163 files changed, 64157 insertions, 20686 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 912d42e302..9a1f28f07b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,7 +122,7 @@ minimal.Fedora.x86_64:
     --disable-ocsp --disable-non-suiteb-curves --with-included-unistring
     --disable-nls --disable-libdane --without-p11-kit --without-tpm
     --disable-ssl3-support --disable-ssl2-support --disable-doc --enable-openssl-compatibility
-    --disable-gcc-warnings
+    --disable-gcc-warnings --with-system-priority-file=""
     --disable-gost
   - make clean
   - make -j$(nproc)
diff --git a/Makefile.am b/Makefile.am
index 71a38c6174..79cb59eb7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,14 +103,14 @@ abi-check-latest: lib/libgnutls.la libdane/libgnutls-dane.la
 	@echo "Checking whether the latest ABI dump matches"
 	@abidiff --suppressions $(ABIGNORE_FILE) lib/.libs/libgnutls.so $(LIBGNUTLS_ABI_LAST_FILE) --hd2 "$(srcdir)/lib/includes/gnutls/"; if test $$? != 0;then \
 		echo "*********************************************************"; \
-		echo "libgnutls ABI has changed; use 'make-files-update'       "; \
+		echo "libgnutls ABI has changed; use 'make files-update'       "; \
 		echo "and use 'git diff' to check correctness before committing"; \
 		echo "*********************************************************"; \
 		false; \
 	fi
 	@abidiff libdane/.libs/libgnutls-dane.so $(LIBDANE_ABI_LAST_FILE) --hd2 "$(srcdir)/libdane/includes/gnutls/"; if test $$? != 0;then \
 		echo "*********************************************************"; \
-		echo "libgnutls-dane ABI has changed; use 'make-files-update'  "; \
+		echo "libgnutls-dane ABI has changed; use 'make files-update'  "; \
 		echo "and use 'git diff' to check correctness before committing"; \
 		echo "*********************************************************"; \
 		false; \
@@ -158,7 +158,7 @@ symbol-check: lib/libgnutls.la
 			false; \
 		else \
 			echo "*************************************************************"; \
-			echo "Symbols were added in the library; use 'make-files-update'   "; \
+			echo "Symbols were added in the library; use 'make files-update'   "; \
 			echo "and use 'git diff' to check correctness before committing    "; \
 			echo "*************************************************************"; \
 			false; \
diff --git a/NEWS b/NEWS
index 77407a3017..35bd412b2c 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,50 @@ See the end for copying conditions.
 ** libgnutls: gnutls_privkey_sign_hash2 now accepts the GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA
    flag as documented. This makes it a complete replacement of gnutls_privkey_sign_hash().
 
-** API and ABI modifications:
-No changes since last version.
+** Marked the crypto cipher registration APIs as deprecated. These APIs are rarely used,
+   are for a niche use case, but have significant side effects, such as preventing any
+   internal re-organization and extension of the internal cipher API. The APIs remain
+   functional though a compiler warning will be issued, and a future minor version update
+   may transform them to a no-op while keeping the ABI compatibility (#789)
+
+** The priority configuration was enhanced to allow more elaborate
+   system-wide configuration of the library. The following changes were done:
+    - The file is read as an ini file with '#' indicating a comment.
+    - The section "[priorities]" or global follows the existing semantics of
+      the configuration file, and allows to specify system-wide priority strings
+      which are accessed with the '@' prefix.
+    - The section "[overrides]" is added with the parameters "insecure-hash",
+      "insecure-sig", "insecure-sig-for-cert", "disabled-curve",
+      "disabled-version", "min-verification-profile", "tls-disabled-cipher",
+      "tls-disabled-mac", "tls-disabled-group", "tls-disabled-kx", which prohibit
+      specific algorithms or options globally. Existing algorithms in the
+      library can be marked as disabled and insecure, but no hard-coded
+      insecure algorithm can be marked as secure (so that the configuration
+      cannot be abused to make the system vulnerable).
+    - Unknown sections or options are skipped with a debug message, unless
+      the GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID environment parameter is
+      set to 1.
+
+** libgnutls: add gnutls_hash_copy/gnutls_hmac_copy functions that will create a copy
+   of digest or MAC context. Copying contexts for externally-registered digest and MAC
+   contexts is unupported.
+
+** libgnutls: Added new flag for GNUTLS_CPUID_OVERRIDE
+    - 0x20: Enable SHA_NI instruction set
+
+** libgnutls: Added support for AES-GMAC MAC (#781)
+
+** API and ABI modifications:
+gnutls_get_system_config_file: Added
+gnutls_crypto_register_cipher: Deprecated
+gnutls_crypto_register_aead_cipher: Deprecated
+gnutls_crypto_register_digest: Deprecated
+gnutls_crypto_register_mac: Deprecated
+gnutls_hash_copy: Added
+gnutls_hmac_copy: Added
+GNUTLS_MAC_AES_GMAC_128: Added
+GNUTLS_MAC_AES_GMAC_192: Added
+GNUTLS_MAC_AES_CMAC_256: Added
 
 
 * Version 3.6.8 (released 2019-05-28)
diff --git a/cfg.mk b/cfg.mk
index 200f421659..ff79dbf2ed 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -45,17 +45,17 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|gtk-doc.make|m4/pkg|doc/fdl-1.3.texi|sr
 update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=1
 
 # Explicit syntax-check exceptions.
-exclude_file_name_regexp--sc_error_message_period = ^src/crywrap/crywrap.c$$
 exclude_file_name_regexp--sc_error_message_uppercase = ^doc/examples/ex-cxx.cpp|guile/src/core.c|src/certtool.c|src/ocsptool.c|src/crywrap/crywrap.c|tests/pkcs12_encode.c$$
 exclude_file_name_regexp--sc_file_system = ^doc/doxygen/Doxyfile
 exclude_file_name_regexp--sc_prohibit_cvs_keyword = ^lib/nettle/.*$$
 exclude_file_name_regexp--sc_prohibit_undesirable_word_seq = ^tests/nist-pkits/gnutls-nist-tests.html$$
-exclude_file_name_regexp--sc_space_tab = ^doc/.*.(pdf|png)|\.crl|\.pdf|\.zip|tests/nist-pkits/|tests/data/|devel/|tests/suite/x509paths/.*|fuzz/.*\.repro|fuzz/.*\.in/.*$$
+exclude_file_name_regexp--sc_space_tab = ^doc/.*.(pdf|png)|\.crl|\.pdf|\.zip|tests/nist-pkits/|tests/data/|tests/system-override-curves.sh|devel/|tests/suite/x509paths/.*|fuzz/.*\.repro|fuzz/.*\.in/.*$$
 _makefile_at_at_check_exceptions = ' && !/CODE_COVERAGE_RULES/ && !/VERSION/'
 exclude_file_name_regexp--sc_m4_quote_check='lib/unistring/m4/absolute-header.m4'
 exclude_file_name_regexp--sc_makefile_at_at_check='lib/unistring/Makefile.am'
 exclude_file_name_regexp--sc_prohibit_stddef_without_use='u*-normalize.c'
 exclude_file_name_regexp--sc_prohibit_strncpy='unistr.in.h'
+exclude_file_name_regexp--sc_prohibit_strncpy='lib/inih/ini.c'
 gl_public_submodule_commit =
 
 autoreconf:
@@ -130,14 +130,13 @@ ASM_SOURCES_XXX := \
 	lib/accelerated/aarch64/XXX/sha1-armv8.s \
 	lib/accelerated/aarch64/XXX/sha256-armv8.s \
 	lib/accelerated/aarch64/XXX/sha512-armv8.s \
-	lib/accelerated/x86/XXX/cpuid-x86_64.s \
-	lib/accelerated/x86/XXX/cpuid-x86.s \
 	lib/accelerated/x86/XXX/ghash-x86_64.s \
 	lib/accelerated/x86/XXX/aesni-x86_64.s \
 	lib/accelerated/x86/XXX/aesni-x86.s \
 	lib/accelerated/x86/XXX/sha1-ssse3-x86.s \
 	lib/accelerated/x86/XXX/sha1-ssse3-x86_64.s \
 	lib/accelerated/x86/XXX/sha256-ssse3-x86.s \
+	lib/accelerated/x86/XXX/sha256-ssse3-x86_64.s \
 	lib/accelerated/x86/XXX/sha512-ssse3-x86.s \
 	lib/accelerated/x86/XXX/sha512-ssse3-x86_64.s \
 	lib/accelerated/x86/XXX/aesni-gcm-x86_64.s \
@@ -153,12 +152,12 @@ asm-sources: $(ASM_SOURCES_ELF) $(ASM_SOURCES_COFF) $(ASM_SOURCES_MACOSX) lib/ac
 asm-sources-clean:
 	rm -f $(ASM_SOURCES_ELF) $(ASM_SOURCES_COFF) $(ASM_SOURCES_MACOSX) lib/accelerated/x86/files.mk
 
-X86_FILES=XXX/aesni-x86.s XXX/cpuid-x86.s XXX/sha1-ssse3-x86.s \
+X86_FILES=XXX/aesni-x86.s XXX/sha1-ssse3-x86.s \
 	XXX/sha256-ssse3-x86.s XXX/sha512-ssse3-x86.s XXX/aes-ssse3-x86.s
 
-X86_64_FILES=XXX/aesni-x86_64.s XXX/cpuid-x86_64.s XXX/ghash-x86_64.s \
+X86_64_FILES=XXX/aesni-x86_64.s XXX/ghash-x86_64.s \
 	XXX/sha1-ssse3-x86_64.s XXX/sha512-ssse3-x86_64.s XXX/aes-ssse3-x86_64.s \
-	XXX/aesni-gcm-x86_64.s
+	XXX/aesni-gcm-x86_64.s XXX/sha256-ssse3-x86_64.s
 
 X86_PADLOCK_FILES=XXX/e_padlock-x86.s
 X86_64_PADLOCK_FILES=XXX/e_padlock-x86_64.s
@@ -194,27 +193,27 @@ lib/accelerated/x86/files.mk: $(ASM_SOURCES_ELF)
 
 # Appro's code
 lib/accelerated/x86/elf/%.s: devel/perlasm/%.pl .submodule.stamp 
-	cat $<.license > $@
-	CC=gcc perl $< elf >> $@
+	CC=gcc perl $< elf $@.tmp
+	cat $<.license $@.tmp > $@ && rm -f $@.tmp
 	echo "" >> $@
 	echo ".section .note.GNU-stack,\"\",%progbits" >> $@
 	sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
 
 lib/accelerated/x86/coff/%-x86.s: devel/perlasm/%-x86.pl .submodule.stamp 
-	cat $<.license > $@
-	CC=gcc perl $< coff >> $@
+	CC=gcc perl $< coff $@.tmp
+	cat $<.license $@.tmp > $@ && rm -f $@.tmp
 	echo "" >> $@
 	sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
 
 lib/accelerated/x86/coff/%-x86_64.s: devel/perlasm/%-x86_64.pl .submodule.stamp 
-	cat $<.license > $@
-	CC=gcc perl $< mingw64 >> $@
+	CC=gcc perl $< mingw64 $@.tmp
+	cat $<.license $@.tmp > $@ && rm -f $@.tmp
 	echo "" >> $@
 	sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
 
 lib/accelerated/x86/macosx/%.s: devel/perlasm/%.pl .submodule.stamp 
-	cat $<.license > $@
-	CC=gcc perl $< macosx >> $@
+	CC=gcc perl $< macosx $@.tmp
+	cat $<.license $@.tmp > $@ && rm -f $@.tmp
 	echo "" >> $@
 	sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
 
diff --git a/configure.ac b/configure.ac
index e0c5c25d5b..e246fdcb73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -628,17 +628,23 @@ fi
 AC_DEFINE_UNQUOTED([UNBOUND_ROOT_KEY_FILE],
   ["$unbound_root_key_file"], [The DNSSEC root key file])
 
+system_config_file="/etc/gnutls/config"
 AC_ARG_WITH(system-priority-file, AS_HELP_STRING([--with-system-priority-file],
-                                 [specify the system priority file]),
-            system_priority_file="$withval", 
-system_priority_file="/etc/gnutls/default-priorities"
+                                 [specify the system-wide config file (set empty to disable; default is $config)]),
+            system_config_file="$withval"
 )
 
+AM_CONDITIONAL(DISABLE_SYSTEM_CONFIG, test -z "${system_config_file}")
+
+if test -z "${system_config_file}";then
+	AC_DEFINE([DISABLE_SYSTEM_CONFIG], 1, [Whether to disable system configuration])
+fi
+
 AC_DEFINE_UNQUOTED([SYSTEM_PRIORITY_FILE],
-  ["$system_priority_file"], [The system priority file])
+  ["$system_config_file"], [The system-wide gnutls configuration file])
 
 AC_ARG_WITH(default-priority-string, AS_HELP_STRING([--with-default-priority-string],
-                                 [specify the default priority string (e.g. @SYSTEM)]),
+                                 [specify the default priority string used by gnutls_set_default_priority (default is NORMAL)]),
             prio_string="$withval", 
             prio_string="NORMAL")
 
@@ -950,6 +956,13 @@ dnl Some variables needed in makefiles
 YEAR=`date +%Y`
 AC_SUBST([YEAR], $YEAR)
 
+dnl configuration options for config file parsing (inih)
+AC_DEFINE([INI_MAX_LINE], 2048, [inih maximum line size])
+AC_DEFINE([INI_ALLOW_INLINE_COMMENTS], 1, [whether to allowin inline comments])
+AC_DEFINE([INI_STOP_ON_FIRST_ERROR], 1, [whether to stop on first error])
+AC_DEFINE_UNQUOTED([INI_INLINE_COMMENT_PREFIXES], [";#"], [The inline comment prefixes])
+AC_DEFINE_UNQUOTED([INI_START_COMMENT_PREFIXES], [";#"], [The comment prefixes])
+
 AC_CONFIG_FILES([guile/pre-inst-guile], [chmod +x guile/pre-inst-guile])
 AC_CONFIG_FILES([
   Makefile
@@ -1072,7 +1085,7 @@ AC_MSG_NOTICE([System files:
   Trust store file:     $with_default_trust_store_file
   Blacklist file:       $with_default_blacklist_file
   CRL file:             $with_default_crl_file
-  Priority file:        $system_priority_file
+  Configuration file:   $system_config_file
   DNSSEC root key file: $unbound_root_key_file
 ])
 
diff --git a/devel/cppcheck.suppressions b/devel/cppcheck.suppressions
index 8fa8ccb766..2273647a4f 100644
--- a/devel/cppcheck.suppressions
+++ b/devel/cppcheck.suppressions
@@ -2,3 +2,5 @@ allocaCalled:lib/nettle/int/pss*.c
 variableScope:lib/safe-memfuncs.c:42
 variableScope:gl/gettext.h
 redundantAssignment:lib/nettle/backport/cmac.c:132
+variableScope:lib/inih/ini.c:97
+variableScope:lib/inih/ini.c:241
diff --git a/devel/libdane-latest-x86_64.abi b/devel/libdane-latest-x86_64.abi
index 80492aa6ef..b6c986b43a 100644
--- a/devel/libdane-latest-x86_64.abi
+++ b/devel/libdane-latest-x86_64.abi
@@ -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-mine/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='52416' 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'>
@@ -389,7 +395,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 +406,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>
@@ -594,7 +603,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='5376' 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 +631,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='2880'>
         <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='5312'>
         <var-decl name='usage_cnt' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
@@ -679,7 +688,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='2432' 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,13 +710,13 @@
       <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='2304'>
         <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='2336'>
         <var-decl name='is_aead' type-id='type-id-2' 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='sequence_number' type-id='type-id-96' visibility='default'/>
       </data-member>
     </class-decl>
@@ -721,7 +730,7 @@
       <subrange length='16' type-id='type-id-44' id='type-id-98'/>
 
     </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='1280' is-anonymous='yes' visibility='default' id='type-id-95'>
       <data-member access='private'>
         <var-decl name='tls12' type-id='type-id-99' visibility='default'/>
       </data-member>
@@ -729,11 +738,11 @@
         <var-decl name='aead' type-id='type-id-100' 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='1280' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-99' visibility='default' id='type-id-101'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cipher' type-id='type-id-102' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
+      <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='mac' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
@@ -745,11 +754,11 @@
       <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='etm' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
+      <data-member access='public' layout-offset-in-bits='1216'>
         <var-decl name='tag_size' type-id='type-id-104' 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-102' visibility='default' id='type-id-105'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='handle' type-id='type-id-106' visibility='default'/>
       </data-member>
@@ -778,46 +787,50 @@
         <var-decl name='setiv' type-id='type-id-113' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='deinit' type-id='type-id-114' visibility='default'/>
+        <var-decl name='getiv' type-id='type-id-114' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='deinit' type-id='type-id-115' 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'/>
+    <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-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'/>
-    <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'/>
-    <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'/>
-    <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'/>
-    <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'/>
+    <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'>
       <data-member access='private'>
-        <var-decl name='dig' type-id='type-id-126' visibility='default'/>
+        <var-decl name='dig' type-id='type-id-127' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='mac' type-id='type-id-127' visibility='default'/>
+        <var-decl name='mac' type-id='type-id-128' 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='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-127' visibility='default' id='type-id-129'>
       <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-129' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-130' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='output' type-id='type-id-130' visibility='default'/>
+        <var-decl name='output' type-id='type-id-131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='deinit' type-id='type-id-131' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='key' type-id='type-id-106' visibility='default'/>
@@ -829,11 +842,11 @@
         <var-decl name='handle' type-id='type-id-106' 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'/>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -841,52 +854,52 @@
         <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-129' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-130' 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-134' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='output' type-id='type-id-130' visibility='default'/>
+        <var-decl name='output' type-id='type-id-131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit' type-id='type-id-131' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='handle' type-id='type-id-106' 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='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='640' is-struct='yes' visibility='default' id='type-id-134'>
+    <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>
     </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='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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='i' type-id='type-id-136' visibility='default'/>
+        <var-decl name='i' type-id='type-id-137' 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 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-135' id='type-id-96'/>
+    <typedef-decl name='gnutls_uint64' type-id='type-id-136' id='type-id-96'/>
     <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'/>
+    <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'/>
 
-    <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 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>
-    <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-142'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='record_buffer' type-id='type-id-142' visibility='default'/>
+        <var-decl name='record_buffer' type-id='type-id-143' 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'/>
@@ -904,25 +917,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-143' visibility='default'/>
+        <var-decl name='handshake_hash_buffer' type-id='type-id-144' 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-144' visibility='default'/>
+        <var-decl name='ticket_state' type-id='type-id-145' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bye_state' type-id='type-id-145' visibility='default'/>
+        <var-decl name='bye_state' type-id='type-id-146' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='reauth_state' type-id='type-id-146' visibility='default'/>
+        <var-decl name='reauth_state' type-id='type-id-147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='handshake_final_state' type-id='type-id-147' visibility='default'/>
+        <var-decl name='handshake_final_state' type-id='type-id-148' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='handshake_state' type-id='type-id-147' visibility='default'/>
+        <var-decl name='handshake_state' type-id='type-id-148' 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'/>
@@ -946,33 +959,36 @@
         <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-148' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-149' 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'/>
       </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'>
@@ -982,49 +998,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-142' visibility='default'/>
+        <var-decl name='handshake_send_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='handshake_header_recv_buffer' type-id='type-id-142' visibility='default'/>
+        <var-decl name='handshake_header_recv_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='handshake_recv_buffer' type-id='type-id-149' visibility='default'/>
+        <var-decl name='handshake_recv_buffer' type-id='type-id-150' 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-142' visibility='default'/>
+        <var-decl name='record_recv_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='record_send_buffer' type-id='type-id-142' visibility='default'/>
+        <var-decl name='record_send_buffer' type-id='type-id-143' 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'/>
       </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'/>
+        <var-decl name='early_data_recv_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='early_data_presend_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='early_data_presend_buffer' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
-        <var-decl name='rsend_state' type-id='type-id-150' visibility='default'/>
+        <var-decl name='rsend_state' type-id='type-id-151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
-        <var-decl name='record_key_update_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='record_key_update_buffer' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8832'>
-        <var-decl name='record_presend_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='record_presend_buffer' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9088'>
-        <var-decl name='reauth_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='reauth_buffer' type-id='type-id-144' 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-151' visibility='default'/>
+        <var-decl name='auth_struct' type-id='type-id-152' 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'/>
@@ -1033,73 +1049,73 @@
         <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-152' visibility='default'/>
+        <var-decl name='send_cert_req' type-id='type-id-153' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
-        <var-decl name='pull_timeout_func' type-id='type-id-153' visibility='default'/>
+        <var-decl name='pull_timeout_func' type-id='type-id-154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
-        <var-decl name='pull_func' type-id='type-id-154' visibility='default'/>
+        <var-decl name='pull_func' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='push_func' type-id='type-id-155' visibility='default'/>
+        <var-decl name='push_func' type-id='type-id-156' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9792'>
-        <var-decl name='vec_push_func' type-id='type-id-156' visibility='default'/>
+        <var-decl name='vec_push_func' type-id='type-id-157' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9856'>
-        <var-decl name='errno_func' type-id='type-id-157' visibility='default'/>
+        <var-decl name='errno_func' type-id='type-id-158' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9920'>
-        <var-decl name='transport_recv_ptr' type-id='type-id-158' visibility='default'/>
+        <var-decl name='transport_recv_ptr' type-id='type-id-159' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
-        <var-decl name='transport_send_ptr' type-id='type-id-158' visibility='default'/>
+        <var-decl name='transport_send_ptr' type-id='type-id-159' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
-        <var-decl name='db_store_func' type-id='type-id-159' visibility='default'/>
+        <var-decl name='db_store_func' type-id='type-id-160' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
-        <var-decl name='db_retrieve_func' type-id='type-id-160' visibility='default'/>
+        <var-decl name='db_retrieve_func' type-id='type-id-161' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='db_remove_func' type-id='type-id-161' visibility='default'/>
+        <var-decl name='db_remove_func' type-id='type-id-162' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='user_hello_func' type-id='type-id-162' visibility='default'/>
+        <var-decl name='user_hello_func' type-id='type-id-163' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10368'>
-        <var-decl name='h_hook' type-id='type-id-163' visibility='default'/>
+        <var-decl name='h_hook' type-id='type-id-164' 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-164' visibility='default'/>
+        <var-decl name='h_post' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
-        <var-decl name='selected_cert_list' type-id='type-id-165' visibility='default'/>
+        <var-decl name='selected_cert_list' type-id='type-id-166' 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-166' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-167' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-167' visibility='default'/>
+        <var-decl name='selected_ocsp' type-id='type-id-168' 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-168' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
         <var-decl name='selected_ocsp_func_ptr' type-id='type-id-106' visibility='default'/>
@@ -1108,10 +1124,10 @@
         <var-decl name='selected_need_free' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10952'>
-        <var-decl name='default_record_version' type-id='type-id-169' visibility='default'/>
+        <var-decl name='default_record_version' type-id='type-id-170' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-169' visibility='default'/>
+        <var-decl name='default_hello_version' type-id='type-id-170' 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'/>
@@ -1123,7 +1139,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-169' visibility='default'/>
+        <var-decl name='rsa_pms_version' type-id='type-id-170' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11104'>
         <var-decl name='errnum' type-id='type-id-1' visibility='default'/>
@@ -1138,7 +1154,7 @@
         <var-decl name='transport' type-id='type-id-78' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='dtls' type-id='type-id-170' visibility='default'/>
+        <var-decl name='dtls' type-id='type-id-171' 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'/>
@@ -1153,13 +1169,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-171' visibility='default'/>
+        <var-decl name='cb_tls_unique' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-172' visibility='default'/>
+        <var-decl name='handshake_start_time' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-172' visibility='default'/>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12544'>
         <var-decl name='ertt' type-id='type-id-2' visibility='default'/>
@@ -1174,147 +1190,150 @@
         <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-143' visibility='default'/>
+        <var-decl name='post_handshake_hash_buffer' type-id='type-id-144' 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-25' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13184'>
-        <var-decl name='full_client_hello' type-id='type-id-143' visibility='default'/>
+      <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='13440'>
-        <var-decl name='extensions_offset' type-id='type-id-1' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13312'>
+        <var-decl name='full_client_hello' type-id='type-id-144' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13504'>
-        <var-decl name='hb_local_data' type-id='type-id-143' visibility='default'/>
+      <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='13760'>
-        <var-decl name='hb_remote_data' type-id='type-id-143' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13632'>
+        <var-decl name='hb_local_data' type-id='type-id-144' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14016'>
-        <var-decl name='hb_ping_start' type-id='type-id-172' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13888'>
+        <var-decl name='hb_remote_data' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14144'>
-        <var-decl name='hb_ping_sent' type-id='type-id-172' visibility='default'/>
+        <var-decl name='hb_ping_start' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14272'>
+        <var-decl name='hb_ping_sent' type-id='type-id-173' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='14400'>
         <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='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'>
-        <var-decl name='hb_state' type-id='type-id-173' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14528'>
+        <var-decl name='hb_state' type-id='type-id-174' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
-        <var-decl name='recv_state' type-id='type-id-174' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14560'>
+        <var-decl name='recv_state' type-id='type-id-175' 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'>
-        <var-decl name='verify_callback' type-id='type-id-175' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14720'>
+        <var-decl name='verify_callback' type-id='type-id-176' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14656'>
-        <var-decl name='vc_data' type-id='type-id-176' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14784'>
+        <var-decl name='vc_data' type-id='type-id-177' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='vc_sdata' type-id='type-id-177' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14848'>
+        <var-decl name='vc_sdata' type-id='type-id-178' 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'>
-        <var-decl name='saved_username' type-id='type-id-178' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='15400'>
+        <var-decl name='saved_username' type-id='type-id-179' 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'>
-        <var-decl name='tfo' type-id='type-id-179' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='16448'>
+        <var-decl name='tfo' type-id='type-id-180' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17536'>
-        <var-decl name='rsup' type-id='type-id-180' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17664'>
+        <var-decl name='rsup' type-id='type-id-181' 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'>
-        <var-decl name='rexts' type-id='type-id-181' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17792'>
+        <var-decl name='rexts' type-id='type-id-182' 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'>
-        <var-decl name='ext_data' type-id='type-id-182' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17920'>
+        <var-decl name='ext_data' type-id='type-id-183' 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'>
-        <var-decl name='ext_msg' type-id='type-id-183' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24096'>
+        <var-decl name='ext_msg' type-id='type-id-184' 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'>
-        <var-decl name='hrr_cs' type-id='type-id-169' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24384'>
+        <var-decl name='hrr_cs' type-id='type-id-170' 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'>
-        <var-decl name='tls13_ticket' type-id='type-id-184' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24448'>
+        <var-decl name='tls13_ticket' type-id='type-id-185' 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'>
-        <var-decl name='anti_replay' type-id='type-id-185' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='27648'>
+        <var-decl name='anti_replay' type-id='type-id-186' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
+      <data-member access='public' layout-offset-in-bits='27712'>
         <var-decl name='epoch_lock' type-id='type-id-106' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-186'>
+    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-187'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-187' visibility='default'/>
+        <var-decl name='head' type-id='type-id-188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-187' visibility='default'/>
+        <var-decl name='tail' type-id='type-id-188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='length' type-id='type-id-2' visibility='default'/>
@@ -1323,12 +1342,12 @@
         <var-decl name='byte_length' type-id='type-id-104' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-188'>
+    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-189'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-187' visibility='default'/>
+        <var-decl name='next' type-id='type-id-188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-187' visibility='default'/>
+        <var-decl name='prev' type-id='type-id-188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='mark' type-id='type-id-104' visibility='default'/>
@@ -1343,7 +1362,7 @@
         <var-decl name='uhead_mark' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='type' type-id='type-id-189' visibility='default'/>
+        <var-decl name='type' type-id='type-id-190' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='record_sequence' type-id='type-id-96' visibility='default'/>
@@ -1352,14 +1371,14 @@
         <var-decl name='epoch' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='htype' type-id='type-id-190' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='handshake_sequence' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-187'/>
-    <enum-decl name='content_type_t' id='type-id-191'>
+    <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-188'/>
+    <enum-decl name='content_type_t' id='type-id-192'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_CHANGE_CIPHER_SPEC' value='20'/>
       <enumerator name='GNUTLS_ALERT' value='21'/>
@@ -1367,8 +1386,8 @@
       <enumerator name='GNUTLS_APPLICATION_DATA' value='23'/>
       <enumerator name='GNUTLS_HEARTBEAT' value='24'/>
     </enum-decl>
-    <typedef-decl name='content_type_t' type-id='type-id-191' id='type-id-189'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-192'>
+    <typedef-decl name='content_type_t' type-id='type-id-192' id='type-id-190'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-193'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_REQUEST' value='0'/>
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO' value='1'/>
@@ -1391,15 +1410,15 @@
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO_V2' value='1024'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_RETRY_REQUEST' value='1025'/>
     </enum-decl>
-    <typedef-decl name='gnutls_handshake_description_t' type-id='type-id-192' id='type-id-190'/>
-    <typedef-decl name='mbuffer_st' type-id='type-id-188' id='type-id-193'/>
-    <typedef-decl name='mbuffer_head_st' type-id='type-id-186' id='type-id-142'/>
-    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-194'>
+    <typedef-decl name='gnutls_handshake_description_t' type-id='type-id-193' id='type-id-191'/>
+    <typedef-decl name='mbuffer_st' type-id='type-id-189' id='type-id-194'/>
+    <typedef-decl name='mbuffer_head_st' type-id='type-id-187' id='type-id-143'/>
+    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-195'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='allocd' type-id='type-id-195' visibility='default'/>
+        <var-decl name='allocd' type-id='type-id-196' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-195' visibility='default'/>
+        <var-decl name='data' type-id='type-id-196' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='max_length' type-id='type-id-104' visibility='default'/>
@@ -1408,22 +1427,22 @@
         <var-decl name='length' type-id='type-id-104' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-195'/>
-    <typedef-decl name='gnutls_buffer_st' type-id='type-id-194' id='type-id-143'/>
-    <enum-decl name='send_ticket_state_t' id='type-id-196'>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-196'/>
+    <typedef-decl name='gnutls_buffer_st' type-id='type-id-195' id='type-id-144'/>
+    <enum-decl name='send_ticket_state_t' id='type-id-197'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='TICKET_STATE0' value='0'/>
       <enumerator name='TICKET_STATE1' value='1'/>
     </enum-decl>
-    <typedef-decl name='send_ticket_state_t' type-id='type-id-196' id='type-id-144'/>
-    <enum-decl name='bye_state_t' id='type-id-197'>
+    <typedef-decl name='send_ticket_state_t' type-id='type-id-197' id='type-id-145'/>
+    <enum-decl name='bye_state_t' id='type-id-198'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='BYE_STATE0' value='0'/>
       <enumerator name='BYE_STATE1' value='1'/>
       <enumerator name='BYE_STATE2' value='2'/>
     </enum-decl>
-    <typedef-decl name='bye_state_t' type-id='type-id-197' id='type-id-145'/>
-    <enum-decl name='reauth_state_t' id='type-id-198'>
+    <typedef-decl name='bye_state_t' type-id='type-id-198' id='type-id-146'/>
+    <enum-decl name='reauth_state_t' id='type-id-199'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='REAUTH_STATE0' value='0'/>
       <enumerator name='REAUTH_STATE1' value='1'/>
@@ -1432,8 +1451,8 @@
       <enumerator name='REAUTH_STATE4' value='4'/>
       <enumerator name='REAUTH_STATE5' value='5'/>
     </enum-decl>
-    <typedef-decl name='reauth_state_t' type-id='type-id-198' id='type-id-146'/>
-    <enum-decl name='handshake_state_t' id='type-id-199'>
+    <typedef-decl name='reauth_state_t' type-id='type-id-199' id='type-id-147'/>
+    <enum-decl name='handshake_state_t' id='type-id-200'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='STATE0' value='0'/>
       <enumerator name='STATE1' value='1'/>
@@ -1487,46 +1506,46 @@
       <enumerator name='STATE115' value='115'/>
       <enumerator name='STATE150' value='116'/>
     </enum-decl>
-    <typedef-decl name='handshake_state_t' type-id='type-id-199' id='type-id-147'/>
-    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-200'>
+    <typedef-decl name='handshake_state_t' type-id='type-id-200' id='type-id-148'/>
+    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-201'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='protocol' type-id='type-id-201' visibility='default'/>
+        <var-decl name='protocol' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='client_ctype' type-id='type-id-201' visibility='default'/>
+        <var-decl name='client_ctype' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='server_ctype' type-id='type-id-201' visibility='default'/>
+        <var-decl name='server_ctype' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='_cipher' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_cipher' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='_mac' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_mac' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10400'>
-        <var-decl name='_kx' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_kx' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12480'>
-        <var-decl name='_sign_algo' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_sign_algo' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='_supported_ecc' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_supported_ecc' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16640'>
-        <var-decl name='groups' type-id='type-id-202' visibility='default'/>
+        <var-decl name='groups' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20800'>
-        <var-decl name='sigalg' type-id='type-id-203' visibility='default'/>
+        <var-decl name='sigalg' type-id='type-id-204' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24960'>
-        <var-decl name='cs' type-id='type-id-204' visibility='default'/>
+        <var-decl name='cs' type-id='type-id-205' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41408'>
         <var-decl name='no_extensions' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41440'>
-        <var-decl name='sr' type-id='type-id-205' visibility='default'/>
+        <var-decl name='sr' type-id='type-id-206' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41472'>
         <var-decl name='min_record_version' type-id='type-id-79' visibility='default'/>
@@ -1556,50 +1575,53 @@
         <var-decl name='fallback' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41600'>
-        <var-decl name='level' type-id='type-id-206' visibility='default'/>
+        <var-decl name='level' type-id='type-id-207' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41632'>
         <var-decl name='_allow_large_records' type-id='type-id-79' visibility='default'/>
       </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'>
         <var-decl name='_dh_prime_bits' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41728'>
-        <var-decl name='usage_cnt' type-id='type-id-207' visibility='default'/>
+        <var-decl name='usage_cnt' type-id='type-id-208' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='2080' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-201' visibility='default' id='type-id-208'>
+    <class-decl name='__anonymous_struct__' size-in-bits='2080' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-202' visibility='default' id='type-id-209'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priorities' type-id='type-id-209' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-210' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
         <var-decl name='num_priorities' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-209'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-210'>
       <subrange length='64' type-id='type-id-44' id='type-id-97'/>
 
     </array-type-def>
-    <typedef-decl name='priority_st' type-id='type-id-208' id='type-id-201'/>
-    <class-decl name='group_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-210'>
+    <typedef-decl name='priority_st' type-id='type-id-209' id='type-id-202'/>
+    <class-decl name='group_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-211' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
@@ -1609,20 +1631,20 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='4096' id='type-id-211'>
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='4096' id='type-id-212'>
       <subrange length='64' type-id='type-id-44' id='type-id-97'/>
 
     </array-type-def>
-    <typedef-decl name='group_list_st' type-id='type-id-210' id='type-id-202'/>
-    <class-decl name='sign_algo_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-212'>
+    <typedef-decl name='group_list_st' type-id='type-id-211' id='type-id-203'/>
+    <class-decl name='sign_algo_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-213'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-213' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-214' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-214'>
+    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-215'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-34' visibility='default'/>
       </data-member>
@@ -1636,7 +1658,7 @@
         <var-decl name='pk' type-id='type-id-67' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='hash' type-id='type-id-215' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-216' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='priv_pk' type-id='type-id-67' visibility='default'/>
@@ -1651,13 +1673,13 @@
         <var-decl name='curve' type-id='type-id-66' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='aid' type-id='type-id-216' visibility='default'/>
+        <var-decl name='aid' type-id='type-id-217' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='slevel' type-id='type-id-217' visibility='default'/>
+        <var-decl name='slevel' type-id='type-id-218' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-218'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-219'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_DIG_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DIG_NULL' value='1'/>
@@ -1678,61 +1700,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-218' id='type-id-215'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='24' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-219' visibility='default' id='type-id-220'>
+    <typedef-decl name='gnutls_digest_algorithm_t' type-id='type-id-219' id='type-id-216'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='24' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-220' visibility='default' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='id' type-id='type-id-169' visibility='default'/>
+        <var-decl name='id' type-id='type-id-170' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='tls_sem' type-id='type-id-24' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='16' id='type-id-169'>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='16' id='type-id-170'>
       <subrange length='2' type-id='type-id-44' id='type-id-46'/>
 
     </array-type-def>
-    <typedef-decl name='sign_algorithm_st' type-id='type-id-220' id='type-id-219'/>
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-216'/>
-    <enum-decl name='hash_security_level_t' id='type-id-221'>
+    <typedef-decl name='sign_algorithm_st' type-id='type-id-221' id='type-id-220'/>
+    <qualified-type-def type-id='type-id-220' const='yes' id='type-id-217'/>
+    <enum-decl name='hash_security_level_t' id='type-id-222'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='_SECURE' value='0'/>
       <enumerator name='_INSECURE_FOR_CERTS' value='1'/>
       <enumerator name='_INSECURE' value='2'/>
     </enum-decl>
-    <typedef-decl name='hash_security_level_t' type-id='type-id-221' id='type-id-217'/>
-    <qualified-type-def type-id='type-id-214' const='yes' id='type-id-222'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-223'/>
+    <typedef-decl name='hash_security_level_t' type-id='type-id-222' id='type-id-218'/>
+    <qualified-type-def type-id='type-id-215' const='yes' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
 
-    <array-type-def dimensions='1' type-id='type-id-223' size-in-bits='4096' id='type-id-213'>
+    <array-type-def dimensions='1' type-id='type-id-224' size-in-bits='4096' id='type-id-214'>
       <subrange length='64' type-id='type-id-44' id='type-id-97'/>
 
     </array-type-def>
-    <typedef-decl name='sign_algo_list_st' type-id='type-id-212' id='type-id-203'/>
-    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-224'>
+    <typedef-decl name='sign_algo_list_st' type-id='type-id-213' id='type-id-204'/>
+    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-225'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-225' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-226' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16384'>
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-33' id='type-id-226'/>
+    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-33' id='type-id-227'/>
 
-    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='16384' id='type-id-225'>
-      <subrange length='256' type-id='type-id-44' id='type-id-227'/>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='16384' id='type-id-226'>
+      <subrange length='256' type-id='type-id-44' id='type-id-228'/>
 
     </array-type-def>
-    <typedef-decl name='ciphersuite_list_st' type-id='type-id-224' id='type-id-204'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-228'>
+    <typedef-decl name='ciphersuite_list_st' type-id='type-id-225' id='type-id-205'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-229'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='SR_DISABLED' value='0'/>
       <enumerator name='SR_UNSAFE' value='1'/>
       <enumerator name='SR_PARTIAL' value='2'/>
       <enumerator name='SR_SAFE' value='3'/>
     </enum-decl>
-    <typedef-decl name='safe_renegotiation_t' type-id='type-id-228' id='type-id-205'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-229'>
+    <typedef-decl name='safe_renegotiation_t' type-id='type-id-229' id='type-id-206'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-230'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_SEC_PARAM_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_SEC_PARAM_INSECURE' value='5'/>
@@ -1747,15 +1769,15 @@
       <enumerator name='GNUTLS_SEC_PARAM_FUTURE' value='50'/>
       <enumerator name='GNUTLS_SEC_PARAM_MAX' value='50'/>
     </enum-decl>
-    <typedef-decl name='gnutls_sec_param_t' type-id='type-id-229' id='type-id-206'/>
-    <type-decl name='atomic_uint' size-in-bits='32' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-148'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-230' visibility='default' id='type-id-231'>
+    <typedef-decl name='gnutls_sec_param_t' type-id='type-id-230' id='type-id-207'/>
+    <type-decl name='atomic_uint' size-in-bits='32' id='type-id-208'/>
+    <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='htype' type-id='type-id-190' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rtype' type-id='type-id-190' visibility='default'/>
+        <var-decl name='rtype' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='length' type-id='type-id-26' visibility='default'/>
@@ -1770,27 +1792,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-232' visibility='default'/>
+        <var-decl name='header' type-id='type-id-233' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='header_size' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='data' type-id='type-id-143' visibility='default'/>
+        <var-decl name='data' type-id='type-id-144' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='96' id='type-id-232'>
-      <subrange length='12' type-id='type-id-44' id='type-id-233'/>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='96' id='type-id-233'>
+      <subrange length='12' type-id='type-id-44' id='type-id-234'/>
 
     </array-type-def>
-    <typedef-decl name='handshake_buffer_st' type-id='type-id-231' id='type-id-230'/>
+    <typedef-decl name='handshake_buffer_st' type-id='type-id-232' id='type-id-231'/>
 
-    <array-type-def dimensions='1' type-id='type-id-230' size-in-bits='3456' id='type-id-149'>
-      <subrange length='6' type-id='type-id-44' id='type-id-234'/>
+    <array-type-def dimensions='1' type-id='type-id-231' size-in-bits='3456' id='type-id-150'>
+      <subrange length='6' type-id='type-id-44' id='type-id-235'/>
 
     </array-type-def>
-    <enum-decl name='record_send_state_t' id='type-id-235'>
+    <enum-decl name='record_send_state_t' id='type-id-236'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='RECORD_SEND_NORMAL' value='0'/>
       <enumerator name='RECORD_SEND_CORKED' value='1'/>
@@ -1799,71 +1821,71 @@
       <enumerator name='RECORD_SEND_KEY_UPDATE_2' value='4'/>
       <enumerator name='RECORD_SEND_KEY_UPDATE_3' value='5'/>
     </enum-decl>
-    <typedef-decl name='record_send_state_t' type-id='type-id-235' id='type-id-150'/>
-    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-236'>
+    <typedef-decl name='record_send_state_t' type-id='type-id-236' id='type-id-151'/>
+    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-237'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-34' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='gnutls_generate_server_kx' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_server_kx' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='gnutls_generate_client_kx' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_client_kx' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='gnutls_process_server_certificate' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_server_certificate' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='gnutls_process_client_certificate' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_client_certificate' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='gnutls_process_server_kx' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_server_kx' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='gnutls_process_client_kx' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_client_kx' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-239' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-239'/>
-    <typedef-decl name='gnutls_session_t' type-id='type-id-239' id='type-id-240'/>
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-240'/>
+    <typedef-decl name='gnutls_session_t' type-id='type-id-240' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-242'/>
     <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-238'/>
-    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-244'/>
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-151'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-245'>
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-239'/>
+    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-152'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-246'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_CERT_IGNORE' value='0'/>
       <enumerator name='GNUTLS_CERT_REQUEST' value='1'/>
       <enumerator name='GNUTLS_CERT_REQUIRE' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_certificate_request_t' type-id='type-id-245' id='type-id-152'/>
-    <typedef-decl name='gnutls_transport_ptr_t' type-id='type-id-106' 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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='iov_base' type-id='type-id-106' visibility='default'/>
       </data-member>
@@ -1871,29 +1893,29 @@
         <var-decl name='iov_len' type-id='type-id-104' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='giovec_t' type-id='type-id-252' id='type-id-253'/>
-    <qualified-type-def type-id='type-id-253' const='yes' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <typedef-decl name='gnutls_vec_push_func' type-id='type-id-257' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-259'/>
-    <typedef-decl name='gnutls_errno_func' type-id='type-id-259' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
-    <typedef-decl name='gnutls_db_store_func' type-id='type-id-261' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-263'/>
-    <typedef-decl name='gnutls_db_retr_func' type-id='type-id-263' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-265'/>
-    <typedef-decl name='gnutls_db_remove_func' type-id='type-id-265' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-266' size-in-bits='64' id='type-id-267'/>
-    <typedef-decl name='gnutls_handshake_simple_hook_func' type-id='type-id-267' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
-    <typedef-decl name='gnutls_handshake_hook_func' type-id='type-id-269' id='type-id-163'/>
-    <type-decl name='short int' size-in-bits='16' id='type-id-270'/>
-    <typedef-decl name='__int16_t' type-id='type-id-270' id='type-id-271'/>
-    <typedef-decl name='int16_t' type-id='type-id-271' id='type-id-164'/>
-    <class-decl name='gnutls_pcert_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-272'>
+    <typedef-decl name='giovec_t' type-id='type-id-253' id='type-id-254'/>
+    <qualified-type-def type-id='type-id-254' const='yes' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-256'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <typedef-decl name='gnutls_vec_push_func' type-id='type-id-258' id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pubkey' type-id='type-id-273' visibility='default'/>
+        <var-decl name='pubkey' type-id='type-id-274' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert' type-id='type-id-3' visibility='default'/>
@@ -1902,14 +1924,14 @@
         <var-decl name='type' type-id='type-id-27' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_pubkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-274'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-275'/>
-    <typedef-decl name='gnutls_pubkey_t' type-id='type-id-275' id='type-id-273'/>
-    <typedef-decl name='gnutls_pcert_st' type-id='type-id-272' id='type-id-276'/>
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-165'/>
-    <class-decl name='gnutls_privkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
+    <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'/>
     <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-166'/>
-    <class-decl name='gnutls_ocsp_data_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-278'>
+    <class-decl name='gnutls_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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='version' type-id='type-id-2' visibility='default'/>
       </data-member>
@@ -1920,19 +1942,19 @@
         <var-decl name='exptime' type-id='type-id-25' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='padding' type-id='type-id-279' visibility='default'/>
+        <var-decl name='padding' type-id='type-id-280' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='256' id='type-id-279'>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='256' id='type-id-280'>
       <subrange length='32' type-id='type-id-44' id='type-id-57'/>
 
     </array-type-def>
-    <typedef-decl name='gnutls_ocsp_data_st' type-id='type-id-278' id='type-id-280'/>
-    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
-    <typedef-decl name='gnutls_status_request_ocsp_func' type-id='type-id-282' id='type-id-168'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-170' visibility='default' id='type-id-283'>
+    <typedef-decl name='gnutls_ocsp_data_st' type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dcookie' type-id='type-id-3' visibility='default'/>
       </data-member>
@@ -1964,35 +1986,35 @@
         <var-decl name='async_term' type-id='type-id-25' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='last_retransmit' type-id='type-id-172' visibility='default'/>
+        <var-decl name='last_retransmit' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='packets_dropped' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-172'>
+    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-173'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tv_sec' type-id='type-id-59' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_nsec' type-id='type-id-284' visibility='default'/>
+        <var-decl name='tv_nsec' type-id='type-id-285' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-58' id='type-id-284'/>
-    <typedef-decl name='dtls_st' type-id='type-id-283' id='type-id-170'/>
+    <typedef-decl name='__syscall_slong_t' type-id='type-id-58' id='type-id-285'/>
+    <typedef-decl name='dtls_st' type-id='type-id-284' id='type-id-171'/>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='288' id='type-id-171'>
-      <subrange length='36' type-id='type-id-44' id='type-id-285'/>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='288' id='type-id-172'>
+      <subrange length='36' type-id='type-id-44' id='type-id-286'/>
 
     </array-type-def>
-    <enum-decl name='heartbeat_state_t' id='type-id-286'>
+    <enum-decl name='heartbeat_state_t' id='type-id-287'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='SHB_SEND1' value='0'/>
       <enumerator name='SHB_SEND2' value='1'/>
       <enumerator name='SHB_RECV' value='2'/>
     </enum-decl>
-    <typedef-decl name='heartbeat_state_t' type-id='type-id-286' id='type-id-173'/>
-    <enum-decl name='recv_state_t' id='type-id-287'>
+    <typedef-decl name='heartbeat_state_t' type-id='type-id-287' id='type-id-174'/>
+    <enum-decl name='recv_state_t' id='type-id-288'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='RECV_STATE_0' value='0'/>
       <enumerator name='RECV_STATE_DTLS_RETRANSMIT' value='1'/>
@@ -2004,12 +2026,12 @@
       <enumerator name='RECV_STATE_REHANDSHAKE' value='7'/>
       <enumerator name='RECV_STATE_REAUTH' value='8'/>
     </enum-decl>
-    <typedef-decl name='recv_state_t' type-id='type-id-287' id='type-id-174'/>
-    <typedef-decl name='gnutls_certificate_verify_function' type-id='type-id-266' id='type-id-288'/>
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-175'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-177' visibility='default' id='type-id-289'>
+    <typedef-decl name='recv_state_t' type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-290' visibility='default'/>
+        <var-decl name='type' type-id='type-id-291' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-5' visibility='default'/>
@@ -2018,7 +2040,7 @@
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-291'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-292'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_DT_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DT_DNS_HOSTNAME' value='1'/>
@@ -2026,15 +2048,15 @@
       <enumerator name='GNUTLS_DT_RFC822NAME' value='3'/>
       <enumerator name='GNUTLS_DT_IP_ADDRESS' value='4'/>
     </enum-decl>
-    <typedef-decl name='gnutls_vdata_types_t' type-id='type-id-291' id='type-id-290'/>
-    <typedef-decl name='gnutls_typed_vdata_st' type-id='type-id-289' id='type-id-177'/>
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-176'/>
+    <typedef-decl name='gnutls_vdata_types_t' type-id='type-id-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'/>
 
-    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='1032' id='type-id-178'>
-      <subrange length='129' type-id='type-id-44' id='type-id-292'/>
+    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='1032' id='type-id-179'>
+      <subrange length='129' type-id='type-id-44' id='type-id-293'/>
 
     </array-type-def>
-    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-293'>
+    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fd' type-id='type-id-1' visibility='default'/>
       </data-member>
@@ -2045,42 +2067,42 @@
         <var-decl name='connect_only' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='connect_addr' type-id='type-id-294' visibility='default'/>
+        <var-decl name='connect_addr' type-id='type-id-295' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='connect_addrlen' type-id='type-id-295' visibility='default'/>
+        <var-decl name='connect_addrlen' type-id='type-id-296' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-294'>
+    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ss_family' type-id='type-id-296' visibility='default'/>
+        <var-decl name='ss_family' type-id='type-id-297' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__ss_padding' type-id='type-id-297' visibility='default'/>
+        <var-decl name='__ss_padding' type-id='type-id-298' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <var-decl name='__ss_align' type-id='type-id-44' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='sa_family_t' type-id='type-id-31' id='type-id-296'/>
+    <typedef-decl name='sa_family_t' type-id='type-id-31' id='type-id-297'/>
 
-    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='944' id='type-id-297'>
-      <subrange length='118' type-id='type-id-44' id='type-id-298'/>
+    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='944' id='type-id-298'>
+      <subrange length='118' type-id='type-id-44' id='type-id-299'/>
 
     </array-type-def>
-    <typedef-decl name='__socklen_t' type-id='type-id-2' id='type-id-299'/>
-    <typedef-decl name='socklen_t' type-id='type-id-299' id='type-id-295'/>
-    <typedef-decl name='tfo_st' type-id='type-id-293' id='type-id-179'/>
-    <class-decl name='gnutls_supplemental_entry_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-180'/>
-    <class-decl name='hello_ext_entry_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-301'/>
+    <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'/>
     <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-181'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-302'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priv' type-id='type-id-303' visibility='default'/>
+        <var-decl name='priv' type-id='type-id-304' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='resumed_priv' type-id='type-id-303' visibility='default'/>
+        <var-decl name='resumed_priv' type-id='type-id-304' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='set' type-id='type-id-24' visibility='default'/>
@@ -2089,13 +2111,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-303'/>
+    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-106' id='type-id-304'/>
 
-    <array-type-def dimensions='1' type-id='type-id-302' size-in-bits='6144' id='type-id-182'>
+    <array-type-def dimensions='1' type-id='type-id-303' size-in-bits='6144' id='type-id-183'>
       <subrange length='32' type-id='type-id-44' id='type-id-57'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-304'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-305'>
       <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'/>
@@ -2107,13 +2129,13 @@
       <enumerator name='GNUTLS_EXT_FLAG_TLS' value='128'/>
       <enumerator name='GNUTLS_EXT_FLAG_DTLS' value='256'/>
     </enum-decl>
-    <typedef-decl name='gnutls_ext_flags_t' type-id='type-id-304' id='type-id-183'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='3136' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-184' visibility='default' id='type-id-305'>
+    <typedef-decl name='gnutls_ext_flags_t' type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arrival_time' type-id='type-id-172' visibility='default'/>
+        <var-decl name='arrival_time' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='creation_time' type-id='type-id-172' visibility='default'/>
+        <var-decl name='creation_time' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='lifetime' type-id='type-id-26' visibility='default'/>
@@ -2122,7 +2144,7 @@
         <var-decl name='age_add' type-id='type-id-26' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='nonce' type-id='type-id-306' visibility='default'/>
+        <var-decl name='nonce' type-id='type-id-307' 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'/>
@@ -2138,24 +2160,24 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2040' id='type-id-306'>
-      <subrange length='255' type-id='type-id-44' id='type-id-307'/>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2040' id='type-id-307'>
+      <subrange length='255' type-id='type-id-44' id='type-id-308'/>
 
     </array-type-def>
-    <typedef-decl name='tls13_ticket_st' type-id='type-id-305' id='type-id-184'/>
-    <class-decl name='gnutls_anti_replay_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-309'/>
-    <typedef-decl name='gnutls_anti_replay_t' type-id='type-id-309' id='type-id-185'/>
-    <typedef-decl name='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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kshare' type-id='type-id-311' visibility='default'/>
+        <var-decl name='kshare' type-id='type-id-312' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='proto' type-id='type-id-312' visibility='default'/>
+        <var-decl name='proto' type-id='type-id-313' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='19776'>
-        <var-decl name='binders' type-id='type-id-313' visibility='default'/>
+        <var-decl name='binders' type-id='type-id-314' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20288'>
         <var-decl name='key' type-id='type-id-3' visibility='default'/>
@@ -2173,32 +2195,32 @@
         <var-decl name='auth_info' type-id='type-id-106' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22016'>
-        <var-decl name='auth_info_type' type-id='type-id-314' visibility='default'/>
+        <var-decl name='auth_info_type' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22048'>
         <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-315' visibility='default'/>
+        <var-decl name='cred' type-id='type-id-316' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22144'>
-        <var-decl name='totp' type-id='type-id-316' visibility='default'/>
+        <var-decl name='totp' type-id='type-id-317' 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='11328' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh_params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='ecdh_params' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='ecdhx_params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='ecdhx_params' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7552'>
-        <var-decl name='dh_params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-318' 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='3776' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-318' visibility='default' id='type-id-319'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-319' visibility='default'/>
+        <var-decl name='params' type-id='type-id-320' 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'/>
@@ -2216,7 +2238,7 @@
         <var-decl name='dh_group' type-id='type-id-63' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='gost_params' type-id='type-id-320' visibility='default'/>
+        <var-decl name='gost_params' type-id='type-id-321' 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'/>
@@ -2228,25 +2250,25 @@
         <var-decl name='seed_size' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='seed' type-id='type-id-321' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-322' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='palgo' type-id='type-id-215' visibility='default'/>
+        <var-decl name='palgo' type-id='type-id-216' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='spki' type-id='type-id-322' visibility='default'/>
+        <var-decl name='spki' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
         <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-106' id='type-id-324'/>
 
-    <array-type-def dimensions='1' type-id='type-id-323' size-in-bits='1024' id='type-id-319'>
+    <array-type-def dimensions='1' type-id='type-id-324' size-in-bits='1024' id='type-id-320'>
       <subrange length='16' type-id='type-id-44' id='type-id-98'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-324'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-325'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_TC26_Z' value='1'/>
@@ -2255,18 +2277,18 @@
       <enumerator name='GNUTLS_GOST_PARAMSET_CP_C' value='4'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_CP_D' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-324' id='type-id-320'/>
+    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-325' id='type-id-321'/>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2048' id='type-id-321'>
-      <subrange length='256' type-id='type-id-44' id='type-id-227'/>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2048' id='type-id-322'>
+      <subrange length='256' type-id='type-id-44' id='type-id-228'/>
 
     </array-type-def>
-    <class-decl name='gnutls_x509_spki_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-325'>
+    <class-decl name='gnutls_x509_spki_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-326'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk' type-id='type-id-67' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rsa_pss_dig' type-id='type-id-215' visibility='default'/>
+        <var-decl name='rsa_pss_dig' type-id='type-id-216' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='salt_size' type-id='type-id-2' visibility='default'/>
@@ -2275,17 +2297,17 @@
         <var-decl name='legacy' 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'>
+    <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'>
       <data-member access='private'>
-        <var-decl name='tls13' type-id='type-id-326' visibility='default'/>
+        <var-decl name='tls13' type-id='type-id-327' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-327' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-328' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-326'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-327'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='temp_secret' type-id='type-id-93' visibility='default'/>
       </data-member>
@@ -2314,69 +2336,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-327'>
+    <class-decl name='__anonymous_struct__' size-in-bits='8448' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-328'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh' type-id='type-id-328' visibility='default'/>
+        <var-decl name='ecdh' type-id='type-id-329' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='dh' type-id='type-id-329' visibility='default'/>
+        <var-decl name='dh' type-id='type-id-330' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7872'>
-        <var-decl name='srp' type-id='type-id-330' visibility='default'/>
+        <var-decl name='srp' type-id='type-id-331' 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='4032' 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'/>
+        <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-323' visibility='default'/>
+        <var-decl name='x' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='y' type-id='type-id-323' visibility='default'/>
+        <var-decl name='y' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <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='3840' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-330'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='params' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='client_Y' type-id='type-id-323' visibility='default'/>
+        <var-decl name='client_Y' type-id='type-id-324' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-330'>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-331'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='srp_key' type-id='type-id-323' visibility='default'/>
+        <var-decl name='srp_key' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='srp_g' type-id='type-id-323' visibility='default'/>
+        <var-decl name='srp_g' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='srp_p' type-id='type-id-323' visibility='default'/>
+        <var-decl name='srp_p' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='A' type-id='type-id-323' visibility='default'/>
+        <var-decl name='A' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='B' type-id='type-id-323' visibility='default'/>
+        <var-decl name='B' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='u' type-id='type-id-323' visibility='default'/>
+        <var-decl name='u' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='b' type-id='type-id-323' visibility='default'/>
+        <var-decl name='b' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-323' visibility='default'/>
+        <var-decl name='a' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='x' type-id='type-id-323' visibility='default'/>
+        <var-decl name='x' type-id='type-id-324' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-331'>
+    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-332'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='prf' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -2391,11 +2413,11 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-331' size-in-bits='512' id='type-id-313'>
+    <array-type-def dimensions='1' type-id='type-id-332' size-in-bits='512' id='type-id-314'>
       <subrange length='2' type-id='type-id-44' id='type-id-46'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-332'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-333'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_CRD_CERTIFICATE' value='1'/>
       <enumerator name='GNUTLS_CRD_ANON' value='2'/>
@@ -2403,21 +2425,21 @@
       <enumerator name='GNUTLS_CRD_PSK' value='4'/>
       <enumerator name='GNUTLS_CRD_IA' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_credentials_type_t' type-id='type-id-332' id='type-id-314'/>
-    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-333'>
+    <typedef-decl name='gnutls_credentials_type_t' type-id='type-id-333' id='type-id-315'/>
+    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-334'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='algorithm' type-id='type-id-314' visibility='default'/>
+        <var-decl name='algorithm' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='credentials' type-id='type-id-106' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next' type-id='type-id-315' visibility='default'/>
+        <var-decl name='next' type-id='type-id-316' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-315'/>
-    <typedef-decl name='auth_cred_st' type-id='type-id-333' id='type-id-334'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-316'>
+    <pointer-type-def type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='last_result' type-id='type-id-84' visibility='default'/>
       </data-member>
@@ -2425,22 +2447,22 @@
         <var-decl name='was_rotated' type-id='type-id-24' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cb' type-id='type-id-335' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-336' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-337'/>
-    <typedef-decl name='gnutls_stek_rotation_callback_t' type-id='type-id-337' id='type-id-335'/>
-    <typedef-decl name='gnutls_key_st' type-id='type-id-310' id='type-id-17'/>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-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'/>
     <function-decl name='dane_verify_session_crt' mangled-name='dane_verify_session_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_verify_session_crt@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
-      <parameter type-id='type-id-240' name='session'/>
+      <parameter type-id='type-id-241' name='session'/>
       <parameter type-id='type-id-34' name='hostname'/>
       <parameter type-id='type-id-34' name='proto'/>
       <parameter type-id='type-id-2' name='port'/>
       <parameter type-id='type-id-2' name='sflags'/>
       <parameter type-id='type-id-2' name='vflags'/>
-      <parameter type-id='type-id-338' name='verify'/>
+      <parameter type-id='type-id-339' 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'>
@@ -2453,38 +2475,38 @@
       <parameter type-id='type-id-2' name='port'/>
       <parameter type-id='type-id-2' name='sflags'/>
       <parameter type-id='type-id-2' name='vflags'/>
-      <parameter type-id='type-id-338' name='verify'/>
+      <parameter type-id='type-id-339' name='verify'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='dane_query_st' size-in-bits='22592' is-struct='yes' visibility='default' id='type-id-339'>
+    <class-decl name='dane_query_st' size-in-bits='22592' is-struct='yes' visibility='default' id='type-id-340'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='result' type-id='type-id-340' visibility='default'/>
+        <var-decl name='result' type-id='type-id-341' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data_entries' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='usage' type-id='type-id-341' visibility='default'/>
+        <var-decl name='usage' type-id='type-id-342' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3296'>
-        <var-decl name='type' type-id='type-id-342' visibility='default'/>
+        <var-decl name='type' type-id='type-id-343' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6496'>
-        <var-decl name='match' type-id='type-id-343' visibility='default'/>
+        <var-decl name='match' type-id='type-id-344' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='data' type-id='type-id-344' visibility='default'/>
+        <var-decl name='data' type-id='type-id-345' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22528'>
         <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22560'>
-        <var-decl name='status' type-id='type-id-345' visibility='default'/>
+        <var-decl name='status' type-id='type-id-346' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='ub_result' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-346'>
+    <class-decl name='ub_result' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='qname' type-id='type-id-347' visibility='default'/>
+        <var-decl name='qname' type-id='type-id-348' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='qtype' type-id='type-id-1' visibility='default'/>
@@ -2493,13 +2515,13 @@
         <var-decl name='qclass' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data' type-id='type-id-348' visibility='default'/>
+        <var-decl name='data' type-id='type-id-349' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='len' type-id='type-id-349' visibility='default'/>
+        <var-decl name='len' type-id='type-id-350' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='canonname' type-id='type-id-347' visibility='default'/>
+        <var-decl name='canonname' type-id='type-id-348' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='rcode' type-id='type-id-1' visibility='default'/>
@@ -2523,7 +2545,7 @@
         <var-decl name='bogus' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='why_bogus' type-id='type-id-347' visibility='default'/>
+        <var-decl name='why_bogus' type-id='type-id-348' 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'/>
@@ -2532,86 +2554,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-347'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-348'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-349'/>
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-340'/>
-    <enum-decl name='dane_cert_usage_t' id='type-id-350'>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-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'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='DANE_CERT_USAGE_CA' value='0'/>
       <enumerator name='DANE_CERT_USAGE_EE' value='1'/>
       <enumerator name='DANE_CERT_USAGE_LOCAL_CA' value='2'/>
       <enumerator name='DANE_CERT_USAGE_LOCAL_EE' value='3'/>
     </enum-decl>
-    <typedef-decl name='dane_cert_usage_t' type-id='type-id-350' id='type-id-351'/>
+    <typedef-decl name='dane_cert_usage_t' type-id='type-id-351' id='type-id-352'/>
 
-    <array-type-def dimensions='1' type-id='type-id-351' size-in-bits='3200' alignment-in-bits='32' id='type-id-341'>
-      <subrange length='100' type-id='type-id-44' id='type-id-352'/>
+    <array-type-def dimensions='1' type-id='type-id-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>
-    <enum-decl name='dane_cert_type_t' id='type-id-353'>
+    <enum-decl name='dane_cert_type_t' id='type-id-354'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='DANE_CERT_X509' value='0'/>
       <enumerator name='DANE_CERT_PK' value='1'/>
     </enum-decl>
-    <typedef-decl name='dane_cert_type_t' type-id='type-id-353' id='type-id-354'/>
+    <typedef-decl name='dane_cert_type_t' type-id='type-id-354' id='type-id-355'/>
 
-    <array-type-def dimensions='1' type-id='type-id-354' size-in-bits='3200' alignment-in-bits='32' id='type-id-342'>
-      <subrange length='100' type-id='type-id-44' id='type-id-352'/>
+    <array-type-def dimensions='1' type-id='type-id-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>
-    <enum-decl name='dane_match_type_t' id='type-id-355'>
+    <enum-decl name='dane_match_type_t' id='type-id-356'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='DANE_MATCH_EXACT' value='0'/>
       <enumerator name='DANE_MATCH_SHA2_256' value='1'/>
       <enumerator name='DANE_MATCH_SHA2_512' value='2'/>
     </enum-decl>
-    <typedef-decl name='dane_match_type_t' type-id='type-id-355' id='type-id-356'/>
+    <typedef-decl name='dane_match_type_t' type-id='type-id-356' id='type-id-357'/>
 
-    <array-type-def dimensions='1' type-id='type-id-356' size-in-bits='3200' alignment-in-bits='32' id='type-id-343'>
-      <subrange length='100' type-id='type-id-44' id='type-id-352'/>
+    <array-type-def dimensions='1' type-id='type-id-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>
 
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='12800' id='type-id-344'>
-      <subrange length='100' type-id='type-id-44' id='type-id-352'/>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='12800' id='type-id-345'>
+      <subrange length='100' type-id='type-id-44' id='type-id-353'/>
 
     </array-type-def>
-    <enum-decl name='dane_query_status_t' id='type-id-357'>
+    <enum-decl name='dane_query_status_t' id='type-id-358'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='DANE_QUERY_UNKNOWN' value='0'/>
       <enumerator name='DANE_QUERY_DNSSEC_VERIFIED' value='1'/>
       <enumerator name='DANE_QUERY_BOGUS' value='2'/>
       <enumerator name='DANE_QUERY_NO_DNSSEC' value='3'/>
     </enum-decl>
-    <typedef-decl name='dane_query_status_t' type-id='type-id-357' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-358'/>
-    <typedef-decl name='dane_query_t' type-id='type-id-358' id='type-id-359'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
+    <typedef-decl name='dane_query_status_t' type-id='type-id-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'/>
     <function-decl name='dane_query_tlsa' mangled-name='dane_query_tlsa' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_tlsa@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
-      <parameter type-id='type-id-360' name='r'/>
+      <parameter type-id='type-id-361' name='r'/>
       <parameter type-id='type-id-34' name='host'/>
       <parameter type-id='type-id-34' name='proto'/>
       <parameter type-id='type-id-2' name='port'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-347' const='yes' id='type-id-361'/>
-    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-363'/>
-    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
+    <qualified-type-def type-id='type-id-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'/>
     <function-decl name='dane_raw_tlsa' mangled-name='dane_raw_tlsa' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_raw_tlsa@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
-      <parameter type-id='type-id-360' name='r'/>
-      <parameter type-id='type-id-362' name='dane_data'/>
-      <parameter type-id='type-id-364' name='dane_data_len'/>
+      <parameter type-id='type-id-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-1' name='secure'/>
       <parameter type-id='type-id-1' name='bogus'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='dane_query_deinit' mangled-name='dane_query_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_deinit@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
-      <return type-id='type-id-115'/>
+      <parameter type-id='type-id-360' name='q'/>
+      <return type-id='type-id-116'/>
     </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'/>
@@ -2620,208 +2642,208 @@
     </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-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-366'/>
     <function-decl name='dane_state_init' mangled-name='dane_state_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_state_init@@DANE_0_0'>
-      <parameter type-id='type-id-365' name='s'/>
+      <parameter type-id='type-id-366' 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-359' name='q'/>
-      <parameter type-id='type-id-338' name='data_entries'/>
-      <parameter type-id='type-id-366' name='dane_data'/>
-      <parameter type-id='type-id-367' name='dane_data_len'/>
-      <parameter type-id='type-id-349' name='secure'/>
-      <parameter type-id='type-id-349' name='bogus'/>
+      <parameter type-id='type-id-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'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='dane_query_data' mangled-name='dane_query_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_data@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
+      <parameter type-id='type-id-360' name='q'/>
       <parameter type-id='type-id-2' name='idx'/>
-      <parameter type-id='type-id-338' name='usage'/>
-      <parameter type-id='type-id-338' name='type'/>
-      <parameter type-id='type-id-338' name='match'/>
+      <parameter type-id='type-id-339' name='usage'/>
+      <parameter type-id='type-id-339' name='type'/>
+      <parameter type-id='type-id-339' name='match'/>
       <parameter type-id='type-id-7' name='data'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='dane_query_entries' mangled-name='dane_query_entries' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_entries@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
+      <parameter type-id='type-id-360' name='q'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='dane_query_status' mangled-name='dane_query_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_status@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
-      <return type-id='type-id-345'/>
+      <parameter type-id='type-id-360' name='q'/>
+      <return type-id='type-id-346'/>
     </function-decl>
     <function-decl name='dane_verify_crt_raw' mangled-name='dane_verify_crt_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_verify_crt_raw@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
       <parameter type-id='type-id-64' name='chain'/>
       <parameter type-id='type-id-2' name='chain_size'/>
       <parameter type-id='type-id-27' name='chain_type'/>
-      <parameter type-id='type-id-359' name='r'/>
+      <parameter type-id='type-id-360' name='r'/>
       <parameter type-id='type-id-2' name='sflags'/>
       <parameter type-id='type-id-2' name='vflags'/>
-      <parameter type-id='type-id-338' name='verify'/>
+      <parameter type-id='type-id-339' 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-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='dcgettext' mangled-name='dcgettext' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_init' mangled-name='gnutls_x509_crt_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_export2' mangled-name='gnutls_x509_crt_export2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='free' mangled-name='free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='snprintf' mangled-name='snprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='ub_resolve' mangled-name='ub_resolve' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='calloc' mangled-name='calloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='__builtin_memcmp' mangled-name='memcmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </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-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-266'>
-      <parameter type-id='type-id-240'/>
+    <function-type size-in-bits='64' id='type-id-267'>
+      <parameter type-id='type-id-241'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-242'>
-      <parameter type-id='type-id-240'/>
+    <function-type size-in-bits='64' id='type-id-243'>
       <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-243'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-195'/>
+    <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'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-268'>
-      <parameter type-id='type-id-240'/>
+    <function-type size-in-bits='64' id='type-id-269'>
+      <parameter type-id='type-id-241'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-64'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-281'>
-      <parameter type-id='type-id-240'/>
+    <function-type size-in-bits='64' id='type-id-282'>
+      <parameter type-id='type-id-241'/>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-7'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-258'>
-      <parameter type-id='type-id-158'/>
+    <function-type size-in-bits='64' id='type-id-259'>
+      <parameter type-id='type-id-159'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-246'>
-      <parameter type-id='type-id-158'/>
+    <function-type size-in-bits='64' id='type-id-247'>
+      <parameter type-id='type-id-159'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-264'>
+    <function-type size-in-bits='64' id='type-id-265'>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-260'>
+    <function-type size-in-bits='64' id='type-id-261'>
       <parameter type-id='type-id-106'/>
       <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'>
+    <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'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-116'>
+    <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'/>
@@ -2829,7 +2851,7 @@
       <parameter type-id='type-id-104'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-118'>
+    <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'/>
@@ -2842,106 +2864,106 @@
       <parameter type-id='type-id-104'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-262'>
+    <function-type size-in-bits='64' id='type-id-263'>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-256'>
-      <parameter type-id='type-id-158'/>
-      <parameter type-id='type-id-255'/>
+    <function-type size-in-bits='64' id='type-id-257'>
+      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-256'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-249'/>
+      <return type-id='type-id-250'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-250'>
-      <parameter type-id='type-id-158'/>
+    <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-249'/>
+      <return type-id='type-id-250'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-336'>
+    <function-type size-in-bits='64' id='type-id-337'>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-84'/>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-124'>
+    <function-type size-in-bits='64' id='type-id-125'>
       <parameter type-id='type-id-106'/>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-122'>
+    <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-115'/>
+      <return type-id='type-id-116'/>
     </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-mine/libdane' language='LANG_C99'>
     <function-decl name='dane_cert_usage_name' mangled-name='dane_cert_usage_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_cert_usage_name@@DANE_0_0'>
-      <parameter type-id='type-id-351' name='usage'/>
+      <parameter type-id='type-id-352' name='usage'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='dane_match_type_name' mangled-name='dane_match_type_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_match_type_name@@DANE_0_0'>
-      <parameter type-id='type-id-356' name='type'/>
+      <parameter type-id='type-id-357' name='type'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='dane_cert_type_name' mangled-name='dane_cert_type_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_cert_type_name@@DANE_0_0'>
-      <parameter type-id='type-id-354' name='type'/>
+      <parameter type-id='type-id-355' 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-nmav/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/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-mine/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'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='__errno_location' mangled-name='__errno_location' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='fclose' mangled-name='fclose' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='ftello' mangled-name='ftello' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='__fxstat' mangled-name='__fxstat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='fileno' mangled-name='fileno' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='realloc' mangled-name='realloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='fread' mangled-name='fread' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='ferror' mangled-name='ferror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='malloc' mangled-name='malloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </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-mine/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'/>
+      <return type-id='type-id-116'/>
     </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-mine/gl' language='LANG_C99'>
     <function-decl name='abort' mangled-name='abort' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='printf_parse' mangled-name='printf_parse' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
     <function-decl name='printf_fetchargs' mangled-name='printf_fetchargs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
+      <return type-id='type-id-116'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/devel/libgnutls-latest-x86_64.abi b/devel/libgnutls-latest-x86_64.abi
index c431eba9b9..17e8d40663 100644
--- a/devel/libgnutls-latest-x86_64.abi
+++ b/devel/libgnutls-latest-x86_64.abi
@@ -25,9 +25,11 @@
     <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_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_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'/>
@@ -49,8 +51,10 @@
     <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'/>
@@ -262,6 +266,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'/>
@@ -287,6 +292,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'/>
@@ -304,6 +310,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'/>
@@ -1241,6 +1248,7 @@
   </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'/>
@@ -1282,11 +1290,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-mine/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='52416' 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>
@@ -1296,7 +1304,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>
@@ -1349,13 +1357,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'>
@@ -1532,6 +1546,9 @@
       <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'/>
     </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'>
@@ -1611,7 +1628,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>
@@ -1622,18 +1639,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>
@@ -1827,7 +1847,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='5376' 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>
@@ -1855,10 +1875,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='2880'>
         <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='5312'>
         <var-decl name='usage_cnt' type-id='type-id-22' visibility='default'/>
       </data-member>
     </class-decl>
@@ -1912,7 +1932,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='2432' 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>
@@ -1934,13 +1954,13 @@
       <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='2304'>
         <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='2336'>
         <var-decl name='is_aead' type-id='type-id-10' 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='sequence_number' type-id='type-id-92' visibility='default'/>
       </data-member>
     </class-decl>
@@ -1954,7 +1974,7 @@
       <subrange length='16' type-id='type-id-38' id='type-id-94'/>
 
     </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='1280' is-anonymous='yes' visibility='default' id='type-id-91'>
       <data-member access='private'>
         <var-decl name='tls12' type-id='type-id-95' visibility='default'/>
       </data-member>
@@ -1962,11 +1982,11 @@
         <var-decl name='aead' type-id='type-id-96' 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='1280' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-95' visibility='default' id='type-id-97'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cipher' type-id='type-id-98' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
+      <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='mac' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
@@ -1978,11 +1998,11 @@
       <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='etm' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
+      <data-member access='public' layout-offset-in-bits='1216'>
         <var-decl name='tag_size' type-id='type-id-100' 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-98' visibility='default' id='type-id-101'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='handle' type-id='type-id-102' visibility='default'/>
       </data-member>
@@ -2011,46 +2031,50 @@
         <var-decl name='setiv' type-id='type-id-109' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='deinit' type-id='type-id-110' visibility='default'/>
+        <var-decl name='getiv' type-id='type-id-110' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='deinit' type-id='type-id-111' 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'/>
+    <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-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'/>
-    <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'/>
-    <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'/>
-    <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'/>
-    <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'/>
+    <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'>
       <data-member access='private'>
-        <var-decl name='dig' type-id='type-id-122' visibility='default'/>
+        <var-decl name='dig' type-id='type-id-123' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='mac' type-id='type-id-123' visibility='default'/>
+        <var-decl name='mac' type-id='type-id-124' 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='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-123' visibility='default' id='type-id-125'>
       <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-125' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-126' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='output' type-id='type-id-126' visibility='default'/>
+        <var-decl name='output' type-id='type-id-127' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='deinit' type-id='type-id-127' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-128' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='key' type-id='type-id-102' visibility='default'/>
@@ -2062,11 +2086,11 @@
         <var-decl name='handle' type-id='type-id-102' 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'/>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-13' visibility='default'/>
       </data-member>
@@ -2074,52 +2098,52 @@
         <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-125' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-126' 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-130' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='output' type-id='type-id-126' visibility='default'/>
+        <var-decl name='output' type-id='type-id-127' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit' type-id='type-id-127' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-128' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='handle' type-id='type-id-102' 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='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='640' is-struct='yes' visibility='default' id='type-id-130'>
+    <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>
     </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='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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='i' type-id='type-id-132' visibility='default'/>
+        <var-decl name='i' type-id='type-id-133' 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 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-131' id='type-id-92'/>
+    <typedef-decl name='gnutls_uint64' type-id='type-id-132' id='type-id-92'/>
     <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'/>
+    <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'/>
 
-    <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 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>
-    <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-138'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='record_buffer' type-id='type-id-138' visibility='default'/>
+        <var-decl name='record_buffer' type-id='type-id-139' 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'/>
@@ -2137,25 +2161,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-139' visibility='default'/>
+        <var-decl name='handshake_hash_buffer' type-id='type-id-140' 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-140' visibility='default'/>
+        <var-decl name='ticket_state' type-id='type-id-141' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bye_state' type-id='type-id-141' visibility='default'/>
+        <var-decl name='bye_state' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='reauth_state' type-id='type-id-142' visibility='default'/>
+        <var-decl name='reauth_state' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='handshake_final_state' type-id='type-id-143' visibility='default'/>
+        <var-decl name='handshake_final_state' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='handshake_state' type-id='type-id-143' visibility='default'/>
+        <var-decl name='handshake_state' type-id='type-id-144' 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'/>
@@ -2179,33 +2203,36 @@
         <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-144' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-145' 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'/>
       </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'>
@@ -2215,49 +2242,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-138' visibility='default'/>
+        <var-decl name='handshake_send_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='handshake_header_recv_buffer' type-id='type-id-138' visibility='default'/>
+        <var-decl name='handshake_header_recv_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='handshake_recv_buffer' type-id='type-id-145' visibility='default'/>
+        <var-decl name='handshake_recv_buffer' type-id='type-id-146' 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-138' visibility='default'/>
+        <var-decl name='record_recv_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='record_send_buffer' type-id='type-id-138' visibility='default'/>
+        <var-decl name='record_send_buffer' type-id='type-id-139' 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'/>
       </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'/>
+        <var-decl name='early_data_recv_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='early_data_presend_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='early_data_presend_buffer' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
-        <var-decl name='rsend_state' type-id='type-id-146' visibility='default'/>
+        <var-decl name='rsend_state' type-id='type-id-147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
-        <var-decl name='record_key_update_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_key_update_buffer' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8832'>
-        <var-decl name='record_presend_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_presend_buffer' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9088'>
-        <var-decl name='reauth_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='reauth_buffer' type-id='type-id-140' 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-147' visibility='default'/>
+        <var-decl name='auth_struct' type-id='type-id-148' 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'/>
@@ -2266,73 +2293,73 @@
         <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-148' visibility='default'/>
+        <var-decl name='send_cert_req' type-id='type-id-149' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
-        <var-decl name='pull_timeout_func' type-id='type-id-149' visibility='default'/>
+        <var-decl name='pull_timeout_func' type-id='type-id-150' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
-        <var-decl name='pull_func' type-id='type-id-150' visibility='default'/>
+        <var-decl name='pull_func' type-id='type-id-151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='push_func' type-id='type-id-151' visibility='default'/>
+        <var-decl name='push_func' type-id='type-id-152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9792'>
-        <var-decl name='vec_push_func' type-id='type-id-152' visibility='default'/>
+        <var-decl name='vec_push_func' type-id='type-id-153' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9856'>
-        <var-decl name='errno_func' type-id='type-id-153' visibility='default'/>
+        <var-decl name='errno_func' type-id='type-id-154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9920'>
-        <var-decl name='transport_recv_ptr' type-id='type-id-154' visibility='default'/>
+        <var-decl name='transport_recv_ptr' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
-        <var-decl name='transport_send_ptr' type-id='type-id-154' visibility='default'/>
+        <var-decl name='transport_send_ptr' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
-        <var-decl name='db_store_func' type-id='type-id-155' visibility='default'/>
+        <var-decl name='db_store_func' type-id='type-id-156' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
-        <var-decl name='db_retrieve_func' type-id='type-id-156' visibility='default'/>
+        <var-decl name='db_retrieve_func' type-id='type-id-157' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='db_remove_func' type-id='type-id-157' visibility='default'/>
+        <var-decl name='db_remove_func' type-id='type-id-158' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='user_hello_func' type-id='type-id-158' visibility='default'/>
+        <var-decl name='user_hello_func' type-id='type-id-159' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10368'>
-        <var-decl name='h_hook' type-id='type-id-159' visibility='default'/>
+        <var-decl name='h_hook' type-id='type-id-160' 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-160' visibility='default'/>
+        <var-decl name='h_post' type-id='type-id-161' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
-        <var-decl name='selected_cert_list' type-id='type-id-161' visibility='default'/>
+        <var-decl name='selected_cert_list' type-id='type-id-162' 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-162' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-163' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-163' visibility='default'/>
+        <var-decl name='selected_ocsp' type-id='type-id-164' 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-164' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
         <var-decl name='selected_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
@@ -2341,10 +2368,10 @@
         <var-decl name='selected_need_free' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10952'>
-        <var-decl name='default_record_version' type-id='type-id-165' visibility='default'/>
+        <var-decl name='default_record_version' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-165' visibility='default'/>
+        <var-decl name='default_hello_version' type-id='type-id-166' 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'/>
@@ -2356,7 +2383,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-165' visibility='default'/>
+        <var-decl name='rsa_pms_version' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11104'>
         <var-decl name='errnum' type-id='type-id-22' visibility='default'/>
@@ -2371,7 +2398,7 @@
         <var-decl name='transport' type-id='type-id-74' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='dtls' type-id='type-id-166' visibility='default'/>
+        <var-decl name='dtls' type-id='type-id-167' 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'/>
@@ -2386,13 +2413,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-167' visibility='default'/>
+        <var-decl name='cb_tls_unique' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-168' visibility='default'/>
+        <var-decl name='handshake_start_time' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-168' visibility='default'/>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12544'>
         <var-decl name='ertt' type-id='type-id-10' visibility='default'/>
@@ -2407,147 +2434,150 @@
         <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-139' visibility='default'/>
+        <var-decl name='post_handshake_hash_buffer' type-id='type-id-140' 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-17' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13184'>
-        <var-decl name='full_client_hello' type-id='type-id-139' visibility='default'/>
+      <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='13440'>
-        <var-decl name='extensions_offset' type-id='type-id-22' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13312'>
+        <var-decl name='full_client_hello' type-id='type-id-140' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13504'>
-        <var-decl name='hb_local_data' type-id='type-id-139' visibility='default'/>
+      <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='13760'>
-        <var-decl name='hb_remote_data' type-id='type-id-139' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13632'>
+        <var-decl name='hb_local_data' type-id='type-id-140' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14016'>
-        <var-decl name='hb_ping_start' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13888'>
+        <var-decl name='hb_remote_data' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14144'>
-        <var-decl name='hb_ping_sent' type-id='type-id-168' visibility='default'/>
+        <var-decl name='hb_ping_start' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14272'>
+        <var-decl name='hb_ping_sent' type-id='type-id-169' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='14400'>
         <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='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'>
-        <var-decl name='hb_state' type-id='type-id-169' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14528'>
+        <var-decl name='hb_state' type-id='type-id-170' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
-        <var-decl name='recv_state' type-id='type-id-170' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14560'>
+        <var-decl name='recv_state' type-id='type-id-171' 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'>
-        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14720'>
+        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14656'>
-        <var-decl name='vc_data' type-id='type-id-172' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14784'>
+        <var-decl name='vc_data' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='vc_sdata' type-id='type-id-173' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14848'>
+        <var-decl name='vc_sdata' type-id='type-id-174' 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'>
-        <var-decl name='saved_username' type-id='type-id-174' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='15400'>
+        <var-decl name='saved_username' type-id='type-id-175' 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'>
-        <var-decl name='tfo' type-id='type-id-175' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='16448'>
+        <var-decl name='tfo' type-id='type-id-176' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17536'>
-        <var-decl name='rsup' type-id='type-id-176' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17664'>
+        <var-decl name='rsup' type-id='type-id-177' 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'>
-        <var-decl name='rexts' type-id='type-id-177' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17792'>
+        <var-decl name='rexts' type-id='type-id-178' 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'>
-        <var-decl name='ext_data' type-id='type-id-178' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17920'>
+        <var-decl name='ext_data' type-id='type-id-179' 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'>
-        <var-decl name='ext_msg' type-id='type-id-179' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24096'>
+        <var-decl name='ext_msg' type-id='type-id-180' 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'>
-        <var-decl name='hrr_cs' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24384'>
+        <var-decl name='hrr_cs' type-id='type-id-166' 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'>
-        <var-decl name='tls13_ticket' type-id='type-id-180' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24448'>
+        <var-decl name='tls13_ticket' type-id='type-id-181' 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'>
-        <var-decl name='anti_replay' type-id='type-id-181' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='27648'>
+        <var-decl name='anti_replay' type-id='type-id-182' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
+      <data-member access='public' layout-offset-in-bits='27712'>
         <var-decl name='epoch_lock' type-id='type-id-102' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-182'>
+    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-183'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-183' visibility='default'/>
+        <var-decl name='head' type-id='type-id-184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-183' visibility='default'/>
+        <var-decl name='tail' type-id='type-id-184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='length' type-id='type-id-10' visibility='default'/>
@@ -2556,12 +2586,12 @@
         <var-decl name='byte_length' type-id='type-id-100' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-184'>
+    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-185'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-183' visibility='default'/>
+        <var-decl name='next' type-id='type-id-184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-183' visibility='default'/>
+        <var-decl name='prev' type-id='type-id-184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='mark' type-id='type-id-100' visibility='default'/>
@@ -2576,7 +2606,7 @@
         <var-decl name='uhead_mark' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='type' type-id='type-id-185' visibility='default'/>
+        <var-decl name='type' type-id='type-id-186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='record_sequence' type-id='type-id-92' visibility='default'/>
@@ -2585,14 +2615,14 @@
         <var-decl name='epoch' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='htype' type-id='type-id-186' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='handshake_sequence' type-id='type-id-11' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-183'/>
-    <enum-decl name='content_type_t' id='type-id-187'>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-184'/>
+    <enum-decl name='content_type_t' id='type-id-188'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CHANGE_CIPHER_SPEC' value='20'/>
       <enumerator name='GNUTLS_ALERT' value='21'/>
@@ -2600,8 +2630,8 @@
       <enumerator name='GNUTLS_APPLICATION_DATA' value='23'/>
       <enumerator name='GNUTLS_HEARTBEAT' value='24'/>
     </enum-decl>
-    <typedef-decl name='content_type_t' type-id='type-id-187' id='type-id-185'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-188'>
+    <typedef-decl name='content_type_t' type-id='type-id-188' id='type-id-186'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-189'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_REQUEST' value='0'/>
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO' value='1'/>
@@ -2624,15 +2654,15 @@
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO_V2' value='1024'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_RETRY_REQUEST' value='1025'/>
     </enum-decl>
-    <typedef-decl name='gnutls_handshake_description_t' type-id='type-id-188' id='type-id-186'/>
-    <typedef-decl name='mbuffer_st' type-id='type-id-184' id='type-id-189'/>
-    <typedef-decl name='mbuffer_head_st' type-id='type-id-182' id='type-id-138'/>
-    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-190'>
+    <typedef-decl name='gnutls_handshake_description_t' type-id='type-id-189' id='type-id-187'/>
+    <typedef-decl name='mbuffer_st' type-id='type-id-185' id='type-id-190'/>
+    <typedef-decl name='mbuffer_head_st' type-id='type-id-183' id='type-id-139'/>
+    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-191'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='allocd' type-id='type-id-191' visibility='default'/>
+        <var-decl name='allocd' type-id='type-id-192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-191' visibility='default'/>
+        <var-decl name='data' type-id='type-id-192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='max_length' type-id='type-id-100' visibility='default'/>
@@ -2641,22 +2671,22 @@
         <var-decl name='length' type-id='type-id-100' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-191'/>
-    <typedef-decl name='gnutls_buffer_st' type-id='type-id-190' id='type-id-139'/>
-    <enum-decl name='send_ticket_state_t' id='type-id-192'>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-192'/>
+    <typedef-decl name='gnutls_buffer_st' type-id='type-id-191' id='type-id-140'/>
+    <enum-decl name='send_ticket_state_t' id='type-id-193'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='TICKET_STATE0' value='0'/>
       <enumerator name='TICKET_STATE1' value='1'/>
     </enum-decl>
-    <typedef-decl name='send_ticket_state_t' type-id='type-id-192' id='type-id-140'/>
-    <enum-decl name='bye_state_t' id='type-id-193'>
+    <typedef-decl name='send_ticket_state_t' type-id='type-id-193' id='type-id-141'/>
+    <enum-decl name='bye_state_t' id='type-id-194'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='BYE_STATE0' value='0'/>
       <enumerator name='BYE_STATE1' value='1'/>
       <enumerator name='BYE_STATE2' value='2'/>
     </enum-decl>
-    <typedef-decl name='bye_state_t' type-id='type-id-193' id='type-id-141'/>
-    <enum-decl name='reauth_state_t' id='type-id-194'>
+    <typedef-decl name='bye_state_t' type-id='type-id-194' id='type-id-142'/>
+    <enum-decl name='reauth_state_t' id='type-id-195'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='REAUTH_STATE0' value='0'/>
       <enumerator name='REAUTH_STATE1' value='1'/>
@@ -2665,8 +2695,8 @@
       <enumerator name='REAUTH_STATE4' value='4'/>
       <enumerator name='REAUTH_STATE5' value='5'/>
     </enum-decl>
-    <typedef-decl name='reauth_state_t' type-id='type-id-194' id='type-id-142'/>
-    <enum-decl name='handshake_state_t' id='type-id-195'>
+    <typedef-decl name='reauth_state_t' type-id='type-id-195' id='type-id-143'/>
+    <enum-decl name='handshake_state_t' id='type-id-196'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='STATE0' value='0'/>
       <enumerator name='STATE1' value='1'/>
@@ -2720,46 +2750,46 @@
       <enumerator name='STATE115' value='115'/>
       <enumerator name='STATE150' value='116'/>
     </enum-decl>
-    <typedef-decl name='handshake_state_t' type-id='type-id-195' id='type-id-143'/>
-    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-196'>
+    <typedef-decl name='handshake_state_t' type-id='type-id-196' id='type-id-144'/>
+    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-197'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='protocol' type-id='type-id-197' visibility='default'/>
+        <var-decl name='protocol' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='client_ctype' type-id='type-id-197' visibility='default'/>
+        <var-decl name='client_ctype' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='server_ctype' type-id='type-id-197' visibility='default'/>
+        <var-decl name='server_ctype' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='_cipher' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_cipher' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='_mac' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_mac' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10400'>
-        <var-decl name='_kx' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_kx' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12480'>
-        <var-decl name='_sign_algo' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_sign_algo' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='_supported_ecc' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_supported_ecc' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16640'>
-        <var-decl name='groups' type-id='type-id-198' visibility='default'/>
+        <var-decl name='groups' type-id='type-id-199' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20800'>
-        <var-decl name='sigalg' type-id='type-id-199' visibility='default'/>
+        <var-decl name='sigalg' type-id='type-id-200' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24960'>
-        <var-decl name='cs' type-id='type-id-200' visibility='default'/>
+        <var-decl name='cs' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41408'>
         <var-decl name='no_extensions' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41440'>
-        <var-decl name='sr' type-id='type-id-201' visibility='default'/>
+        <var-decl name='sr' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41472'>
         <var-decl name='min_record_version' type-id='type-id-75' visibility='default'/>
@@ -2789,50 +2819,53 @@
         <var-decl name='fallback' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41600'>
-        <var-decl name='level' type-id='type-id-202' visibility='default'/>
+        <var-decl name='level' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41632'>
         <var-decl name='_allow_large_records' type-id='type-id-75' visibility='default'/>
       </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'>
         <var-decl name='_dh_prime_bits' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41728'>
-        <var-decl name='usage_cnt' type-id='type-id-203' visibility='default'/>
+        <var-decl name='usage_cnt' type-id='type-id-204' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='2080' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-197' visibility='default' id='type-id-204'>
+    <class-decl name='__anonymous_struct__' size-in-bits='2080' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-198' visibility='default' id='type-id-205'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priorities' type-id='type-id-205' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-206' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
         <var-decl name='num_priorities' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-205'>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-206'>
       <subrange length='64' type-id='type-id-38' id='type-id-93'/>
 
     </array-type-def>
-    <typedef-decl name='priority_st' type-id='type-id-204' id='type-id-197'/>
-    <class-decl name='group_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-206'>
+    <typedef-decl name='priority_st' type-id='type-id-205' id='type-id-198'/>
+    <class-decl name='group_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-207'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-207' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-208' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
@@ -2842,20 +2875,20 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='4096' id='type-id-207'>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='4096' id='type-id-208'>
       <subrange length='64' type-id='type-id-38' id='type-id-93'/>
 
     </array-type-def>
-    <typedef-decl name='group_list_st' type-id='type-id-206' id='type-id-198'/>
-    <class-decl name='sign_algo_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-208'>
+    <typedef-decl name='group_list_st' type-id='type-id-207' id='type-id-199'/>
+    <class-decl name='sign_algo_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-209'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-209' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-210' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-210'>
+    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -2869,7 +2902,7 @@
         <var-decl name='pk' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='hash' type-id='type-id-211' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='priv_pk' type-id='type-id-60' visibility='default'/>
@@ -2884,13 +2917,13 @@
         <var-decl name='curve' type-id='type-id-59' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='aid' type-id='type-id-212' visibility='default'/>
+        <var-decl name='aid' type-id='type-id-213' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='slevel' type-id='type-id-213' visibility='default'/>
+        <var-decl name='slevel' type-id='type-id-214' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-214'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-215'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_DIG_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DIG_NULL' value='1'/>
@@ -2911,61 +2944,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-214' id='type-id-211'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='24' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-215' visibility='default' id='type-id-216'>
+    <typedef-decl name='gnutls_digest_algorithm_t' type-id='type-id-215' id='type-id-212'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='24' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-216' visibility='default' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='id' type-id='type-id-165' visibility='default'/>
+        <var-decl name='id' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='tls_sem' type-id='type-id-16' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='16' id='type-id-165'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='16' id='type-id-166'>
       <subrange length='2' type-id='type-id-38' id='type-id-40'/>
 
     </array-type-def>
-    <typedef-decl name='sign_algorithm_st' type-id='type-id-216' id='type-id-215'/>
-    <qualified-type-def type-id='type-id-215' const='yes' id='type-id-212'/>
-    <enum-decl name='hash_security_level_t' id='type-id-217'>
+    <typedef-decl name='sign_algorithm_st' type-id='type-id-217' id='type-id-216'/>
+    <qualified-type-def type-id='type-id-216' const='yes' id='type-id-213'/>
+    <enum-decl name='hash_security_level_t' id='type-id-218'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='_SECURE' value='0'/>
       <enumerator name='_INSECURE_FOR_CERTS' value='1'/>
       <enumerator name='_INSECURE' value='2'/>
     </enum-decl>
-    <typedef-decl name='hash_security_level_t' type-id='type-id-217' id='type-id-213'/>
-    <qualified-type-def type-id='type-id-210' const='yes' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-219'/>
+    <typedef-decl name='hash_security_level_t' type-id='type-id-218' id='type-id-214'/>
+    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-219'/>
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
 
-    <array-type-def dimensions='1' type-id='type-id-219' size-in-bits='4096' id='type-id-209'>
+    <array-type-def dimensions='1' type-id='type-id-220' size-in-bits='4096' id='type-id-210'>
       <subrange length='64' type-id='type-id-38' id='type-id-93'/>
 
     </array-type-def>
-    <typedef-decl name='sign_algo_list_st' type-id='type-id-208' id='type-id-199'/>
-    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-220'>
+    <typedef-decl name='sign_algo_list_st' type-id='type-id-209' id='type-id-200'/>
+    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-221' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-222' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16384'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-26' id='type-id-222'/>
+    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-26' id='type-id-223'/>
 
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='16384' id='type-id-221'>
-      <subrange length='256' type-id='type-id-38' id='type-id-223'/>
+    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='16384' id='type-id-222'>
+      <subrange length='256' type-id='type-id-38' id='type-id-224'/>
 
     </array-type-def>
-    <typedef-decl name='ciphersuite_list_st' type-id='type-id-220' id='type-id-200'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-224'>
+    <typedef-decl name='ciphersuite_list_st' type-id='type-id-221' id='type-id-201'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-225'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='SR_DISABLED' value='0'/>
       <enumerator name='SR_UNSAFE' value='1'/>
       <enumerator name='SR_PARTIAL' value='2'/>
       <enumerator name='SR_SAFE' value='3'/>
     </enum-decl>
-    <typedef-decl name='safe_renegotiation_t' type-id='type-id-224' id='type-id-201'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-225'>
+    <typedef-decl name='safe_renegotiation_t' type-id='type-id-225' id='type-id-202'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-226'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SEC_PARAM_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_SEC_PARAM_INSECURE' value='5'/>
@@ -2980,15 +3013,15 @@
       <enumerator name='GNUTLS_SEC_PARAM_FUTURE' value='50'/>
       <enumerator name='GNUTLS_SEC_PARAM_MAX' value='50'/>
     </enum-decl>
-    <typedef-decl name='gnutls_sec_param_t' type-id='type-id-225' id='type-id-202'/>
-    <type-decl name='atomic_uint' size-in-bits='32' id='type-id-203'/>
-    <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-144'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-226' visibility='default' id='type-id-227'>
+    <typedef-decl name='gnutls_sec_param_t' type-id='type-id-226' id='type-id-203'/>
+    <type-decl name='atomic_uint' size-in-bits='32' id='type-id-204'/>
+    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='htype' type-id='type-id-186' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rtype' type-id='type-id-186' visibility='default'/>
+        <var-decl name='rtype' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='length' type-id='type-id-18' visibility='default'/>
@@ -3003,27 +3036,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-228' visibility='default'/>
+        <var-decl name='header' type-id='type-id-229' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='header_size' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='data' type-id='type-id-139' visibility='default'/>
+        <var-decl name='data' type-id='type-id-140' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='96' id='type-id-228'>
-      <subrange length='12' type-id='type-id-38' id='type-id-229'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='96' id='type-id-229'>
+      <subrange length='12' type-id='type-id-38' id='type-id-230'/>
 
     </array-type-def>
-    <typedef-decl name='handshake_buffer_st' type-id='type-id-227' id='type-id-226'/>
+    <typedef-decl name='handshake_buffer_st' type-id='type-id-228' id='type-id-227'/>
 
-    <array-type-def dimensions='1' type-id='type-id-226' size-in-bits='3456' id='type-id-145'>
-      <subrange length='6' type-id='type-id-38' id='type-id-230'/>
+    <array-type-def dimensions='1' type-id='type-id-227' size-in-bits='3456' id='type-id-146'>
+      <subrange length='6' type-id='type-id-38' id='type-id-231'/>
 
     </array-type-def>
-    <enum-decl name='record_send_state_t' id='type-id-231'>
+    <enum-decl name='record_send_state_t' id='type-id-232'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='RECORD_SEND_NORMAL' value='0'/>
       <enumerator name='RECORD_SEND_CORKED' value='1'/>
@@ -3032,69 +3065,69 @@
       <enumerator name='RECORD_SEND_KEY_UPDATE_2' value='4'/>
       <enumerator name='RECORD_SEND_KEY_UPDATE_3' value='5'/>
     </enum-decl>
-    <typedef-decl name='record_send_state_t' type-id='type-id-231' id='type-id-146'/>
-    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-232'>
+    <typedef-decl name='record_send_state_t' type-id='type-id-232' id='type-id-147'/>
+    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-233'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='gnutls_generate_server_kx' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_server_kx' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='gnutls_generate_client_kx' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_client_kx' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='gnutls_process_server_certificate' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_server_certificate' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='gnutls_process_client_certificate' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_client_certificate' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='gnutls_process_server_kx' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_server_kx' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='gnutls_process_client_kx' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_client_kx' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-235' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-235'/>
-    <typedef-decl name='gnutls_session_t' type-id='type-id-235' id='type-id-236'/>
-    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-237'/>
-    <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-233'/>
+    <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-236'/>
+    <typedef-decl name='gnutls_session_t' type-id='type-id-236' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-238'/>
     <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-234'/>
-    <qualified-type-def type-id='type-id-232' const='yes' id='type-id-240'/>
-    <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-147'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-241'>
+    <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-235'/>
+    <qualified-type-def type-id='type-id-233' const='yes' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-148'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-242'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CERT_IGNORE' value='0'/>
       <enumerator name='GNUTLS_CERT_REQUEST' value='1'/>
       <enumerator name='GNUTLS_CERT_REQUIRE' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_certificate_request_t' type-id='type-id-241' id='type-id-148'/>
-    <typedef-decl name='gnutls_transport_ptr_t' type-id='type-id-102' 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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='iov_base' type-id='type-id-102' visibility='default'/>
       </data-member>
@@ -3102,29 +3135,29 @@
         <var-decl name='iov_len' type-id='type-id-100' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='giovec_t' type-id='type-id-246' id='type-id-247'/>
-    <qualified-type-def type-id='type-id-247' const='yes' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-249'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
-    <typedef-decl name='gnutls_vec_push_func' type-id='type-id-251' id='type-id-152'/>
-    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
-    <typedef-decl name='gnutls_errno_func' type-id='type-id-253' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
-    <typedef-decl name='gnutls_db_store_func' type-id='type-id-255' id='type-id-155'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <typedef-decl name='gnutls_db_retr_func' type-id='type-id-257' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-259'/>
-    <typedef-decl name='gnutls_db_remove_func' type-id='type-id-259' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
-    <typedef-decl name='gnutls_handshake_simple_hook_func' type-id='type-id-261' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-263'/>
-    <typedef-decl name='gnutls_handshake_hook_func' type-id='type-id-263' id='type-id-159'/>
-    <type-decl name='short int' size-in-bits='16' id='type-id-264'/>
-    <typedef-decl name='__int16_t' type-id='type-id-264' id='type-id-265'/>
-    <typedef-decl name='int16_t' type-id='type-id-265' id='type-id-160'/>
-    <class-decl name='gnutls_pcert_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-266'>
+    <typedef-decl name='giovec_t' type-id='type-id-247' id='type-id-248'/>
+    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-252'/>
+    <typedef-decl name='gnutls_vec_push_func' type-id='type-id-252' id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pubkey' type-id='type-id-267' visibility='default'/>
+        <var-decl name='pubkey' type-id='type-id-268' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert' type-id='type-id-62' visibility='default'/>
@@ -3133,14 +3166,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-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'/>
+    <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'/>
     <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-162'/>
-    <class-decl name='gnutls_ocsp_data_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-272'>
+    <class-decl name='gnutls_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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='version' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -3151,20 +3184,20 @@
         <var-decl name='exptime' type-id='type-id-17' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='padding' type-id='type-id-273' visibility='default'/>
+        <var-decl name='padding' type-id='type-id-274' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='256' id='type-id-273'>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='256' id='type-id-274'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <typedef-decl name='gnutls_ocsp_data_st' type-id='type-id-272' id='type-id-274'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-277'/>
-    <typedef-decl name='gnutls_status_request_ocsp_func' type-id='type-id-277' id='type-id-164'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-166' visibility='default' id='type-id-278'>
+    <typedef-decl name='gnutls_ocsp_data_st' type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dcookie' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -3196,35 +3229,35 @@
         <var-decl name='async_term' type-id='type-id-17' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='last_retransmit' type-id='type-id-168' visibility='default'/>
+        <var-decl name='last_retransmit' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='packets_dropped' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-168'>
+    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-169'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tv_sec' type-id='type-id-52' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_nsec' type-id='type-id-279' visibility='default'/>
+        <var-decl name='tv_nsec' type-id='type-id-280' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-1' id='type-id-279'/>
-    <typedef-decl name='dtls_st' type-id='type-id-278' id='type-id-166'/>
+    <typedef-decl name='__syscall_slong_t' type-id='type-id-1' id='type-id-280'/>
+    <typedef-decl name='dtls_st' type-id='type-id-279' id='type-id-167'/>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='288' id='type-id-167'>
-      <subrange length='36' type-id='type-id-38' id='type-id-280'/>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='288' id='type-id-168'>
+      <subrange length='36' type-id='type-id-38' id='type-id-281'/>
 
     </array-type-def>
-    <enum-decl name='heartbeat_state_t' id='type-id-281'>
+    <enum-decl name='heartbeat_state_t' id='type-id-282'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='SHB_SEND1' value='0'/>
       <enumerator name='SHB_SEND2' value='1'/>
       <enumerator name='SHB_RECV' value='2'/>
     </enum-decl>
-    <typedef-decl name='heartbeat_state_t' type-id='type-id-281' id='type-id-169'/>
-    <enum-decl name='recv_state_t' id='type-id-282'>
+    <typedef-decl name='heartbeat_state_t' type-id='type-id-282' id='type-id-170'/>
+    <enum-decl name='recv_state_t' id='type-id-283'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='RECV_STATE_0' value='0'/>
       <enumerator name='RECV_STATE_DTLS_RETRANSMIT' value='1'/>
@@ -3236,12 +3269,12 @@
       <enumerator name='RECV_STATE_REHANDSHAKE' value='7'/>
       <enumerator name='RECV_STATE_REAUTH' value='8'/>
     </enum-decl>
-    <typedef-decl name='recv_state_t' type-id='type-id-282' id='type-id-170'/>
-    <typedef-decl name='gnutls_certificate_verify_function' type-id='type-id-260' id='type-id-283'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-171'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-173' visibility='default' id='type-id-284'>
+    <typedef-decl name='recv_state_t' type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-285' visibility='default'/>
+        <var-decl name='type' type-id='type-id-286' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-64' visibility='default'/>
@@ -3250,7 +3283,7 @@
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-286'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-287'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_DT_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DT_DNS_HOSTNAME' value='1'/>
@@ -3258,15 +3291,15 @@
       <enumerator name='GNUTLS_DT_RFC822NAME' value='3'/>
       <enumerator name='GNUTLS_DT_IP_ADDRESS' value='4'/>
     </enum-decl>
-    <typedef-decl name='gnutls_vdata_types_t' type-id='type-id-286' id='type-id-285'/>
-    <typedef-decl name='gnutls_typed_vdata_st' type-id='type-id-284' id='type-id-173'/>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-172'/>
+    <typedef-decl name='gnutls_vdata_types_t' type-id='type-id-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'/>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1032' id='type-id-174'>
-      <subrange length='129' type-id='type-id-38' id='type-id-287'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1032' id='type-id-175'>
+      <subrange length='129' type-id='type-id-38' id='type-id-288'/>
 
     </array-type-def>
-    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-288'>
+    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-289'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fd' type-id='type-id-22' visibility='default'/>
       </data-member>
@@ -3277,42 +3310,42 @@
         <var-decl name='connect_only' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='connect_addr' type-id='type-id-289' visibility='default'/>
+        <var-decl name='connect_addr' type-id='type-id-290' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='connect_addrlen' type-id='type-id-290' visibility='default'/>
+        <var-decl name='connect_addrlen' type-id='type-id-291' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-289'>
+    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-290'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ss_family' type-id='type-id-291' visibility='default'/>
+        <var-decl name='ss_family' type-id='type-id-292' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__ss_padding' type-id='type-id-292' visibility='default'/>
+        <var-decl name='__ss_padding' type-id='type-id-293' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <var-decl name='__ss_align' type-id='type-id-38' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='sa_family_t' type-id='type-id-24' id='type-id-291'/>
+    <typedef-decl name='sa_family_t' type-id='type-id-24' id='type-id-292'/>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='944' id='type-id-292'>
-      <subrange length='118' type-id='type-id-38' id='type-id-293'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='944' id='type-id-293'>
+      <subrange length='118' type-id='type-id-38' id='type-id-294'/>
 
     </array-type-def>
-    <typedef-decl name='__socklen_t' type-id='type-id-10' id='type-id-294'/>
-    <typedef-decl name='socklen_t' type-id='type-id-294' id='type-id-290'/>
-    <typedef-decl name='tfo_st' type-id='type-id-288' id='type-id-175'/>
-    <class-decl name='gnutls_supplemental_entry_st' size-in-bits='256' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-176'/>
-    <class-decl name='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-296'/>
+    <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'/>
     <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-177'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-297'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priv' type-id='type-id-298' visibility='default'/>
+        <var-decl name='priv' type-id='type-id-299' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='resumed_priv' type-id='type-id-298' visibility='default'/>
+        <var-decl name='resumed_priv' type-id='type-id-299' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='set' type-id='type-id-16' visibility='default'/>
@@ -3321,13 +3354,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-298'/>
+    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-102' id='type-id-299'/>
 
-    <array-type-def dimensions='1' type-id='type-id-297' size-in-bits='6144' id='type-id-178'>
+    <array-type-def dimensions='1' type-id='type-id-298' size-in-bits='6144' id='type-id-179'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-299'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-300'>
       <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'/>
@@ -3339,13 +3372,13 @@
       <enumerator name='GNUTLS_EXT_FLAG_TLS' value='128'/>
       <enumerator name='GNUTLS_EXT_FLAG_DTLS' value='256'/>
     </enum-decl>
-    <typedef-decl name='gnutls_ext_flags_t' type-id='type-id-299' id='type-id-179'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='3136' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-180' visibility='default' id='type-id-300'>
+    <typedef-decl name='gnutls_ext_flags_t' type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arrival_time' type-id='type-id-168' visibility='default'/>
+        <var-decl name='arrival_time' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='creation_time' type-id='type-id-168' visibility='default'/>
+        <var-decl name='creation_time' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='lifetime' type-id='type-id-18' visibility='default'/>
@@ -3354,7 +3387,7 @@
         <var-decl name='age_add' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='nonce' type-id='type-id-301' visibility='default'/>
+        <var-decl name='nonce' type-id='type-id-302' 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'/>
@@ -3370,24 +3403,24 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2040' id='type-id-301'>
-      <subrange length='255' type-id='type-id-38' id='type-id-302'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2040' id='type-id-302'>
+      <subrange length='255' type-id='type-id-38' id='type-id-303'/>
 
     </array-type-def>
-    <typedef-decl name='tls13_ticket_st' type-id='type-id-300' id='type-id-180'/>
-    <class-decl name='gnutls_anti_replay_st' size-in-bits='320' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
-    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
-    <typedef-decl name='gnutls_anti_replay_t' type-id='type-id-304' id='type-id-181'/>
-    <typedef-decl name='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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kshare' type-id='type-id-306' visibility='default'/>
+        <var-decl name='kshare' type-id='type-id-307' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='proto' type-id='type-id-307' visibility='default'/>
+        <var-decl name='proto' type-id='type-id-308' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='19776'>
-        <var-decl name='binders' type-id='type-id-308' visibility='default'/>
+        <var-decl name='binders' type-id='type-id-309' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20288'>
         <var-decl name='key' type-id='type-id-62' visibility='default'/>
@@ -3405,32 +3438,32 @@
         <var-decl name='auth_info' type-id='type-id-102' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22016'>
-        <var-decl name='auth_info_type' type-id='type-id-309' visibility='default'/>
+        <var-decl name='auth_info_type' type-id='type-id-310' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22048'>
         <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-310' visibility='default'/>
+        <var-decl name='cred' type-id='type-id-311' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22144'>
-        <var-decl name='totp' type-id='type-id-311' visibility='default'/>
+        <var-decl name='totp' type-id='type-id-312' 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='11328' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-307'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh_params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='ecdh_params' type-id='type-id-313' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='ecdhx_params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='ecdhx_params' type-id='type-id-313' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7552'>
-        <var-decl name='dh_params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-313' 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='3776' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-313' visibility='default' id='type-id-314'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-314' visibility='default'/>
+        <var-decl name='params' type-id='type-id-315' 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'/>
@@ -3448,7 +3481,7 @@
         <var-decl name='dh_group' type-id='type-id-56' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='gost_params' type-id='type-id-315' visibility='default'/>
+        <var-decl name='gost_params' type-id='type-id-316' 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'/>
@@ -3460,25 +3493,25 @@
         <var-decl name='seed_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='seed' type-id='type-id-316' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-317' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='palgo' type-id='type-id-211' visibility='default'/>
+        <var-decl name='palgo' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='spki' type-id='type-id-317' visibility='default'/>
+        <var-decl name='spki' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
         <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-102' id='type-id-319'/>
 
-    <array-type-def dimensions='1' type-id='type-id-318' size-in-bits='1024' id='type-id-314'>
+    <array-type-def dimensions='1' type-id='type-id-319' size-in-bits='1024' id='type-id-315'>
       <subrange length='16' type-id='type-id-38' id='type-id-94'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-319'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-320'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_TC26_Z' value='1'/>
@@ -3487,18 +3520,18 @@
       <enumerator name='GNUTLS_GOST_PARAMSET_CP_C' value='4'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_CP_D' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-319' id='type-id-315'/>
+    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-320' id='type-id-316'/>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-316'>
-      <subrange length='256' type-id='type-id-38' id='type-id-223'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-317'>
+      <subrange length='256' type-id='type-id-38' id='type-id-224'/>
 
     </array-type-def>
-    <class-decl name='gnutls_x509_spki_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-320'>
+    <class-decl name='gnutls_x509_spki_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-321'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rsa_pss_dig' type-id='type-id-211' visibility='default'/>
+        <var-decl name='rsa_pss_dig' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='salt_size' type-id='type-id-10' visibility='default'/>
@@ -3507,17 +3540,17 @@
         <var-decl name='legacy' 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'>
+    <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'>
       <data-member access='private'>
-        <var-decl name='tls13' type-id='type-id-321' visibility='default'/>
+        <var-decl name='tls13' type-id='type-id-322' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-322' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-323' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-321'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-322'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='temp_secret' type-id='type-id-89' visibility='default'/>
       </data-member>
@@ -3546,69 +3579,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-322'>
+    <class-decl name='__anonymous_struct__' size-in-bits='8448' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-323'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh' type-id='type-id-323' visibility='default'/>
+        <var-decl name='ecdh' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='dh' type-id='type-id-324' visibility='default'/>
+        <var-decl name='dh' type-id='type-id-325' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7872'>
-        <var-decl name='srp' type-id='type-id-325' visibility='default'/>
+        <var-decl name='srp' type-id='type-id-326' 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='4032' 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'/>
+        <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-318' visibility='default'/>
+        <var-decl name='x' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='y' type-id='type-id-318' visibility='default'/>
+        <var-decl name='y' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <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='3840' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-325'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='params' type-id='type-id-313' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='client_Y' type-id='type-id-318' visibility='default'/>
+        <var-decl name='client_Y' type-id='type-id-319' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-325'>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-326'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='srp_key' type-id='type-id-318' visibility='default'/>
+        <var-decl name='srp_key' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='srp_g' type-id='type-id-318' visibility='default'/>
+        <var-decl name='srp_g' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='srp_p' type-id='type-id-318' visibility='default'/>
+        <var-decl name='srp_p' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='A' type-id='type-id-318' visibility='default'/>
+        <var-decl name='A' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='B' type-id='type-id-318' visibility='default'/>
+        <var-decl name='B' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='u' type-id='type-id-318' visibility='default'/>
+        <var-decl name='u' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='b' type-id='type-id-318' visibility='default'/>
+        <var-decl name='b' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-318' visibility='default'/>
+        <var-decl name='a' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='x' type-id='type-id-318' visibility='default'/>
+        <var-decl name='x' type-id='type-id-319' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-326'>
+    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-327'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='prf' type-id='type-id-13' visibility='default'/>
       </data-member>
@@ -3623,11 +3656,11 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-326' size-in-bits='512' id='type-id-308'>
+    <array-type-def dimensions='1' type-id='type-id-327' size-in-bits='512' id='type-id-309'>
       <subrange length='2' type-id='type-id-38' id='type-id-40'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-327'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-328'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CRD_CERTIFICATE' value='1'/>
       <enumerator name='GNUTLS_CRD_ANON' value='2'/>
@@ -3635,21 +3668,21 @@
       <enumerator name='GNUTLS_CRD_PSK' value='4'/>
       <enumerator name='GNUTLS_CRD_IA' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_credentials_type_t' type-id='type-id-327' id='type-id-309'/>
-    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-328'>
+    <typedef-decl name='gnutls_credentials_type_t' type-id='type-id-328' id='type-id-310'/>
+    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-329'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='algorithm' type-id='type-id-309' visibility='default'/>
+        <var-decl name='algorithm' type-id='type-id-310' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='credentials' type-id='type-id-102' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next' type-id='type-id-310' visibility='default'/>
+        <var-decl name='next' type-id='type-id-311' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-310'/>
-    <typedef-decl name='auth_cred_st' type-id='type-id-328' id='type-id-329'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-311'>
+    <pointer-type-def type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='last_result' type-id='type-id-80' visibility='default'/>
       </data-member>
@@ -3657,13 +3690,13 @@
         <var-decl name='was_rotated' type-id='type-id-16' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cb' type-id='type-id-330' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-331' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-332'/>
-    <typedef-decl name='gnutls_stek_rotation_callback_t' type-id='type-id-332' id='type-id-330'/>
-    <typedef-decl name='gnutls_key_st' type-id='type-id-305' id='type-id-8'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-333' visibility='default' id='type-id-334'>
+    <pointer-type-def type-id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='low' type-id='type-id-100' visibility='default'/>
       </data-member>
@@ -3671,96 +3704,96 @@
         <var-decl name='high' type-id='type-id-100' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_range_st' type-id='type-id-334' id='type-id-333'/>
-    <qualified-type-def type-id='type-id-333' const='yes' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-336'/>
+    <typedef-decl name='gnutls_range_st' type-id='type-id-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'/>
     <function-decl name='gnutls_record_send_range' mangled-name='gnutls_record_send_range' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_send_range@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' name='data_size'/>
-      <parameter type-id='type-id-336' name='range'/>
+      <parameter type-id='type-id-337' name='range'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-338'/>
     <function-decl name='gnutls_range_split' mangled-name='gnutls_range_split' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_range_split@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-336' name='orig'/>
-      <parameter type-id='type-id-337' name='next'/>
-      <parameter type-id='type-id-337' name='remainder'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-337' name='orig'/>
+      <parameter type-id='type-id-338' name='next'/>
+      <parameter type-id='type-id-338' name='remainder'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_record_can_use_length_hiding' mangled-name='gnutls_record_can_use_length_hiding' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_can_use_length_hiding@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='_gnutls_log' mangled-name='_gnutls_log' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_dtls_get_data_mtu' mangled-name='gnutls_dtls_get_data_mtu' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_epoch_get' mangled-name='_gnutls_epoch_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-260'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-261'>
+      <parameter type-id='type-id-237'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-238'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-239'>
       <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-239'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-191'/>
+    <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'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-262'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-263'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-276'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-277'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-252'>
-      <parameter type-id='type-id-154'/>
+    <function-type size-in-bits='64' id='type-id-253'>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-242'>
-      <parameter type-id='type-id-154'/>
+    <function-type size-in-bits='64' id='type-id-243'>
+      <parameter type-id='type-id-155'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-258'>
+    <function-type size-in-bits='64' id='type-id-259'>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-62'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-254'>
+    <function-type size-in-bits='64' id='type-id-255'>
       <parameter type-id='type-id-102'/>
       <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'>
+    <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'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-112'>
+    <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'/>
@@ -3768,7 +3801,7 @@
       <parameter type-id='type-id-100'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-114'>
+    <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'/>
@@ -3781,42 +3814,42 @@
       <parameter type-id='type-id-100'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-256'>
+    <function-type size-in-bits='64' id='type-id-257'>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-62'/>
       <return type-id='type-id-62'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-250'>
-      <parameter type-id='type-id-154'/>
-      <parameter type-id='type-id-249'/>
+    <function-type size-in-bits='64' id='type-id-251'>
+      <parameter type-id='type-id-155'/>
+      <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-244'>
-      <parameter type-id='type-id-154'/>
+    <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'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-331'>
+    <function-type size-in-bits='64' id='type-id-332'>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-80'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-120'>
+    <function-type size-in-bits='64' id='type-id-121'>
       <parameter type-id='type-id-102'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-118'>
+    <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-111'/>
+      <return type-id='type-id-112'/>
     </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'>
-    <class-decl name='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-296'>
+  <abi-instr version='1.0' address-size='64' path='record.c' comp-dir-path='/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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -3830,31 +3863,31 @@
         <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='parse_type' type-id='type-id-339' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='validity' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='recv_func' type-id='type-id-339' visibility='default'/>
+        <var-decl name='recv_func' type-id='type-id-340' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='send_func' type-id='type-id-340' visibility='default'/>
+        <var-decl name='send_func' type-id='type-id-341' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='deinit_func' type-id='type-id-341' visibility='default'/>
+        <var-decl name='deinit_func' type-id='type-id-342' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='pack_func' type-id='type-id-342' visibility='default'/>
+        <var-decl name='pack_func' type-id='type-id-343' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='unpack_func' type-id='type-id-343' visibility='default'/>
+        <var-decl name='unpack_func' type-id='type-id-344' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='cannot_be_overriden' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-344'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-345'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_EXT_ANY' value='0'/>
       <enumerator name='GNUTLS_EXT_APPLICATION' value='1'/>
@@ -3863,63 +3896,63 @@
       <enumerator name='GNUTLS_EXT_NONE' value='4'/>
       <enumerator name='GNUTLS_EXT_VERSION_NEG' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_ext_parse_type_t' type-id='type-id-344' id='type-id-338'/>
-    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-346'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-348'/>
-    <typedef-decl name='gnutls_ext_recv_func' type-id='type-id-348' id='type-id-339'/>
-    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-349'/>
-    <typedef-decl name='gnutls_buffer_t' type-id='type-id-349' id='type-id-350'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
-    <typedef-decl name='gnutls_ext_send_func' type-id='type-id-352' id='type-id-340'/>
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-354'/>
-    <typedef-decl name='gnutls_ext_deinit_data_func' type-id='type-id-354' id='type-id-341'/>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
-    <typedef-decl name='gnutls_ext_pack_func' type-id='type-id-356' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-357'/>
-    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
-    <typedef-decl name='gnutls_ext_unpack_func' type-id='type-id-359' id='type-id-343'/>
+    <typedef-decl name='gnutls_ext_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'/>
     <function-decl name='gnutls_record_set_timeout' mangled-name='gnutls_record_set_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_timeout@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='ms'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_record_recv_seq' mangled-name='gnutls_record_recv_seq' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_recv_seq@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' name='data_size'/>
       <parameter type-id='type-id-64' name='seq'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_recv' mangled-name='gnutls_record_recv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_recv@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' name='data_size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_uncork' mangled-name='gnutls_record_uncork' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_uncork@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_record_cork' mangled-name='gnutls_record_cork' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_cork@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_record_recv_early_data' mangled-name='gnutls_record_recv_early_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_recv_early_data@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' name='data_size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_send_early_data' mangled-name='gnutls_record_send_early_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_send_early_data@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' name='data_size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_send2' mangled-name='gnutls_record_send2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_send2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' name='data_size'/>
       <parameter type-id='type-id-100' name='pad'/>
@@ -3927,298 +3960,298 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_send' mangled-name='gnutls_record_send' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_send@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' name='data_size'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <typedef-decl name='gnutls_packet_t' type-id='type-id-183' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-361'/>
+    <typedef-decl name='gnutls_packet_t' type-id='type-id-184' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
     <function-decl name='gnutls_record_recv_packet' mangled-name='gnutls_record_recv_packet' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_recv_packet@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-361' name='packet'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-362' name='packet'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_discard_queued' mangled-name='gnutls_record_discard_queued' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_discard_queued@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-100'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-361' name='packet'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_packet_get' mangled-name='gnutls_packet_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_packet_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-360' name='packet'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-361' name='packet'/>
+      <parameter type-id='type-id-276' name='data'/>
       <parameter type-id='type-id-64' name='sequence'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-362'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-363'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SHUT_RDWR' value='0'/>
       <enumerator name='GNUTLS_SHUT_WR' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_close_request_t' type-id='type-id-362' id='type-id-363'/>
+    <typedef-decl name='gnutls_close_request_t' type-id='type-id-363' id='type-id-364'/>
     <function-decl name='gnutls_bye' mangled-name='gnutls_bye' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_bye@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-363' name='how'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-364' name='how'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_transport_get_int' mangled-name='gnutls_transport_get_int' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_get_int@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-364'/>
+    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-365'/>
     <function-decl name='gnutls_transport_get_int2' mangled-name='gnutls_transport_get_int2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_get_int2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-364' name='recv_int'/>
-      <parameter type-id='type-id-364' name='send_int'/>
-      <return type-id='type-id-111'/>
+      <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'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-366'/>
     <function-decl name='gnutls_transport_get_ptr2' mangled-name='gnutls_transport_get_ptr2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_get_ptr2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-365' name='recv_ptr'/>
-      <parameter type-id='type-id-365' name='send_ptr'/>
-      <return type-id='type-id-111'/>
+      <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'/>
     </function-decl>
     <function-decl name='gnutls_transport_get_ptr' mangled-name='gnutls_transport_get_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_get_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <return type-id='type-id-154'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <return type-id='type-id-155'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_int2' mangled-name='gnutls_transport_set_int2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_int2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-22' name='recv_fd'/>
       <parameter type-id='type-id-22' name='send_fd'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_ptr2' mangled-name='gnutls_transport_set_ptr2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_ptr2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-154' name='recv_ptr'/>
-      <parameter type-id='type-id-154' name='send_ptr'/>
-      <return type-id='type-id-111'/>
+      <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'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_ptr' mangled-name='gnutls_transport_set_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-154' name='ptr'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-155' name='ptr'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_record_disable_padding' mangled-name='gnutls_record_disable_padding' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_disable_padding@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__assert_fail' mangled-name='__assert_fail' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_packet2str' mangled-name='_gnutls_packet2str' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nanosleep' mangled-name='nanosleep' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_dtls_transmit' mangled-name='_dtls_transmit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_decrypt' mangled-name='_gnutls_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_encrypt' mangled-name='_gnutls_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='time' mangled-name='time' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_reauth' mangled-name='gnutls_reauth' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-358'>
-      <parameter type-id='type-id-350'/>
-      <parameter type-id='type-id-357'/>
+    <function-type size-in-bits='64' id='type-id-359'>
+      <parameter type-id='type-id-351'/>
+      <parameter type-id='type-id-358'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-355'>
-      <parameter type-id='type-id-298'/>
-      <parameter type-id='type-id-350'/>
+    <function-type size-in-bits='64' id='type-id-356'>
+      <parameter type-id='type-id-299'/>
+      <parameter type-id='type-id-351'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-347'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-346'/>
+    <function-type size-in-bits='64' id='type-id-348'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-347'/>
       <parameter type-id='type-id-100'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-351'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-350'/>
+    <function-type size-in-bits='64' id='type-id-352'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-351'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-353'>
-      <parameter type-id='type-id-298'/>
-      <return type-id='type-id-111'/>
+    <function-type size-in-bits='64' id='type-id-354'>
+      <parameter type-id='type-id-299'/>
+      <return type-id='type-id-112'/>
     </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'>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-366'>
+  <abi-instr version='1.0' address-size='64' path='compress.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-367'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_COMP_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_COMP_NULL' value='1'/>
       <enumerator name='GNUTLS_COMP_DEFLATE' value='2'/>
       <enumerator name='GNUTLS_COMP_ZLIB' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_compression_method_t' type-id='type-id-366' id='type-id-367'/>
-    <qualified-type-def type-id='type-id-367' const='yes' id='type-id-368'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-369'/>
+    <typedef-decl name='gnutls_compression_method_t' type-id='type-id-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'/>
     <function-decl name='gnutls_compression_list' mangled-name='gnutls_compression_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_compression_list@@GNUTLS_3_4'>
-      <return type-id='type-id-369'/>
+      <return type-id='type-id-370'/>
     </function-decl>
     <function-decl name='gnutls_compression_get_id' mangled-name='gnutls_compression_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_compression_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
-      <return type-id='type-id-367'/>
+      <return type-id='type-id-368'/>
     </function-decl>
     <function-decl name='gnutls_compression_get_name' mangled-name='gnutls_compression_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_compression_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-367' name='algorithm'/>
+      <parameter type-id='type-id-368' name='algorithm'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='c_strcasecmp' mangled-name='c_strcasecmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_handshake_description_get_name' mangled-name='gnutls_handshake_description_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_description_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-186' name='type'/>
+      <parameter type-id='type-id-187' name='type'/>
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/home/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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_memcmp' mangled-name='gnutls_memcmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_memxor' mangled-name='nettle_memxor' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_rnd' mangled-name='gnutls_rnd' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
+    <class-decl name='gnutls_session_int' size-in-bits='52416' is-struct='yes' visibility='default' id='type-id-371'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='security_parameters' type-id='type-id-5' visibility='default'/>
       </data-member>
@@ -4226,15 +4259,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-371' visibility='default'/>
+        <var-decl name='internals' type-id='type-id-372' 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-372' visibility='default' id='type-id-373'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='record_buffer' type-id='type-id-138' visibility='default'/>
+        <var-decl name='record_buffer' type-id='type-id-139' 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'/>
@@ -4252,25 +4285,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-139' visibility='default'/>
+        <var-decl name='handshake_hash_buffer' type-id='type-id-140' 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-140' visibility='default'/>
+        <var-decl name='ticket_state' type-id='type-id-141' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bye_state' type-id='type-id-141' visibility='default'/>
+        <var-decl name='bye_state' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='reauth_state' type-id='type-id-142' visibility='default'/>
+        <var-decl name='reauth_state' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='handshake_final_state' type-id='type-id-143' visibility='default'/>
+        <var-decl name='handshake_final_state' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='handshake_state' type-id='type-id-143' visibility='default'/>
+        <var-decl name='handshake_state' type-id='type-id-144' 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'/>
@@ -4294,33 +4327,36 @@
         <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-144' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-145' 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'/>
       </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'>
@@ -4330,49 +4366,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-138' visibility='default'/>
+        <var-decl name='handshake_send_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='handshake_header_recv_buffer' type-id='type-id-138' visibility='default'/>
+        <var-decl name='handshake_header_recv_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='handshake_recv_buffer' type-id='type-id-145' visibility='default'/>
+        <var-decl name='handshake_recv_buffer' type-id='type-id-146' 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-138' visibility='default'/>
+        <var-decl name='record_recv_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='record_send_buffer' type-id='type-id-138' visibility='default'/>
+        <var-decl name='record_send_buffer' type-id='type-id-139' 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'/>
       </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'/>
+        <var-decl name='early_data_recv_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='early_data_presend_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='early_data_presend_buffer' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
-        <var-decl name='rsend_state' type-id='type-id-146' visibility='default'/>
+        <var-decl name='rsend_state' type-id='type-id-147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
-        <var-decl name='record_key_update_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_key_update_buffer' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8832'>
-        <var-decl name='record_presend_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_presend_buffer' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9088'>
-        <var-decl name='reauth_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='reauth_buffer' type-id='type-id-140' 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-147' visibility='default'/>
+        <var-decl name='auth_struct' type-id='type-id-148' 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'/>
@@ -4381,73 +4417,73 @@
         <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-148' visibility='default'/>
+        <var-decl name='send_cert_req' type-id='type-id-149' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
-        <var-decl name='pull_timeout_func' type-id='type-id-149' visibility='default'/>
+        <var-decl name='pull_timeout_func' type-id='type-id-150' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
-        <var-decl name='pull_func' type-id='type-id-150' visibility='default'/>
+        <var-decl name='pull_func' type-id='type-id-151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='push_func' type-id='type-id-151' visibility='default'/>
+        <var-decl name='push_func' type-id='type-id-152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9792'>
-        <var-decl name='vec_push_func' type-id='type-id-152' visibility='default'/>
+        <var-decl name='vec_push_func' type-id='type-id-153' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9856'>
-        <var-decl name='errno_func' type-id='type-id-153' visibility='default'/>
+        <var-decl name='errno_func' type-id='type-id-154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9920'>
-        <var-decl name='transport_recv_ptr' type-id='type-id-154' visibility='default'/>
+        <var-decl name='transport_recv_ptr' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
-        <var-decl name='transport_send_ptr' type-id='type-id-154' visibility='default'/>
+        <var-decl name='transport_send_ptr' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
-        <var-decl name='db_store_func' type-id='type-id-155' visibility='default'/>
+        <var-decl name='db_store_func' type-id='type-id-156' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
-        <var-decl name='db_retrieve_func' type-id='type-id-156' visibility='default'/>
+        <var-decl name='db_retrieve_func' type-id='type-id-157' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='db_remove_func' type-id='type-id-157' visibility='default'/>
+        <var-decl name='db_remove_func' type-id='type-id-158' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='user_hello_func' type-id='type-id-158' visibility='default'/>
+        <var-decl name='user_hello_func' type-id='type-id-159' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10368'>
-        <var-decl name='h_hook' type-id='type-id-159' visibility='default'/>
+        <var-decl name='h_hook' type-id='type-id-160' 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-160' visibility='default'/>
+        <var-decl name='h_post' type-id='type-id-161' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
-        <var-decl name='selected_cert_list' type-id='type-id-161' visibility='default'/>
+        <var-decl name='selected_cert_list' type-id='type-id-162' 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-373' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-374' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-163' visibility='default'/>
+        <var-decl name='selected_ocsp' type-id='type-id-164' 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-164' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
         <var-decl name='selected_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
@@ -4456,10 +4492,10 @@
         <var-decl name='selected_need_free' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10952'>
-        <var-decl name='default_record_version' type-id='type-id-165' visibility='default'/>
+        <var-decl name='default_record_version' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-165' visibility='default'/>
+        <var-decl name='default_hello_version' type-id='type-id-166' 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'/>
@@ -4471,7 +4507,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-165' visibility='default'/>
+        <var-decl name='rsa_pms_version' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11104'>
         <var-decl name='errnum' type-id='type-id-22' visibility='default'/>
@@ -4486,7 +4522,7 @@
         <var-decl name='transport' type-id='type-id-74' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='dtls' type-id='type-id-166' visibility='default'/>
+        <var-decl name='dtls' type-id='type-id-167' 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'/>
@@ -4501,13 +4537,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-167' visibility='default'/>
+        <var-decl name='cb_tls_unique' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-168' visibility='default'/>
+        <var-decl name='handshake_start_time' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-168' visibility='default'/>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12544'>
         <var-decl name='ertt' type-id='type-id-10' visibility='default'/>
@@ -4522,205 +4558,208 @@
         <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-139' visibility='default'/>
+        <var-decl name='post_handshake_hash_buffer' type-id='type-id-140' 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-17' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13184'>
-        <var-decl name='full_client_hello' type-id='type-id-139' visibility='default'/>
+      <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='13440'>
-        <var-decl name='extensions_offset' type-id='type-id-22' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13312'>
+        <var-decl name='full_client_hello' type-id='type-id-140' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13504'>
-        <var-decl name='hb_local_data' type-id='type-id-139' visibility='default'/>
+      <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='13760'>
-        <var-decl name='hb_remote_data' type-id='type-id-139' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13632'>
+        <var-decl name='hb_local_data' type-id='type-id-140' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14016'>
-        <var-decl name='hb_ping_start' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13888'>
+        <var-decl name='hb_remote_data' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14144'>
-        <var-decl name='hb_ping_sent' type-id='type-id-168' visibility='default'/>
+        <var-decl name='hb_ping_start' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14272'>
+        <var-decl name='hb_ping_sent' type-id='type-id-169' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='14400'>
         <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='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'>
-        <var-decl name='hb_state' type-id='type-id-169' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14528'>
+        <var-decl name='hb_state' type-id='type-id-170' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
-        <var-decl name='recv_state' type-id='type-id-170' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14560'>
+        <var-decl name='recv_state' type-id='type-id-171' 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'>
-        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14720'>
+        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14656'>
-        <var-decl name='vc_data' type-id='type-id-172' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14784'>
+        <var-decl name='vc_data' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='vc_sdata' type-id='type-id-173' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14848'>
+        <var-decl name='vc_sdata' type-id='type-id-174' 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'>
-        <var-decl name='saved_username' type-id='type-id-174' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='15400'>
+        <var-decl name='saved_username' type-id='type-id-175' 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'>
-        <var-decl name='tfo' type-id='type-id-175' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='16448'>
+        <var-decl name='tfo' type-id='type-id-176' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17536'>
-        <var-decl name='rsup' type-id='type-id-176' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17664'>
+        <var-decl name='rsup' type-id='type-id-177' 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'>
-        <var-decl name='rexts' type-id='type-id-177' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17792'>
+        <var-decl name='rexts' type-id='type-id-178' 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'>
-        <var-decl name='ext_data' type-id='type-id-178' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='17920'>
+        <var-decl name='ext_data' type-id='type-id-179' 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'>
-        <var-decl name='ext_msg' type-id='type-id-179' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24096'>
+        <var-decl name='ext_msg' type-id='type-id-180' 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'>
-        <var-decl name='hrr_cs' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24384'>
+        <var-decl name='hrr_cs' type-id='type-id-166' 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'>
-        <var-decl name='tls13_ticket' type-id='type-id-180' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24448'>
+        <var-decl name='tls13_ticket' type-id='type-id-181' 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'>
-        <var-decl name='anti_replay' type-id='type-id-181' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='27648'>
+        <var-decl name='anti_replay' type-id='type-id-182' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
+      <data-member access='public' layout-offset-in-bits='27712'>
         <var-decl name='epoch_lock' type-id='type-id-102' 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='4032' is-struct='yes' visibility='default' id='type-id-269'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='bits' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='params' type-id='type-id-313' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <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-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-375' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='pin_info_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-374'>
+    <class-decl name='pin_info_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-375'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cb' type-id='type-id-375' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-102' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-376'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-378'/>
-    <typedef-decl name='gnutls_pin_callback_t' type-id='type-id-378' id='type-id-375'/>
-    <class-decl name='gnutls_privkey_st' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-379'>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-380' visibility='default'/>
+        <var-decl name='type' type-id='type-id-381' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='pk_algorithm' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='key' type-id='type-id-381' visibility='default'/>
+        <var-decl name='key' type-id='type-id-382' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-375' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-382'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-383'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PRIVKEY_X509' value='0'/>
       <enumerator name='GNUTLS_PRIVKEY_OPENPGP' value='1'/>
       <enumerator name='GNUTLS_PRIVKEY_PKCS11' value='2'/>
       <enumerator name='GNUTLS_PRIVKEY_EXT' value='3'/>
     </enum-decl>
-    <typedef-decl name='gnutls_privkey_type_t' type-id='type-id-382' id='type-id-380'/>
-    <union-decl name='__anonymous_union__' size-in-bits='576' is-anonymous='yes' visibility='default' id='type-id-381'>
+    <typedef-decl name='gnutls_privkey_type_t' type-id='type-id-383' id='type-id-381'/>
+    <union-decl name='__anonymous_union__' size-in-bits='576' is-anonymous='yes' visibility='default' id='type-id-382'>
       <data-member access='private'>
-        <var-decl name='x509' type-id='type-id-383' visibility='default'/>
+        <var-decl name='x509' type-id='type-id-384' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pkcs11' type-id='type-id-384' visibility='default'/>
+        <var-decl name='pkcs11' type-id='type-id-385' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ext' type-id='type-id-385' visibility='default'/>
+        <var-decl name='ext' type-id='type-id-386' 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='4032' is-struct='yes' visibility='default' id='type-id-387'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='params' type-id='type-id-313' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
@@ -4729,42 +4768,42 @@
         <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-387' visibility='default'/>
+        <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-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-375' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='asn1_node_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-388'/>
-    <typedef-decl name='asn1_node_st' type-id='type-id-388' id='type-id-389'/>
-    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-390'/>
-    <typedef-decl name='asn1_node' type-id='type-id-390' id='type-id-387'/>
-    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-391'/>
-    <typedef-decl name='gnutls_x509_privkey_t' type-id='type-id-391' id='type-id-383'/>
-    <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-392'/>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='sign_func' type-id='type-id-394' visibility='default'/>
+        <var-decl name='sign_func' type-id='type-id-395' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='sign_data_func' type-id='type-id-395' visibility='default'/>
+        <var-decl name='sign_data_func' type-id='type-id-396' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sign_hash_func' type-id='type-id-396' visibility='default'/>
+        <var-decl name='sign_hash_func' type-id='type-id-397' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='decrypt_func' type-id='type-id-397' visibility='default'/>
+        <var-decl name='decrypt_func' type-id='type-id-398' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='decrypt_func2' type-id='type-id-398' visibility='default'/>
+        <var-decl name='decrypt_func2' type-id='type-id-399' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit_func' type-id='type-id-399' visibility='default'/>
+        <var-decl name='deinit_func' type-id='type-id-400' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='info_func' type-id='type-id-400' visibility='default'/>
+        <var-decl name='info_func' type-id='type-id-401' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='userdata' type-id='type-id-102' visibility='default'/>
@@ -4773,493 +4812,496 @@
         <var-decl name='bits' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-373'/>
-    <typedef-decl name='gnutls_privkey_t' type-id='type-id-373' id='type-id-401'/>
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-403'/>
-    <typedef-decl name='gnutls_privkey_sign_func' type-id='type-id-403' id='type-id-394'/>
-    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-405'/>
-    <typedef-decl name='gnutls_privkey_sign_data_func' type-id='type-id-405' id='type-id-395'/>
-    <typedef-decl name='gnutls_privkey_sign_hash_func' type-id='type-id-405' id='type-id-396'/>
-    <typedef-decl name='gnutls_privkey_decrypt_func' type-id='type-id-403' id='type-id-397'/>
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
-    <typedef-decl name='gnutls_privkey_decrypt_func2' type-id='type-id-407' id='type-id-398'/>
-    <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-409'/>
-    <typedef-decl name='gnutls_privkey_deinit_func' type-id='type-id-409' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-411'/>
-    <typedef-decl name='gnutls_privkey_info_func' type-id='type-id-411' id='type-id-400'/>
-    <typedef-decl name='internals_st' type-id='type-id-372' id='type-id-371'/>
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-412'/>
-    <typedef-decl name='gnutls_session_t' type-id='type-id-412' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-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'/>
     <function-decl name='gnutls_session_ticket_send' mangled-name='gnutls_session_ticket_send' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ticket_send@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__builtin_memset' mangled-name='memset' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-404'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-405'>
+      <parameter type-id='type-id-402'/>
       <parameter type-id='type-id-21'/>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-410'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-411'>
+      <parameter type-id='type-id-402'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-102'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-402'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-403'>
+      <parameter type-id='type-id-402'/>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-406'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-407'>
+      <parameter type-id='type-id-402'/>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-100'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-377'>
+    <function-type size-in-bits='64' id='type-id-378'>
       <parameter type-id='type-id-102'/>
       <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-377'/>
       <parameter type-id='type-id-100'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-408'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-409'>
+      <parameter type-id='type-id-402'/>
       <parameter type-id='type-id-102'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_record_check_corked' mangled-name='gnutls_record_check_corked' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_check_corked@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-100'/>
     </function-decl>
     <function-decl name='gnutls_record_check_pending' mangled-name='gnutls_record_check_pending' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_check_pending@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-100'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='memmove' mangled-name='memmove' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_mbuffer_dequeue' mangled-name='_mbuffer_dequeue' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='qsort' mangled-name='qsort' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__errno_location' mangled-name='__errno_location' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_handshake_get_last_out' mangled-name='gnutls_handshake_get_last_out' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_get_last_out@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-186'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-187'/>
     </function-decl>
     <function-decl name='gnutls_handshake_get_last_in' mangled-name='gnutls_handshake_get_last_in' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_get_last_in@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-186'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-187'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_max_packet_length' mangled-name='gnutls_handshake_set_max_packet_length' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_max_packet_length@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-100' name='max'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_timeout' mangled-name='gnutls_handshake_set_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_timeout@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-10' name='ms'/>
-      <return type-id='type-id-111'/>
+      <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' elf-symbol-id='gnutls_handshake@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_rehandshake' mangled-name='gnutls_rehandshake' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_rehandshake@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <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-111'/>
+      <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-111'/>
+      <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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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='_tls13_init_secret2' mangled-name='_tls13_init_secret2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__builtin_memcmp' mangled-name='memcmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
+    </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'/>
+    </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'/>
+    </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'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
+    </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'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_mbuffer_alloc' mangled-name='_mbuffer_alloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_log' mangled-name='_gnutls_mpi_log' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_mpi_log@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-27' name='prefix'/>
-      <parameter type-id='type-id-318' name='a'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-319' name='a'/>
+      <return type-id='type-id-112'/>
     </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'/>
@@ -5267,7 +5309,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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
@@ -5278,507 +5320,528 @@
       <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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='free' mangled-name='free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='fprintf' mangled-name='fprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='dcgettext' mangled-name='dcgettext' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-415' visibility='default'/>
+        <var-decl name='params' type-id='type-id-416' 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-319' size-in-bits='192' id='type-id-416'>
+      <subrange length='3' type-id='type-id-38' id='type-id-417'/>
 
     </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-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'/>
     <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-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='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'/>
       <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-421'>
       <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-421' id='type-id-422'/>
     <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-275' name='out'/>
+      <parameter type-id='type-id-419' name='params'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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-100' size-in-bits='64' id='type-id-423'/>
     <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-419' name='params'/>
+      <parameter type-id='type-id-422' 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-423' 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-419' name='params'/>
       <parameter type-id='type-id-57' name='pkcs3_params'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-419' 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-419' name='dst'/>
+      <parameter type-id='type-id-419' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-419' name='dh_params'/>
+      <return type-id='type-id-112'/>
     </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-419' size-in-bits='64' id='type-id-424'/>
     <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-424' name='dh_params'/>
       <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'/>
+    <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-57' name='prime'/>
+      <parameter type-id='type-id-57' name='q'/>
       <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_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-417' name='dh_params'/>
+    <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-57' name='prime'/>
-      <parameter type-id='type-id-57' name='q'/>
       <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-383' name='key'/>
+      <parameter type-id='type-id-419' name='dh_params'/>
+      <parameter type-id='type-id-384' 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-419' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_asn2err' mangled-name='_gnutls_asn2err' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='fclose' mangled-name='fclose' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='fflush' mangled-name='fflush' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='secure_getenv' mangled-name='secure_getenv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='fopen' mangled-name='fopen' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-145' id='type-id-425'/>
+    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-426'/>
     <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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-425' name='pcache'/>
+      <parameter type-id='type-id-426' 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-427'/>
     <function-decl name='gnutls_set_default_priority_append' mangled-name='gnutls_set_default_priority_append' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_set_default_priority_append@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='add_prio'/>
-      <parameter type-id='type-id-425' name='err_pos'/>
+      <parameter type-id='type-id-427' name='err_pos'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_set_default_priority' mangled-name='gnutls_set_default_priority' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_set_default_priority@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_set_direct' mangled-name='gnutls_priority_set_direct' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_set_direct@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-425' name='err_pos'/>
+      <parameter type-id='type-id-427' 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-425' size-in-bits='64' id='type-id-428'/>
     <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-428' 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-427' 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-428' 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-427' name='err_pos'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_resolve_priorities' mangled-name='_gnutls_resolve_priorities' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_resolve_priorities@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-27' name='priorities'/>
-      <return type-id='type-id-376'/>
+      <return type-id='type-id-377'/>
+    </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-237' name='session'/>
+      <parameter type-id='type-id-425' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-425' name='priority_cache'/>
+      <return type-id='type-id-112'/>
     </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-429'>
       <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-429' id='type-id-430'/>
     <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-425' name='pcache'/>
+      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-430' 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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strlen' mangled-name='strlen' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strchr' mangled-name='strchr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
+    </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'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='c_strncasecmp' mangled-name='c_strncasecmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strncasecmp' mangled-name='strncasecmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_protocol_get_id' mangled-name='gnutls_protocol_get_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
-    </function-decl>
-    <function-decl name='gnutls_certificate_type_get_id' mangled-name='gnutls_certificate_type_get_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
+    </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'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-decl name='__getdelim' mangled-name='__getdelim' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+    <function-decl name='__xstat' mangled-name='__xstat' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-decl name='fmemopen' mangled-name='fmemopen' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+    <function-decl name='ini_parse' mangled-name='ini_parse' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-decl name='__xstat' mangled-name='__xstat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+    <function-decl name='exit' mangled-name='exit' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-112'/>
     </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 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'/>
+    </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>
+    <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>
+    <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'/>
+    </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>
+    <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'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='_gnutls_digest_exists' mangled-name='_gnutls_digest_exists' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_digest_exists@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-211' name='algo'/>
+      <parameter type-id='type-id-212' name='algo'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_get_crypto_mac' mangled-name='_gnutls_get_crypto_mac' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_session_set_id' mangled-name='gnutls_session_set_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-57' name='sid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_desc' mangled-name='gnutls_session_get_desc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_desc@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <return type-id='type-id-376'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <return type-id='type-id-377'/>
     </function-decl>
     <function-decl name='gnutls_session_force_valid' mangled-name='gnutls_session_force_valid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_force_valid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_session_set_data' mangled-name='gnutls_session_set_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='session_data'/>
       <parameter type-id='type-id-100' name='session_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_id2' mangled-name='gnutls_session_get_id2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_id2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='session_id'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-276' name='session_id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_id' mangled-name='gnutls_session_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='session_id'/>
-      <parameter type-id='type-id-421' name='session_id_size'/>
+      <parameter type-id='type-id-423' name='session_id_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_data2' mangled-name='gnutls_session_get_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_data2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-276' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_data' mangled-name='gnutls_session_get_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='session_data'/>
-      <parameter type-id='type-id-421' name='session_data_size'/>
+      <parameter type-id='type-id-423' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='snprintf' mangled-name='snprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_certificate_type_get_name' mangled-name='gnutls_certificate_type_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_db_check_entry_expire_time' mangled-name='gnutls_db_check_entry_expire_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_check_entry_expire_time@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-275' name='entry'/>
+      <parameter type-id='type-id-276' name='entry'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_db_check_entry_time' mangled-name='gnutls_db_check_entry_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_check_entry_time@@GNUTLS_3_4'>
-      <parameter type-id='type-id-275' name='entry'/>
+      <parameter type-id='type-id-276' name='entry'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_db_check_entry' mangled-name='gnutls_db_check_entry' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_check_entry@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-62' name='session_entry'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -5786,139 +5849,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-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-22' name='seconds'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_db_get_ptr' mangled-name='gnutls_db_get_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_get_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-102'/>
     </function-decl>
     <function-decl name='gnutls_db_set_ptr' mangled-name='gnutls_db_set_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='ptr'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_db_set_store_function' mangled-name='gnutls_db_set_store_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_store_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-155' name='store_func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-156' name='store_func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_db_set_remove_function' mangled-name='gnutls_db_set_remove_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_remove_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-157' name='rem_func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-158' name='rem_func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_db_set_retrieve_function' mangled-name='gnutls_db_set_retrieve_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_retrieve_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-156' name='retr_func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-157' name='retr_func'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_base64_encode2' mangled-name='gnutls_base64_encode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_base64_encode2@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-276' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_base64_decode2' mangled-name='gnutls_base64_decode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_base64_decode2@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-57' name='base64'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-276' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_decode2' mangled-name='gnutls_pem_base64_decode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pem_base64_decode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='header'/>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-276' 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-421' name='result_size'/>
+      <parameter type-id='type-id-423' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_encode2' mangled-name='gnutls_pem_base64_encode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pem_base64_encode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='header'/>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-276' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_encode' mangled-name='gnutls_pem_base64_encode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pem_base64_encode@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='msg'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-376' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-377' name='result'/>
+      <parameter type-id='type-id-423' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='memmem' mangled-name='memmem' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_ext_get_current_msg' mangled-name='gnutls_ext_get_current_msg' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_get_current_msg@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_ext_get_data' mangled-name='gnutls_ext_get_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_get_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='tls_id'/>
-      <parameter type-id='type-id-357' name='data'/>
+      <parameter type-id='type-id-358' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ext_set_data' mangled-name='gnutls_ext_set_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_set_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='tls_id'/>
-      <parameter type-id='type-id-298' name='data'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-299' name='data'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_session_ext_register' mangled-name='gnutls_session_ext_register' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ext_register@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='name'/>
       <parameter type-id='type-id-22' name='id'/>
-      <parameter type-id='type-id-338' name='parse_type'/>
-      <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-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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ext_register' mangled-name='gnutls_ext_register' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_register@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
       <parameter type-id='type-id-22' name='id'/>
-      <parameter type-id='type-id-338' name='parse_type'/>
-      <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-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'/>
       <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'>
@@ -5926,225 +5989,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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_auth_client_get_type' mangled-name='gnutls_auth_client_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_auth_client_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-309'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-310'/>
     </function-decl>
     <function-decl name='gnutls_auth_server_get_type' mangled-name='gnutls_auth_server_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_auth_server_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-309'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-310'/>
     </function-decl>
     <function-decl name='gnutls_auth_get_type' mangled-name='gnutls_auth_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_auth_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-309'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-310'/>
     </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-102' size-in-bits='64' id='type-id-431'/>
     <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-414' name='session'/>
+      <parameter type-id='type-id-310' name='type'/>
+      <parameter type-id='type-id-431' 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-414' name='session'/>
+      <parameter type-id='type-id-310' name='type'/>
       <parameter type-id='type-id-102' name='cred'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_credentials_clear' mangled-name='gnutls_credentials_clear' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_credentials_clear@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='calloc' mangled-name='calloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-414' name='session'/>
       <parameter type-id='type-id-10' name='entity'/>
       <parameter type-id='type-id-32' name='version'/>
       <parameter type-id='type-id-30' name='kx'/>
       <parameter type-id='type-id-29' name='cipher'/>
       <parameter type-id='type-id-31' name='mac'/>
-      <parameter type-id='type-id-367' name='comp'/>
+      <parameter type-id='type-id-368' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-432'/>
     <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-432' name='hash'/>
       <parameter type-id='type-id-64' name='digest'/>
-      <parameter type-id='type-id-418' name='digest_size'/>
+      <parameter type-id='type-id-420' name='digest_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_encode_ber_digest_info' mangled-name='gnutls_encode_ber_digest_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_encode_ber_digest_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='hash'/>
+      <parameter type-id='type-id-212' name='hash'/>
       <parameter type-id='type-id-57' name='digest'/>
-      <parameter type-id='type-id-275' name='output'/>
+      <parameter type-id='type-id-276' name='output'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_decode_gost_rs_value' mangled-name='gnutls_decode_gost_rs_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_decode_gost_rs_value@@GNUTLS_3_6_3'>
       <parameter type-id='type-id-57' name='sig_value'/>
-      <parameter type-id='type-id-275' name='r'/>
-      <parameter type-id='type-id-275' name='s'/>
+      <parameter type-id='type-id-276' name='r'/>
+      <parameter type-id='type-id-276' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_encode_gost_rs_value' mangled-name='gnutls_encode_gost_rs_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_encode_gost_rs_value@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-275' name='sig_value'/>
+      <parameter type-id='type-id-276' name='sig_value'/>
       <parameter type-id='type-id-57' name='r'/>
       <parameter type-id='type-id-57' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_decode_ber_rs_raw' mangled-name='_gnutls_decode_ber_rs_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_decode_ber_rs_raw@@GNUTLS_FIPS140_3_4'>
       <parameter type-id='type-id-57' name='sig_value'/>
-      <parameter type-id='type-id-275' name='r'/>
-      <parameter type-id='type-id-275' name='s'/>
+      <parameter type-id='type-id-276' name='r'/>
+      <parameter type-id='type-id-276' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_decode_rs_value' mangled-name='gnutls_decode_rs_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_decode_rs_value@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-57' name='sig_value'/>
-      <parameter type-id='type-id-275' name='r'/>
-      <parameter type-id='type-id-275' name='s'/>
+      <parameter type-id='type-id-276' name='r'/>
+      <parameter type-id='type-id-276' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_encode_ber_rs_raw' mangled-name='_gnutls_encode_ber_rs_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_encode_ber_rs_raw@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-275' name='sig_value'/>
+      <parameter type-id='type-id-276' name='sig_value'/>
       <parameter type-id='type-id-57' name='r'/>
       <parameter type-id='type-id-57' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_encode_rs_value' mangled-name='gnutls_encode_rs_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_encode_rs_value@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-275' name='sig_value'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <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-419' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-432' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-434' 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-435' 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-420' 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-436' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
@@ -6159,138 +6222,141 @@
         <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-437' 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-438' 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-439' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-375' 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-440' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='glob_ocsp_func' type-id='type-id-164' visibility='default'/>
+        <var-decl name='glob_ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='glob_ocsp_func_ptr' type-id='type-id-102' 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-441'>
       <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-441' id='type-id-442'/>
+    <class-decl name='gnutls_params_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-443'>
       <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-442' 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-444' 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-444'>
       <data-member access='private'>
-        <var-decl name='dh' type-id='type-id-417' visibility='default'/>
+        <var-decl name='dh' type-id='type-id-419' 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-445' 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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cert_list' type-id='type-id-161' visibility='default'/>
+        <var-decl name='cert_list' type-id='type-id-162' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert_list_length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='names' type-id='type-id-450' visibility='default'/>
+        <var-decl name='names' type-id='type-id-452' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ocsp_func' type-id='type-id-164' visibility='default'/>
+        <var-decl name='ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='ocsp_func_ptr' type-id='type-id-102' 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-453' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
         <var-decl name='ocsp_data_length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4480'>
-        <var-decl name='pkey' type-id='type-id-401' visibility='default'/>
+        <var-decl name='pkey' type-id='type-id-402' 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-454'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='str' type-id='type-id-376' visibility='default'/>
+        <var-decl name='str' type-id='type-id-377' 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-453' visibility='default'/>
+        <var-decl name='next' type-id='type-id-455' 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-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'/>
 
-    <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-275' size-in-bits='4096' id='type-id-453'>
+      <subrange length='8' type-id='type-id-38' id='type-id-134'/>
 
     </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-451' id='type-id-450'/>
+    <pointer-type-def type-id='type-id-450' size-in-bits='64' id='type-id-435'/>
+    <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='pkcs11_token' type-id='type-id-376' visibility='default'/>
+        <var-decl name='pkcs11_token' type-id='type-id-377' 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'/>
+        <var-decl name='cert' type-id='type-id-388' 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'/>
@@ -6305,7 +6371,7 @@
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-375' 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'/>
@@ -6320,93 +6386,93 @@
         <var-decl name='der' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='san' type-id='type-id-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'/>
+        <var-decl name='asn' type-id='type-id-388' 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-436'/>
+    <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>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='key_type' type-id='type-id-380' visibility='default'/>
+        <var-decl name='key_type' type-id='type-id-381' 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'/>
+        <var-decl name='x509' type-id='type-id-384' 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'/>
+        <var-decl name='pkcs11' type-id='type-id-385' 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-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'/>
+    <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'/>
+    <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'/>
@@ -6415,552 +6481,556 @@
         <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-433' 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'>
+    <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'/>
 
     </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-164' 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'/>
 
-    <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-440'>
       <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-202' name='sec_param'/>
+      <parameter type-id='type-id-489' name='res'/>
+      <parameter type-id='type-id-203' name='sec_param'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_dh_params' mangled-name='gnutls_certificate_set_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-487' name='res'/>
-      <parameter type-id='type-id-417' name='dh_params'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='res'/>
+      <parameter type-id='type-id-419' name='dh_params'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verification_status_print' mangled-name='gnutls_certificate_verification_status_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verification_status_print@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='status'/>
       <parameter type-id='type-id-19' name='type'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-276' 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-487' name='cred'/>
-      <parameter type-id='type-id-171' name='func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='cred'/>
+      <parameter type-id='type-id-172' name='func'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='cred'/>
+      <parameter type-id='type-id-439' name='func'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='cred'/>
+      <parameter type-id='type-id-438' name='func'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='cred'/>
+      <parameter type-id='type-id-437' name='func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_certificate_server_set_request' mangled-name='gnutls_certificate_server_set_request' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_server_set_request@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-148' name='req'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-149' name='req'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='sc'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='sc'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <parameter type-id='type-id-276' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='sc'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-489' name='sc'/>
+      <return type-id='type-id-112'/>
     </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-427' name='names'/>
       <parameter type-id='type-id-22' name='names_size'/>
-      <parameter type-id='type-id-161' name='pcert_list'/>
+      <parameter type-id='type-id-162' name='pcert_list'/>
       <parameter type-id='type-id-22' name='pcert_list_size'/>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
-    </function-decl>
-    <function-type size-in-bits='64' id='type-id-493'>
-      <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'/>
+      <return type-id='type-id-112'/>
+    </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'/>
+    </function-decl>
+    <function-type size-in-bits='64' id='type-id-495'>
+      <parameter type-id='type-id-414'/>
+      <parameter type-id='type-id-493'/>
+      <parameter type-id='type-id-484'/>
+      <parameter type-id='type-id-420'/>
+      <parameter type-id='type-id-494'/>
+      <parameter type-id='type-id-420'/>
+      <parameter type-id='type-id-485'/>
+      <parameter type-id='type-id-420'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-484'>
-      <parameter type-id='type-id-413'/>
+    <function-type size-in-bits='64' id='type-id-486'>
+      <parameter type-id='type-id-414'/>
       <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-420'/>
+      <parameter type-id='type-id-485'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-480'>
-      <parameter type-id='type-id-413'/>
+    <function-type size-in-bits='64' id='type-id-482'>
+      <parameter type-id='type-id-414'/>
       <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'>
-      <parameter type-id='type-id-413'/>
-      <parameter type-id='type-id-440'/>
-      <parameter type-id='type-id-445'/>
+    <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'/>
       <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'>
-    <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'/>
+  <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'/>
+    <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'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
     </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-122' 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'/>
-      <return type-id='type-id-111'/>
+      <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'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-517' name='time_func'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-503' name='log_func'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-500' name='log_func'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_strerror' mangled-name='gnutls_strerror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strverscmp' mangled-name='strverscmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='bindtextdomain' mangled-name='bindtextdomain' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='asn1_array2tree' mangled-name='asn1_array2tree' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-505'>
+    <function-type size-in-bits='64' id='type-id-507'>
       <parameter type-id='type-id-102'/>
       <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'/>
+      <return type-id='type-id-112'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-499'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-501'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-27'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-502'>
+    <function-type size-in-bits='64' id='type-id-504'>
       <parameter type-id='type-id-100'/>
       <return type-id='type-id-102'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-508'>
+    <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'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
+    <class-decl name='gnutls_anon_server_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-518'>
       <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-419' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-432' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-434' 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-202' name='sec_param'/>
+      <parameter type-id='type-id-520' name='res'/>
+      <parameter type-id='type-id-203' name='sec_param'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_anon_set_server_dh_params' mangled-name='gnutls_anon_set_server_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anon_set_server_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-518' name='res'/>
-      <parameter type-id='type-id-417' name='dh_params'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-520' name='res'/>
+      <parameter type-id='type-id-419' name='dh_params'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-523' name='sc'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-520' name='sc'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-520' name='res'/>
+      <parameter type-id='type-id-434' name='func'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
+    <var-decl name='gnutls_secure_malloc' type-id='type-id-506' mangled-name='gnutls_secure_malloc' visibility='default' elf-symbol-id='gnutls_secure_malloc@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_malloc' type-id='type-id-506' mangled-name='gnutls_malloc' visibility='default' elf-symbol-id='gnutls_malloc@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_free' type-id='type-id-513' mangled-name='gnutls_free' visibility='default' elf-symbol-id='gnutls_free@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_realloc' type-id='type-id-512' mangled-name='gnutls_realloc' visibility='default' elf-symbol-id='gnutls_realloc@@GNUTLS_3_4'/>
+    <pointer-type-def type-id='type-id-526' size-in-bits='64' id='type-id-527'/>
+    <typedef-decl name='gnutls_calloc_function' type-id='type-id-527' id='type-id-528'/>
+    <var-decl name='gnutls_calloc' type-id='type-id-528' mangled-name='gnutls_calloc' visibility='default' elf-symbol-id='gnutls_calloc@@GNUTLS_3_4'/>
+    <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'/>
+      <return type-id='type-id-377'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-524'>
+    <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'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_fingerprint' mangled-name='gnutls_fingerprint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_fingerprint@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algo'/>
+      <parameter type-id='type-id-212' name='algo'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-102' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-423' 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'>
+  <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-111'/>
+      <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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
@@ -6996,44 +7066,44 @@
       <enumerator name='GNUTLS_A_NO_APPLICATION_PROTOCOL' value='120'/>
       <enumerator name='GNUTLS_A_MAX' value='120'/>
     </enum-decl>
-    <typedef-decl name='gnutls_alert_description_t' type-id='type-id-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'/>
+      <parameter type-id='type-id-237' 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-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-22' name='err'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_error_to_alert' mangled-name='gnutls_error_to_alert' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_error_to_alert@@GNUTLS_3_4'>
       <parameter type-id='type-id-22' name='err'/>
-      <parameter type-id='type-id-364' name='level'/>
+      <parameter type-id='type-id-365' 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-237' name='session'/>
+      <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'>
-    <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' id='type-id-392'>
+  <abi-instr version='1.0' address-size='64' path='privkey_raw.c' comp-dir-path='/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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk_algorithm' type-id='type-id-60' visibility='default'/>
       </data-member>
@@ -7047,16 +7117,16 @@
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='uinfo' type-id='type-id-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'/>
+        <var-decl name='url' type-id='type-id-377' 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'/>
@@ -7065,26 +7135,26 @@
         <var-decl name='mutex' type-id='type-id-102' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-375' 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'/>
@@ -7093,216 +7163,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>
@@ -7310,75 +7380,75 @@
         <var-decl name='minor' type-id='type-id-35' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ck_rv_t' type-id='type-id-38' id='type-id-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'/>
+        <var-decl name='manufacturer_id' type-id='type-id-274' 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'/>
+        <var-decl name='library_description' type-id='type-id-274' 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'/>
+        <var-decl name='manufacturer_id' type-id='type-id-274' 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'/>
+        <var-decl name='label' type-id='type-id-274' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='manufacturer_id' type-id='type-id-273' visibility='default'/>
+        <var-decl name='manufacturer_id' type-id='type-id-274' 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'/>
@@ -7411,28 +7481,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'>
+    <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'/>
 
     </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>
@@ -7440,59 +7510,59 @@
         <var-decl name='max_key_size' type-id='type-id-38' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='flags' type-id='type-id-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'/>
@@ -7501,28 +7571,28 @@
         <var-decl name='value_len' type-id='type-id-38' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ck_attribute_type_t' type-id='type-id-38' id='type-id-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'/>
@@ -7531,67 +7601,67 @@
         <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-402' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-211' name='digest'/>
-      <parameter type-id='type-id-315' name='paramset'/>
+      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-316' name='paramset'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
       <parameter type-id='type-id-57' name='k'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ecc_raw' mangled-name='gnutls_privkey_import_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' 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'/>
@@ -7599,7 +7669,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_dsa_raw' mangled-name='gnutls_privkey_import_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' 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'/>
@@ -7608,7 +7678,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_rsa_raw' mangled-name='gnutls_privkey_import_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' 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'/>
@@ -7619,842 +7689,847 @@
       <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-316' 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-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-402' name='key'/>
+      <parameter type-id='type-id-711' name='curve'/>
+      <parameter type-id='type-id-432' 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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_ecc_raw' mangled-name='gnutls_privkey_export_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-709' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-402' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_dsa_raw' mangled-name='gnutls_privkey_export_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_rsa_raw' mangled-name='gnutls_privkey_export_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
-      <parameter type-id='type-id-275' name='e1'/>
-      <parameter type-id='type-id-275' name='e2'/>
+      <parameter type-id='type-id-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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_rsa_raw2' mangled-name='gnutls_privkey_export_rsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_rsa_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
-      <parameter type-id='type-id-275' name='e1'/>
-      <parameter type-id='type-id-275' name='e2'/>
+      <parameter type-id='type-id-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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_dsa_raw2' mangled-name='gnutls_privkey_export_dsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_dsa_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_ecc_raw2' mangled-name='gnutls_privkey_export_ecc_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_ecc_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-709' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-402' 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-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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+    <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'/>
-      <return type-id='type-id-612'/>
+      <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'/>
+    <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'/>
-      <return type-id='type-id-612'/>
+      <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 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-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-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-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-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-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-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-653'>
-      <parameter type-id='type-id-541'/>
-      <parameter type-id='type-id-616'/>
+    <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-651'/>
-      <parameter type-id='type-id-652'/>
-      <return type-id='type-id-612'/>
-    </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'/>
+      <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'>
+    <function-type size-in-bits='64' id='type-id-615'>
       <parameter type-id='type-id-102'/>
-      <return type-id='type-id-612'/>
+      <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-mine/lib' language='LANG_C99'>
+    <class-decl name='gnutls_x509_trust_list_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-713'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
+    <typedef-decl name='gnutls_x509_trust_list_t' type-id='type-id-714' id='type-id-715'/>
     <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'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='getuid' mangled-name='getuid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='getpwuid_r' mangled-name='getpwuid_r' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='malloc' mangled-name='malloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='abort' mangled-name='abort' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='recv' mangled-name='recv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='setsockopt' mangled-name='setsockopt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='sendmsg' mangled-name='sendmsg' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='connect' mangled-name='connect' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-155' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-275' name='output'/>
+      <parameter type-id='type-id-276' 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-275' name='output'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='u16_normalize' mangled-name='u16_normalize' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-719' name='gettime_func'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-715'>
-      <parameter type-id='type-id-714'/>
-      <return type-id='type-id-111'/>
+    <function-type size-in-bits='64' id='type-id-717'>
+      <parameter type-id='type-id-716'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+    </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'/>
+    </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'>
     <function-decl name='gnutls_hex_encode2' mangled-name='gnutls_hex_encode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hex_encode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-276' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_hex_encode' mangled-name='gnutls_hex_encode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hex_encode@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-376' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-377' name='result'/>
+      <parameter type-id='type-id-423' 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-423' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_hex_decode2' mangled-name='gnutls_hex_decode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hex_decode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='hex_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-276' 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-421' name='bin_size'/>
+      <parameter type-id='type-id-423' 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-376' name='buffer'/>
+      <parameter type-id='type-id-377' name='buffer'/>
       <parameter type-id='type-id-100' name='buffer_size'/>
       <parameter type-id='type-id-27' name='separator'/>
-      <return type-id='type-id-376'/>
+      <return type-id='type-id-377'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_to_datum' mangled-name='_gnutls_buffer_to_datum' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_buffer_to_datum@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-237' name='str'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-238' name='str'/>
+      <parameter type-id='type-id-276' name='data'/>
       <parameter type-id='type-id-10' name='is_str'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_append_str' mangled-name='_gnutls_buffer_append_str' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_buffer_append_str@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-237' name='dest'/>
+      <parameter type-id='type-id-238' name='dest'/>
       <parameter type-id='type-id-27' name='src'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_buffer_append_data' mangled-name='gnutls_buffer_append_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_buffer_append_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-350' name='dest'/>
+      <parameter type-id='type-id-351' name='dest'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' name='data_size'/>
       <return type-id='type-id-22'/>
     </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'/>
+      <parameter type-id='type-id-238' name='str'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strrchr' mangled-name='strrchr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='hex_encode' mangled-name='hex_encode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strtoul' mangled-name='strtoul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='sprintf' mangled-name='sprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strncat' mangled-name='strncat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-347' name='password'/>
       <parameter type-id='type-id-10' name='plen'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='u32_normalize' mangled-name='u32_normalize' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='u8_check' mangled-name='u8_check' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_idna_reverse_map' mangled-name='gnutls_idna_reverse_map' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_idna_reverse_map@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='input'/>
       <parameter type-id='type-id-10' name='ilen'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-276' name='out'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_idna_map' mangled-name='gnutls_idna_map' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_idna_map@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='input'/>
       <parameter type-id='type-id-10' name='ilen'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='idn2_free' mangled-name='idn2_free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='idn2_strerror' mangled-name='idn2_strerror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <var-decl name='_gnutls_disable_tls13' type-id='type-id-10' visibility='default'/>
     <function-decl name='gnutls_session_get_flags' mangled-name='gnutls_session_get_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_record_set_state' mangled-name='gnutls_record_set_state' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_state@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-10' name='read'/>
-      <parameter type-id='type-id-346' name='seq_number'/>
+      <parameter type-id='type-id-347' name='seq_number'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_record_get_state' mangled-name='gnutls_record_get_state' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_state@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-10' name='read'/>
-      <parameter type-id='type-id-275' name='mac_key'/>
-      <parameter type-id='type-id-275' name='IV'/>
-      <parameter type-id='type-id-275' name='cipher_key'/>
+      <parameter type-id='type-id-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-64' name='seq_number'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_hook_function' mangled-name='gnutls_handshake_set_hook_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_hook_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-10' name='htype'/>
       <parameter type-id='type-id-22' name='when'/>
-      <parameter type-id='type-id-159' name='func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-160' name='func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_random' mangled-name='gnutls_handshake_set_random' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_random@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-57' name='random'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_master_secret' mangled-name='gnutls_session_get_master_secret' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_master_secret@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='secret'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-276' name='secret'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_session_get_random' mangled-name='gnutls_session_get_random' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_random@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='client'/>
-      <parameter type-id='type-id-275' name='server'/>
-      <return type-id='type-id-111'/>
+      <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'/>
     </function-decl>
     <function-decl name='gnutls_protocol_get_version' mangled-name='gnutls_protocol_get_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_protocol_get_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='gnutls_group_get' mangled-name='gnutls_group_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_group_get@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='gnutls_ecc_curve_get' mangled-name='gnutls_ecc_curve_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ecc_curve_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' 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-275' name='cb'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-721' name='cbtype'/>
+      <parameter type-id='type-id-276' name='cb'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_enable_compatibility_mode' mangled-name='gnutls_session_enable_compatibility_mode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_enable_compatibility_mode@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_post_client_hello_function' mangled-name='gnutls_handshake_set_post_client_hello_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_post_client_hello_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-158' name='func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-159' name='func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_rsa_pms_set_version' mangled-name='_gnutls_rsa_pms_set_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_rsa_pms_set_version@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_record_get_direction' mangled-name='gnutls_record_get_direction' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_direction@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_set_verify_function' mangled-name='gnutls_session_set_verify_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_verify_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-171' name='func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-172' name='func'/>
+      <return type-id='type-id-112'/>
     </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-414' name='session'/>
       <parameter type-id='type-id-102' name='ptr'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_session_get_ptr' mangled-name='gnutls_session_get_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-102'/>
     </function-decl>
     <function-decl name='gnutls_session_resumption_requested' mangled-name='gnutls_session_resumption_requested' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_resumption_requested@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_is_resumed' mangled-name='gnutls_session_is_resumed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_is_resumed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_private_extensions' mangled-name='gnutls_handshake_set_private_extensions' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_private_extensions@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-22' name='allow'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_hello_set_default_version' mangled-name='_gnutls_hello_set_default_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_hello_set_default_version@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_record_set_default_version' mangled-name='_gnutls_record_set_default_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_record_set_default_version@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_certificate_send_x509_rdn_sequence' mangled-name='gnutls_certificate_send_x509_rdn_sequence' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_send_x509_rdn_sequence@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-22' name='allow'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_deinit' mangled-name='gnutls_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-112'/>
     </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-414' 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>
     <function-decl name='gnutls_compression_get' mangled-name='gnutls_compression_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_compression_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-367'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <return type-id='type-id-368'/>
     </function-decl>
     <function-decl name='gnutls_mac_get' mangled-name='gnutls_mac_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-31'/>
     </function-decl>
     <function-decl name='gnutls_kx_get' mangled-name='gnutls_kx_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_kx_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='gnutls_certificate_type_get' mangled-name='gnutls_certificate_type_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_type_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-19'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get' mangled-name='gnutls_cipher_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-29'/>
     </function-decl>
     <function-decl name='gnutls_certificate_type_get2' mangled-name='gnutls_certificate_type_get2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_type_get2@@GNUTLS_3_6_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-428' name='target'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-430' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_status_request_enable_client' mangled-name='gnutls_ocsp_status_request_enable_client' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-419' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-432' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-434' 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-435' 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-420' 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'/>
@@ -8469,71 +8544,74 @@
         <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-437' 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-438' 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-439' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-375' 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-440' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='glob_ocsp_func' type-id='type-id-164' visibility='default'/>
+        <var-decl name='glob_ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='glob_ocsp_func_ptr' type-id='type-id-102' 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-375' name='fn'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-725' name='sc'/>
+      <return type-id='type-id-112'/>
     </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-422' 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-422' 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-422' 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'/>
+        <var-decl name='crl' type-id='type-id-388' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='rcache' type-id='type-id-387' visibility='default'/>
+        <var-decl name='rcache' type-id='type-id-388' 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'/>
@@ -8548,312 +8626,312 @@
         <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-422' 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-422' 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-422' 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-422' 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-422' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-725' name='res'/>
+      <parameter type-id='type-id-730' name='tlist'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-420' 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-384' 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'/>
+      <parameter type-id='type-id-384' 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-422' 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-422' 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-422' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_load_file' mangled-name='gnutls_load_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_load_file@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='filename'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-276' 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'>
-    <class-decl name='gnutls_supplemental_entry_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-295'>
+  <abi-instr version='1.0' address-size='64' path='supplemental.c' comp-dir-path='/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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-376' visibility='default'/>
+        <var-decl name='name' type-id='type-id-377' 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-349' id='type-id-734'/>
+    <typedef-decl name='gnutls_supp_send_func' type-id='type-id-353' 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-237' name='session'/>
       <parameter type-id='type-id-10' name='do_send_supplemental'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_supplemental_recv' mangled-name='gnutls_supplemental_recv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_supplemental_recv@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='do_send_supplemental'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_session_supplemental_register' mangled-name='gnutls_session_supplemental_register' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_supplemental_register@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='name'/>
-      <parameter type-id='type-id-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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-738' name='level'/>
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-100' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-131' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-740' name='handle'/>
+      <return type-id='type-id-112'/>
     </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-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-249' name='auth_iov'/>
+      <parameter type-id='type-id-250' name='auth_iov'/>
       <parameter type-id='type-id-22' name='auth_iovcnt'/>
       <parameter type-id='type-id-100' name='tag_size'/>
-      <parameter type-id='type-id-249' name='iov'/>
+      <parameter type-id='type-id-250' name='iov'/>
       <parameter type-id='type-id-22' name='iovcnt'/>
       <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-421' name='ctext_len'/>
+      <parameter type-id='type-id-423' 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-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'/>
@@ -8862,11 +8940,11 @@
       <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-423' 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-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'/>
@@ -8875,55 +8953,55 @@
       <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-423' 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'/>
+    <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'/>
     </function-decl>
     <function-decl name='gnutls_key_generate' mangled-name='gnutls_key_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_key_generate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-275' name='key'/>
+      <parameter type-id='type-id-276' 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-211' name='algorithm'/>
+      <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-211' name='algorithm'/>
+      <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-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'/>
+    <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_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-744' name='handle'/>
       <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-744' name='handle'/>
       <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-744' name='handle'/>
       <parameter type-id='type-id-102' name='ptext'/>
       <parameter type-id='type-id-100' 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-211' name='algorithm'/>
+      <parameter type-id='type-id-745' name='dig'/>
+      <parameter type-id='type-id-212' name='algorithm'/>
       <return type-id='type-id-22'/>
     </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'>
@@ -8939,55 +9017,55 @@
       <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'/>
+    <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-746' name='handle'/>
+      <parameter type-id='type-id-748' name='handle'/>
       <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-748' name='handle'/>
       <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-748' name='handle'/>
       <parameter type-id='type-id-102' name='ptext'/>
       <parameter type-id='type-id-100' 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-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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
       <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
+      <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='ctx_dec' type-id='type-id-98' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-752' name='handle'/>
+      <return type-id='type-id-112'/>
     </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-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'/>
@@ -8995,7 +9073,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_cipher_encrypt2' mangled-name='gnutls_cipher_encrypt2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_encrypt2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-750' name='handle'/>
+      <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'/>
@@ -9003,98 +9081,104 @@
       <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-752' name='handle'/>
       <parameter type-id='type-id-102' name='ctext'/>
       <parameter type-id='type-id-100' 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-752' name='handle'/>
+      <parameter type-id='type-id-102' name='ptext'/>
+      <parameter type-id='type-id-100' 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'/>
       <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-752' name='handle'/>
       <parameter type-id='type-id-102' name='iv'/>
       <parameter type-id='type-id-100' name='ivlen'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-752' name='handle'/>
       <parameter type-id='type-id-102' name='ptext'/>
       <parameter type-id='type-id-100' 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-752' name='handle'/>
       <parameter type-id='type-id-102' name='tag'/>
       <parameter type-id='type-id-100' 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_mac_fast' mangled-name='_gnutls_mac_fast' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-321' 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-402' 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-401' name='privkey'/>
-      <parameter type-id='type-id-753' name='spki'/>
+      <parameter type-id='type-id-402' 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-401' name='key'/>
+      <parameter type-id='type-id-402' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_status' mangled-name='gnutls_privkey_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_set_flags' mangled-name='gnutls_privkey_set_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_set_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_privkey_set_pin_function' mangled-name='gnutls_privkey_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-402' name='key'/>
+      <parameter type-id='type-id-376' name='fn'/>
       <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_url' mangled-name='gnutls_privkey_import_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' name='key'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_x509_raw' mangled-name='gnutls_privkey_import_x509_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_x509_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-402' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_decrypt_data2' mangled-name='gnutls_privkey_decrypt_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_decrypt_data2@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' 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'/>
@@ -9102,148 +9186,148 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_decrypt_data' mangled-name='gnutls_privkey_decrypt_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_decrypt_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-402' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='ciphertext'/>
-      <parameter type-id='type-id-275' name='plaintext'/>
+      <parameter type-id='type-id-276' name='plaintext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_hash' mangled-name='gnutls_privkey_sign_hash' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_sign_hash@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='signer'/>
-      <parameter type-id='type-id-211' name='hash_algo'/>
+      <parameter type-id='type-id-402' name='signer'/>
+      <parameter type-id='type-id-212' name='hash_algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='hash_data'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-276' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_hash2' mangled-name='gnutls_privkey_sign_hash2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_sign_hash2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='signer'/>
+      <parameter type-id='type-id-402' name='signer'/>
       <parameter type-id='type-id-21' name='algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='hash_data'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-276' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_data2' mangled-name='gnutls_privkey_sign_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_sign_data2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='signer'/>
+      <parameter type-id='type-id-402' name='signer'/>
       <parameter type-id='type-id-21' name='algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-276' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_data' mangled-name='gnutls_privkey_sign_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_sign_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='signer'/>
-      <parameter type-id='type-id-211' name='hash'/>
+      <parameter type-id='type-id-402' name='signer'/>
+      <parameter type-id='type-id-212' name='hash'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-276' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_generate' mangled-name='gnutls_privkey_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_generate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-402' name='pkey'/>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_x509' mangled-name='gnutls_privkey_export_x509' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_x509@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
-      <parameter type-id='type-id-730' name='key'/>
+      <parameter type-id='type-id-402' 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-401' name='pkey'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-402' 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>
     <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-402' name='pkey'/>
       <parameter type-id='type-id-102' 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-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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ext3' mangled-name='gnutls_privkey_import_ext3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ext3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-402' name='pkey'/>
       <parameter type-id='type-id-102' 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-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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ext2' mangled-name='gnutls_privkey_import_ext2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ext2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-402' name='pkey'/>
       <parameter type-id='type-id-60' name='pk'/>
       <parameter type-id='type-id-102' 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-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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ext' mangled-name='gnutls_privkey_import_ext' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ext@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-402' name='pkey'/>
       <parameter type-id='type-id-60' name='pk'/>
       <parameter type-id='type-id-102' 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-395' name='sign_func'/>
+      <parameter type-id='type-id-398' 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-385' 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-402' 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-401' name='key'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-402' name='key'/>
+      <return type-id='type-id-112'/>
     </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-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'/>
       <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-402' name='key'/>
+      <parameter type-id='type-id-432' name='digest'/>
       <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-421' name='seed_size'/>
+      <parameter type-id='type-id-423' name='seed_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_get_type' mangled-name='gnutls_privkey_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <return type-id='type-id-380'/>
+      <parameter type-id='type-id-402' name='key'/>
+      <return type-id='type-id-381'/>
     </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-402' name='key'/>
+      <parameter type-id='type-id-420' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_pkcs11' mangled-name='gnutls_privkey_import_pkcs11' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_pkcs11@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-402' name='pkey'/>
+      <parameter type-id='type-id-385' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-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'/>
@@ -9252,260 +9336,263 @@
         <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-402' 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>
     <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strncmp' mangled-name='strncmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <parameter type-id='type-id-162' name='pcert'/>
+      <return type-id='type-id-112'/>
     </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-162' 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-161' name='pcert'/>
-      <parameter type-id='type-id-267' name='pubkey'/>
+      <parameter type-id='type-id-162' name='pcert'/>
+      <parameter type-id='type-id-268' name='pubkey'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pcert_import_x509_raw' mangled-name='gnutls_pcert_import_x509_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_import_x509_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-161' name='pcert'/>
+      <parameter type-id='type-id-162' name='pcert'/>
       <parameter type-id='type-id-57' name='cert'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-162' name='pcert_list'/>
+      <parameter type-id='type-id-420' 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-375' name='pin_fn'/>
+      <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-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-162' name='pcert_list'/>
+      <parameter type-id='type-id-420' 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-422' 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-162' name='pcert_list'/>
+      <parameter type-id='type-id-458' name='crt'/>
+      <parameter type-id='type-id-420' 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-162' 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-161' name='pcert'/>
+      <parameter type-id='type-id-162' name='pcert'/>
       <parameter type-id='type-id-57' name='rawpubkey'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
+    </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'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-268' 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-267' name='pubkey'/>
-      <parameter type-id='type-id-753' name='spki'/>
+      <parameter type-id='type-id-268' 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-267' name='key'/>
+      <parameter type-id='type-id-268' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_x509_raw' mangled-name='gnutls_pubkey_import_x509_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_x509_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pkey'/>
+      <parameter type-id='type-id-268' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-268' name='key'/>
+      <parameter type-id='type-id-376' name='fn'/>
       <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_encrypt_data' mangled-name='gnutls_pubkey_encrypt_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_encrypt_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='plaintext'/>
-      <parameter type-id='type-id-275' name='ciphertext'/>
+      <parameter type-id='type-id-276' name='ciphertext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_verify_hash2' mangled-name='gnutls_pubkey_verify_hash2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_verify_hash2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' 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'/>
@@ -9513,7 +9600,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_verify_data2' mangled-name='gnutls_pubkey_verify_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_verify_data2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pubkey'/>
+      <parameter type-id='type-id-268' 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'/>
@@ -9521,7 +9608,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_dsa_raw' mangled-name='gnutls_pubkey_import_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' 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'/>
@@ -9529,166 +9616,166 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_gost_raw' mangled-name='gnutls_pubkey_import_gost_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_gost_raw@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-211' name='digest'/>
-      <parameter type-id='type-id-315' name='paramset'/>
+      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-316' name='paramset'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_ecc_x962' mangled-name='gnutls_pubkey_import_ecc_x962' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_ecc_x962@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' name='key'/>
       <parameter type-id='type-id-57' name='parameters'/>
       <parameter type-id='type-id-57' name='ecpoint'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_ecc_raw' mangled-name='gnutls_pubkey_import_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_rsa_raw' mangled-name='gnutls_pubkey_import_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' name='key'/>
       <parameter type-id='type-id-57' name='m'/>
       <parameter type-id='type-id-57' name='e'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_url' mangled-name='gnutls_pubkey_import_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' name='key'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_set_key_usage' mangled-name='gnutls_pubkey_set_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_set_key_usage@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' 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-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'/>
+        <var-decl name='crq' type-id='type-id-388' 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-267' name='key'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-268' 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-267' name='key'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-268' 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-268' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-268' name='key'/>
+      <parameter type-id='type-id-711' name='curve'/>
+      <parameter type-id='type-id-432' 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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_ecc_x962' mangled-name='gnutls_pubkey_export_ecc_x962' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_ecc_x962@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='parameters'/>
-      <parameter type-id='type-id-275' name='ecpoint'/>
+      <parameter type-id='type-id-268' name='key'/>
+      <parameter type-id='type-id-276' name='parameters'/>
+      <parameter type-id='type-id-276' name='ecpoint'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_ecc_raw2' mangled-name='gnutls_pubkey_export_ecc_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_ecc_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-709' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-268' 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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_ecc_raw' mangled-name='gnutls_pubkey_export_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-709' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-268' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_dsa_raw2' mangled-name='gnutls_pubkey_export_dsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_dsa_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_dsa_raw' mangled-name='gnutls_pubkey_export_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_rsa_raw' mangled-name='gnutls_pubkey_export_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
+      <parameter type-id='type-id-268' name='key'/>
+      <parameter type-id='type-id-276' name='m'/>
+      <parameter type-id='type-id-276' name='e'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_rsa_raw2' mangled-name='gnutls_pubkey_export_rsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_rsa_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
+      <parameter type-id='type-id-268' name='key'/>
+      <parameter type-id='type-id-276' name='m'/>
+      <parameter type-id='type-id-276' name='e'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_get_key_id' mangled-name='gnutls_pubkey_get_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_get_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' 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-423' 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-275' name='out'/>
+      <parameter type-id='type-id-268' name='key'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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'/>
@@ -9700,10 +9787,10 @@
         <var-decl name='key_usage' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-375' 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'/>
@@ -9713,207 +9800,207 @@
       <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'>
-      <subrange length='4' type-id='type-id-38' id='type-id-136'/>
+    <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'/>
 
     </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-268' 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-267' name='key'/>
-      <parameter type-id='type-id-430' name='hash'/>
-      <parameter type-id='type-id-418' name='mand'/>
+      <parameter type-id='type-id-268' name='key'/>
+      <parameter type-id='type-id-432' name='hash'/>
+      <parameter type-id='type-id-420' name='mand'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_privkey' mangled-name='gnutls_pubkey_import_privkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_privkey@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-268' name='key'/>
+      <parameter type-id='type-id-402' name='pkey'/>
       <parameter type-id='type-id-10' name='usage'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_x509_crq' mangled-name='gnutls_pubkey_import_x509_crq' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_x509_crq@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-764' name='crq'/>
+      <parameter type-id='type-id-268' 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-267' name='key'/>
-      <parameter type-id='type-id-465' name='crt'/>
+      <parameter type-id='type-id-268' 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-267' name='key'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-268' name='key'/>
+      <return type-id='type-id-112'/>
     </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-268' 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-268' name='key'/>
+      <parameter type-id='type-id-420' 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-268' name='key'/>
+      <parameter type-id='type-id-420' 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'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
-      <return type-id='type-id-111'/>
+      <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-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-431'/>
       <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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_record_get_discarded' mangled-name='gnutls_record_get_discarded' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_discarded@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-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>
@@ -9924,57 +10011,57 @@
         <var-decl name='hsk_write_seq' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_dtls_prestate_st' type-id='type-id-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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-783' name='prestate'/>
+      <return type-id='type-id-112'/>
     </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-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-781' name='prestate'/>
+      <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-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-781' name='prestate'/>
-      <parameter type-id='type-id-154' name='ptr'/>
-      <parameter type-id='type-id-151' name='push_func'/>
+      <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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dtls_get_timeout' mangled-name='gnutls_dtls_get_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_get_timeout@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_dtls_get_mtu' mangled-name='gnutls_dtls_get_mtu' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_get_mtu@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_dtls_set_data_mtu' mangled-name='gnutls_dtls_set_data_mtu' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_set_data_mtu@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='mtu'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dtls_get_data_mtu' mangled-name='gnutls_dtls_get_data_mtu' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_get_data_mtu@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_record_overhead_size' mangled-name='gnutls_record_overhead_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_overhead_size@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-100'/>
     </function-decl>
     <function-decl name='gnutls_est_record_overhead_size' mangled-name='gnutls_est_record_overhead_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_est_record_overhead_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-32' name='version'/>
       <parameter type-id='type-id-29' name='cipher'/>
       <parameter type-id='type-id-31' name='mac'/>
-      <parameter type-id='type-id-367' name='comp'/>
+      <parameter type-id='type-id-368' name='comp'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-100'/>
     </function-decl>
@@ -9986,151 +10073,151 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_dtls_set_mtu' mangled-name='gnutls_dtls_set_mtu' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_set_mtu@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='mtu'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_dtls_set_timeouts' mangled-name='gnutls_dtls_set_timeouts' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_set_timeouts@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='retrans_timeout'/>
       <parameter type-id='type-id-10' name='total_timeout'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-154' name='errno_func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_vec_push_function' mangled-name='gnutls_transport_set_vec_push_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_vec_push_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-152' name='vec_func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-153' name='vec_func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_push_function' mangled-name='gnutls_transport_set_push_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_push_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-151' name='push_func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-152' name='push_func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_pull_timeout_function' mangled-name='gnutls_transport_set_pull_timeout_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_pull_timeout_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-149' name='func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-150' name='func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_pull_function' mangled-name='gnutls_transport_set_pull_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_pull_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-150' name='pull_func'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-151' name='pull_func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_errno' mangled-name='gnutls_transport_set_errno' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_errno@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-22' name='err'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-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'/>
+    <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-212' 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-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'/>
+    <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-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'/>
     <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-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'/>
     <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-431'/>
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-782'>
-      <parameter type-id='type-id-211'/>
-      <parameter type-id='type-id-429'/>
+    <function-type size-in-bits='64' id='type-id-784'>
+      <parameter type-id='type-id-212'/>
+      <parameter type-id='type-id-431'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-788'>
-      <parameter type-id='type-id-211'/>
+    <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'/>
       <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-431'/>
       <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'/>
@@ -10142,56 +10229,56 @@
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='verify-tofu.c' comp-dir-path='/home/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-mine/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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-825' name='tdb'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-825' name='tdb'/>
+      <parameter type-id='type-id-817' name='verify'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-825' name='tdb'/>
+      <parameter type-id='type-id-816' name='cstore'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-825' name='tdb'/>
+      <parameter type-id='type-id-815' name='store'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <parameter type-id='type-id-212' name='hash_algo'/>
       <parameter type-id='type-id-57' name='hash'/>
       <parameter type-id='type-id-17' name='expiration'/>
       <parameter type-id='type-id-10' name='flags'/>
@@ -10199,7 +10286,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'/>
@@ -10210,7 +10297,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'/>
@@ -10219,28 +10306,28 @@
       <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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='mkdir' mangled-name='mkdir' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strpbrk' mangled-name='strpbrk' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-112'/>
+    </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'/>
@@ -10248,176 +10335,176 @@
       <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'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-211'/>
+      <parameter type-id='type-id-212'/>
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pin.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <var-decl name='_gnutls_pin_func' type-id='type-id-375' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='pin.c' comp-dir-path='/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'/>
     <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'/>
-      <return type-id='type-id-375'/>
+      <parameter type-id='type-id-431' name='userdata'/>
+      <return type-id='type-id-376'/>
     </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-376' name='fn'/>
       <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'>
-      <subrange length='6' type-id='type-id-38' id='type-id-230'/>
+    <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'/>
 
     </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-377' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-848' name='list'/>
+      <return type-id='type-id-112'/>
     </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-275' name='privkey'/>
-      <parameter type-id='type-id-275' name='pubkey'/>
+      <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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_tpm_url' mangled-name='gnutls_pubkey_import_tpm_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_tpm_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pkey'/>
+      <parameter type-id='type-id-268' name='pkey'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-27' name='srk_password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_tpm_url' mangled-name='gnutls_privkey_import_tpm_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_tpm_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-402' 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'/>
@@ -10425,77 +10512,77 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_tpm_raw' mangled-name='gnutls_privkey_import_tpm_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_tpm_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-402' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_tpm_raw' mangled-name='gnutls_pubkey_import_tpm_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_tpm_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pkey'/>
+      <parameter type-id='type-id-268' 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'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strstr' mangled-name='strstr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='dlclose' mangled-name='dlclose' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='dlsym' mangled-name='dlsym' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='dlopen' mangled-name='dlopen' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
@@ -10503,17 +10590,17 @@
       <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'/>
+      <return type-id='type-id-112'/>
     </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-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='safe-memfuncs.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/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'/>
@@ -10524,39 +10611,39 @@
       <parameter type-id='type-id-102' name='data'/>
       <parameter type-id='type-id-22' name='c'/>
       <parameter type-id='type-id-100' name='size'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-275' name='art'/>
+      <parameter type-id='type-id-276' name='art'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_key_fingerprint_randomart' mangled-name='_gnutls_key_fingerprint_randomart' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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>
@@ -10564,16 +10651,16 @@
         <var-decl name='name_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='import_key' type-id='type-id-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'/>
@@ -10582,30 +10669,30 @@
         <var-decl name='future2' type-id='type-id-102' 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-163' 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'>
@@ -10613,512 +10700,528 @@
       <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-111'/>
+      <return type-id='type-id-112'/>
     </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-275'/>
+      <parameter type-id='type-id-867'/>
+      <parameter type-id='type-id-276'/>
       <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'>
-      <parameter type-id='type-id-267'/>
+    <function-type size-in-bits='64' id='type-id-870'>
+      <parameter type-id='type-id-268'/>
       <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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_prf' mangled-name='gnutls_prf' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_prf@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-100' 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-27' name='extra'/>
       <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-377' 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-27' name='label'/>
+      <parameter type-id='type-id-100' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_prf_rfc5705' mangled-name='gnutls_prf_rfc5705' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_prf_rfc5705@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-100' 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-27' name='context'/>
       <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-377' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_prf_raw' mangled-name='gnutls_prf_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_prf_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-100' 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-27' name='seed'/>
       <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-377' 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'/>
+    </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'/>
+    </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_session_get_verify_cert_status' mangled-name='gnutls_session_get_verify_cert_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_verify_cert_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_session_set_verify_cert2' mangled-name='gnutls_session_set_verify_cert2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_verify_cert2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-172' name='data'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-173' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_session_set_verify_cert' mangled-name='gnutls_session_set_verify_cert' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_verify_cert@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-27' name='hostname'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_dh_get_peers_public_bits' mangled-name='gnutls_dh_get_peers_public_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_peers_public_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_get_prime_bits' mangled-name='gnutls_dh_get_prime_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_prime_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_get_secret_bits' mangled-name='gnutls_dh_get_secret_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_secret_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_get_pubkey' mangled-name='gnutls_dh_get_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_pubkey@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='raw_key'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-276' name='raw_key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_get_group' mangled-name='gnutls_dh_get_group' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_group@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='raw_gen'/>
-      <parameter type-id='type-id-275' name='raw_prime'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-276' name='raw_gen'/>
+      <parameter type-id='type-id-276' name='raw_prime'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_set_prime_bits' mangled-name='gnutls_dh_set_prime_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_set_prime_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-10' name='bits'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_certificate_activation_time_peers' mangled-name='gnutls_certificate_activation_time_peers' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_activation_time_peers@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_certificate_expiration_time_peers' mangled-name='gnutls_certificate_expiration_time_peers' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_expiration_time_peers@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verify_peers3' mangled-name='gnutls_certificate_verify_peers3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verify_peers3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-27' name='hostname'/>
-      <parameter type-id='type-id-418' name='status'/>
+      <parameter type-id='type-id-420' 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-414' name='session'/>
+      <parameter type-id='type-id-420' 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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-725' name='res'/>
+      <parameter type-id='type-id-434' name='func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_certificate_client_get_request_status' mangled-name='gnutls_certificate_client_get_request_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_client_get_request_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_peers' mangled-name='gnutls_certificate_get_peers' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_peers@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-418' name='list_size'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-420' name='list_size'/>
       <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_ours' mangled-name='gnutls_certificate_get_ours' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_ours@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verify_peers' mangled-name='gnutls_certificate_verify_peers' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verify_peers@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-172' name='data'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-173' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
-      <parameter type-id='type-id-418' name='status'/>
+      <parameter type-id='type-id-420' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-mine/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'/>
+      <parameter type-id='type-id-276' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_peers_subkey_id' mangled-name='gnutls_certificate_get_peers_subkey_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_peers_subkey_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='session_id'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-276' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-880' name='status'/>
+      <return type-id='type-id-112'/>
     </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-346' name='keyid'/>
+      <parameter type-id='type-id-882' name='format'/>
+      <parameter type-id='type-id-347' name='keyid'/>
       <parameter type-id='type-id-27' name='password'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_get_openpgp_key_id' mangled-name='gnutls_pubkey_get_openpgp_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_get_openpgp_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-268' 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-423' name='output_data_size'/>
+      <parameter type-id='type-id-420' 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-346' name='data'/>
+      <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-880' name='format'/>
+      <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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-888' name='func'/>
+      <return type-id='type-id-112'/>
     </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-420' 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'/>
+      <parameter type-id='type-id-276' 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-423' 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-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-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'/>
       <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-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-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'/>
       <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'/>
-      <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-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'/>
       <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'/>
-      <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-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'/>
       <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-420' 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'/>
-      <return type-id='type-id-202'/>
+      <parameter type-id='type-id-477' name='key'/>
+      <return type-id='type-id-203'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_pk_dsa_raw' mangled-name='gnutls_openpgp_crt_get_pk_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_pk_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-472' name='crt'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-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'/>
       <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'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <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'/>
       <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-420' 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-377' name='buf'/>
+      <parameter type-id='type-id-423' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-474' name='key'/>
+      <return type-id='type-id-112'/>
     </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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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-275' name='out'/>
+      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-882' name='format'/>
+      <parameter type-id='type-id-276' 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-420' 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'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-346'/>
+    <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-10'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
       <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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_digest_self_test' mangled-name='gnutls_digest_self_test' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_self_test@@GNUTLS_FIPS140_3_4'>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-212' name='digest'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_mac_self_test' mangled-name='gnutls_mac_self_test' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_self_test@@GNUTLS_FIPS140_3_4'>
@@ -11132,279 +11235,282 @@
       <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
+    </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'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_hmac' mangled-name='gnutls_hmac' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='nettle_hmac_sha256_set_key' mangled-name='nettle_hmac_sha256_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_hkdf_expand' mangled-name='nettle_hkdf_expand' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_hmac_sha384_set_key' mangled-name='nettle_hmac_sha384_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_hmac_fast' mangled-name='gnutls_hmac_fast' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-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'>
+    <function-type size-in-bits='64' id='type-id-893'>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-347'/>
       <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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-414' 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-422' 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-165' name='ocsp_func'/>
       <parameter type-id='type-id-102' 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-164' name='ocsp_func'/>
+      <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-111'/>
+      <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-413' name='session'/>
-      <parameter type-id='type-id-275' name='response'/>
+      <parameter type-id='type-id-414' name='session'/>
+      <parameter type-id='type-id-276' 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'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-275' name='response'/>
+      <parameter type-id='type-id-276' 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-422' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-331' name='cb'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-422' 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-427' 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-422' 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-427' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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='system/keys-dummy.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/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-383' name='privkey'/>
+      <parameter type-id='type-id-867' name='crt'/>
+      <parameter type-id='type-id-384' 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'/>
+    <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'/>
     <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-899' 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-275' name='der'/>
+      <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-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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-898' name='iter'/>
+      <return type-id='type-id-112'/>
     </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'/>
@@ -11412,120 +11518,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-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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_session_key_update' mangled-name='gnutls_session_key_update' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_key_update@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
 
     <function-decl name='gnutls_reauth' mangled-name='gnutls_reauth' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_reauth@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='identities_data' type-id='type-id-346' visibility='default'/>
+        <var-decl name='identities_data' type-id='type-id-347' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='binders_data' type-id='type-id-346' visibility='default'/>
+        <var-decl name='binders_data' type-id='type-id-347' 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'/>
       </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-900' id='type-id-901'/>
+    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
     <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-275' name='binder'/>
+      <parameter type-id='type-id-902' name='iter'/>
+      <parameter type-id='type-id-276' 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-903'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='identity' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -11533,75 +11631,75 @@
         <var-decl name='ob_ticket_age' type-id='type-id-18' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
+    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-904'/>
     <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-902' name='iter'/>
+      <parameter type-id='type-id-904' 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-900' 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_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-346' name='data'/>
+      <parameter type-id='type-id-906' name='p'/>
+      <parameter type-id='type-id-347' name='data'/>
       <parameter type-id='type-id-100' 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'>
-    <class-decl name='gnutls_anti_replay_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-303'>
+  <abi-instr version='1.0' address-size='64' path='tls13/anti_replay.c' comp-dir-path='/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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='window' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start_time' type-id='type-id-168' visibility='default'/>
+        <var-decl name='start_time' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='db_add_func' type-id='type-id-905' visibility='default'/>
+        <var-decl name='db_add_func' type-id='type-id-907' 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'/>
       </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-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'/>
     <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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
+      <parameter type-id='type-id-907' name='add_func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_anti_replay_set_ptr' mangled-name='gnutls_anti_replay_set_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_set_ptr@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
       <parameter type-id='type-id-102' name='ptr'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_anti_replay_check' mangled-name='_gnutls_anti_replay_check' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_anti_replay_check@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
       <parameter type-id='type-id-18' name='client_ticket_age'/>
-      <parameter type-id='type-id-714' name='ticket_creation_time'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-716' name='ticket_creation_time'/>
+      <parameter type-id='type-id-276' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_anti_replay_enable' mangled-name='gnutls_anti_replay_enable' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_enable@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-181' name='anti_replay'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_anti_replay_deinit' mangled-name='gnutls_anti_replay_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_deinit@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_anti_replay_set_window' mangled-name='gnutls_anti_replay_set_window' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_set_window@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
       <parameter type-id='type-id-10' name='window'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-182' size-in-bits='64' id='type-id-910'/>
     <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-910' name='anti_replay'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-906'>
+    <function-type size-in-bits='64' id='type-id-908'>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-57'/>
@@ -11609,25 +11707,25 @@
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs11.c' comp-dir-path='/home/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'/>
+  <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'/>
     <function-decl name='gnutls_pkcs11_obj_flags_get_str' mangled-name='gnutls_pkcs11_obj_flags_get_str' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_flags_get_str@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-376'/>
+      <return type-id='type-id-377'/>
     </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-420' 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>
@@ -11635,29 +11733,29 @@
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-57' name='dn'/>
       <parameter type-id='type-id-57' name='spki'/>
-      <parameter type-id='type-id-275' name='issuer'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-276' name='issuer'/>
+      <parameter type-id='type-id-422' name='fmt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_get_raw_issuer_by_dn' mangled-name='gnutls_pkcs11_get_raw_issuer_by_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_get_raw_issuer_by_dn@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-57' name='dn'/>
-      <parameter type-id='type-id-275' name='issuer'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-276' name='issuer'/>
+      <parameter type-id='type-id-422' 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-275' name='issuer'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <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-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'>
@@ -11671,60 +11769,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-420' 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-916'/>
+    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-917'/>
     <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-917' 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-916' name='p_list'/>
+      <parameter type-id='type-id-420' 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-918'>
       <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-918' id='type-id-919'/>
     <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-919' 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-431' 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-920'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_LABEL' value='0'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_SERIAL' value='1'/>
@@ -11732,72 +11830,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-920' id='type-id-921'/>
     <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-921' name='ttype'/>
       <parameter type-id='type-id-102' name='output'/>
-      <parameter type-id='type-id-421' name='output_size'/>
+      <parameter type-id='type-id-423' 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-919' 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-919' 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-275' name='out'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-276' 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-275' name='out'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-276' 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-773' 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-423' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <return type-id='type-id-112'/>
     </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-375' name='fn'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-915' name='fn'/>
       <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-431' name='ptr'/>
+      <parameter type-id='type-id-431' name='session'/>
+      <parameter type-id='type-id-431' 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-922'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_ID_HEX' value='1'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_LABEL' value='2'/>
@@ -11810,17 +11908,17 @@
       <enumerator name='GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION' value='9'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER' value='10'/>
     </enum-decl>
-    <typedef-decl name='gnutls_pkcs11_obj_info_t' type-id='type-id-920' id='type-id-921'/>
+    <typedef-decl name='gnutls_pkcs11_obj_info_t' type-id='type-id-922' id='type-id-923'/>
     <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-773' name='obj'/>
+      <parameter type-id='type-id-923' name='itype'/>
       <parameter type-id='type-id-102' name='output'/>
-      <parameter type-id='type-id-421' name='output_size'/>
+      <parameter type-id='type-id-423' 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-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-10' name='flags'/>
@@ -11837,202 +11935,202 @@
       <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-916' 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-916' size-in-bits='64' id='type-id-924'/>
     <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-924' name='p_list'/>
+      <parameter type-id='type-id-420' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='fgets' mangled-name='fgets' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_hex2bin' mangled-name='_gnutls_hex2bin' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-913'>
+      <parameter type-id='type-id-911'/>
+      <parameter type-id='type-id-912'/>
       <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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-376' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-377' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='critical' type-id='type-id-10' visibility='default'/>
@@ -12041,49 +12139,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-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-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'/>
     <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-928' name='exts'/>
+      <parameter type-id='type-id-420' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-385' name='key'/>
+      <parameter type-id='type-id-376' name='fn'/>
       <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-275' name='data'/>
+      <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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -12093,112 +12191,112 @@
       <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-275' name='pubkey'/>
+      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-276' name='pubkey'/>
       <parameter type-id='type-id-10' name='key_usage'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_export_url' mangled-name='gnutls_pkcs11_privkey_export_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_export_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='key'/>
-      <parameter type-id='type-id-917' name='detailed'/>
-      <parameter type-id='type-id-848' name='url'/>
+      <parameter type-id='type-id-385' name='key'/>
+      <parameter type-id='type-id-919' 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-384' name='pkey'/>
+      <parameter type-id='type-id-385' name='pkey'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_status' mangled-name='gnutls_pkcs11_privkey_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-385' name='key'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_get_info' mangled-name='gnutls_pkcs11_privkey_get_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_get_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='pkey'/>
-      <parameter type-id='type-id-921' name='itype'/>
+      <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-421' name='output_size'/>
+      <parameter type-id='type-id-423' 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-385' name='key'/>
+      <parameter type-id='type-id-420' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_deinit' mangled-name='gnutls_pkcs11_privkey_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='key'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-385' name='key'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_cpy' mangled-name='gnutls_pkcs11_privkey_cpy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_cpy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='dst'/>
-      <parameter type-id='type-id-384' name='src'/>
+      <parameter type-id='type-id-385' name='dst'/>
+      <parameter type-id='type-id-385' name='src'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_init' mangled-name='gnutls_pkcs11_privkey_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-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'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='pkcs11_strerror' mangled-name='pkcs11_strerror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='pkcs11_login' mangled-name='pkcs11_login' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='pkcs11_decrypt' mangled-name='pkcs11_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='pkcs11_sign' mangled-name='pkcs11_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
@@ -12225,7 +12323,7 @@
     </function-decl>
     <function-decl name='gnutls_pkcs11_copy_x509_privkey2' mangled-name='gnutls_pkcs11_copy_x509_privkey2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_x509_privkey2@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' 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'/>
@@ -12234,15 +12332,15 @@
     </function-decl>
     <function-decl name='gnutls_pkcs11_copy_attached_extension' mangled-name='gnutls_pkcs11_copy_attached_extension' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_attached_extension@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-465' name='crt'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-276' name='data'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_copy_pubkey' mangled-name='gnutls_pkcs11_copy_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_pubkey@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-267' name='pubkey'/>
+      <parameter type-id='type-id-268' 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'/>
@@ -12251,84 +12349,84 @@
     </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'/>
       <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib' language='LANG_C99'>
     <function-decl name='gnutls_pkcs11_copy_secret_key' mangled-name='gnutls_pkcs11_copy_secret_key' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_secret_key@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-275' name='key'/>
+      <parameter type-id='type-id-276' 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-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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='password_file' type-id='type-id-376' visibility='default'/>
+        <var-decl name='password_file' type-id='type-id-377' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='password_conf_file' type-id='type-id-376' visibility='default'/>
+        <var-decl name='password_conf_file' type-id='type-id-377' 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-930' 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'/>
@@ -12337,20 +12435,20 @@
         <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-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'/>
     <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-934' 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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_srp_set_prime_bits' mangled-name='gnutls_srp_set_prime_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_set_prime_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='mtu'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
@@ -12358,140 +12456,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-275' name='res'/>
+      <parameter type-id='type-id-276' name='res'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_server_get_username' mangled-name='gnutls_srp_server_get_username' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_server_get_username@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <class-decl name='gnutls_srp_client_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-933'>
+    <class-decl name='gnutls_srp_client_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-935'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='username' type-id='type-id-376' visibility='default'/>
+        <var-decl name='username' type-id='type-id-377' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='password' type-id='type-id-376' visibility='default'/>
+        <var-decl name='password' type-id='type-id-377' 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-936' 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-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'/>
     <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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-940' name='cred'/>
+      <parameter type-id='type-id-936' name='func'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-934' name='cred'/>
+      <parameter type-id='type-id-930' name='func'/>
+      <return type-id='type-id-112'/>
     </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-934' 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-934' size-in-bits='64' id='type-id-941'/>
     <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-941' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-934' name='sc'/>
+      <return type-id='type-id-112'/>
     </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-940' 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-940' size-in-bits='64' id='type-id-942'/>
     <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-942' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-940' name='sc'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-935'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-848'/>
-      <parameter type-id='type-id-848'/>
+    <function-type size-in-bits='64' id='type-id-937'>
+      <parameter type-id='type-id-237'/>
+      <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'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-931'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-275'/>
-      <parameter type-id='type-id-275'/>
-      <parameter type-id='type-id-275'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-276'/>
       <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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='password_file' type-id='type-id-376' visibility='default'/>
+        <var-decl name='password_file' type-id='type-id-377' 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-944' 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-419' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-203' 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-434' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='hint' type-id='type-id-376' visibility='default'/>
+        <var-decl name='hint' type-id='type-id-377' 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-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-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'/>
     <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-202' name='sec_param'/>
+      <parameter type-id='type-id-948' name='res'/>
+      <parameter type-id='type-id-203' name='sec_param'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_psk_set_server_dh_params' mangled-name='gnutls_psk_set_server_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_server_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-946' name='res'/>
-      <parameter type-id='type-id-417' name='dh_params'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-948' name='res'/>
+      <parameter type-id='type-id-419' name='dh_params'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_psk_client_get_hint' mangled-name='gnutls_psk_client_get_hint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_client_get_hint@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_psk_server_get_username' mangled-name='gnutls_psk_server_get_username' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_server_get_username@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <class-decl name='gnutls_psk_client_credentials_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-947'>
+    <class-decl name='gnutls_psk_client_credentials_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-949'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='username' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -12499,129 +12597,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-948' visibility='default'/>
+        <var-decl name='get_function' type-id='type-id-950' 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-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'/>
     <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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-954' name='cred'/>
+      <parameter type-id='type-id-950' name='func'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-948' name='cred'/>
+      <parameter type-id='type-id-944' name='func'/>
+      <return type-id='type-id-112'/>
     </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-948' 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-948' 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-948' size-in-bits='64' id='type-id-955'/>
     <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-955' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-948' name='sc'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <enum-decl name='gnutls_psk_key_flags' id='type-id-954'>
+    <enum-decl name='gnutls_psk_key_flags' id='type-id-956'>
       <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-956' id='type-id-957'/>
     <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-954' 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-957' 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-954' size-in-bits='64' id='type-id-958'/>
     <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-958' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-954' name='sc'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-948' name='res'/>
+      <parameter type-id='type-id-434' name='func'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-949'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-848'/>
-      <parameter type-id='type-id-275'/>
+    <function-type size-in-bits='64' id='type-id-951'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-850'/>
+      <parameter type-id='type-id-276'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-943'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-945'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
       <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-mine/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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__fxstat' mangled-name='__fxstat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='fileno' mangled-name='fileno' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='realloc' mangled-name='realloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='fread' mangled-name='fread' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='ferror' mangled-name='ferror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='printf_fetchargs' mangled-name='printf_fetchargs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_oid_to_gost_paramset' mangled-name='gnutls_oid_to_gost_paramset' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_oid_to_gost_paramset@@GNUTLS_3_6_3'>
       <parameter type-id='type-id-27' name='oid'/>
-      <return type-id='type-id-315'/>
+      <return type-id='type-id-316'/>
     </function-decl>
     <function-decl name='gnutls_gost_paramset_get_oid' mangled-name='gnutls_gost_paramset_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_gost_paramset_get_oid@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-315' name='param'/>
+      <parameter type-id='type-id-316' name='param'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_gost_paramset_get_name' mangled-name='gnutls_gost_paramset_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_gost_paramset_get_name@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-315' name='param'/>
+      <parameter type-id='type-id-316' 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'>
@@ -12634,515 +12732,523 @@
       <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strftime' mangled-name='strftime' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-420' name='crl_max'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-959'/>
     <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-959' name='crls'/>
+      <parameter type-id='type-id-420' name='size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-423' 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-423' name='sizeof_oid'/>
+      <parameter type-id='type-id-420' 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-423' 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-728' 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-423' name='ret_size'/>
+      <parameter type-id='type-id-420' 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-728' 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-423' name='id_size'/>
+      <parameter type-id='type-id-420' 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-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-421' name='serial_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-423' name='serial_size'/>
+      <parameter type-id='type-id-420' 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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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-275' name='dn'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-276' 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-960'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='rcache' type-id='type-id-387' visibility='default'/>
+        <var-decl name='rcache' type-id='type-id-388' 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-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'/>
+    <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'/>
     <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-963' 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-423' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-962' name='iter'/>
+      <return type-id='type-id-112'/>
     </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-423' 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-376' name='sig'/>
-      <parameter type-id='type-id-421' name='sizeof_sig'/>
+      <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'/>
       <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-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <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'/>
       <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-275' name='dn'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-276' 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-275' name='dn'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-276' 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-423' 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-423' 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-376' name='buf'/>
-      <parameter type-id='type-id-421' name='sizeof_buf'/>
+      <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'/>
       <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-422' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <return type-id='type-id-112'/>
     </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-275' name='out'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-401' name='issuer_key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <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-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-728' name='crl'/>
       <parameter type-id='type-id-102' name='nr'/>
       <parameter type-id='type-id-100' 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-728' name='crl'/>
       <parameter type-id='type-id-102' name='nr'/>
       <parameter type-id='type-id-100' 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-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-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-383' name='issuer_key'/>
+      <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'/>
       <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-383' name='issuer_key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <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-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>
     <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-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-964'>
       <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-965' 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-965'>
       <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-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'/>
     <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-967' 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-967' name='features'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-420' 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-401' name='key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <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-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-423' 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-766' name='crq'/>
       <parameter type-id='type-id-102' 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-423' name='sizeof_oid'/>
+      <parameter type-id='type-id-420' 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-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-968'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SAN_DNSNAME' value='1'/>
       <enumerator name='GNUTLS_SAN_RFC822NAME' value='2'/>
@@ -13154,163 +13260,163 @@
       <enumerator name='GNUTLS_SAN_OTHERNAME_XMPP' value='1000'/>
       <enumerator name='GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL' value='1001'/>
     </enum-decl>
-    <typedef-decl name='gnutls_x509_subject_alt_name_t' type-id='type-id-966' id='type-id-967'/>
+    <typedef-decl name='gnutls_x509_subject_alt_name_t' type-id='type-id-968' id='type-id-969'/>
     <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-766' name='crq'/>
+      <parameter type-id='type-id-969' name='nt'/>
       <parameter type-id='type-id-102' 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-276' name='output'/>
+      <parameter type-id='type-id-420' 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-423' name='buf_size'/>
+      <parameter type-id='type-id-420' 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-423' 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-423' name='ret_size'/>
+      <parameter type-id='type-id-420' name='ret_type'/>
+      <parameter type-id='type-id-420' 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-364' name='pathlen'/>
+      <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'/>
       <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-420' name='key_usage'/>
+      <parameter type-id='type-id-420' 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'/>
+      <parameter type-id='type-id-276' 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-423' 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-423' name='sizeof_oid'/>
+      <parameter type-id='type-id-420' 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-423' 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-423' 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-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <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'/>
       <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-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <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'/>
       <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-275' name='out'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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-383' name='key'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-384' 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-383' name='key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <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-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-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-276' name='m'/>
+      <parameter type-id='type-id-276' 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-383' name='key'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-384' 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'/>
@@ -13318,187 +13424,187 @@
       <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'/>
       <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-376' name='pass'/>
-      <parameter type-id='type-id-421' name='pass_size'/>
+      <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'/>
       <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-423' 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-423' 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-275' name='dn'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-276' 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-275' name='dn'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-276' 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-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <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'/>
       <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-420' 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-422' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <return type-id='type-id-112'/>
     </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-970'/>
     <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-970' 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-423' 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-420' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-423' 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'>
@@ -13507,111 +13613,111 @@
       <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-423' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_rdn_get2' mangled-name='gnutls_x509_rdn_get2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_rdn_get2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='idn'/>
-      <parameter type-id='type-id-275' name='str'/>
+      <parameter type-id='type-id-276' name='str'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_rdn_get' mangled-name='gnutls_x509_rdn_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_rdn_get@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='idn'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-377' name='buf'/>
+      <parameter type-id='type-id-423' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'>
+  <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-111'/>
+      <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-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='extensions.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/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'/>
+      <parameter type-id='type-id-276' 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'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_asnstr_append_name' mangled-name='_asnstr_append_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/x509' language='LANG_C99'>
+    <enum-decl name='gnutls_certificate_print_formats' id='type-id-971'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CRT_PRINT_FULL' value='0'/>
       <enumerator name='GNUTLS_CRT_PRINT_ONELINE' value='1'/>
@@ -13619,368 +13725,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-969' id='type-id-970'/>
+    <typedef-decl name='gnutls_certificate_print_formats_t' type-id='type-id-971' id='type-id-972'/>
     <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-927' name='exts'/>
       <parameter type-id='type-id-10' name='exts_size'/>
-      <parameter type-id='type-id-970' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-972' name='format'/>
+      <parameter type-id='type-id-276' 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-275' name='out'/>
+      <parameter type-id='type-id-268' name='pubkey'/>
+      <parameter type-id='type-id-972' name='format'/>
+      <parameter type-id='type-id-276' 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-275' name='out'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-972' name='format'/>
+      <parameter type-id='type-id-276' 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-275' name='out'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-972' name='format'/>
+      <parameter type-id='type-id-276' 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-275' name='out'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-972' name='format'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pkcs12' type-id='type-id-387' visibility='default'/>
+        <var-decl name='pkcs12' type-id='type-id-388' 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-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-973' size-in-bits='64' id='type-id-974'/>
+    <typedef-decl name='gnutls_pkcs12_t' type-id='type-id-974' id='type-id-975'/>
     <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-975' name='pkcs12'/>
+      <parameter type-id='type-id-420' 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-420' name='salt_size'/>
+      <parameter type-id='type-id-420' 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-975' 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-420' 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-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-975' 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-975' 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-975' 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-976'>
       <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-977' 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-978'>
       <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-979' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='local_key_id' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='friendly_name' type-id='type-id-376' visibility='default'/>
+        <var-decl name='friendly_name' type-id='type-id-377' 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-980'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_BAG_EMPTY' value='0'/>
       <enumerator name='GNUTLS_BAG_PKCS8_ENCRYPTED_KEY' value='1'/>
@@ -13991,354 +14097,354 @@
       <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-980' id='type-id-979'/>
 
-    <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-978' size-in-bits='12288' id='type-id-977'>
       <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-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'/>
     <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-975' name='pkcs12'/>
+      <parameter type-id='type-id-982' 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-975' name='pkcs12'/>
       <parameter type-id='type-id-22' name='indx'/>
-      <parameter type-id='type-id-980' name='bag'/>
+      <parameter type-id='type-id-982' 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-275' name='out'/>
+      <parameter type-id='type-id-975' name='pkcs12'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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-975' name='pkcs12'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-975' name='pkcs12'/>
+      <return type-id='type-id-112'/>
     </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-975' size-in-bits='64' id='type-id-983'/>
     <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-983' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_pbkdf2_hmac_streebog512' mangled-name='_gnutls_pbkdf2_hmac_streebog512' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_pbkdf2_hmac_gosthash94cp' mangled-name='_gnutls_pbkdf2_hmac_gosthash94cp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_pbkdf2_hmac_streebog256' mangled-name='_gnutls_pbkdf2_hmac_streebog256' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_x509_der_encode_and_copy' mangled-name='_gnutls_x509_der_encode_and_copy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-383' name='privkey'/>
+      <parameter type-id='type-id-982' name='bag'/>
+      <parameter type-id='type-id-384' 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-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-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-420' name='salt_size'/>
+      <parameter type-id='type-id-420' 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-982' 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-982' 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-982' 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-982' 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-982' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-276' 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-982' 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-982' 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-982' 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-982' name='bag'/>
+      <parameter type-id='type-id-979' 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-982' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-276' 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-982' 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-982' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-982' name='bag'/>
+      <return type-id='type-id-112'/>
     </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-982' size-in-bits='64' id='type-id-984'/>
     <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-984' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/x509' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-985'/>
     <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-985' name='salt'/>
       <parameter type-id='type-id-10' name='salt_size'/>
       <parameter type-id='type-id-10' name='iter'/>
       <parameter type-id='type-id-27' name='pw'/>
       <parameter type-id='type-id-10' name='req_keylen'/>
-      <parameter type-id='type-id-191' name='keybuf'/>
+      <parameter type-id='type-id-192' name='keybuf'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_utf8_to_ucs2' mangled-name='_gnutls_utf8_to_ucs2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pkcs7' type-id='type-id-387' visibility='default'/>
+        <var-decl name='pkcs7' type-id='type-id-388' 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-987' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='der_signed_data' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='signed_data' type-id='type-id-387' visibility='default'/>
+        <var-decl name='signed_data' type-id='type-id-388' 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-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-987'>
+      <subrange length='128' type-id='type-id-38' id='type-id-988'/>
 
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-376' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-377' 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-990' visibility='default'/>
+        <var-decl name='next' type-id='type-id-992' 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-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'/>
     <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-401' name='signer_key'/>
+      <parameter type-id='type-id-990' name='pkcs7'/>
+      <parameter type-id='type-id-467' name='signer'/>
+      <parameter type-id='type-id-402' 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-211' name='dig'/>
+      <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-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-990' 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-990' 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-990' 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-990' 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-990' 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-423' 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-990' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='crl'/>
+      <parameter type-id='type-id-276' 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-990' 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-990' 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-990' name='pkcs7'/>
       <parameter type-id='type-id-57' name='crt'/>
       <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-275' name='out'/>
+      <parameter type-id='type-id-990' name='pkcs7'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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-172' name='vdata'/>
+      <parameter type-id='type-id-990' name='pkcs7'/>
+      <parameter type-id='type-id-715' name='tl'/>
+      <parameter type-id='type-id-173' name='vdata'/>
       <parameter type-id='type-id-10' name='vdata_size'/>
       <parameter type-id='type-id-10' name='idx'/>
       <parameter type-id='type-id-57' name='data'/>
@@ -14346,24 +14452,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-990' 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-990' 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-990' name='pkcs7'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-276' 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-994'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='algo' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -14383,140 +14489,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-991' visibility='default'/>
+        <var-decl name='signed_attrs' type-id='type-id-993' 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-993' 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-995' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='512' id='type-id-993'>
+    <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>
-    <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-994' id='type-id-996'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
     <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-990' name='pkcs7'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-995' name='info'/>
+      <parameter type-id='type-id-997' 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-990' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-997' name='info'/>
+      <return type-id='type-id-112'/>
     </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-990' 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-423' 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-990' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='cert'/>
+      <parameter type-id='type-id-276' 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-990' name='pkcs7'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-990' name='pkcs7'/>
+      <return type-id='type-id-112'/>
     </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-990' size-in-bits='64' id='type-id-998'/>
     <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-998' 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-990' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-993' name='list'/>
+      <return type-id='type-id-112'/>
     </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-993' name='list'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-848' name='oid'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-850' name='oid'/>
+      <parameter type-id='type-id-276' 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-993' size-in-bits='64' id='type-id-999'/>
     <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-999' name='list'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-276' 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-mine/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'/>
@@ -14526,79 +14632,79 @@
       <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_pbkdf2_hmac_sha1' mangled-name='nettle_pbkdf2_hmac_sha1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_pbkdf2_hmac_sha256' mangled-name='nettle_pbkdf2_hmac_sha256' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_mac' mangled-name='gnutls_oid_to_mac' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-384' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_set_pin_function' mangled-name='gnutls_x509_privkey_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='privkey'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-384' name='privkey'/>
+      <parameter type-id='type-id-376' name='fn'/>
       <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_sign_data' mangled-name='gnutls_x509_privkey_sign_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_sign_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-212' name='digest'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-102' name='signature'/>
-      <parameter type-id='type-id-421' name='signature_size'/>
+      <parameter type-id='type-id-423' name='signature_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_sign_hash' mangled-name='gnutls_x509_privkey_sign_hash' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_sign_hash@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' name='key'/>
       <parameter type-id='type-id-57' name='hash'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-276' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_get_key_id' mangled-name='gnutls_x509_privkey_get_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_get_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' 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-423' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_verify_params' mangled-name='gnutls_x509_privkey_verify_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_verify_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_verify_seed' mangled-name='gnutls_x509_privkey_verify_seed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_verify_seed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-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'/>
       <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-384' name='key'/>
+      <parameter type-id='type-id-432' name='digest'/>
       <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-421' name='seed_size'/>
+      <parameter type-id='type-id-423' 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-1000'>
       <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'/>
@@ -14608,115 +14714,115 @@
       </data-member>
     </class-decl>
     <function-decl name='gnutls_x509_privkey_generate2' mangled-name='gnutls_x509_privkey_generate2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_generate2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' name='key'/>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-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>
     <function-decl name='gnutls_x509_privkey_generate' mangled-name='gnutls_x509_privkey_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_generate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' name='key'/>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_dsa_raw' mangled-name='gnutls_x509_privkey_export_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_rsa_raw2' mangled-name='gnutls_x509_privkey_export_rsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_rsa_raw2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
-      <parameter type-id='type-id-275' name='e1'/>
-      <parameter type-id='type-id-275' name='e2'/>
+      <parameter type-id='type-id-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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_rsa_raw' mangled-name='gnutls_x509_privkey_export_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
+      <parameter type-id='type-id-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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_gost_raw' mangled-name='gnutls_x509_privkey_export_gost_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_gost_raw@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-709' name='curve'/>
-      <parameter type-id='type-id-430' name='digest'/>
-      <parameter type-id='type-id-710' name='paramset'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-711' name='curve'/>
+      <parameter type-id='type-id-432' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_ecc_raw' mangled-name='gnutls_x509_privkey_export_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-709' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-384' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_sec_param' mangled-name='gnutls_x509_privkey_sec_param' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_sec_param@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <return type-id='type-id-202'/>
+      <parameter type-id='type-id-384' name='key'/>
+      <return type-id='type-id-203'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export2' mangled-name='gnutls_x509_privkey_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-420' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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-384' 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-383' name='key'/>
-      <parameter type-id='type-id-753' name='spki'/>
+      <parameter type-id='type-id-384' 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-383' name='key'/>
+      <parameter type-id='type-id-384' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_gost_raw' mangled-name='gnutls_x509_privkey_import_gost_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_gost_raw@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-211' name='digest'/>
-      <parameter type-id='type-id-315' name='paramset'/>
+      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-316' name='paramset'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
       <parameter type-id='type-id-57' name='k'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_ecc_raw' mangled-name='gnutls_x509_privkey_import_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' 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'/>
@@ -14724,7 +14830,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_dsa_raw' mangled-name='gnutls_x509_privkey_import_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' 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'/>
@@ -14733,7 +14839,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_rsa_raw2' mangled-name='gnutls_x509_privkey_import_rsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_rsa_raw2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' 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'/>
@@ -14745,7 +14851,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_rsa_raw' mangled-name='gnutls_x509_privkey_import_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' 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'/>
@@ -14755,274 +14861,274 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import2' mangled-name='gnutls_x509_privkey_import2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import' mangled-name='gnutls_x509_privkey_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_cpy' mangled-name='gnutls_x509_privkey_cpy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_cpy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='dst'/>
-      <parameter type-id='type-id-383' name='src'/>
+      <parameter type-id='type-id-384' name='dst'/>
+      <parameter type-id='type-id-384' name='src'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_init' mangled-name='gnutls_x509_privkey_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-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'>
-      <parameter type-id='type-id-383' name='key'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-384' name='key'/>
+      <return type-id='type-id-112'/>
     </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-384' name='key'/>
+      <parameter type-id='type-id-420' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_fix' mangled-name='gnutls_x509_privkey_fix' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_fix@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-384' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-384' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-384' name='key'/>
+      <parameter type-id='type-id-422' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-276' 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-420' name='format'/>
-      <parameter type-id='type-id-418' name='schema'/>
-      <parameter type-id='type-id-418' name='cipher'/>
+      <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-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-420' name='salt_size'/>
+      <parameter type-id='type-id-420' 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-384' name='key'/>
+      <parameter type-id='type-id-422' 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-423' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-384' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-346' name='ip'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-347' 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>
     <function-decl name='inet_pton' mangled-name='inet_pton' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-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'/>
     <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-1002' 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-420' 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-1002' 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-420' 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-1003'/>
+    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
     <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-1002' 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-1002' 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-1004' 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-420' 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'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_check_revocation' mangled-name='gnutls_x509_crt_check_revocation' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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'/>
@@ -15030,557 +15136,557 @@
       <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-420' name='size'/>
       <parameter type-id='type-id-27' name='url'/>
-      <parameter type-id='type-id-375' name='pin_fn'/>
+      <parameter type-id='type-id-376' name='pin_fn'/>
       <parameter type-id='type-id-102' 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-375' name='fn'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-276' name='data'/>
+      <parameter type-id='type-id-420' 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-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <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'/>
       <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-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <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'/>
       <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-420' name='cert_max'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-420' name='size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' 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-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-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'/>
       <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-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <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-712' name='paramset'/>
+      <parameter type-id='type-id-276' name='x'/>
+      <parameter type-id='type-id-276' 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-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <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'/>
       <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-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-276' name='m'/>
+      <parameter type-id='type-id-276' 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-423' name='oid_size'/>
+      <parameter type-id='type-id-420' 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-423' name='san_size'/>
+      <parameter type-id='type-id-420' name='reason_flags'/>
+      <parameter type-id='type-id-420' 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-432' name='hash'/>
+      <parameter type-id='type-id-420' 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-1004' 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-423' 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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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-211' name='algo'/>
+      <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-421' name='buf_size'/>
+      <parameter type-id='type-id-423' 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-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'/>
     <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-1007' 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-1007' 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-275' name='dn'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-276' 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-275' name='dn'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-276' 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-423' 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-423' name='oid_size'/>
+      <parameter type-id='type-id-420' 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-423' 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-276' name='output'/>
+      <parameter type-id='type-id-420' 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-423' name='buf_size'/>
+      <parameter type-id='type-id-420' 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-1008'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-376' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-377' 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-1007' visibility='default'/>
+        <var-decl name='qualifier' type-id='type-id-1009' 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-1010'>
       <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-1011' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-376' visibility='default'/>
+        <var-decl name='data' type-id='type-id-377' 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-1010'>
+    <enum-decl name='gnutls_x509_qualifier_t' id='type-id-1012'>
       <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-1012' id='type-id-1011'/>
 
-    <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-1010' size-in-bits='1536' id='type-id-1009'>
+      <subrange length='8' type-id='type-id-38' id='type-id-134'/>
 
     </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-1008' size-in-bits='64' id='type-id-1013'/>
     <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-1013' name='policy'/>
+      <parameter type-id='type-id-420' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1013' name='policy'/>
+      <return type-id='type-id-112'/>
     </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-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-467' name='cert'/>
+      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-365' 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'/>
       <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-420' name='skipcerts'/>
+      <parameter type-id='type-id-420' 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-420' name='skipcerts'/>
+      <parameter type-id='type-id-420' 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-420' 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-364' name='pathlen'/>
+      <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'/>
       <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-423' 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-423' 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-423' name='ian_size'/>
+      <parameter type-id='type-id-420' name='ian_type'/>
+      <parameter type-id='type-id-420' 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-423' name='ian_size'/>
+      <parameter type-id='type-id-420' name='ian_type'/>
+      <parameter type-id='type-id-420' 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-423' name='ian_size'/>
+      <parameter type-id='type-id-420' 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-423' name='ian_size'/>
+      <parameter type-id='type-id-420' 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-467' 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-423' name='id_size'/>
+      <parameter type-id='type-id-420' 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-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-421' name='serial_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-423' name='serial_size'/>
+      <parameter type-id='type-id-420' 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-467' 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-423' name='ret_size'/>
+      <parameter type-id='type-id-420' 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-420' 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-376' name='sig'/>
-      <parameter type-id='type-id-421' name='sig_size'/>
+      <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'/>
       <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-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <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'/>
       <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-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <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'/>
       <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-423' 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-423' 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-275' name='dn'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-276' 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-275' name='dn'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-276' 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-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <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'/>
       <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-423' 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-423' 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-275' name='dn'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-276' 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-275' name='dn'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-276' 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-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <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'/>
       <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-422' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <return type-id='type-id-112'/>
     </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-467' name='cert'/>
       <parameter type-id='type-id-102' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-423' 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-420' 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-275' name='out'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_fingerprint' mangled-name='gnutls_fingerprint' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-275' name='str'/>
+      <parameter type-id='type-id-1006' name='dn'/>
+      <parameter type-id='type-id-276' 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-275' name='str'/>
+      <parameter type-id='type-id-1006' name='dn'/>
+      <parameter type-id='type-id-276' 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-1014'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -15591,195 +15697,195 @@
         <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-1014' id='type-id-1015'/>
+    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
     <function-decl name='gnutls_x509_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-1006' 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-1016' 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-275' name='out'/>
+      <parameter type-id='type-id-1006' name='dn'/>
+      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-276' 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-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-421' name='output_data_size'/>
+      <parameter type-id='type-id-423' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1006' name='dn'/>
+      <return type-id='type-id-112'/>
     </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-1006' 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-1007' 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-1006' name='dn'/>
       <parameter type-id='type-id-27' name='str'/>
-      <parameter type-id='type-id-425' name='err'/>
+      <parameter type-id='type-id-427' 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-427' 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-427' 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-427' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-1008' const='yes' id='type-id-1017'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1018'/>
     <function-decl name='gnutls_x509_crt_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-1018' 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'/>
+      <parameter type-id='type-id-276' 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-401' name='issuer_key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <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-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-467' name='cert'/>
       <parameter type-id='type-id-102' 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-467' name='cert'/>
       <parameter type-id='type-id-102' name='id'/>
       <parameter type-id='type-id-100' 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-467' name='cert'/>
       <parameter type-id='type-id-102' name='id'/>
       <parameter type-id='type-id-100' 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-467' name='crt'/>
+      <parameter type-id='type-id-969' name='type'/>
       <parameter type-id='type-id-102' 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-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-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-467' name='cert'/>
       <parameter type-id='type-id-102' name='id'/>
       <parameter type-id='type-id-100' 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-467' name='cert'/>
       <parameter type-id='type-id-102' name='id'/>
       <parameter type-id='type-id-100' 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-467' name='cert'/>
       <parameter type-id='type-id-102' name='serial'/>
       <parameter type-id='type-id-100' 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-383' name='issuer_key'/>
+      <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'/>
       <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-383' name='issuer_key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <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-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'/>
@@ -15787,7 +15893,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_issuer_alt_othername' mangled-name='gnutls_x509_crt_set_issuer_alt_othername' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_issuer_alt_othername@@GNUTLS_3_4'>
-      <parameter type-id='type-id-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-10' name='data_size'/>
@@ -15795,7 +15901,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_subject_alt_othername' mangled-name='gnutls_x509_crt_set_subject_alt_othername' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_subject_alt_othername@@GNUTLS_3_4'>
-      <parameter type-id='type-id-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-10' name='data_size'/>
@@ -15803,50 +15909,50 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_issuer_alt_name' mangled-name='gnutls_x509_crt_set_issuer_alt_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_issuer_alt_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-465' name='crt'/>
-      <parameter type-id='type-id-967' name='type'/>
+      <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-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-467' name='crt'/>
+      <parameter type-id='type-id-969' name='type'/>
       <parameter type-id='type-id-102' 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-969' 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'/>
@@ -15854,35 +15960,35 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_crq_extensions' mangled-name='gnutls_x509_crt_set_crq_extensions' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_crq_extensions@@GNUTLS_3_4'>
-      <parameter type-id='type-id-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-383' name='key'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-384' 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-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'/>
@@ -15890,7 +15996,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_dn_by_oid' mangled-name='gnutls_x509_crt_set_dn_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_dn_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-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'/>
@@ -15898,68 +16004,68 @@
       <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'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <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-1020' 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-1020' 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-1021'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -15967,203 +16073,203 @@
         <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-1020' 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-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'/>
     <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-1023' name='nc'/>
+      <parameter type-id='type-id-969' 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-1023' name='nc'/>
+      <parameter type-id='type-id-969' 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-1023' 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-1023' name='nc'/>
+      <parameter type-id='type-id-969' 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-1023' name='nc'/>
+      <parameter type-id='type-id-969' 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-1023' name='nc'/>
+      <parameter type-id='type-id-1023' 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-1023' size-in-bits='64' id='type-id-1024'/>
     <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-1024' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1023' name='nc'/>
+      <return type-id='type-id-112'/>
     </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-1023' name='nc'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-420' 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-1023' name='nc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='type'/>
-      <parameter type-id='type-id-275' name='name'/>
+      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-276' 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-1023' name='nc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='type'/>
-      <parameter type-id='type-id-275' name='name'/>
+      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-1025' 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-1026'>
       <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'/>
+        <var-decl name='name' type-id='type-id-317' 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-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-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'/>
     <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-436' 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-10' name='flags'/>
-      <parameter type-id='type-id-418' name='voutput'/>
-      <parameter type-id='type-id-1027' name='func'/>
+      <parameter type-id='type-id-420' name='voutput'/>
+      <parameter type-id='type-id-1029' 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-436' 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-173' 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-420' name='voutput'/>
+      <parameter type-id='type-id-1029' 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-436' 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-420' name='voutput'/>
+      <parameter type-id='type-id-1029' 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-436' 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-436' 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-436' 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-436' name='list'/>
+      <parameter type-id='type-id-1004' 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-436' 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-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-436' name='list'/>
+      <parameter type-id='type-id-1002' 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-1030'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='node_index' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16171,7 +16277,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-916' 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'/>
@@ -16180,219 +16286,219 @@
         <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-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'/>
     <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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1032' name='iter'/>
+      <return type-id='type-id-112'/>
     </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-1032' size-in-bits='64' id='type-id-1033'/>
     <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-436' name='list'/>
+      <parameter type-id='type-id-1033' 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-436' name='list'/>
+      <parameter type-id='type-id-1002' 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-436' name='list'/>
       <parameter type-id='type-id-10' name='all'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-436' size-in-bits='64' id='type-id-1034'/>
     <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-1034' name='list'/>
       <parameter type-id='type-id-10' name='size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='hash_pjw_bare' mangled-name='hash_pjw_bare' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_check_revocation' mangled-name='_gnutls_x509_crt_check_revocation' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-1027'>
+      <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-mine/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-436' name='list'/>
       <parameter type-id='type-id-27' name='ca_file'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-422' 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-436' 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-422' 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-436' 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-422' 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-436' name='list'/>
       <parameter type-id='type-id-57' name='cas'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-422' 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-436' 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-422' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='opendir' mangled-name='opendir' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='readdir' mangled-name='readdir' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='closedir' mangled-name='closedir' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-967' 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-275' name='ext'/>
+      <parameter type-id='type-id-967' name='f'/>
+      <parameter type-id='type-id-276' 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-967' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-927' name='ext'/>
+      <return type-id='type-id-112'/>
     </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-1035'>
       <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-1036' 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'>
+    <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>
-    <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-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'/>
     <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-275' name='ext'/>
+      <parameter type-id='type-id-1038' name='p'/>
+      <parameter type-id='type-id-276' 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-1038' 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-1038' name='p'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-275' name='oid'/>
+      <parameter type-id='type-id-276' 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-1038' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1038' name='p'/>
+      <return type-id='type-id-112'/>
     </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-1038' size-in-bits='64' id='type-id-1039'/>
     <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-1039' 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-1040'>
       <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-1041' 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-1042'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -16403,53 +16509,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-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'/>
     <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-275' name='ext'/>
+      <parameter type-id='type-id-1044' name='aia'/>
+      <parameter type-id='type-id-276' 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-1044' 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-1044' 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-1044' 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-275' name='san'/>
+      <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'/>
       <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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1044' name='aia'/>
+      <return type-id='type-id-112'/>
     </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-1044' size-in-bits='64' id='type-id-1045'/>
     <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-1045' 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-1046'>
       <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-1047' 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-1048'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16460,88 +16566,88 @@
         <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-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'/>
     <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-275' name='ext'/>
+      <parameter type-id='type-id-1050' name='cdp'/>
+      <parameter type-id='type-id-276' 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-1050' 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-1050' name='cdp'/>
+      <parameter type-id='type-id-969' 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-1050' name='cdp'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-418' name='type'/>
-      <parameter type-id='type-id-275' name='san'/>
-      <parameter type-id='type-id-418' name='reasons'/>
+      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-276' name='san'/>
+      <parameter type-id='type-id-420' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1050' name='cdp'/>
+      <return type-id='type-id-112'/>
     </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-1050' size-in-bits='64' id='type-id-1051'/>
     <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-1051' 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-1052'>
       <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-1053' 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'>
+    <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>
-    <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-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'/>
     <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-275' name='ext'/>
+      <parameter type-id='type-id-1055' name='policies'/>
+      <parameter type-id='type-id-276' 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-1055' 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-1055' name='policies'/>
+      <parameter type-id='type-id-1018' 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-1055' name='policies'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-1011' name='policy'/>
+      <parameter type-id='type-id-1013' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1055' name='policies'/>
+      <return type-id='type-id-112'/>
     </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-1055' size-in-bits='64' id='type-id-1056'/>
     <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-1056' 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'>
@@ -16549,81 +16655,81 @@
       <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-275' name='ext'/>
+      <parameter type-id='type-id-276' 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-365' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_basic_constraints' mangled-name='gnutls_x509_ext_export_basic_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_basic_constraints@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='ca'/>
       <parameter type-id='type-id-22' name='pathlen'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-276' 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-418' name='ca'/>
-      <parameter type-id='type-id-364' name='pathlen'/>
+      <parameter type-id='type-id-420' name='ca'/>
+      <parameter type-id='type-id-365' name='pathlen'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_private_key_usage_period' mangled-name='gnutls_x509_ext_export_private_key_usage_period' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_private_key_usage_period@@GNUTLS_3_4'>
       <parameter type-id='type-id-17' name='activation'/>
       <parameter type-id='type-id-17' name='expiration'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-276' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_private_key_usage_period' mangled-name='gnutls_x509_ext_import_private_key_usage_period' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_private_key_usage_period@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-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'>
       <parameter type-id='type-id-10' name='skipcerts'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-276' 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-418' name='skipcerts'/>
+      <parameter type-id='type-id-420' name='skipcerts'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_key_usage' mangled-name='gnutls_x509_ext_export_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_key_usage@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='usage'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-276' 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-418' name='key_usage'/>
+      <parameter type-id='type-id-420' 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-1057'>
       <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-1058' 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-1059'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16634,31 +16740,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-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'/>
     <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-275' name='ext'/>
+      <parameter type-id='type-id-1061' name='aki'/>
+      <parameter type-id='type-id-276' 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-1061' 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-1061' name='aki'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-418' name='san_type'/>
-      <parameter type-id='type-id-275' name='san'/>
-      <parameter type-id='type-id-275' name='othername_oid'/>
-      <parameter type-id='type-id-275' name='serial'/>
+      <parameter type-id='type-id-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'/>
       <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-1061' 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'/>
@@ -16666,263 +16772,263 @@
       <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-1061' 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-275' name='id'/>
+      <parameter type-id='type-id-1061' name='aki'/>
+      <parameter type-id='type-id-276' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1061' name='aki'/>
+      <return type-id='type-id-112'/>
     </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-1061' size-in-bits='64' id='type-id-1062'/>
     <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-1062' name='aki'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_subject_key_id' mangled-name='gnutls_x509_ext_export_subject_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_subject_key_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='id'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-276' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_subject_key_id' mangled-name='gnutls_x509_ext_import_subject_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_subject_key_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-276' 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-1021' name='nc'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-1023' name='nc'/>
+      <parameter type-id='type-id-276' 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-1023' 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-275' name='ext'/>
+      <parameter type-id='type-id-461' name='sans'/>
+      <parameter type-id='type-id-276' 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-275' name='san'/>
-      <parameter type-id='type-id-275' name='othername_oid'/>
+      <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'/>
       <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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-461' name='sans'/>
+      <return type-id='type-id-112'/>
     </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-1063'/>
     <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-1063' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-mine/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-275' name='out'/>
+      <parameter type-id='type-id-990' name='pkcs7'/>
+      <parameter type-id='type-id-972' name='format'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-275' name='virt'/>
+      <parameter type-id='type-id-420' name='virt_type'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-432' name='dig'/>
+      <parameter type-id='type-id-420' 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-211' name='dig'/>
+      <parameter type-id='type-id-755' name='spki'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='salt_size'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-755' name='spki'/>
+      <return type-id='type-id-112'/>
     </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-1064'/>
     <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-1064' 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-mine/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-967' 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-967' 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-967' name='features'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-420' 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-967' name='f'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='feature'/>
+      <parameter type-id='type-id-420' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-967' name='f'/>
+      <return type-id='type-id-112'/>
     </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-967' size-in-bits='64' id='type-id-1065'/>
     <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-1065' 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-mine/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_cidr_to_rfc5280' mangled-name='gnutls_x509_cidr_to_rfc5280' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_cidr_to_rfc5280@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='cidr'/>
-      <parameter type-id='type-id-275' name='cidr_rfc5280'/>
+      <parameter type-id='type-id-276' 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-10' name='ip_size'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-377' 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-10' name='ip_size'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-377' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='resp' type-id='type-id-387' visibility='default'/>
+        <var-decl name='resp' type-id='type-id-388' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='response_type_oid' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='basicresp' type-id='type-id-387' visibility='default'/>
+        <var-decl name='basicresp' type-id='type-id-388' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='der' type-id='type-id-62' visibility='default'/>
@@ -16931,770 +17037,773 @@
         <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'/>
+    <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'/>
     <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-1070' name='ocsps'/>
+      <parameter type-id='type-id-420' name='size'/>
       <parameter type-id='type-id-57' name='resp_data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-422' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <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-1068' name='resp'/>
+      <parameter type-id='type-id-436' name='trustlist'/>
+      <parameter type-id='type-id-420' 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-1068' name='resp'/>
+      <parameter type-id='type-id-467' name='issuer'/>
+      <parameter type-id='type-id-420' 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-1068' name='resp'/>
+      <parameter type-id='type-id-731' name='certs'/>
+      <parameter type-id='type-id-423' 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-1068' 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-275' name='nonce'/>
+      <parameter type-id='type-id-1068' name='resp'/>
+      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-276' 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-1068' 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-275' name='data'/>
+      <parameter type-id='type-id-276' name='oid'/>
+      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-276' 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-1068' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-430' 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-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-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'/>
       <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-1068' 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-1068' 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-1068' name='resp'/>
       <parameter type-id='type-id-10' name='type'/>
-      <parameter type-id='type-id-275' name='raw'/>
+      <parameter type-id='type-id-276' 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-275' name='dn'/>
+      <parameter type-id='type-id-1068' name='resp'/>
+      <parameter type-id='type-id-276' 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-1068' 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-275' name='response_type_oid'/>
-      <parameter type-id='type-id-275' name='response'/>
+      <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'/>
       <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-1068' 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-1071'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='req' type-id='type-id-387' visibility='default'/>
+        <var-decl name='req' type-id='type-id-388' 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-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-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'/>
     <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-1073' 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-1073' 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>
     <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-275' name='nonce'/>
+      <parameter type-id='type-id-1073' name='req'/>
+      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-276' 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-1073' 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-1073' 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-275' name='data'/>
+      <parameter type-id='type-id-276' name='oid'/>
+      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-276' 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-211' name='digest'/>
-      <parameter type-id='type-id-465' name='issuer'/>
-      <parameter type-id='type-id-465' name='cert'/>
+      <parameter type-id='type-id-1073' name='req'/>
+      <parameter type-id='type-id-212' 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-1071' name='req'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-1073' name='req'/>
+      <parameter type-id='type-id-212' name='digest'/>
       <parameter type-id='type-id-57' name='issuer_name_hash'/>
       <parameter type-id='type-id-57' name='issuer_key_hash'/>
       <parameter type-id='type-id-57' name='serial_number'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_get_cert_id' mangled-name='gnutls_ocsp_req_get_cert_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_get_cert_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1071' name='req'/>
+      <parameter type-id='type-id-1073' name='req'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-430' 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-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'/>
       <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-1073' 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-275' name='data'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-1068' name='resp'/>
+      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-422' 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-275' name='data'/>
+      <parameter type-id='type-id-1068' name='resp'/>
+      <parameter type-id='type-id-276' 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-275' name='data'/>
+      <parameter type-id='type-id-1073' name='req'/>
+      <parameter type-id='type-id-276' 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-1068' name='resp'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-422' 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-1068' 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-1073' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1068' name='resp'/>
+      <return type-id='type-id-112'/>
     </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-1069' 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'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-1073' name='req'/>
+      <return type-id='type-id-112'/>
     </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-1073' size-in-bits='64' id='type-id-1074'/>
     <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-1074' 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-275' name='dn'/>
+      <parameter type-id='type-id-1068' name='resp'/>
+      <parameter type-id='type-id-276' 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-275' name='sig'/>
+      <parameter type-id='type-id-1068' name='resp'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/x509' language='LANG_C99'>
+    <enum-decl name='gnutls_ocsp_print_formats_t' id='type-id-1075'>
       <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-1075' id='type-id-1076'/>
     <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-275' name='out'/>
+      <parameter type-id='type-id-1068' name='resp'/>
+      <parameter type-id='type-id-1076' name='format'/>
+      <parameter type-id='type-id-276' 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-275' name='out'/>
+      <parameter type-id='type-id-1073' name='req'/>
+      <parameter type-id='type-id-1076' name='format'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
-    <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_6'>
-      <parameter type-id='type-id-236' name='session'/>
+  <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'/>
+    <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'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_set_max_size' mangled-name='gnutls_record_set_max_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_max_size@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-100' name='size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_get_max_size' mangled-name='gnutls_record_get_max_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_max_size@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-100'/>
     </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-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'>
       <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-1079' id='type-id-1080'/>
     <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-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'/>
       <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-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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_server_name_get' mangled-name='gnutls_server_name_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_server_name_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-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-423' name='data_length'/>
+      <parameter type-id='type-id-420' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_sig' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_sign_algorithm_get_client' mangled-name='gnutls_sign_algorithm_get_client' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_algorithm_get_client@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_sign_algorithm_get' mangled-name='gnutls_sign_algorithm_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_algorithm_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-414' 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-1081'/>
     <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-414' name='session'/>
       <parameter type-id='type-id-100' name='indx'/>
-      <parameter type-id='type-id-1079' name='algo'/>
+      <parameter type-id='type-id-1081' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_sr' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_safe_renegotiation_status' mangled-name='gnutls_safe_renegotiation_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_safe_renegotiation_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='session_ticket.c' comp-dir-path='/home/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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_session_ticket' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_session_ticket_enable_server' mangled-name='gnutls_session_ticket_enable_server' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ticket_enable_server@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-57' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_ticket_enable_client' mangled-name='gnutls_session_ticket_enable_client' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ticket_enable_client@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_ticket_key_generate' mangled-name='gnutls_session_ticket_key_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ticket_key_generate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-275' name='key'/>
+      <parameter type-id='type-id-276' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_srp' type-id='type-id-1078' 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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_heartbeat' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_heartbeat_set_timeouts' mangled-name='gnutls_heartbeat_set_timeouts' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_set_timeouts@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='retrans_timeout'/>
       <parameter type-id='type-id-10' name='total_timeout'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_get_timeout' mangled-name='gnutls_heartbeat_get_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_get_timeout@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_pong' mangled-name='gnutls_heartbeat_pong' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_pong@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_ping' mangled-name='gnutls_heartbeat_ping' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_ping@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-100' name='data_size'/>
       <parameter type-id='type-id-10' name='max_tries'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_enable' mangled-name='gnutls_heartbeat_enable' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_enable@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='type'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_allowed' mangled-name='gnutls_heartbeat_allowed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_allowed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='type'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='status_request.c' comp-dir-path='/home/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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_status_request' type-id='type-id-1078' 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-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-275' name='extensions'/>
+      <parameter type-id='type-id-276' 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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_dumbfw' type-id='type-id-1078' 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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_ext_master_secret' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_session_ext_master_secret_status' mangled-name='gnutls_session_ext_master_secret_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ext_master_secret_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='etm.c' comp-dir-path='/home/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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_etm' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_session_etm_status' mangled-name='gnutls_session_etm_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_etm_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='supported_versions.c' comp-dir-path='/home/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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_versions' type-id='type-id-1078' 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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_post_handshake' type-id='type-id-1078' 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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_cookie' type-id='type-id-1078' 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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_psk_ke_modes' type-id='type-id-1078' 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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_pre_shared_key' type-id='type-id-1078' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_anti_replay_check' mangled-name='_gnutls_anti_replay_check' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
+    </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'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_groups' type-id='type-id-1078' 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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_ec_point_formats' type-id='type-id-1078' 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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_early_data' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_record_set_max_early_data_size' mangled-name='gnutls_record_set_max_early_data_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_max_early_data_size@@GNUTLS_3_6_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-100' name='size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_record_get_max_early_data_size' mangled-name='gnutls_record_get_max_early_data_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_max_early_data_size@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-100'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_record_size_limit' type-id='type-id-1078' 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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_client_cert_type' type-id='type-id-1078' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_server_cert_type' type-id='type-id-1078' 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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_alpn' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_alpn_set_protocols' mangled-name='gnutls_alpn_set_protocols' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alpn_set_protocols@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-57' name='protocols'/>
       <parameter type-id='type-id-10' name='protocols_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_alpn_get_selected_protocol' mangled-name='gnutls_alpn_get_selected_protocol' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alpn_get_selected_protocol@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='protocol'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-276' 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-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-mine/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_srtp' type-id='type-id-1078' visibility='default'/>
     <function-decl name='gnutls_srtp_get_keys' mangled-name='gnutls_srtp_get_keys' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_get_keys@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-102' name='key_material'/>
       <parameter type-id='type-id-10' name='key_material_size'/>
-      <parameter type-id='type-id-275' name='client_key'/>
-      <parameter type-id='type-id-275' name='client_salt'/>
-      <parameter type-id='type-id-275' name='server_key'/>
-      <parameter type-id='type-id-275' name='server_salt'/>
+      <parameter type-id='type-id-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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srtp_set_profile_direct' mangled-name='gnutls_srtp_set_profile_direct' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_set_profile_direct@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='profiles'/>
-      <parameter type-id='type-id-425' name='err_pos'/>
+      <parameter type-id='type-id-427' 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-1082'>
       <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-1082' id='type-id-1083'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-1083' name='profile'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srtp_set_mki' mangled-name='gnutls_srtp_set_mki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_set_mki@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-57' name='mki'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srtp_get_mki' mangled-name='gnutls_srtp_get_mki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_get_mki@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='mki'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-276' 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-1081' name='profile'/>
+      <parameter type-id='type-id-1083' 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-1083' size-in-bits='64' id='type-id-1084'/>
     <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-1084' 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-237' name='session'/>
+      <parameter type-id='type-id-1084' 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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
@@ -17708,75 +17817,75 @@
     <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/auth' language='LANG_C99'>
     <function-decl name='gnutls_srp_base64_decode2' mangled-name='gnutls_srp_base64_decode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_base64_decode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-276' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_base64_decode' mangled-name='gnutls_srp_base64_decode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_base64_decode@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-376' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-377' name='result'/>
+      <parameter type-id='type-id-423' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_base64_encode2' mangled-name='gnutls_srp_base64_encode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_base64_encode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-276' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_base64_encode' mangled-name='gnutls_srp_base64_encode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_base64_encode@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-376' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-377' name='result'/>
+      <parameter type-id='type-id-423' 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='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'/>
     <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-1086'/>
     </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'/>
@@ -17787,11 +17896,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-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'/>
     <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-1088'/>
     </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'/>
@@ -17822,24 +17931,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-mine/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-425' name='pcache'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='sidx'/>
+      <parameter type-id='type-id-420' 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-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'/>
     <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-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-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'/>
       <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'>
@@ -17849,16 +17958,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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
@@ -17883,17 +17992,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-1093'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
     <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-1094'/>
     </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-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'/>
     <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-1096'/>
     </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'/>
@@ -17904,9 +18017,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-nmav/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_digest_get_oid' mangled-name='gnutls_digest_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_get_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algorithm'/>
+      <parameter type-id='type-id-212' name='algorithm'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_mac' mangled-name='gnutls_oid_to_mac' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_oid_to_mac@@GNUTLS_3_4'>
@@ -17915,17 +18028,17 @@
     </function-decl>
     <function-decl name='gnutls_oid_to_digest' mangled-name='gnutls_oid_to_digest' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_oid_to_digest@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='oid'/>
-      <return type-id='type-id-211'/>
+      <return type-id='type-id-212'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-1095'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1096'/>
+    <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'/>
     <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-1098'/>
     </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-1099'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
     <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-1100'/>
     </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'/>
@@ -17941,10 +18054,10 @@
     </function-decl>
     <function-decl name='gnutls_digest_get_id' mangled-name='gnutls_digest_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
-      <return type-id='type-id-211'/>
+      <return type-id='type-id-212'/>
     </function-decl>
     <function-decl name='gnutls_digest_get_name' mangled-name='gnutls_digest_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algorithm'/>
+      <parameter type-id='type-id-212' name='algorithm'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_name' mangled-name='gnutls_mac_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get_name@@GNUTLS_3_4'>
@@ -17956,11 +18069,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-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'/>
     <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-1102'/>
     </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'/>
@@ -17975,7 +18088,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-mine/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'/>
@@ -17993,34 +18106,34 @@
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gnutls_pk_list' mangled-name='gnutls_pk_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_list@@GNUTLS_3_4'>
-      <return type-id='type-id-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-mine/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_pk_bits_to_sec_param' mangled-name='gnutls_pk_bits_to_sec_param' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_bits_to_sec_param@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
-      <return type-id='type-id-202'/>
+      <return type-id='type-id-203'/>
     </function-decl>
     <function-decl name='gnutls_sec_param_get_name' mangled-name='gnutls_sec_param_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sec_param_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-202' name='param'/>
+      <parameter type-id='type-id-203' name='param'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_sec_param_to_symmetric_bits' mangled-name='gnutls_sec_param_to_symmetric_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sec_param_to_symmetric_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-202' name='param'/>
+      <parameter type-id='type-id-203' name='param'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_sec_param_to_pk_bits' mangled-name='gnutls_sec_param_to_pk_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sec_param_to_pk_bits@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='algo'/>
-      <parameter type-id='type-id-202' name='param'/>
+      <parameter type-id='type-id-203' name='param'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/home/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-mine/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'/>
@@ -18032,7 +18145,7 @@
     </function-decl>
     <function-decl name='gnutls_sign_get_hash_algorithm' mangled-name='gnutls_sign_get_hash_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_get_hash_algorithm@@GNUTLS_3_4'>
       <parameter type-id='type-id-21' name='sign'/>
-      <return type-id='type-id-211'/>
+      <return type-id='type-id-212'/>
     </function-decl>
     <function-decl name='gnutls_sign_get_oid' mangled-name='gnutls_sign_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_get_oid@@GNUTLS_3_4'>
       <parameter type-id='type-id-21' name='sign'/>
@@ -18040,7 +18153,7 @@
     </function-decl>
     <function-decl name='gnutls_pk_to_sign' mangled-name='gnutls_pk_to_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_to_sign@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='pk'/>
-      <parameter type-id='type-id-211' name='hash'/>
+      <parameter type-id='type-id-212' name='hash'/>
       <return type-id='type-id-21'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_sign' mangled-name='gnutls_oid_to_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_oid_to_sign@@GNUTLS_3_4'>
@@ -18051,10 +18164,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-1103'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
     <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-1104'/>
     </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'/>
@@ -18069,8 +18182,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-112'/>
+    </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-mine/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'/>
@@ -18079,247 +18195,254 @@
       <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-1105'/>
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-1106'/>
     <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-1106'/>
+    </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'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <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-1109' 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-1110' 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-1111' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='exists' type-id='type-id-1112' 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-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'/>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1110'>
+    <function-type size-in-bits='64' id='type-id-1113'>
       <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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_ssse3' type-id='type-id-1114' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_ccm_x86_aesni' type-id='type-id-1114' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_padlock' type-id='type-id-1114' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_x86_aesni' type-id='type-id-1114' 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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_pclmul_avx' type-id='type-id-1114' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_pclmul' type-id='type-id-1114' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_x86_ssse3' type-id='type-id-1114' 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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_padlock' type-id='type-id-1114' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <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='exists' type-id='type-id-1117' 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'/>
+    <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'/>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1115'>
+    <function-type size-in-bits='64' id='type-id-1118'>
       <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-mine/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_hmac_sha_x86_ssse3' type-id='type-id-1119' visibility='default'/>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -18333,584 +18456,575 @@
         <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-1121' 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-1122' 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-1123' 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-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'>
       <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='exists' type-id='type-id-1132' 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'/>
+    <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'/>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1130'>
-      <parameter type-id='type-id-211'/>
+    <function-type size-in-bits='64' id='type-id-1133'>
+      <parameter type-id='type-id-212'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1122'>
+    <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-983'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-985'/>
+      <return type-id='type-id-112'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1124'>
+    <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-191'/>
-      <return type-id='type-id-111'/>
+      <parameter type-id='type-id-192'/>
+      <return type-id='type-id-112'/>
     </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-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'/>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'>
+  <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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='padlock_capability' mangled-name='padlock_capability' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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='704' is-struct='yes' visibility='default' id='type-id-1135'>
       <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-1136' 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-1136' 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-1137' 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-1138' 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-1139' 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-1140' 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-1140' 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-1141' 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-1142' 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-1143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='derive' type-id='type-id-1141' 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='derive' type-id='type-id-1144' 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-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'>
       <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'/>
+    <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'/>
     <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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_get_secp_384r1' mangled-name='nettle_get_secp_384r1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_invert' mangled-name='__gmpz_invert' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_init' mangled-name='__gmpz_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_cmp' mangled-name='__gmpz_cmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_ed25519_sha512_public_key' mangled-name='nettle_ed25519_sha512_public_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_clear' mangled-name='__gmpz_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_sizeinbase' mangled-name='__gmpz_sizeinbase' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_mod' mangled-name='__gmpz_mod' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_powm' mangled-name='__gmpz_powm' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_set' mangled-name='__gmpz_set' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_curve25519_mul_g' mangled-name='nettle_curve25519_mul_g' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='_gnutls_decode_gost_rs' mangled-name='_gnutls_decode_gost_rs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_ed25519_sha512_sign' mangled-name='nettle_ed25519_sha512_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_curve25519_mul' mangled-name='nettle_curve25519_mul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1159'>
-      <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-1152'>
       <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-1146'/>
+      <parameter type-id='type-id-1150'/>
       <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-1148'>
       <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-1146'/>
       <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-1153'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-1144'/>
+      <parameter type-id='type-id-1146'/>
       <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-1147'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1144'/>
+      <parameter type-id='type-id-1146'/>
       <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-1151'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-276'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1144'/>
-      <parameter type-id='type-id-1148'/>
+      <parameter type-id='type-id-1146'/>
+      <parameter type-id='type-id-1150'/>
       <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-1160'>
       <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-276'/>
+      <parameter type-id='type-id-1146'/>
+      <parameter type-id='type-id-1146'/>
       <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-1159'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-1156'/>
-      <parameter type-id='type-id-1152'/>
+      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1154'/>
       <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-1156'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-1152'/>
+      <parameter type-id='type-id-1154'/>
       <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-1155'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-1152'/>
+      <parameter type-id='type-id-1154'/>
       <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-mine/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-1162'>
       <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-1163' 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-1164' 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-1165' 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-1165' 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-1166' 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-1167' 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-1168' 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-1169' 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-1170' 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-1171' 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-1172' 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-1173' 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-1173' 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-1173' 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-1173' 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-1168' 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-1168' 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-1168' 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-1174' 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-1174' 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-1174' 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-1168' 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-1175' 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-1176' 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-1177' 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-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'/>
-    <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-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'/>
@@ -18920,224 +19034,225 @@
     <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-1192' size-in-bits='64' id='type-id-1175'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1193'>
       <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'/>
+    <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'/>
-    <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'/>
+    <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'/>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_mul' mangled-name='__gmpz_mul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_sub' mangled-name='__gmpz_sub' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_add' mangled-name='__gmpz_add' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-1179'>
+      <parameter type-id='type-id-1178'/>
       <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-1180'>
+      <parameter type-id='type-id-1178'/>
       <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-1192'>
+      <parameter type-id='type-id-1182'/>
       <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-1183'>
+      <parameter type-id='type-id-1182'/>
+      <parameter type-id='type-id-1182'/>
       <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-1184'>
+      <parameter type-id='type-id-1182'/>
       <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'/>
+    <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-421'/>
-      <parameter type-id='type-id-1193'/>
+      <parameter type-id='type-id-423'/>
+      <parameter type-id='type-id-1194'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1185'>
-      <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1181'/>
+    <function-type size-in-bits='64' id='type-id-1186'>
+      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-1182'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1184'>
-      <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1181'/>
-      <parameter type-id='type-id-1181'/>
+    <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'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1189'>
-      <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1181'/>
-      <parameter type-id='type-id-1181'/>
-      <parameter type-id='type-id-1181'/>
+    <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'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1190'>
-      <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1181'/>
+    <function-type size-in-bits='64' id='type-id-1191'>
+      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-1182'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1187'>
-      <parameter type-id='type-id-318'/>
+    <function-type size-in-bits='64' id='type-id-1188'>
+      <parameter type-id='type-id-319'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1194'>
-      <parameter type-id='type-id-318'/>
+    <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-1193'/>
+      <parameter type-id='type-id-1194'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1186'>
-      <parameter type-id='type-id-1181'/>
-      <return type-id='type-id-318'/>
+    <function-type size-in-bits='64' id='type-id-1187'>
+      <parameter type-id='type-id-1182'/>
+      <return type-id='type-id-319'/>
     </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-1189'>
+      <parameter type-id='type-id-1182'/>
       <return type-id='type-id-10'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1180'>
-      <parameter type-id='type-id-318'/>
-      <return type-id='type-id-111'/>
+    <function-type size-in-bits='64' id='type-id-1181'>
+      <parameter type-id='type-id-319'/>
+      <return type-id='type-id-112'/>
     </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-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'/>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_cipher_ops' type-id='type-id-1107' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
@@ -19145,57 +19260,57 @@
       <parameter type-id='type-id-100' 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-985' name='seed'/>
       <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-377' 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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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'>
+  <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-111'/>
+      <return type-id='type-id-112'/>
     </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'>
+  <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-111'/>
+      <return type-id='type-id-112'/>
     </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'>
+  <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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='size' type-id='type-id-100' 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-1199' 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-1199' 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-1200' visibility='default' id='type-id-1201'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='_mp_alloc' type-id='type-id-22' visibility='default'/>
       </data-member>
@@ -19203,140 +19318,140 @@
         <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-1202' 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-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'/>
 
-    <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-1200' size-in-bits='128' id='type-id-1204'>
+      <subrange length='1' type-id='type-id-38' id='type-id-1205'/>
 
     </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-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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='size' type-id='type-id-100' 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-1199' 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-1199' 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-1199' 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-1199' 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-1199' 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-1199' 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-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'/>
     <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-1206' name='pub'/>
+      <parameter type-id='type-id-1208' name='key'/>
       <parameter type-id='type-id-10' name='seed_length'/>
-      <parameter type-id='type-id-191' name='seed'/>
+      <parameter type-id='type-id-192' name='seed'/>
       <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1210' name='progress'/>
+      <parameter type-id='type-id-1211' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_lcm' mangled-name='__gmpz_lcm' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_sqrt' mangled-name='__gmpz_sqrt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_gcd' mangled-name='__gmpz_gcd' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1208'>
+    <function-type size-in-bits='64' id='type-id-1209'>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-22'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/nettle' language='LANG_C99'>
+    <class-decl name='dsa_params' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1212'>
       <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-1199' 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-1199' 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-1199' 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-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'/>
     <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-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-1215' name='random'/>
+      <parameter type-id='type-id-1216' name='random'/>
       <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1210' name='progress'/>
+      <parameter type-id='type-id-1211' 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-1217'>
       <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-1218' 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-1218' 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-1218' 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'/>
@@ -19346,232 +19461,232 @@
       </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-1218'>
+      <subrange length='257' type-id='type-id-38' id='type-id-1219'/>
 
     </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-1217' size-in-bits='64' id='type-id-1220'/>
     <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-1213' name='params'/>
+      <parameter type-id='type-id-1220' 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-1211' 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-1213' 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-985' 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-1211' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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-1213' name='pub'/>
+      <parameter type-id='type-id-1220' 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-1213' 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-985' 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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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='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'/>
     <function-decl name='close' mangled-name='close' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='strerror' mangled-name='strerror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='read' mangled-name='read' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='getrandom' mangled-name='getrandom' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='open' mangled-name='open' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='fcntl' mangled-name='fcntl' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1220'>
+    <function-type size-in-bits='64' id='type-id-1221'>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-100'/>
       <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-mine/lib/nettle' language='LANG_C99'>
+    <class-decl name='gost28147_param' size-in-bits='32800' is-struct='yes' visibility='default' id='type-id-1224'>
       <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-1225' 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-1225'>
+      <subrange length='1024' type-id='type-id-38' id='type-id-1226'/>
 
     </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'/>
+    <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-nmav/lib/nettle' language='LANG_C99'>
+  <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'>
     <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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_gosthash94cp' type-id='type-id-1129' 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-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>
-  <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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_export' mangled-name='__gmpz_export' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_hmac_gosthash94cp_set_key' mangled-name='_gnutls_hmac_gosthash94cp_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='nettle_pbkdf2' mangled-name='nettle_pbkdf2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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'>
+  <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-111'/>
+      <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-111'/>
+      <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-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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <return type-id='type-id-112'/>
     </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-mine/lib/nettle' language='LANG_C99'>
     <function-decl name='__gmpz_roinit_n' mangled-name='__gmpz_roinit_n' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_tdiv_r_2exp' mangled-name='__gmpz_tdiv_r_2exp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpz_tdiv_q_2exp' mangled-name='__gmpz_tdiv_q_2exp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </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'>
+  <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-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <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'/>
+      <return type-id='type-id-112'/>
     </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'/>
+      <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-111'/>
+      <return type-id='type-id-112'/>
     </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-mine/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'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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-111'/>
+      <return type-id='type-id-112'/>
     </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/ecc-gost-hash.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/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'/>
+      <return type-id='type-id-112'/>
     </function-decl>
     <function-decl name='__gmpn_rshift' mangled-name='__gmpn_rshift' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-112'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/devel/openssl b/devel/openssl
-Subproject 2805ee1e095a78f596dc7adf778441e2edb9f15
+Subproject 7216e9a20aee620d85185a6ddb8caa30f11f219
diff --git a/devel/perlasm/cpuid-x86.pl b/devel/perlasm/cpuid-x86.pl
deleted file mode 100644
index fa9c14e577..0000000000
--- a/devel/perlasm/cpuid-x86.pl
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl
-#
-# ====================================================================
-# Written by Nikos Mavrogiannopoulos
-# Placed under the LGPL
-# ====================================================================
-#
-
-$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
-push(@INC,"${dir}","${dir}../../crypto/perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],$0);
-
-&function_begin_B("gnutls_cpuid");
-	&push	("ebp");
-	&mov    ("ebp", "esp");
-	&sub    ("esp", 12);
-	&mov    (&DWP(0,"esp"), "ebx");
-	&mov    ("eax",&DWP(8,"ebp"));
-	&mov    (&DWP(4,"esp"), "esi");
-	&mov    (&DWP(8,"esp"), "edi");
-	&push	("ebx");
-	&cpuid	();
-	&mov    ("edi", "ebx");
-	&pop	("ebx");
-	&mov	("esi","edx");
-	&mov    ("edx",&DWP(12,"ebp"));
-	&mov    (&DWP(0,"edx"), "eax");
-	&mov    ("eax",&DWP(16,"ebp"));
-	&mov    (&DWP(0,"eax"), "edi");
-	&mov    ("eax",&DWP(20,"ebp"));
-	&mov    (&DWP(0,"eax"), "ecx");
-	&mov    ("eax",&DWP(24,"ebp"));
-	&mov    (&DWP(0,"eax"), "esi");
-	&mov    ("ebx",&DWP(0,"esp"));
-	&mov    ("esi",&DWP(4,"esp"));
-	&mov    ("edi",&DWP(8,"esp"));
-	&mov    ("esp","ebp");
-	&pop	("ebp");
-	&ret    ();
-&function_end_B("gnutls_cpuid");
-
-&function_begin_B("gnutls_have_cpuid");
-	&pushf	();
-	&pop    ("eax");
-	&or     ("eax",0x200000);
-	&push   ("eax");
-	&popf   ();
-	&pushf  ();
-	&pop    ("eax");
-	&and     ("eax",0x200000);
-	&ret    ();
-&function_end_B("gnutls_have_cpuid");
-
-&asciz("CPUID for x86");
-&asm_finish();
diff --git a/devel/perlasm/cpuid-x86.pl.license b/devel/perlasm/cpuid-x86.pl.license
deleted file mode 120000
index 6879a72497..0000000000
--- a/devel/perlasm/cpuid-x86.pl.license
+++ /dev/null
@@ -1 +0,0 @@
-license-gnutls.txt
\ No newline at end of file
diff --git a/devel/perlasm/cpuid-x86_64.pl b/devel/perlasm/cpuid-x86_64.pl
deleted file mode 100644
index a6bb30ed7e..0000000000
--- a/devel/perlasm/cpuid-x86_64.pl
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env perl
-#
-# ====================================================================
-# Written by Nikos Mavrogiannopoulos
-# Based on e_padlock-x86_64
-# ====================================================================
-#
-
-$flavour = shift;
-$output  = shift;
-if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
-
-$win64=0; $win64=1 if ($flavour =~ /[nm]asm|mingw64/ || $output =~ /\.asm$/);
-
-$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
-( $xlate="${dir}x86_64-xlate.pl" and -f $xlate ) or
-( $xlate="${dir}../../crypto/perlasm/x86_64-xlate.pl" and -f $xlate) or
-die "can't locate x86_64-xlate.pl";
-
-open STDOUT,"| $^X $xlate $flavour $output";
-
-$code=".text\n";
-
-($arg1,$arg2,$arg3,$arg4)=$win64?("%rcx","%rdx","%r8", "%r9") : # Win64 order
-                                 ("%rdi","%rsi","%rdx","%rcx"); # Unix order
-
-
-$code.=<<___;
-.globl gnutls_cpuid
-.type gnutls_cpuid,\@function
-.align	16
-gnutls_cpuid:
-	pushq	%rbp
-	movq	%rsp, %rbp
-	pushq	%rbx
-	movl	%edi, -12(%rbp)
-	movq	%rsi, -24(%rbp)
-	movq	%rdx, -32(%rbp)
-	movq	%rcx, -40(%rbp)
-	movq	%r8, -48(%rbp)
-	movl	-12(%rbp), %eax
-	movl	%eax, -60(%rbp)
-	movl	-60(%rbp), %eax
-	cpuid
-	movl	%edx, -56(%rbp)
-	movl	%ecx, %esi
-	movl	%eax, -52(%rbp)
-	movq	-24(%rbp), %rax
-	movl	-52(%rbp), %edx
-	movl	%edx, (%rax)
-	movq	-32(%rbp), %rax
-	movl	%ebx, (%rax)
-	movq	-40(%rbp), %rax
-	movl	%esi, (%rax)
-	movq	-48(%rbp), %rax
-	movl	-56(%rbp), %ecx
-	movl	%ecx, (%rax)
-	popq	%rbx
-	leave
-	ret
-.size gnutls_cpuid,.-gnutls_cpuid
-___
-
-$code =~ s/\`([^\`]*)\`/eval($1)/gem;
-
-print $code;
-
-close STDOUT;
-
diff --git a/devel/perlasm/cpuid-x86_64.pl.license b/devel/perlasm/cpuid-x86_64.pl.license
deleted file mode 120000
index 6879a72497..0000000000
--- a/devel/perlasm/cpuid-x86_64.pl.license
+++ /dev/null
@@ -1 +0,0 @@
-license-gnutls.txt
\ No newline at end of file
diff --git a/devel/perlasm/sha256-ssse3-x86_64.pl b/devel/perlasm/sha256-ssse3-x86_64.pl
new file mode 120000
index 0000000000..126162756a
--- /dev/null
+++ b/devel/perlasm/sha256-ssse3-x86_64.pl
@@ -0,0 +1 @@
+sha512-ssse3-x86_64.pl
\ No newline at end of file
diff --git a/devel/perlasm/sha256-ssse3-x86_64.pl.license b/devel/perlasm/sha256-ssse3-x86_64.pl.license
new file mode 120000
index 0000000000..614714ae16
--- /dev/null
+++ b/devel/perlasm/sha256-ssse3-x86_64.pl.license
@@ -0,0 +1 @@
+sha512-ssse3-x86_64.pl.license
\ No newline at end of file
diff --git a/devel/symbols.last b/devel/symbols.last
index 9c6c93a26e..e5ff89d5e4 100644
--- a/devel/symbols.last
+++ b/devel/symbols.last
@@ -6,6 +6,7 @@ GNUTLS_3_6_4@GNUTLS_3_6_4
 GNUTLS_3_6_5@GNUTLS_3_6_5
 GNUTLS_3_6_6@GNUTLS_3_6_6
 GNUTLS_3_6_8@GNUTLS_3_6_8
+GNUTLS_3_6_9@GNUTLS_3_6_9
 _gnutls_global_init_skip@GNUTLS_3_4
 gnutls_aead_cipher_decrypt@GNUTLS_3_4
 gnutls_aead_cipher_deinit@GNUTLS_3_4
@@ -235,6 +236,7 @@ gnutls_fingerprint@GNUTLS_3_4
 gnutls_fips140_mode_enabled@GNUTLS_3_4
 gnutls_fips140_set_mode@GNUTLS_3_6_3
 gnutls_free@GNUTLS_3_4
+gnutls_get_system_config_file@GNUTLS_3_6_9
 gnutls_global_deinit@GNUTLS_3_4
 gnutls_global_init@GNUTLS_3_4
 gnutls_global_set_audit_log_function@GNUTLS_3_4
@@ -260,6 +262,7 @@ gnutls_handshake_set_private_extensions@GNUTLS_3_4
 gnutls_handshake_set_random@GNUTLS_3_4
 gnutls_handshake_set_timeout@GNUTLS_3_4
 gnutls_hash@GNUTLS_3_4
+gnutls_hash_copy@GNUTLS_3_6_9
 gnutls_hash_deinit@GNUTLS_3_4
 gnutls_hash_fast@GNUTLS_3_4
 gnutls_hash_get_len@GNUTLS_3_4
@@ -277,6 +280,7 @@ gnutls_hex_decode@GNUTLS_3_4
 gnutls_hex_encode2@GNUTLS_3_4
 gnutls_hex_encode@GNUTLS_3_4
 gnutls_hmac@GNUTLS_3_4
+gnutls_hmac_copy@GNUTLS_3_6_9
 gnutls_hmac_deinit@GNUTLS_3_4
 gnutls_hmac_fast@GNUTLS_3_4
 gnutls_hmac_get_len@GNUTLS_3_4
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 773ab6dc7f..6d21d74820 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -151,7 +151,7 @@ gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi				\
 	cha-library.texi cha-preface.texi cha-programs.texi		\
 	sec-tls-app.texi cha-errors.texi cha-support.texi		\
 	cha-shared-key.texi cha-gtls-examples.texi cha-upgrade.texi	\
-	cha-tokens.texi cha-crypto.texi cha-auth.texi
+	cha-tokens.texi cha-crypto.texi cha-auth.texi cha-config.texi
 
 AUTOGENED_DOC = invoke-gnutls-cli.texi invoke-gnutls-cli-debug.texi \
 	invoke-gnutls-serv.texi invoke-certtool.texi invoke-srptool.texi \
@@ -1027,6 +1027,8 @@ FUNCS += functions/gnutls_fips140_mode_enabled
 FUNCS += functions/gnutls_fips140_mode_enabled.short
 FUNCS += functions/gnutls_fips140_set_mode
 FUNCS += functions/gnutls_fips140_set_mode.short
+FUNCS += functions/gnutls_get_system_config_file
+FUNCS += functions/gnutls_get_system_config_file.short
 FUNCS += functions/gnutls_global_deinit
 FUNCS += functions/gnutls_global_deinit.short
 FUNCS += functions/gnutls_global_init
@@ -1077,6 +1079,8 @@ FUNCS += functions/gnutls_handshake_set_timeout
 FUNCS += functions/gnutls_handshake_set_timeout.short
 FUNCS += functions/gnutls_hash
 FUNCS += functions/gnutls_hash.short
+FUNCS += functions/gnutls_hash_copy
+FUNCS += functions/gnutls_hash_copy.short
 FUNCS += functions/gnutls_hash_deinit
 FUNCS += functions/gnutls_hash_deinit.short
 FUNCS += functions/gnutls_hash_fast
@@ -1111,6 +1115,8 @@ FUNCS += functions/gnutls_hex_encode2
 FUNCS += functions/gnutls_hex_encode2.short
 FUNCS += functions/gnutls_hmac
 FUNCS += functions/gnutls_hmac.short
+FUNCS += functions/gnutls_hmac_copy
+FUNCS += functions/gnutls_hmac_copy.short
 FUNCS += functions/gnutls_hmac_deinit
 FUNCS += functions/gnutls_hmac_deinit.short
 FUNCS += functions/gnutls_hmac_fast
diff --git a/doc/cha-config.texi b/doc/cha-config.texi
new file mode 100644
index 0000000000..3cc568a607
--- /dev/null
+++ b/doc/cha-config.texi
@@ -0,0 +1,158 @@
+@node System-wide configuration of the library
+@chapter System-wide configuration of the library
+@cindex System-wide configuration
+
+@acronym{GnuTLS} 3.6.9 introduced a system-wide configuration of the library
+which can be used to disable or mark algorithms and protocols as insecure
+system-wide, overriding the library defaults. The format of this
+configuration file is of an INI file, with the hash ('#') allowed for
+commenting. It intentionally does not allow switching algorithms or protocols
+which were disabled or marked as insecure during compile time to the secure
+set. This is to prevent the feature from being used to attack the system.
+Unknown options or sections in the configuration file are skipped unless
+the environment variable @code{GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID} is
+set to 1, where it would cause the library to exit on unknown options.
+
+The location of the default configuration file is @code{/etc/gnutls/config},
+but its actual location may be overriden during compile time or at run-time
+using the @code{GNUTLS_SYSTEM_PRIORITY_FILE} environment variable. The file
+used can be queried using @funcref{gnutls_get_system_config_file}.
+
+@showfuncdesc{gnutls_get_system_config_file}
+
+@menu
+* Application-specific priority strings::
+* Disabling algorithms and protocols::
+* Querying for disabled algorithms and protocols::
+* Overriding the parameter verification profile::
+@end menu
+
+@node Application-specific priority strings
+@section Application-specific priority strings
+
+It is possible to specify custom cipher priority strings, in addition to the
+default priority strings (@code{NORMAL}, @code{PERFORMANCE}, etc.). These can
+be used either by individual applications, or even as the default option if
+the library is compiled with the configuration option
+@code{--with-default-priority-string}. In the latter case the defined
+priority string will be used for applications using @funcref{gnutls_set_default_priority}
+or @funcref{gnutls_set_default_priority_append}.
+
+The priority strings can be specified in the global section of the
+configuration file, or in the section named @code{[priorities]}.
+The format is '@code{KEYWORD = VALUE}', e.g.,
+
+When used they may be followed by additional options that will be appended to the
+system string (e.g., '@code{@@EXAMPLE-PRIORITY:+SRP}'). '@code{EXAMPLE-PRIORITY=NORMAL:+ARCFOUR-128}'.
+Since version 3.5.1 applications are allowed to specify fallback keywords such as
+@@KEYWORD1,@@KEYWORD2, and the first valid keyword will be used.
+
+The following example configuration defines a priority string called @code{@@SYSTEM}.
+When set, its full settings can be queried using @code{gnutls-cli --priority @@SYSTEM --list}.
+
+@example
+[priorities]
+SYSTEM = NORMAL:-AES-128-CBC:-AES-256-CBC
+@end example
+
+
+@node Disabling algorithms and protocols
+@section Disabling algorithms and protocols
+
+The approach above works well to create consistent system-wide settings
+for cooperative GnuTLS applications. When an application however does not
+use the @funcref{gnutls_set_default_priority} or @funcref{gnutls_set_default_priority_append}
+functions, the method is not sufficient to prevent applications from using
+protocols or algorithms forbidden by a local policy.
+The override method described below enables the deprecation of algorithms and
+protocols system-wide for all applications.
+
+The available options must be set in the @code{[overrides]} section of the
+configuration file and can be
+@itemize
+@item @code{insecure-sig-for-cert}: to mark the signature algorithm as insecure when used in certificates.
+@item @code{insecure-sig}: to mark the signature algorithm as insecure for any use.
+@item @code{insecure-hash}: to mark the hash algorithm as insecure for digital signature use (provides a more generic way to disable digital signatures for broken hash algorithms).
+@item @code{disabled-version}: to disable the specified TLS versions.
+@item @code{tls-disabled-cipher}: to disable the specified ciphers for use in the TLS or DTLS protocols.
+@item @code{tls-disabled-mac}: to disable the specified MAC algorithms for use in the TLS or DTLS protocols.
+@item @code{tls-disabled-group}: to disable the specified group for use in the TLS or DTLS protocols.
+@item @code{tls-disabled-kx}: to disable the specified key exchange algorithms for use in the TLS or DTLS protocols (applies to TLS1.2 or earlier).
+@end itemize
+
+Each of the options can be repeated multiple times when multiple values need
+to be disabled.
+
+The valid values for the options above can be found in the 'Protocols', 'Digests'
+'PK-signatures', 'Protocols', 'Ciphrers', and 'MACs' fields of the output of @code{gnutls-cli --list}.
+
+@subsection Examples
+
+The following example marks as insecure all digital signature algorithms
+which depend on SHA384, as well as the RSA-SHA1 signature algorithm.
+
+@example
+[overrides]
+insecure-hash = sha384
+insecure-sig = rsa-sha1
+@end example
+
+The following example marks RSA-SHA256 as insecure for use in certificates
+and disables the TLS1.0 and TLS1.1 protocols.
+
+@example
+[overrides]
+insecure-sig-for-cert = rsa-sha256
+disabled-version = tls1.0
+disabled-version = tls1.1
+@end example
+
+The following example disables the @code{AES-128-CBC} and @code{AES-256-CBC}
+ciphers, the @code{HMAC-SHA1} MAC algorithm and the @code{GROUP-FFDHE8192}
+group for TLS and DTLS protocols.
+
+@example
+[overrides]
+tls-disabled-cipher = aes-128-cbc
+tls-disabled-cipher = aes-256-cbc
+tls-disabled-mac = sha1
+tls-disabled-group = group-ffdhe8192
+@end example
+
+@node Querying for disabled algorithms and protocols
+@section Querying for disabled algorithms and protocols
+
+When necessary applications can query whether a particular algorithm
+or protocol has been marked as insecure or disabled system-wide.
+Digital signatures can be queried using the following algorithms.
+@showfuncB{gnutls_sign_is_secure,gnutls_sign_is_secure2}
+
+Any disabled protocol versions or elliptic curves will not show up in the
+lists provided by the following functions.
+
+@showfuncC{gnutls_protocol_list,gnutls_group_list,gnutls_ecc_curve_list}
+
+It is not possible to query for insecure hash algorithms directly
+(only indirectly through the signature API).
+
+
+@node Overriding the parameter verification profile
+@section Overriding the parameter verification profile
+
+When verifying a certificate or TLS session parameters, GnuTLS uses a set
+of profiles associated with the session to determine whether the parameters
+seen in the session are acceptable. For example, whether the RSA public key
+size as seen on the wire, or the Diffie-Hellman parameters for the session.
+These profiles are normally set using the @code{%PROFILE} priority string
+(see @ref{Priority Strings} and @ref{Selecting cryptographic key sizes}).
+
+It is possible to set the low bar profile that applications cannot override
+using the following.
+
+@example
+[overrides]
+
+# do not allow applications use the LOW or VERY-WEAK profiles.
+min-verification-profile = legacy
+
+@end example
diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index e08cbb24f1..4a6a53811b 100644
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -199,6 +199,7 @@ CPU. The currently available options are:
 @item 0x4: Enable SSSE3
 @item 0x8: Enable PCLMUL
 @item 0x10: Enable AVX
+@item 0x20: Enable SHA_NI
 @item 0x100000: Enable VIA padlock
 @item 0x200000: Enable VIA PHE
 @item 0x400000: Enable VIA PHE SHA512
@@ -1293,7 +1294,7 @@ advances while providing compatibility with old clients and servers).
 @multitable @columnfractions .20 .70
 @headitem Keyword @tab Description
 @item @@KEYWORD @tab
-Means that a compile-time specified system configuration file@footnote{The default is @code{/etc/gnutls/default-priorities}.} 
+Means that a compile-time specified system configuration file (see @ref{System-wide configuration of the library})
 will be used to expand the provided keyword. That is used to impose system-specific policies.
 It may be followed by additional options that will be appended to the
 system string (e.g., "@@SYSTEM:+SRP"). The system file should have the
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 7b963d6f67..5c4daa79ae 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -153,6 +153,7 @@ Documentation License''.
 * Hardware security modules and abstract key types::
 * How to use GnuTLS in applications::
 * GnuTLS application examples::
+* System-wide configuration of the library::
 * Using GnuTLS as a cryptographic library::
 * Other included programs::
 * Internal architecture of GnuTLS::
@@ -182,6 +183,8 @@ Documentation License''.
 
 @include cha-gtls-examples.texi
 
+@include cha-config.texi
+
 @include cha-crypto.texi
 
 @include cha-programs.texi
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 9beee86060..d06c180138 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -315,6 +315,7 @@ APIMANS += gnutls_ext_set_data.3
 APIMANS += gnutls_fingerprint.3
 APIMANS += gnutls_fips140_mode_enabled.3
 APIMANS += gnutls_fips140_set_mode.3
+APIMANS += gnutls_get_system_config_file.3
 APIMANS += gnutls_global_deinit.3
 APIMANS += gnutls_global_init.3
 APIMANS += gnutls_global_set_audit_log_function.3
@@ -340,6 +341,7 @@ APIMANS += gnutls_handshake_set_private_extensions.3
 APIMANS += gnutls_handshake_set_random.3
 APIMANS += gnutls_handshake_set_timeout.3
 APIMANS += gnutls_hash.3
+APIMANS += gnutls_hash_copy.3
 APIMANS += gnutls_hash_deinit.3
 APIMANS += gnutls_hash_fast.3
 APIMANS += gnutls_hash_get_len.3
@@ -357,6 +359,7 @@ APIMANS += gnutls_hex_decode2.3
 APIMANS += gnutls_hex_encode.3
 APIMANS += gnutls_hex_encode2.3
 APIMANS += gnutls_hmac.3
+APIMANS += gnutls_hmac_copy.3
 APIMANS += gnutls_hmac_deinit.3
 APIMANS += gnutls_hmac_fast.3
 APIMANS += gnutls_hmac_get_len.3
diff --git a/fuzz/gnutls_x509_verify_fuzzer.repro/5b24d9a0bdb049a203a1fac98d2854bbc6062195 b/fuzz/gnutls_x509_verify_fuzzer.repro/5b24d9a0bdb049a203a1fac98d2854bbc6062195
new file mode 100644
index 0000000000..86b66c022c
--- /dev/null
+++ b/fuzz/gnutls_x509_verify_fuzzer.repro/5b24d9a0bdb049a203a1fac98d2854bbc6062195
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 83b328e89a..5f2d3f849a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -72,11 +72,11 @@ COBJECTS = range.c record.c compress.c debug.c cipher.c gthreads.h handshake-tls
 	pk.c cert-cred.c global.c constate.c anon_cred.c pkix_asn1_tab.c gnutls_asn1_tab.c	\
 	mem.c fingerprint.c tls-sig.c ecc.c alert.c privkey_raw.c atomic.h	\
 	system/certs.c system/threads.c system/fastopen.c system/sockets.c	\
-	str-iconv.c system.c profiles.c profiles.h \
+	str-iconv.c system.c profiles.c profiles.h inih/ini.c \
 	str.c str-unicode.c str-idna.c state.c cert-cred-x509.c file.c supplemental.c	\
 	random.c crypto-api.c crypto-api.h privkey.c pcert.c pubkey.c locks.c dtls.c \
 	system_override.c crypto-backend.c verify-tofu.c pin.c tpm.c fips.c	\
-	safe-memfuncs.c atfork.c atfork.h randomart.c \
+	safe-memfuncs.c atfork.c atfork.h randomart.c name_val_array.h \
 	system-keys.h urls.c urls.h prf.c auto-verify.c dh-session.c \
 	cert-session.c handshake-checks.c dtls-sw.c dh-primes.c openpgp_compat.c \
 	crypto-selftests.c crypto-selftests-pk.c secrets.c extv.c extv.h \
@@ -117,7 +117,7 @@ HFILES = abstract_int.h debug.h cipher.h	 \
 	dh.h kx.h hash_int.h cipher_int.h	 \
 	db.h auth.h hello_ext.h	handshake-defs.h \
 	x509_b64.h sslv2_compat.h datum.h \
-	mpi.h pk.h record.h		\
+	mpi.h pk.h record.h inih/ini.h		\
 	constate.h global.h tls-sig.h mem.h	\
 	session_pack.h str.h str_array.h		\
 	state.h x509.h crypto-backend.h			\
diff --git a/lib/accelerated/aarch64/elf/aes-aarch64.s b/lib/accelerated/aarch64/elf/aes-aarch64.s
index e5a2dc500d..ab227a8c14 100644
--- a/lib/accelerated/aarch64/elf/aes-aarch64.s
+++ b/lib/accelerated/aarch64/elf/aes-aarch64.s
@@ -40,8 +40,6 @@
 # 1 "lib/accelerated/aarch64/elf/aes-aarch64.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/elf/aes-aarch64.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
 # 2 "lib/accelerated/aarch64/elf/aes-aarch64.s.tmp.S" 2
@@ -226,6 +224,7 @@ aes_v8_set_encrypt_key:
 .type aes_v8_set_decrypt_key,%function
 .align 5
 aes_v8_set_decrypt_key:
+.inst 0xd503233f
  stp x29,x30,[sp,#-16]!
  add x29,sp,#0
  bl .Lenc_key
@@ -259,6 +258,7 @@ aes_v8_set_decrypt_key:
  eor x0,x0,x0
 .Ldec_key_abort:
  ldp x29,x30,[sp],#16
+.inst 0xd50323bf
  ret
 .size aes_v8_set_decrypt_key,.-aes_v8_set_decrypt_key
 .globl aes_v8_encrypt
diff --git a/lib/accelerated/aarch64/elf/ghash-aarch64.s b/lib/accelerated/aarch64/elf/ghash-aarch64.s
index 3875047c5e..c30139985b 100644
--- a/lib/accelerated/aarch64/elf/ghash-aarch64.s
+++ b/lib/accelerated/aarch64/elf/ghash-aarch64.s
@@ -40,12 +40,11 @@
 # 1 "lib/accelerated/aarch64/elf/ghash-aarch64.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/elf/ghash-aarch64.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
 # 2 "lib/accelerated/aarch64/elf/ghash-aarch64.s.tmp.S" 2
 
+
 .text
 .arch armv8-a+crypto
 .globl gcm_init_v8
@@ -193,7 +192,7 @@ gcm_ghash_v8:
 
  subs x3,x3,#32
  mov x12,#16
-# 158 "lib/accelerated/aarch64/elf/ghash-aarch64.s.tmp.S"
+# 159 "lib/accelerated/aarch64/elf/ghash-aarch64.s.tmp.S"
  ld1 {v20.2d,v21.2d},[x1],#32
  movi v19.16b,#0xe1
  ld1 {v22.2d},[x1]
diff --git a/lib/accelerated/aarch64/elf/sha1-armv8.s b/lib/accelerated/aarch64/elf/sha1-armv8.s
index 5c588ff7a6..4b65cf6ea8 100644
--- a/lib/accelerated/aarch64/elf/sha1-armv8.s
+++ b/lib/accelerated/aarch64/elf/sha1-armv8.s
@@ -40,8 +40,6 @@
 # 1 "lib/accelerated/aarch64/elf/sha1-armv8.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/elf/sha1-armv8.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
 # 2 "lib/accelerated/aarch64/elf/sha1-armv8.s.tmp.S" 2
diff --git a/lib/accelerated/aarch64/elf/sha256-armv8.s b/lib/accelerated/aarch64/elf/sha256-armv8.s
index 4439e3cc69..bc3f146c68 100644
--- a/lib/accelerated/aarch64/elf/sha256-armv8.s
+++ b/lib/accelerated/aarch64/elf/sha256-armv8.s
@@ -40,8 +40,6 @@
 # 1 "lib/accelerated/aarch64/elf/sha256-armv8.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/elf/sha256-armv8.s.tmp.S"
 # 56 "lib/accelerated/aarch64/elf/sha256-armv8.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
@@ -69,6 +67,7 @@ sha256_block_data_order:
  tst w16,#(1<<0)
  b.ne .Lneon_entry
 
+.inst 0xd503233f
  stp x29,x30,[sp,#-128]!
  add x29,sp,#0
 
@@ -1028,6 +1027,7 @@ sha256_block_data_order:
  ldp x25,x26,[x29,#64]
  ldp x27,x28,[x29,#80]
  ldp x29,x30,[sp],#128
+.inst 0xd50323bf
  ret
 .size sha256_block_data_order,.-sha256_block_data_order
 
diff --git a/lib/accelerated/aarch64/elf/sha512-armv8.s b/lib/accelerated/aarch64/elf/sha512-armv8.s
index 0d65657dd9..b036c2a121 100644
--- a/lib/accelerated/aarch64/elf/sha512-armv8.s
+++ b/lib/accelerated/aarch64/elf/sha512-armv8.s
@@ -40,8 +40,6 @@
 # 1 "lib/accelerated/aarch64/elf/sha512-armv8.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/elf/sha512-armv8.s.tmp.S"
 # 56 "lib/accelerated/aarch64/elf/sha512-armv8.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
@@ -67,6 +65,7 @@ sha512_block_data_order:
  tst w16,#(1<<6)
  b.ne .Lv8_entry
 
+.inst 0xd503233f
  stp x29,x30,[sp,#-128]!
  add x29,sp,#0
 
@@ -1026,6 +1025,7 @@ sha512_block_data_order:
  ldp x25,x26,[x29,#64]
  ldp x27,x28,[x29,#80]
  ldp x29,x30,[sp],#128
+.inst 0xd50323bf
  ret
 .size sha512_block_data_order,.-sha512_block_data_order
 
diff --git a/lib/accelerated/aarch64/hmac-sha-aarch64.c b/lib/accelerated/aarch64/hmac-sha-aarch64.c
index d9081060c6..47d6c516ce 100644
--- a/lib/accelerated/aarch64/hmac-sha-aarch64.c
+++ b/lib/accelerated/aarch64/hmac-sha-aarch64.c
@@ -218,6 +218,26 @@ static int wrap_aarch64_hmac_init(gnutls_mac_algorithm_t algo, void **_ctx)
 	return 0;
 }
 
+static void *
+wrap_aarch64_hmac_copy(const void *_ctx)
+{
+	struct aarch64_hmac_ctx *new_ctx;
+	const struct aarch64_hmac_ctx *ctx=_ctx;
+	ptrdiff_t off = (uint8_t *)ctx->ctx_ptr - (uint8_t *)(&ctx->ctx);
+
+	new_ctx = gnutls_malloc(sizeof(struct aarch64_hmac_ctx));
+	if (new_ctx == NULL) {
+		gnutls_assert();
+		return NULL;
+	}
+
+	memcpy(new_ctx, ctx, sizeof(*new_ctx));
+	new_ctx->ctx_ptr = (uint8_t *)&new_ctx->ctx + off;
+
+	return new_ctx;
+}
+
+
 static int
 wrap_aarch64_hmac_setkey(void *_ctx, const void *key, size_t keylen)
 {
@@ -287,6 +307,7 @@ const gnutls_crypto_mac_st _gnutls_hmac_sha_aarch64 = {
 	.setnonce = NULL,
 	.hash = wrap_aarch64_hmac_update,
 	.output = wrap_aarch64_hmac_output,
+	.copy = wrap_aarch64_hmac_copy,
 	.deinit = wrap_aarch64_hmac_deinit,
 	.fast = wrap_aarch64_hmac_fast,
 };
diff --git a/lib/accelerated/aarch64/macosx/aes-aarch64.s b/lib/accelerated/aarch64/macosx/aes-aarch64.s
index f017bcd95d..7acabf3f25 100644
--- a/lib/accelerated/aarch64/macosx/aes-aarch64.s
+++ b/lib/accelerated/aarch64/macosx/aes-aarch64.s
@@ -40,8 +40,6 @@
 # 1 "lib/accelerated/aarch64/macosx/aes-aarch64.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/macosx/aes-aarch64.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
 # 2 "lib/accelerated/aarch64/macosx/aes-aarch64.s.tmp.S" 2
@@ -226,6 +224,7 @@ Lenc_key_abort:
 
 .align 5
 _aes_v8_set_decrypt_key:
+.long 0xd503233f
  stp x29,x30,[sp,#-16]!
  add x29,sp,#0
  bl Lenc_key
@@ -259,6 +258,7 @@ Loop_imc:
  eor x0,x0,x0
 Ldec_key_abort:
  ldp x29,x30,[sp],#16
+.long 0xd50323bf
  ret
 
 .globl _aes_v8_encrypt
diff --git a/lib/accelerated/aarch64/macosx/ghash-aarch64.s b/lib/accelerated/aarch64/macosx/ghash-aarch64.s
index f49a8dbb70..bf33773aa8 100644
--- a/lib/accelerated/aarch64/macosx/ghash-aarch64.s
+++ b/lib/accelerated/aarch64/macosx/ghash-aarch64.s
@@ -40,12 +40,11 @@
 # 1 "lib/accelerated/aarch64/macosx/ghash-aarch64.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/macosx/ghash-aarch64.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
 # 2 "lib/accelerated/aarch64/macosx/ghash-aarch64.s.tmp.S" 2
 
+
 .text
 
 .globl _gcm_init_v8
@@ -193,7 +192,7 @@ _gcm_ghash_v8:
 
  subs x3,x3,#32
  mov x12,#16
-# 158 "lib/accelerated/aarch64/macosx/ghash-aarch64.s.tmp.S"
+# 159 "lib/accelerated/aarch64/macosx/ghash-aarch64.s.tmp.S"
  ld1 {v20.2d,v21.2d},[x1],#32
  movi v19.16b,#0xe1
  ld1 {v22.2d},[x1]
diff --git a/lib/accelerated/aarch64/macosx/sha1-armv8.s b/lib/accelerated/aarch64/macosx/sha1-armv8.s
index 221dc11731..8e1e12edf6 100644
--- a/lib/accelerated/aarch64/macosx/sha1-armv8.s
+++ b/lib/accelerated/aarch64/macosx/sha1-armv8.s
@@ -40,8 +40,6 @@
 # 1 "lib/accelerated/aarch64/macosx/sha1-armv8.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/macosx/sha1-armv8.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
 # 2 "lib/accelerated/aarch64/macosx/sha1-armv8.s.tmp.S" 2
diff --git a/lib/accelerated/aarch64/macosx/sha256-armv8.s b/lib/accelerated/aarch64/macosx/sha256-armv8.s
index b48f6ca42a..fc6424975c 100644
--- a/lib/accelerated/aarch64/macosx/sha256-armv8.s
+++ b/lib/accelerated/aarch64/macosx/sha256-armv8.s
@@ -40,8 +40,6 @@
 # 1 "lib/accelerated/aarch64/macosx/sha256-armv8.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/macosx/sha256-armv8.s.tmp.S"
 # 56 "lib/accelerated/aarch64/macosx/sha256-armv8.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
@@ -69,6 +67,7 @@ _sha256_block_data_order:
  tst w16,#(1<<0)
  b.ne Lneon_entry
 
+.long 0xd503233f
  stp x29,x30,[sp,#-128]!
  add x29,sp,#0
 
@@ -1028,6 +1027,7 @@ Loop_16_xx:
  ldp x25,x26,[x29,#64]
  ldp x27,x28,[x29,#80]
  ldp x29,x30,[sp],#128
+.long 0xd50323bf
  ret
 
 
diff --git a/lib/accelerated/aarch64/macosx/sha512-armv8.s b/lib/accelerated/aarch64/macosx/sha512-armv8.s
index 798619bc9a..43af71fa48 100644
--- a/lib/accelerated/aarch64/macosx/sha512-armv8.s
+++ b/lib/accelerated/aarch64/macosx/sha512-armv8.s
@@ -40,8 +40,6 @@
 # 1 "lib/accelerated/aarch64/macosx/sha512-armv8.s.tmp.S"
 # 1 "<built-in>"
 # 1 "<command-line>"
-# 1 "/usr/aarch64-linux-gnu/include/stdc-predef.h" 1 3
-# 1 "<command-line>" 2
 # 1 "lib/accelerated/aarch64/macosx/sha512-armv8.s.tmp.S"
 # 56 "lib/accelerated/aarch64/macosx/sha512-armv8.s.tmp.S"
 # 1 "lib/accelerated/aarch64/aarch64-common.h" 1
@@ -67,6 +65,7 @@ _sha512_block_data_order:
  tst w16,#(1<<6)
  b.ne Lv8_entry
 
+.long 0xd503233f
  stp x29,x30,[sp,#-128]!
  add x29,sp,#0
 
@@ -1026,6 +1025,7 @@ Loop_16_xx:
  ldp x25,x26,[x29,#64]
  ldp x27,x28,[x29,#80]
  ldp x29,x30,[sp],#128
+.long 0xd50323bf
  ret
 
 
diff --git a/lib/accelerated/aarch64/sha-aarch64.c b/lib/accelerated/aarch64/sha-aarch64.c
index 9cdf12ca3a..e4871293e5 100644
--- a/lib/accelerated/aarch64/sha-aarch64.c
+++ b/lib/accelerated/aarch64/sha-aarch64.c
@@ -305,6 +305,25 @@ static int wrap_aarch64_hash_init(gnutls_digest_algorithm_t algo, void **_ctx)
 	return 0;
 }
 
+static void *
+wrap_aarch64_hash_copy(const void *_ctx)
+{
+	struct aarch64_hash_ctx *new_ctx;
+	const struct aarch64_hash_ctx *ctx=_ctx;
+	ptrdiff_t off = (uint8_t *)ctx->ctx_ptr - (uint8_t *)(&ctx->ctx);
+
+	new_ctx = gnutls_malloc(sizeof(struct aarch64_hash_ctx));
+	if (new_ctx == NULL) {
+		gnutls_assert();
+		return NULL;
+	}
+
+	memcpy(new_ctx, ctx, sizeof(*new_ctx));
+	new_ctx->ctx_ptr = (uint8_t *)&new_ctx->ctx + off;
+
+	return new_ctx;
+}
+
 static int
 wrap_aarch64_hash_output(void *src_ctx, void *digest, size_t digestsize)
 {
@@ -352,6 +371,7 @@ const gnutls_crypto_digest_st _gnutls_sha_aarch64 = {
 	.init = wrap_aarch64_hash_init,
 	.hash = wrap_aarch64_hash_update,
 	.output = wrap_aarch64_hash_output,
+	.copy = wrap_aarch64_hash_copy,
 	.deinit = wrap_aarch64_hash_deinit,
 	.fast = wrap_aarch64_hash_fast,
 };
diff --git a/lib/accelerated/accelerated.c b/lib/accelerated/accelerated.c
index 2d8f546b23..8fb0b11f65 100644
--- a/lib/accelerated/accelerated.c
+++ b/lib/accelerated/accelerated.c
@@ -32,9 +32,7 @@
 void _gnutls_register_accel_crypto(void)
 {
 #if defined(ASM_X86)
-	if (gnutls_have_cpuid() != 0) {
-		register_x86_crypto();
-	}
+	register_x86_crypto();
 #endif
 
 #if defined(ASM_AARCH64)
diff --git a/lib/accelerated/x86/coff/aes-ssse3-x86.s b/lib/accelerated/x86/coff/aes-ssse3-x86.s
index 6e6ea90973..c58ea23597 100644
--- a/lib/accelerated/x86/coff/aes-ssse3-x86.s
+++ b/lib/accelerated/x86/coff/aes-ssse3-x86.s
@@ -5,12 +5,11 @@
 ## By Mike Hamburg (Stanford University), 2009
 ## Public domain.
 ##
-## For details see https://shiftleft.org/papers/vector_aes/ and
-## https://crypto.stanford.edu/vpaes/.
+## For details see http://shiftleft.org/papers/vector_aes/ and
+## http://crypto.stanford.edu/vpaes/.
 #
 # *** This file is auto-generated ***
 #
-.file	"vpaes-x86.s"
 .text
 .align	64
 .L_vpaes_consts:
diff --git a/lib/accelerated/x86/coff/aes-ssse3-x86_64.s b/lib/accelerated/x86/coff/aes-ssse3-x86_64.s
index 8c4a7d709d..150c9921d7 100644
--- a/lib/accelerated/x86/coff/aes-ssse3-x86_64.s
+++ b/lib/accelerated/x86/coff/aes-ssse3-x86_64.s
@@ -5,8 +5,8 @@
 ## By Mike Hamburg (Stanford University), 2009
 ## Public domain.
 ##
-## For details see https://shiftleft.org/papers/vector_aes/ and
-## https://crypto.stanford.edu/vpaes/.
+## For details see http://shiftleft.org/papers/vector_aes/ and
+## http://crypto.stanford.edu/vpaes/.
 #
 # *** This file is auto-generated ***
 #
@@ -30,6 +30,7 @@
 .def	_vpaes_encrypt_core;	.scl 3;	.type 32;	.endef
 .p2align	4
 _vpaes_encrypt_core:
+
 	movq	%rdx,%r9
 	movq	$16,%r11
 	movl	240(%rdx),%eax
@@ -117,9 +118,11 @@ _vpaes_encrypt_core:
 
 
 
+
 .def	_vpaes_decrypt_core;	.scl 3;	.type 32;	.endef
 .p2align	4
 _vpaes_decrypt_core:
+
 	movq	%rdx,%r9
 	movl	240(%rdx),%eax
 	movdqa	%xmm9,%xmm1
@@ -223,6 +226,7 @@ _vpaes_decrypt_core:
 
 
 
+
 .def	_vpaes_schedule_core;	.scl 3;	.type 32;	.endef
 .p2align	4
 _vpaes_schedule_core:
@@ -231,6 +235,7 @@ _vpaes_schedule_core:
 
 
 
+
 	call	_vpaes_preheat
 	movdqa	.Lk_rcon(%rip),%xmm8
 	movdqu	(%rdi),%xmm0
@@ -408,9 +413,11 @@ _vpaes_schedule_core:
 
 
 
+
 .def	_vpaes_schedule_192_smear;	.scl 3;	.type 32;	.endef
 .p2align	4
 _vpaes_schedule_192_smear:
+
 	pshufd	$0x80,%xmm6,%xmm1
 	pshufd	$0xFE,%xmm7,%xmm0
 	pxor	%xmm1,%xmm6
@@ -439,10 +446,12 @@ _vpaes_schedule_192_smear:
 
 
 
+
 .def	_vpaes_schedule_round;	.scl 3;	.type 32;	.endef
 .p2align	4
 _vpaes_schedule_round:
 
+
 	pxor	%xmm1,%xmm1
 .byte	102,65,15,58,15,200,15
 .byte	102,69,15,58,15,192,15
@@ -506,9 +515,11 @@ _vpaes_schedule_low_round:
 
 
 
+
 .def	_vpaes_schedule_transform;	.scl 3;	.type 32;	.endef
 .p2align	4
 _vpaes_schedule_transform:
+
 	movdqa	%xmm9,%xmm1
 	pandn	%xmm0,%xmm1
 	psrld	$4,%xmm1
@@ -544,9 +555,11 @@ _vpaes_schedule_transform:
 
 
 
+
 .def	_vpaes_schedule_mangle;	.scl 3;	.type 32;	.endef
 .p2align	4
 _vpaes_schedule_mangle:
+
 	movdqa	%xmm0,%xmm4
 	movdqa	.Lk_mc_forward(%rip),%xmm5
 	testq	%rcx,%rcx
@@ -616,6 +629,7 @@ _vpaes_schedule_mangle:
 
 
 
+
 .globl	vpaes_set_encrypt_key
 .def	vpaes_set_encrypt_key;	.scl 2;	.type 32;	.endef
 .p2align	4
@@ -628,6 +642,7 @@ vpaes_set_encrypt_key:
 	movq	%rdx,%rsi
 	movq	%r8,%rdx
 
+
 	leaq	-184(%rsp),%rsp
 	movaps	%xmm6,16(%rsp)
 	movaps	%xmm7,32(%rsp)
@@ -664,6 +679,7 @@ vpaes_set_encrypt_key:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_vpaes_set_encrypt_key:
 
 .globl	vpaes_set_decrypt_key
@@ -678,6 +694,7 @@ vpaes_set_decrypt_key:
 	movq	%rdx,%rsi
 	movq	%r8,%rdx
 
+
 	leaq	-184(%rsp),%rsp
 	movaps	%xmm6,16(%rsp)
 	movaps	%xmm7,32(%rsp)
@@ -719,6 +736,7 @@ vpaes_set_decrypt_key:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_vpaes_set_decrypt_key:
 
 .globl	vpaes_encrypt
@@ -733,6 +751,7 @@ vpaes_encrypt:
 	movq	%rdx,%rsi
 	movq	%r8,%rdx
 
+
 	leaq	-184(%rsp),%rsp
 	movaps	%xmm6,16(%rsp)
 	movaps	%xmm7,32(%rsp)
@@ -764,6 +783,7 @@ vpaes_encrypt:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_vpaes_encrypt:
 
 .globl	vpaes_decrypt
@@ -778,6 +798,7 @@ vpaes_decrypt:
 	movq	%rdx,%rsi
 	movq	%r8,%rdx
 
+
 	leaq	-184(%rsp),%rsp
 	movaps	%xmm6,16(%rsp)
 	movaps	%xmm7,32(%rsp)
@@ -809,6 +830,7 @@ vpaes_decrypt:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_vpaes_decrypt:
 .globl	vpaes_cbc_encrypt
 .def	vpaes_cbc_encrypt;	.scl 2;	.type 32;	.endef
@@ -825,6 +847,7 @@ vpaes_cbc_encrypt:
 	movq	40(%rsp),%r8
 	movq	48(%rsp),%r9
 
+
 	xchgq	%rcx,%rdx
 	subq	$16,%rcx
 	jc	.Lcbc_abort
@@ -886,6 +909,7 @@ vpaes_cbc_encrypt:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_vpaes_cbc_encrypt:
 
 
@@ -896,6 +920,7 @@ vpaes_cbc_encrypt:
 .def	_vpaes_preheat;	.scl 3;	.type 32;	.endef
 .p2align	4
 _vpaes_preheat:
+
 	leaq	.Lk_s0F(%rip),%r10
 	movdqa	-32(%r10),%xmm10
 	movdqa	-16(%r10),%xmm11
@@ -912,6 +937,7 @@ _vpaes_preheat:
 
 
 
+
 .p2align	6
 _vpaes_consts:
 .Lk_inv:
diff --git a/lib/accelerated/x86/coff/aesni-gcm-x86_64.s b/lib/accelerated/x86/coff/aesni-gcm-x86_64.s
index bc3554ca07..7988004cb0 100644
--- a/lib/accelerated/x86/coff/aesni-gcm-x86_64.s
+++ b/lib/accelerated/x86/coff/aesni-gcm-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -365,17 +365,25 @@ aesni_gcm_decrypt:
 	movq	40(%rsp),%r8
 	movq	48(%rsp),%r9
 
+
 	xorq	%r10,%r10
 	cmpq	$0x60,%rdx
 	jb	.Lgcm_dec_abort
 
 	leaq	(%rsp),%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
+
 	leaq	-168(%rsp),%rsp
 	movaps	%xmm6,-216(%rax)
 	movaps	%xmm7,-200(%rax)
@@ -459,17 +467,25 @@ aesni_gcm_decrypt:
 	movaps	-88(%rax),%xmm14
 	movaps	-72(%rax),%xmm15
 	movq	-48(%rax),%r15
+
 	movq	-40(%rax),%r14
+
 	movq	-32(%rax),%r13
+
 	movq	-24(%rax),%r12
+
 	movq	-16(%rax),%rbp
+
 	movq	-8(%rax),%rbx
+
 	leaq	(%rax),%rsp
+
 .Lgcm_dec_abort:
 	movq	%r10,%rax
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_aesni_gcm_decrypt:
 .def	_aesni_ctr32_6x;	.scl 3;	.type 32;	.endef
 .p2align	5
@@ -577,17 +593,25 @@ aesni_gcm_encrypt:
 	movq	40(%rsp),%r8
 	movq	48(%rsp),%r9
 
+
 	xorq	%r10,%r10
 	cmpq	$288,%rdx
 	jb	.Lgcm_enc_abort
 
 	leaq	(%rsp),%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
+
 	leaq	-168(%rsp),%rsp
 	movaps	%xmm6,-216(%rax)
 	movaps	%xmm7,-200(%rax)
@@ -835,17 +859,25 @@ aesni_gcm_encrypt:
 	movaps	-88(%rax),%xmm14
 	movaps	-72(%rax),%xmm15
 	movq	-48(%rax),%r15
+
 	movq	-40(%rax),%r14
+
 	movq	-32(%rax),%r13
+
 	movq	-24(%rax),%r12
+
 	movq	-16(%rax),%rbp
+
 	movq	-8(%rax),%rbx
+
 	leaq	(%rax),%rsp
+
 .Lgcm_enc_abort:
 	movq	%r10,%rax
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_aesni_gcm_encrypt:
 .p2align	6
 .Lbswap_mask:
diff --git a/lib/accelerated/x86/coff/aesni-x86.s b/lib/accelerated/x86/coff/aesni-x86.s
index 502be77883..c6aa1a1e2a 100644
--- a/lib/accelerated/x86/coff/aesni-x86.s
+++ b/lib/accelerated/x86/coff/aesni-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"devel/perlasm/aesni-x86.s"
 .text
 .globl	_aesni_encrypt
 .def	_aesni_encrypt;	.scl	2;	.type	32;	.endef
@@ -60,7 +59,10 @@ _aesni_encrypt:
 	leal	16(%edx),%edx
 	jnz	.L000enc1_loop_1
 .byte	102,15,56,221,209
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movups	%xmm2,(%eax)
+	pxor	%xmm2,%xmm2
 	ret
 .globl	_aesni_decrypt
 .def	_aesni_decrypt;	.scl	2;	.type	32;	.endef
@@ -83,31 +85,87 @@ _aesni_decrypt:
 	leal	16(%edx),%edx
 	jnz	.L001dec1_loop_2
 .byte	102,15,56,223,209
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movups	%xmm2,(%eax)
+	pxor	%xmm2,%xmm2
+	ret
+.def	__aesni_encrypt2;	.scl	3;	.type	32;	.endef
+.align	16
+__aesni_encrypt2:
+	movups	(%edx),%xmm0
+	shll	$4,%ecx
+	movups	16(%edx),%xmm1
+	xorps	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+.L002enc2_loop:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L002enc2_loop
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,221,208
+.byte	102,15,56,221,216
+	ret
+.def	__aesni_decrypt2;	.scl	3;	.type	32;	.endef
+.align	16
+__aesni_decrypt2:
+	movups	(%edx),%xmm0
+	shll	$4,%ecx
+	movups	16(%edx),%xmm1
+	xorps	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+.L003dec2_loop:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L003dec2_loop
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,223,208
+.byte	102,15,56,223,216
 	ret
 .def	__aesni_encrypt3;	.scl	3;	.type	32;	.endef
 .align	16
 __aesni_encrypt3:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
-	movups	(%edx),%xmm0
-.L002enc3_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+.L004enc3_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
-	movups	(%edx),%xmm0
-	jnz	.L002enc3_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L004enc3_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -119,25 +177,26 @@ __aesni_encrypt3:
 .align	16
 __aesni_decrypt3:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
-	movups	(%edx),%xmm0
-.L003dec3_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+.L005dec3_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
-	movups	(%edx),%xmm0
-	jnz	.L003dec3_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L005dec3_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -150,27 +209,29 @@ __aesni_decrypt3:
 __aesni_encrypt4:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
-	shrl	$1,%ecx
-	leal	32(%edx),%edx
+	shll	$4,%ecx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
 	pxor	%xmm0,%xmm5
-	movups	(%edx),%xmm0
-.L004enc4_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	15,31,64,0
+	addl	$16,%ecx
+.L006enc4_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
-	movups	(%edx),%xmm0
-	jnz	.L004enc4_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L006enc4_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -185,27 +246,29 @@ __aesni_encrypt4:
 __aesni_decrypt4:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
-	shrl	$1,%ecx
-	leal	32(%edx),%edx
+	shll	$4,%ecx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
 	pxor	%xmm0,%xmm5
-	movups	(%edx),%xmm0
-.L005dec4_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	15,31,64,0
+	addl	$16,%ecx
+.L007dec4_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
 .byte	102,15,56,222,232
-	movups	(%edx),%xmm0
-	jnz	.L005dec4_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L007dec4_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -219,45 +282,42 @@ __aesni_decrypt4:
 .align	16
 __aesni_encrypt6:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,220,217
+.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm5
-	decl	%ecx
-.byte	102,15,56,220,225
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,220,233
+.byte	102,15,56,220,217
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	102,15,56,220,225
 	pxor	%xmm0,%xmm7
-.byte	102,15,56,220,241
-	movups	(%edx),%xmm0
-.byte	102,15,56,220,249
-	jmp	.L_aesni_encrypt6_enter
+	movups	(%edx,%ecx,1),%xmm0
+	addl	$16,%ecx
+	jmp	.L008_aesni_encrypt6_inner
 .align	16
-.L006enc6_loop:
+.L009enc6_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
+.L008_aesni_encrypt6_inner:
 .byte	102,15,56,220,233
 .byte	102,15,56,220,241
 .byte	102,15,56,220,249
-.align	16
 .L_aesni_encrypt6_enter:
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
 .byte	102,15,56,220,240
 .byte	102,15,56,220,248
-	movups	(%edx),%xmm0
-	jnz	.L006enc6_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L009enc6_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -275,45 +335,42 @@ __aesni_encrypt6:
 .align	16
 __aesni_decrypt6:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,222,209
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,222,217
+.byte	102,15,56,222,209
 	pxor	%xmm0,%xmm5
-	decl	%ecx
-.byte	102,15,56,222,225
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,222,233
+.byte	102,15,56,222,217
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	102,15,56,222,225
 	pxor	%xmm0,%xmm7
-.byte	102,15,56,222,241
-	movups	(%edx),%xmm0
-.byte	102,15,56,222,249
-	jmp	.L_aesni_decrypt6_enter
+	movups	(%edx,%ecx,1),%xmm0
+	addl	$16,%ecx
+	jmp	.L010_aesni_decrypt6_inner
 .align	16
-.L007dec6_loop:
+.L011dec6_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
+.L010_aesni_decrypt6_inner:
 .byte	102,15,56,222,233
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
-.align	16
 .L_aesni_decrypt6_enter:
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
 .byte	102,15,56,222,232
 .byte	102,15,56,222,240
 .byte	102,15,56,222,248
-	movups	(%edx),%xmm0
-	jnz	.L007dec6_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L011dec6_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -342,14 +399,14 @@ _aesni_ecb_encrypt:
 	movl	32(%esp),%edx
 	movl	36(%esp),%ebx
 	andl	$-16,%eax
-	jz	.L008ecb_ret
+	jz	.L012ecb_ret
 	movl	240(%edx),%ecx
 	testl	%ebx,%ebx
-	jz	.L009ecb_decrypt
+	jz	.L013ecb_decrypt
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	cmpl	$96,%eax
-	jb	.L010ecb_enc_tail
+	jb	.L014ecb_enc_tail
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -358,9 +415,9 @@ _aesni_ecb_encrypt:
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
 	subl	$96,%eax
-	jmp	.L011ecb_enc_loop6_enter
+	jmp	.L015ecb_enc_loop6_enter
 .align	16
-.L012ecb_enc_loop6:
+.L016ecb_enc_loop6:
 	movups	%xmm2,(%edi)
 	movdqu	(%esi),%xmm2
 	movups	%xmm3,16(%edi)
@@ -375,12 +432,12 @@ _aesni_ecb_encrypt:
 	leal	96(%edi),%edi
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
-.L011ecb_enc_loop6_enter:
+.L015ecb_enc_loop6_enter:
 	call	__aesni_encrypt6
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
 	subl	$96,%eax
-	jnc	.L012ecb_enc_loop6
+	jnc	.L016ecb_enc_loop6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
@@ -389,18 +446,18 @@ _aesni_ecb_encrypt:
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
 	addl	$96,%eax
-	jz	.L008ecb_ret
-.L010ecb_enc_tail:
+	jz	.L012ecb_ret
+.L014ecb_enc_tail:
 	movups	(%esi),%xmm2
 	cmpl	$32,%eax
-	jb	.L013ecb_enc_one
+	jb	.L017ecb_enc_one
 	movups	16(%esi),%xmm3
-	je	.L014ecb_enc_two
+	je	.L018ecb_enc_two
 	movups	32(%esi),%xmm4
 	cmpl	$64,%eax
-	jb	.L015ecb_enc_three
+	jb	.L019ecb_enc_three
 	movups	48(%esi),%xmm5
-	je	.L016ecb_enc_four
+	je	.L020ecb_enc_four
 	movups	64(%esi),%xmm6
 	xorps	%xmm7,%xmm7
 	call	__aesni_encrypt6
@@ -409,50 +466,49 @@ _aesni_ecb_encrypt:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L013ecb_enc_one:
+.L017ecb_enc_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L017enc1_loop_3:
+.L021enc1_loop_3:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L017enc1_loop_3
+	jnz	.L021enc1_loop_3
 .byte	102,15,56,221,209
 	movups	%xmm2,(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L014ecb_enc_two:
-	xorps	%xmm4,%xmm4
-	call	__aesni_encrypt3
+.L018ecb_enc_two:
+	call	__aesni_encrypt2
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L015ecb_enc_three:
+.L019ecb_enc_three:
 	call	__aesni_encrypt3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L016ecb_enc_four:
+.L020ecb_enc_four:
 	call	__aesni_encrypt4
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L009ecb_decrypt:
+.L013ecb_decrypt:
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	cmpl	$96,%eax
-	jb	.L018ecb_dec_tail
+	jb	.L022ecb_dec_tail
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -461,9 +517,9 @@ _aesni_ecb_encrypt:
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
 	subl	$96,%eax
-	jmp	.L019ecb_dec_loop6_enter
+	jmp	.L023ecb_dec_loop6_enter
 .align	16
-.L020ecb_dec_loop6:
+.L024ecb_dec_loop6:
 	movups	%xmm2,(%edi)
 	movdqu	(%esi),%xmm2
 	movups	%xmm3,16(%edi)
@@ -478,12 +534,12 @@ _aesni_ecb_encrypt:
 	leal	96(%edi),%edi
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
-.L019ecb_dec_loop6_enter:
+.L023ecb_dec_loop6_enter:
 	call	__aesni_decrypt6
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
 	subl	$96,%eax
-	jnc	.L020ecb_dec_loop6
+	jnc	.L024ecb_dec_loop6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
@@ -492,18 +548,18 @@ _aesni_ecb_encrypt:
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
 	addl	$96,%eax
-	jz	.L008ecb_ret
-.L018ecb_dec_tail:
+	jz	.L012ecb_ret
+.L022ecb_dec_tail:
 	movups	(%esi),%xmm2
 	cmpl	$32,%eax
-	jb	.L021ecb_dec_one
+	jb	.L025ecb_dec_one
 	movups	16(%esi),%xmm3
-	je	.L022ecb_dec_two
+	je	.L026ecb_dec_two
 	movups	32(%esi),%xmm4
 	cmpl	$64,%eax
-	jb	.L023ecb_dec_three
+	jb	.L027ecb_dec_three
 	movups	48(%esi),%xmm5
-	je	.L024ecb_dec_four
+	je	.L028ecb_dec_four
 	movups	64(%esi),%xmm6
 	xorps	%xmm7,%xmm7
 	call	__aesni_decrypt6
@@ -512,44 +568,51 @@ _aesni_ecb_encrypt:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L021ecb_dec_one:
+.L025ecb_dec_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L025dec1_loop_4:
+.L029dec1_loop_4:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L025dec1_loop_4
+	jnz	.L029dec1_loop_4
 .byte	102,15,56,223,209
 	movups	%xmm2,(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L022ecb_dec_two:
-	xorps	%xmm4,%xmm4
-	call	__aesni_decrypt3
+.L026ecb_dec_two:
+	call	__aesni_decrypt2
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L023ecb_dec_three:
+.L027ecb_dec_three:
 	call	__aesni_decrypt3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L024ecb_dec_four:
+.L028ecb_dec_four:
 	call	__aesni_decrypt4
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-.L008ecb_ret:
+.L012ecb_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -587,48 +650,56 @@ _aesni_ccm64_encrypt_blocks:
 	movl	%ebp,20(%esp)
 	movl	%ebp,24(%esp)
 	movl	%ebp,28(%esp)
-	shrl	$1,%ecx
+	shll	$4,%ecx
+	movl	$16,%ebx
 	leal	(%edx),%ebp
 	movdqa	(%esp),%xmm5
 	movdqa	%xmm7,%xmm2
-	movl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	subl	%ecx,%ebx
 .byte	102,15,56,0,253
-.L026ccm64_enc_outer:
+.L030ccm64_enc_outer:
 	movups	(%ebp),%xmm0
 	movl	%ebx,%ecx
 	movups	(%esi),%xmm6
 	xorps	%xmm0,%xmm2
 	movups	16(%ebp),%xmm1
 	xorps	%xmm6,%xmm0
-	leal	32(%ebp),%edx
 	xorps	%xmm0,%xmm3
-	movups	(%edx),%xmm0
-.L027ccm64_enc2_loop:
+	movups	32(%ebp),%xmm0
+.L031ccm64_enc2_loop:
 .byte	102,15,56,220,209
-	decl	%ecx
 .byte	102,15,56,220,217
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
-	leal	32(%edx),%edx
 .byte	102,15,56,220,216
-	movups	(%edx),%xmm0
-	jnz	.L027ccm64_enc2_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L031ccm64_enc2_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 	paddq	16(%esp),%xmm7
+	decl	%eax
 .byte	102,15,56,221,208
 .byte	102,15,56,221,216
-	decl	%eax
 	leal	16(%esi),%esi
 	xorps	%xmm2,%xmm6
 	movdqa	%xmm7,%xmm2
 	movups	%xmm6,(%edi)
-	leal	16(%edi),%edi
 .byte	102,15,56,0,213
-	jnz	.L026ccm64_enc_outer
+	leal	16(%edi),%edi
+	jnz	.L030ccm64_enc_outer
 	movl	48(%esp),%esp
 	movl	40(%esp),%edi
 	movups	%xmm3,(%edi)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -675,71 +746,82 @@ _aesni_ccm64_decrypt_blocks:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L028enc1_loop_5:
+.L032enc1_loop_5:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L028enc1_loop_5
+	jnz	.L032enc1_loop_5
 .byte	102,15,56,221,209
+	shll	$4,%ebx
+	movl	$16,%ecx
 	movups	(%esi),%xmm6
 	paddq	16(%esp),%xmm7
 	leal	16(%esi),%esi
-	jmp	.L029ccm64_dec_outer
+	subl	%ebx,%ecx
+	leal	32(%ebp,%ebx,1),%edx
+	movl	%ecx,%ebx
+	jmp	.L033ccm64_dec_outer
 .align	16
-.L029ccm64_dec_outer:
+.L033ccm64_dec_outer:
 	xorps	%xmm2,%xmm6
 	movdqa	%xmm7,%xmm2
-	movl	%ebx,%ecx
 	movups	%xmm6,(%edi)
 	leal	16(%edi),%edi
 .byte	102,15,56,0,213
 	subl	$1,%eax
-	jz	.L030ccm64_dec_break
+	jz	.L034ccm64_dec_break
 	movups	(%ebp),%xmm0
-	shrl	$1,%ecx
+	movl	%ebx,%ecx
 	movups	16(%ebp),%xmm1
 	xorps	%xmm0,%xmm6
-	leal	32(%ebp),%edx
 	xorps	%xmm0,%xmm2
 	xorps	%xmm6,%xmm3
-	movups	(%edx),%xmm0
-.L031ccm64_dec2_loop:
+	movups	32(%ebp),%xmm0
+.L035ccm64_dec2_loop:
 .byte	102,15,56,220,209
-	decl	%ecx
 .byte	102,15,56,220,217
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
-	leal	32(%edx),%edx
 .byte	102,15,56,220,216
-	movups	(%edx),%xmm0
-	jnz	.L031ccm64_dec2_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L035ccm64_dec2_loop
 	movups	(%esi),%xmm6
 	paddq	16(%esp),%xmm7
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	leal	16(%esi),%esi
 .byte	102,15,56,221,208
 .byte	102,15,56,221,216
-	jmp	.L029ccm64_dec_outer
+	leal	16(%esi),%esi
+	jmp	.L033ccm64_dec_outer
 .align	16
-.L030ccm64_dec_break:
+.L034ccm64_dec_break:
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	xorps	%xmm0,%xmm6
 	leal	32(%edx),%edx
 	xorps	%xmm6,%xmm3
-.L032enc1_loop_6:
+.L036enc1_loop_6:
 .byte	102,15,56,220,217
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L032enc1_loop_6
+	jnz	.L036enc1_loop_6
 .byte	102,15,56,221,217
 	movl	48(%esp),%esp
 	movl	40(%esp),%edi
 	movups	%xmm3,(%edi)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -764,7 +846,7 @@ _aesni_ctr32_encrypt_blocks:
 	andl	$-16,%esp
 	movl	%ebp,80(%esp)
 	cmpl	$1,%eax
-	je	.L033ctr32_one_shortcut
+	je	.L037ctr32_one_shortcut
 	movdqu	(%ebx),%xmm7
 	movl	$202182159,(%esp)
 	movl	$134810123,4(%esp)
@@ -780,63 +862,59 @@ _aesni_ctr32_encrypt_blocks:
 .byte	102,15,58,34,253,3
 	movl	240(%edx),%ecx
 	bswap	%ebx
-	pxor	%xmm1,%xmm1
 	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movdqa	(%esp),%xmm2
-.byte	102,15,58,34,203,0
+.byte	102,15,58,34,195,0
 	leal	3(%ebx),%ebp
-.byte	102,15,58,34,197,0
+.byte	102,15,58,34,205,0
 	incl	%ebx
-.byte	102,15,58,34,203,1
+.byte	102,15,58,34,195,1
 	incl	%ebp
-.byte	102,15,58,34,197,1
+.byte	102,15,58,34,205,1
 	incl	%ebx
-.byte	102,15,58,34,203,2
+.byte	102,15,58,34,195,2
 	incl	%ebp
-.byte	102,15,58,34,197,2
-	movdqa	%xmm1,48(%esp)
-.byte	102,15,56,0,202
-	movdqa	%xmm0,64(%esp)
+.byte	102,15,58,34,205,2
+	movdqa	%xmm0,48(%esp)
 .byte	102,15,56,0,194
-	pshufd	$192,%xmm1,%xmm2
-	pshufd	$128,%xmm1,%xmm3
+	movdqu	(%edx),%xmm6
+	movdqa	%xmm1,64(%esp)
+.byte	102,15,56,0,202
+	pshufd	$192,%xmm0,%xmm2
+	pshufd	$128,%xmm0,%xmm3
 	cmpl	$6,%eax
-	jb	.L034ctr32_tail
+	jb	.L038ctr32_tail
+	pxor	%xmm6,%xmm7
+	shll	$4,%ecx
+	movl	$16,%ebx
 	movdqa	%xmm7,32(%esp)
-	shrl	$1,%ecx
 	movl	%edx,%ebp
-	movl	%ecx,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
 	subl	$6,%eax
-	jmp	.L035ctr32_loop6
-.align	16
-.L035ctr32_loop6:
-	pshufd	$64,%xmm1,%xmm4
-	movdqa	32(%esp),%xmm1
-	pshufd	$192,%xmm0,%xmm5
-	por	%xmm1,%xmm2
-	pshufd	$128,%xmm0,%xmm6
-	por	%xmm1,%xmm3
-	pshufd	$64,%xmm0,%xmm7
-	por	%xmm1,%xmm4
-	por	%xmm1,%xmm5
-	por	%xmm1,%xmm6
-	por	%xmm1,%xmm7
-	movups	(%ebp),%xmm0
-	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
-	decl	%ecx
+	jmp	.L039ctr32_loop6
+.align	16
+.L039ctr32_loop6:
+	pshufd	$64,%xmm0,%xmm4
+	movdqa	32(%esp),%xmm0
+	pshufd	$192,%xmm1,%xmm5
 	pxor	%xmm0,%xmm2
+	pshufd	$128,%xmm1,%xmm6
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,220,209
+	pshufd	$64,%xmm1,%xmm7
+	movups	16(%ebp),%xmm1
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,220,217
 	pxor	%xmm0,%xmm5
-.byte	102,15,56,220,225
+.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,220,233
 	pxor	%xmm0,%xmm7
+.byte	102,15,56,220,217
+	movups	32(%ebp),%xmm0
+	movl	%ebx,%ecx
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
 .byte	102,15,56,220,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,220,249
 	call	.L_aesni_encrypt6_enter
 	movups	(%esi),%xmm1
@@ -847,51 +925,51 @@ _aesni_ctr32_encrypt_blocks:
 	movups	%xmm2,(%edi)
 	movdqa	16(%esp),%xmm0
 	xorps	%xmm1,%xmm4
-	movdqa	48(%esp),%xmm1
+	movdqa	64(%esp),%xmm1
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	paddd	%xmm0,%xmm1
-	paddd	64(%esp),%xmm0
+	paddd	48(%esp),%xmm0
 	movdqa	(%esp),%xmm2
 	movups	48(%esi),%xmm3
 	movups	64(%esi),%xmm4
 	xorps	%xmm3,%xmm5
 	movups	80(%esi),%xmm3
 	leal	96(%esi),%esi
-	movdqa	%xmm1,48(%esp)
-.byte	102,15,56,0,202
+	movdqa	%xmm0,48(%esp)
+.byte	102,15,56,0,194
 	xorps	%xmm4,%xmm6
 	movups	%xmm5,48(%edi)
 	xorps	%xmm3,%xmm7
-	movdqa	%xmm0,64(%esp)
-.byte	102,15,56,0,194
+	movdqa	%xmm1,64(%esp)
+.byte	102,15,56,0,202
 	movups	%xmm6,64(%edi)
-	pshufd	$192,%xmm1,%xmm2
+	pshufd	$192,%xmm0,%xmm2
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
-	movl	%ebx,%ecx
-	pshufd	$128,%xmm1,%xmm3
+	pshufd	$128,%xmm0,%xmm3
 	subl	$6,%eax
-	jnc	.L035ctr32_loop6
+	jnc	.L039ctr32_loop6
 	addl	$6,%eax
-	jz	.L036ctr32_ret
+	jz	.L040ctr32_ret
+	movdqu	(%ebp),%xmm7
 	movl	%ebp,%edx
-	leal	1(,%ecx,2),%ecx
-	movdqa	32(%esp),%xmm7
-.L034ctr32_tail:
+	pxor	32(%esp),%xmm7
+	movl	240(%ebp),%ecx
+.L038ctr32_tail:
 	por	%xmm7,%xmm2
 	cmpl	$2,%eax
-	jb	.L037ctr32_one
-	pshufd	$64,%xmm1,%xmm4
+	jb	.L041ctr32_one
+	pshufd	$64,%xmm0,%xmm4
 	por	%xmm7,%xmm3
-	je	.L038ctr32_two
-	pshufd	$192,%xmm0,%xmm5
+	je	.L042ctr32_two
+	pshufd	$192,%xmm1,%xmm5
 	por	%xmm7,%xmm4
 	cmpl	$4,%eax
-	jb	.L039ctr32_three
-	pshufd	$128,%xmm0,%xmm6
+	jb	.L043ctr32_three
+	pshufd	$128,%xmm1,%xmm6
 	por	%xmm7,%xmm5
-	je	.L040ctr32_four
+	je	.L044ctr32_four
 	por	%xmm7,%xmm6
 	call	__aesni_encrypt6
 	movups	(%esi),%xmm1
@@ -909,39 +987,39 @@ _aesni_ctr32_encrypt_blocks:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	.L036ctr32_ret
+	jmp	.L040ctr32_ret
 .align	16
-.L033ctr32_one_shortcut:
+.L037ctr32_one_shortcut:
 	movups	(%ebx),%xmm2
 	movl	240(%edx),%ecx
-.L037ctr32_one:
+.L041ctr32_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L041enc1_loop_7:
+.L045enc1_loop_7:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L041enc1_loop_7
+	jnz	.L045enc1_loop_7
 .byte	102,15,56,221,209
 	movups	(%esi),%xmm6
 	xorps	%xmm2,%xmm6
 	movups	%xmm6,(%edi)
-	jmp	.L036ctr32_ret
+	jmp	.L040ctr32_ret
 .align	16
-.L038ctr32_two:
-	call	__aesni_encrypt3
+.L042ctr32_two:
+	call	__aesni_encrypt2
 	movups	(%esi),%xmm5
 	movups	16(%esi),%xmm6
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	.L036ctr32_ret
+	jmp	.L040ctr32_ret
 .align	16
-.L039ctr32_three:
+.L043ctr32_three:
 	call	__aesni_encrypt3
 	movups	(%esi),%xmm5
 	movups	16(%esi),%xmm6
@@ -952,9 +1030,9 @@ _aesni_ctr32_encrypt_blocks:
 	xorps	%xmm7,%xmm4
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	.L036ctr32_ret
+	jmp	.L040ctr32_ret
 .align	16
-.L040ctr32_four:
+.L044ctr32_four:
 	call	__aesni_encrypt4
 	movups	(%esi),%xmm6
 	movups	16(%esi),%xmm7
@@ -968,7 +1046,18 @@ _aesni_ctr32_encrypt_blocks:
 	xorps	%xmm0,%xmm5
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-.L036ctr32_ret:
+.L040ctr32_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
 	movl	80(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -992,12 +1081,12 @@ _aesni_xts_encrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L042enc1_loop_8:
+.L046enc1_loop_8:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L042enc1_loop_8
+	jnz	.L046enc1_loop_8
 .byte	102,15,56,221,209
 	movl	20(%esp),%esi
 	movl	24(%esp),%edi
@@ -1021,12 +1110,14 @@ _aesni_xts_encrypt:
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	subl	$96,%eax
-	jc	.L043xts_enc_short
-	shrl	$1,%ecx
-	movl	%ecx,%ebx
-	jmp	.L044xts_enc_loop6
+	jc	.L047xts_enc_short
+	shll	$4,%ecx
+	movl	$16,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	jmp	.L048xts_enc_loop6
 .align	16
-.L044xts_enc_loop6:
+.L048xts_enc_loop6:
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,(%esp)
@@ -1062,6 +1153,7 @@ _aesni_xts_encrypt:
 	pand	%xmm3,%xmm7
 	movups	(%esi),%xmm2
 	pxor	%xmm1,%xmm7
+	movl	%ebx,%ecx
 	movdqu	16(%esi),%xmm3
 	xorps	%xmm0,%xmm2
 	movdqu	32(%esi),%xmm4
@@ -1077,19 +1169,17 @@ _aesni_xts_encrypt:
 	movdqa	%xmm7,80(%esp)
 	pxor	%xmm1,%xmm7
 	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
 	pxor	16(%esp),%xmm3
-.byte	102,15,56,220,209
 	pxor	32(%esp),%xmm4
-.byte	102,15,56,220,217
+.byte	102,15,56,220,209
 	pxor	48(%esp),%xmm5
-	decl	%ecx
-.byte	102,15,56,220,225
 	pxor	64(%esp),%xmm6
-.byte	102,15,56,220,233
+.byte	102,15,56,220,217
 	pxor	%xmm0,%xmm7
+	movups	32(%ebp),%xmm0
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
 .byte	102,15,56,220,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,220,249
 	call	.L_aesni_encrypt6_enter
 	movdqa	80(%esp),%xmm1
@@ -1114,26 +1204,25 @@ _aesni_xts_encrypt:
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
-	movl	%ebx,%ecx
 	pxor	%xmm2,%xmm1
 	subl	$96,%eax
-	jnc	.L044xts_enc_loop6
-	leal	1(,%ecx,2),%ecx
+	jnc	.L048xts_enc_loop6
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movl	%ecx,%ebx
-.L043xts_enc_short:
+.L047xts_enc_short:
 	addl	$96,%eax
-	jz	.L045xts_enc_done6x
+	jz	.L049xts_enc_done6x
 	movdqa	%xmm1,%xmm5
 	cmpl	$32,%eax
-	jb	.L046xts_enc_one
+	jb	.L050xts_enc_one
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-	je	.L047xts_enc_two
+	je	.L051xts_enc_two
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm6
@@ -1142,7 +1231,7 @@ _aesni_xts_encrypt:
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
 	cmpl	$64,%eax
-	jb	.L048xts_enc_three
+	jb	.L052xts_enc_three
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm7
@@ -1152,7 +1241,7 @@ _aesni_xts_encrypt:
 	pxor	%xmm2,%xmm1
 	movdqa	%xmm5,(%esp)
 	movdqa	%xmm6,16(%esp)
-	je	.L049xts_enc_four
+	je	.L053xts_enc_four
 	movdqa	%xmm7,32(%esp)
 	pshufd	$19,%xmm0,%xmm7
 	movdqa	%xmm1,48(%esp)
@@ -1184,9 +1273,9 @@ _aesni_xts_encrypt:
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L046xts_enc_one:
+.L050xts_enc_one:
 	movups	(%esi),%xmm2
 	leal	16(%esi),%esi
 	xorps	%xmm5,%xmm2
@@ -1194,37 +1283,36 @@ _aesni_xts_encrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L051enc1_loop_9:
+.L055enc1_loop_9:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L051enc1_loop_9
+	jnz	.L055enc1_loop_9
 .byte	102,15,56,221,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	movdqa	%xmm5,%xmm1
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L047xts_enc_two:
+.L051xts_enc_two:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
 	leal	32(%esi),%esi
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
-	xorps	%xmm4,%xmm4
-	call	__aesni_encrypt3
+	call	__aesni_encrypt2
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	leal	32(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L048xts_enc_three:
+.L052xts_enc_three:
 	movaps	%xmm1,%xmm7
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1242,9 +1330,9 @@ _aesni_xts_encrypt:
 	movups	%xmm4,32(%edi)
 	leal	48(%edi),%edi
 	movdqa	%xmm7,%xmm1
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L049xts_enc_four:
+.L053xts_enc_four:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1266,28 +1354,28 @@ _aesni_xts_encrypt:
 	movups	%xmm5,48(%edi)
 	leal	64(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L045xts_enc_done6x:
+.L049xts_enc_done6x:
 	movl	112(%esp),%eax
 	andl	$15,%eax
-	jz	.L052xts_enc_ret
+	jz	.L056xts_enc_ret
 	movdqa	%xmm1,%xmm5
 	movl	%eax,112(%esp)
-	jmp	.L053xts_enc_steal
+	jmp	.L057xts_enc_steal
 .align	16
-.L050xts_enc_done:
+.L054xts_enc_done:
 	movl	112(%esp),%eax
 	pxor	%xmm0,%xmm0
 	andl	$15,%eax
-	jz	.L052xts_enc_ret
+	jz	.L056xts_enc_ret
 	pcmpgtd	%xmm1,%xmm0
 	movl	%eax,112(%esp)
 	pshufd	$19,%xmm0,%xmm5
 	paddq	%xmm1,%xmm1
 	pand	96(%esp),%xmm5
 	pxor	%xmm1,%xmm5
-.L053xts_enc_steal:
+.L057xts_enc_steal:
 	movzbl	(%esi),%ecx
 	movzbl	-16(%edi),%edx
 	leal	1(%esi),%esi
@@ -1295,7 +1383,7 @@ _aesni_xts_encrypt:
 	movb	%dl,(%edi)
 	leal	1(%edi),%edi
 	subl	$1,%eax
-	jnz	.L053xts_enc_steal
+	jnz	.L057xts_enc_steal
 	subl	112(%esp),%edi
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
@@ -1305,16 +1393,30 @@ _aesni_xts_encrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L054enc1_loop_10:
+.L058enc1_loop_10:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L054enc1_loop_10
+	jnz	.L058enc1_loop_10
 .byte	102,15,56,221,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,-16(%edi)
-.L052xts_enc_ret:
+.L056xts_enc_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	movdqa	%xmm0,(%esp)
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm0,16(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm0,80(%esp)
 	movl	116(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -1338,12 +1440,12 @@ _aesni_xts_decrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L055enc1_loop_11:
+.L059enc1_loop_11:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L055enc1_loop_11
+	jnz	.L059enc1_loop_11
 .byte	102,15,56,221,209
 	movl	20(%esp),%esi
 	movl	24(%esp),%edi
@@ -1372,12 +1474,14 @@ _aesni_xts_decrypt:
 	pcmpgtd	%xmm1,%xmm0
 	andl	$-16,%eax
 	subl	$96,%eax
-	jc	.L056xts_dec_short
-	shrl	$1,%ecx
-	movl	%ecx,%ebx
-	jmp	.L057xts_dec_loop6
+	jc	.L060xts_dec_short
+	shll	$4,%ecx
+	movl	$16,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	jmp	.L061xts_dec_loop6
 .align	16
-.L057xts_dec_loop6:
+.L061xts_dec_loop6:
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,(%esp)
@@ -1413,6 +1517,7 @@ _aesni_xts_decrypt:
 	pand	%xmm3,%xmm7
 	movups	(%esi),%xmm2
 	pxor	%xmm1,%xmm7
+	movl	%ebx,%ecx
 	movdqu	16(%esi),%xmm3
 	xorps	%xmm0,%xmm2
 	movdqu	32(%esi),%xmm4
@@ -1428,19 +1533,17 @@ _aesni_xts_decrypt:
 	movdqa	%xmm7,80(%esp)
 	pxor	%xmm1,%xmm7
 	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
 	pxor	16(%esp),%xmm3
-.byte	102,15,56,222,209
 	pxor	32(%esp),%xmm4
-.byte	102,15,56,222,217
+.byte	102,15,56,222,209
 	pxor	48(%esp),%xmm5
-	decl	%ecx
-.byte	102,15,56,222,225
 	pxor	64(%esp),%xmm6
-.byte	102,15,56,222,233
+.byte	102,15,56,222,217
 	pxor	%xmm0,%xmm7
+	movups	32(%ebp),%xmm0
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
 .byte	102,15,56,222,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,222,249
 	call	.L_aesni_decrypt6_enter
 	movdqa	80(%esp),%xmm1
@@ -1465,26 +1568,25 @@ _aesni_xts_decrypt:
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
-	movl	%ebx,%ecx
 	pxor	%xmm2,%xmm1
 	subl	$96,%eax
-	jnc	.L057xts_dec_loop6
-	leal	1(,%ecx,2),%ecx
+	jnc	.L061xts_dec_loop6
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movl	%ecx,%ebx
-.L056xts_dec_short:
+.L060xts_dec_short:
 	addl	$96,%eax
-	jz	.L058xts_dec_done6x
+	jz	.L062xts_dec_done6x
 	movdqa	%xmm1,%xmm5
 	cmpl	$32,%eax
-	jb	.L059xts_dec_one
+	jb	.L063xts_dec_one
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-	je	.L060xts_dec_two
+	je	.L064xts_dec_two
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm6
@@ -1493,7 +1595,7 @@ _aesni_xts_decrypt:
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
 	cmpl	$64,%eax
-	jb	.L061xts_dec_three
+	jb	.L065xts_dec_three
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm7
@@ -1503,7 +1605,7 @@ _aesni_xts_decrypt:
 	pxor	%xmm2,%xmm1
 	movdqa	%xmm5,(%esp)
 	movdqa	%xmm6,16(%esp)
-	je	.L062xts_dec_four
+	je	.L066xts_dec_four
 	movdqa	%xmm7,32(%esp)
 	pshufd	$19,%xmm0,%xmm7
 	movdqa	%xmm1,48(%esp)
@@ -1535,9 +1637,9 @@ _aesni_xts_decrypt:
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L059xts_dec_one:
+.L063xts_dec_one:
 	movups	(%esi),%xmm2
 	leal	16(%esi),%esi
 	xorps	%xmm5,%xmm2
@@ -1545,36 +1647,36 @@ _aesni_xts_decrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L064dec1_loop_12:
+.L068dec1_loop_12:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L064dec1_loop_12
+	jnz	.L068dec1_loop_12
 .byte	102,15,56,223,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	movdqa	%xmm5,%xmm1
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L060xts_dec_two:
+.L064xts_dec_two:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
 	leal	32(%esi),%esi
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
-	call	__aesni_decrypt3
+	call	__aesni_decrypt2
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	leal	32(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L061xts_dec_three:
+.L065xts_dec_three:
 	movaps	%xmm1,%xmm7
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1592,9 +1694,9 @@ _aesni_xts_decrypt:
 	movups	%xmm4,32(%edi)
 	leal	48(%edi),%edi
 	movdqa	%xmm7,%xmm1
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L062xts_dec_four:
+.L066xts_dec_four:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1616,20 +1718,20 @@ _aesni_xts_decrypt:
 	movups	%xmm5,48(%edi)
 	leal	64(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L058xts_dec_done6x:
+.L062xts_dec_done6x:
 	movl	112(%esp),%eax
 	andl	$15,%eax
-	jz	.L065xts_dec_ret
+	jz	.L069xts_dec_ret
 	movl	%eax,112(%esp)
-	jmp	.L066xts_dec_only_one_more
+	jmp	.L070xts_dec_only_one_more
 .align	16
-.L063xts_dec_done:
+.L067xts_dec_done:
 	movl	112(%esp),%eax
 	pxor	%xmm0,%xmm0
 	andl	$15,%eax
-	jz	.L065xts_dec_ret
+	jz	.L069xts_dec_ret
 	pcmpgtd	%xmm1,%xmm0
 	movl	%eax,112(%esp)
 	pshufd	$19,%xmm0,%xmm2
@@ -1639,7 +1741,7 @@ _aesni_xts_decrypt:
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-.L066xts_dec_only_one_more:
+.L070xts_dec_only_one_more:
 	pshufd	$19,%xmm0,%xmm5
 	movdqa	%xmm1,%xmm6
 	paddq	%xmm1,%xmm1
@@ -1653,16 +1755,16 @@ _aesni_xts_decrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L067dec1_loop_13:
+.L071dec1_loop_13:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L067dec1_loop_13
+	jnz	.L071dec1_loop_13
 .byte	102,15,56,223,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
-.L068xts_dec_steal:
+.L072xts_dec_steal:
 	movzbl	16(%esi),%ecx
 	movzbl	(%edi),%edx
 	leal	1(%esi),%esi
@@ -1670,7 +1772,7 @@ _aesni_xts_decrypt:
 	movb	%dl,16(%edi)
 	leal	1(%edi),%edi
 	subl	$1,%eax
-	jnz	.L068xts_dec_steal
+	jnz	.L072xts_dec_steal
 	subl	112(%esp),%edi
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
@@ -1680,22 +1782,824 @@ _aesni_xts_decrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L069dec1_loop_14:
+.L073dec1_loop_14:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L069dec1_loop_14
+	jnz	.L073dec1_loop_14
 .byte	102,15,56,223,209
 	xorps	%xmm6,%xmm2
 	movups	%xmm2,(%edi)
-.L065xts_dec_ret:
+.L069xts_dec_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	movdqa	%xmm0,(%esp)
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm0,16(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm0,80(%esp)
 	movl	116(%esp),%esp
 	popl	%edi
 	popl	%esi
 	popl	%ebx
 	popl	%ebp
 	ret
+.globl	_aesni_ocb_encrypt
+.def	_aesni_ocb_encrypt;	.scl	2;	.type	32;	.endef
+.align	16
+_aesni_ocb_encrypt:
+.L_aesni_ocb_encrypt_begin:
+	pushl	%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movl	20(%esp),%esi
+	movl	24(%esp),%edi
+	movl	28(%esp),%eax
+	movl	32(%esp),%edx
+	movdqu	(%ecx),%xmm0
+	movl	36(%esp),%ebp
+	movdqu	(%ebx),%xmm1
+	movl	44(%esp),%ebx
+	movl	%esp,%ecx
+	subl	$132,%esp
+	andl	$-16,%esp
+	subl	%esi,%edi
+	shll	$4,%eax
+	leal	-96(%esi,%eax,1),%eax
+	movl	%edi,120(%esp)
+	movl	%eax,124(%esp)
+	movl	%ecx,128(%esp)
+	movl	240(%edx),%ecx
+	testl	$1,%ebp
+	jnz	.L074odd
+	bsfl	%ebp,%eax
+	addl	$1,%ebp
+	shll	$4,%eax
+	movdqu	(%ebx,%eax,1),%xmm7
+	movl	%edx,%eax
+	movdqu	(%esi),%xmm2
+	leal	16(%esi),%esi
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+.L075enc1_loop_15:
+.byte	102,15,56,220,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	.L075enc1_loop_15
+.byte	102,15,56,221,209
+	xorps	%xmm7,%xmm2
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm6,%xmm1
+	movups	%xmm2,-16(%edi,%esi,1)
+	movl	240(%eax),%ecx
+	movl	%eax,%edx
+	movl	124(%esp),%eax
+.L074odd:
+	shll	$4,%ecx
+	movl	$16,%edi
+	subl	%ecx,%edi
+	movl	%edx,112(%esp)
+	leal	32(%edx,%ecx,1),%edx
+	movl	%edi,116(%esp)
+	cmpl	%eax,%esi
+	ja	.L076short
+	jmp	.L077grandloop
+.align	32
+.L077grandloop:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	leal	5(%ebp),%edi
+	addl	$6,%ebp
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	bsfl	%edi,%edi
+	shll	$4,%ecx
+	shll	$4,%eax
+	shll	$4,%edi
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	movdqu	(%ebx,%edi,1),%xmm7
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movdqa	%xmm7,80(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	movdqu	80(%esi),%xmm7
+	leal	96(%esi),%esi
+	pxor	%xmm2,%xmm1
+	pxor	%xmm0,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm0,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm0,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm0,%xmm5
+	pxor	%xmm6,%xmm1
+	pxor	%xmm0,%xmm6
+	pxor	%xmm7,%xmm1
+	pxor	%xmm0,%xmm7
+	movdqa	%xmm1,96(%esp)
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	80(%esp),%xmm7
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movl	120(%esp),%edi
+	movl	124(%esp),%eax
+	call	.L_aesni_encrypt6_enter
+	movdqa	80(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	%xmm0,%xmm7
+	movdqa	96(%esp),%xmm1
+	movdqu	%xmm2,-96(%edi,%esi,1)
+	movdqu	%xmm3,-80(%edi,%esi,1)
+	movdqu	%xmm4,-64(%edi,%esi,1)
+	movdqu	%xmm5,-48(%edi,%esi,1)
+	movdqu	%xmm6,-32(%edi,%esi,1)
+	movdqu	%xmm7,-16(%edi,%esi,1)
+	cmpl	%eax,%esi
+	jb	.L077grandloop
+.L076short:
+	addl	$96,%eax
+	subl	%esi,%eax
+	jz	.L078done
+	cmpl	$32,%eax
+	jb	.L079one
+	je	.L080two
+	cmpl	$64,%eax
+	jb	.L081three
+	je	.L082four
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	pxor	%xmm7,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm0,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm0,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm0,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm0,%xmm5
+	pxor	%xmm6,%xmm1
+	pxor	%xmm0,%xmm6
+	movdqa	%xmm1,96(%esp)
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movl	120(%esp),%edi
+	call	.L_aesni_encrypt6_enter
+	movdqa	64(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	%xmm0,%xmm6
+	movdqa	96(%esp),%xmm1
+	movdqu	%xmm2,(%edi,%esi,1)
+	movdqu	%xmm3,16(%edi,%esi,1)
+	movdqu	%xmm4,32(%edi,%esi,1)
+	movdqu	%xmm5,48(%edi,%esi,1)
+	movdqu	%xmm6,64(%edi,%esi,1)
+	jmp	.L078done
+.align	16
+.L079one:
+	movdqu	(%ebx),%xmm7
+	movl	112(%esp),%edx
+	movdqu	(%esi),%xmm2
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movl	120(%esp),%edi
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+.L083enc1_loop_16:
+.byte	102,15,56,220,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	.L083enc1_loop_16
+.byte	102,15,56,221,209
+	xorps	%xmm7,%xmm2
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm6,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	jmp	.L078done
+.align	16
+.L080two:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm6
+	movdqu	(%ebx,%ecx,1),%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm6,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm7,%xmm3
+	movdqa	%xmm1,%xmm5
+	movl	120(%esp),%edi
+	call	__aesni_encrypt2
+	xorps	%xmm6,%xmm2
+	xorps	%xmm7,%xmm3
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm5,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	movups	%xmm3,16(%edi,%esi,1)
+	jmp	.L078done
+.align	16
+.L081three:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm5
+	movdqu	(%ebx,%ecx,1),%xmm6
+	movdqa	%xmm5,%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm5
+	pxor	%xmm5,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm5,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm6,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm7,%xmm4
+	movdqa	%xmm1,96(%esp)
+	movl	120(%esp),%edi
+	call	__aesni_encrypt3
+	xorps	%xmm5,%xmm2
+	xorps	%xmm6,%xmm3
+	xorps	%xmm7,%xmm4
+	movdqa	%xmm7,%xmm0
+	movdqa	96(%esp),%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	movups	%xmm3,16(%edi,%esi,1)
+	movups	%xmm4,32(%edi,%esi,1)
+	jmp	.L078done
+.align	16
+.L082four:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	movl	112(%esp),%edx
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm4
+	movdqu	(%ebx,%ecx,1),%xmm5
+	movdqa	%xmm4,%xmm6
+	movdqu	(%ebx,%eax,1),%xmm7
+	pxor	%xmm0,%xmm4
+	movdqu	(%esi),%xmm2
+	pxor	%xmm4,%xmm5
+	movdqu	16(%esi),%xmm3
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm4,(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm5,16(%esp)
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movl	240(%edx),%ecx
+	pxor	%xmm2,%xmm1
+	pxor	(%esp),%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm6,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm7,%xmm5
+	movdqa	%xmm1,96(%esp)
+	movl	120(%esp),%edi
+	call	__aesni_encrypt4
+	xorps	(%esp),%xmm2
+	xorps	16(%esp),%xmm3
+	xorps	%xmm6,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	xorps	%xmm7,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	movdqa	%xmm7,%xmm0
+	movups	%xmm4,32(%edi,%esi,1)
+	movdqa	96(%esp),%xmm1
+	movups	%xmm5,48(%edi,%esi,1)
+.L078done:
+	movl	128(%esp),%edx
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm2,16(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm2,32(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm2,48(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm2,64(%esp)
+	movdqa	%xmm2,80(%esp)
+	movdqa	%xmm2,96(%esp)
+	leal	(%edx),%esp
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movdqu	%xmm0,(%ecx)
+	pxor	%xmm0,%xmm0
+	movdqu	%xmm1,(%ebx)
+	pxor	%xmm1,%xmm1
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
+.globl	_aesni_ocb_decrypt
+.def	_aesni_ocb_decrypt;	.scl	2;	.type	32;	.endef
+.align	16
+_aesni_ocb_decrypt:
+.L_aesni_ocb_decrypt_begin:
+	pushl	%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movl	20(%esp),%esi
+	movl	24(%esp),%edi
+	movl	28(%esp),%eax
+	movl	32(%esp),%edx
+	movdqu	(%ecx),%xmm0
+	movl	36(%esp),%ebp
+	movdqu	(%ebx),%xmm1
+	movl	44(%esp),%ebx
+	movl	%esp,%ecx
+	subl	$132,%esp
+	andl	$-16,%esp
+	subl	%esi,%edi
+	shll	$4,%eax
+	leal	-96(%esi,%eax,1),%eax
+	movl	%edi,120(%esp)
+	movl	%eax,124(%esp)
+	movl	%ecx,128(%esp)
+	movl	240(%edx),%ecx
+	testl	$1,%ebp
+	jnz	.L084odd
+	bsfl	%ebp,%eax
+	addl	$1,%ebp
+	shll	$4,%eax
+	movdqu	(%ebx,%eax,1),%xmm7
+	movl	%edx,%eax
+	movdqu	(%esi),%xmm2
+	leal	16(%esi),%esi
+	pxor	%xmm0,%xmm7
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+.L085dec1_loop_17:
+.byte	102,15,56,222,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	.L085dec1_loop_17
+.byte	102,15,56,223,209
+	xorps	%xmm7,%xmm2
+	movaps	%xmm6,%xmm1
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm1
+	movups	%xmm2,-16(%edi,%esi,1)
+	movl	240(%eax),%ecx
+	movl	%eax,%edx
+	movl	124(%esp),%eax
+.L084odd:
+	shll	$4,%ecx
+	movl	$16,%edi
+	subl	%ecx,%edi
+	movl	%edx,112(%esp)
+	leal	32(%edx,%ecx,1),%edx
+	movl	%edi,116(%esp)
+	cmpl	%eax,%esi
+	ja	.L086short
+	jmp	.L087grandloop
+.align	32
+.L087grandloop:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	leal	5(%ebp),%edi
+	addl	$6,%ebp
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	bsfl	%edi,%edi
+	shll	$4,%ecx
+	shll	$4,%eax
+	shll	$4,%edi
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	movdqu	(%ebx,%edi,1),%xmm7
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movdqa	%xmm7,80(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	movdqu	80(%esi),%xmm7
+	leal	96(%esi),%esi
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	pxor	%xmm0,%xmm4
+	pxor	%xmm0,%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm0,%xmm7
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	80(%esp),%xmm7
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movl	120(%esp),%edi
+	movl	124(%esp),%eax
+	call	.L_aesni_decrypt6_enter
+	movdqa	80(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	movdqa	96(%esp),%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	movdqu	%xmm2,-96(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqu	%xmm3,-80(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movdqu	%xmm4,-64(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+	movdqu	%xmm5,-48(%edi,%esi,1)
+	pxor	%xmm6,%xmm1
+	movdqu	%xmm6,-32(%edi,%esi,1)
+	pxor	%xmm7,%xmm1
+	movdqu	%xmm7,-16(%edi,%esi,1)
+	cmpl	%eax,%esi
+	jb	.L087grandloop
+.L086short:
+	addl	$96,%eax
+	subl	%esi,%eax
+	jz	.L088done
+	cmpl	$32,%eax
+	jb	.L089one
+	je	.L090two
+	cmpl	$64,%eax
+	jb	.L091three
+	je	.L092four
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	pxor	%xmm0,%xmm4
+	pxor	%xmm0,%xmm5
+	pxor	%xmm0,%xmm6
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movl	120(%esp),%edi
+	call	.L_aesni_decrypt6_enter
+	movdqa	64(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	movdqa	96(%esp),%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm2,%xmm1
+	movdqu	%xmm2,(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqu	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movdqu	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+	movdqu	%xmm5,48(%edi,%esi,1)
+	pxor	%xmm6,%xmm1
+	movdqu	%xmm6,64(%edi,%esi,1)
+	jmp	.L088done
+.align	16
+.L089one:
+	movdqu	(%ebx),%xmm7
+	movl	112(%esp),%edx
+	movdqu	(%esi),%xmm2
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm7
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movl	120(%esp),%edi
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+.L093dec1_loop_18:
+.byte	102,15,56,222,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	.L093dec1_loop_18
+.byte	102,15,56,223,209
+	xorps	%xmm7,%xmm2
+	movaps	%xmm6,%xmm1
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	jmp	.L088done
+.align	16
+.L090two:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm6
+	movdqu	(%ebx,%ecx,1),%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm6,%xmm2
+	pxor	%xmm7,%xmm3
+	movl	120(%esp),%edi
+	call	__aesni_decrypt2
+	xorps	%xmm6,%xmm2
+	xorps	%xmm7,%xmm3
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm5
+	movups	%xmm2,(%edi,%esi,1)
+	xorps	%xmm3,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	movaps	%xmm5,%xmm1
+	jmp	.L088done
+.align	16
+.L091three:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm5
+	movdqu	(%ebx,%ecx,1),%xmm6
+	movdqa	%xmm5,%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm5
+	pxor	%xmm5,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm5,%xmm2
+	pxor	%xmm6,%xmm3
+	pxor	%xmm7,%xmm4
+	movl	120(%esp),%edi
+	call	__aesni_decrypt3
+	movdqa	96(%esp),%xmm1
+	xorps	%xmm5,%xmm2
+	xorps	%xmm6,%xmm3
+	xorps	%xmm7,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	pxor	%xmm2,%xmm1
+	movdqa	%xmm7,%xmm0
+	movups	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movups	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	jmp	.L088done
+.align	16
+.L092four:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	movl	112(%esp),%edx
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm4
+	movdqu	(%ebx,%ecx,1),%xmm5
+	movdqa	%xmm4,%xmm6
+	movdqu	(%ebx,%eax,1),%xmm7
+	pxor	%xmm0,%xmm4
+	movdqu	(%esi),%xmm2
+	pxor	%xmm4,%xmm5
+	movdqu	16(%esi),%xmm3
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm4,(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm5,16(%esp)
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,96(%esp)
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	%xmm6,%xmm4
+	pxor	%xmm7,%xmm5
+	movl	120(%esp),%edi
+	call	__aesni_decrypt4
+	movdqa	96(%esp),%xmm1
+	xorps	(%esp),%xmm2
+	xorps	16(%esp),%xmm3
+	xorps	%xmm6,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	pxor	%xmm2,%xmm1
+	xorps	%xmm7,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqa	%xmm7,%xmm0
+	movups	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movups	%xmm5,48(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+.L088done:
+	movl	128(%esp),%edx
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm2,16(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm2,32(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm2,48(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm2,64(%esp)
+	movdqa	%xmm2,80(%esp)
+	movdqa	%xmm2,96(%esp)
+	leal	(%edx),%esp
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movdqu	%xmm0,(%ecx)
+	pxor	%xmm0,%xmm0
+	movdqu	%xmm1,(%ebx)
+	pxor	%xmm1,%xmm1
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
 .globl	_aesni_cbc_encrypt
 .def	_aesni_cbc_encrypt;	.scl	2;	.type	32;	.endef
 .align	16
@@ -1714,7 +2618,7 @@ _aesni_cbc_encrypt:
 	movl	32(%esp),%edx
 	movl	36(%esp),%ebp
 	testl	%eax,%eax
-	jz	.L070cbc_abort
+	jz	.L094cbc_abort
 	cmpl	$0,40(%esp)
 	xchgl	%esp,%ebx
 	movups	(%ebp),%xmm7
@@ -1722,14 +2626,14 @@ _aesni_cbc_encrypt:
 	movl	%edx,%ebp
 	movl	%ebx,16(%esp)
 	movl	%ecx,%ebx
-	je	.L071cbc_decrypt
+	je	.L095cbc_decrypt
 	movaps	%xmm7,%xmm2
 	cmpl	$16,%eax
-	jb	.L072cbc_enc_tail
+	jb	.L096cbc_enc_tail
 	subl	$16,%eax
-	jmp	.L073cbc_enc_loop
+	jmp	.L097cbc_enc_loop
 .align	16
-.L073cbc_enc_loop:
+.L097cbc_enc_loop:
 	movups	(%esi),%xmm7
 	leal	16(%esi),%esi
 	movups	(%edx),%xmm0
@@ -1737,24 +2641,25 @@ _aesni_cbc_encrypt:
 	xorps	%xmm0,%xmm7
 	leal	32(%edx),%edx
 	xorps	%xmm7,%xmm2
-.L074enc1_loop_15:
+.L098enc1_loop_19:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L074enc1_loop_15
+	jnz	.L098enc1_loop_19
 .byte	102,15,56,221,209
 	movl	%ebx,%ecx
 	movl	%ebp,%edx
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	subl	$16,%eax
-	jnc	.L073cbc_enc_loop
+	jnc	.L097cbc_enc_loop
 	addl	$16,%eax
-	jnz	.L072cbc_enc_tail
+	jnz	.L096cbc_enc_tail
 	movaps	%xmm2,%xmm7
-	jmp	.L075cbc_ret
-.L072cbc_enc_tail:
+	pxor	%xmm2,%xmm2
+	jmp	.L099cbc_ret
+.L096cbc_enc_tail:
 	movl	%eax,%ecx
 .long	2767451785
 	movl	$16,%ecx
@@ -1765,20 +2670,20 @@ _aesni_cbc_encrypt:
 	movl	%ebx,%ecx
 	movl	%edi,%esi
 	movl	%ebp,%edx
-	jmp	.L073cbc_enc_loop
+	jmp	.L097cbc_enc_loop
 .align	16
-.L071cbc_decrypt:
+.L095cbc_decrypt:
 	cmpl	$80,%eax
-	jbe	.L076cbc_dec_tail
+	jbe	.L100cbc_dec_tail
 	movaps	%xmm7,(%esp)
 	subl	$80,%eax
-	jmp	.L077cbc_dec_loop6_enter
+	jmp	.L101cbc_dec_loop6_enter
 .align	16
-.L078cbc_dec_loop6:
+.L102cbc_dec_loop6:
 	movaps	%xmm0,(%esp)
 	movups	%xmm7,(%edi)
 	leal	16(%edi),%edi
-.L077cbc_dec_loop6_enter:
+.L101cbc_dec_loop6_enter:
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -1808,28 +2713,28 @@ _aesni_cbc_encrypt:
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
 	subl	$96,%eax
-	ja	.L078cbc_dec_loop6
+	ja	.L102cbc_dec_loop6
 	movaps	%xmm7,%xmm2
 	movaps	%xmm0,%xmm7
 	addl	$80,%eax
-	jle	.L079cbc_dec_tail_collected
+	jle	.L103cbc_dec_clear_tail_collected
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
-.L076cbc_dec_tail:
+.L100cbc_dec_tail:
 	movups	(%esi),%xmm2
 	movaps	%xmm2,%xmm6
 	cmpl	$16,%eax
-	jbe	.L080cbc_dec_one
+	jbe	.L104cbc_dec_one
 	movups	16(%esi),%xmm3
 	movaps	%xmm3,%xmm5
 	cmpl	$32,%eax
-	jbe	.L081cbc_dec_two
+	jbe	.L105cbc_dec_two
 	movups	32(%esi),%xmm4
 	cmpl	$48,%eax
-	jbe	.L082cbc_dec_three
+	jbe	.L106cbc_dec_three
 	movups	48(%esi),%xmm5
 	cmpl	$64,%eax
-	jbe	.L083cbc_dec_four
+	jbe	.L107cbc_dec_four
 	movups	64(%esi),%xmm6
 	movaps	%xmm7,(%esp)
 	movups	(%esi),%xmm2
@@ -1847,56 +2752,62 @@ _aesni_cbc_encrypt:
 	xorps	%xmm0,%xmm6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	movups	%xmm4,32(%edi)
+	pxor	%xmm4,%xmm4
 	movups	%xmm5,48(%edi)
+	pxor	%xmm5,%xmm5
 	leal	64(%edi),%edi
 	movaps	%xmm6,%xmm2
+	pxor	%xmm6,%xmm6
 	subl	$80,%eax
-	jmp	.L079cbc_dec_tail_collected
+	jmp	.L108cbc_dec_tail_collected
 .align	16
-.L080cbc_dec_one:
+.L104cbc_dec_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L084dec1_loop_16:
+.L109dec1_loop_20:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L084dec1_loop_16
+	jnz	.L109dec1_loop_20
 .byte	102,15,56,223,209
 	xorps	%xmm7,%xmm2
 	movaps	%xmm6,%xmm7
 	subl	$16,%eax
-	jmp	.L079cbc_dec_tail_collected
+	jmp	.L108cbc_dec_tail_collected
 .align	16
-.L081cbc_dec_two:
-	xorps	%xmm4,%xmm4
-	call	__aesni_decrypt3
+.L105cbc_dec_two:
+	call	__aesni_decrypt2
 	xorps	%xmm7,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movaps	%xmm3,%xmm2
+	pxor	%xmm3,%xmm3
 	leal	16(%edi),%edi
 	movaps	%xmm5,%xmm7
 	subl	$32,%eax
-	jmp	.L079cbc_dec_tail_collected
+	jmp	.L108cbc_dec_tail_collected
 .align	16
-.L082cbc_dec_three:
+.L106cbc_dec_three:
 	call	__aesni_decrypt3
 	xorps	%xmm7,%xmm2
 	xorps	%xmm6,%xmm3
 	xorps	%xmm5,%xmm4
 	movups	%xmm2,(%edi)
 	movaps	%xmm4,%xmm2
+	pxor	%xmm4,%xmm4
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	leal	32(%edi),%edi
 	movups	32(%esi),%xmm7
 	subl	$48,%eax
-	jmp	.L079cbc_dec_tail_collected
+	jmp	.L108cbc_dec_tail_collected
 .align	16
-.L083cbc_dec_four:
+.L107cbc_dec_four:
 	call	__aesni_decrypt4
 	movups	16(%esi),%xmm1
 	movups	32(%esi),%xmm0
@@ -1906,28 +2817,44 @@ _aesni_cbc_encrypt:
 	movups	%xmm2,(%edi)
 	xorps	%xmm1,%xmm4
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	xorps	%xmm0,%xmm5
 	movups	%xmm4,32(%edi)
+	pxor	%xmm4,%xmm4
 	leal	48(%edi),%edi
 	movaps	%xmm5,%xmm2
+	pxor	%xmm5,%xmm5
 	subl	$64,%eax
-.L079cbc_dec_tail_collected:
+	jmp	.L108cbc_dec_tail_collected
+.align	16
+.L103cbc_dec_clear_tail_collected:
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+.L108cbc_dec_tail_collected:
 	andl	$15,%eax
-	jnz	.L085cbc_dec_tail_partial
+	jnz	.L110cbc_dec_tail_partial
 	movups	%xmm2,(%edi)
-	jmp	.L075cbc_ret
+	pxor	%xmm0,%xmm0
+	jmp	.L099cbc_ret
 .align	16
-.L085cbc_dec_tail_partial:
+.L110cbc_dec_tail_partial:
 	movaps	%xmm2,(%esp)
+	pxor	%xmm0,%xmm0
 	movl	$16,%ecx
 	movl	%esp,%esi
 	subl	%eax,%ecx
 .long	2767451785
-.L075cbc_ret:
+	movdqa	%xmm2,(%esp)
+.L099cbc_ret:
 	movl	16(%esp),%esp
 	movl	36(%esp),%ebp
+	pxor	%xmm2,%xmm2
+	pxor	%xmm1,%xmm1
 	movups	%xmm7,(%ebp)
-.L070cbc_abort:
+	pxor	%xmm7,%xmm7
+.L094cbc_abort:
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -1936,52 +2863,62 @@ _aesni_cbc_encrypt:
 .def	__aesni_set_encrypt_key;	.scl	3;	.type	32;	.endef
 .align	16
 __aesni_set_encrypt_key:
+	pushl	%ebp
+	pushl	%ebx
 	testl	%eax,%eax
-	jz	.L086bad_pointer
+	jz	.L111bad_pointer
 	testl	%edx,%edx
-	jz	.L086bad_pointer
+	jz	.L111bad_pointer
+	call	.L112pic
+.L112pic:
+	popl	%ebx
+	leal	.Lkey_const-.L112pic(%ebx),%ebx
+	leal	__gnutls_x86_cpuid_s,%ebp
 	movups	(%eax),%xmm0
 	xorps	%xmm4,%xmm4
+	movl	4(%ebp),%ebp
 	leal	16(%edx),%edx
+	andl	$268437504,%ebp
 	cmpl	$256,%ecx
-	je	.L08714rounds
+	je	.L11314rounds
 	cmpl	$192,%ecx
-	je	.L08812rounds
+	je	.L11412rounds
 	cmpl	$128,%ecx
-	jne	.L089bad_keybits
+	jne	.L115bad_keybits
 .align	16
-.L09010rounds:
+.L11610rounds:
+	cmpl	$268435456,%ebp
+	je	.L11710rounds_alt
 	movl	$9,%ecx
 	movups	%xmm0,-16(%edx)
 .byte	102,15,58,223,200,1
-	call	.L091key_128_cold
+	call	.L118key_128_cold
 .byte	102,15,58,223,200,2
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,4
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,8
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,16
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,32
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,64
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,128
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,27
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,54
-	call	.L092key_128
+	call	.L119key_128
 	movups	%xmm0,(%edx)
 	movl	%ecx,80(%edx)
-	xorl	%eax,%eax
-	ret
+	jmp	.L120good_key
 .align	16
-.L092key_128:
+.L119key_128:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
-.L091key_128_cold:
+.L118key_128_cold:
 	shufps	$16,%xmm0,%xmm4
 	xorps	%xmm4,%xmm0
 	shufps	$140,%xmm0,%xmm4
@@ -1990,38 +2927,91 @@ __aesni_set_encrypt_key:
 	xorps	%xmm1,%xmm0
 	ret
 .align	16
-.L08812rounds:
+.L11710rounds_alt:
+	movdqa	(%ebx),%xmm5
+	movl	$8,%ecx
+	movdqa	32(%ebx),%xmm4
+	movdqa	%xmm0,%xmm2
+	movdqu	%xmm0,-16(%edx)
+.L121loop_key128:
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	pslld	$1,%xmm4
+	leal	16(%edx),%edx
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,-16(%edx)
+	movdqa	%xmm0,%xmm2
+	decl	%ecx
+	jnz	.L121loop_key128
+	movdqa	48(%ebx),%xmm4
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	pslld	$1,%xmm4
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,(%edx)
+	movdqa	%xmm0,%xmm2
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,16(%edx)
+	movl	$9,%ecx
+	movl	%ecx,96(%edx)
+	jmp	.L120good_key
+.align	16
+.L11412rounds:
 	movq	16(%eax),%xmm2
+	cmpl	$268435456,%ebp
+	je	.L12212rounds_alt
 	movl	$11,%ecx
 	movups	%xmm0,-16(%edx)
 .byte	102,15,58,223,202,1
-	call	.L093key_192a_cold
+	call	.L123key_192a_cold
 .byte	102,15,58,223,202,2
-	call	.L094key_192b
+	call	.L124key_192b
 .byte	102,15,58,223,202,4
-	call	.L095key_192a
+	call	.L125key_192a
 .byte	102,15,58,223,202,8
-	call	.L094key_192b
+	call	.L124key_192b
 .byte	102,15,58,223,202,16
-	call	.L095key_192a
+	call	.L125key_192a
 .byte	102,15,58,223,202,32
-	call	.L094key_192b
+	call	.L124key_192b
 .byte	102,15,58,223,202,64
-	call	.L095key_192a
+	call	.L125key_192a
 .byte	102,15,58,223,202,128
-	call	.L094key_192b
+	call	.L124key_192b
 	movups	%xmm0,(%edx)
 	movl	%ecx,48(%edx)
-	xorl	%eax,%eax
-	ret
+	jmp	.L120good_key
 .align	16
-.L095key_192a:
+.L125key_192a:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
 .align	16
-.L093key_192a_cold:
+.L123key_192a_cold:
 	movaps	%xmm2,%xmm5
-.L096key_192b_warm:
+.L126key_192b_warm:
 	shufps	$16,%xmm0,%xmm4
 	movdqa	%xmm2,%xmm3
 	xorps	%xmm4,%xmm0
@@ -2035,56 +3025,90 @@ __aesni_set_encrypt_key:
 	pxor	%xmm3,%xmm2
 	ret
 .align	16
-.L094key_192b:
+.L124key_192b:
 	movaps	%xmm0,%xmm3
 	shufps	$68,%xmm0,%xmm5
 	movups	%xmm5,(%edx)
 	shufps	$78,%xmm2,%xmm3
 	movups	%xmm3,16(%edx)
 	leal	32(%edx),%edx
-	jmp	.L096key_192b_warm
+	jmp	.L126key_192b_warm
+.align	16
+.L12212rounds_alt:
+	movdqa	16(%ebx),%xmm5
+	movdqa	32(%ebx),%xmm4
+	movl	$8,%ecx
+	movdqu	%xmm0,-16(%edx)
+.L127loop_key192:
+	movq	%xmm2,(%edx)
+	movdqa	%xmm2,%xmm1
+.byte	102,15,56,0,213
+.byte	102,15,56,221,212
+	pslld	$1,%xmm4
+	leal	24(%edx),%edx
+	movdqa	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm3,%xmm0
+	pshufd	$255,%xmm0,%xmm3
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pxor	%xmm2,%xmm0
+	pxor	%xmm3,%xmm2
+	movdqu	%xmm0,-16(%edx)
+	decl	%ecx
+	jnz	.L127loop_key192
+	movl	$11,%ecx
+	movl	%ecx,32(%edx)
+	jmp	.L120good_key
 .align	16
-.L08714rounds:
+.L11314rounds:
 	movups	16(%eax),%xmm2
-	movl	$13,%ecx
 	leal	16(%edx),%edx
+	cmpl	$268435456,%ebp
+	je	.L12814rounds_alt
+	movl	$13,%ecx
 	movups	%xmm0,-32(%edx)
 	movups	%xmm2,-16(%edx)
 .byte	102,15,58,223,202,1
-	call	.L097key_256a_cold
+	call	.L129key_256a_cold
 .byte	102,15,58,223,200,1
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,2
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,2
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,4
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,4
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,8
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,8
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,16
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,16
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,32
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,32
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,64
-	call	.L099key_256a
+	call	.L131key_256a
 	movups	%xmm0,(%edx)
 	movl	%ecx,16(%edx)
 	xorl	%eax,%eax
-	ret
+	jmp	.L120good_key
 .align	16
-.L099key_256a:
+.L131key_256a:
 	movups	%xmm2,(%edx)
 	leal	16(%edx),%edx
-.L097key_256a_cold:
+.L129key_256a_cold:
 	shufps	$16,%xmm0,%xmm4
 	xorps	%xmm4,%xmm0
 	shufps	$140,%xmm0,%xmm4
@@ -2093,7 +3117,7 @@ __aesni_set_encrypt_key:
 	xorps	%xmm1,%xmm0
 	ret
 .align	16
-.L098key_256b:
+.L130key_256b:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
 	shufps	$16,%xmm2,%xmm4
@@ -2103,13 +3127,70 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	ret
+.align	16
+.L12814rounds_alt:
+	movdqa	(%ebx),%xmm5
+	movdqa	32(%ebx),%xmm4
+	movl	$7,%ecx
+	movdqu	%xmm0,-32(%edx)
+	movdqa	%xmm2,%xmm1
+	movdqu	%xmm2,-16(%edx)
+.L132loop_key256:
+.byte	102,15,56,0,213
+.byte	102,15,56,221,212
+	movdqa	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm3,%xmm0
+	pslld	$1,%xmm4
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,(%edx)
+	decl	%ecx
+	jz	.L133done_key256
+	pshufd	$255,%xmm0,%xmm2
+	pxor	%xmm3,%xmm3
+.byte	102,15,56,221,211
+	movdqa	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm3,%xmm1
+	pxor	%xmm1,%xmm2
+	movdqu	%xmm2,16(%edx)
+	leal	32(%edx),%edx
+	movdqa	%xmm2,%xmm1
+	jmp	.L132loop_key256
+.L133done_key256:
+	movl	$13,%ecx
+	movl	%ecx,16(%edx)
+.L120good_key:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	xorl	%eax,%eax
+	popl	%ebx
+	popl	%ebp
+	ret
 .align	4
-.L086bad_pointer:
+.L111bad_pointer:
 	movl	$-1,%eax
+	popl	%ebx
+	popl	%ebp
 	ret
 .align	4
-.L089bad_keybits:
+.L115bad_keybits:
+	pxor	%xmm0,%xmm0
 	movl	$-2,%eax
+	popl	%ebx
+	popl	%ebp
 	ret
 .globl	_aesni_set_encrypt_key
 .def	_aesni_set_encrypt_key;	.scl	2;	.type	32;	.endef
@@ -2133,7 +3214,7 @@ _aesni_set_decrypt_key:
 	movl	12(%esp),%edx
 	shll	$4,%ecx
 	testl	%eax,%eax
-	jnz	.L100dec_key_ret
+	jnz	.L134dec_key_ret
 	leal	16(%edx,%ecx,1),%eax
 	movups	(%edx),%xmm0
 	movups	(%eax),%xmm1
@@ -2141,7 +3222,7 @@ _aesni_set_decrypt_key:
 	movups	%xmm1,(%edx)
 	leal	16(%edx),%edx
 	leal	-16(%eax),%eax
-.L101dec_key_inverse:
+.L135dec_key_inverse:
 	movups	(%edx),%xmm0
 	movups	(%eax),%xmm1
 .byte	102,15,56,219,192
@@ -2151,15 +3232,24 @@ _aesni_set_decrypt_key:
 	movups	%xmm0,16(%eax)
 	movups	%xmm1,-16(%edx)
 	cmpl	%edx,%eax
-	ja	.L101dec_key_inverse
+	ja	.L135dec_key_inverse
 	movups	(%edx),%xmm0
 .byte	102,15,56,219,192
 	movups	%xmm0,(%edx)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	xorl	%eax,%eax
-.L100dec_key_ret:
+.L134dec_key_ret:
 	ret
+.align	64
+.Lkey_const:
+.long	202313229,202313229,202313229,202313229
+.long	67569157,67569157,67569157,67569157
+.long	1,1,1,1
+.long	27,27,27,27
 .byte	65,69,83,32,102,111,114,32,73,110,116,101,108,32,65,69
 .byte	83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83
 .byte	32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115
 .byte	115,108,46,111,114,103,62,0
+.comm	__gnutls_x86_cpuid_s,16
 
diff --git a/lib/accelerated/x86/coff/aesni-x86_64.s b/lib/accelerated/x86/coff/aesni-x86_64.s
index 79ffbf70c7..4e8de065f2 100644
--- a/lib/accelerated/x86/coff/aesni-x86_64.s
+++ b/lib/accelerated/x86/coff/aesni-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
 .def	aesni_encrypt;	.scl 2;	.type 32;	.endef
 .p2align	4
 aesni_encrypt:
+
 	movups	(%rcx),%xmm2
 	movl	240(%r8),%eax
 	movups	(%r8),%xmm0
@@ -63,10 +64,12 @@ aesni_encrypt:
 	.byte	0xf3,0xc3
 
 
+
 .globl	aesni_decrypt
 .def	aesni_decrypt;	.scl 2;	.type 32;	.endef
 .p2align	4
 aesni_decrypt:
+
 	movups	(%rcx),%xmm2
 	movl	240(%r8),%eax
 	movups	(%r8),%xmm0
@@ -86,9 +89,11 @@ aesni_decrypt:
 	pxor	%xmm2,%xmm2
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_encrypt2;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_encrypt2:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -115,9 +120,11 @@ _aesni_encrypt2:
 .byte	102,15,56,221,216
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_decrypt2;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_decrypt2:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -144,9 +151,11 @@ _aesni_decrypt2:
 .byte	102,15,56,223,216
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_encrypt3;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_encrypt3:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -178,9 +187,11 @@ _aesni_encrypt3:
 .byte	102,15,56,221,224
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_decrypt3;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_decrypt3:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -212,9 +223,11 @@ _aesni_decrypt3:
 .byte	102,15,56,223,224
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_encrypt4;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_encrypt4:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -252,9 +265,11 @@ _aesni_encrypt4:
 .byte	102,15,56,221,232
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_decrypt4;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_decrypt4:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -292,9 +307,11 @@ _aesni_decrypt4:
 .byte	102,15,56,223,232
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_encrypt6;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_encrypt6:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -346,9 +363,11 @@ _aesni_encrypt6:
 .byte	102,15,56,221,248
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_decrypt6;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_decrypt6:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -400,9 +419,11 @@ _aesni_decrypt6:
 .byte	102,15,56,223,248
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_encrypt8;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_encrypt8:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -464,9 +485,11 @@ _aesni_encrypt8:
 .byte	102,68,15,56,221,200
 	.byte	0xf3,0xc3
 
+
 .def	_aesni_decrypt8;	.scl 3;	.type 32;	.endef
 .p2align	4
 _aesni_decrypt8:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -528,6 +551,7 @@ _aesni_decrypt8:
 .byte	102,68,15,56,223,200
 	.byte	0xf3,0xc3
 
+
 .globl	aesni_ecb_encrypt
 .def	aesni_ecb_encrypt;	.scl 2;	.type 32;	.endef
 .p2align	4
@@ -542,6 +566,7 @@ aesni_ecb_encrypt:
 	movq	%r9,%rcx
 	movq	40(%rsp),%r8
 
+
 	leaq	-88(%rsp),%rsp
 	movaps	%xmm6,(%rsp)
 	movaps	%xmm7,16(%rsp)
@@ -897,6 +922,7 @@ aesni_ecb_encrypt:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_aesni_ecb_encrypt:
 .globl	aesni_ccm64_encrypt_blocks
 .def	aesni_ccm64_encrypt_blocks;	.scl 2;	.type 32;	.endef
@@ -1130,6 +1156,7 @@ aesni_ctr32_encrypt_blocks:
 	movq	%r9,%rcx
 	movq	40(%rsp),%r8
 
+
 	cmpq	$1,%rdx
 	jne	.Lctr32_bulk
 
@@ -1159,22 +1186,23 @@ aesni_ctr32_encrypt_blocks:
 
 .p2align	4
 .Lctr32_bulk:
-	leaq	(%rsp),%rax
+	leaq	(%rsp),%r11
+
 	pushq	%rbp
+
 	subq	$288,%rsp
 	andq	$-16,%rsp
-	movaps	%xmm6,-168(%rax)
-	movaps	%xmm7,-152(%rax)
-	movaps	%xmm8,-136(%rax)
-	movaps	%xmm9,-120(%rax)
-	movaps	%xmm10,-104(%rax)
-	movaps	%xmm11,-88(%rax)
-	movaps	%xmm12,-72(%rax)
-	movaps	%xmm13,-56(%rax)
-	movaps	%xmm14,-40(%rax)
-	movaps	%xmm15,-24(%rax)
+	movaps	%xmm6,-168(%r11)
+	movaps	%xmm7,-152(%r11)
+	movaps	%xmm8,-136(%r11)
+	movaps	%xmm9,-120(%r11)
+	movaps	%xmm10,-104(%r11)
+	movaps	%xmm11,-88(%r11)
+	movaps	%xmm12,-72(%r11)
+	movaps	%xmm13,-56(%r11)
+	movaps	%xmm14,-40(%r11)
+	movaps	%xmm15,-24(%r11)
 .Lctr32_body:
-	leaq	-8(%rax),%rbp
 
 
 
@@ -1183,7 +1211,7 @@ aesni_ctr32_encrypt_blocks:
 	movdqu	(%rcx),%xmm0
 	movl	12(%r8),%r8d
 	pxor	%xmm0,%xmm2
-	movl	12(%rcx),%r11d
+	movl	12(%rcx),%ebp
 	movdqa	%xmm2,0(%rsp)
 	bswapl	%r8d
 	movdqa	%xmm2,%xmm3
@@ -1199,8 +1227,8 @@ aesni_ctr32_encrypt_blocks:
 	leaq	2(%r8),%rdx
 	bswapl	%eax
 	bswapl	%edx
-	xorl	%r11d,%eax
-	xorl	%r11d,%edx
+	xorl	%ebp,%eax
+	xorl	%ebp,%edx
 .byte	102,15,58,34,216,3
 	leaq	3(%r8),%rax
 	movdqa	%xmm3,16(%rsp)
@@ -1209,25 +1237,25 @@ aesni_ctr32_encrypt_blocks:
 	movq	%r10,%rdx
 	leaq	4(%r8),%r10
 	movdqa	%xmm4,32(%rsp)
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 	bswapl	%r10d
 .byte	102,15,58,34,232,3
-	xorl	%r11d,%r10d
+	xorl	%ebp,%r10d
 	movdqa	%xmm5,48(%rsp)
 	leaq	5(%r8),%r9
 	movl	%r10d,64+12(%rsp)
 	bswapl	%r9d
 	leaq	6(%r8),%r10
 	movl	240(%rcx),%eax
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	bswapl	%r10d
 	movl	%r9d,80+12(%rsp)
-	xorl	%r11d,%r10d
+	xorl	%ebp,%r10d
 	leaq	7(%r8),%r9
 	movl	%r10d,96+12(%rsp)
 	bswapl	%r9d
 	movl	_gnutls_x86_cpuid_s+4(%rip),%r10d
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	andl	$71303168,%r10d
 	movl	%r9d,112+12(%rsp)
 
@@ -1251,7 +1279,7 @@ aesni_ctr32_encrypt_blocks:
 .Lctr32_6x:
 	shll	$4,%eax
 	movl	$48,%r10d
-	bswapl	%r11d
+	bswapl	%ebp
 	leaq	32(%rcx,%rax,1),%rcx
 	subq	%rax,%r10
 	jmp	.Lctr32_loop6
@@ -1262,32 +1290,32 @@ aesni_ctr32_encrypt_blocks:
 	movups	-48(%rcx,%r10,1),%xmm0
 .byte	102,15,56,220,209
 	movl	%r8d,%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,217
 .byte	0x0f,0x38,0xf1,0x44,0x24,12
 	leal	1(%r8),%eax
 .byte	102,15,56,220,225
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	0x0f,0x38,0xf1,0x44,0x24,28
 .byte	102,15,56,220,233
 	leal	2(%r8),%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,241
 .byte	0x0f,0x38,0xf1,0x44,0x24,44
 	leal	3(%r8),%eax
 .byte	102,15,56,220,249
 	movups	-32(%rcx,%r10,1),%xmm1
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 
 .byte	102,15,56,220,208
 .byte	0x0f,0x38,0xf1,0x44,0x24,60
 	leal	4(%r8),%eax
 .byte	102,15,56,220,216
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	0x0f,0x38,0xf1,0x44,0x24,76
 .byte	102,15,56,220,224
 	leal	5(%r8),%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,232
 .byte	0x0f,0x38,0xf1,0x44,0x24,92
 	movq	%r10,%rax
@@ -1348,7 +1376,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 	movups	32-128(%rcx),%xmm0
 .byte	102,15,56,220,225
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	nop
 .byte	102,15,56,220,233
 	movl	%r9d,0+12(%rsp)
@@ -1361,7 +1389,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1375,7 +1403,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1389,7 +1417,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1403,7 +1431,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1417,7 +1445,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1431,7 +1459,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1446,7 +1474,7 @@ aesni_ctr32_encrypt_blocks:
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
 .byte	102,15,56,220,224
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	movdqu	0(%rdi),%xmm10
 .byte	102,15,56,220,232
 	movl	%r9d,112+12(%rsp)
@@ -1681,32 +1709,32 @@ aesni_ctr32_encrypt_blocks:
 
 .Lctr32_done:
 	xorps	%xmm0,%xmm0
-	xorl	%r11d,%r11d
+	xorl	%ebp,%ebp
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
 	pxor	%xmm3,%xmm3
 	pxor	%xmm4,%xmm4
 	pxor	%xmm5,%xmm5
-	movaps	-160(%rbp),%xmm6
-	movaps	%xmm0,-160(%rbp)
-	movaps	-144(%rbp),%xmm7
-	movaps	%xmm0,-144(%rbp)
-	movaps	-128(%rbp),%xmm8
-	movaps	%xmm0,-128(%rbp)
-	movaps	-112(%rbp),%xmm9
-	movaps	%xmm0,-112(%rbp)
-	movaps	-96(%rbp),%xmm10
-	movaps	%xmm0,-96(%rbp)
-	movaps	-80(%rbp),%xmm11
-	movaps	%xmm0,-80(%rbp)
-	movaps	-64(%rbp),%xmm12
-	movaps	%xmm0,-64(%rbp)
-	movaps	-48(%rbp),%xmm13
-	movaps	%xmm0,-48(%rbp)
-	movaps	-32(%rbp),%xmm14
-	movaps	%xmm0,-32(%rbp)
-	movaps	-16(%rbp),%xmm15
-	movaps	%xmm0,-16(%rbp)
+	movaps	-168(%r11),%xmm6
+	movaps	%xmm0,-168(%r11)
+	movaps	-152(%r11),%xmm7
+	movaps	%xmm0,-152(%r11)
+	movaps	-136(%r11),%xmm8
+	movaps	%xmm0,-136(%r11)
+	movaps	-120(%r11),%xmm9
+	movaps	%xmm0,-120(%r11)
+	movaps	-104(%r11),%xmm10
+	movaps	%xmm0,-104(%r11)
+	movaps	-88(%r11),%xmm11
+	movaps	%xmm0,-88(%r11)
+	movaps	-72(%r11),%xmm12
+	movaps	%xmm0,-72(%r11)
+	movaps	-56(%r11),%xmm13
+	movaps	%xmm0,-56(%r11)
+	movaps	-40(%r11),%xmm14
+	movaps	%xmm0,-40(%r11)
+	movaps	-24(%r11),%xmm15
+	movaps	%xmm0,-24(%r11)
 	movaps	%xmm0,0(%rsp)
 	movaps	%xmm0,16(%rsp)
 	movaps	%xmm0,32(%rsp)
@@ -1715,12 +1743,15 @@ aesni_ctr32_encrypt_blocks:
 	movaps	%xmm0,80(%rsp)
 	movaps	%xmm0,96(%rsp)
 	movaps	%xmm0,112(%rsp)
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+
+	leaq	(%r11),%rsp
+
 .Lctr32_epilogue:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_aesni_ctr32_encrypt_blocks:
 .globl	aesni_xts_encrypt
 .def	aesni_xts_encrypt;	.scl 2;	.type 32;	.endef
@@ -1737,22 +1768,24 @@ aesni_xts_encrypt:
 	movq	40(%rsp),%r8
 	movq	48(%rsp),%r9
 
-	leaq	(%rsp),%rax
+
+	leaq	(%rsp),%r11
+
 	pushq	%rbp
+
 	subq	$272,%rsp
 	andq	$-16,%rsp
-	movaps	%xmm6,-168(%rax)
-	movaps	%xmm7,-152(%rax)
-	movaps	%xmm8,-136(%rax)
-	movaps	%xmm9,-120(%rax)
-	movaps	%xmm10,-104(%rax)
-	movaps	%xmm11,-88(%rax)
-	movaps	%xmm12,-72(%rax)
-	movaps	%xmm13,-56(%rax)
-	movaps	%xmm14,-40(%rax)
-	movaps	%xmm15,-24(%rax)
+	movaps	%xmm6,-168(%r11)
+	movaps	%xmm7,-152(%r11)
+	movaps	%xmm8,-136(%r11)
+	movaps	%xmm9,-120(%r11)
+	movaps	%xmm10,-104(%r11)
+	movaps	%xmm11,-88(%r11)
+	movaps	%xmm12,-72(%r11)
+	movaps	%xmm13,-56(%r11)
+	movaps	%xmm14,-40(%r11)
+	movaps	%xmm15,-24(%r11)
 .Lxts_enc_body:
-	leaq	-8(%rax),%rbp
 	movups	(%r9),%xmm2
 	movl	240(%r8),%eax
 	movl	240(%rcx),%r10d
@@ -1768,7 +1801,7 @@ aesni_xts_encrypt:
 	jnz	.Loop_enc1_8
 .byte	102,15,56,221,209
 	movups	(%rcx),%xmm0
-	movq	%rcx,%r11
+	movq	%rcx,%rbp
 	movl	%r10d,%eax
 	shll	$4,%r10d
 	movq	%rdx,%r9
@@ -1824,9 +1857,9 @@ aesni_xts_encrypt:
 	jc	.Lxts_enc_short
 
 	movl	$16+96,%eax
-	leaq	32(%r11,%r10,1),%rcx
+	leaq	32(%rbp,%r10,1),%rcx
 	subq	%r10,%rax
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 	movq	%rax,%r10
 	leaq	.Lxts_magic(%rip),%r8
 	jmp	.Lxts_enc_grandloop
@@ -1851,7 +1884,7 @@ aesni_xts_encrypt:
 	movdqa	96(%rsp),%xmm9
 	pxor	%xmm14,%xmm6
 .byte	102,15,56,220,233
-	movups	32(%r11),%xmm0
+	movups	32(%rbp),%xmm0
 	leaq	96(%rdi),%rdi
 	pxor	%xmm8,%xmm7
 
@@ -1860,7 +1893,7 @@ aesni_xts_encrypt:
 	pxor	%xmm9,%xmm11
 	movdqa	%xmm10,0(%rsp)
 .byte	102,15,56,220,249
-	movups	48(%r11),%xmm1
+	movups	48(%rbp),%xmm1
 	pxor	%xmm9,%xmm12
 
 .byte	102,15,56,220,208
@@ -1875,7 +1908,7 @@ aesni_xts_encrypt:
 	movdqa	%xmm14,64(%rsp)
 .byte	102,15,56,220,240
 .byte	102,15,56,220,248
-	movups	64(%r11),%xmm0
+	movups	64(%rbp),%xmm0
 	movdqa	%xmm8,80(%rsp)
 	pshufd	$0x5f,%xmm15,%xmm9
 	jmp	.Lxts_enc_loop6
@@ -1907,7 +1940,7 @@ aesni_xts_encrypt:
 	psrad	$31,%xmm14
 .byte	102,15,56,220,217
 	pand	%xmm8,%xmm14
-	movups	(%r11),%xmm10
+	movups	(%rbp),%xmm10
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
 .byte	102,15,56,220,241
@@ -1975,10 +2008,10 @@ aesni_xts_encrypt:
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
 	pxor	%xmm0,%xmm15
-	movups	(%r11),%xmm0
+	movups	(%rbp),%xmm0
 .byte	102,15,56,220,241
 .byte	102,15,56,220,249
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 
 	pxor	%xmm15,%xmm14
 .byte	102,15,56,221,84,36,0
@@ -2005,7 +2038,7 @@ aesni_xts_encrypt:
 
 	movl	$16+96,%eax
 	subl	%r10d,%eax
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	shrl	$4,%eax
 
 .Lxts_enc_short:
@@ -2161,7 +2194,7 @@ aesni_xts_encrypt:
 	jnz	.Lxts_enc_steal
 
 	subq	%r9,%rsi
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	-16(%rsi),%xmm2
@@ -2187,26 +2220,26 @@ aesni_xts_encrypt:
 	pxor	%xmm3,%xmm3
 	pxor	%xmm4,%xmm4
 	pxor	%xmm5,%xmm5
-	movaps	-160(%rbp),%xmm6
-	movaps	%xmm0,-160(%rbp)
-	movaps	-144(%rbp),%xmm7
-	movaps	%xmm0,-144(%rbp)
-	movaps	-128(%rbp),%xmm8
-	movaps	%xmm0,-128(%rbp)
-	movaps	-112(%rbp),%xmm9
-	movaps	%xmm0,-112(%rbp)
-	movaps	-96(%rbp),%xmm10
-	movaps	%xmm0,-96(%rbp)
-	movaps	-80(%rbp),%xmm11
-	movaps	%xmm0,-80(%rbp)
-	movaps	-64(%rbp),%xmm12
-	movaps	%xmm0,-64(%rbp)
-	movaps	-48(%rbp),%xmm13
-	movaps	%xmm0,-48(%rbp)
-	movaps	-32(%rbp),%xmm14
-	movaps	%xmm0,-32(%rbp)
-	movaps	-16(%rbp),%xmm15
-	movaps	%xmm0,-16(%rbp)
+	movaps	-168(%r11),%xmm6
+	movaps	%xmm0,-168(%r11)
+	movaps	-152(%r11),%xmm7
+	movaps	%xmm0,-152(%r11)
+	movaps	-136(%r11),%xmm8
+	movaps	%xmm0,-136(%r11)
+	movaps	-120(%r11),%xmm9
+	movaps	%xmm0,-120(%r11)
+	movaps	-104(%r11),%xmm10
+	movaps	%xmm0,-104(%r11)
+	movaps	-88(%r11),%xmm11
+	movaps	%xmm0,-88(%r11)
+	movaps	-72(%r11),%xmm12
+	movaps	%xmm0,-72(%r11)
+	movaps	-56(%r11),%xmm13
+	movaps	%xmm0,-56(%r11)
+	movaps	-40(%r11),%xmm14
+	movaps	%xmm0,-40(%r11)
+	movaps	-24(%r11),%xmm15
+	movaps	%xmm0,-24(%r11)
 	movaps	%xmm0,0(%rsp)
 	movaps	%xmm0,16(%rsp)
 	movaps	%xmm0,32(%rsp)
@@ -2214,12 +2247,15 @@ aesni_xts_encrypt:
 	movaps	%xmm0,64(%rsp)
 	movaps	%xmm0,80(%rsp)
 	movaps	%xmm0,96(%rsp)
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+
+	leaq	(%r11),%rsp
+
 .Lxts_enc_epilogue:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_aesni_xts_encrypt:
 .globl	aesni_xts_decrypt
 .def	aesni_xts_decrypt;	.scl 2;	.type 32;	.endef
@@ -2236,22 +2272,24 @@ aesni_xts_decrypt:
 	movq	40(%rsp),%r8
 	movq	48(%rsp),%r9
 
-	leaq	(%rsp),%rax
+
+	leaq	(%rsp),%r11
+
 	pushq	%rbp
+
 	subq	$272,%rsp
 	andq	$-16,%rsp
-	movaps	%xmm6,-168(%rax)
-	movaps	%xmm7,-152(%rax)
-	movaps	%xmm8,-136(%rax)
-	movaps	%xmm9,-120(%rax)
-	movaps	%xmm10,-104(%rax)
-	movaps	%xmm11,-88(%rax)
-	movaps	%xmm12,-72(%rax)
-	movaps	%xmm13,-56(%rax)
-	movaps	%xmm14,-40(%rax)
-	movaps	%xmm15,-24(%rax)
+	movaps	%xmm6,-168(%r11)
+	movaps	%xmm7,-152(%r11)
+	movaps	%xmm8,-136(%r11)
+	movaps	%xmm9,-120(%r11)
+	movaps	%xmm10,-104(%r11)
+	movaps	%xmm11,-88(%r11)
+	movaps	%xmm12,-72(%r11)
+	movaps	%xmm13,-56(%r11)
+	movaps	%xmm14,-40(%r11)
+	movaps	%xmm15,-24(%r11)
 .Lxts_dec_body:
-	leaq	-8(%rax),%rbp
 	movups	(%r9),%xmm2
 	movl	240(%r8),%eax
 	movl	240(%rcx),%r10d
@@ -2273,7 +2311,7 @@ aesni_xts_decrypt:
 	subq	%rax,%rdx
 
 	movups	(%rcx),%xmm0
-	movq	%rcx,%r11
+	movq	%rcx,%rbp
 	movl	%r10d,%eax
 	shll	$4,%r10d
 	movq	%rdx,%r9
@@ -2329,9 +2367,9 @@ aesni_xts_decrypt:
 	jc	.Lxts_dec_short
 
 	movl	$16+96,%eax
-	leaq	32(%r11,%r10,1),%rcx
+	leaq	32(%rbp,%r10,1),%rcx
 	subq	%r10,%rax
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 	movq	%rax,%r10
 	leaq	.Lxts_magic(%rip),%r8
 	jmp	.Lxts_dec_grandloop
@@ -2356,7 +2394,7 @@ aesni_xts_decrypt:
 	movdqa	96(%rsp),%xmm9
 	pxor	%xmm14,%xmm6
 .byte	102,15,56,222,233
-	movups	32(%r11),%xmm0
+	movups	32(%rbp),%xmm0
 	leaq	96(%rdi),%rdi
 	pxor	%xmm8,%xmm7
 
@@ -2365,7 +2403,7 @@ aesni_xts_decrypt:
 	pxor	%xmm9,%xmm11
 	movdqa	%xmm10,0(%rsp)
 .byte	102,15,56,222,249
-	movups	48(%r11),%xmm1
+	movups	48(%rbp),%xmm1
 	pxor	%xmm9,%xmm12
 
 .byte	102,15,56,222,208
@@ -2380,7 +2418,7 @@ aesni_xts_decrypt:
 	movdqa	%xmm14,64(%rsp)
 .byte	102,15,56,222,240
 .byte	102,15,56,222,248
-	movups	64(%r11),%xmm0
+	movups	64(%rbp),%xmm0
 	movdqa	%xmm8,80(%rsp)
 	pshufd	$0x5f,%xmm15,%xmm9
 	jmp	.Lxts_dec_loop6
@@ -2412,7 +2450,7 @@ aesni_xts_decrypt:
 	psrad	$31,%xmm14
 .byte	102,15,56,222,217
 	pand	%xmm8,%xmm14
-	movups	(%r11),%xmm10
+	movups	(%rbp),%xmm10
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
 .byte	102,15,56,222,241
@@ -2480,10 +2518,10 @@ aesni_xts_decrypt:
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
 	pxor	%xmm0,%xmm15
-	movups	(%r11),%xmm0
+	movups	(%rbp),%xmm0
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 
 	pxor	%xmm15,%xmm14
 .byte	102,15,56,223,84,36,0
@@ -2510,7 +2548,7 @@ aesni_xts_decrypt:
 
 	movl	$16+96,%eax
 	subl	%r10d,%eax
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	shrl	$4,%eax
 
 .Lxts_dec_short:
@@ -2667,7 +2705,7 @@ aesni_xts_decrypt:
 	jz	.Lxts_dec_ret
 .Lxts_dec_done2:
 	movq	%r9,%rdx
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	(%rdi),%xmm2
@@ -2697,7 +2735,7 @@ aesni_xts_decrypt:
 	jnz	.Lxts_dec_steal
 
 	subq	%r9,%rsi
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	(%rsi),%xmm2
@@ -2723,26 +2761,26 @@ aesni_xts_decrypt:
 	pxor	%xmm3,%xmm3
 	pxor	%xmm4,%xmm4
 	pxor	%xmm5,%xmm5
-	movaps	-160(%rbp),%xmm6
-	movaps	%xmm0,-160(%rbp)
-	movaps	-144(%rbp),%xmm7
-	movaps	%xmm0,-144(%rbp)
-	movaps	-128(%rbp),%xmm8
-	movaps	%xmm0,-128(%rbp)
-	movaps	-112(%rbp),%xmm9
-	movaps	%xmm0,-112(%rbp)
-	movaps	-96(%rbp),%xmm10
-	movaps	%xmm0,-96(%rbp)
-	movaps	-80(%rbp),%xmm11
-	movaps	%xmm0,-80(%rbp)
-	movaps	-64(%rbp),%xmm12
-	movaps	%xmm0,-64(%rbp)
-	movaps	-48(%rbp),%xmm13
-	movaps	%xmm0,-48(%rbp)
-	movaps	-32(%rbp),%xmm14
-	movaps	%xmm0,-32(%rbp)
-	movaps	-16(%rbp),%xmm15
-	movaps	%xmm0,-16(%rbp)
+	movaps	-168(%r11),%xmm6
+	movaps	%xmm0,-168(%r11)
+	movaps	-152(%r11),%xmm7
+	movaps	%xmm0,-152(%r11)
+	movaps	-136(%r11),%xmm8
+	movaps	%xmm0,-136(%r11)
+	movaps	-120(%r11),%xmm9
+	movaps	%xmm0,-120(%r11)
+	movaps	-104(%r11),%xmm10
+	movaps	%xmm0,-104(%r11)
+	movaps	-88(%r11),%xmm11
+	movaps	%xmm0,-88(%r11)
+	movaps	-72(%r11),%xmm12
+	movaps	%xmm0,-72(%r11)
+	movaps	-56(%r11),%xmm13
+	movaps	%xmm0,-56(%r11)
+	movaps	-40(%r11),%xmm14
+	movaps	%xmm0,-40(%r11)
+	movaps	-24(%r11),%xmm15
+	movaps	%xmm0,-24(%r11)
 	movaps	%xmm0,0(%rsp)
 	movaps	%xmm0,16(%rsp)
 	movaps	%xmm0,32(%rsp)
@@ -2750,13 +2788,928 @@ aesni_xts_decrypt:
 	movaps	%xmm0,64(%rsp)
 	movaps	%xmm0,80(%rsp)
 	movaps	%xmm0,96(%rsp)
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+
+	leaq	(%r11),%rsp
+
 .Lxts_dec_epilogue:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_aesni_xts_decrypt:
+.globl	aesni_ocb_encrypt
+.def	aesni_ocb_encrypt;	.scl 2;	.type 32;	.endef
+.p2align	5
+aesni_ocb_encrypt:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_aesni_ocb_encrypt:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+	movq	%r9,%rcx
+	movq	40(%rsp),%r8
+	movq	48(%rsp),%r9
+
+
+	leaq	(%rsp),%rax
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	leaq	-160(%rsp),%rsp
+	movaps	%xmm6,0(%rsp)
+	movaps	%xmm7,16(%rsp)
+	movaps	%xmm8,32(%rsp)
+	movaps	%xmm9,48(%rsp)
+	movaps	%xmm10,64(%rsp)
+	movaps	%xmm11,80(%rsp)
+	movaps	%xmm12,96(%rsp)
+	movaps	%xmm13,112(%rsp)
+	movaps	%xmm14,128(%rsp)
+	movaps	%xmm15,144(%rsp)
+.Locb_enc_body:
+	movq	56(%rax),%rbx
+	movq	56+8(%rax),%rbp
+
+	movl	240(%rcx),%r10d
+	movq	%rcx,%r11
+	shll	$4,%r10d
+	movups	(%rcx),%xmm9
+	movups	16(%rcx,%r10,1),%xmm1
+
+	movdqu	(%r9),%xmm15
+	pxor	%xmm1,%xmm9
+	pxor	%xmm1,%xmm15
+
+	movl	$16+32,%eax
+	leaq	32(%r11,%r10,1),%rcx
+	movups	16(%r11),%xmm1
+	subq	%r10,%rax
+	movq	%rax,%r10
+
+	movdqu	(%rbx),%xmm10
+	movdqu	(%rbp),%xmm8
+
+	testq	$1,%r8
+	jnz	.Locb_enc_odd
+
+	bsfq	%r8,%r12
+	addq	$1,%r8
+	shlq	$4,%r12
+	movdqu	(%rbx,%r12,1),%xmm7
+	movdqu	(%rdi),%xmm2
+	leaq	16(%rdi),%rdi
+
+	call	__ocb_encrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,(%rsi)
+	leaq	16(%rsi),%rsi
+	subq	$1,%rdx
+	jz	.Locb_enc_done
+
+.Locb_enc_odd:
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	leaq	6(%r8),%r8
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+	shlq	$4,%r12
+	shlq	$4,%r13
+	shlq	$4,%r14
+
+	subq	$6,%rdx
+	jc	.Locb_enc_short
+	jmp	.Locb_enc_grandloop
+
+.p2align	5
+.Locb_enc_grandloop:
+	movdqu	0(%rdi),%xmm2
+	movdqu	16(%rdi),%xmm3
+	movdqu	32(%rdi),%xmm4
+	movdqu	48(%rdi),%xmm5
+	movdqu	64(%rdi),%xmm6
+	movdqu	80(%rdi),%xmm7
+	leaq	96(%rdi),%rdi
+
+	call	__ocb_encrypt6
+
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+	movups	%xmm6,64(%rsi)
+	movups	%xmm7,80(%rsi)
+	leaq	96(%rsi),%rsi
+	subq	$6,%rdx
+	jnc	.Locb_enc_grandloop
+
+.Locb_enc_short:
+	addq	$6,%rdx
+	jz	.Locb_enc_done
+
+	movdqu	0(%rdi),%xmm2
+	cmpq	$2,%rdx
+	jb	.Locb_enc_one
+	movdqu	16(%rdi),%xmm3
+	je	.Locb_enc_two
+
+	movdqu	32(%rdi),%xmm4
+	cmpq	$4,%rdx
+	jb	.Locb_enc_three
+	movdqu	48(%rdi),%xmm5
+	je	.Locb_enc_four
+
+	movdqu	64(%rdi),%xmm6
+	pxor	%xmm7,%xmm7
+
+	call	__ocb_encrypt6
+
+	movdqa	%xmm14,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+	movups	%xmm6,64(%rsi)
+
+	jmp	.Locb_enc_done
+
+.p2align	4
+.Locb_enc_one:
+	movdqa	%xmm10,%xmm7
+
+	call	__ocb_encrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,0(%rsi)
+	jmp	.Locb_enc_done
+
+.p2align	4
+.Locb_enc_two:
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_encrypt4
+
+	movdqa	%xmm11,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+
+	jmp	.Locb_enc_done
+
+.p2align	4
+.Locb_enc_three:
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_encrypt4
+
+	movdqa	%xmm12,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+
+	jmp	.Locb_enc_done
+
+.p2align	4
+.Locb_enc_four:
+	call	__ocb_encrypt4
+
+	movdqa	%xmm13,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+
+.Locb_enc_done:
+	pxor	%xmm0,%xmm15
+	movdqu	%xmm8,(%rbp)
+	movdqu	%xmm15,(%r9)
+
+	xorps	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	movaps	0(%rsp),%xmm6
+	movaps	%xmm0,0(%rsp)
+	movaps	16(%rsp),%xmm7
+	movaps	%xmm0,16(%rsp)
+	movaps	32(%rsp),%xmm8
+	movaps	%xmm0,32(%rsp)
+	movaps	48(%rsp),%xmm9
+	movaps	%xmm0,48(%rsp)
+	movaps	64(%rsp),%xmm10
+	movaps	%xmm0,64(%rsp)
+	movaps	80(%rsp),%xmm11
+	movaps	%xmm0,80(%rsp)
+	movaps	96(%rsp),%xmm12
+	movaps	%xmm0,96(%rsp)
+	movaps	112(%rsp),%xmm13
+	movaps	%xmm0,112(%rsp)
+	movaps	128(%rsp),%xmm14
+	movaps	%xmm0,128(%rsp)
+	movaps	144(%rsp),%xmm15
+	movaps	%xmm0,144(%rsp)
+	leaq	160+40(%rsp),%rax
+.Locb_enc_pop:
+	movq	-40(%rax),%r14
+
+	movq	-32(%rax),%r13
+
+	movq	-24(%rax),%r12
+
+	movq	-16(%rax),%rbp
+
+	movq	-8(%rax),%rbx
+
+	leaq	(%rax),%rsp
+
+.Locb_enc_epilogue:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_aesni_ocb_encrypt:
+
+.def	__ocb_encrypt6;	.scl 3;	.type 32;	.endef
+.p2align	5
+__ocb_encrypt6:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	movdqa	%xmm10,%xmm14
+	pxor	%xmm15,%xmm10
+	movdqu	(%rbx,%r14,1),%xmm15
+	pxor	%xmm10,%xmm11
+	pxor	%xmm2,%xmm8
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm3,%xmm8
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm4,%xmm8
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm14
+	pxor	%xmm5,%xmm8
+	pxor	%xmm13,%xmm5
+	pxor	%xmm14,%xmm15
+	pxor	%xmm6,%xmm8
+	pxor	%xmm14,%xmm6
+	pxor	%xmm7,%xmm8
+	pxor	%xmm15,%xmm7
+	movups	32(%r11),%xmm0
+
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	addq	$6,%r8
+	pxor	%xmm9,%xmm10
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+.byte	102,15,56,220,241
+	pxor	%xmm9,%xmm13
+	pxor	%xmm9,%xmm14
+.byte	102,15,56,220,249
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm15
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+.byte	102,15,56,220,240
+.byte	102,15,56,220,248
+	movups	64(%r11),%xmm0
+	shlq	$4,%r12
+	shlq	$4,%r13
+	jmp	.Locb_enc_loop6
+
+.p2align	5
+.Locb_enc_loop6:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+.byte	102,15,56,220,240
+.byte	102,15,56,220,248
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_enc_loop6
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movups	16(%r11),%xmm1
+	shlq	$4,%r14
+
+.byte	102,65,15,56,221,210
+	movdqu	(%rbx),%xmm10
+	movq	%r10,%rax
+.byte	102,65,15,56,221,219
+.byte	102,65,15,56,221,228
+.byte	102,65,15,56,221,237
+.byte	102,65,15,56,221,246
+.byte	102,65,15,56,221,255
+	.byte	0xf3,0xc3
+
+
+.def	__ocb_encrypt4;	.scl 3;	.type 32;	.endef
+.p2align	5
+__ocb_encrypt4:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	pxor	%xmm15,%xmm10
+	pxor	%xmm10,%xmm11
+	pxor	%xmm2,%xmm8
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm3,%xmm8
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm4,%xmm8
+	pxor	%xmm12,%xmm4
+	pxor	%xmm5,%xmm8
+	pxor	%xmm13,%xmm5
+	movups	32(%r11),%xmm0
+
+	pxor	%xmm9,%xmm10
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+	pxor	%xmm9,%xmm13
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	48(%r11),%xmm1
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+	movups	64(%r11),%xmm0
+	jmp	.Locb_enc_loop4
+
+.p2align	5
+.Locb_enc_loop4:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_enc_loop4
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,65,15,56,221,210
+.byte	102,65,15,56,221,219
+.byte	102,65,15,56,221,228
+.byte	102,65,15,56,221,237
+	.byte	0xf3,0xc3
+
+
+.def	__ocb_encrypt1;	.scl 3;	.type 32;	.endef
+.p2align	5
+__ocb_encrypt1:
+	pxor	%xmm15,%xmm7
+	pxor	%xmm9,%xmm7
+	pxor	%xmm2,%xmm8
+	pxor	%xmm7,%xmm2
+	movups	32(%r11),%xmm0
+
+.byte	102,15,56,220,209
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm7
+
+.byte	102,15,56,220,208
+	movups	64(%r11),%xmm0
+	jmp	.Locb_enc_loop1
+
+.p2align	5
+.Locb_enc_loop1:
+.byte	102,15,56,220,209
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_enc_loop1
+
+.byte	102,15,56,220,209
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,15,56,221,215
+	.byte	0xf3,0xc3
+
+
+.globl	aesni_ocb_decrypt
+.def	aesni_ocb_decrypt;	.scl 2;	.type 32;	.endef
+.p2align	5
+aesni_ocb_decrypt:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_aesni_ocb_decrypt:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+	movq	%r9,%rcx
+	movq	40(%rsp),%r8
+	movq	48(%rsp),%r9
+
+
+	leaq	(%rsp),%rax
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	leaq	-160(%rsp),%rsp
+	movaps	%xmm6,0(%rsp)
+	movaps	%xmm7,16(%rsp)
+	movaps	%xmm8,32(%rsp)
+	movaps	%xmm9,48(%rsp)
+	movaps	%xmm10,64(%rsp)
+	movaps	%xmm11,80(%rsp)
+	movaps	%xmm12,96(%rsp)
+	movaps	%xmm13,112(%rsp)
+	movaps	%xmm14,128(%rsp)
+	movaps	%xmm15,144(%rsp)
+.Locb_dec_body:
+	movq	56(%rax),%rbx
+	movq	56+8(%rax),%rbp
+
+	movl	240(%rcx),%r10d
+	movq	%rcx,%r11
+	shll	$4,%r10d
+	movups	(%rcx),%xmm9
+	movups	16(%rcx,%r10,1),%xmm1
+
+	movdqu	(%r9),%xmm15
+	pxor	%xmm1,%xmm9
+	pxor	%xmm1,%xmm15
+
+	movl	$16+32,%eax
+	leaq	32(%r11,%r10,1),%rcx
+	movups	16(%r11),%xmm1
+	subq	%r10,%rax
+	movq	%rax,%r10
+
+	movdqu	(%rbx),%xmm10
+	movdqu	(%rbp),%xmm8
+
+	testq	$1,%r8
+	jnz	.Locb_dec_odd
+
+	bsfq	%r8,%r12
+	addq	$1,%r8
+	shlq	$4,%r12
+	movdqu	(%rbx,%r12,1),%xmm7
+	movdqu	(%rdi),%xmm2
+	leaq	16(%rdi),%rdi
+
+	call	__ocb_decrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,(%rsi)
+	xorps	%xmm2,%xmm8
+	leaq	16(%rsi),%rsi
+	subq	$1,%rdx
+	jz	.Locb_dec_done
+
+.Locb_dec_odd:
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	leaq	6(%r8),%r8
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+	shlq	$4,%r12
+	shlq	$4,%r13
+	shlq	$4,%r14
+
+	subq	$6,%rdx
+	jc	.Locb_dec_short
+	jmp	.Locb_dec_grandloop
+
+.p2align	5
+.Locb_dec_grandloop:
+	movdqu	0(%rdi),%xmm2
+	movdqu	16(%rdi),%xmm3
+	movdqu	32(%rdi),%xmm4
+	movdqu	48(%rdi),%xmm5
+	movdqu	64(%rdi),%xmm6
+	movdqu	80(%rdi),%xmm7
+	leaq	96(%rdi),%rdi
+
+	call	__ocb_decrypt6
+
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+	movups	%xmm6,64(%rsi)
+	pxor	%xmm6,%xmm8
+	movups	%xmm7,80(%rsi)
+	pxor	%xmm7,%xmm8
+	leaq	96(%rsi),%rsi
+	subq	$6,%rdx
+	jnc	.Locb_dec_grandloop
+
+.Locb_dec_short:
+	addq	$6,%rdx
+	jz	.Locb_dec_done
+
+	movdqu	0(%rdi),%xmm2
+	cmpq	$2,%rdx
+	jb	.Locb_dec_one
+	movdqu	16(%rdi),%xmm3
+	je	.Locb_dec_two
+
+	movdqu	32(%rdi),%xmm4
+	cmpq	$4,%rdx
+	jb	.Locb_dec_three
+	movdqu	48(%rdi),%xmm5
+	je	.Locb_dec_four
+
+	movdqu	64(%rdi),%xmm6
+	pxor	%xmm7,%xmm7
+
+	call	__ocb_decrypt6
+
+	movdqa	%xmm14,%xmm15
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+	movups	%xmm6,64(%rsi)
+	pxor	%xmm6,%xmm8
+
+	jmp	.Locb_dec_done
+
+.p2align	4
+.Locb_dec_one:
+	movdqa	%xmm10,%xmm7
+
+	call	__ocb_decrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	jmp	.Locb_dec_done
+
+.p2align	4
+.Locb_dec_two:
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_decrypt4
+
+	movdqa	%xmm11,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	xorps	%xmm3,%xmm8
+
+	jmp	.Locb_dec_done
+
+.p2align	4
+.Locb_dec_three:
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_decrypt4
+
+	movdqa	%xmm12,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	xorps	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	xorps	%xmm4,%xmm8
+
+	jmp	.Locb_dec_done
+
+.p2align	4
+.Locb_dec_four:
+	call	__ocb_decrypt4
+
+	movdqa	%xmm13,%xmm15
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+
+.Locb_dec_done:
+	pxor	%xmm0,%xmm15
+	movdqu	%xmm8,(%rbp)
+	movdqu	%xmm15,(%r9)
+
+	xorps	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	movaps	0(%rsp),%xmm6
+	movaps	%xmm0,0(%rsp)
+	movaps	16(%rsp),%xmm7
+	movaps	%xmm0,16(%rsp)
+	movaps	32(%rsp),%xmm8
+	movaps	%xmm0,32(%rsp)
+	movaps	48(%rsp),%xmm9
+	movaps	%xmm0,48(%rsp)
+	movaps	64(%rsp),%xmm10
+	movaps	%xmm0,64(%rsp)
+	movaps	80(%rsp),%xmm11
+	movaps	%xmm0,80(%rsp)
+	movaps	96(%rsp),%xmm12
+	movaps	%xmm0,96(%rsp)
+	movaps	112(%rsp),%xmm13
+	movaps	%xmm0,112(%rsp)
+	movaps	128(%rsp),%xmm14
+	movaps	%xmm0,128(%rsp)
+	movaps	144(%rsp),%xmm15
+	movaps	%xmm0,144(%rsp)
+	leaq	160+40(%rsp),%rax
+.Locb_dec_pop:
+	movq	-40(%rax),%r14
+
+	movq	-32(%rax),%r13
+
+	movq	-24(%rax),%r12
+
+	movq	-16(%rax),%rbp
+
+	movq	-8(%rax),%rbx
+
+	leaq	(%rax),%rsp
+
+.Locb_dec_epilogue:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_aesni_ocb_decrypt:
+
+.def	__ocb_decrypt6;	.scl 3;	.type 32;	.endef
+.p2align	5
+__ocb_decrypt6:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	movdqa	%xmm10,%xmm14
+	pxor	%xmm15,%xmm10
+	movdqu	(%rbx,%r14,1),%xmm15
+	pxor	%xmm10,%xmm11
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm14
+	pxor	%xmm13,%xmm5
+	pxor	%xmm14,%xmm15
+	pxor	%xmm14,%xmm6
+	pxor	%xmm15,%xmm7
+	movups	32(%r11),%xmm0
+
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	addq	$6,%r8
+	pxor	%xmm9,%xmm10
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+.byte	102,15,56,222,241
+	pxor	%xmm9,%xmm13
+	pxor	%xmm9,%xmm14
+.byte	102,15,56,222,249
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm15
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+.byte	102,15,56,222,240
+.byte	102,15,56,222,248
+	movups	64(%r11),%xmm0
+	shlq	$4,%r12
+	shlq	$4,%r13
+	jmp	.Locb_dec_loop6
+
+.p2align	5
+.Locb_dec_loop6:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+.byte	102,15,56,222,240
+.byte	102,15,56,222,248
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_dec_loop6
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movups	16(%r11),%xmm1
+	shlq	$4,%r14
+
+.byte	102,65,15,56,223,210
+	movdqu	(%rbx),%xmm10
+	movq	%r10,%rax
+.byte	102,65,15,56,223,219
+.byte	102,65,15,56,223,228
+.byte	102,65,15,56,223,237
+.byte	102,65,15,56,223,246
+.byte	102,65,15,56,223,255
+	.byte	0xf3,0xc3
+
+
+.def	__ocb_decrypt4;	.scl 3;	.type 32;	.endef
+.p2align	5
+__ocb_decrypt4:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	pxor	%xmm15,%xmm10
+	pxor	%xmm10,%xmm11
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm5
+	movups	32(%r11),%xmm0
+
+	pxor	%xmm9,%xmm10
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+	pxor	%xmm9,%xmm13
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	48(%r11),%xmm1
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+	movups	64(%r11),%xmm0
+	jmp	.Locb_dec_loop4
+
+.p2align	5
+.Locb_dec_loop4:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_dec_loop4
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,65,15,56,223,210
+.byte	102,65,15,56,223,219
+.byte	102,65,15,56,223,228
+.byte	102,65,15,56,223,237
+	.byte	0xf3,0xc3
+
+
+.def	__ocb_decrypt1;	.scl 3;	.type 32;	.endef
+.p2align	5
+__ocb_decrypt1:
+	pxor	%xmm15,%xmm7
+	pxor	%xmm9,%xmm7
+	pxor	%xmm7,%xmm2
+	movups	32(%r11),%xmm0
+
+.byte	102,15,56,222,209
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm7
+
+.byte	102,15,56,222,208
+	movups	64(%r11),%xmm0
+	jmp	.Locb_dec_loop1
+
+.p2align	5
+.Locb_dec_loop1:
+.byte	102,15,56,222,209
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_dec_loop1
+
+.byte	102,15,56,222,209
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,15,56,223,215
+	.byte	0xf3,0xc3
+
 .globl	aesni_cbc_encrypt
 .def	aesni_cbc_encrypt;	.scl 2;	.type 32;	.endef
 .p2align	4
@@ -2772,6 +3725,7 @@ aesni_cbc_encrypt:
 	movq	40(%rsp),%r8
 	movq	48(%rsp),%r9
 
+
 	testq	%rdx,%rdx
 	jz	.Lcbc_ret
 
@@ -2864,8 +3818,10 @@ aesni_cbc_encrypt:
 	jmp	.Lcbc_ret
 .p2align	4
 .Lcbc_decrypt_bulk:
-	leaq	(%rsp),%rax
+	leaq	(%rsp),%r11
+
 	pushq	%rbp
+
 	subq	$176,%rsp
 	andq	$-16,%rsp
 	movaps	%xmm6,16(%rsp)
@@ -2879,7 +3835,7 @@ aesni_cbc_encrypt:
 	movaps	%xmm14,144(%rsp)
 	movaps	%xmm15,160(%rsp)
 .Lcbc_decrypt_body:
-	leaq	-8(%rax),%rbp
+	movq	%rcx,%rbp
 	movups	(%r8),%xmm10
 	movl	%r10d,%eax
 	cmpq	$0x50,%rdx
@@ -2919,7 +3875,7 @@ aesni_cbc_encrypt:
 	pxor	%xmm0,%xmm3
 	movups	16-112(%rcx),%xmm1
 	pxor	%xmm0,%xmm4
-	xorq	%r11,%r11
+	movq	$-1,%rbp
 	cmpq	$0x70,%rdx
 	pxor	%xmm0,%xmm5
 	pxor	%xmm0,%xmm6
@@ -2935,10 +3891,10 @@ aesni_cbc_encrypt:
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
 .byte	102,68,15,56,222,193
-	setnc	%r11b
-	shlq	$7,%r11
+	adcq	$0,%rbp
+	andq	$128,%rbp
 .byte	102,68,15,56,222,201
-	addq	%rdi,%r11
+	addq	%rdi,%rbp
 	movups	48-112(%rcx),%xmm1
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
@@ -3076,18 +4032,18 @@ aesni_cbc_encrypt:
 	movdqu	112(%rdi),%xmm0
 .byte	102,65,15,56,223,228
 	leaq	128(%rdi),%rdi
-	movdqu	0(%r11),%xmm11
+	movdqu	0(%rbp),%xmm11
 .byte	102,65,15,56,223,237
 .byte	102,65,15,56,223,246
-	movdqu	16(%r11),%xmm12
-	movdqu	32(%r11),%xmm13
+	movdqu	16(%rbp),%xmm12
+	movdqu	32(%rbp),%xmm13
 .byte	102,65,15,56,223,255
 .byte	102,68,15,56,223,193
-	movdqu	48(%r11),%xmm14
-	movdqu	64(%r11),%xmm15
+	movdqu	48(%rbp),%xmm14
+	movdqu	64(%rbp),%xmm15
 .byte	102,69,15,56,223,202
 	movdqa	%xmm0,%xmm10
-	movdqu	80(%r11),%xmm1
+	movdqu	80(%rbp),%xmm1
 	movups	-112(%rcx),%xmm0
 
 	movups	%xmm2,(%rsi)
@@ -3206,7 +4162,7 @@ aesni_cbc_encrypt:
 	pxor	%xmm13,%xmm5
 	movdqu	%xmm4,32(%rsi)
 	pxor	%xmm14,%xmm6
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movdqu	%xmm5,48(%rsi)
 	pxor	%xmm15,%xmm7
 	movl	%r10d,%eax
@@ -3375,18 +4331,23 @@ aesni_cbc_encrypt:
 	movaps	%xmm0,144(%rsp)
 	movaps	160(%rsp),%xmm15
 	movaps	%xmm0,160(%rsp)
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+
+	leaq	(%r11),%rsp
+
 .Lcbc_ret:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_aesni_cbc_encrypt:
 .globl	aesni_set_decrypt_key
 .def	aesni_set_decrypt_key;	.scl 2;	.type 32;	.endef
 .p2align	4
 aesni_set_decrypt_key:
+
 .byte	0x48,0x83,0xEC,0x08
+
 	call	__aesni_set_encrypt_key
 	shll	$4,%edx
 	testl	%eax,%eax
@@ -3419,7 +4380,9 @@ aesni_set_decrypt_key:
 	pxor	%xmm0,%xmm0
 .Ldec_key_ret:
 	addq	$8,%rsp
+
 	.byte	0xf3,0xc3
+
 .LSEH_end_set_decrypt_key:
 
 .globl	aesni_set_encrypt_key
@@ -3427,7 +4390,9 @@ aesni_set_decrypt_key:
 .p2align	4
 aesni_set_encrypt_key:
 __aesni_set_encrypt_key:
+
 .byte	0x48,0x83,0xEC,0x08
+
 	movq	$-1,%rax
 	testq	%rcx,%rcx
 	jz	.Lenc_key_ret
@@ -3720,7 +4685,9 @@ __aesni_set_encrypt_key:
 	pxor	%xmm4,%xmm4
 	pxor	%xmm5,%xmm5
 	addq	$8,%rsp
+
 	.byte	0xf3,0xc3
+
 .LSEH_end_set_encrypt_key:
 
 .p2align	4
@@ -3889,13 +4856,75 @@ ctr_xts_se_handler:
 	cmpq	%r10,%rbx
 	jae	.Lcommon_seh_tail
 
-	movq	160(%r8),%rax
-	leaq	-160(%rax),%rsi
+	movq	208(%r8),%rax
+
+	leaq	-168(%rax),%rsi
 	leaq	512(%r8),%rdi
 	movl	$20,%ecx
 .long	0xa548f3fc
 
-	jmp	.Lcommon_rbp_tail
+	movq	-8(%rax),%rbp
+	movq	%rbp,160(%r8)
+	jmp	.Lcommon_seh_tail
+
+
+.def	ocb_se_handler;	.scl 3;	.type 32;	.endef
+.p2align	4
+ocb_se_handler:
+	pushq	%rsi
+	pushq	%rdi
+	pushq	%rbx
+	pushq	%rbp
+	pushq	%r12
+	pushq	%r13
+	pushq	%r14
+	pushq	%r15
+	pushfq
+	subq	$64,%rsp
+
+	movq	120(%r8),%rax
+	movq	248(%r8),%rbx
+
+	movq	8(%r9),%rsi
+	movq	56(%r9),%r11
+
+	movl	0(%r11),%r10d
+	leaq	(%rsi,%r10,1),%r10
+	cmpq	%r10,%rbx
+	jb	.Lcommon_seh_tail
+
+	movl	4(%r11),%r10d
+	leaq	(%rsi,%r10,1),%r10
+	cmpq	%r10,%rbx
+	jae	.Lcommon_seh_tail
+
+	movl	8(%r11),%r10d
+	leaq	(%rsi,%r10,1),%r10
+	cmpq	%r10,%rbx
+	jae	.Locb_no_xmm
+
+	movq	152(%r8),%rax
+
+	leaq	(%rax),%rsi
+	leaq	512(%r8),%rdi
+	movl	$20,%ecx
+.long	0xa548f3fc
+	leaq	160+40(%rax),%rax
+
+.Locb_no_xmm:
+	movq	-8(%rax),%rbx
+	movq	-16(%rax),%rbp
+	movq	-24(%rax),%r12
+	movq	-32(%rax),%r13
+	movq	-40(%rax),%r14
+
+	movq	%rbx,144(%r8)
+	movq	%rbp,160(%r8)
+	movq	%r12,216(%r8)
+	movq	%r13,224(%r8)
+	movq	%r14,232(%r8)
+
+	jmp	.Lcommon_seh_tail
 
 .def	cbc_se_handler;	.scl 3;	.type 32;	.endef
 .p2align	4
@@ -3918,9 +4947,13 @@ cbc_se_handler:
 	cmpq	%r10,%rbx
 	jb	.Lcommon_seh_tail
 
+	movq	120(%r8),%rax
+
 	leaq	.Lcbc_decrypt_body(%rip),%r10
 	cmpq	%r10,%rbx
-	jb	.Lrestore_cbc_rax
+	jb	.Lcommon_seh_tail
+
+	movq	152(%r8),%rax
 
 	leaq	.Lcbc_ret(%rip),%r10
 	cmpq	%r10,%rbx
@@ -3931,15 +4964,10 @@ cbc_se_handler:
 	movl	$20,%ecx
 .long	0xa548f3fc
 
-.Lcommon_rbp_tail:
-	movq	160(%r8),%rax
-	movq	(%rax),%rbp
-	leaq	8(%rax),%rax
-	movq	%rbp,160(%r8)
-	jmp	.Lcommon_seh_tail
+	movq	208(%r8),%rax
 
-.Lrestore_cbc_rax:
-	movq	120(%r8),%rax
+	movq	-8(%rax),%rbp
+	movq	%rbp,160(%r8)
 
 .Lcommon_seh_tail:
 	movq	8(%rax),%rdi
@@ -4006,6 +5034,14 @@ cbc_se_handler:
 .rva	.LSEH_begin_aesni_xts_decrypt
 .rva	.LSEH_end_aesni_xts_decrypt
 .rva	.LSEH_info_xts_dec
+
+.rva	.LSEH_begin_aesni_ocb_encrypt
+.rva	.LSEH_end_aesni_ocb_encrypt
+.rva	.LSEH_info_ocb_enc
+
+.rva	.LSEH_begin_aesni_ocb_decrypt
+.rva	.LSEH_end_aesni_ocb_decrypt
+.rva	.LSEH_info_ocb_dec
 .rva	.LSEH_begin_aesni_cbc_encrypt
 .rva	.LSEH_end_aesni_cbc_encrypt
 .rva	.LSEH_info_cbc
@@ -4043,6 +5079,18 @@ cbc_se_handler:
 .byte	9,0,0,0
 .rva	ctr_xts_se_handler
 .rva	.Lxts_dec_body,.Lxts_dec_epilogue
+.LSEH_info_ocb_enc:
+.byte	9,0,0,0
+.rva	ocb_se_handler
+.rva	.Locb_enc_body,.Locb_enc_epilogue
+.rva	.Locb_enc_pop
+.long	0
+.LSEH_info_ocb_dec:
+.byte	9,0,0,0
+.rva	ocb_se_handler
+.rva	.Locb_dec_body,.Locb_dec_epilogue
+.rva	.Locb_dec_pop
+.long	0
 .LSEH_info_cbc:
 .byte	9,0,0,0
 .rva	cbc_se_handler
diff --git a/lib/accelerated/x86/coff/cpuid-x86.s b/lib/accelerated/x86/coff/cpuid-x86.s
deleted file mode 100644
index 4baa8b0b45..0000000000
--- a/lib/accelerated/x86/coff/cpuid-x86.s
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-# Copyright (C) 2013 Nikos Mavrogiannopoulos
-#
-# Author: Nikos Mavrogiannopoulos
-#
-# This file is part of GnuTLS.
-#
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-# *** This file is auto-generated ***
-#
-.file	"devel/perlasm/cpuid-x86.s"
-.text
-.globl	_gnutls_cpuid
-.def	_gnutls_cpuid;	.scl	2;	.type	32;	.endef
-.align	16
-_gnutls_cpuid:
-.L_gnutls_cpuid_begin:
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$12,%esp
-	movl	%ebx,(%esp)
-	movl	8(%ebp),%eax
-	movl	%esi,4(%esp)
-	movl	%edi,8(%esp)
-	pushl	%ebx
-	.byte	0x0f,0xa2
-	movl	%ebx,%edi
-	popl	%ebx
-	movl	%edx,%esi
-	movl	12(%ebp),%edx
-	movl	%eax,(%edx)
-	movl	16(%ebp),%eax
-	movl	%edi,(%eax)
-	movl	20(%ebp),%eax
-	movl	%ecx,(%eax)
-	movl	24(%ebp),%eax
-	movl	%esi,(%eax)
-	movl	(%esp),%ebx
-	movl	4(%esp),%esi
-	movl	8(%esp),%edi
-	movl	%ebp,%esp
-	popl	%ebp
-	ret
-.globl	_gnutls_have_cpuid
-.def	_gnutls_have_cpuid;	.scl	2;	.type	32;	.endef
-.align	16
-_gnutls_have_cpuid:
-.L_gnutls_have_cpuid_begin:
-	pushfl
-	popl	%eax
-	orl	$2097152,%eax
-	pushl	%eax
-	popfl
-	pushfl
-	popl	%eax
-	andl	$2097152,%eax
-	ret
-.byte	67,80,85,73,68,32,102,111,114,32,120,56,54,0
-
diff --git a/lib/accelerated/x86/coff/cpuid-x86_64.s b/lib/accelerated/x86/coff/cpuid-x86_64.s
deleted file mode 100644
index cd28c7b156..0000000000
--- a/lib/accelerated/x86/coff/cpuid-x86_64.s
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-# Copyright (C) 2013 Nikos Mavrogiannopoulos
-#
-# Author: Nikos Mavrogiannopoulos
-#
-# This file is part of GnuTLS.
-#
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-# *** This file is auto-generated ***
-#
-.text	
-.globl	gnutls_cpuid
-.def	gnutls_cpuid;	.scl 2;	.type 32;	.endef
-.p2align	4
-gnutls_cpuid:
-	movq	%rdi,8(%rsp)
-	movq	%rsi,16(%rsp)
-	movq	%rsp,%rax
-.LSEH_begin_gnutls_cpuid:
-	movq	%rcx,%rdi
-	movq	%rdx,%rsi
-	movq	%r8,%rdx
-	movq	%r9,%rcx
-	movq	40(%rsp),%r8
-	movq	48(%rsp),%r9
-
-	pushq	%rbp
-	movq	%rsp,%rbp
-	pushq	%rbx
-	movl	%edi,-12(%rbp)
-	movq	%rsi,-24(%rbp)
-	movq	%rdx,-32(%rbp)
-	movq	%rcx,-40(%rbp)
-	movq	%r8,-48(%rbp)
-	movl	-12(%rbp),%eax
-	movl	%eax,-60(%rbp)
-	movl	-60(%rbp),%eax
-	cpuid
-	movl	%edx,-56(%rbp)
-	movl	%ecx,%esi
-	movl	%eax,-52(%rbp)
-	movq	-24(%rbp),%rax
-	movl	-52(%rbp),%edx
-	movl	%edx,(%rax)
-	movq	-32(%rbp),%rax
-	movl	%ebx,(%rax)
-	movq	-40(%rbp),%rax
-	movl	%esi,(%rax)
-	movq	-48(%rbp),%rax
-	movl	-56(%rbp),%ecx
-	movl	%ecx,(%rax)
-	popq	%rbx
-	leave
-	movq	8(%rsp),%rdi
-	movq	16(%rsp),%rsi
-	.byte	0xf3,0xc3
-.LSEH_end_gnutls_cpuid:
-
diff --git a/lib/accelerated/x86/coff/ghash-x86_64.s b/lib/accelerated/x86/coff/ghash-x86_64.s
index f4bcee28f0..de207e4002 100644
--- a/lib/accelerated/x86/coff/ghash-x86_64.s
+++ b/lib/accelerated/x86/coff/ghash-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,9 +51,21 @@ gcm_gmult_4bit:
 	movq	%rcx,%rdi
 	movq	%rdx,%rsi
 
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	subq	$280,%rsp
+
 .Lgmult_prologue:
 
 	movzbq	15(%rdi),%r8
@@ -130,12 +142,17 @@ gcm_gmult_4bit:
 	movq	%r8,8(%rdi)
 	movq	%r9,(%rdi)
 
-	movq	16(%rsp),%rbx
-	leaq	24(%rsp),%rsp
+	leaq	280+48(%rsp),%rsi
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
 .Lgmult_epilogue:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_gcm_gmult_4bit:
 .globl	gcm_ghash_4bit
 .def	gcm_ghash_4bit;	.scl 2;	.type 32;	.endef
@@ -150,13 +167,21 @@ gcm_ghash_4bit:
 	movq	%r8,%rdx
 	movq	%r9,%rcx
 
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
+
 	subq	$280,%rsp
+
 .Lghash_prologue:
 	movq	%rdx,%r14
 	movq	%rcx,%r15
@@ -701,23 +726,33 @@ gcm_ghash_4bit:
 	movq	%r8,8(%rdi)
 	movq	%r9,(%rdi)
 
-	leaq	280(%rsp),%rsi
-	movq	0(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
+	leaq	280+48(%rsp),%rsi
+
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	0(%rsi),%rsp
+
 .Lghash_epilogue:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_gcm_ghash_4bit:
 .globl	gcm_init_clmul
 .def	gcm_init_clmul;	.scl 2;	.type 32;	.endef
 .p2align	4
 gcm_init_clmul:
+
 .L_init_clmul:
 .LSEH_begin_gcm_init_clmul:
 
@@ -877,10 +912,12 @@ gcm_init_clmul:
 .LSEH_end_gcm_init_clmul:
 	.byte	0xf3,0xc3
 
+
 .globl	gcm_gmult_clmul
 .def	gcm_gmult_clmul;	.scl 2;	.type 32;	.endef
 .p2align	4
 gcm_gmult_clmul:
+
 .L_gmult_clmul:
 	movdqu	(%rcx),%xmm0
 	movdqa	.Lbswap_mask(%rip),%xmm5
@@ -928,10 +965,12 @@ gcm_gmult_clmul:
 	movdqu	%xmm0,(%rcx)
 	.byte	0xf3,0xc3
 
+
 .globl	gcm_ghash_clmul
 .def	gcm_ghash_clmul;	.scl 2;	.type 32;	.endef
 .p2align	5
 gcm_ghash_clmul:
+
 .L_ghash_clmul:
 	leaq	-136(%rsp),%rax
 .LSEH_begin_gcm_ghash_clmul:
@@ -1337,10 +1376,12 @@ gcm_ghash_clmul:
 .LSEH_end_gcm_ghash_clmul:
 	.byte	0xf3,0xc3
 
+
 .globl	gcm_init_avx
 .def	gcm_init_avx;	.scl 2;	.type 32;	.endef
 .p2align	5
 gcm_init_avx:
+
 .LSEH_begin_gcm_init_avx:
 
 .byte	0x48,0x83,0xec,0x18
@@ -1451,16 +1492,20 @@ gcm_init_avx:
 .LSEH_end_gcm_init_avx:
 	.byte	0xf3,0xc3
 
+
 .globl	gcm_gmult_avx
 .def	gcm_gmult_avx;	.scl 2;	.type 32;	.endef
 .p2align	5
 gcm_gmult_avx:
+
 	jmp	.L_gmult_clmul
 
+
 .globl	gcm_ghash_avx
 .def	gcm_ghash_avx;	.scl 2;	.type 32;	.endef
 .p2align	5
 gcm_ghash_avx:
+
 	leaq	-136(%rsp),%rax
 .LSEH_begin_gcm_ghash_avx:
 
@@ -1859,6 +1904,7 @@ gcm_ghash_avx:
 .LSEH_end_gcm_ghash_avx:
 	.byte	0xf3,0xc3
 
+
 .p2align	6
 .Lbswap_mask:
 .byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
@@ -1945,14 +1991,20 @@ se_handler:
 	cmpq	%r10,%rbx
 	jae	.Lin_prologue
 
-	leaq	24(%rax),%rax
+	leaq	48+280(%rax),%rax
 
 	movq	-8(%rax),%rbx
 	movq	-16(%rax),%rbp
 	movq	-24(%rax),%r12
+	movq	-32(%rax),%r13
+	movq	-40(%rax),%r14
+	movq	-48(%rax),%r15
 	movq	%rbx,144(%r8)
 	movq	%rbp,160(%r8)
 	movq	%r12,216(%r8)
+	movq	%r13,224(%r8)
+	movq	%r14,232(%r8)
+	movq	%r15,240(%r8)
 
 .Lin_prologue:
 	movq	8(%rax),%rdi
diff --git a/lib/accelerated/x86/coff/sha1-ssse3-x86.s b/lib/accelerated/x86/coff/sha1-ssse3-x86.s
index 22c17e7353..30f9ded212 100644
--- a/lib/accelerated/x86/coff/sha1-ssse3-x86.s
+++ b/lib/accelerated/x86/coff/sha1-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha1-586.s"
 .text
 .globl	_sha1_block_data_order
 .def	_sha1_block_data_order;	.scl	2;	.type	32;	.endef
diff --git a/lib/accelerated/x86/coff/sha1-ssse3-x86_64.s b/lib/accelerated/x86/coff/sha1-ssse3-x86_64.s
index 13203c2b90..cdfc88254e 100644
--- a/lib/accelerated/x86/coff/sha1-ssse3-x86_64.s
+++ b/lib/accelerated/x86/coff/sha1-ssse3-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -52,25 +52,45 @@ sha1_block_data_order:
 	movq	%rdx,%rsi
 	movq	%r8,%rdx
 
+
 	movl	_gnutls_x86_cpuid_s+0(%rip),%r9d
 	movl	_gnutls_x86_cpuid_s+4(%rip),%r8d
+	movl	_gnutls_x86_cpuid_s+8(%rip),%r10d
 	testl	$512,%r8d
 	jz	.Lialu
+	testl	$536870912,%r10d
+	jnz	_shaext_shortcut
+	andl	$296,%r10d
+	cmpl	$296,%r10d
+	je	_avx2_shortcut
+	andl	$268435456,%r8d
+	andl	$1073741824,%r9d
+	orl	%r9d,%r8d
+	cmpl	$1342177280,%r8d
+	je	_avx_shortcut
 	jmp	_ssse3_shortcut
 
 .p2align	4
 .Lialu:
+	movq	%rsp,%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
-	movq	%rsp,%r11
+
+	pushq	%r14
+
 	movq	%rdi,%r8
 	subq	$72,%rsp
 	movq	%rsi,%r9
 	andq	$-64,%rsp
 	movq	%rdx,%r10
-	movq	%r11,64(%rsp)
+	movq	%rax,64(%rsp)
+
 .Lprologue:
 
 	movl	0(%r8),%esi
@@ -84,1230 +104,1168 @@ sha1_block_data_order:
 .Lloop:
 	movl	0(%r9),%edx
 	bswapl	%edx
-	movl	%edx,0(%rsp)
-	movl	%r11d,%eax
 	movl	4(%r9),%ebp
+	movl	%r12d,%eax
+	movl	%edx,0(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
 	bswapl	%ebp
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%ebp,4(%rsp)
+	leal	1518500249(%rdx,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
-	movl	8(%r9),%edx
+	movl	8(%r9),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,4(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%edx,8(%rsp)
+	leal	1518500249(%rbp,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
-	movl	12(%r9),%ebp
+	movl	12(%r9),%edx
+	movl	%edi,%eax
+	movl	%r14d,8(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%ebp,12(%rsp)
+	leal	1518500249(%r14,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	16(%r9),%edx
+	movl	16(%r9),%ebp
+	movl	%esi,%eax
+	movl	%edx,12(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%edx
+	bswapl	%ebp
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%edx,16(%rsp)
+	leal	1518500249(%rdx,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	20(%r9),%ebp
+	movl	20(%r9),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,16(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%ebp
+	bswapl	%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%ebp,20(%rsp)
+	leal	1518500249(%rbp,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	%r11d,%eax
 	movl	24(%r9),%edx
+	movl	%r12d,%eax
+	movl	%r14d,20(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
 	bswapl	%edx
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%edx,24(%rsp)
+	leal	1518500249(%r14,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
 	movl	28(%r9),%ebp
+	movl	%r11d,%eax
+	movl	%edx,24(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
 	bswapl	%ebp
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%ebp,28(%rsp)
+	leal	1518500249(%rdx,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
-	movl	32(%r9),%edx
+	movl	32(%r9),%r14d
+	movl	%edi,%eax
+	movl	%ebp,28(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%edx,32(%rsp)
+	leal	1518500249(%rbp,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	36(%r9),%ebp
+	movl	36(%r9),%edx
+	movl	%esi,%eax
+	movl	%r14d,32(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%ebp,36(%rsp)
+	leal	1518500249(%r14,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	40(%r9),%edx
+	movl	40(%r9),%ebp
+	movl	%r13d,%eax
+	movl	%edx,36(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%edx
+	bswapl	%ebp
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%edx,40(%rsp)
+	leal	1518500249(%rdx,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	%r11d,%eax
-	movl	44(%r9),%ebp
+	movl	44(%r9),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,40(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
-	bswapl	%ebp
+	bswapl	%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%ebp,44(%rsp)
+	leal	1518500249(%rbp,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
 	movl	48(%r9),%edx
+	movl	%r11d,%eax
+	movl	%r14d,44(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
 	bswapl	%edx
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%edx,48(%rsp)
+	leal	1518500249(%r14,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
 	movl	52(%r9),%ebp
+	movl	%edi,%eax
+	movl	%edx,48(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
 	bswapl	%ebp
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%ebp,52(%rsp)
+	leal	1518500249(%rdx,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	56(%r9),%edx
+	movl	56(%r9),%r14d
+	movl	%esi,%eax
+	movl	%ebp,52(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%edx,56(%rsp)
+	leal	1518500249(%rbp,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	60(%r9),%ebp
+	movl	60(%r9),%edx
+	movl	%r13d,%eax
+	movl	%r14d,56(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%ebp,60(%rsp)
+	leal	1518500249(%r14,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	0(%rsp),%edx
-	movl	%r11d,%eax
+	xorl	0(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,60(%rsp)
 	movl	%esi,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	8(%rsp),%ebp
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	xorl	32(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	andl	%edi,%eax
-	leal	1518500249(%rbp,%r13,1),%r13d
-	xorl	52(%rsp),%edx
+	leal	1518500249(%rdx,%r13,1),%r13d
+	roll	$30,%edi
 	xorl	%r12d,%eax
-	roll	$1,%edx
 	addl	%ecx,%r13d
-	roll	$30,%edi
-	movl	%edx,0(%rsp)
+	roll	$1,%ebp
 	addl	%eax,%r13d
-	movl	4(%rsp),%ebp
-	movl	%edi,%eax
+	xorl	4(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,0(%rsp)
 	movl	%r13d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r11d,%eax
+	xorl	12(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	xorl	36(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	andl	%esi,%eax
-	leal	1518500249(%rdx,%r12,1),%r12d
-	xorl	56(%rsp),%ebp
+	leal	1518500249(%rbp,%r12,1),%r12d
+	roll	$30,%esi
 	xorl	%r11d,%eax
-	roll	$1,%ebp
 	addl	%ecx,%r12d
-	roll	$30,%esi
-	movl	%ebp,4(%rsp)
+	roll	$1,%r14d
 	addl	%eax,%r12d
-	movl	8(%rsp),%edx
-	movl	%esi,%eax
+	xorl	8(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,4(%rsp)
 	movl	%r12d,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
 	xorl	40(%rsp),%edx
 	andl	%r13d,%eax
-	leal	1518500249(%rbp,%r11,1),%r11d
-	xorl	60(%rsp),%edx
+	leal	1518500249(%r14,%r11,1),%r11d
+	roll	$30,%r13d
 	xorl	%edi,%eax
-	roll	$1,%edx
 	addl	%ecx,%r11d
-	roll	$30,%r13d
-	movl	%edx,8(%rsp)
+	roll	$1,%edx
 	addl	%eax,%r11d
-	movl	12(%rsp),%ebp
-	movl	%r13d,%eax
+	xorl	12(%rsp),%ebp
+	movl	%esi,%eax
+	movl	%edx,8(%rsp)
 	movl	%r11d,%ecx
 	xorl	20(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
 	xorl	44(%rsp),%ebp
 	andl	%r12d,%eax
 	leal	1518500249(%rdx,%rdi,1),%edi
-	xorl	0(%rsp),%ebp
+	roll	$30,%r12d
 	xorl	%esi,%eax
-	roll	$1,%ebp
 	addl	%ecx,%edi
-	roll	$30,%r12d
-	movl	%ebp,12(%rsp)
+	roll	$1,%ebp
 	addl	%eax,%edi
-	movl	16(%rsp),%edx
-	movl	%r12d,%eax
+	xorl	16(%rsp),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,12(%rsp)
 	movl	%edi,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	24(%rsp),%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	xorl	48(%rsp),%edx
+	xorl	48(%rsp),%r14d
 	andl	%r11d,%eax
 	leal	1518500249(%rbp,%rsi,1),%esi
-	xorl	4(%rsp),%edx
+	roll	$30,%r11d
 	xorl	%r13d,%eax
-	roll	$1,%edx
 	addl	%ecx,%esi
-	roll	$30,%r11d
-	movl	%edx,16(%rsp)
+	roll	$1,%r14d
 	addl	%eax,%esi
-	movl	20(%rsp),%ebp
-	movl	%r11d,%eax
+	xorl	20(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,16(%rsp)
 	movl	%esi,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r13,1),%r13d
-	xorl	52(%rsp),%ebp
+	xorl	28(%rsp),%edx
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	52(%rsp),%edx
+	leal	1859775393(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	8(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%ebp
-	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%edi,%eax
+	roll	$1,%edx
+	xorl	24(%rsp),%ebp
+	movl	%esi,%eax
+	movl	%edx,20(%rsp)
 	movl	%r13d,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%r12,1),%r12d
-	xorl	56(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	56(%rsp),%ebp
+	leal	1859775393(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	12(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%ebp
+	xorl	28(%rsp),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,24(%rsp)
 	movl	%r12d,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r11,1),%r11d
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%r14d
+	leal	1859775393(%rbp,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	16(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	32(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,28(%rsp)
 	movl	%r11d,%ecx
 	xorl	40(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%rdi,1),%edi
 	xorl	0(%rsp),%edx
-	xorl	%esi,%eax
+	leal	1859775393(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	20(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
 	roll	$1,%edx
+	xorl	36(%rsp),%ebp
+	movl	%r11d,%eax
 	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	44(%rsp),%ebp
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%rsi,1),%esi
 	xorl	4(%rsp),%ebp
-	xorl	%r13d,%eax
+	leal	1859775393(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	24(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
 	roll	$1,%ebp
+	xorl	40(%rsp),%r14d
+	movl	%edi,%eax
 	movl	%ebp,36(%rsp)
-	movl	40(%rsp),%edx
-	movl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	48(%rsp),%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
+	xorl	8(%rsp),%r14d
 	leal	1859775393(%rbp,%r13,1),%r13d
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	28(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%edx
-	movl	%edx,40(%rsp)
-	movl	44(%rsp),%ebp
-	movl	%edi,%eax
+	roll	$1,%r14d
+	xorl	44(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,40(%rsp)
 	movl	%r13d,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r12,1),%r12d
-	xorl	12(%rsp),%ebp
+	xorl	52(%rsp),%edx
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	12(%rsp),%edx
+	leal	1859775393(%r14,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	32(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%ebp
-	movl	%ebp,44(%rsp)
-	movl	48(%rsp),%edx
-	movl	%esi,%eax
+	roll	$1,%edx
+	xorl	48(%rsp),%ebp
+	movl	%r13d,%eax
+	movl	%edx,44(%rsp)
 	movl	%r12d,%ecx
-	xorl	56(%rsp),%edx
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%r11,1),%r11d
-	xorl	16(%rsp),%edx
+	xorl	56(%rsp),%ebp
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	16(%rsp),%ebp
+	leal	1859775393(%rdx,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	36(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,48(%rsp)
-	movl	52(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%ebp
+	xorl	52(%rsp),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,48(%rsp)
 	movl	%r11d,%ecx
-	xorl	60(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rdi,1),%edi
-	xorl	20(%rsp),%ebp
+	xorl	60(%rsp),%r14d
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	20(%rsp),%r14d
+	leal	1859775393(%rbp,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	40(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,52(%rsp)
-	movl	56(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%r14d
+	xorl	56(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,52(%rsp)
 	movl	%edi,%ecx
 	xorl	0(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%rsi,1),%esi
 	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	leal	1859775393(%r14,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	44(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
 	roll	$1,%edx
+	xorl	60(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,56(%rsp)
-	movl	60(%rsp),%ebp
-	movl	%r11d,%eax
 	movl	%esi,%ecx
 	xorl	4(%rsp),%ebp
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%r13,1),%r13d
 	xorl	28(%rsp),%ebp
-	xorl	%r12d,%eax
+	leal	1859775393(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	48(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%ebp
+	xorl	0(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,60(%rsp)
-	movl	0(%rsp),%edx
-	movl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	8(%rsp),%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
+	xorl	32(%rsp),%r14d
 	leal	1859775393(%rbp,%r12,1),%r12d
-	xorl	32(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	52(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,0(%rsp)
-	movl	4(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	4(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,0(%rsp)
 	movl	%r12d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r11,1),%r11d
-	xorl	36(%rsp),%ebp
+	xorl	12(%rsp),%edx
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	36(%rsp),%edx
+	leal	1859775393(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	56(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,4(%rsp)
-	movl	8(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%edx
+	xorl	8(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,4(%rsp)
 	movl	%r11d,%ecx
-	xorl	16(%rsp),%edx
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%rdi,1),%edi
-	xorl	40(%rsp),%edx
+	xorl	16(%rsp),%ebp
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	40(%rsp),%ebp
+	leal	1859775393(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	60(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,8(%rsp)
-	movl	12(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	12(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,8(%rsp)
 	movl	%edi,%ecx
-	xorl	20(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rsi,1),%esi
-	xorl	44(%rsp),%ebp
+	xorl	20(%rsp),%r14d
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	44(%rsp),%r14d
+	leal	1859775393(%rbp,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	0(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,12(%rsp)
-	movl	16(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%r14d
+	xorl	16(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,12(%rsp)
 	movl	%esi,%ecx
 	xorl	24(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%r13,1),%r13d
 	xorl	48(%rsp),%edx
-	xorl	%r12d,%eax
+	leal	1859775393(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	4(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%edx
+	xorl	20(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,16(%rsp)
-	movl	20(%rsp),%ebp
-	movl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	28(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%r12,1),%r12d
 	xorl	52(%rsp),%ebp
-	xorl	%r11d,%eax
+	leal	1859775393(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	8(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%ebp
+	xorl	24(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	32(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
+	xorl	56(%rsp),%r14d
 	leal	1859775393(%rbp,%r11,1),%r11d
-	xorl	56(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	12(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	28(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,24(%rsp)
 	movl	%r11d,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rdi,1),%edi
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%edx
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%edx
+	leal	1859775393(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	16(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%edx
+	xorl	32(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,28(%rsp)
 	movl	%edi,%ecx
-	xorl	40(%rsp),%edx
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%rsi,1),%esi
-	xorl	0(%rsp),%edx
+	xorl	40(%rsp),%ebp
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	0(%rsp),%ebp
+	leal	1859775393(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	20(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%edx
-	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	44(%rsp),%ebp
-	andl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	36(%rsp),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,32(%rsp)
+	movl	%r12d,%ebx
+	xorl	44(%rsp),%r14d
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	4(%rsp),%r14d
+	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	24(%rsp),%ebp
 	addl	%eax,%r13d
+	roll	$1,%r14d
 	andl	%edi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%ebp,36(%rsp)
 	addl	%ecx,%r13d
-	movl	40(%rsp),%edx
-	movl	%edi,%eax
-	movl	%edi,%ebx
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	40(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,36(%rsp)
+	movl	%r11d,%ebx
 	xorl	48(%rsp),%edx
-	andl	%r11d,%eax
+	andl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	8(%rsp),%edx
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rbp,%r12,1),%r12d
+	leal	-1894007588(%r14,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	28(%rsp),%edx
 	addl	%eax,%r12d
-	andl	%esi,%ebx
 	roll	$1,%edx
-	addl	%ebx,%r12d
+	andl	%esi,%ebx
+	addl	%ecx,%r12d
 	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	44(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,40(%rsp)
-	addl	%ecx,%r12d
-	movl	44(%rsp),%ebp
-	movl	%esi,%eax
-	movl	%esi,%ebx
+	movl	%edi,%ebx
 	xorl	52(%rsp),%ebp
-	andl	%edi,%eax
+	andl	%esi,%eax
 	movl	%r12d,%ecx
 	xorl	12(%rsp),%ebp
-	xorl	%edi,%ebx
 	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	32(%rsp),%ebp
 	addl	%eax,%r11d
-	andl	%r13d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%r11d
+	andl	%r13d,%ebx
+	addl	%ecx,%r11d
 	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	48(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,44(%rsp)
-	addl	%ecx,%r11d
-	movl	48(%rsp),%edx
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
-	xorl	56(%rsp),%edx
-	andl	%esi,%eax
+	movl	%esi,%ebx
+	xorl	56(%rsp),%r14d
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
-	xorl	16(%rsp),%edx
-	xorl	%esi,%ebx
+	xorl	16(%rsp),%r14d
 	leal	-1894007588(%rbp,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	36(%rsp),%edx
 	addl	%eax,%edi
+	roll	$1,%r14d
 	andl	%r12d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%edi
-	roll	$30,%r12d
-	movl	%edx,48(%rsp)
 	addl	%ecx,%edi
-	movl	52(%rsp),%ebp
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
-	xorl	60(%rsp),%ebp
-	andl	%r13d,%eax
+	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	52(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,48(%rsp)
+	movl	%r13d,%ebx
+	xorl	60(%rsp),%edx
+	andl	%r12d,%eax
 	movl	%edi,%ecx
-	xorl	20(%rsp),%ebp
-	xorl	%r13d,%ebx
-	leal	-1894007588(%rdx,%rsi,1),%esi
+	xorl	20(%rsp),%edx
+	leal	-1894007588(%r14,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	40(%rsp),%ebp
 	addl	%eax,%esi
+	roll	$1,%edx
 	andl	%r11d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%esi
-	roll	$30,%r11d
-	movl	%ebp,52(%rsp)
 	addl	%ecx,%esi
-	movl	56(%rsp),%edx
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	0(%rsp),%edx
-	andl	%r12d,%eax
+	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	56(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,52(%rsp)
+	movl	%r12d,%ebx
+	xorl	0(%rsp),%ebp
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	24(%rsp),%ebp
+	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	44(%rsp),%edx
 	addl	%eax,%r13d
+	roll	$1,%ebp
 	andl	%edi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%edx,56(%rsp)
 	addl	%ecx,%r13d
-	movl	60(%rsp),%ebp
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	4(%rsp),%ebp
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	60(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,56(%rsp)
+	movl	%r11d,%ebx
+	xorl	4(%rsp),%r14d
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	28(%rsp),%r14d
+	leal	-1894007588(%rbp,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	48(%rsp),%ebp
 	addl	%eax,%r12d
+	roll	$1,%r14d
 	andl	%esi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%ebp,60(%rsp)
 	addl	%ecx,%r12d
-	movl	0(%rsp),%edx
-	movl	%esi,%eax
-	movl	%esi,%ebx
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	0(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,60(%rsp)
+	movl	%edi,%ebx
 	xorl	8(%rsp),%edx
-	andl	%edi,%eax
+	andl	%esi,%eax
 	movl	%r12d,%ecx
 	xorl	32(%rsp),%edx
-	xorl	%edi,%ebx
-	leal	-1894007588(%rbp,%r11,1),%r11d
+	leal	-1894007588(%r14,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	52(%rsp),%edx
 	addl	%eax,%r11d
-	andl	%r13d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%r11d
+	andl	%r13d,%ebx
+	addl	%ecx,%r11d
 	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	4(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,0(%rsp)
-	addl	%ecx,%r11d
-	movl	4(%rsp),%ebp
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
+	movl	%esi,%ebx
 	xorl	12(%rsp),%ebp
-	andl	%esi,%eax
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
 	xorl	36(%rsp),%ebp
-	xorl	%esi,%ebx
 	leal	-1894007588(%rdx,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	56(%rsp),%ebp
 	addl	%eax,%edi
-	andl	%r12d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%edi
+	andl	%r12d,%ebx
+	addl	%ecx,%edi
 	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	8(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,4(%rsp)
-	addl	%ecx,%edi
-	movl	8(%rsp),%edx
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
-	xorl	16(%rsp),%edx
-	andl	%r13d,%eax
+	movl	%r13d,%ebx
+	xorl	16(%rsp),%r14d
+	andl	%r12d,%eax
 	movl	%edi,%ecx
-	xorl	40(%rsp),%edx
-	xorl	%r13d,%ebx
+	xorl	40(%rsp),%r14d
 	leal	-1894007588(%rbp,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	60(%rsp),%edx
 	addl	%eax,%esi
+	roll	$1,%r14d
 	andl	%r11d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%esi
-	roll	$30,%r11d
-	movl	%edx,8(%rsp)
 	addl	%ecx,%esi
-	movl	12(%rsp),%ebp
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	20(%rsp),%ebp
-	andl	%r12d,%eax
+	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	12(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,8(%rsp)
+	movl	%r12d,%ebx
+	xorl	20(%rsp),%edx
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	44(%rsp),%ebp
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	44(%rsp),%edx
+	leal	-1894007588(%r14,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	0(%rsp),%ebp
 	addl	%eax,%r13d
+	roll	$1,%edx
 	andl	%edi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%ebp,12(%rsp)
 	addl	%ecx,%r13d
-	movl	16(%rsp),%edx
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	24(%rsp),%edx
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	16(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,12(%rsp)
+	movl	%r11d,%ebx
+	xorl	24(%rsp),%ebp
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rbp,%r12,1),%r12d
+	xorl	48(%rsp),%ebp
+	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	4(%rsp),%edx
 	addl	%eax,%r12d
+	roll	$1,%ebp
 	andl	%esi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%edx,16(%rsp)
 	addl	%ecx,%r12d
-	movl	20(%rsp),%ebp
-	movl	%esi,%eax
-	movl	%esi,%ebx
-	xorl	28(%rsp),%ebp
-	andl	%edi,%eax
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	20(%rsp),%r14d
+	movl	%edi,%eax
+	movl	%ebp,16(%rsp)
+	movl	%edi,%ebx
+	xorl	28(%rsp),%r14d
+	andl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%edi,%ebx
-	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	52(%rsp),%r14d
+	leal	-1894007588(%rbp,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	8(%rsp),%ebp
 	addl	%eax,%r11d
+	roll	$1,%r14d
 	andl	%r13d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r11d
-	roll	$30,%r13d
-	movl	%ebp,20(%rsp)
 	addl	%ecx,%r11d
-	movl	24(%rsp),%edx
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
+	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	24(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,20(%rsp)
+	movl	%esi,%ebx
 	xorl	32(%rsp),%edx
-	andl	%esi,%eax
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
 	xorl	56(%rsp),%edx
-	xorl	%esi,%ebx
-	leal	-1894007588(%rbp,%rdi,1),%edi
+	leal	-1894007588(%r14,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	12(%rsp),%edx
 	addl	%eax,%edi
-	andl	%r12d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%edi
+	andl	%r12d,%ebx
+	addl	%ecx,%edi
 	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	28(%rsp),%ebp
+	movl	%r13d,%eax
 	movl	%edx,24(%rsp)
-	addl	%ecx,%edi
-	movl	28(%rsp),%ebp
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
+	movl	%r13d,%ebx
 	xorl	36(%rsp),%ebp
-	andl	%r13d,%eax
+	andl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	60(%rsp),%ebp
-	xorl	%r13d,%ebx
 	leal	-1894007588(%rdx,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	16(%rsp),%ebp
 	addl	%eax,%esi
-	andl	%r11d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%esi
+	andl	%r11d,%ebx
+	addl	%ecx,%esi
 	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	32(%rsp),%r14d
+	movl	%r12d,%eax
 	movl	%ebp,28(%rsp)
-	addl	%ecx,%esi
-	movl	32(%rsp),%edx
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	40(%rsp),%edx
-	andl	%r12d,%eax
+	movl	%r12d,%ebx
+	xorl	40(%rsp),%r14d
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	0(%rsp),%edx
-	xorl	%r12d,%ebx
+	xorl	0(%rsp),%r14d
 	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	20(%rsp),%edx
 	addl	%eax,%r13d
+	roll	$1,%r14d
 	andl	%edi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%edx,32(%rsp)
 	addl	%ecx,%r13d
-	movl	36(%rsp),%ebp
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	44(%rsp),%ebp
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	36(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,32(%rsp)
+	movl	%r11d,%ebx
+	xorl	44(%rsp),%edx
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	4(%rsp),%edx
+	leal	-1894007588(%r14,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	24(%rsp),%ebp
 	addl	%eax,%r12d
+	roll	$1,%edx
 	andl	%esi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%ebp,36(%rsp)
 	addl	%ecx,%r12d
-	movl	40(%rsp),%edx
-	movl	%esi,%eax
-	movl	%esi,%ebx
-	xorl	48(%rsp),%edx
-	andl	%edi,%eax
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	40(%rsp),%ebp
+	movl	%edi,%eax
+	movl	%edx,36(%rsp)
+	movl	%edi,%ebx
+	xorl	48(%rsp),%ebp
+	andl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%edi,%ebx
-	leal	-1894007588(%rbp,%r11,1),%r11d
+	xorl	8(%rsp),%ebp
+	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	28(%rsp),%edx
 	addl	%eax,%r11d
+	roll	$1,%ebp
 	andl	%r13d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r11d
-	roll	$30,%r13d
-	movl	%edx,40(%rsp)
 	addl	%ecx,%r11d
-	movl	44(%rsp),%ebp
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
-	xorl	52(%rsp),%ebp
-	andl	%esi,%eax
+	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	44(%rsp),%r14d
+	movl	%esi,%eax
+	movl	%ebp,40(%rsp)
+	movl	%esi,%ebx
+	xorl	52(%rsp),%r14d
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%esi,%ebx
-	leal	-1894007588(%rdx,%rdi,1),%edi
+	xorl	12(%rsp),%r14d
+	leal	-1894007588(%rbp,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	32(%rsp),%ebp
 	addl	%eax,%edi
+	roll	$1,%r14d
 	andl	%r12d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%edi
-	roll	$30,%r12d
-	movl	%ebp,44(%rsp)
 	addl	%ecx,%edi
-	movl	48(%rsp),%edx
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
+	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	48(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,44(%rsp)
+	movl	%r13d,%ebx
 	xorl	56(%rsp),%edx
-	andl	%r13d,%eax
+	andl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%r13d,%ebx
-	leal	-1894007588(%rbp,%rsi,1),%esi
+	leal	-1894007588(%r14,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	36(%rsp),%edx
 	addl	%eax,%esi
-	andl	%r11d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%esi
+	andl	%r11d,%ebx
+	addl	%ecx,%esi
 	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	52(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,48(%rsp)
-	addl	%ecx,%esi
-	movl	52(%rsp),%ebp
-	movl	%r11d,%eax
 	movl	%esi,%ecx
 	xorl	60(%rsp),%ebp
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r13,1),%r13d
 	xorl	20(%rsp),%ebp
-	xorl	%r12d,%eax
+	leal	-899497514(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	40(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%ebp
+	xorl	56(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,52(%rsp)
-	movl	56(%rsp),%edx
-	movl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	0(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	0(%rsp),%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
+	xorl	24(%rsp),%r14d
 	leal	-899497514(%rbp,%r12,1),%r12d
-	xorl	24(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	44(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,56(%rsp)
-	movl	60(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	60(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,56(%rsp)
 	movl	%r12d,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r11,1),%r11d
-	xorl	28(%rsp),%ebp
+	xorl	4(%rsp),%edx
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	28(%rsp),%edx
+	leal	-899497514(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	48(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,60(%rsp)
-	movl	0(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%edx
+	xorl	0(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,60(%rsp)
 	movl	%r11d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%rdi,1),%edi
-	xorl	32(%rsp),%edx
+	xorl	8(%rsp),%ebp
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	32(%rsp),%ebp
+	leal	-899497514(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	52(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,0(%rsp)
-	movl	4(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	4(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,0(%rsp)
 	movl	%edi,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rsi,1),%esi
-	xorl	36(%rsp),%ebp
+	xorl	12(%rsp),%r14d
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	36(%rsp),%r14d
+	leal	-899497514(%rbp,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	56(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,4(%rsp)
-	movl	8(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%r14d
+	xorl	8(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,4(%rsp)
 	movl	%esi,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r13,1),%r13d
 	xorl	40(%rsp),%edx
-	xorl	%r12d,%eax
+	leal	-899497514(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	60(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%edx
+	xorl	12(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,8(%rsp)
-	movl	12(%rsp),%ebp
-	movl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	20(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r12,1),%r12d
 	xorl	44(%rsp),%ebp
-	xorl	%r11d,%eax
+	leal	-899497514(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	0(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%ebp
+	xorl	16(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,12(%rsp)
-	movl	16(%rsp),%edx
-	movl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	24(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
+	xorl	48(%rsp),%r14d
 	leal	-899497514(%rbp,%r11,1),%r11d
-	xorl	48(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	4(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,16(%rsp)
-	movl	20(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	20(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,16(%rsp)
 	movl	%r11d,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rdi,1),%edi
-	xorl	52(%rsp),%ebp
+	xorl	28(%rsp),%edx
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	52(%rsp),%edx
+	leal	-899497514(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	8(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%edx
+	xorl	24(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,20(%rsp)
 	movl	%edi,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%rsi,1),%esi
-	xorl	56(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	56(%rsp),%ebp
+	leal	-899497514(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	12(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%r11d,%eax
+	roll	$1,%ebp
+	xorl	28(%rsp),%r14d
+	movl	%edi,%eax
+	movl	%ebp,24(%rsp)
 	movl	%esi,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r13,1),%r13d
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%r14d
+	leal	-899497514(%rbp,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	16(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%edi,%eax
+	roll	$1,%r14d
+	xorl	32(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,28(%rsp)
 	movl	%r13d,%ecx
 	xorl	40(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r12,1),%r12d
 	xorl	0(%rsp),%edx
-	xorl	%r11d,%eax
+	leal	-899497514(%r14,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	20(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%edx
-	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%esi,%eax
+	xorl	36(%rsp),%ebp
+	movl	%r13d,%eax
+
 	movl	%r12d,%ecx
 	xorl	44(%rsp),%ebp
-	xorl	%r13d,%eax
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r11,1),%r11d
 	xorl	4(%rsp),%ebp
-	xorl	%edi,%eax
+	leal	-899497514(%rdx,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	24(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
 	roll	$1,%ebp
-	movl	%ebp,36(%rsp)
-	movl	40(%rsp),%edx
-	movl	%r13d,%eax
+	xorl	40(%rsp),%r14d
+	movl	%r12d,%eax
+
 	movl	%r11d,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	48(%rsp),%r14d
+	xorl	%esi,%eax
 	roll	$5,%ecx
+	xorl	8(%rsp),%r14d
 	leal	-899497514(%rbp,%rdi,1),%edi
-	xorl	8(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	28(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,40(%rsp)
-	movl	44(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%r14d
+	xorl	44(%rsp),%edx
+	movl	%r11d,%eax
+
 	movl	%edi,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rsi,1),%esi
-	xorl	12(%rsp),%ebp
+	xorl	52(%rsp),%edx
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	12(%rsp),%edx
+	leal	-899497514(%r14,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	32(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,44(%rsp)
-	movl	48(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%edx
+	xorl	48(%rsp),%ebp
+	movl	%edi,%eax
+
 	movl	%esi,%ecx
-	xorl	56(%rsp),%edx
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%r13,1),%r13d
-	xorl	16(%rsp),%edx
+	xorl	56(%rsp),%ebp
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	16(%rsp),%ebp
+	leal	-899497514(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	36(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%edx
-	movl	%edx,48(%rsp)
-	movl	52(%rsp),%ebp
-	movl	%edi,%eax
+	roll	$1,%ebp
+	xorl	52(%rsp),%r14d
+	movl	%esi,%eax
+
 	movl	%r13d,%ecx
-	xorl	60(%rsp),%ebp
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r12,1),%r12d
-	xorl	20(%rsp),%ebp
+	xorl	60(%rsp),%r14d
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	20(%rsp),%r14d
+	leal	-899497514(%rbp,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	40(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%ebp
-	movl	56(%rsp),%edx
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	56(%rsp),%edx
+	movl	%r13d,%eax
+
 	movl	%r12d,%ecx
 	xorl	0(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r11,1),%r11d
 	xorl	24(%rsp),%edx
-	xorl	%edi,%eax
+	leal	-899497514(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	44(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
 	roll	$1,%edx
-	movl	60(%rsp),%ebp
-	movl	%r13d,%eax
+	xorl	60(%rsp),%ebp
+	movl	%r12d,%eax
+
 	movl	%r11d,%ecx
 	xorl	4(%rsp),%ebp
-	xorl	%r12d,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%rdi,1),%edi
 	xorl	28(%rsp),%ebp
-	xorl	%esi,%eax
+	leal	-899497514(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	48(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
 	roll	$1,%ebp
-	movl	%r12d,%eax
+	movl	%r11d,%eax
 	movl	%edi,%ecx
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	leal	-899497514(%rbp,%rsi,1),%esi
 	roll	$5,%ecx
-	xorl	%r13d,%eax
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
 	roll	$30,%r11d
 	addl	%eax,%esi
@@ -1327,16 +1285,216 @@ sha1_block_data_order:
 	jnz	.Lloop
 
 	movq	64(%rsp),%rsi
-	movq	(%rsi),%r13
-	movq	8(%rsi),%r12
-	movq	16(%rsi),%rbp
-	movq	24(%rsi),%rbx
-	leaq	32(%rsi),%rsp
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
 .Lepilogue:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_sha1_block_data_order:
+.def	sha1_block_data_order_shaext;	.scl 3;	.type 32;	.endef
+.p2align	5
+sha1_block_data_order_shaext:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha1_block_data_order_shaext:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+_shaext_shortcut:
+
+	leaq	-72(%rsp),%rsp
+	movaps	%xmm6,-8-64(%rax)
+	movaps	%xmm7,-8-48(%rax)
+	movaps	%xmm8,-8-32(%rax)
+	movaps	%xmm9,-8-16(%rax)
+.Lprologue_shaext:
+	movdqu	(%rdi),%xmm0
+	movd	16(%rdi),%xmm1
+	movdqa	K_XX_XX+160(%rip),%xmm3
+
+	movdqu	(%rsi),%xmm4
+	pshufd	$27,%xmm0,%xmm0
+	movdqu	16(%rsi),%xmm5
+	pshufd	$27,%xmm1,%xmm1
+	movdqu	32(%rsi),%xmm6
+.byte	102,15,56,0,227
+	movdqu	48(%rsi),%xmm7
+.byte	102,15,56,0,235
+.byte	102,15,56,0,243
+	movdqa	%xmm1,%xmm9
+.byte	102,15,56,0,251
+	jmp	.Loop_shaext
+
+.p2align	4
+.Loop_shaext:
+	decq	%rdx
+	leaq	64(%rsi),%r8
+	paddd	%xmm4,%xmm1
+	cmovneq	%r8,%rsi
+	movdqa	%xmm0,%xmm8
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,0
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,0
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,1
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,1
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,2
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,2
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+	movdqu	(%rsi),%xmm4
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,3
+.byte	15,56,200,213
+	movdqu	16(%rsi),%xmm5
+.byte	102,15,56,0,227
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	15,56,200,206
+	movdqu	32(%rsi),%xmm6
+.byte	102,15,56,0,235
+
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,3
+.byte	15,56,200,215
+	movdqu	48(%rsi),%xmm7
+.byte	102,15,56,0,243
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	65,15,56,200,201
+.byte	102,15,56,0,251
+
+	paddd	%xmm8,%xmm0
+	movdqa	%xmm1,%xmm9
+
+	jnz	.Loop_shaext
+
+	pshufd	$27,%xmm0,%xmm0
+	pshufd	$27,%xmm1,%xmm1
+	movdqu	%xmm0,(%rdi)
+	movd	%xmm1,16(%rdi)
+	movaps	-8-64(%rax),%xmm6
+	movaps	-8-48(%rax),%xmm7
+	movaps	-8-32(%rax),%xmm8
+	movaps	-8-16(%rax),%xmm9
+	movq	%rax,%rsp
+.Lepilogue_shaext:
+
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+.LSEH_end_sha1_block_data_order_shaext:
 .def	sha1_block_data_order_ssse3;	.scl 3;	.type 32;	.endef
 .p2align	4
 sha1_block_data_order_ssse3:
@@ -1349,24 +1507,35 @@ sha1_block_data_order_ssse3:
 	movq	%r8,%rdx
 
 _ssse3_shortcut:
+
+	movq	%rsp,%r11
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
 	leaq	-160(%rsp),%rsp
-	movaps	%xmm6,64+0(%rsp)
-	movaps	%xmm7,64+16(%rsp)
-	movaps	%xmm8,64+32(%rsp)
-	movaps	%xmm9,64+48(%rsp)
-	movaps	%xmm10,64+64(%rsp)
-	movaps	%xmm11,64+80(%rsp)
+	movaps	%xmm6,-40-96(%r11)
+	movaps	%xmm7,-40-80(%r11)
+	movaps	%xmm8,-40-64(%r11)
+	movaps	%xmm9,-40-48(%r11)
+	movaps	%xmm10,-40-32(%r11)
+	movaps	%xmm11,-40-16(%r11)
 .Lprologue_ssse3:
+	andq	$-64,%rsp
 	movq	%rdi,%r8
 	movq	%rsi,%r9
 	movq	%rdx,%r10
 
 	shlq	$6,%r10
 	addq	%r9,%r10
-	leaq	K_XX_XX(%rip),%r11
+	leaq	K_XX_XX+64(%rip),%r14
 
 	movl	0(%r8),%eax
 	movl	4(%r8),%ebx
@@ -1378,18 +1547,18 @@ _ssse3_shortcut:
 	xorl	%edx,%edi
 	andl	%edi,%esi
 
-	movdqa	64(%r11),%xmm6
-	movdqa	0(%r11),%xmm9
+	movdqa	64(%r14),%xmm6
+	movdqa	-64(%r14),%xmm9
 	movdqu	0(%r9),%xmm0
 	movdqu	16(%r9),%xmm1
 	movdqu	32(%r9),%xmm2
 	movdqu	48(%r9),%xmm3
 .byte	102,15,56,0,198
-	addq	$64,%r9
 .byte	102,15,56,0,206
 .byte	102,15,56,0,214
-.byte	102,15,56,0,222
+	addq	$64,%r9
 	paddd	%xmm9,%xmm0
+.byte	102,15,56,0,222
 	paddd	%xmm9,%xmm1
 	paddd	%xmm9,%xmm2
 	movdqa	%xmm0,0(%rsp)
@@ -1401,24 +1570,24 @@ _ssse3_shortcut:
 	jmp	.Loop_ssse3
 .p2align	4
 .Loop_ssse3:
-	movdqa	%xmm1,%xmm4
 	rorl	$2,%ebx
+	pshufd	$238,%xmm0,%xmm4
 	xorl	%edx,%esi
 	movdqa	%xmm3,%xmm8
-.byte	102,15,58,15,224,8
+	paddd	%xmm3,%xmm9
 	movl	%eax,%edi
 	addl	0(%rsp),%ebp
-	paddd	%xmm3,%xmm9
+	punpcklqdq	%xmm1,%xmm4
 	xorl	%ecx,%ebx
 	roll	$5,%eax
-	psrldq	$4,%xmm8
 	addl	%esi,%ebp
+	psrldq	$4,%xmm8
 	andl	%ebx,%edi
-	pxor	%xmm0,%xmm4
 	xorl	%ecx,%ebx
+	pxor	%xmm0,%xmm4
 	addl	%eax,%ebp
-	pxor	%xmm2,%xmm8
 	rorl	$7,%eax
+	pxor	%xmm2,%xmm8
 	xorl	%ecx,%edi
 	movl	%ebp,%esi
 	addl	4(%rsp),%edx
@@ -1429,57 +1598,57 @@ _ssse3_shortcut:
 	addl	%edi,%edx
 	andl	%eax,%esi
 	movdqa	%xmm4,%xmm10
-	movdqa	%xmm4,%xmm8
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
 	rorl	$7,%ebp
+	movdqa	%xmm4,%xmm8
 	xorl	%ebx,%esi
 	pslldq	$12,%xmm10
 	paddd	%xmm4,%xmm4
 	movl	%edx,%edi
 	addl	8(%rsp),%ecx
+	psrld	$31,%xmm8
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	psrld	$31,%xmm8
 	addl	%esi,%ecx
-	andl	%ebp,%edi
 	movdqa	%xmm10,%xmm9
+	andl	%ebp,%edi
 	xorl	%eax,%ebp
-	addl	%edx,%ecx
 	psrld	$30,%xmm10
-	por	%xmm8,%xmm4
+	addl	%edx,%ecx
 	rorl	$7,%edx
+	por	%xmm8,%xmm4
 	xorl	%eax,%edi
 	movl	%ecx,%esi
 	addl	12(%rsp),%ebx
 	pslld	$2,%xmm9
 	pxor	%xmm10,%xmm4
 	xorl	%ebp,%edx
+	movdqa	-64(%r14),%xmm10
 	roll	$5,%ecx
-	movdqa	0(%r11),%xmm10
 	addl	%edi,%ebx
 	andl	%edx,%esi
 	pxor	%xmm9,%xmm4
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
-	movdqa	%xmm2,%xmm5
 	rorl	$7,%ecx
+	pshufd	$238,%xmm1,%xmm5
 	xorl	%ebp,%esi
 	movdqa	%xmm4,%xmm9
-.byte	102,15,58,15,233,8
+	paddd	%xmm4,%xmm10
 	movl	%ebx,%edi
 	addl	16(%rsp),%eax
-	paddd	%xmm4,%xmm10
+	punpcklqdq	%xmm2,%xmm5
 	xorl	%edx,%ecx
 	roll	$5,%ebx
-	psrldq	$4,%xmm9
 	addl	%esi,%eax
+	psrldq	$4,%xmm9
 	andl	%ecx,%edi
-	pxor	%xmm1,%xmm5
 	xorl	%edx,%ecx
+	pxor	%xmm1,%xmm5
 	addl	%ebx,%eax
-	pxor	%xmm3,%xmm9
 	rorl	$7,%ebx
+	pxor	%xmm3,%xmm9
 	xorl	%edx,%edi
 	movl	%eax,%esi
 	addl	20(%rsp),%ebp
@@ -1490,57 +1659,57 @@ _ssse3_shortcut:
 	addl	%edi,%ebp
 	andl	%ebx,%esi
 	movdqa	%xmm5,%xmm8
-	movdqa	%xmm5,%xmm9
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
 	rorl	$7,%eax
+	movdqa	%xmm5,%xmm9
 	xorl	%ecx,%esi
 	pslldq	$12,%xmm8
 	paddd	%xmm5,%xmm5
 	movl	%ebp,%edi
 	addl	24(%rsp),%edx
+	psrld	$31,%xmm9
 	xorl	%ebx,%eax
 	roll	$5,%ebp
-	psrld	$31,%xmm9
 	addl	%esi,%edx
-	andl	%eax,%edi
 	movdqa	%xmm8,%xmm10
+	andl	%eax,%edi
 	xorl	%ebx,%eax
-	addl	%ebp,%edx
 	psrld	$30,%xmm8
-	por	%xmm9,%xmm5
+	addl	%ebp,%edx
 	rorl	$7,%ebp
+	por	%xmm9,%xmm5
 	xorl	%ebx,%edi
 	movl	%edx,%esi
 	addl	28(%rsp),%ecx
 	pslld	$2,%xmm10
 	pxor	%xmm8,%xmm5
 	xorl	%eax,%ebp
+	movdqa	-32(%r14),%xmm8
 	roll	$5,%edx
-	movdqa	16(%r11),%xmm8
 	addl	%edi,%ecx
 	andl	%ebp,%esi
 	pxor	%xmm10,%xmm5
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
-	movdqa	%xmm3,%xmm6
 	rorl	$7,%edx
+	pshufd	$238,%xmm2,%xmm6
 	xorl	%eax,%esi
 	movdqa	%xmm5,%xmm10
-.byte	102,15,58,15,242,8
+	paddd	%xmm5,%xmm8
 	movl	%ecx,%edi
 	addl	32(%rsp),%ebx
-	paddd	%xmm5,%xmm8
+	punpcklqdq	%xmm3,%xmm6
 	xorl	%ebp,%edx
 	roll	$5,%ecx
-	psrldq	$4,%xmm10
 	addl	%esi,%ebx
+	psrldq	$4,%xmm10
 	andl	%edx,%edi
-	pxor	%xmm2,%xmm6
 	xorl	%ebp,%edx
+	pxor	%xmm2,%xmm6
 	addl	%ecx,%ebx
-	pxor	%xmm4,%xmm10
 	rorl	$7,%ecx
+	pxor	%xmm4,%xmm10
 	xorl	%ebp,%edi
 	movl	%ebx,%esi
 	addl	36(%rsp),%eax
@@ -1551,57 +1720,57 @@ _ssse3_shortcut:
 	addl	%edi,%eax
 	andl	%ecx,%esi
 	movdqa	%xmm6,%xmm9
-	movdqa	%xmm6,%xmm10
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
 	rorl	$7,%ebx
+	movdqa	%xmm6,%xmm10
 	xorl	%edx,%esi
 	pslldq	$12,%xmm9
 	paddd	%xmm6,%xmm6
 	movl	%eax,%edi
 	addl	40(%rsp),%ebp
+	psrld	$31,%xmm10
 	xorl	%ecx,%ebx
 	roll	$5,%eax
-	psrld	$31,%xmm10
 	addl	%esi,%ebp
-	andl	%ebx,%edi
 	movdqa	%xmm9,%xmm8
+	andl	%ebx,%edi
 	xorl	%ecx,%ebx
-	addl	%eax,%ebp
 	psrld	$30,%xmm9
-	por	%xmm10,%xmm6
+	addl	%eax,%ebp
 	rorl	$7,%eax
+	por	%xmm10,%xmm6
 	xorl	%ecx,%edi
 	movl	%ebp,%esi
 	addl	44(%rsp),%edx
 	pslld	$2,%xmm8
 	pxor	%xmm9,%xmm6
 	xorl	%ebx,%eax
+	movdqa	-32(%r14),%xmm9
 	roll	$5,%ebp
-	movdqa	16(%r11),%xmm9
 	addl	%edi,%edx
 	andl	%eax,%esi
 	pxor	%xmm8,%xmm6
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
-	movdqa	%xmm4,%xmm7
 	rorl	$7,%ebp
+	pshufd	$238,%xmm3,%xmm7
 	xorl	%ebx,%esi
 	movdqa	%xmm6,%xmm8
-.byte	102,15,58,15,251,8
+	paddd	%xmm6,%xmm9
 	movl	%edx,%edi
 	addl	48(%rsp),%ecx
-	paddd	%xmm6,%xmm9
+	punpcklqdq	%xmm4,%xmm7
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	psrldq	$4,%xmm8
 	addl	%esi,%ecx
+	psrldq	$4,%xmm8
 	andl	%ebp,%edi
-	pxor	%xmm3,%xmm7
 	xorl	%eax,%ebp
+	pxor	%xmm3,%xmm7
 	addl	%edx,%ecx
-	pxor	%xmm5,%xmm8
 	rorl	$7,%edx
+	pxor	%xmm5,%xmm8
 	xorl	%eax,%edi
 	movl	%ecx,%esi
 	addl	52(%rsp),%ebx
@@ -1612,78 +1781,78 @@ _ssse3_shortcut:
 	addl	%edi,%ebx
 	andl	%edx,%esi
 	movdqa	%xmm7,%xmm10
-	movdqa	%xmm7,%xmm8
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
 	rorl	$7,%ecx
+	movdqa	%xmm7,%xmm8
 	xorl	%ebp,%esi
 	pslldq	$12,%xmm10
 	paddd	%xmm7,%xmm7
 	movl	%ebx,%edi
 	addl	56(%rsp),%eax
+	psrld	$31,%xmm8
 	xorl	%edx,%ecx
 	roll	$5,%ebx
-	psrld	$31,%xmm8
 	addl	%esi,%eax
-	andl	%ecx,%edi
 	movdqa	%xmm10,%xmm9
+	andl	%ecx,%edi
 	xorl	%edx,%ecx
-	addl	%ebx,%eax
 	psrld	$30,%xmm10
-	por	%xmm8,%xmm7
+	addl	%ebx,%eax
 	rorl	$7,%ebx
+	por	%xmm8,%xmm7
 	xorl	%edx,%edi
 	movl	%eax,%esi
 	addl	60(%rsp),%ebp
 	pslld	$2,%xmm9
 	pxor	%xmm10,%xmm7
 	xorl	%ecx,%ebx
+	movdqa	-32(%r14),%xmm10
 	roll	$5,%eax
-	movdqa	16(%r11),%xmm10
 	addl	%edi,%ebp
 	andl	%ebx,%esi
 	pxor	%xmm9,%xmm7
+	pshufd	$238,%xmm6,%xmm9
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
-	movdqa	%xmm7,%xmm9
 	rorl	$7,%eax
 	pxor	%xmm4,%xmm0
-.byte	102,68,15,58,15,206,8
 	xorl	%ecx,%esi
 	movl	%ebp,%edi
 	addl	0(%rsp),%edx
-	pxor	%xmm1,%xmm0
+	punpcklqdq	%xmm7,%xmm9
 	xorl	%ebx,%eax
 	roll	$5,%ebp
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm7,%xmm10
+	pxor	%xmm1,%xmm0
 	addl	%esi,%edx
 	andl	%eax,%edi
-	pxor	%xmm9,%xmm0
+	movdqa	%xmm10,%xmm8
 	xorl	%ebx,%eax
+	paddd	%xmm7,%xmm10
 	addl	%ebp,%edx
+	pxor	%xmm9,%xmm0
 	rorl	$7,%ebp
 	xorl	%ebx,%edi
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm10,48(%rsp)
 	movl	%edx,%esi
 	addl	4(%rsp),%ecx
+	movdqa	%xmm0,%xmm9
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	pslld	$2,%xmm0
+	movdqa	%xmm10,48(%rsp)
 	addl	%edi,%ecx
 	andl	%ebp,%esi
-	psrld	$30,%xmm9
 	xorl	%eax,%ebp
+	pslld	$2,%xmm0
 	addl	%edx,%ecx
 	rorl	$7,%edx
+	psrld	$30,%xmm9
 	xorl	%eax,%esi
 	movl	%ecx,%edi
 	addl	8(%rsp),%ebx
 	por	%xmm9,%xmm0
 	xorl	%ebp,%edx
 	roll	$5,%ecx
-	movdqa	%xmm0,%xmm10
+	pshufd	$238,%xmm7,%xmm10
 	addl	%esi,%ebx
 	andl	%edx,%edi
 	xorl	%ebp,%edx
@@ -1696,18 +1865,18 @@ _ssse3_shortcut:
 	xorl	%edx,%esi
 	rorl	$7,%ecx
 	addl	%ebx,%eax
-	addl	16(%rsp),%ebp
 	pxor	%xmm5,%xmm1
-.byte	102,68,15,58,15,215,8
+	addl	16(%rsp),%ebp
 	xorl	%ecx,%esi
+	punpcklqdq	%xmm0,%xmm10
 	movl	%eax,%edi
 	roll	$5,%eax
 	pxor	%xmm2,%xmm1
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	movdqa	%xmm8,%xmm9
-	paddd	%xmm0,%xmm8
 	rorl	$7,%ebx
+	paddd	%xmm0,%xmm8
 	addl	%eax,%ebp
 	pxor	%xmm10,%xmm1
 	addl	20(%rsp),%edx
@@ -1715,43 +1884,43 @@ _ssse3_shortcut:
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	movdqa	%xmm1,%xmm10
-	movdqa	%xmm8,0(%rsp)
 	addl	%edi,%edx
 	xorl	%ebx,%esi
+	movdqa	%xmm8,0(%rsp)
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	pslld	$2,%xmm1
 	addl	24(%rsp),%ecx
+	pslld	$2,%xmm1
 	xorl	%eax,%esi
-	psrld	$30,%xmm10
 	movl	%edx,%edi
+	psrld	$30,%xmm10
 	roll	$5,%edx
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
-	addl	%edx,%ecx
 	por	%xmm10,%xmm1
+	addl	%edx,%ecx
 	addl	28(%rsp),%ebx
+	pshufd	$238,%xmm0,%xmm8
 	xorl	%ebp,%edi
-	movdqa	%xmm1,%xmm8
 	movl	%ecx,%esi
 	roll	$5,%ecx
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
 	rorl	$7,%edx
 	addl	%ecx,%ebx
-	addl	32(%rsp),%eax
 	pxor	%xmm6,%xmm2
-.byte	102,68,15,58,15,192,8
+	addl	32(%rsp),%eax
 	xorl	%edx,%esi
+	punpcklqdq	%xmm1,%xmm8
 	movl	%ebx,%edi
 	roll	$5,%ebx
 	pxor	%xmm3,%xmm2
 	addl	%esi,%eax
 	xorl	%edx,%edi
-	movdqa	32(%r11),%xmm10
-	paddd	%xmm1,%xmm9
+	movdqa	0(%r14),%xmm10
 	rorl	$7,%ecx
+	paddd	%xmm1,%xmm9
 	addl	%ebx,%eax
 	pxor	%xmm8,%xmm2
 	addl	36(%rsp),%ebp
@@ -1759,43 +1928,43 @@ _ssse3_shortcut:
 	movl	%eax,%esi
 	roll	$5,%eax
 	movdqa	%xmm2,%xmm8
-	movdqa	%xmm9,16(%rsp)
 	addl	%edi,%ebp
 	xorl	%ecx,%esi
+	movdqa	%xmm9,16(%rsp)
 	rorl	$7,%ebx
 	addl	%eax,%ebp
-	pslld	$2,%xmm2
 	addl	40(%rsp),%edx
+	pslld	$2,%xmm2
 	xorl	%ebx,%esi
-	psrld	$30,%xmm8
 	movl	%ebp,%edi
+	psrld	$30,%xmm8
 	roll	$5,%ebp
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	rorl	$7,%eax
-	addl	%ebp,%edx
 	por	%xmm8,%xmm2
+	addl	%ebp,%edx
 	addl	44(%rsp),%ecx
+	pshufd	$238,%xmm1,%xmm9
 	xorl	%eax,%edi
-	movdqa	%xmm2,%xmm9
 	movl	%edx,%esi
 	roll	$5,%edx
 	addl	%edi,%ecx
 	xorl	%eax,%esi
 	rorl	$7,%ebp
 	addl	%edx,%ecx
-	addl	48(%rsp),%ebx
 	pxor	%xmm7,%xmm3
-.byte	102,68,15,58,15,201,8
+	addl	48(%rsp),%ebx
 	xorl	%ebp,%esi
+	punpcklqdq	%xmm2,%xmm9
 	movl	%ecx,%edi
 	roll	$5,%ecx
 	pxor	%xmm4,%xmm3
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	movdqa	%xmm10,%xmm8
-	paddd	%xmm2,%xmm10
 	rorl	$7,%edx
+	paddd	%xmm2,%xmm10
 	addl	%ecx,%ebx
 	pxor	%xmm9,%xmm3
 	addl	52(%rsp),%eax
@@ -1803,43 +1972,43 @@ _ssse3_shortcut:
 	movl	%ebx,%esi
 	roll	$5,%ebx
 	movdqa	%xmm3,%xmm9
-	movdqa	%xmm10,32(%rsp)
 	addl	%edi,%eax
 	xorl	%edx,%esi
+	movdqa	%xmm10,32(%rsp)
 	rorl	$7,%ecx
 	addl	%ebx,%eax
-	pslld	$2,%xmm3
 	addl	56(%rsp),%ebp
+	pslld	$2,%xmm3
 	xorl	%ecx,%esi
-	psrld	$30,%xmm9
 	movl	%eax,%edi
+	psrld	$30,%xmm9
 	roll	$5,%eax
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	rorl	$7,%ebx
-	addl	%eax,%ebp
 	por	%xmm9,%xmm3
+	addl	%eax,%ebp
 	addl	60(%rsp),%edx
+	pshufd	$238,%xmm2,%xmm10
 	xorl	%ebx,%edi
-	movdqa	%xmm3,%xmm10
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	addl	%edi,%edx
 	xorl	%ebx,%esi
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	addl	0(%rsp),%ecx
 	pxor	%xmm0,%xmm4
-.byte	102,68,15,58,15,210,8
+	addl	0(%rsp),%ecx
 	xorl	%eax,%esi
+	punpcklqdq	%xmm3,%xmm10
 	movl	%edx,%edi
 	roll	$5,%edx
 	pxor	%xmm5,%xmm4
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	movdqa	%xmm8,%xmm9
-	paddd	%xmm3,%xmm8
 	rorl	$7,%ebp
+	paddd	%xmm3,%xmm8
 	addl	%edx,%ecx
 	pxor	%xmm10,%xmm4
 	addl	4(%rsp),%ebx
@@ -1847,43 +2016,43 @@ _ssse3_shortcut:
 	movl	%ecx,%esi
 	roll	$5,%ecx
 	movdqa	%xmm4,%xmm10
-	movdqa	%xmm8,48(%rsp)
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
+	movdqa	%xmm8,48(%rsp)
 	rorl	$7,%edx
 	addl	%ecx,%ebx
-	pslld	$2,%xmm4
 	addl	8(%rsp),%eax
+	pslld	$2,%xmm4
 	xorl	%edx,%esi
-	psrld	$30,%xmm10
 	movl	%ebx,%edi
+	psrld	$30,%xmm10
 	roll	$5,%ebx
 	addl	%esi,%eax
 	xorl	%edx,%edi
 	rorl	$7,%ecx
-	addl	%ebx,%eax
 	por	%xmm10,%xmm4
+	addl	%ebx,%eax
 	addl	12(%rsp),%ebp
+	pshufd	$238,%xmm3,%xmm8
 	xorl	%ecx,%edi
-	movdqa	%xmm4,%xmm8
 	movl	%eax,%esi
 	roll	$5,%eax
 	addl	%edi,%ebp
 	xorl	%ecx,%esi
 	rorl	$7,%ebx
 	addl	%eax,%ebp
-	addl	16(%rsp),%edx
 	pxor	%xmm1,%xmm5
-.byte	102,68,15,58,15,195,8
+	addl	16(%rsp),%edx
 	xorl	%ebx,%esi
+	punpcklqdq	%xmm4,%xmm8
 	movl	%ebp,%edi
 	roll	$5,%ebp
 	pxor	%xmm6,%xmm5
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	movdqa	%xmm9,%xmm10
-	paddd	%xmm4,%xmm9
 	rorl	$7,%eax
+	paddd	%xmm4,%xmm9
 	addl	%ebp,%edx
 	pxor	%xmm8,%xmm5
 	addl	20(%rsp),%ecx
@@ -1891,24 +2060,24 @@ _ssse3_shortcut:
 	movl	%edx,%esi
 	roll	$5,%edx
 	movdqa	%xmm5,%xmm8
-	movdqa	%xmm9,0(%rsp)
 	addl	%edi,%ecx
 	xorl	%eax,%esi
+	movdqa	%xmm9,0(%rsp)
 	rorl	$7,%ebp
 	addl	%edx,%ecx
-	pslld	$2,%xmm5
 	addl	24(%rsp),%ebx
+	pslld	$2,%xmm5
 	xorl	%ebp,%esi
-	psrld	$30,%xmm8
 	movl	%ecx,%edi
+	psrld	$30,%xmm8
 	roll	$5,%ecx
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	rorl	$7,%edx
-	addl	%ecx,%ebx
 	por	%xmm8,%xmm5
+	addl	%ecx,%ebx
 	addl	28(%rsp),%eax
-	movdqa	%xmm5,%xmm9
+	pshufd	$238,%xmm4,%xmm9
 	rorl	$7,%ecx
 	movl	%ebx,%esi
 	xorl	%edx,%edi
@@ -1917,47 +2086,47 @@ _ssse3_shortcut:
 	xorl	%ecx,%esi
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
-	addl	32(%rsp),%ebp
 	pxor	%xmm2,%xmm6
-.byte	102,68,15,58,15,204,8
+	addl	32(%rsp),%ebp
 	andl	%ecx,%esi
 	xorl	%edx,%ecx
 	rorl	$7,%ebx
-	pxor	%xmm7,%xmm6
+	punpcklqdq	%xmm5,%xmm9
 	movl	%eax,%edi
 	xorl	%ecx,%esi
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm5,%xmm10
+	pxor	%xmm7,%xmm6
 	roll	$5,%eax
 	addl	%esi,%ebp
-	pxor	%xmm9,%xmm6
+	movdqa	%xmm10,%xmm8
 	xorl	%ebx,%edi
+	paddd	%xmm5,%xmm10
 	xorl	%ecx,%ebx
+	pxor	%xmm9,%xmm6
 	addl	%eax,%ebp
 	addl	36(%rsp),%edx
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm10,16(%rsp)
 	andl	%ebx,%edi
 	xorl	%ecx,%ebx
 	rorl	$7,%eax
+	movdqa	%xmm6,%xmm9
 	movl	%ebp,%esi
-	pslld	$2,%xmm6
 	xorl	%ebx,%edi
+	movdqa	%xmm10,16(%rsp)
 	roll	$5,%ebp
-	psrld	$30,%xmm9
 	addl	%edi,%edx
 	xorl	%eax,%esi
+	pslld	$2,%xmm6
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
+	psrld	$30,%xmm9
 	addl	40(%rsp),%ecx
 	andl	%eax,%esi
-	por	%xmm9,%xmm6
 	xorl	%ebx,%eax
+	por	%xmm9,%xmm6
 	rorl	$7,%ebp
-	movdqa	%xmm6,%xmm10
 	movl	%edx,%edi
 	xorl	%eax,%esi
 	roll	$5,%edx
+	pshufd	$238,%xmm5,%xmm10
 	addl	%esi,%ecx
 	xorl	%ebp,%edi
 	xorl	%eax,%ebp
@@ -1973,47 +2142,47 @@ _ssse3_shortcut:
 	xorl	%edx,%esi
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
-	addl	48(%rsp),%eax
 	pxor	%xmm3,%xmm7
-.byte	102,68,15,58,15,213,8
+	addl	48(%rsp),%eax
 	andl	%edx,%esi
 	xorl	%ebp,%edx
 	rorl	$7,%ecx
-	pxor	%xmm0,%xmm7
+	punpcklqdq	%xmm6,%xmm10
 	movl	%ebx,%edi
 	xorl	%edx,%esi
-	movdqa	48(%r11),%xmm9
-	paddd	%xmm6,%xmm8
+	pxor	%xmm0,%xmm7
 	roll	$5,%ebx
 	addl	%esi,%eax
-	pxor	%xmm10,%xmm7
+	movdqa	32(%r14),%xmm9
 	xorl	%ecx,%edi
+	paddd	%xmm6,%xmm8
 	xorl	%edx,%ecx
+	pxor	%xmm10,%xmm7
 	addl	%ebx,%eax
 	addl	52(%rsp),%ebp
-	movdqa	%xmm7,%xmm10
-	movdqa	%xmm8,32(%rsp)
 	andl	%ecx,%edi
 	xorl	%edx,%ecx
 	rorl	$7,%ebx
+	movdqa	%xmm7,%xmm10
 	movl	%eax,%esi
-	pslld	$2,%xmm7
 	xorl	%ecx,%edi
+	movdqa	%xmm8,32(%rsp)
 	roll	$5,%eax
-	psrld	$30,%xmm10
 	addl	%edi,%ebp
 	xorl	%ebx,%esi
+	pslld	$2,%xmm7
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
+	psrld	$30,%xmm10
 	addl	56(%rsp),%edx
 	andl	%ebx,%esi
-	por	%xmm10,%xmm7
 	xorl	%ecx,%ebx
+	por	%xmm10,%xmm7
 	rorl	$7,%eax
-	movdqa	%xmm7,%xmm8
 	movl	%ebp,%edi
 	xorl	%ebx,%esi
 	roll	$5,%ebp
+	pshufd	$238,%xmm6,%xmm8
 	addl	%esi,%edx
 	xorl	%eax,%edi
 	xorl	%ebx,%eax
@@ -2029,47 +2198,47 @@ _ssse3_shortcut:
 	xorl	%ebp,%esi
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
-	addl	0(%rsp),%ebx
 	pxor	%xmm4,%xmm0
-.byte	102,68,15,58,15,198,8
+	addl	0(%rsp),%ebx
 	andl	%ebp,%esi
 	xorl	%eax,%ebp
 	rorl	$7,%edx
-	pxor	%xmm1,%xmm0
+	punpcklqdq	%xmm7,%xmm8
 	movl	%ecx,%edi
 	xorl	%ebp,%esi
-	movdqa	%xmm9,%xmm10
-	paddd	%xmm7,%xmm9
+	pxor	%xmm1,%xmm0
 	roll	$5,%ecx
 	addl	%esi,%ebx
-	pxor	%xmm8,%xmm0
+	movdqa	%xmm9,%xmm10
 	xorl	%edx,%edi
+	paddd	%xmm7,%xmm9
 	xorl	%ebp,%edx
+	pxor	%xmm8,%xmm0
 	addl	%ecx,%ebx
 	addl	4(%rsp),%eax
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm9,48(%rsp)
 	andl	%edx,%edi
 	xorl	%ebp,%edx
 	rorl	$7,%ecx
+	movdqa	%xmm0,%xmm8
 	movl	%ebx,%esi
-	pslld	$2,%xmm0
 	xorl	%edx,%edi
+	movdqa	%xmm9,48(%rsp)
 	roll	$5,%ebx
-	psrld	$30,%xmm8
 	addl	%edi,%eax
 	xorl	%ecx,%esi
+	pslld	$2,%xmm0
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
+	psrld	$30,%xmm8
 	addl	8(%rsp),%ebp
 	andl	%ecx,%esi
-	por	%xmm8,%xmm0
 	xorl	%edx,%ecx
+	por	%xmm8,%xmm0
 	rorl	$7,%ebx
-	movdqa	%xmm0,%xmm9
 	movl	%eax,%edi
 	xorl	%ecx,%esi
 	roll	$5,%eax
+	pshufd	$238,%xmm7,%xmm9
 	addl	%esi,%ebp
 	xorl	%ebx,%edi
 	xorl	%ecx,%ebx
@@ -2085,47 +2254,47 @@ _ssse3_shortcut:
 	xorl	%eax,%esi
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
-	addl	16(%rsp),%ecx
 	pxor	%xmm5,%xmm1
-.byte	102,68,15,58,15,207,8
+	addl	16(%rsp),%ecx
 	andl	%eax,%esi
 	xorl	%ebx,%eax
 	rorl	$7,%ebp
-	pxor	%xmm2,%xmm1
+	punpcklqdq	%xmm0,%xmm9
 	movl	%edx,%edi
 	xorl	%eax,%esi
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm0,%xmm10
+	pxor	%xmm2,%xmm1
 	roll	$5,%edx
 	addl	%esi,%ecx
-	pxor	%xmm9,%xmm1
+	movdqa	%xmm10,%xmm8
 	xorl	%ebp,%edi
+	paddd	%xmm0,%xmm10
 	xorl	%eax,%ebp
+	pxor	%xmm9,%xmm1
 	addl	%edx,%ecx
 	addl	20(%rsp),%ebx
-	movdqa	%xmm1,%xmm9
-	movdqa	%xmm10,0(%rsp)
 	andl	%ebp,%edi
 	xorl	%eax,%ebp
 	rorl	$7,%edx
+	movdqa	%xmm1,%xmm9
 	movl	%ecx,%esi
-	pslld	$2,%xmm1
 	xorl	%ebp,%edi
+	movdqa	%xmm10,0(%rsp)
 	roll	$5,%ecx
-	psrld	$30,%xmm9
 	addl	%edi,%ebx
 	xorl	%edx,%esi
+	pslld	$2,%xmm1
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
+	psrld	$30,%xmm9
 	addl	24(%rsp),%eax
 	andl	%edx,%esi
-	por	%xmm9,%xmm1
 	xorl	%ebp,%edx
+	por	%xmm9,%xmm1
 	rorl	$7,%ecx
-	movdqa	%xmm1,%xmm10
 	movl	%ebx,%edi
 	xorl	%edx,%esi
 	roll	$5,%ebx
+	pshufd	$238,%xmm0,%xmm10
 	addl	%esi,%eax
 	xorl	%ecx,%edi
 	xorl	%edx,%ecx
@@ -2141,47 +2310,47 @@ _ssse3_shortcut:
 	xorl	%ebx,%esi
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
-	addl	32(%rsp),%edx
 	pxor	%xmm6,%xmm2
-.byte	102,68,15,58,15,208,8
+	addl	32(%rsp),%edx
 	andl	%ebx,%esi
 	xorl	%ecx,%ebx
 	rorl	$7,%eax
-	pxor	%xmm3,%xmm2
+	punpcklqdq	%xmm1,%xmm10
 	movl	%ebp,%edi
 	xorl	%ebx,%esi
-	movdqa	%xmm8,%xmm9
-	paddd	%xmm1,%xmm8
+	pxor	%xmm3,%xmm2
 	roll	$5,%ebp
 	addl	%esi,%edx
-	pxor	%xmm10,%xmm2
+	movdqa	%xmm8,%xmm9
 	xorl	%eax,%edi
+	paddd	%xmm1,%xmm8
 	xorl	%ebx,%eax
+	pxor	%xmm10,%xmm2
 	addl	%ebp,%edx
 	addl	36(%rsp),%ecx
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm8,16(%rsp)
 	andl	%eax,%edi
 	xorl	%ebx,%eax
 	rorl	$7,%ebp
+	movdqa	%xmm2,%xmm10
 	movl	%edx,%esi
-	pslld	$2,%xmm2
 	xorl	%eax,%edi
+	movdqa	%xmm8,16(%rsp)
 	roll	$5,%edx
-	psrld	$30,%xmm10
 	addl	%edi,%ecx
 	xorl	%ebp,%esi
+	pslld	$2,%xmm2
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
+	psrld	$30,%xmm10
 	addl	40(%rsp),%ebx
 	andl	%ebp,%esi
-	por	%xmm10,%xmm2
 	xorl	%eax,%ebp
+	por	%xmm10,%xmm2
 	rorl	$7,%edx
-	movdqa	%xmm2,%xmm8
 	movl	%ecx,%edi
 	xorl	%ebp,%esi
 	roll	$5,%ecx
+	pshufd	$238,%xmm1,%xmm8
 	addl	%esi,%ebx
 	xorl	%edx,%edi
 	xorl	%ebp,%edx
@@ -2196,18 +2365,18 @@ _ssse3_shortcut:
 	addl	%edi,%eax
 	xorl	%edx,%esi
 	addl	%ebx,%eax
-	addl	48(%rsp),%ebp
 	pxor	%xmm7,%xmm3
-.byte	102,68,15,58,15,193,8
+	addl	48(%rsp),%ebp
 	xorl	%ecx,%esi
+	punpcklqdq	%xmm2,%xmm8
 	movl	%eax,%edi
 	roll	$5,%eax
 	pxor	%xmm4,%xmm3
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	movdqa	%xmm9,%xmm10
-	paddd	%xmm2,%xmm9
 	rorl	$7,%ebx
+	paddd	%xmm2,%xmm9
 	addl	%eax,%ebp
 	pxor	%xmm8,%xmm3
 	addl	52(%rsp),%edx
@@ -2215,22 +2384,22 @@ _ssse3_shortcut:
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	movdqa	%xmm3,%xmm8
-	movdqa	%xmm9,32(%rsp)
 	addl	%edi,%edx
 	xorl	%ebx,%esi
+	movdqa	%xmm9,32(%rsp)
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	pslld	$2,%xmm3
 	addl	56(%rsp),%ecx
+	pslld	$2,%xmm3
 	xorl	%eax,%esi
-	psrld	$30,%xmm8
 	movl	%edx,%edi
+	psrld	$30,%xmm8
 	roll	$5,%edx
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
-	addl	%edx,%ecx
 	por	%xmm8,%xmm3
+	addl	%edx,%ecx
 	addl	60(%rsp),%ebx
 	xorl	%ebp,%edi
 	movl	%ecx,%esi
@@ -2240,13 +2409,13 @@ _ssse3_shortcut:
 	rorl	$7,%edx
 	addl	%ecx,%ebx
 	addl	0(%rsp),%eax
-	paddd	%xmm3,%xmm10
 	xorl	%edx,%esi
 	movl	%ebx,%edi
 	roll	$5,%ebx
+	paddd	%xmm3,%xmm10
 	addl	%esi,%eax
-	movdqa	%xmm10,48(%rsp)
 	xorl	%edx,%edi
+	movdqa	%xmm10,48(%rsp)
 	rorl	$7,%ecx
 	addl	%ebx,%eax
 	addl	4(%rsp),%ebp
@@ -2275,8 +2444,8 @@ _ssse3_shortcut:
 	addl	%edx,%ecx
 	cmpq	%r10,%r9
 	je	.Ldone_ssse3
-	movdqa	64(%r11),%xmm6
-	movdqa	0(%r11),%xmm9
+	movdqa	64(%r14),%xmm6
+	movdqa	-64(%r14),%xmm9
 	movdqu	0(%r9),%xmm0
 	movdqu	16(%r9),%xmm1
 	movdqu	32(%r9),%xmm2
@@ -2285,23 +2454,23 @@ _ssse3_shortcut:
 	addq	$64,%r9
 	addl	16(%rsp),%ebx
 	xorl	%ebp,%esi
-.byte	102,15,56,0,206
 	movl	%ecx,%edi
+.byte	102,15,56,0,206
 	roll	$5,%ecx
-	paddd	%xmm9,%xmm0
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	rorl	$7,%edx
+	paddd	%xmm9,%xmm0
 	addl	%ecx,%ebx
-	movdqa	%xmm0,0(%rsp)
 	addl	20(%rsp),%eax
 	xorl	%edx,%edi
-	psubd	%xmm9,%xmm0
 	movl	%ebx,%esi
+	movdqa	%xmm0,0(%rsp)
 	roll	$5,%ebx
 	addl	%edi,%eax
 	xorl	%edx,%esi
 	rorl	$7,%ecx
+	psubd	%xmm9,%xmm0
 	addl	%ebx,%eax
 	addl	24(%rsp),%ebp
 	xorl	%ecx,%esi
@@ -2321,23 +2490,23 @@ _ssse3_shortcut:
 	addl	%ebp,%edx
 	addl	32(%rsp),%ecx
 	xorl	%eax,%esi
-.byte	102,15,56,0,214
 	movl	%edx,%edi
+.byte	102,15,56,0,214
 	roll	$5,%edx
-	paddd	%xmm9,%xmm1
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
+	paddd	%xmm9,%xmm1
 	addl	%edx,%ecx
-	movdqa	%xmm1,16(%rsp)
 	addl	36(%rsp),%ebx
 	xorl	%ebp,%edi
-	psubd	%xmm9,%xmm1
 	movl	%ecx,%esi
+	movdqa	%xmm1,16(%rsp)
 	roll	$5,%ecx
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
 	rorl	$7,%edx
+	psubd	%xmm9,%xmm1
 	addl	%ecx,%ebx
 	addl	40(%rsp),%eax
 	xorl	%edx,%esi
@@ -2357,23 +2526,23 @@ _ssse3_shortcut:
 	addl	%eax,%ebp
 	addl	48(%rsp),%edx
 	xorl	%ebx,%esi
-.byte	102,15,56,0,222
 	movl	%ebp,%edi
+.byte	102,15,56,0,222
 	roll	$5,%ebp
-	paddd	%xmm9,%xmm2
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	rorl	$7,%eax
+	paddd	%xmm9,%xmm2
 	addl	%ebp,%edx
-	movdqa	%xmm2,32(%rsp)
 	addl	52(%rsp),%ecx
 	xorl	%eax,%edi
-	psubd	%xmm9,%xmm2
 	movl	%edx,%esi
+	movdqa	%xmm2,32(%rsp)
 	roll	$5,%edx
 	addl	%edi,%ecx
 	xorl	%eax,%esi
 	rorl	$7,%ebp
+	psubd	%xmm9,%xmm2
 	addl	%edx,%ecx
 	addl	56(%rsp),%ebx
 	xorl	%ebp,%esi
@@ -2513,29 +2682,2911 @@ _ssse3_shortcut:
 	movl	%ecx,8(%r8)
 	movl	%edx,12(%r8)
 	movl	%ebp,16(%r8)
-	movaps	64+0(%rsp),%xmm6
-	movaps	64+16(%rsp),%xmm7
-	movaps	64+32(%rsp),%xmm8
-	movaps	64+48(%rsp),%xmm9
-	movaps	64+64(%rsp),%xmm10
-	movaps	64+80(%rsp),%xmm11
-	leaq	160(%rsp),%rsi
-	movq	0(%rsi),%r12
-	movq	8(%rsi),%rbp
-	movq	16(%rsi),%rbx
-	leaq	24(%rsi),%rsp
+	movaps	-40-96(%r11),%xmm6
+	movaps	-40-80(%r11),%xmm7
+	movaps	-40-64(%r11),%xmm8
+	movaps	-40-48(%r11),%xmm9
+	movaps	-40-32(%r11),%xmm10
+	movaps	-40-16(%r11),%xmm11
+	movq	-40(%r11),%r14
+
+	movq	-32(%r11),%r13
+
+	movq	-24(%r11),%r12
+
+	movq	-16(%r11),%rbp
+
+	movq	-8(%r11),%rbx
+
+	leaq	(%r11),%rsp
+
 .Lepilogue_ssse3:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
+
 .LSEH_end_sha1_block_data_order_ssse3:
+.def	sha1_block_data_order_avx;	.scl 3;	.type 32;	.endef
+.p2align	4
+sha1_block_data_order_avx:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha1_block_data_order_avx:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+_avx_shortcut:
+
+	movq	%rsp,%r11
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	leaq	-160(%rsp),%rsp
+	vzeroupper
+	vmovaps	%xmm6,-40-96(%r11)
+	vmovaps	%xmm7,-40-80(%r11)
+	vmovaps	%xmm8,-40-64(%r11)
+	vmovaps	%xmm9,-40-48(%r11)
+	vmovaps	%xmm10,-40-32(%r11)
+	vmovaps	%xmm11,-40-16(%r11)
+.Lprologue_avx:
+	andq	$-64,%rsp
+	movq	%rdi,%r8
+	movq	%rsi,%r9
+	movq	%rdx,%r10
+
+	shlq	$6,%r10
+	addq	%r9,%r10
+	leaq	K_XX_XX+64(%rip),%r14
+
+	movl	0(%r8),%eax
+	movl	4(%r8),%ebx
+	movl	8(%r8),%ecx
+	movl	12(%r8),%edx
+	movl	%ebx,%esi
+	movl	16(%r8),%ebp
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	andl	%edi,%esi
+
+	vmovdqa	64(%r14),%xmm6
+	vmovdqa	-64(%r14),%xmm11
+	vmovdqu	0(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	vpshufb	%xmm6,%xmm0,%xmm0
+	addq	$64,%r9
+	vpshufb	%xmm6,%xmm1,%xmm1
+	vpshufb	%xmm6,%xmm2,%xmm2
+	vpshufb	%xmm6,%xmm3,%xmm3
+	vpaddd	%xmm11,%xmm0,%xmm4
+	vpaddd	%xmm11,%xmm1,%xmm5
+	vpaddd	%xmm11,%xmm2,%xmm6
+	vmovdqa	%xmm4,0(%rsp)
+	vmovdqa	%xmm5,16(%rsp)
+	vmovdqa	%xmm6,32(%rsp)
+	jmp	.Loop_avx
+.p2align	4
+.Loop_avx:
+	shrdl	$2,%ebx,%ebx
+	xorl	%edx,%esi
+	vpalignr	$8,%xmm0,%xmm1,%xmm4
+	movl	%eax,%edi
+	addl	0(%rsp),%ebp
+	vpaddd	%xmm3,%xmm11,%xmm9
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vpsrldq	$4,%xmm3,%xmm8
+	addl	%esi,%ebp
+	andl	%ebx,%edi
+	vpxor	%xmm0,%xmm4,%xmm4
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm2,%xmm8,%xmm8
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%edi
+	movl	%ebp,%esi
+	addl	4(%rsp),%edx
+	vpxor	%xmm8,%xmm4,%xmm4
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vmovdqa	%xmm9,48(%rsp)
+	addl	%edi,%edx
+	andl	%eax,%esi
+	vpsrld	$31,%xmm4,%xmm8
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%esi
+	vpslldq	$12,%xmm4,%xmm10
+	vpaddd	%xmm4,%xmm4,%xmm4
+	movl	%edx,%edi
+	addl	8(%rsp),%ecx
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm4,%xmm4
+	addl	%esi,%ecx
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm4,%xmm4
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%edi
+	movl	%ecx,%esi
+	addl	12(%rsp),%ebx
+	vpxor	%xmm10,%xmm4,%xmm4
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	andl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%esi
+	vpalignr	$8,%xmm1,%xmm2,%xmm5
+	movl	%ebx,%edi
+	addl	16(%rsp),%eax
+	vpaddd	%xmm4,%xmm11,%xmm9
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vpsrldq	$4,%xmm4,%xmm8
+	addl	%esi,%eax
+	andl	%ecx,%edi
+	vpxor	%xmm1,%xmm5,%xmm5
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpxor	%xmm3,%xmm8,%xmm8
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%edi
+	movl	%eax,%esi
+	addl	20(%rsp),%ebp
+	vpxor	%xmm8,%xmm5,%xmm5
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%ebp
+	andl	%ebx,%esi
+	vpsrld	$31,%xmm5,%xmm8
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%esi
+	vpslldq	$12,%xmm5,%xmm10
+	vpaddd	%xmm5,%xmm5,%xmm5
+	movl	%ebp,%edi
+	addl	24(%rsp),%edx
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm5,%xmm5
+	addl	%esi,%edx
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm5,%xmm5
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%edi
+	movl	%edx,%esi
+	addl	28(%rsp),%ecx
+	vpxor	%xmm10,%xmm5,%xmm5
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vmovdqa	-32(%r14),%xmm11
+	addl	%edi,%ecx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%esi
+	vpalignr	$8,%xmm2,%xmm3,%xmm6
+	movl	%ecx,%edi
+	addl	32(%rsp),%ebx
+	vpaddd	%xmm5,%xmm11,%xmm9
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	vpsrldq	$4,%xmm5,%xmm8
+	addl	%esi,%ebx
+	andl	%edx,%edi
+	vpxor	%xmm2,%xmm6,%xmm6
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	vpxor	%xmm4,%xmm8,%xmm8
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%edi
+	movl	%ebx,%esi
+	addl	36(%rsp),%eax
+	vpxor	%xmm8,%xmm6,%xmm6
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vmovdqa	%xmm9,16(%rsp)
+	addl	%edi,%eax
+	andl	%ecx,%esi
+	vpsrld	$31,%xmm6,%xmm8
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%esi
+	vpslldq	$12,%xmm6,%xmm10
+	vpaddd	%xmm6,%xmm6,%xmm6
+	movl	%eax,%edi
+	addl	40(%rsp),%ebp
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm6,%xmm6
+	addl	%esi,%ebp
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm6,%xmm6
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%edi
+	movl	%ebp,%esi
+	addl	44(%rsp),%edx
+	vpxor	%xmm10,%xmm6,%xmm6
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	andl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%esi
+	vpalignr	$8,%xmm3,%xmm4,%xmm7
+	movl	%edx,%edi
+	addl	48(%rsp),%ecx
+	vpaddd	%xmm6,%xmm11,%xmm9
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpsrldq	$4,%xmm6,%xmm8
+	addl	%esi,%ecx
+	andl	%ebp,%edi
+	vpxor	%xmm3,%xmm7,%xmm7
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpxor	%xmm5,%xmm8,%xmm8
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%edi
+	movl	%ecx,%esi
+	addl	52(%rsp),%ebx
+	vpxor	%xmm8,%xmm7,%xmm7
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%ebx
+	andl	%edx,%esi
+	vpsrld	$31,%xmm7,%xmm8
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%esi
+	vpslldq	$12,%xmm7,%xmm10
+	vpaddd	%xmm7,%xmm7,%xmm7
+	movl	%ebx,%edi
+	addl	56(%rsp),%eax
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm7,%xmm7
+	addl	%esi,%eax
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm7,%xmm7
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%edi
+	movl	%eax,%esi
+	addl	60(%rsp),%ebp
+	vpxor	%xmm10,%xmm7,%xmm7
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	andl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	vpxor	%xmm4,%xmm0,%xmm0
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%esi
+	movl	%ebp,%edi
+	addl	0(%rsp),%edx
+	vpxor	%xmm1,%xmm0,%xmm0
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vpaddd	%xmm7,%xmm11,%xmm9
+	addl	%esi,%edx
+	andl	%eax,%edi
+	vpxor	%xmm8,%xmm0,%xmm0
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%edi
+	vpsrld	$30,%xmm0,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	movl	%edx,%esi
+	addl	4(%rsp),%ecx
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpslld	$2,%xmm0,%xmm0
+	addl	%edi,%ecx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%esi
+	movl	%ecx,%edi
+	addl	8(%rsp),%ebx
+	vpor	%xmm8,%xmm0,%xmm0
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	12(%rsp),%eax
+	xorl	%ebp,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	vpxor	%xmm5,%xmm1,%xmm1
+	addl	16(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	vpxor	%xmm2,%xmm1,%xmm1
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	vpaddd	%xmm0,%xmm11,%xmm9
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm8,%xmm1,%xmm1
+	addl	20(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm1,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm1,%xmm1
+	addl	24(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpor	%xmm8,%xmm1,%xmm1
+	addl	28(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	vpxor	%xmm6,%xmm2,%xmm2
+	addl	32(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	vpxor	%xmm3,%xmm2,%xmm2
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	vpaddd	%xmm1,%xmm11,%xmm9
+	vmovdqa	0(%r14),%xmm11
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpxor	%xmm8,%xmm2,%xmm2
+	addl	36(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	vpsrld	$30,%xmm2,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpslld	$2,%xmm2,%xmm2
+	addl	40(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpor	%xmm8,%xmm2,%xmm2
+	addl	44(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	vpxor	%xmm7,%xmm3,%xmm3
+	addl	48(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	vpxor	%xmm4,%xmm3,%xmm3
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	vpaddd	%xmm2,%xmm11,%xmm9
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpxor	%xmm8,%xmm3,%xmm3
+	addl	52(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	vpsrld	$30,%xmm3,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpslld	$2,%xmm3,%xmm3
+	addl	56(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpor	%xmm8,%xmm3,%xmm3
+	addl	60(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	vpxor	%xmm0,%xmm4,%xmm4
+	addl	0(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	vpxor	%xmm5,%xmm4,%xmm4
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	vpaddd	%xmm3,%xmm11,%xmm9
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpxor	%xmm8,%xmm4,%xmm4
+	addl	4(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	vpsrld	$30,%xmm4,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpslld	$2,%xmm4,%xmm4
+	addl	8(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpor	%xmm8,%xmm4,%xmm4
+	addl	12(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	vpxor	%xmm1,%xmm5,%xmm5
+	addl	16(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	vpxor	%xmm6,%xmm5,%xmm5
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	vpaddd	%xmm4,%xmm11,%xmm9
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpxor	%xmm8,%xmm5,%xmm5
+	addl	20(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	vpsrld	$30,%xmm5,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpslld	$2,%xmm5,%xmm5
+	addl	24(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpor	%xmm8,%xmm5,%xmm5
+	addl	28(%rsp),%eax
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%ecx,%esi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	vpxor	%xmm2,%xmm6,%xmm6
+	addl	32(%rsp),%ebp
+	andl	%ecx,%esi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%eax,%edi
+	xorl	%ecx,%esi
+	vpaddd	%xmm5,%xmm11,%xmm9
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	vpxor	%xmm8,%xmm6,%xmm6
+	xorl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	36(%rsp),%edx
+	vpsrld	$30,%xmm6,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%esi
+	vpslld	$2,%xmm6,%xmm6
+	xorl	%ebx,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	40(%rsp),%ecx
+	andl	%eax,%esi
+	vpor	%xmm8,%xmm6,%xmm6
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%edi
+	xorl	%eax,%esi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	44(%rsp),%ebx
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%esi
+	xorl	%ebp,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	vpxor	%xmm3,%xmm7,%xmm7
+	addl	48(%rsp),%eax
+	andl	%edx,%esi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	vpxor	%xmm0,%xmm7,%xmm7
+	movl	%ebx,%edi
+	xorl	%edx,%esi
+	vpaddd	%xmm6,%xmm11,%xmm9
+	vmovdqa	32(%r14),%xmm11
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	vpxor	%xmm8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	52(%rsp),%ebp
+	vpsrld	$30,%xmm7,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%esi
+	vpslld	$2,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	56(%rsp),%edx
+	andl	%ebx,%esi
+	vpor	%xmm8,%xmm7,%xmm7
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	60(%rsp),%ecx
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%esi
+	xorl	%eax,%edi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	vpxor	%xmm4,%xmm0,%xmm0
+	addl	0(%rsp),%ebx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	vpxor	%xmm1,%xmm0,%xmm0
+	movl	%ecx,%edi
+	xorl	%ebp,%esi
+	vpaddd	%xmm7,%xmm11,%xmm9
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	vpxor	%xmm8,%xmm0,%xmm0
+	xorl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	4(%rsp),%eax
+	vpsrld	$30,%xmm0,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	vpslld	$2,%xmm0,%xmm0
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%ecx,%esi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	8(%rsp),%ebp
+	andl	%ecx,%esi
+	vpor	%xmm8,%xmm0,%xmm0
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%edi
+	xorl	%ecx,%esi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	12(%rsp),%edx
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%esi
+	xorl	%ebx,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	vpxor	%xmm5,%xmm1,%xmm1
+	addl	16(%rsp),%ecx
+	andl	%eax,%esi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	vpxor	%xmm2,%xmm1,%xmm1
+	movl	%edx,%edi
+	xorl	%eax,%esi
+	vpaddd	%xmm0,%xmm11,%xmm9
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	vpxor	%xmm8,%xmm1,%xmm1
+	xorl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	20(%rsp),%ebx
+	vpsrld	$30,%xmm1,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%esi
+	vpslld	$2,%xmm1,%xmm1
+	xorl	%ebp,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	24(%rsp),%eax
+	andl	%edx,%esi
+	vpor	%xmm8,%xmm1,%xmm1
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%edi
+	xorl	%edx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	28(%rsp),%ebp
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%esi
+	xorl	%ecx,%edi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	vpxor	%xmm6,%xmm2,%xmm2
+	addl	32(%rsp),%edx
+	andl	%ebx,%esi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	vpxor	%xmm3,%xmm2,%xmm2
+	movl	%ebp,%edi
+	xorl	%ebx,%esi
+	vpaddd	%xmm1,%xmm11,%xmm9
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	vpxor	%xmm8,%xmm2,%xmm2
+	xorl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	36(%rsp),%ecx
+	vpsrld	$30,%xmm2,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%esi
+	vpslld	$2,%xmm2,%xmm2
+	xorl	%eax,%edi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	40(%rsp),%ebx
+	andl	%ebp,%esi
+	vpor	%xmm8,%xmm2,%xmm2
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%edi
+	xorl	%ebp,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	44(%rsp),%eax
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	vpxor	%xmm7,%xmm3,%xmm3
+	addl	48(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	vpxor	%xmm4,%xmm3,%xmm3
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	vpaddd	%xmm2,%xmm11,%xmm9
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm8,%xmm3,%xmm3
+	addl	52(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm3,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm3,%xmm3
+	addl	56(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpor	%xmm8,%xmm3,%xmm3
+	addl	60(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	0(%rsp),%eax
+	vpaddd	%xmm3,%xmm11,%xmm9
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	vmovdqa	%xmm9,48(%rsp)
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	4(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	8(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	12(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	cmpq	%r10,%r9
+	je	.Ldone_avx
+	vmovdqa	64(%r14),%xmm6
+	vmovdqa	-64(%r14),%xmm11
+	vmovdqu	0(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	vpshufb	%xmm6,%xmm0,%xmm0
+	addq	$64,%r9
+	addl	16(%rsp),%ebx
+	xorl	%ebp,%esi
+	vpshufb	%xmm6,%xmm1,%xmm1
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	vpaddd	%xmm11,%xmm0,%xmm4
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vmovdqa	%xmm4,0(%rsp)
+	addl	20(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	24(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	28(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	32(%rsp),%ecx
+	xorl	%eax,%esi
+	vpshufb	%xmm6,%xmm2,%xmm2
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	vpaddd	%xmm11,%xmm1,%xmm5
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vmovdqa	%xmm5,16(%rsp)
+	addl	36(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	40(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	44(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	48(%rsp),%edx
+	xorl	%ebx,%esi
+	vpshufb	%xmm6,%xmm3,%xmm3
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	vpaddd	%xmm11,%xmm2,%xmm6
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vmovdqa	%xmm6,32(%rsp)
+	addl	52(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	56(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	60(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	0(%r8),%eax
+	addl	4(%r8),%esi
+	addl	8(%r8),%ecx
+	addl	12(%r8),%edx
+	movl	%eax,0(%r8)
+	addl	16(%r8),%ebp
+	movl	%esi,4(%r8)
+	movl	%esi,%ebx
+	movl	%ecx,8(%r8)
+	movl	%ecx,%edi
+	movl	%edx,12(%r8)
+	xorl	%edx,%edi
+	movl	%ebp,16(%r8)
+	andl	%edi,%esi
+	jmp	.Loop_avx
+
+.p2align	4
+.Ldone_avx:
+	addl	16(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	20(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	24(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	28(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	32(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	36(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	40(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	44(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	48(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	52(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	56(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	60(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vzeroupper
+
+	addl	0(%r8),%eax
+	addl	4(%r8),%esi
+	addl	8(%r8),%ecx
+	movl	%eax,0(%r8)
+	addl	12(%r8),%edx
+	movl	%esi,4(%r8)
+	addl	16(%r8),%ebp
+	movl	%ecx,8(%r8)
+	movl	%edx,12(%r8)
+	movl	%ebp,16(%r8)
+	movaps	-40-96(%r11),%xmm6
+	movaps	-40-80(%r11),%xmm7
+	movaps	-40-64(%r11),%xmm8
+	movaps	-40-48(%r11),%xmm9
+	movaps	-40-32(%r11),%xmm10
+	movaps	-40-16(%r11),%xmm11
+	movq	-40(%r11),%r14
+
+	movq	-32(%r11),%r13
+
+	movq	-24(%r11),%r12
+
+	movq	-16(%r11),%rbp
+
+	movq	-8(%r11),%rbx
+
+	leaq	(%r11),%rsp
+
+.Lepilogue_avx:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_sha1_block_data_order_avx:
+.def	sha1_block_data_order_avx2;	.scl 3;	.type 32;	.endef
+.p2align	4
+sha1_block_data_order_avx2:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha1_block_data_order_avx2:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+_avx2_shortcut:
+
+	movq	%rsp,%r11
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	vzeroupper
+	leaq	-96(%rsp),%rsp
+	vmovaps	%xmm6,-40-96(%r11)
+	vmovaps	%xmm7,-40-80(%r11)
+	vmovaps	%xmm8,-40-64(%r11)
+	vmovaps	%xmm9,-40-48(%r11)
+	vmovaps	%xmm10,-40-32(%r11)
+	vmovaps	%xmm11,-40-16(%r11)
+.Lprologue_avx2:
+	movq	%rdi,%r8
+	movq	%rsi,%r9
+	movq	%rdx,%r10
+
+	leaq	-640(%rsp),%rsp
+	shlq	$6,%r10
+	leaq	64(%r9),%r13
+	andq	$-128,%rsp
+	addq	%r9,%r10
+	leaq	K_XX_XX+64(%rip),%r14
+
+	movl	0(%r8),%eax
+	cmpq	%r10,%r13
+	cmovaeq	%r9,%r13
+	movl	4(%r8),%ebp
+	movl	8(%r8),%ecx
+	movl	12(%r8),%edx
+	movl	16(%r8),%esi
+	vmovdqu	64(%r14),%ymm6
+
+	vmovdqu	(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	leaq	64(%r9),%r9
+	vinserti128	$1,(%r13),%ymm0,%ymm0
+	vinserti128	$1,16(%r13),%ymm1,%ymm1
+	vpshufb	%ymm6,%ymm0,%ymm0
+	vinserti128	$1,32(%r13),%ymm2,%ymm2
+	vpshufb	%ymm6,%ymm1,%ymm1
+	vinserti128	$1,48(%r13),%ymm3,%ymm3
+	vpshufb	%ymm6,%ymm2,%ymm2
+	vmovdqu	-64(%r14),%ymm11
+	vpshufb	%ymm6,%ymm3,%ymm3
+
+	vpaddd	%ymm11,%ymm0,%ymm4
+	vpaddd	%ymm11,%ymm1,%ymm5
+	vmovdqu	%ymm4,0(%rsp)
+	vpaddd	%ymm11,%ymm2,%ymm6
+	vmovdqu	%ymm5,32(%rsp)
+	vpaddd	%ymm11,%ymm3,%ymm7
+	vmovdqu	%ymm6,64(%rsp)
+	vmovdqu	%ymm7,96(%rsp)
+	vpalignr	$8,%ymm0,%ymm1,%ymm4
+	vpsrldq	$4,%ymm3,%ymm8
+	vpxor	%ymm0,%ymm4,%ymm4
+	vpxor	%ymm2,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm4,%ymm4
+	vpsrld	$31,%ymm4,%ymm8
+	vpslldq	$12,%ymm4,%ymm10
+	vpaddd	%ymm4,%ymm4,%ymm4
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm4,%ymm4
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm4,%ymm4
+	vpxor	%ymm10,%ymm4,%ymm4
+	vpaddd	%ymm11,%ymm4,%ymm9
+	vmovdqu	%ymm9,128(%rsp)
+	vpalignr	$8,%ymm1,%ymm2,%ymm5
+	vpsrldq	$4,%ymm4,%ymm8
+	vpxor	%ymm1,%ymm5,%ymm5
+	vpxor	%ymm3,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm5,%ymm5
+	vpsrld	$31,%ymm5,%ymm8
+	vmovdqu	-32(%r14),%ymm11
+	vpslldq	$12,%ymm5,%ymm10
+	vpaddd	%ymm5,%ymm5,%ymm5
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm5,%ymm5
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm5,%ymm5
+	vpxor	%ymm10,%ymm5,%ymm5
+	vpaddd	%ymm11,%ymm5,%ymm9
+	vmovdqu	%ymm9,160(%rsp)
+	vpalignr	$8,%ymm2,%ymm3,%ymm6
+	vpsrldq	$4,%ymm5,%ymm8
+	vpxor	%ymm2,%ymm6,%ymm6
+	vpxor	%ymm4,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm6,%ymm6
+	vpsrld	$31,%ymm6,%ymm8
+	vpslldq	$12,%ymm6,%ymm10
+	vpaddd	%ymm6,%ymm6,%ymm6
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm6,%ymm6
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm6,%ymm6
+	vpxor	%ymm10,%ymm6,%ymm6
+	vpaddd	%ymm11,%ymm6,%ymm9
+	vmovdqu	%ymm9,192(%rsp)
+	vpalignr	$8,%ymm3,%ymm4,%ymm7
+	vpsrldq	$4,%ymm6,%ymm8
+	vpxor	%ymm3,%ymm7,%ymm7
+	vpxor	%ymm5,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm7,%ymm7
+	vpsrld	$31,%ymm7,%ymm8
+	vpslldq	$12,%ymm7,%ymm10
+	vpaddd	%ymm7,%ymm7,%ymm7
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm7,%ymm7
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm7,%ymm7
+	vpxor	%ymm10,%ymm7,%ymm7
+	vpaddd	%ymm11,%ymm7,%ymm9
+	vmovdqu	%ymm9,224(%rsp)
+	leaq	128(%rsp),%r13
+	jmp	.Loop_avx2
+.p2align	5
+.Loop_avx2:
+	rorxl	$2,%ebp,%ebx
+	andnl	%edx,%ebp,%edi
+	andl	%ecx,%ebp
+	xorl	%edi,%ebp
+	jmp	.Lalign32_1
+.p2align	5
+.Lalign32_1:
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	vpxor	%ymm4,%ymm0,%ymm0
+	addl	-128(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	vpxor	%ymm1,%ymm0,%ymm0
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpxor	%ymm8,%ymm0,%ymm0
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	vpsrld	$30,%ymm0,%ymm8
+	vpslld	$2,%ymm0,%ymm0
+	addl	-124(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	vpor	%ymm8,%ymm0,%ymm0
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-120(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	vpaddd	%ymm11,%ymm0,%ymm9
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	vmovdqu	%ymm9,256(%rsp)
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-116(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-96(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	vpxor	%ymm5,%ymm1,%ymm1
+	addl	-92(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	vpxor	%ymm2,%ymm1,%ymm1
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	vpxor	%ymm8,%ymm1,%ymm1
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	vpsrld	$30,%ymm1,%ymm8
+	vpslld	$2,%ymm1,%ymm1
+	addl	-88(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	vpor	%ymm8,%ymm1,%ymm1
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-84(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	vmovdqu	%ymm9,288(%rsp)
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-64(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-60(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	vpxor	%ymm6,%ymm2,%ymm2
+	addl	-56(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	vpxor	%ymm3,%ymm2,%ymm2
+	vmovdqu	0(%r14),%ymm11
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpxor	%ymm8,%ymm2,%ymm2
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	vpsrld	$30,%ymm2,%ymm8
+	vpslld	$2,%ymm2,%ymm2
+	addl	-52(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	vpor	%ymm8,%ymm2,%ymm2
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-32(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	vpaddd	%ymm11,%ymm2,%ymm9
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	vmovdqu	%ymm9,320(%rsp)
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-28(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-24(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	vpxor	%ymm7,%ymm3,%ymm3
+	addl	-20(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	vpxor	%ymm4,%ymm3,%ymm3
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpxor	%ymm8,%ymm3,%ymm3
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	vpsrld	$30,%ymm3,%ymm8
+	vpslld	$2,%ymm3,%ymm3
+	addl	0(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	vpor	%ymm8,%ymm3,%ymm3
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	4(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	vpaddd	%ymm11,%ymm3,%ymm9
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	vmovdqu	%ymm9,352(%rsp)
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	8(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	12(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vpalignr	$8,%ymm2,%ymm3,%ymm8
+	vpxor	%ymm0,%ymm4,%ymm4
+	addl	32(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpxor	%ymm8,%ymm4,%ymm4
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	36(%r13),%ebx
+	vpsrld	$30,%ymm4,%ymm8
+	vpslld	$2,%ymm4,%ymm4
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vpor	%ymm8,%ymm4,%ymm4
+	addl	40(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpaddd	%ymm11,%ymm4,%ymm9
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	44(%r13),%eax
+	vmovdqu	%ymm9,384(%rsp)
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpalignr	$8,%ymm3,%ymm4,%ymm8
+	vpxor	%ymm1,%ymm5,%ymm5
+	addl	68(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm6,%ymm5,%ymm5
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	vpxor	%ymm8,%ymm5,%ymm5
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	72(%r13),%ecx
+	vpsrld	$30,%ymm5,%ymm8
+	vpslld	$2,%ymm5,%ymm5
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	vpor	%ymm8,%ymm5,%ymm5
+	addl	76(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpaddd	%ymm11,%ymm5,%ymm9
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	96(%r13),%ebp
+	vmovdqu	%ymm9,416(%rsp)
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	100(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpalignr	$8,%ymm4,%ymm5,%ymm8
+	vpxor	%ymm2,%ymm6,%ymm6
+	addl	104(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpxor	%ymm7,%ymm6,%ymm6
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	vpxor	%ymm8,%ymm6,%ymm6
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	108(%r13),%edx
+	leaq	256(%r13),%r13
+	vpsrld	$30,%ymm6,%ymm8
+	vpslld	$2,%ymm6,%ymm6
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vpor	%ymm8,%ymm6,%ymm6
+	addl	-128(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpaddd	%ymm11,%ymm6,%ymm9
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-124(%r13),%ebx
+	vmovdqu	%ymm9,448(%rsp)
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-120(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpalignr	$8,%ymm5,%ymm6,%ymm8
+	vpxor	%ymm3,%ymm7,%ymm7
+	addl	-116(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	vpxor	%ymm0,%ymm7,%ymm7
+	vmovdqu	32(%r14),%ymm11
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	vpxor	%ymm8,%ymm7,%ymm7
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-96(%r13),%esi
+	vpsrld	$30,%ymm7,%ymm8
+	vpslld	$2,%ymm7,%ymm7
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpor	%ymm8,%ymm7,%ymm7
+	addl	-92(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpaddd	%ymm11,%ymm7,%ymm9
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-88(%r13),%ecx
+	vmovdqu	%ymm9,480(%rsp)
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-84(%r13),%ebx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	jmp	.Lalign32_2
+.p2align	5
+.Lalign32_2:
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	vpxor	%ymm4,%ymm0,%ymm0
+	addl	-64(%r13),%ebp
+	xorl	%esi,%ecx
+	vpxor	%ymm1,%ymm0,%ymm0
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	vpxor	%ymm8,%ymm0,%ymm0
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	vpsrld	$30,%ymm0,%ymm8
+	vpslld	$2,%ymm0,%ymm0
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-60(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	vpor	%ymm8,%ymm0,%ymm0
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	vpaddd	%ymm11,%ymm0,%ymm9
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	-56(%r13),%esi
+	xorl	%ecx,%ebp
+	vmovdqu	%ymm9,512(%rsp)
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	-52(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	-32(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	vpxor	%ymm5,%ymm1,%ymm1
+	addl	-28(%r13),%ebx
+	xorl	%eax,%edx
+	vpxor	%ymm2,%ymm1,%ymm1
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	vpxor	%ymm8,%ymm1,%ymm1
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vpsrld	$30,%ymm1,%ymm8
+	vpslld	$2,%ymm1,%ymm1
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	-24(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	vpor	%ymm8,%ymm1,%ymm1
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-20(%r13),%eax
+	xorl	%edx,%ebx
+	vmovdqu	%ymm9,544(%rsp)
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	0(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	4(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	vpxor	%ymm6,%ymm2,%ymm2
+	addl	8(%r13),%ecx
+	xorl	%ebp,%esi
+	vpxor	%ymm3,%ymm2,%ymm2
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	vpxor	%ymm8,%ymm2,%ymm2
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpsrld	$30,%ymm2,%ymm8
+	vpslld	$2,%ymm2,%ymm2
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	12(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	vpor	%ymm8,%ymm2,%ymm2
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vpaddd	%ymm11,%ymm2,%ymm9
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	32(%r13),%ebp
+	xorl	%esi,%ecx
+	vmovdqu	%ymm9,576(%rsp)
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	36(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	40(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	vpxor	%ymm7,%ymm3,%ymm3
+	addl	44(%r13),%edx
+	xorl	%ebx,%eax
+	vpxor	%ymm4,%ymm3,%ymm3
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm8,%ymm3,%ymm3
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	vpsrld	$30,%ymm3,%ymm8
+	vpslld	$2,%ymm3,%ymm3
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	64(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	vpor	%ymm8,%ymm3,%ymm3
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpaddd	%ymm11,%ymm3,%ymm9
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	68(%r13),%ebx
+	xorl	%eax,%edx
+	vmovdqu	%ymm9,608(%rsp)
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	72(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	76(%r13),%eax
+	xorl	%edx,%ebx
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	100(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	104(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	108(%r13),%ebx
+	leaq	256(%r13),%r13
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-128(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-124(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-120(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-116(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-96(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-92(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-88(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-84(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-60(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-56(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-52(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-32(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-28(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-24(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-20(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	addl	%r12d,%edx
+	leaq	128(%r9),%r13
+	leaq	128(%r9),%rdi
+	cmpq	%r10,%r13
+	cmovaeq	%r9,%r13
+
+
+	addl	0(%r8),%edx
+	addl	4(%r8),%esi
+	addl	8(%r8),%ebp
+	movl	%edx,0(%r8)
+	addl	12(%r8),%ebx
+	movl	%esi,4(%r8)
+	movl	%edx,%eax
+	addl	16(%r8),%ecx
+	movl	%ebp,%r12d
+	movl	%ebp,8(%r8)
+	movl	%ebx,%edx
+
+	movl	%ebx,12(%r8)
+	movl	%esi,%ebp
+	movl	%ecx,16(%r8)
+
+	movl	%ecx,%esi
+	movl	%r12d,%ecx
+
+
+	cmpq	%r10,%r9
+	je	.Ldone_avx2
+	vmovdqu	64(%r14),%ymm6
+	cmpq	%r10,%rdi
+	ja	.Last_avx2
+
+	vmovdqu	-64(%rdi),%xmm0
+	vmovdqu	-48(%rdi),%xmm1
+	vmovdqu	-32(%rdi),%xmm2
+	vmovdqu	-16(%rdi),%xmm3
+	vinserti128	$1,0(%r13),%ymm0,%ymm0
+	vinserti128	$1,16(%r13),%ymm1,%ymm1
+	vinserti128	$1,32(%r13),%ymm2,%ymm2
+	vinserti128	$1,48(%r13),%ymm3,%ymm3
+	jmp	.Last_avx2
+
+.p2align	5
+.Last_avx2:
+	leaq	128+16(%rsp),%r13
+	rorxl	$2,%ebp,%ebx
+	andnl	%edx,%ebp,%edi
+	andl	%ecx,%ebp
+	xorl	%edi,%ebp
+	subq	$-128,%r9
+	addl	-128(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-124(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-120(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-116(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-96(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	-92(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-88(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-84(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-64(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-60(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-56(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	-52(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-32(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-28(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-24(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-20(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	0(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	4(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	8(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	12(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	32(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	36(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	40(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	44(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vmovdqu	-64(%r14),%ymm11
+	vpshufb	%ymm6,%ymm0,%ymm0
+	addl	68(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	72(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	76(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	96(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	100(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpshufb	%ymm6,%ymm1,%ymm1
+	vpaddd	%ymm11,%ymm0,%ymm8
+	addl	104(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	108(%r13),%edx
+	leaq	256(%r13),%r13
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-128(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-124(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-120(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vmovdqu	%ymm8,0(%rsp)
+	vpshufb	%ymm6,%ymm2,%ymm2
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	-116(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-92(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-88(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-84(%r13),%ebx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	vmovdqu	%ymm9,32(%rsp)
+	vpshufb	%ymm6,%ymm3,%ymm3
+	vpaddd	%ymm11,%ymm2,%ymm6
+	addl	-64(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-60(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	-56(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	-52(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	-32(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	jmp	.Lalign32_3
+.p2align	5
+.Lalign32_3:
+	vmovdqu	%ymm6,64(%rsp)
+	vpaddd	%ymm11,%ymm3,%ymm7
+	addl	-28(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	-24(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-20(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	0(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	4(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	vmovdqu	%ymm7,96(%rsp)
+	addl	8(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	12(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	32(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	36(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	40(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	vpalignr	$8,%ymm0,%ymm1,%ymm4
+	addl	44(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	vpsrldq	$4,%ymm3,%ymm8
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpxor	%ymm0,%ymm4,%ymm4
+	vpxor	%ymm2,%ymm8,%ymm8
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpxor	%ymm8,%ymm4,%ymm4
+	andl	%edi,%esi
+	addl	64(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	vpsrld	$31,%ymm4,%ymm8
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	vpslldq	$12,%ymm4,%ymm10
+	vpaddd	%ymm4,%ymm4,%ymm4
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm4,%ymm4
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm4,%ymm4
+	addl	68(%r13),%ebx
+	xorl	%eax,%edx
+	vpxor	%ymm10,%ymm4,%ymm4
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	vpaddd	%ymm11,%ymm4,%ymm9
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vmovdqu	%ymm9,128(%rsp)
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	72(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	76(%r13),%eax
+	xorl	%edx,%ebx
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpalignr	$8,%ymm1,%ymm2,%ymm5
+	addl	96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpsrldq	$4,%ymm4,%ymm8
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpxor	%ymm1,%ymm5,%ymm5
+	vpxor	%ymm3,%ymm8,%ymm8
+	addl	100(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm8,%ymm5,%ymm5
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpsrld	$31,%ymm5,%ymm8
+	vmovdqu	-32(%r14),%ymm11
+	xorl	%ebx,%esi
+	addl	104(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	vpslldq	$12,%ymm5,%ymm10
+	vpaddd	%ymm5,%ymm5,%ymm5
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm5,%ymm5
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm5,%ymm5
+	xorl	%ebp,%edx
+	addl	108(%r13),%ebx
+	leaq	256(%r13),%r13
+	vpxor	%ymm10,%ymm5,%ymm5
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpaddd	%ymm11,%ymm5,%ymm9
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vmovdqu	%ymm9,160(%rsp)
+	addl	-128(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpalignr	$8,%ymm2,%ymm3,%ymm6
+	addl	-124(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	vpsrldq	$4,%ymm5,%ymm8
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpxor	%ymm2,%ymm6,%ymm6
+	vpxor	%ymm4,%ymm8,%ymm8
+	addl	-120(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpxor	%ymm8,%ymm6,%ymm6
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	vpsrld	$31,%ymm6,%ymm8
+	xorl	%ecx,%eax
+	addl	-116(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpslldq	$12,%ymm6,%ymm10
+	vpaddd	%ymm6,%ymm6,%ymm6
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm6,%ymm6
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm6,%ymm6
+	xorl	%ebx,%esi
+	addl	-96(%r13),%ecx
+	vpxor	%ymm10,%ymm6,%ymm6
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpaddd	%ymm11,%ymm6,%ymm9
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	vmovdqu	%ymm9,192(%rsp)
+	addl	-92(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vpalignr	$8,%ymm3,%ymm4,%ymm7
+	addl	-88(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpsrldq	$4,%ymm6,%ymm8
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpxor	%ymm3,%ymm7,%ymm7
+	vpxor	%ymm5,%ymm8,%ymm8
+	addl	-84(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	vpxor	%ymm8,%ymm7,%ymm7
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	vpsrld	$31,%ymm7,%ymm8
+	xorl	%edx,%ebp
+	addl	-64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpslldq	$12,%ymm7,%ymm10
+	vpaddd	%ymm7,%ymm7,%ymm7
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm7,%ymm7
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm7,%ymm7
+	xorl	%ecx,%eax
+	addl	-60(%r13),%edx
+	vpxor	%ymm10,%ymm7,%ymm7
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpaddd	%ymm11,%ymm7,%ymm9
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vmovdqu	%ymm9,224(%rsp)
+	addl	-56(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-52(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-32(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-28(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-24(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-20(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	addl	%r12d,%edx
+	leaq	128(%rsp),%r13
+
+
+	addl	0(%r8),%edx
+	addl	4(%r8),%esi
+	addl	8(%r8),%ebp
+	movl	%edx,0(%r8)
+	addl	12(%r8),%ebx
+	movl	%esi,4(%r8)
+	movl	%edx,%eax
+	addl	16(%r8),%ecx
+	movl	%ebp,%r12d
+	movl	%ebp,8(%r8)
+	movl	%ebx,%edx
+
+	movl	%ebx,12(%r8)
+	movl	%esi,%ebp
+	movl	%ecx,16(%r8)
+
+	movl	%ecx,%esi
+	movl	%r12d,%ecx
+
+
+	cmpq	%r10,%r9
+	jbe	.Loop_avx2
+
+.Ldone_avx2:
+	vzeroupper
+	movaps	-40-96(%r11),%xmm6
+	movaps	-40-80(%r11),%xmm7
+	movaps	-40-64(%r11),%xmm8
+	movaps	-40-48(%r11),%xmm9
+	movaps	-40-32(%r11),%xmm10
+	movaps	-40-16(%r11),%xmm11
+	movq	-40(%r11),%r14
+
+	movq	-32(%r11),%r13
+
+	movq	-24(%r11),%r12
+
+	movq	-16(%r11),%rbp
+
+	movq	-8(%r11),%rbx
+
+	leaq	(%r11),%rsp
+
+.Lepilogue_avx2:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_sha1_block_data_order_avx2:
 .p2align	6
 K_XX_XX:
-.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999	
-.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1	
-.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc	
-.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6	
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f	
+.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999
+.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999
+.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1
+.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1
+.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc
+.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc
+.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6
+.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.byte	0xf,0xe,0xd,0xc,0xb,0xa,0x9,0x8,0x7,0x6,0x5,0x4,0x3,0x2,0x1,0x0
 .byte	83,72,65,49,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .p2align	6
 
@@ -2567,19 +5618,51 @@ se_handler:
 	jae	.Lcommon_seh_tail
 
 	movq	64(%rax),%rax
-	leaq	32(%rax),%rax
 
 	movq	-8(%rax),%rbx
 	movq	-16(%rax),%rbp
 	movq	-24(%rax),%r12
 	movq	-32(%rax),%r13
+	movq	-40(%rax),%r14
 	movq	%rbx,144(%r8)
 	movq	%rbp,160(%r8)
 	movq	%r12,216(%r8)
 	movq	%r13,224(%r8)
+	movq	%r14,232(%r8)
 
 	jmp	.Lcommon_seh_tail
 
+.def	shaext_handler;	.scl 3;	.type 32;	.endef
+.p2align	4
+shaext_handler:
+	pushq	%rsi
+	pushq	%rdi
+	pushq	%rbx
+	pushq	%rbp
+	pushq	%r12
+	pushq	%r13
+	pushq	%r14
+	pushq	%r15
+	pushfq
+	subq	$64,%rsp
+
+	movq	120(%r8),%rax
+	movq	248(%r8),%rbx
+
+	leaq	.Lprologue_shaext(%rip),%r10
+	cmpq	%r10,%rbx
+	jb	.Lcommon_seh_tail
+
+	leaq	.Lepilogue_shaext(%rip),%r10
+	cmpq	%r10,%rbx
+	jae	.Lcommon_seh_tail
+
+	leaq	-8-64(%rax),%rsi
+	leaq	512(%r8),%rdi
+	movl	$8,%ecx
+.long	0xa548f3fc
+
+	jmp	.Lcommon_seh_tail
 
 .def	ssse3_handler;	.scl 3;	.type 32;	.endef
 .p2align	4
@@ -2606,25 +5689,28 @@ ssse3_handler:
 	cmpq	%r10,%rbx
 	jb	.Lcommon_seh_tail
 
-	movq	152(%r8),%rax
+	movq	208(%r8),%rax
 
 	movl	4(%r11),%r10d
 	leaq	(%rsi,%r10,1),%r10
 	cmpq	%r10,%rbx
 	jae	.Lcommon_seh_tail
 
-	leaq	64(%rax),%rsi
+	leaq	-40-96(%rax),%rsi
 	leaq	512(%r8),%rdi
 	movl	$12,%ecx
-.long	0xa548f3fc		
-	leaq	184(%rax),%rax
+.long	0xa548f3fc
 
 	movq	-8(%rax),%rbx
 	movq	-16(%rax),%rbp
 	movq	-24(%rax),%r12
+	movq	-32(%rax),%r13
+	movq	-40(%rax),%r14
 	movq	%rbx,144(%r8)
 	movq	%rbp,160(%r8)
 	movq	%r12,216(%r8)
+	movq	%r13,224(%r8)
+	movq	%r14,232(%r8)
 
 .Lcommon_seh_tail:
 	movq	8(%rax),%rdi
@@ -2636,7 +5722,7 @@ ssse3_handler:
 	movq	40(%r9),%rdi
 	movq	%r8,%rsi
 	movl	$154,%ecx
-.long	0xa548f3fc		
+.long	0xa548f3fc
 
 	movq	%r9,%rsi
 	xorq	%rcx,%rcx
@@ -2671,16 +5757,36 @@ ssse3_handler:
 .rva	.LSEH_begin_sha1_block_data_order
 .rva	.LSEH_end_sha1_block_data_order
 .rva	.LSEH_info_sha1_block_data_order
+.rva	.LSEH_begin_sha1_block_data_order_shaext
+.rva	.LSEH_end_sha1_block_data_order_shaext
+.rva	.LSEH_info_sha1_block_data_order_shaext
 .rva	.LSEH_begin_sha1_block_data_order_ssse3
 .rva	.LSEH_end_sha1_block_data_order_ssse3
 .rva	.LSEH_info_sha1_block_data_order_ssse3
+.rva	.LSEH_begin_sha1_block_data_order_avx
+.rva	.LSEH_end_sha1_block_data_order_avx
+.rva	.LSEH_info_sha1_block_data_order_avx
+.rva	.LSEH_begin_sha1_block_data_order_avx2
+.rva	.LSEH_end_sha1_block_data_order_avx2
+.rva	.LSEH_info_sha1_block_data_order_avx2
 .section	.xdata
 .p2align	3
 .LSEH_info_sha1_block_data_order:
 .byte	9,0,0,0
 .rva	se_handler
+.LSEH_info_sha1_block_data_order_shaext:
+.byte	9,0,0,0
+.rva	shaext_handler
 .LSEH_info_sha1_block_data_order_ssse3:
 .byte	9,0,0,0
 .rva	ssse3_handler
-.rva	.Lprologue_ssse3,.Lepilogue_ssse3	
+.rva	.Lprologue_ssse3,.Lepilogue_ssse3
+.LSEH_info_sha1_block_data_order_avx:
+.byte	9,0,0,0
+.rva	ssse3_handler
+.rva	.Lprologue_avx,.Lepilogue_avx
+.LSEH_info_sha1_block_data_order_avx2:
+.byte	9,0,0,0
+.rva	ssse3_handler
+.rva	.Lprologue_avx2,.Lepilogue_avx2
 
diff --git a/lib/accelerated/x86/coff/sha256-ssse3-x86.s b/lib/accelerated/x86/coff/sha256-ssse3-x86.s
index eaa435408e..05cd61d1b1 100644
--- a/lib/accelerated/x86/coff/sha256-ssse3-x86.s
+++ b/lib/accelerated/x86/coff/sha256-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha512-586.s"
 .text
 .globl	_sha256_block_data_order
 .def	_sha256_block_data_order;	.scl	2;	.type	32;	.endef
@@ -64,20 +63,6 @@ _sha256_block_data_order:
 	movl	%edi,4(%esp)
 	movl	%eax,8(%esp)
 	movl	%ebx,12(%esp)
-	leal	__gnutls_x86_cpuid_s-.L001K256(%ebp),%edx
-	movl	(%edx),%ecx
-	movl	4(%edx),%edx
-	testl	$1048576,%ecx
-	jnz	.L002loop
-	testl	$2048,%edx
-	andl	$1073741824,%ecx
-	andl	$268435456,%edx
-	orl	%edx,%ecx
-	cmpl	$1342177280,%ecx
-	je	.L003loop_shrd
-	subl	%edi,%eax
-	cmpl	$256,%eax
-	jae	.L004unrolled
 	jmp	.L002loop
 .align	16
 .L002loop:
@@ -149,7 +134,7 @@ _sha256_block_data_order:
 	movl	%ecx,28(%esp)
 	movl	%edi,32(%esp)
 .align	16
-.L00500_15:
+.L00300_15:
 	movl	%edx,%ecx
 	movl	24(%esp),%esi
 	rorl	$14,%ecx
@@ -187,11 +172,11 @@ _sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3248222580,%esi
-	jne	.L00500_15
+	jne	.L00300_15
 	movl	156(%esp),%ecx
-	jmp	.L00616_63
+	jmp	.L00416_63
 .align	16
-.L00616_63:
+.L00416_63:
 	movl	%ecx,%ebx
 	movl	104(%esp),%esi
 	rorl	$11,%ecx
@@ -246,7 +231,7 @@ _sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3329325298,%esi
-	jne	.L00616_63
+	jne	.L00416_63
 	movl	356(%esp),%esi
 	movl	8(%esp),%ebx
 	movl	16(%esp),%ecx
@@ -280,8 +265,8 @@ _sha256_block_data_order:
 	popl	%ebx
 	popl	%ebp
 	ret
-.align	16
-.L003loop_shrd:
+.align	32
+.L005loop_shrd:
 	movl	(%edi),%eax
 	movl	4(%edi),%ebx
 	movl	8(%edi),%ecx
@@ -350,7 +335,7 @@ _sha256_block_data_order:
 	movl	%ecx,28(%esp)
 	movl	%edi,32(%esp)
 .align	16
-.L00700_15_shrd:
+.L00600_15_shrd:
 	movl	%edx,%ecx
 	movl	24(%esp),%esi
 	shrdl	$14,%ecx,%ecx
@@ -388,11 +373,11 @@ _sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3248222580,%esi
-	jne	.L00700_15_shrd
+	jne	.L00600_15_shrd
 	movl	156(%esp),%ecx
-	jmp	.L00816_63_shrd
+	jmp	.L00716_63_shrd
 .align	16
-.L00816_63_shrd:
+.L00716_63_shrd:
 	movl	%ecx,%ebx
 	movl	104(%esp),%esi
 	shrdl	$11,%ecx,%ecx
@@ -447,7 +432,7 @@ _sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3329325298,%esi
-	jne	.L00816_63_shrd
+	jne	.L00716_63_shrd
 	movl	356(%esp),%esi
 	movl	8(%esp),%ebx
 	movl	16(%esp),%ecx
@@ -474,7 +459,7 @@ _sha256_block_data_order:
 	leal	356(%esp),%esp
 	subl	$256,%ebp
 	cmpl	8(%esp),%edi
-	jb	.L003loop_shrd
+	jb	.L005loop_shrd
 	movl	12(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -485,8 +470,13 @@ _sha256_block_data_order:
 .L001K256:
 .long	1116352408,1899447441,3049323471,3921009573,961987163,1508970993,2453635748,2870763221,3624381080,310598401,607225278,1426881987,1925078388,2162078206,2614888103,3248222580,3835390401,4022224774,264347078,604807628,770255983,1249150122,1555081692,1996064986,2554220882,2821834349,2952996808,3210313671,3336571891,3584528711,113926993,338241895,666307205,773529912,1294757372,1396182291,1695183700,1986661051,2177026350,2456956037,2730485921,2820302411,3259730800,3345764771,3516065817,3600352804,4094571909,275423344,430227734,506948616,659060556,883997877,958139571,1322822218,1537002063,1747873779,1955562222,2024104815,2227730452,2361852424,2428436474,2756734187,3204031479,3329325298
 .long	66051,67438087,134810123,202182159
+.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97
+.byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
+.byte	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
+.byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
+.byte	62,0
 .align	16
-.L004unrolled:
+.L008unrolled:
 	leal	-96(%esp),%esp
 	movl	(%esi),%eax
 	movl	4(%esi),%ebp
@@ -3392,10 +3382,4 @@ _sha256_block_data_order:
 	popl	%ebx
 	popl	%ebp
 	ret
-.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97
-.byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
-.byte	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
-.byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
-.byte	62,0
-.comm	__gnutls_x86_cpuid_s,16
 
diff --git a/lib/accelerated/x86/coff/sha256-ssse3-x86_64.s b/lib/accelerated/x86/coff/sha256-ssse3-x86_64.s
new file mode 100644
index 0000000000..d2fc1957ea
--- /dev/null
+++ b/lib/accelerated/x86/coff/sha256-ssse3-x86_64.s
@@ -0,0 +1,5731 @@
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+#     * Redistributions of source code must retain copyright notices,
+#      this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+#     * Neither the name of the Andy Polyakov nor the names of its
+#      copyright holder and contributors may be used to endorse or
+#      promote products derived from this software without specific
+#      prior written permission.
+#
+# ALTERNATIVELY, provided that this notice is retained in full, this
+# product may be distributed under the terms of the GNU General Public
+# License (GPL), in which case the provisions of the GPL apply INSTEAD OF
+# those given above.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# *** This file is auto-generated ***
+#
+.text	
+
+
+.globl	sha256_block_data_order
+.def	sha256_block_data_order;	.scl 2;	.type 32;	.endef
+.p2align	4
+sha256_block_data_order:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha256_block_data_order:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+
+	leaq	_gnutls_x86_cpuid_s(%rip),%r11
+	movl	0(%r11),%r9d
+	movl	4(%r11),%r10d
+	movl	8(%r11),%r11d
+	testl	$536870912,%r11d
+	jnz	_shaext_shortcut
+	andl	$296,%r11d
+	cmpl	$296,%r11d
+	je	.Lavx2_shortcut
+	andl	$1073741824,%r9d
+	andl	$268435968,%r10d
+	orl	%r9d,%r10d
+	cmpl	$1342177792,%r10d
+	je	.Lavx_shortcut
+	testl	$512,%r10d
+	jnz	.Lssse3_shortcut
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	shlq	$4,%rdx
+	subq	$64+32,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+
+.Lprologue:
+
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	jmp	.Lloop
+
+.p2align	4
+.Lloop:
+	movl	%ebx,%edi
+	leaq	K256(%rip),%rbp
+	xorl	%ecx,%edi
+	movl	0(%rsi),%r12d
+	movl	%r8d,%r13d
+	movl	%eax,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,0(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r11d
+	movl	4(%rsi),%r12d
+	movl	%edx,%r13d
+	movl	%r11d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,4(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r10d
+	movl	8(%rsi),%r12d
+	movl	%ecx,%r13d
+	movl	%r10d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,8(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r9d
+	movl	12(%rsi),%r12d
+	movl	%ebx,%r13d
+	movl	%r9d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,12(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%r8d
+	movl	16(%rsi),%r12d
+	movl	%eax,%r13d
+	movl	%r8d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,16(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%edx
+	movl	20(%rsi),%r12d
+	movl	%r11d,%r13d
+	movl	%edx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,20(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ecx
+	movl	24(%rsi),%r12d
+	movl	%r10d,%r13d
+	movl	%ecx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,24(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ebx
+	movl	28(%rsi),%r12d
+	movl	%r9d,%r13d
+	movl	%ebx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,28(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%eax
+	movl	32(%rsi),%r12d
+	movl	%r8d,%r13d
+	movl	%eax,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,32(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r11d
+	movl	36(%rsi),%r12d
+	movl	%edx,%r13d
+	movl	%r11d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,36(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r10d
+	movl	40(%rsi),%r12d
+	movl	%ecx,%r13d
+	movl	%r10d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,40(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r9d
+	movl	44(%rsi),%r12d
+	movl	%ebx,%r13d
+	movl	%r9d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,44(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%r8d
+	movl	48(%rsi),%r12d
+	movl	%eax,%r13d
+	movl	%r8d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,48(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%edx
+	movl	52(%rsi),%r12d
+	movl	%r11d,%r13d
+	movl	%edx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,52(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ecx
+	movl	56(%rsi),%r12d
+	movl	%r10d,%r13d
+	movl	%ecx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,56(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ebx
+	movl	60(%rsi),%r12d
+	movl	%r9d,%r13d
+	movl	%ebx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,60(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	jmp	.Lrounds_16_xx
+.p2align	4
+.Lrounds_16_xx:
+	movl	4(%rsp),%r13d
+	movl	56(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%eax
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	36(%rsp),%r12d
+
+	addl	0(%rsp),%r12d
+	movl	%r8d,%r13d
+	addl	%r15d,%r12d
+	movl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,0(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	movl	8(%rsp),%r13d
+	movl	60(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r11d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	40(%rsp),%r12d
+
+	addl	4(%rsp),%r12d
+	movl	%edx,%r13d
+	addl	%edi,%r12d
+	movl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,4(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	movl	12(%rsp),%r13d
+	movl	0(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r10d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	44(%rsp),%r12d
+
+	addl	8(%rsp),%r12d
+	movl	%ecx,%r13d
+	addl	%r15d,%r12d
+	movl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,8(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	movl	16(%rsp),%r13d
+	movl	4(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r9d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	48(%rsp),%r12d
+
+	addl	12(%rsp),%r12d
+	movl	%ebx,%r13d
+	addl	%edi,%r12d
+	movl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,12(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	movl	20(%rsp),%r13d
+	movl	8(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r8d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	52(%rsp),%r12d
+
+	addl	16(%rsp),%r12d
+	movl	%eax,%r13d
+	addl	%r15d,%r12d
+	movl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,16(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	movl	24(%rsp),%r13d
+	movl	12(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%edx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	56(%rsp),%r12d
+
+	addl	20(%rsp),%r12d
+	movl	%r11d,%r13d
+	addl	%edi,%r12d
+	movl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,20(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	movl	28(%rsp),%r13d
+	movl	16(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ecx
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	60(%rsp),%r12d
+
+	addl	24(%rsp),%r12d
+	movl	%r10d,%r13d
+	addl	%r15d,%r12d
+	movl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,24(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	movl	32(%rsp),%r13d
+	movl	20(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ebx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	0(%rsp),%r12d
+
+	addl	28(%rsp),%r12d
+	movl	%r9d,%r13d
+	addl	%edi,%r12d
+	movl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,28(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	movl	36(%rsp),%r13d
+	movl	24(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%eax
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	4(%rsp),%r12d
+
+	addl	32(%rsp),%r12d
+	movl	%r8d,%r13d
+	addl	%r15d,%r12d
+	movl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,32(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	movl	40(%rsp),%r13d
+	movl	28(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r11d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	8(%rsp),%r12d
+
+	addl	36(%rsp),%r12d
+	movl	%edx,%r13d
+	addl	%edi,%r12d
+	movl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,36(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	movl	44(%rsp),%r13d
+	movl	32(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r10d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	12(%rsp),%r12d
+
+	addl	40(%rsp),%r12d
+	movl	%ecx,%r13d
+	addl	%r15d,%r12d
+	movl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,40(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	movl	48(%rsp),%r13d
+	movl	36(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r9d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	16(%rsp),%r12d
+
+	addl	44(%rsp),%r12d
+	movl	%ebx,%r13d
+	addl	%edi,%r12d
+	movl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,44(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	movl	52(%rsp),%r13d
+	movl	40(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r8d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	20(%rsp),%r12d
+
+	addl	48(%rsp),%r12d
+	movl	%eax,%r13d
+	addl	%r15d,%r12d
+	movl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,48(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	movl	56(%rsp),%r13d
+	movl	44(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%edx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	24(%rsp),%r12d
+
+	addl	52(%rsp),%r12d
+	movl	%r11d,%r13d
+	addl	%edi,%r12d
+	movl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,52(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	movl	60(%rsp),%r13d
+	movl	48(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ecx
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	28(%rsp),%r12d
+
+	addl	56(%rsp),%r12d
+	movl	%r10d,%r13d
+	addl	%r15d,%r12d
+	movl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,56(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	movl	0(%rsp),%r13d
+	movl	52(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ebx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	32(%rsp),%r12d
+
+	addl	60(%rsp),%r12d
+	movl	%r9d,%r13d
+	addl	%edi,%r12d
+	movl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,60(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	cmpb	$0,3(%rbp)
+	jnz	.Lrounds_16_xx
+
+	movq	64+0(%rsp),%rdi
+	addl	%r14d,%eax
+	leaq	64(%rsi),%rsi
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	.Lloop
+
+	movq	88(%rsp),%rsi
+
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+.Lepilogue:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_sha256_block_data_order:
+.p2align	6
+
+K256:
+.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
+.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
+.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
+.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
+.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
+.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
+.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
+.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
+.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
+.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
+.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
+.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
+.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
+.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
+.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
+.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
+.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
+.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
+.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
+.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
+.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
+.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
+.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
+.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
+.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
+.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
+.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
+.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
+.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
+.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
+.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
+.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
+.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
+.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
+.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
+.def	sha256_block_data_order_shaext;	.scl 3;	.type 32;	.endef
+.p2align	6
+sha256_block_data_order_shaext:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha256_block_data_order_shaext:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+_shaext_shortcut:
+	leaq	-88(%rsp),%rsp
+	movaps	%xmm6,-8-80(%rax)
+	movaps	%xmm7,-8-64(%rax)
+	movaps	%xmm8,-8-48(%rax)
+	movaps	%xmm9,-8-32(%rax)
+	movaps	%xmm10,-8-16(%rax)
+.Lprologue_shaext:
+	leaq	K256+128(%rip),%rcx
+	movdqu	(%rdi),%xmm1
+	movdqu	16(%rdi),%xmm2
+	movdqa	512-128(%rcx),%xmm7
+
+	pshufd	$0x1b,%xmm1,%xmm0
+	pshufd	$0xb1,%xmm1,%xmm1
+	pshufd	$0x1b,%xmm2,%xmm2
+	movdqa	%xmm7,%xmm8
+.byte	102,15,58,15,202,8
+	punpcklqdq	%xmm0,%xmm2
+	jmp	.Loop_shaext
+
+.p2align	4
+.Loop_shaext:
+	movdqu	(%rsi),%xmm3
+	movdqu	16(%rsi),%xmm4
+	movdqu	32(%rsi),%xmm5
+.byte	102,15,56,0,223
+	movdqu	48(%rsi),%xmm6
+
+	movdqa	0-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	102,15,56,0,231
+	movdqa	%xmm2,%xmm10
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	nop
+	movdqa	%xmm1,%xmm9
+.byte	15,56,203,202
+
+	movdqa	32-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	102,15,56,0,239
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	leaq	64(%rsi),%rsi
+.byte	15,56,204,220
+.byte	15,56,203,202
+
+	movdqa	64-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	102,15,56,0,247
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+
+	movdqa	96-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	128-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	160-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+	nop
+	paddd	%xmm7,%xmm6
+.byte	15,56,204,220
+.byte	15,56,203,202
+	movdqa	192-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,205,245
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+	movdqa	224-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	256-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	288-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+	nop
+	paddd	%xmm7,%xmm6
+.byte	15,56,204,220
+.byte	15,56,203,202
+	movdqa	320-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,205,245
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+	movdqa	352-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	384-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	416-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+.byte	15,56,203,202
+	paddd	%xmm7,%xmm6
+
+	movdqa	448-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+.byte	15,56,205,245
+	movdqa	%xmm8,%xmm7
+.byte	15,56,203,202
+
+	movdqa	480-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+	nop
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	decq	%rdx
+	nop
+.byte	15,56,203,202
+
+	paddd	%xmm10,%xmm2
+	paddd	%xmm9,%xmm1
+	jnz	.Loop_shaext
+
+	pshufd	$0xb1,%xmm2,%xmm2
+	pshufd	$0x1b,%xmm1,%xmm7
+	pshufd	$0xb1,%xmm1,%xmm1
+	punpckhqdq	%xmm2,%xmm1
+.byte	102,15,58,15,215,8
+
+	movdqu	%xmm1,(%rdi)
+	movdqu	%xmm2,16(%rdi)
+	movaps	-8-80(%rax),%xmm6
+	movaps	-8-64(%rax),%xmm7
+	movaps	-8-48(%rax),%xmm8
+	movaps	-8-32(%rax),%xmm9
+	movaps	-8-16(%rax),%xmm10
+	movq	%rax,%rsp
+.Lepilogue_shaext:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+.LSEH_end_sha256_block_data_order_shaext:
+.def	sha256_block_data_order_ssse3;	.scl 3;	.type 32;	.endef
+.p2align	6
+sha256_block_data_order_ssse3:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha256_block_data_order_ssse3:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+
+.Lssse3_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	shlq	$4,%rdx
+	subq	$160,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+
+	movaps	%xmm6,64+32(%rsp)
+	movaps	%xmm7,64+48(%rsp)
+	movaps	%xmm8,64+64(%rsp)
+	movaps	%xmm9,64+80(%rsp)
+.Lprologue_ssse3:
+
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+
+
+	jmp	.Lloop_ssse3
+.p2align	4
+.Lloop_ssse3:
+	movdqa	K256+512(%rip),%xmm7
+	movdqu	0(%rsi),%xmm0
+	movdqu	16(%rsi),%xmm1
+	movdqu	32(%rsi),%xmm2
+.byte	102,15,56,0,199
+	movdqu	48(%rsi),%xmm3
+	leaq	K256(%rip),%rbp
+.byte	102,15,56,0,207
+	movdqa	0(%rbp),%xmm4
+	movdqa	32(%rbp),%xmm5
+.byte	102,15,56,0,215
+	paddd	%xmm0,%xmm4
+	movdqa	64(%rbp),%xmm6
+.byte	102,15,56,0,223
+	movdqa	96(%rbp),%xmm7
+	paddd	%xmm1,%xmm5
+	paddd	%xmm2,%xmm6
+	paddd	%xmm3,%xmm7
+	movdqa	%xmm4,0(%rsp)
+	movl	%eax,%r14d
+	movdqa	%xmm5,16(%rsp)
+	movl	%ebx,%edi
+	movdqa	%xmm6,32(%rsp)
+	xorl	%ecx,%edi
+	movdqa	%xmm7,48(%rsp)
+	movl	%r8d,%r13d
+	jmp	.Lssse3_00_47
+
+.p2align	4
+.Lssse3_00_47:
+	subq	$-128,%rbp
+	rorl	$14,%r13d
+	movdqa	%xmm1,%xmm4
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	movdqa	%xmm3,%xmm7
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+.byte	102,15,58,15,224,4
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+.byte	102,15,58,15,250,4
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	paddd	%xmm7,%xmm0
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	psrld	$7,%xmm6
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	pshufd	$250,%xmm3,%xmm7
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%r11d,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	pslld	$11,%xmm5
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	paddd	%xmm4,%xmm0
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	psrlq	$17,%xmm6
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	psrldq	$8,%xmm7
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm0
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	pshufd	$80,%xmm0,%xmm7
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	psrld	$10,%xmm7
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	psrlq	$2,%xmm6
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	pxor	%xmm6,%xmm7
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	movdqa	0(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	paddd	%xmm7,%xmm0
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	paddd	%xmm0,%xmm6
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	movdqa	%xmm6,0(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm2,%xmm4
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	movdqa	%xmm0,%xmm7
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+.byte	102,15,58,15,225,4
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+.byte	102,15,58,15,251,4
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	paddd	%xmm7,%xmm1
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	psrld	$7,%xmm6
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	pshufd	$250,%xmm0,%xmm7
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%edx,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	pslld	$11,%xmm5
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	paddd	%xmm4,%xmm1
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	psrlq	$17,%xmm6
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	psrldq	$8,%xmm7
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm1
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	pshufd	$80,%xmm1,%xmm7
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	psrld	$10,%xmm7
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	psrlq	$2,%xmm6
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	pxor	%xmm6,%xmm7
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	movdqa	32(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	paddd	%xmm7,%xmm1
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	paddd	%xmm1,%xmm6
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movdqa	%xmm6,16(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm3,%xmm4
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	movdqa	%xmm1,%xmm7
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+.byte	102,15,58,15,226,4
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+.byte	102,15,58,15,248,4
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	paddd	%xmm7,%xmm2
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	psrld	$7,%xmm6
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	pshufd	$250,%xmm1,%xmm7
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%r11d,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	pslld	$11,%xmm5
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	paddd	%xmm4,%xmm2
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	psrlq	$17,%xmm6
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	psrldq	$8,%xmm7
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm2
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	pshufd	$80,%xmm2,%xmm7
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	psrld	$10,%xmm7
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	psrlq	$2,%xmm6
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	pxor	%xmm6,%xmm7
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	movdqa	64(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	paddd	%xmm7,%xmm2
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	paddd	%xmm2,%xmm6
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	movdqa	%xmm6,32(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm0,%xmm4
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	movdqa	%xmm2,%xmm7
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+.byte	102,15,58,15,227,4
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+.byte	102,15,58,15,249,4
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	paddd	%xmm7,%xmm3
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	psrld	$7,%xmm6
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	pshufd	$250,%xmm2,%xmm7
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%edx,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	pslld	$11,%xmm5
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	paddd	%xmm4,%xmm3
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	psrlq	$17,%xmm6
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	psrldq	$8,%xmm7
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm3
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	pshufd	$80,%xmm3,%xmm7
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	psrld	$10,%xmm7
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	psrlq	$2,%xmm6
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	pxor	%xmm6,%xmm7
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	movdqa	96(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	paddd	%xmm7,%xmm3
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	paddd	%xmm3,%xmm6
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movdqa	%xmm6,48(%rsp)
+	cmpb	$0,131(%rbp)
+	jne	.Lssse3_00_47
+	rorl	$14,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movq	64+0(%rsp),%rdi
+	movl	%r14d,%eax
+
+	addl	0(%rdi),%eax
+	leaq	64(%rsi),%rsi
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	.Lloop_ssse3
+
+	movq	88(%rsp),%rsi
+
+	movaps	64+32(%rsp),%xmm6
+	movaps	64+48(%rsp),%xmm7
+	movaps	64+64(%rsp),%xmm8
+	movaps	64+80(%rsp),%xmm9
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+.Lepilogue_ssse3:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_sha256_block_data_order_ssse3:
+.def	sha256_block_data_order_avx;	.scl 3;	.type 32;	.endef
+.p2align	6
+sha256_block_data_order_avx:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha256_block_data_order_avx:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+
+.Lavx_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	shlq	$4,%rdx
+	subq	$160,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+
+	movaps	%xmm6,64+32(%rsp)
+	movaps	%xmm7,64+48(%rsp)
+	movaps	%xmm8,64+64(%rsp)
+	movaps	%xmm9,64+80(%rsp)
+.Lprologue_avx:
+
+	vzeroupper
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	vmovdqa	K256+512+32(%rip),%xmm8
+	vmovdqa	K256+512+64(%rip),%xmm9
+	jmp	.Lloop_avx
+.p2align	4
+.Lloop_avx:
+	vmovdqa	K256+512(%rip),%xmm7
+	vmovdqu	0(%rsi),%xmm0
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm7,%xmm0,%xmm0
+	leaq	K256(%rip),%rbp
+	vpshufb	%xmm7,%xmm1,%xmm1
+	vpshufb	%xmm7,%xmm2,%xmm2
+	vpaddd	0(%rbp),%xmm0,%xmm4
+	vpshufb	%xmm7,%xmm3,%xmm3
+	vpaddd	32(%rbp),%xmm1,%xmm5
+	vpaddd	64(%rbp),%xmm2,%xmm6
+	vpaddd	96(%rbp),%xmm3,%xmm7
+	vmovdqa	%xmm4,0(%rsp)
+	movl	%eax,%r14d
+	vmovdqa	%xmm5,16(%rsp)
+	movl	%ebx,%edi
+	vmovdqa	%xmm6,32(%rsp)
+	xorl	%ecx,%edi
+	vmovdqa	%xmm7,48(%rsp)
+	movl	%r8d,%r13d
+	jmp	.Lavx_00_47
+
+.p2align	4
+.Lavx_00_47:
+	subq	$-128,%rbp
+	vpalignr	$4,%xmm0,%xmm1,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	vpalignr	$4,%xmm2,%xmm3,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	vpaddd	%xmm7,%xmm0,%xmm0
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	vpshufd	$250,%xmm3,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	vpaddd	%xmm4,%xmm0,%xmm0
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	vpaddd	%xmm6,%xmm0,%xmm0
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	vpshufd	$80,%xmm0,%xmm7
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	vpaddd	%xmm6,%xmm0,%xmm0
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	vpaddd	0(%rbp),%xmm0,%xmm6
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	vmovdqa	%xmm6,0(%rsp)
+	vpalignr	$4,%xmm1,%xmm2,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	vpalignr	$4,%xmm3,%xmm0,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	vpaddd	%xmm7,%xmm1,%xmm1
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	vpshufd	$250,%xmm0,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	vpaddd	%xmm4,%xmm1,%xmm1
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	vpaddd	%xmm6,%xmm1,%xmm1
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	vpshufd	$80,%xmm1,%xmm7
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	vpaddd	%xmm6,%xmm1,%xmm1
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	vpaddd	32(%rbp),%xmm1,%xmm6
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	vmovdqa	%xmm6,16(%rsp)
+	vpalignr	$4,%xmm2,%xmm3,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	vpalignr	$4,%xmm0,%xmm1,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	vpaddd	%xmm7,%xmm2,%xmm2
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	vpshufd	$250,%xmm1,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	vpaddd	%xmm4,%xmm2,%xmm2
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	vpaddd	%xmm6,%xmm2,%xmm2
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	vpshufd	$80,%xmm2,%xmm7
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	vpaddd	%xmm6,%xmm2,%xmm2
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	vpaddd	64(%rbp),%xmm2,%xmm6
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	vmovdqa	%xmm6,32(%rsp)
+	vpalignr	$4,%xmm3,%xmm0,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	vpalignr	$4,%xmm1,%xmm2,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	vpaddd	%xmm7,%xmm3,%xmm3
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	vpshufd	$250,%xmm2,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	vpaddd	%xmm4,%xmm3,%xmm3
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	vpaddd	%xmm6,%xmm3,%xmm3
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	vpshufd	$80,%xmm3,%xmm7
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	vpaddd	%xmm6,%xmm3,%xmm3
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	vpaddd	96(%rbp),%xmm3,%xmm6
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	vmovdqa	%xmm6,48(%rsp)
+	cmpb	$0,131(%rbp)
+	jne	.Lavx_00_47
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movq	64+0(%rsp),%rdi
+	movl	%r14d,%eax
+
+	addl	0(%rdi),%eax
+	leaq	64(%rsi),%rsi
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	.Lloop_avx
+
+	movq	88(%rsp),%rsi
+
+	vzeroupper
+	movaps	64+32(%rsp),%xmm6
+	movaps	64+48(%rsp),%xmm7
+	movaps	64+64(%rsp),%xmm8
+	movaps	64+80(%rsp),%xmm9
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+.Lepilogue_avx:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_sha256_block_data_order_avx:
+.def	sha256_block_data_order_avx2;	.scl 3;	.type 32;	.endef
+.p2align	6
+sha256_block_data_order_avx2:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha256_block_data_order_avx2:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+
+.Lavx2_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	subq	$608,%rsp
+	shlq	$4,%rdx
+	andq	$-1024,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	addq	$448,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+
+	movaps	%xmm6,64+32(%rsp)
+	movaps	%xmm7,64+48(%rsp)
+	movaps	%xmm8,64+64(%rsp)
+	movaps	%xmm9,64+80(%rsp)
+.Lprologue_avx2:
+
+	vzeroupper
+	subq	$-64,%rsi
+	movl	0(%rdi),%eax
+	movq	%rsi,%r12
+	movl	4(%rdi),%ebx
+	cmpq	%rdx,%rsi
+	movl	8(%rdi),%ecx
+	cmoveq	%rsp,%r12
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	vmovdqa	K256+512+32(%rip),%ymm8
+	vmovdqa	K256+512+64(%rip),%ymm9
+	jmp	.Loop_avx2
+.p2align	4
+.Loop_avx2:
+	vmovdqa	K256+512(%rip),%ymm7
+	vmovdqu	-64+0(%rsi),%xmm0
+	vmovdqu	-64+16(%rsi),%xmm1
+	vmovdqu	-64+32(%rsi),%xmm2
+	vmovdqu	-64+48(%rsi),%xmm3
+
+	vinserti128	$1,(%r12),%ymm0,%ymm0
+	vinserti128	$1,16(%r12),%ymm1,%ymm1
+	vpshufb	%ymm7,%ymm0,%ymm0
+	vinserti128	$1,32(%r12),%ymm2,%ymm2
+	vpshufb	%ymm7,%ymm1,%ymm1
+	vinserti128	$1,48(%r12),%ymm3,%ymm3
+
+	leaq	K256(%rip),%rbp
+	vpshufb	%ymm7,%ymm2,%ymm2
+	vpaddd	0(%rbp),%ymm0,%ymm4
+	vpshufb	%ymm7,%ymm3,%ymm3
+	vpaddd	32(%rbp),%ymm1,%ymm5
+	vpaddd	64(%rbp),%ymm2,%ymm6
+	vpaddd	96(%rbp),%ymm3,%ymm7
+	vmovdqa	%ymm4,0(%rsp)
+	xorl	%r14d,%r14d
+	vmovdqa	%ymm5,32(%rsp)
+	leaq	-64(%rsp),%rsp
+	movl	%ebx,%edi
+	vmovdqa	%ymm6,0(%rsp)
+	xorl	%ecx,%edi
+	vmovdqa	%ymm7,32(%rsp)
+	movl	%r9d,%r12d
+	subq	$-32*4,%rbp
+	jmp	.Lavx2_00_47
+
+.p2align	4
+.Lavx2_00_47:
+	leaq	-64(%rsp),%rsp
+	vpalignr	$4,%ymm0,%ymm1,%ymm4
+	addl	0+128(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	vpalignr	$4,%ymm2,%ymm3,%ymm7
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	vpaddd	%ymm7,%ymm0,%ymm0
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	vpshufd	$250,%ymm3,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	4+128(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	vpaddd	%ymm4,%ymm0,%ymm0
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	8+128(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	vpaddd	%ymm6,%ymm0,%ymm0
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	vpshufd	$80,%ymm0,%ymm7
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	12+128(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	vpaddd	%ymm6,%ymm0,%ymm0
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	vpaddd	0(%rbp),%ymm0,%ymm6
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	vmovdqa	%ymm6,0(%rsp)
+	vpalignr	$4,%ymm1,%ymm2,%ymm4
+	addl	32+128(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	vpalignr	$4,%ymm3,%ymm0,%ymm7
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	vpaddd	%ymm7,%ymm1,%ymm1
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	vpshufd	$250,%ymm0,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	36+128(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	vpaddd	%ymm4,%ymm1,%ymm1
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	40+128(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	vpaddd	%ymm6,%ymm1,%ymm1
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	vpshufd	$80,%ymm1,%ymm7
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	44+128(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	vpaddd	%ymm6,%ymm1,%ymm1
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	vpaddd	32(%rbp),%ymm1,%ymm6
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	vmovdqa	%ymm6,32(%rsp)
+	leaq	-64(%rsp),%rsp
+	vpalignr	$4,%ymm2,%ymm3,%ymm4
+	addl	0+128(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	vpalignr	$4,%ymm0,%ymm1,%ymm7
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	vpaddd	%ymm7,%ymm2,%ymm2
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	vpshufd	$250,%ymm1,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	4+128(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	vpaddd	%ymm4,%ymm2,%ymm2
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	8+128(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	vpaddd	%ymm6,%ymm2,%ymm2
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	vpshufd	$80,%ymm2,%ymm7
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	12+128(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	vpaddd	%ymm6,%ymm2,%ymm2
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	vpaddd	64(%rbp),%ymm2,%ymm6
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	vmovdqa	%ymm6,0(%rsp)
+	vpalignr	$4,%ymm3,%ymm0,%ymm4
+	addl	32+128(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	vpalignr	$4,%ymm1,%ymm2,%ymm7
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	vpaddd	%ymm7,%ymm3,%ymm3
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	vpshufd	$250,%ymm2,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	36+128(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	vpaddd	%ymm4,%ymm3,%ymm3
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	40+128(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	vpaddd	%ymm6,%ymm3,%ymm3
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	vpshufd	$80,%ymm3,%ymm7
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	44+128(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	vpaddd	%ymm6,%ymm3,%ymm3
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	vpaddd	96(%rbp),%ymm3,%ymm6
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	vmovdqa	%ymm6,32(%rsp)
+	leaq	128(%rbp),%rbp
+	cmpb	$0,3(%rbp)
+	jne	.Lavx2_00_47
+	addl	0+64(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4+64(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8+64(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12+64(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32+64(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36+64(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40+64(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44+64(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	addl	0(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	movq	512(%rsp),%rdi
+	addl	%r14d,%eax
+
+	leaq	448(%rsp),%rbp
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+
+	cmpq	80(%rbp),%rsi
+	je	.Ldone_avx2
+
+	xorl	%r14d,%r14d
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	movl	%r9d,%r12d
+	jmp	.Lower_avx2
+.p2align	4
+.Lower_avx2:
+	addl	0+16(%rbp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4+16(%rbp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8+16(%rbp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12+16(%rbp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32+16(%rbp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36+16(%rbp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40+16(%rbp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44+16(%rbp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	leaq	-64(%rbp),%rbp
+	cmpq	%rsp,%rbp
+	jae	.Lower_avx2
+
+	movq	512(%rsp),%rdi
+	addl	%r14d,%eax
+
+	leaq	448(%rsp),%rsp
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	leaq	128(%rsi),%rsi
+	addl	24(%rdi),%r10d
+	movq	%rsi,%r12
+	addl	28(%rdi),%r11d
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	cmoveq	%rsp,%r12
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+
+	jbe	.Loop_avx2
+	leaq	(%rsp),%rbp
+
+.Ldone_avx2:
+	leaq	(%rbp),%rsp
+	movq	88(%rsp),%rsi
+
+	vzeroupper
+	movaps	64+32(%rsp),%xmm6
+	movaps	64+48(%rsp),%xmm7
+	movaps	64+64(%rsp),%xmm8
+	movaps	64+80(%rsp),%xmm9
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+.Lepilogue_avx2:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_sha256_block_data_order_avx2:
+
+.def	se_handler;	.scl 3;	.type 32;	.endef
+.p2align	4
+se_handler:
+	pushq	%rsi
+	pushq	%rdi
+	pushq	%rbx
+	pushq	%rbp
+	pushq	%r12
+	pushq	%r13
+	pushq	%r14
+	pushq	%r15
+	pushfq
+	subq	$64,%rsp
+
+	movq	120(%r8),%rax
+	movq	248(%r8),%rbx
+
+	movq	8(%r9),%rsi
+	movq	56(%r9),%r11
+
+	movl	0(%r11),%r10d
+	leaq	(%rsi,%r10,1),%r10
+	cmpq	%r10,%rbx
+	jb	.Lin_prologue
+
+	movq	152(%r8),%rax
+
+	movl	4(%r11),%r10d
+	leaq	(%rsi,%r10,1),%r10
+	cmpq	%r10,%rbx
+	jae	.Lin_prologue
+	leaq	.Lavx2_shortcut(%rip),%r10
+	cmpq	%r10,%rbx
+	jb	.Lnot_in_avx2
+
+	andq	$-1024,%rax
+	addq	$448,%rax
+.Lnot_in_avx2:
+	movq	%rax,%rsi
+	movq	64+24(%rax),%rax
+
+	movq	-8(%rax),%rbx
+	movq	-16(%rax),%rbp
+	movq	-24(%rax),%r12
+	movq	-32(%rax),%r13
+	movq	-40(%rax),%r14
+	movq	-48(%rax),%r15
+	movq	%rbx,144(%r8)
+	movq	%rbp,160(%r8)
+	movq	%r12,216(%r8)
+	movq	%r13,224(%r8)
+	movq	%r14,232(%r8)
+	movq	%r15,240(%r8)
+
+	leaq	.Lepilogue(%rip),%r10
+	cmpq	%r10,%rbx
+	jb	.Lin_prologue
+
+	leaq	64+32(%rsi),%rsi
+	leaq	512(%r8),%rdi
+	movl	$8,%ecx
+.long	0xa548f3fc
+
+.Lin_prologue:
+	movq	8(%rax),%rdi
+	movq	16(%rax),%rsi
+	movq	%rax,152(%r8)
+	movq	%rsi,168(%r8)
+	movq	%rdi,176(%r8)
+
+	movq	40(%r9),%rdi
+	movq	%r8,%rsi
+	movl	$154,%ecx
+.long	0xa548f3fc
+
+	movq	%r9,%rsi
+	xorq	%rcx,%rcx
+	movq	8(%rsi),%rdx
+	movq	0(%rsi),%r8
+	movq	16(%rsi),%r9
+	movq	40(%rsi),%r10
+	leaq	56(%rsi),%r11
+	leaq	24(%rsi),%r12
+	movq	%r10,32(%rsp)
+	movq	%r11,40(%rsp)
+	movq	%r12,48(%rsp)
+	movq	%rcx,56(%rsp)
+	call	*__imp_RtlVirtualUnwind(%rip)
+
+	movl	$1,%eax
+	addq	$64,%rsp
+	popfq
+	popq	%r15
+	popq	%r14
+	popq	%r13
+	popq	%r12
+	popq	%rbp
+	popq	%rbx
+	popq	%rdi
+	popq	%rsi
+	.byte	0xf3,0xc3
+
+.def	shaext_handler;	.scl 3;	.type 32;	.endef
+.p2align	4
+shaext_handler:
+	pushq	%rsi
+	pushq	%rdi
+	pushq	%rbx
+	pushq	%rbp
+	pushq	%r12
+	pushq	%r13
+	pushq	%r14
+	pushq	%r15
+	pushfq
+	subq	$64,%rsp
+
+	movq	120(%r8),%rax
+	movq	248(%r8),%rbx
+
+	leaq	.Lprologue_shaext(%rip),%r10
+	cmpq	%r10,%rbx
+	jb	.Lin_prologue
+
+	leaq	.Lepilogue_shaext(%rip),%r10
+	cmpq	%r10,%rbx
+	jae	.Lin_prologue
+
+	leaq	-8-80(%rax),%rsi
+	leaq	512(%r8),%rdi
+	movl	$10,%ecx
+.long	0xa548f3fc
+
+	jmp	.Lin_prologue
+
+.section	.pdata
+.p2align	2
+.rva	.LSEH_begin_sha256_block_data_order
+.rva	.LSEH_end_sha256_block_data_order
+.rva	.LSEH_info_sha256_block_data_order
+.rva	.LSEH_begin_sha256_block_data_order_shaext
+.rva	.LSEH_end_sha256_block_data_order_shaext
+.rva	.LSEH_info_sha256_block_data_order_shaext
+.rva	.LSEH_begin_sha256_block_data_order_ssse3
+.rva	.LSEH_end_sha256_block_data_order_ssse3
+.rva	.LSEH_info_sha256_block_data_order_ssse3
+.rva	.LSEH_begin_sha256_block_data_order_avx
+.rva	.LSEH_end_sha256_block_data_order_avx
+.rva	.LSEH_info_sha256_block_data_order_avx
+.rva	.LSEH_begin_sha256_block_data_order_avx2
+.rva	.LSEH_end_sha256_block_data_order_avx2
+.rva	.LSEH_info_sha256_block_data_order_avx2
+.section	.xdata
+.p2align	3
+.LSEH_info_sha256_block_data_order:
+.byte	9,0,0,0
+.rva	se_handler
+.rva	.Lprologue,.Lepilogue
+.LSEH_info_sha256_block_data_order_shaext:
+.byte	9,0,0,0
+.rva	shaext_handler
+.LSEH_info_sha256_block_data_order_ssse3:
+.byte	9,0,0,0
+.rva	se_handler
+.rva	.Lprologue_ssse3,.Lepilogue_ssse3
+.LSEH_info_sha256_block_data_order_avx:
+.byte	9,0,0,0
+.rva	se_handler
+.rva	.Lprologue_avx,.Lepilogue_avx
+.LSEH_info_sha256_block_data_order_avx2:
+.byte	9,0,0,0
+.rva	se_handler
+.rva	.Lprologue_avx2,.Lepilogue_avx2
+
diff --git a/lib/accelerated/x86/coff/sha512-ssse3-x86.s b/lib/accelerated/x86/coff/sha512-ssse3-x86.s
index acad0ec1e7..72a7f73d77 100644
--- a/lib/accelerated/x86/coff/sha512-ssse3-x86.s
+++ b/lib/accelerated/x86/coff/sha512-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha512-586.s"
 .text
 .globl	_sha512_block_data_order
 .def	_sha512_block_data_order;	.scl	2;	.type	32;	.endef
@@ -594,6 +593,8 @@ _sha512_block_data_order:
 .long	4234509866,1501505948
 .long	987167468,1607167915
 .long	1246189591,1816402316
+.long	67438087,66051
+.long	202182159,134810123
 .byte	83,72,65,53,49,50,32,98,108,111,99,107,32,116,114,97
 .byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
 .byte	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
diff --git a/lib/accelerated/x86/coff/sha512-ssse3-x86_64.s b/lib/accelerated/x86/coff/sha512-ssse3-x86_64.s
index 034dab2388..419fa2a980 100644
--- a/lib/accelerated/x86/coff/sha512-ssse3-x86_64.s
+++ b/lib/accelerated/x86/coff/sha512-ssse3-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,2880 +40,5516 @@
 .text	
 
 
-.globl	sha256_block_data_order
-.def	sha256_block_data_order;	.scl 2;	.type 32;	.endef
+.globl	sha512_block_data_order
+.def	sha512_block_data_order;	.scl 2;	.type 32;	.endef
 .p2align	4
-sha256_block_data_order:
+sha512_block_data_order:
 	movq	%rdi,8(%rsp)
 	movq	%rsi,16(%rsp)
 	movq	%rsp,%rax
-.LSEH_begin_sha256_block_data_order:
+.LSEH_begin_sha512_block_data_order:
 	movq	%rcx,%rdi
 	movq	%rdx,%rsi
 	movq	%r8,%rdx
 
+
 	leaq	_gnutls_x86_cpuid_s(%rip),%r11
 	movl	0(%r11),%r9d
 	movl	4(%r11),%r10d
 	movl	8(%r11),%r11d
-	testl	$512,%r10d
-	jnz	.Lssse3_shortcut
+	testl	$2048,%r10d
+	jnz	.Lxop_shortcut
+	andl	$296,%r11d
+	cmpl	$296,%r11d
+	je	.Lavx2_shortcut
+	andl	$1073741824,%r9d
+	andl	$268435968,%r10d
+	orl	%r9d,%r10d
+	cmpl	$1342177792,%r10d
+	je	.Lavx_shortcut
+	movq	%rsp,%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
-	movq	%rsp,%r11
+
 	shlq	$4,%rdx
-	subq	$64+32,%rsp
-	leaq	(%rsi,%rdx,4),%rdx
+	subq	$128+32,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
 	andq	$-64,%rsp
-	movq	%rdi,64+0(%rsp)
-	movq	%rsi,64+8(%rsp)
-	movq	%rdx,64+16(%rsp)
-	movq	%r11,64+24(%rsp)
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+
 .Lprologue:
 
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-	movl	16(%rdi),%r8d
-	movl	20(%rdi),%r9d
-	movl	24(%rdi),%r10d
-	movl	28(%rdi),%r11d
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
 	jmp	.Lloop
 
 .p2align	4
 .Lloop:
-	movl	%ebx,%edi
-	leaq	K256(%rip),%rbp
-	xorl	%ecx,%edi
-	movl	0(%rsi),%r12d
-	movl	%r8d,%r13d
-	movl	%eax,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,0(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-	movl	4(%rsi),%r12d
-	movl	%edx,%r13d
-	movl	%r11d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,4(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-	movl	8(%rsi),%r12d
-	movl	%ecx,%r13d
-	movl	%r10d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,8(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-	movl	12(%rsi),%r12d
-	movl	%ebx,%r13d
-	movl	%r9d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,12(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-	movl	16(%rsi),%r12d
-	movl	%eax,%r13d
-	movl	%r8d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,16(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-	movl	20(%rsi),%r12d
-	movl	%r11d,%r13d
-	movl	%edx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,20(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-	movl	24(%rsi),%r12d
-	movl	%r10d,%r13d
-	movl	%ecx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,24(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-	movl	28(%rsi),%r12d
-	movl	%r9d,%r13d
-	movl	%ebx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,28(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-	movl	32(%rsi),%r12d
-	movl	%r8d,%r13d
-	movl	%eax,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,32(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-	movl	36(%rsi),%r12d
-	movl	%edx,%r13d
-	movl	%r11d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,36(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-	movl	40(%rsi),%r12d
-	movl	%ecx,%r13d
-	movl	%r10d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,40(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-	movl	44(%rsi),%r12d
-	movl	%ebx,%r13d
-	movl	%r9d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,44(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-	movl	48(%rsi),%r12d
-	movl	%eax,%r13d
-	movl	%r8d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,48(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-	movl	52(%rsi),%r12d
-	movl	%r11d,%r13d
-	movl	%edx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,52(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-	movl	56(%rsi),%r12d
-	movl	%r10d,%r13d
-	movl	%ecx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,56(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-	movl	60(%rsi),%r12d
-	movl	%r9d,%r13d
-	movl	%ebx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,60(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	4(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
+	movq	%rbx,%rdi
+	leaq	K512(%rip),%rbp
+	xorq	%rcx,%rdi
+	movq	0(%rsi),%r12
+	movq	%r8,%r13
+	movq	%rax,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,0(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r11
+	movq	8(%rsi),%r12
+	movq	%rdx,%r13
+	movq	%r11,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,8(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r10
+	movq	16(%rsi),%r12
+	movq	%rcx,%r13
+	movq	%r10,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,16(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r9
+	movq	24(%rsi),%r12
+	movq	%rbx,%r13
+	movq	%r9,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rcx,%rdi
 
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,24(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r8
+	movq	32(%rsi),%r12
+	movq	%rax,%r13
+	movq	%r8,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,32(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rdx
+	movq	40(%rsi),%r12
+	movq	%r11,%r13
+	movq	%rdx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,40(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rcx
+	movq	48(%rsi),%r12
+	movq	%r10,%r13
+	movq	%rcx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,48(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rbx
+	movq	56(%rsi),%r12
+	movq	%r9,%r13
+	movq	%rbx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,56(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rax
+	movq	64(%rsi),%r12
+	movq	%r8,%r13
+	movq	%rax,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,64(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r11
+	movq	72(%rsi),%r12
+	movq	%rdx,%r13
+	movq	%r11,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,72(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r10
+	movq	80(%rsi),%r12
+	movq	%rcx,%r13
+	movq	%r10,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,80(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r9
+	movq	88(%rsi),%r12
+	movq	%rbx,%r13
+	movq	%r9,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,88(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r8
+	movq	96(%rsi),%r12
+	movq	%rax,%r13
+	movq	%r8,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,96(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rdx
+	movq	104(%rsi),%r12
+	movq	%r11,%r13
+	movq	%rdx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,104(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rcx
+	movq	112(%rsi),%r12
+	movq	%r10,%r13
+	movq	%rcx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,112(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rbx
+	movq	120(%rsi),%r12
+	movq	%r9,%r13
+	movq	%rbx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,120(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
 	jmp	.Lrounds_16_xx
 .p2align	4
 .Lrounds_16_xx:
+	movq	8(%rsp),%r13
+	movq	112(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rax
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	72(%rsp),%r12
+
+	addq	0(%rsp),%r12
+	movq	%r8,%r13
+	addq	%r15,%r12
+	movq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,0(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	movq	16(%rsp),%r13
+	movq	120(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r11
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	80(%rsp),%r12
+
+	addq	8(%rsp),%r12
+	movq	%rdx,%r13
+	addq	%rdi,%r12
+	movq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,8(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	movq	24(%rsp),%r13
+	movq	0(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r10
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	88(%rsp),%r12
+
+	addq	16(%rsp),%r12
+	movq	%rcx,%r13
+	addq	%r15,%r12
+	movq	%r10,%r14
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,16(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	movq	32(%rsp),%r13
+	movq	8(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r9
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	96(%rsp),%r12
+
+	addq	24(%rsp),%r12
+	movq	%rbx,%r13
+	addq	%rdi,%r12
+	movq	%r9,%r14
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,24(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	movq	40(%rsp),%r13
+	movq	16(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r8
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	104(%rsp),%r12
+
+	addq	32(%rsp),%r12
+	movq	%rax,%r13
+	addq	%r15,%r12
+	movq	%r8,%r14
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,32(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	movq	48(%rsp),%r13
+	movq	24(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rdx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	112(%rsp),%r12
+
+	addq	40(%rsp),%r12
+	movq	%r11,%r13
+	addq	%rdi,%r12
+	movq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,40(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	movq	56(%rsp),%r13
+	movq	32(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rcx
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	120(%rsp),%r12
+
+	addq	48(%rsp),%r12
+	movq	%r10,%r13
+	addq	%r15,%r12
+	movq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,48(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	movq	64(%rsp),%r13
+	movq	40(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rbx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	0(%rsp),%r12
+
+	addq	56(%rsp),%r12
+	movq	%r9,%r13
+	addq	%rdi,%r12
+	movq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,56(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	movq	72(%rsp),%r13
+	movq	48(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rax
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	8(%rsp),%r12
+
+	addq	64(%rsp),%r12
+	movq	%r8,%r13
+	addq	%r15,%r12
+	movq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,64(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	movq	80(%rsp),%r13
+	movq	56(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r11
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	16(%rsp),%r12
+
+	addq	72(%rsp),%r12
+	movq	%rdx,%r13
+	addq	%rdi,%r12
+	movq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,72(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	movq	88(%rsp),%r13
+	movq	64(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r10
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	24(%rsp),%r12
+
+	addq	80(%rsp),%r12
+	movq	%rcx,%r13
+	addq	%r15,%r12
+	movq	%r10,%r14
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,80(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	movq	96(%rsp),%r13
+	movq	72(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r9
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	32(%rsp),%r12
+
+	addq	88(%rsp),%r12
+	movq	%rbx,%r13
+	addq	%rdi,%r12
+	movq	%r9,%r14
+	rorq	$23,%r13
+	movq	%rcx,%rdi
 
-	movl	56(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	36(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	0(%rsp),%r12d
-	movl	%r8d,%r13d
-	addl	%r14d,%r12d
-	movl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,0(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	movl	8(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-
-	movl	60(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	40(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	4(%rsp),%r12d
-	movl	%edx,%r13d
-	addl	%r14d,%r12d
-	movl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,4(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	movl	12(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-
-	movl	0(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	44(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	8(%rsp),%r12d
-	movl	%ecx,%r13d
-	addl	%r14d,%r12d
-	movl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,8(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	movl	16(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-
-	movl	4(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	48(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	12(%rsp),%r12d
-	movl	%ebx,%r13d
-	addl	%r14d,%r12d
-	movl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,12(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	movl	20(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-
-	movl	8(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	52(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	16(%rsp),%r12d
-	movl	%eax,%r13d
-	addl	%r14d,%r12d
-	movl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,16(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	movl	24(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-
-	movl	12(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	56(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	20(%rsp),%r12d
-	movl	%r11d,%r13d
-	addl	%r14d,%r12d
-	movl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,20(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	movl	28(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-
-	movl	16(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	60(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	24(%rsp),%r12d
-	movl	%r10d,%r13d
-	addl	%r14d,%r12d
-	movl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,24(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	movl	32(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-
-	movl	20(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	0(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	28(%rsp),%r12d
-	movl	%r9d,%r13d
-	addl	%r14d,%r12d
-	movl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,28(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	36(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-
-	movl	24(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	4(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	32(%rsp),%r12d
-	movl	%r8d,%r13d
-	addl	%r14d,%r12d
-	movl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,32(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	movl	40(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-
-	movl	28(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	8(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	36(%rsp),%r12d
-	movl	%edx,%r13d
-	addl	%r14d,%r12d
-	movl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,36(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	movl	44(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-
-	movl	32(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	12(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	40(%rsp),%r12d
-	movl	%ecx,%r13d
-	addl	%r14d,%r12d
-	movl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,40(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	movl	48(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-
-	movl	36(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	16(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	44(%rsp),%r12d
-	movl	%ebx,%r13d
-	addl	%r14d,%r12d
-	movl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,44(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	movl	52(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-
-	movl	40(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	20(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	48(%rsp),%r12d
-	movl	%eax,%r13d
-	addl	%r14d,%r12d
-	movl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,48(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	movl	56(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-
-	movl	44(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	24(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	52(%rsp),%r12d
-	movl	%r11d,%r13d
-	addl	%r14d,%r12d
-	movl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,52(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	movl	60(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-
-	movl	48(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	28(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	56(%rsp),%r12d
-	movl	%r10d,%r13d
-	addl	%r14d,%r12d
-	movl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,56(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	movl	0(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-
-	movl	52(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	32(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	60(%rsp),%r12d
-	movl	%r9d,%r13d
-	addl	%r14d,%r12d
-	movl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,60(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	4(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-	cmpb	$0,3(%rbp)
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,88(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	movq	104(%rsp),%r13
+	movq	80(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r8
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	40(%rsp),%r12
+
+	addq	96(%rsp),%r12
+	movq	%rax,%r13
+	addq	%r15,%r12
+	movq	%r8,%r14
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,96(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	movq	112(%rsp),%r13
+	movq	88(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rdx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	48(%rsp),%r12
+
+	addq	104(%rsp),%r12
+	movq	%r11,%r13
+	addq	%rdi,%r12
+	movq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,104(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	movq	120(%rsp),%r13
+	movq	96(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rcx
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	56(%rsp),%r12
+
+	addq	112(%rsp),%r12
+	movq	%r10,%r13
+	addq	%r15,%r12
+	movq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,112(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	movq	0(%rsp),%r13
+	movq	104(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rbx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	64(%rsp),%r12
+
+	addq	120(%rsp),%r12
+	movq	%r9,%r13
+	addq	%rdi,%r12
+	movq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,120(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	cmpb	$0,7(%rbp)
 	jnz	.Lrounds_16_xx
 
-	movq	64+0(%rsp),%rdi
-	leaq	64(%rsi),%rsi
-
-	addl	0(%rdi),%eax
-	addl	4(%rdi),%ebx
-	addl	8(%rdi),%ecx
-	addl	12(%rdi),%edx
-	addl	16(%rdi),%r8d
-	addl	20(%rdi),%r9d
-	addl	24(%rdi),%r10d
-	addl	28(%rdi),%r11d
-
-	cmpq	64+16(%rsp),%rsi
-
-	movl	%eax,0(%rdi)
-	movl	%ebx,4(%rdi)
-	movl	%ecx,8(%rdi)
-	movl	%edx,12(%rdi)
-	movl	%r8d,16(%rdi)
-	movl	%r9d,20(%rdi)
-	movl	%r10d,24(%rdi)
-	movl	%r11d,28(%rdi)
+	movq	128+0(%rsp),%rdi
+	addq	%r14,%rax
+	leaq	128(%rsi),%rsi
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
 	jb	.Lloop
 
-	movq	64+24(%rsp),%rsi
-	movq	(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
+	movq	152(%rsp),%rsi
+
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
 .Lepilogue:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
-.LSEH_end_sha256_block_data_order:
+
+.LSEH_end_sha512_block_data_order:
 .p2align	6
 
-K256:
-.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
-.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
-.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
-.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
-.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
-.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
-.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
-.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
-.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
-.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
-.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
-.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
-.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
-.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
-.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
-.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
-.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
-.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
-.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
-.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
-.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
-.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
-.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
-.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
-.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
-.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
-.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
-.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
-.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
-.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
-.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
-.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
-
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
-.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
-.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
-.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
-.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
-.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.def	sha256_block_data_order_ssse3;	.scl 3;	.type 32;	.endef
+K512:
+.quad	0x428a2f98d728ae22,0x7137449123ef65cd
+.quad	0x428a2f98d728ae22,0x7137449123ef65cd
+.quad	0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc
+.quad	0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc
+.quad	0x3956c25bf348b538,0x59f111f1b605d019
+.quad	0x3956c25bf348b538,0x59f111f1b605d019
+.quad	0x923f82a4af194f9b,0xab1c5ed5da6d8118
+.quad	0x923f82a4af194f9b,0xab1c5ed5da6d8118
+.quad	0xd807aa98a3030242,0x12835b0145706fbe
+.quad	0xd807aa98a3030242,0x12835b0145706fbe
+.quad	0x243185be4ee4b28c,0x550c7dc3d5ffb4e2
+.quad	0x243185be4ee4b28c,0x550c7dc3d5ffb4e2
+.quad	0x72be5d74f27b896f,0x80deb1fe3b1696b1
+.quad	0x72be5d74f27b896f,0x80deb1fe3b1696b1
+.quad	0x9bdc06a725c71235,0xc19bf174cf692694
+.quad	0x9bdc06a725c71235,0xc19bf174cf692694
+.quad	0xe49b69c19ef14ad2,0xefbe4786384f25e3
+.quad	0xe49b69c19ef14ad2,0xefbe4786384f25e3
+.quad	0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65
+.quad	0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65
+.quad	0x2de92c6f592b0275,0x4a7484aa6ea6e483
+.quad	0x2de92c6f592b0275,0x4a7484aa6ea6e483
+.quad	0x5cb0a9dcbd41fbd4,0x76f988da831153b5
+.quad	0x5cb0a9dcbd41fbd4,0x76f988da831153b5
+.quad	0x983e5152ee66dfab,0xa831c66d2db43210
+.quad	0x983e5152ee66dfab,0xa831c66d2db43210
+.quad	0xb00327c898fb213f,0xbf597fc7beef0ee4
+.quad	0xb00327c898fb213f,0xbf597fc7beef0ee4
+.quad	0xc6e00bf33da88fc2,0xd5a79147930aa725
+.quad	0xc6e00bf33da88fc2,0xd5a79147930aa725
+.quad	0x06ca6351e003826f,0x142929670a0e6e70
+.quad	0x06ca6351e003826f,0x142929670a0e6e70
+.quad	0x27b70a8546d22ffc,0x2e1b21385c26c926
+.quad	0x27b70a8546d22ffc,0x2e1b21385c26c926
+.quad	0x4d2c6dfc5ac42aed,0x53380d139d95b3df
+.quad	0x4d2c6dfc5ac42aed,0x53380d139d95b3df
+.quad	0x650a73548baf63de,0x766a0abb3c77b2a8
+.quad	0x650a73548baf63de,0x766a0abb3c77b2a8
+.quad	0x81c2c92e47edaee6,0x92722c851482353b
+.quad	0x81c2c92e47edaee6,0x92722c851482353b
+.quad	0xa2bfe8a14cf10364,0xa81a664bbc423001
+.quad	0xa2bfe8a14cf10364,0xa81a664bbc423001
+.quad	0xc24b8b70d0f89791,0xc76c51a30654be30
+.quad	0xc24b8b70d0f89791,0xc76c51a30654be30
+.quad	0xd192e819d6ef5218,0xd69906245565a910
+.quad	0xd192e819d6ef5218,0xd69906245565a910
+.quad	0xf40e35855771202a,0x106aa07032bbd1b8
+.quad	0xf40e35855771202a,0x106aa07032bbd1b8
+.quad	0x19a4c116b8d2d0c8,0x1e376c085141ab53
+.quad	0x19a4c116b8d2d0c8,0x1e376c085141ab53
+.quad	0x2748774cdf8eeb99,0x34b0bcb5e19b48a8
+.quad	0x2748774cdf8eeb99,0x34b0bcb5e19b48a8
+.quad	0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb
+.quad	0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb
+.quad	0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3
+.quad	0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3
+.quad	0x748f82ee5defb2fc,0x78a5636f43172f60
+.quad	0x748f82ee5defb2fc,0x78a5636f43172f60
+.quad	0x84c87814a1f0ab72,0x8cc702081a6439ec
+.quad	0x84c87814a1f0ab72,0x8cc702081a6439ec
+.quad	0x90befffa23631e28,0xa4506cebde82bde9
+.quad	0x90befffa23631e28,0xa4506cebde82bde9
+.quad	0xbef9a3f7b2c67915,0xc67178f2e372532b
+.quad	0xbef9a3f7b2c67915,0xc67178f2e372532b
+.quad	0xca273eceea26619c,0xd186b8c721c0c207
+.quad	0xca273eceea26619c,0xd186b8c721c0c207
+.quad	0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178
+.quad	0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178
+.quad	0x06f067aa72176fba,0x0a637dc5a2c898a6
+.quad	0x06f067aa72176fba,0x0a637dc5a2c898a6
+.quad	0x113f9804bef90dae,0x1b710b35131c471b
+.quad	0x113f9804bef90dae,0x1b710b35131c471b
+.quad	0x28db77f523047d84,0x32caab7b40c72493
+.quad	0x28db77f523047d84,0x32caab7b40c72493
+.quad	0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
+.quad	0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
+.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a
+.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a
+.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817
+.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817
+
+.quad	0x0001020304050607,0x08090a0b0c0d0e0f
+.quad	0x0001020304050607,0x08090a0b0c0d0e0f
+.byte	83,72,65,53,49,50,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
+.def	sha512_block_data_order_xop;	.scl 3;	.type 32;	.endef
 .p2align	6
-sha256_block_data_order_ssse3:
+sha512_block_data_order_xop:
 	movq	%rdi,8(%rsp)
 	movq	%rsi,16(%rsp)
 	movq	%rsp,%rax
-.LSEH_begin_sha256_block_data_order_ssse3:
+.LSEH_begin_sha512_block_data_order_xop:
 	movq	%rcx,%rdi
 	movq	%rdx,%rsi
 	movq	%r8,%rdx
 
-.Lssse3_shortcut:
+
+.Lxop_shortcut:
+	movq	%rsp,%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
-	movq	%rsp,%r11
+
 	shlq	$4,%rdx
-	subq	$160,%rsp
-	leaq	(%rsi,%rdx,4),%rdx
+	subq	$256,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
 	andq	$-64,%rsp
-	movq	%rdi,64+0(%rsp)
-	movq	%rsi,64+8(%rsp)
-	movq	%rdx,64+16(%rsp)
-	movq	%r11,64+24(%rsp)
-	movaps	%xmm6,64+32(%rsp)
-	movaps	%xmm7,64+48(%rsp)
-	movaps	%xmm8,64+64(%rsp)
-	movaps	%xmm9,64+80(%rsp)
-.Lprologue_ssse3:
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-	movl	16(%rdi),%r8d
-	movl	20(%rdi),%r9d
-	movl	24(%rdi),%r10d
-	movl	28(%rdi),%r11d
-	movdqa	K256+512+32(%rip),%xmm8
-	movdqa	K256+512+64(%rip),%xmm9
-	jmp	.Lloop_ssse3
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+
+	movaps	%xmm6,128+32(%rsp)
+	movaps	%xmm7,128+48(%rsp)
+	movaps	%xmm8,128+64(%rsp)
+	movaps	%xmm9,128+80(%rsp)
+	movaps	%xmm10,128+96(%rsp)
+	movaps	%xmm11,128+112(%rsp)
+.Lprologue_xop:
+
+	vzeroupper
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	.Lloop_xop
 .p2align	4
-.Lloop_ssse3:
-	movdqa	K256+512(%rip),%xmm7
-	movdqu	0(%rsi),%xmm0
-	movdqu	16(%rsi),%xmm1
-	movdqu	32(%rsi),%xmm2
-	movdqu	48(%rsi),%xmm3
-.byte	102,15,56,0,199
-	leaq	K256(%rip),%rbp
-.byte	102,15,56,0,207
-	movdqa	0(%rbp),%xmm4
-.byte	102,15,56,0,215
-	movdqa	32(%rbp),%xmm5
-	paddd	%xmm0,%xmm4
-	movdqa	64(%rbp),%xmm6
-.byte	102,15,56,0,223
-	movdqa	96(%rbp),%xmm7
-	paddd	%xmm1,%xmm5
-	paddd	%xmm2,%xmm6
-	paddd	%xmm3,%xmm7
-	movdqa	%xmm4,0(%rsp)
-	movl	%eax,%r14d
-	movdqa	%xmm5,16(%rsp)
-	movl	%ebx,%edi
-	movdqa	%xmm6,32(%rsp)
-	xorl	%ecx,%edi
-	movdqa	%xmm7,48(%rsp)
-	movl	%r8d,%r13d
-	jmp	.Lssse3_00_47
+.Lloop_xop:
+	vmovdqa	K512+1280(%rip),%xmm11
+	vmovdqu	0(%rsi),%xmm0
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vpshufb	%xmm11,%xmm0,%xmm0
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm11,%xmm1,%xmm1
+	vmovdqu	64(%rsi),%xmm4
+	vpshufb	%xmm11,%xmm2,%xmm2
+	vmovdqu	80(%rsi),%xmm5
+	vpshufb	%xmm11,%xmm3,%xmm3
+	vmovdqu	96(%rsi),%xmm6
+	vpshufb	%xmm11,%xmm4,%xmm4
+	vmovdqu	112(%rsi),%xmm7
+	vpshufb	%xmm11,%xmm5,%xmm5
+	vpaddq	-128(%rbp),%xmm0,%xmm8
+	vpshufb	%xmm11,%xmm6,%xmm6
+	vpaddq	-96(%rbp),%xmm1,%xmm9
+	vpshufb	%xmm11,%xmm7,%xmm7
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	vpaddq	-32(%rbp),%xmm3,%xmm11
+	vmovdqa	%xmm8,0(%rsp)
+	vpaddq	0(%rbp),%xmm4,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	vpaddq	32(%rbp),%xmm5,%xmm9
+	vmovdqa	%xmm10,32(%rsp)
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	vmovdqa	%xmm11,48(%rsp)
+	vpaddq	96(%rbp),%xmm7,%xmm11
+	vmovdqa	%xmm8,64(%rsp)
+	movq	%rax,%r14
+	vmovdqa	%xmm9,80(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%xmm10,96(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%xmm11,112(%rsp)
+	movq	%r8,%r13
+	jmp	.Lxop_00_47
 
 .p2align	4
-.Lssse3_00_47:
-	subq	$-32*4,%rbp
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movdqa	%xmm1,%xmm4
-	movl	%r9d,%r12d
-	movdqa	%xmm3,%xmm7
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-.byte	102,15,58,15,224,4
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-.byte	102,15,58,15,250,4
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	0(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%ebx,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	paddd	%xmm7,%xmm0
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	psrld	$7,%xmm6
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	pshufd	$250,%xmm3,%xmm7
-	movl	%r8d,%r12d
-	pslld	$14,%xmm5
-	xorl	%edx,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	pslld	$11,%xmm5
-	addl	4(%rsp),%r10d
-	pxor	%xmm6,%xmm4
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	paddd	%xmm4,%xmm0
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	8(%rsp),%r9d
-.byte	102,65,15,56,0,248
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm0
-	addl	%r12d,%r9d
-	pshufd	$80,%xmm0,%xmm7
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	psrld	$10,%xmm7
-	movl	%ebx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	pxor	%xmm6,%xmm7
-	addl	12(%rsp),%r8d
-	movl	%r9d,%edi
-	movdqa	0(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	paddd	%xmm7,%xmm0
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	paddd	%xmm0,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	movdqa	%xmm6,0(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movdqa	%xmm2,%xmm4
-	movl	%ebx,%r12d
-	movdqa	%xmm0,%xmm7
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-.byte	102,15,58,15,225,4
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-.byte	102,15,58,15,251,4
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	16(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%r9d,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	paddd	%xmm7,%xmm1
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	psrld	$7,%xmm6
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	pshufd	$250,%xmm0,%xmm7
-	movl	%eax,%r12d
-	pslld	$14,%xmm5
-	xorl	%r11d,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	pslld	$11,%xmm5
-	addl	20(%rsp),%ecx
-	pxor	%xmm6,%xmm4
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	paddd	%xmm4,%xmm1
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	24(%rsp),%ebx
-.byte	102,65,15,56,0,248
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm1
-	addl	%r12d,%ebx
-	pshufd	$80,%xmm1,%xmm7
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	psrld	$10,%xmm7
-	movl	%r9d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	pxor	%xmm6,%xmm7
-	addl	28(%rsp),%eax
-	movl	%ebx,%edi
-	movdqa	32(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	paddd	%xmm7,%xmm1
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	paddd	%xmm1,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movdqa	%xmm6,16(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movdqa	%xmm3,%xmm4
-	movl	%r9d,%r12d
-	movdqa	%xmm1,%xmm7
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-.byte	102,15,58,15,226,4
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-.byte	102,15,58,15,248,4
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	32(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%ebx,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	paddd	%xmm7,%xmm2
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	psrld	$7,%xmm6
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	pshufd	$250,%xmm1,%xmm7
-	movl	%r8d,%r12d
-	pslld	$14,%xmm5
-	xorl	%edx,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	pslld	$11,%xmm5
-	addl	36(%rsp),%r10d
-	pxor	%xmm6,%xmm4
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	paddd	%xmm4,%xmm2
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	40(%rsp),%r9d
-.byte	102,65,15,56,0,248
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm2
-	addl	%r12d,%r9d
-	pshufd	$80,%xmm2,%xmm7
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	psrld	$10,%xmm7
-	movl	%ebx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	pxor	%xmm6,%xmm7
-	addl	44(%rsp),%r8d
-	movl	%r9d,%edi
-	movdqa	64(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	paddd	%xmm7,%xmm2
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	paddd	%xmm2,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	movdqa	%xmm6,32(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movdqa	%xmm0,%xmm4
-	movl	%ebx,%r12d
-	movdqa	%xmm2,%xmm7
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-.byte	102,15,58,15,227,4
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-.byte	102,15,58,15,249,4
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	48(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%r9d,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	paddd	%xmm7,%xmm3
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	psrld	$7,%xmm6
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	pshufd	$250,%xmm2,%xmm7
-	movl	%eax,%r12d
-	pslld	$14,%xmm5
-	xorl	%r11d,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	pslld	$11,%xmm5
-	addl	52(%rsp),%ecx
-	pxor	%xmm6,%xmm4
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	paddd	%xmm4,%xmm3
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	56(%rsp),%ebx
-.byte	102,65,15,56,0,248
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm3
-	addl	%r12d,%ebx
-	pshufd	$80,%xmm3,%xmm7
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	psrld	$10,%xmm7
-	movl	%r9d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	pxor	%xmm6,%xmm7
-	addl	60(%rsp),%eax
-	movl	%ebx,%edi
-	movdqa	96(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	paddd	%xmm7,%xmm3
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	paddd	%xmm3,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movdqa	%xmm6,48(%rsp)
-	cmpb	$0,131(%rbp)
-	jne	.Lssse3_00_47
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movl	%r9d,%r12d
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	0(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	xorl	%ebx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	movl	%r8d,%r12d
-	xorl	%edx,%r13d
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	addl	4(%rsp),%r10d
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	8(%rsp),%r9d
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r9d
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	movl	%ebx,%r13d
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	addl	12(%rsp),%r8d
-	movl	%r9d,%edi
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movl	%ebx,%r12d
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	16(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	xorl	%r9d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	movl	%eax,%r12d
-	xorl	%r11d,%r13d
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	addl	20(%rsp),%ecx
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	24(%rsp),%ebx
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%ebx
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	movl	%r9d,%r13d
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	addl	28(%rsp),%eax
-	movl	%ebx,%edi
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movl	%r9d,%r12d
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	32(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	xorl	%ebx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	movl	%r8d,%r12d
-	xorl	%edx,%r13d
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	addl	36(%rsp),%r10d
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	40(%rsp),%r9d
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r9d
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	movl	%ebx,%r13d
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	addl	44(%rsp),%r8d
-	movl	%r9d,%edi
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movl	%ebx,%r12d
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	48(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	xorl	%r9d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	movl	%eax,%r12d
-	xorl	%r11d,%r13d
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	addl	52(%rsp),%ecx
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	56(%rsp),%ebx
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%ebx
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	movl	%r9d,%r13d
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	addl	60(%rsp),%eax
-	movl	%ebx,%edi
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movq	64+0(%rsp),%rdi
-	movl	%r14d,%eax
-
-	addl	0(%rdi),%eax
-	leaq	64(%rsi),%rsi
-	addl	4(%rdi),%ebx
-	addl	8(%rdi),%ecx
-	addl	12(%rdi),%edx
-	addl	16(%rdi),%r8d
-	addl	20(%rdi),%r9d
-	addl	24(%rdi),%r10d
-	addl	28(%rdi),%r11d
-
-	cmpq	64+16(%rsp),%rsi
-
-	movl	%eax,0(%rdi)
-	movl	%ebx,4(%rdi)
-	movl	%ecx,8(%rdi)
-	movl	%edx,12(%rdi)
-	movl	%r8d,16(%rdi)
-	movl	%r9d,20(%rdi)
-	movl	%r10d,24(%rdi)
-	movl	%r11d,28(%rdi)
-	jb	.Lloop_ssse3
-
-	movq	64+24(%rsp),%rsi
-	movaps	64+32(%rsp),%xmm6
-	movaps	64+48(%rsp),%xmm7
-	movaps	64+64(%rsp),%xmm8
-	movaps	64+80(%rsp),%xmm9
-	movq	(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
-.Lepilogue_ssse3:
+.Lxop_00_47:
+	addq	$256,%rbp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm4,%xmm5,%xmm11
+	movq	%r9,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	vpaddq	%xmm11,%xmm0,%xmm0
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,223,3
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm7,%xmm10
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpaddq	%xmm8,%xmm0,%xmm0
+	movq	%rdx,%r13
+	addq	%r11,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r11
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpaddq	%xmm11,%xmm0,%xmm0
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	vpaddq	-128(%rbp),%xmm0,%xmm10
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,0(%rsp)
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm5,%xmm6,%xmm11
+	movq	%rdx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	vpaddq	%xmm11,%xmm1,%xmm1
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,216,3
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm0,%xmm10
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpaddq	%xmm8,%xmm1,%xmm1
+	movq	%rbx,%r13
+	addq	%r9,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r9
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpaddq	%xmm11,%xmm1,%xmm1
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	vpaddq	-96(%rbp),%xmm1,%xmm10
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,16(%rsp)
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm6,%xmm7,%xmm11
+	movq	%rbx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	vpaddq	%xmm11,%xmm2,%xmm2
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,217,3
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm1,%xmm10
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpaddq	%xmm8,%xmm2,%xmm2
+	movq	%r11,%r13
+	addq	%rdx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpaddq	%xmm11,%xmm2,%xmm2
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,32(%rsp)
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm7,%xmm0,%xmm11
+	movq	%r11,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	vpaddq	%xmm11,%xmm3,%xmm3
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,218,3
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm2,%xmm10
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpaddq	%xmm8,%xmm3,%xmm3
+	movq	%r9,%r13
+	addq	%rbx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpaddq	%xmm11,%xmm3,%xmm3
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	vpaddq	-32(%rbp),%xmm3,%xmm10
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,48(%rsp)
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm0,%xmm1,%xmm11
+	movq	%r9,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	vpaddq	%xmm11,%xmm4,%xmm4
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,219,3
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm3,%xmm10
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpaddq	%xmm8,%xmm4,%xmm4
+	movq	%rdx,%r13
+	addq	%r11,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r11
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpaddq	%xmm11,%xmm4,%xmm4
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	vpaddq	0(%rbp),%xmm4,%xmm10
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,64(%rsp)
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm1,%xmm2,%xmm11
+	movq	%rdx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	vpaddq	%xmm11,%xmm5,%xmm5
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,220,3
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm4,%xmm10
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpaddq	%xmm8,%xmm5,%xmm5
+	movq	%rbx,%r13
+	addq	%r9,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r9
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpaddq	%xmm11,%xmm5,%xmm5
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	vpaddq	32(%rbp),%xmm5,%xmm10
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,80(%rsp)
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm2,%xmm3,%xmm11
+	movq	%rbx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	vpaddq	%xmm11,%xmm6,%xmm6
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,221,3
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm5,%xmm10
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpaddq	%xmm8,%xmm6,%xmm6
+	movq	%r11,%r13
+	addq	%rdx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpaddq	%xmm11,%xmm6,%xmm6
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,96(%rsp)
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm3,%xmm4,%xmm11
+	movq	%r11,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	vpaddq	%xmm11,%xmm7,%xmm7
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,222,3
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm6,%xmm10
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpaddq	%xmm8,%xmm7,%xmm7
+	movq	%r9,%r13
+	addq	%rbx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpaddq	%xmm11,%xmm7,%xmm7
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	vpaddq	96(%rbp),%xmm7,%xmm10
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,112(%rsp)
+	cmpb	$0,135(%rbp)
+	jne	.Lxop_00_47
+	rorq	$23,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	rorq	$5,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	rorq	$23,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	rorq	$5,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	rorq	$23,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	rorq	$23,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	rorq	$5,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	rorq	$5,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	rorq	$5,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	rorq	$23,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	rorq	$5,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	rorq	$23,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	rorq	$23,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	rorq	$5,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	rorq	$5,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	movq	128+0(%rsp),%rdi
+	movq	%r14,%rax
+
+	addq	0(%rdi),%rax
+	leaq	128(%rsi),%rsi
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+	jb	.Lloop_xop
+
+	movq	152(%rsp),%rsi
+
+	vzeroupper
+	movaps	128+32(%rsp),%xmm6
+	movaps	128+48(%rsp),%xmm7
+	movaps	128+64(%rsp),%xmm8
+	movaps	128+80(%rsp),%xmm9
+	movaps	128+96(%rsp),%xmm10
+	movaps	128+112(%rsp),%xmm11
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+.Lepilogue_xop:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_sha512_block_data_order_xop:
+.def	sha512_block_data_order_avx;	.scl 3;	.type 32;	.endef
+.p2align	6
+sha512_block_data_order_avx:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha512_block_data_order_avx:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+
+.Lavx_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	shlq	$4,%rdx
+	subq	$256,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+
+	movaps	%xmm6,128+32(%rsp)
+	movaps	%xmm7,128+48(%rsp)
+	movaps	%xmm8,128+64(%rsp)
+	movaps	%xmm9,128+80(%rsp)
+	movaps	%xmm10,128+96(%rsp)
+	movaps	%xmm11,128+112(%rsp)
+.Lprologue_avx:
+
+	vzeroupper
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	.Lloop_avx
+.p2align	4
+.Lloop_avx:
+	vmovdqa	K512+1280(%rip),%xmm11
+	vmovdqu	0(%rsi),%xmm0
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vpshufb	%xmm11,%xmm0,%xmm0
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm11,%xmm1,%xmm1
+	vmovdqu	64(%rsi),%xmm4
+	vpshufb	%xmm11,%xmm2,%xmm2
+	vmovdqu	80(%rsi),%xmm5
+	vpshufb	%xmm11,%xmm3,%xmm3
+	vmovdqu	96(%rsi),%xmm6
+	vpshufb	%xmm11,%xmm4,%xmm4
+	vmovdqu	112(%rsi),%xmm7
+	vpshufb	%xmm11,%xmm5,%xmm5
+	vpaddq	-128(%rbp),%xmm0,%xmm8
+	vpshufb	%xmm11,%xmm6,%xmm6
+	vpaddq	-96(%rbp),%xmm1,%xmm9
+	vpshufb	%xmm11,%xmm7,%xmm7
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	vpaddq	-32(%rbp),%xmm3,%xmm11
+	vmovdqa	%xmm8,0(%rsp)
+	vpaddq	0(%rbp),%xmm4,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	vpaddq	32(%rbp),%xmm5,%xmm9
+	vmovdqa	%xmm10,32(%rsp)
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	vmovdqa	%xmm11,48(%rsp)
+	vpaddq	96(%rbp),%xmm7,%xmm11
+	vmovdqa	%xmm8,64(%rsp)
+	movq	%rax,%r14
+	vmovdqa	%xmm9,80(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%xmm10,96(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%xmm11,112(%rsp)
+	movq	%r8,%r13
+	jmp	.Lavx_00_47
+
+.p2align	4
+.Lavx_00_47:
+	addq	$256,%rbp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm4,%xmm5,%xmm11
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpaddq	%xmm11,%xmm0,%xmm0
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm7,%xmm11
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	vpsllq	$3,%xmm7,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	vpaddq	%xmm8,%xmm0,%xmm0
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm7,%xmm9
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm0,%xmm0
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	vpaddq	-128(%rbp),%xmm0,%xmm10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,0(%rsp)
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm5,%xmm6,%xmm11
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpaddq	%xmm11,%xmm1,%xmm1
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm0,%xmm11
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	vpsllq	$3,%xmm0,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	vpaddq	%xmm8,%xmm1,%xmm1
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm0,%xmm9
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm1,%xmm1
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	vpaddq	-96(%rbp),%xmm1,%xmm10
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,16(%rsp)
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm6,%xmm7,%xmm11
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpaddq	%xmm11,%xmm2,%xmm2
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm1,%xmm11
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	vpsllq	$3,%xmm1,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	vpaddq	%xmm8,%xmm2,%xmm2
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm1,%xmm9
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm2,%xmm2
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,32(%rsp)
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm7,%xmm0,%xmm11
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpaddq	%xmm11,%xmm3,%xmm3
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm2,%xmm11
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	vpsllq	$3,%xmm2,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	vpaddq	%xmm8,%xmm3,%xmm3
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm2,%xmm9
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm3,%xmm3
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	vpaddq	-32(%rbp),%xmm3,%xmm10
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,48(%rsp)
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm0,%xmm1,%xmm11
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpaddq	%xmm11,%xmm4,%xmm4
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm3,%xmm11
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	vpsllq	$3,%xmm3,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	vpaddq	%xmm8,%xmm4,%xmm4
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm3,%xmm9
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm4,%xmm4
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	vpaddq	0(%rbp),%xmm4,%xmm10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,64(%rsp)
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm1,%xmm2,%xmm11
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpaddq	%xmm11,%xmm5,%xmm5
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm4,%xmm11
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	vpsllq	$3,%xmm4,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	vpaddq	%xmm8,%xmm5,%xmm5
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm4,%xmm9
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm5,%xmm5
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	vpaddq	32(%rbp),%xmm5,%xmm10
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,80(%rsp)
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm2,%xmm3,%xmm11
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpaddq	%xmm11,%xmm6,%xmm6
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm5,%xmm11
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	vpsllq	$3,%xmm5,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	vpaddq	%xmm8,%xmm6,%xmm6
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm5,%xmm9
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm6,%xmm6
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,96(%rsp)
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm3,%xmm4,%xmm11
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpaddq	%xmm11,%xmm7,%xmm7
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm6,%xmm11
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	vpsllq	$3,%xmm6,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	vpaddq	%xmm8,%xmm7,%xmm7
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm6,%xmm9
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm7,%xmm7
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	vpaddq	96(%rbp),%xmm7,%xmm10
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,112(%rsp)
+	cmpb	$0,135(%rbp)
+	jne	.Lavx_00_47
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	movq	128+0(%rsp),%rdi
+	movq	%r14,%rax
+
+	addq	0(%rdi),%rax
+	leaq	128(%rsi),%rsi
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+	jb	.Lloop_avx
+
+	movq	152(%rsp),%rsi
+
+	vzeroupper
+	movaps	128+32(%rsp),%xmm6
+	movaps	128+48(%rsp),%xmm7
+	movaps	128+64(%rsp),%xmm8
+	movaps	128+80(%rsp),%xmm9
+	movaps	128+96(%rsp),%xmm10
+	movaps	128+112(%rsp),%xmm11
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+.Lepilogue_avx:
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
+	.byte	0xf3,0xc3
+
+.LSEH_end_sha512_block_data_order_avx:
+.def	sha512_block_data_order_avx2;	.scl 3;	.type 32;	.endef
+.p2align	6
+sha512_block_data_order_avx2:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_sha512_block_data_order_avx2:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+
+
+.Lavx2_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	subq	$1408,%rsp
+	shlq	$4,%rdx
+	andq	$-2048,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
+	addq	$1152,%rsp
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+
+	movaps	%xmm6,128+32(%rsp)
+	movaps	%xmm7,128+48(%rsp)
+	movaps	%xmm8,128+64(%rsp)
+	movaps	%xmm9,128+80(%rsp)
+	movaps	%xmm10,128+96(%rsp)
+	movaps	%xmm11,128+112(%rsp)
+.Lprologue_avx2:
+
+	vzeroupper
+	subq	$-128,%rsi
+	movq	0(%rdi),%rax
+	movq	%rsi,%r12
+	movq	8(%rdi),%rbx
+	cmpq	%rdx,%rsi
+	movq	16(%rdi),%rcx
+	cmoveq	%rsp,%r12
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	.Loop_avx2
+.p2align	4
+.Loop_avx2:
+	vmovdqu	-128(%rsi),%xmm0
+	vmovdqu	-128+16(%rsi),%xmm1
+	vmovdqu	-128+32(%rsi),%xmm2
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	-128+48(%rsi),%xmm3
+	vmovdqu	-128+64(%rsi),%xmm4
+	vmovdqu	-128+80(%rsi),%xmm5
+	vmovdqu	-128+96(%rsi),%xmm6
+	vmovdqu	-128+112(%rsi),%xmm7
+
+	vmovdqa	1152(%rbp),%ymm10
+	vinserti128	$1,(%r12),%ymm0,%ymm0
+	vinserti128	$1,16(%r12),%ymm1,%ymm1
+	vpshufb	%ymm10,%ymm0,%ymm0
+	vinserti128	$1,32(%r12),%ymm2,%ymm2
+	vpshufb	%ymm10,%ymm1,%ymm1
+	vinserti128	$1,48(%r12),%ymm3,%ymm3
+	vpshufb	%ymm10,%ymm2,%ymm2
+	vinserti128	$1,64(%r12),%ymm4,%ymm4
+	vpshufb	%ymm10,%ymm3,%ymm3
+	vinserti128	$1,80(%r12),%ymm5,%ymm5
+	vpshufb	%ymm10,%ymm4,%ymm4
+	vinserti128	$1,96(%r12),%ymm6,%ymm6
+	vpshufb	%ymm10,%ymm5,%ymm5
+	vinserti128	$1,112(%r12),%ymm7,%ymm7
+
+	vpaddq	-128(%rbp),%ymm0,%ymm8
+	vpshufb	%ymm10,%ymm6,%ymm6
+	vpaddq	-96(%rbp),%ymm1,%ymm9
+	vpshufb	%ymm10,%ymm7,%ymm7
+	vpaddq	-64(%rbp),%ymm2,%ymm10
+	vpaddq	-32(%rbp),%ymm3,%ymm11
+	vmovdqa	%ymm8,0(%rsp)
+	vpaddq	0(%rbp),%ymm4,%ymm8
+	vmovdqa	%ymm9,32(%rsp)
+	vpaddq	32(%rbp),%ymm5,%ymm9
+	vmovdqa	%ymm10,64(%rsp)
+	vpaddq	64(%rbp),%ymm6,%ymm10
+	vmovdqa	%ymm11,96(%rsp)
+	leaq	-128(%rsp),%rsp
+	vpaddq	96(%rbp),%ymm7,%ymm11
+	vmovdqa	%ymm8,0(%rsp)
+	xorq	%r14,%r14
+	vmovdqa	%ymm9,32(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%ymm10,64(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%ymm11,96(%rsp)
+	movq	%r9,%r12
+	addq	$32*8,%rbp
+	jmp	.Lavx2_00_47
+
+.p2align	4
+.Lavx2_00_47:
+	leaq	-128(%rsp),%rsp
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	addq	0+256(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	vpalignr	$8,%ymm4,%ymm5,%ymm11
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	vpaddq	%ymm11,%ymm0,%ymm0
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	vpsrlq	$6,%ymm7,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	vpsllq	$3,%ymm7,%ymm10
+	vpaddq	%ymm8,%ymm0,%ymm0
+	addq	8+256(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	vpsrlq	$19,%ymm7,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	vpaddq	%ymm11,%ymm0,%ymm0
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	vpaddq	-128(%rbp),%ymm0,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	vmovdqa	%ymm10,0(%rsp)
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	addq	32+256(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	vpalignr	$8,%ymm5,%ymm6,%ymm11
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	vpaddq	%ymm11,%ymm1,%ymm1
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	vpsrlq	$6,%ymm0,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	vpsllq	$3,%ymm0,%ymm10
+	vpaddq	%ymm8,%ymm1,%ymm1
+	addq	40+256(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	vpsrlq	$19,%ymm0,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	vpaddq	%ymm11,%ymm1,%ymm1
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	vpaddq	-96(%rbp),%ymm1,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	vmovdqa	%ymm10,32(%rsp)
+	vpalignr	$8,%ymm2,%ymm3,%ymm8
+	addq	64+256(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	vpalignr	$8,%ymm6,%ymm7,%ymm11
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	vpaddq	%ymm11,%ymm2,%ymm2
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	vpsrlq	$6,%ymm1,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	vpsllq	$3,%ymm1,%ymm10
+	vpaddq	%ymm8,%ymm2,%ymm2
+	addq	72+256(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	vpsrlq	$19,%ymm1,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	vpaddq	%ymm11,%ymm2,%ymm2
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	vpaddq	-64(%rbp),%ymm2,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	vmovdqa	%ymm10,64(%rsp)
+	vpalignr	$8,%ymm3,%ymm4,%ymm8
+	addq	96+256(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	vpalignr	$8,%ymm7,%ymm0,%ymm11
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	vpaddq	%ymm11,%ymm3,%ymm3
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	vpsrlq	$6,%ymm2,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	vpsllq	$3,%ymm2,%ymm10
+	vpaddq	%ymm8,%ymm3,%ymm3
+	addq	104+256(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	vpsrlq	$19,%ymm2,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	vpaddq	%ymm11,%ymm3,%ymm3
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	vpaddq	-32(%rbp),%ymm3,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	vmovdqa	%ymm10,96(%rsp)
+	leaq	-128(%rsp),%rsp
+	vpalignr	$8,%ymm4,%ymm5,%ymm8
+	addq	0+256(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	vpalignr	$8,%ymm0,%ymm1,%ymm11
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	vpaddq	%ymm11,%ymm4,%ymm4
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	vpsrlq	$6,%ymm3,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	vpsllq	$3,%ymm3,%ymm10
+	vpaddq	%ymm8,%ymm4,%ymm4
+	addq	8+256(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	vpsrlq	$19,%ymm3,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	vpaddq	%ymm11,%ymm4,%ymm4
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	vpaddq	0(%rbp),%ymm4,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	vmovdqa	%ymm10,0(%rsp)
+	vpalignr	$8,%ymm5,%ymm6,%ymm8
+	addq	32+256(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	vpalignr	$8,%ymm1,%ymm2,%ymm11
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	vpaddq	%ymm11,%ymm5,%ymm5
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	vpsrlq	$6,%ymm4,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	vpsllq	$3,%ymm4,%ymm10
+	vpaddq	%ymm8,%ymm5,%ymm5
+	addq	40+256(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	vpsrlq	$19,%ymm4,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	vpaddq	%ymm11,%ymm5,%ymm5
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	vpaddq	32(%rbp),%ymm5,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	vmovdqa	%ymm10,32(%rsp)
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	addq	64+256(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	vpalignr	$8,%ymm2,%ymm3,%ymm11
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	vpaddq	%ymm11,%ymm6,%ymm6
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	vpsrlq	$6,%ymm5,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	vpsllq	$3,%ymm5,%ymm10
+	vpaddq	%ymm8,%ymm6,%ymm6
+	addq	72+256(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	vpsrlq	$19,%ymm5,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	vpaddq	%ymm11,%ymm6,%ymm6
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	vpaddq	64(%rbp),%ymm6,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	vmovdqa	%ymm10,64(%rsp)
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	addq	96+256(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	vpalignr	$8,%ymm3,%ymm4,%ymm11
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	vpaddq	%ymm11,%ymm7,%ymm7
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	vpsrlq	$6,%ymm6,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	vpsllq	$3,%ymm6,%ymm10
+	vpaddq	%ymm8,%ymm7,%ymm7
+	addq	104+256(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	vpsrlq	$19,%ymm6,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	vpaddq	%ymm11,%ymm7,%ymm7
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	vpaddq	96(%rbp),%ymm7,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	vmovdqa	%ymm10,96(%rsp)
+	leaq	256(%rbp),%rbp
+	cmpb	$0,-121(%rbp)
+	jne	.Lavx2_00_47
+	addq	0+128(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8+128(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32+128(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40+128(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64+128(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72+128(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96+128(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104+128(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	addq	0(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	movq	1280(%rsp),%rdi
+	addq	%r14,%rax
+
+	leaq	1152(%rsp),%rbp
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+
+	cmpq	144(%rbp),%rsi
+	je	.Ldone_avx2
+
+	xorq	%r14,%r14
+	movq	%rbx,%rdi
+	xorq	%rcx,%rdi
+	movq	%r9,%r12
+	jmp	.Lower_avx2
+.p2align	4
+.Lower_avx2:
+	addq	0+16(%rbp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8+16(%rbp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32+16(%rbp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40+16(%rbp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64+16(%rbp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72+16(%rbp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96+16(%rbp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104+16(%rbp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	leaq	-128(%rbp),%rbp
+	cmpq	%rsp,%rbp
+	jae	.Lower_avx2
+
+	movq	1280(%rsp),%rdi
+	addq	%r14,%rax
+
+	leaq	1152(%rsp),%rsp
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	leaq	256(%rsi),%rsi
+	addq	48(%rdi),%r10
+	movq	%rsi,%r12
+	addq	56(%rdi),%r11
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	cmoveq	%rsp,%r12
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+
+	jbe	.Loop_avx2
+	leaq	(%rsp),%rbp
+
+.Ldone_avx2:
+	leaq	(%rbp),%rsp
+	movq	152(%rsp),%rsi
+
+	vzeroupper
+	movaps	128+32(%rsp),%xmm6
+	movaps	128+48(%rsp),%xmm7
+	movaps	128+64(%rsp),%xmm8
+	movaps	128+80(%rsp),%xmm9
+	movaps	128+96(%rsp),%xmm10
+	movaps	128+112(%rsp),%xmm11
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+.Lepilogue_avx2:
 	movq	8(%rsp),%rdi
 	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
-.LSEH_end_sha256_block_data_order_ssse3:
+
+.LSEH_end_sha512_block_data_order_avx2:
 
 .def	se_handler;	.scl 3;	.type 32;	.endef
 .p2align	4
@@ -2946,9 +5582,15 @@ se_handler:
 	leaq	(%rsi,%r10,1),%r10
 	cmpq	%r10,%rbx
 	jae	.Lin_prologue
+	leaq	.Lavx2_shortcut(%rip),%r10
+	cmpq	%r10,%rbx
+	jb	.Lnot_in_avx2
+
+	andq	$-2048,%rax
+	addq	$1152,%rax
+.Lnot_in_avx2:
 	movq	%rax,%rsi
-	movq	64+24(%rax),%rax
-	leaq	48(%rax),%rax
+	movq	128+24(%rax),%rax
 
 	movq	-8(%rax),%rbx
 	movq	-16(%rax),%rbp
@@ -2965,12 +5607,12 @@ se_handler:
 
 	leaq	.Lepilogue(%rip),%r10
 	cmpq	%r10,%rbx
-	jb	.Lin_prologue		
+	jb	.Lin_prologue
 
-	leaq	64+32(%rsi),%rsi
+	leaq	128+32(%rsi),%rsi
 	leaq	512(%r8),%rdi
-	movl	$8,%ecx
-.long	0xa548f3fc		
+	movl	$12,%ecx
+.long	0xa548f3fc
 
 .Lin_prologue:
 	movq	8(%rax),%rdi
@@ -2982,7 +5624,7 @@ se_handler:
 	movq	40(%r9),%rdi
 	movq	%r8,%rsi
 	movl	$154,%ecx
-.long	0xa548f3fc		
+.long	0xa548f3fc
 
 	movq	%r9,%rsi
 	xorq	%rcx,%rcx
@@ -3011,23 +5653,36 @@ se_handler:
 	popq	%rsi
 	.byte	0xf3,0xc3
 
-
 .section	.pdata
 .p2align	2
-.rva	.LSEH_begin_sha256_block_data_order
-.rva	.LSEH_end_sha256_block_data_order
-.rva	.LSEH_info_sha256_block_data_order
-.rva	.LSEH_begin_sha256_block_data_order_ssse3
-.rva	.LSEH_end_sha256_block_data_order_ssse3
-.rva	.LSEH_info_sha256_block_data_order_ssse3
+.rva	.LSEH_begin_sha512_block_data_order
+.rva	.LSEH_end_sha512_block_data_order
+.rva	.LSEH_info_sha512_block_data_order
+.rva	.LSEH_begin_sha512_block_data_order_xop
+.rva	.LSEH_end_sha512_block_data_order_xop
+.rva	.LSEH_info_sha512_block_data_order_xop
+.rva	.LSEH_begin_sha512_block_data_order_avx
+.rva	.LSEH_end_sha512_block_data_order_avx
+.rva	.LSEH_info_sha512_block_data_order_avx
+.rva	.LSEH_begin_sha512_block_data_order_avx2
+.rva	.LSEH_end_sha512_block_data_order_avx2
+.rva	.LSEH_info_sha512_block_data_order_avx2
 .section	.xdata
 .p2align	3
-.LSEH_info_sha256_block_data_order:
+.LSEH_info_sha512_block_data_order:
+.byte	9,0,0,0
+.rva	se_handler
+.rva	.Lprologue,.Lepilogue
+.LSEH_info_sha512_block_data_order_xop:
+.byte	9,0,0,0
+.rva	se_handler
+.rva	.Lprologue_xop,.Lepilogue_xop
+.LSEH_info_sha512_block_data_order_avx:
 .byte	9,0,0,0
 .rva	se_handler
-.rva	.Lprologue,.Lepilogue			
-.LSEH_info_sha256_block_data_order_ssse3:
+.rva	.Lprologue_avx,.Lepilogue_avx
+.LSEH_info_sha512_block_data_order_avx2:
 .byte	9,0,0,0
 .rva	se_handler
-.rva	.Lprologue_ssse3,.Lepilogue_ssse3	
+.rva	.Lprologue_avx2,.Lepilogue_avx2
 
diff --git a/lib/accelerated/x86/elf/aes-ssse3-x86.s b/lib/accelerated/x86/elf/aes-ssse3-x86.s
index 2b677952d1..265e28a7ef 100644
--- a/lib/accelerated/x86/elf/aes-ssse3-x86.s
+++ b/lib/accelerated/x86/elf/aes-ssse3-x86.s
@@ -5,12 +5,11 @@
 ## By Mike Hamburg (Stanford University), 2009
 ## Public domain.
 ##
-## For details see https://shiftleft.org/papers/vector_aes/ and
-## https://crypto.stanford.edu/vpaes/.
+## For details see http://shiftleft.org/papers/vector_aes/ and
+## http://crypto.stanford.edu/vpaes/.
 #
 # *** This file is auto-generated ***
 #
-.file	"vpaes-x86.s"
 .text
 .align	64
 .L_vpaes_consts:
diff --git a/lib/accelerated/x86/elf/aes-ssse3-x86_64.s b/lib/accelerated/x86/elf/aes-ssse3-x86_64.s
index d086050e37..ea1216baf7 100644
--- a/lib/accelerated/x86/elf/aes-ssse3-x86_64.s
+++ b/lib/accelerated/x86/elf/aes-ssse3-x86_64.s
@@ -5,8 +5,8 @@
 ## By Mike Hamburg (Stanford University), 2009
 ## Public domain.
 ##
-## For details see https://shiftleft.org/papers/vector_aes/ and
-## https://crypto.stanford.edu/vpaes/.
+## For details see http://shiftleft.org/papers/vector_aes/ and
+## http://crypto.stanford.edu/vpaes/.
 #
 # *** This file is auto-generated ***
 #
@@ -30,6 +30,7 @@
 .type	_vpaes_encrypt_core,@function
 .align	16
 _vpaes_encrypt_core:
+.cfi_startproc	
 	movq	%rdx,%r9
 	movq	$16,%r11
 	movl	240(%rdx),%eax
@@ -110,6 +111,7 @@ _vpaes_encrypt_core:
 	pxor	%xmm4,%xmm0
 .byte	102,15,56,0,193
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_vpaes_encrypt_core,.-_vpaes_encrypt_core
 
 
@@ -120,6 +122,7 @@ _vpaes_encrypt_core:
 .type	_vpaes_decrypt_core,@function
 .align	16
 _vpaes_decrypt_core:
+.cfi_startproc	
 	movq	%rdx,%r9
 	movl	240(%rdx),%eax
 	movdqa	%xmm9,%xmm1
@@ -216,6 +219,7 @@ _vpaes_decrypt_core:
 	pxor	%xmm4,%xmm0
 .byte	102,15,56,0,194
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_vpaes_decrypt_core,.-_vpaes_decrypt_core
 
 
@@ -226,6 +230,7 @@ _vpaes_decrypt_core:
 .type	_vpaes_schedule_core,@function
 .align	16
 _vpaes_schedule_core:
+.cfi_startproc	
 
 
 
@@ -392,6 +397,7 @@ _vpaes_schedule_core:
 	pxor	%xmm6,%xmm6
 	pxor	%xmm7,%xmm7
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_vpaes_schedule_core,.-_vpaes_schedule_core
 
 
@@ -411,6 +417,7 @@ _vpaes_schedule_core:
 .type	_vpaes_schedule_192_smear,@function
 .align	16
 _vpaes_schedule_192_smear:
+.cfi_startproc	
 	pshufd	$0x80,%xmm6,%xmm1
 	pshufd	$0xFE,%xmm7,%xmm0
 	pxor	%xmm1,%xmm6
@@ -419,6 +426,7 @@ _vpaes_schedule_192_smear:
 	movdqa	%xmm6,%xmm0
 	movhlps	%xmm1,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_vpaes_schedule_192_smear,.-_vpaes_schedule_192_smear
 
 
@@ -442,6 +450,7 @@ _vpaes_schedule_192_smear:
 .type	_vpaes_schedule_round,@function
 .align	16
 _vpaes_schedule_round:
+.cfi_startproc	
 
 	pxor	%xmm1,%xmm1
 .byte	102,65,15,58,15,200,15
@@ -495,6 +504,7 @@ _vpaes_schedule_low_round:
 	pxor	%xmm7,%xmm0
 	movdqa	%xmm0,%xmm7
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_vpaes_schedule_round,.-_vpaes_schedule_round
 
 
@@ -509,6 +519,7 @@ _vpaes_schedule_low_round:
 .type	_vpaes_schedule_transform,@function
 .align	16
 _vpaes_schedule_transform:
+.cfi_startproc	
 	movdqa	%xmm9,%xmm1
 	pandn	%xmm0,%xmm1
 	psrld	$4,%xmm1
@@ -519,6 +530,7 @@ _vpaes_schedule_transform:
 .byte	102,15,56,0,193
 	pxor	%xmm2,%xmm0
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_vpaes_schedule_transform,.-_vpaes_schedule_transform
 
 
@@ -547,6 +559,7 @@ _vpaes_schedule_transform:
 .type	_vpaes_schedule_mangle,@function
 .align	16
 _vpaes_schedule_mangle:
+.cfi_startproc	
 	movdqa	%xmm0,%xmm4
 	movdqa	.Lk_mc_forward(%rip),%xmm5
 	testq	%rcx,%rcx
@@ -611,6 +624,7 @@ _vpaes_schedule_mangle:
 	andq	$0x30,%r8
 	movdqu	%xmm3,(%rdx)
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_vpaes_schedule_mangle,.-_vpaes_schedule_mangle
 
 
@@ -620,6 +634,7 @@ _vpaes_schedule_mangle:
 .type	vpaes_set_encrypt_key,@function
 .align	16
 vpaes_set_encrypt_key:
+.cfi_startproc	
 	movl	%esi,%eax
 	shrl	$5,%eax
 	addl	$5,%eax
@@ -630,12 +645,14 @@ vpaes_set_encrypt_key:
 	call	_vpaes_schedule_core
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	vpaes_set_encrypt_key,.-vpaes_set_encrypt_key
 
 .globl	vpaes_set_decrypt_key
 .type	vpaes_set_decrypt_key,@function
 .align	16
 vpaes_set_decrypt_key:
+.cfi_startproc	
 	movl	%esi,%eax
 	shrl	$5,%eax
 	addl	$5,%eax
@@ -651,33 +668,39 @@ vpaes_set_decrypt_key:
 	call	_vpaes_schedule_core
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	vpaes_set_decrypt_key,.-vpaes_set_decrypt_key
 
 .globl	vpaes_encrypt
 .type	vpaes_encrypt,@function
 .align	16
 vpaes_encrypt:
+.cfi_startproc	
 	movdqu	(%rdi),%xmm0
 	call	_vpaes_preheat
 	call	_vpaes_encrypt_core
 	movdqu	%xmm0,(%rsi)
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	vpaes_encrypt,.-vpaes_encrypt
 
 .globl	vpaes_decrypt
 .type	vpaes_decrypt,@function
 .align	16
 vpaes_decrypt:
+.cfi_startproc	
 	movdqu	(%rdi),%xmm0
 	call	_vpaes_preheat
 	call	_vpaes_decrypt_core
 	movdqu	%xmm0,(%rsi)
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	vpaes_decrypt,.-vpaes_decrypt
 .globl	vpaes_cbc_encrypt
 .type	vpaes_cbc_encrypt,@function
 .align	16
 vpaes_cbc_encrypt:
+.cfi_startproc	
 	xchgq	%rcx,%rdx
 	subq	$16,%rcx
 	jc	.Lcbc_abort
@@ -713,6 +736,7 @@ vpaes_cbc_encrypt:
 	movdqu	%xmm6,(%r8)
 .Lcbc_abort:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	vpaes_cbc_encrypt,.-vpaes_cbc_encrypt
 
 
@@ -723,6 +747,7 @@ vpaes_cbc_encrypt:
 .type	_vpaes_preheat,@function
 .align	16
 _vpaes_preheat:
+.cfi_startproc	
 	leaq	.Lk_s0F(%rip),%r10
 	movdqa	-32(%r10),%xmm10
 	movdqa	-16(%r10),%xmm11
@@ -732,6 +757,7 @@ _vpaes_preheat:
 	movdqa	80(%r10),%xmm15
 	movdqa	96(%r10),%xmm14
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_vpaes_preheat,.-_vpaes_preheat
 
 
diff --git a/lib/accelerated/x86/elf/aesni-gcm-x86_64.s b/lib/accelerated/x86/elf/aesni-gcm-x86_64.s
index 07f177d8d4..e26d18d69f 100644
--- a/lib/accelerated/x86/elf/aesni-gcm-x86_64.s
+++ b/lib/accelerated/x86/elf/aesni-gcm-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -354,17 +354,25 @@ _aesni_ctr32_ghash_6x:
 .type	aesni_gcm_decrypt,@function
 .align	32
 aesni_gcm_decrypt:
+.cfi_startproc	
 	xorq	%r10,%r10
 	cmpq	$0x60,%rdx
 	jb	.Lgcm_dec_abort
 
 	leaq	(%rsp),%rax
+.cfi_def_cfa_register	%rax
 	pushq	%rbx
+.cfi_offset	%rbx,-16
 	pushq	%rbp
+.cfi_offset	%rbp,-24
 	pushq	%r12
+.cfi_offset	%r12,-32
 	pushq	%r13
+.cfi_offset	%r13,-40
 	pushq	%r14
+.cfi_offset	%r14,-48
 	pushq	%r15
+.cfi_offset	%r15,-56
 	vzeroupper
 
 	vmovdqu	(%r8),%xmm1
@@ -426,15 +434,23 @@ aesni_gcm_decrypt:
 
 	vzeroupper
 	movq	-48(%rax),%r15
+.cfi_restore	%r15
 	movq	-40(%rax),%r14
+.cfi_restore	%r14
 	movq	-32(%rax),%r13
+.cfi_restore	%r13
 	movq	-24(%rax),%r12
+.cfi_restore	%r12
 	movq	-16(%rax),%rbp
+.cfi_restore	%rbp
 	movq	-8(%rax),%rbx
+.cfi_restore	%rbx
 	leaq	(%rax),%rsp
+.cfi_def_cfa_register	%rsp
 .Lgcm_dec_abort:
 	movq	%r10,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_gcm_decrypt,.-aesni_gcm_decrypt
 .type	_aesni_ctr32_6x,@function
 .align	32
@@ -531,17 +547,25 @@ _aesni_ctr32_6x:
 .type	aesni_gcm_encrypt,@function
 .align	32
 aesni_gcm_encrypt:
+.cfi_startproc	
 	xorq	%r10,%r10
 	cmpq	$288,%rdx
 	jb	.Lgcm_enc_abort
 
 	leaq	(%rsp),%rax
+.cfi_def_cfa_register	%rax
 	pushq	%rbx
+.cfi_offset	%rbx,-16
 	pushq	%rbp
+.cfi_offset	%rbp,-24
 	pushq	%r12
+.cfi_offset	%r12,-32
 	pushq	%r13
+.cfi_offset	%r13,-40
 	pushq	%r14
+.cfi_offset	%r14,-48
 	pushq	%r15
+.cfi_offset	%r15,-56
 	vzeroupper
 
 	vmovdqu	(%r8),%xmm1
@@ -767,15 +791,23 @@ aesni_gcm_encrypt:
 
 	vzeroupper
 	movq	-48(%rax),%r15
+.cfi_restore	%r15
 	movq	-40(%rax),%r14
+.cfi_restore	%r14
 	movq	-32(%rax),%r13
+.cfi_restore	%r13
 	movq	-24(%rax),%r12
+.cfi_restore	%r12
 	movq	-16(%rax),%rbp
+.cfi_restore	%rbp
 	movq	-8(%rax),%rbx
+.cfi_restore	%rbx
 	leaq	(%rax),%rsp
+.cfi_def_cfa_register	%rsp
 .Lgcm_enc_abort:
 	movq	%r10,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_gcm_encrypt,.-aesni_gcm_encrypt
 .align	64
 .Lbswap_mask:
diff --git a/lib/accelerated/x86/elf/aesni-x86.s b/lib/accelerated/x86/elf/aesni-x86.s
index 5d70f2568f..aaf0bab635 100644
--- a/lib/accelerated/x86/elf/aesni-x86.s
+++ b/lib/accelerated/x86/elf/aesni-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"devel/perlasm/aesni-x86.s"
 .text
 .globl	aesni_encrypt
 .type	aesni_encrypt,@function
@@ -60,7 +59,10 @@ aesni_encrypt:
 	leal	16(%edx),%edx
 	jnz	.L000enc1_loop_1
 .byte	102,15,56,221,209
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movups	%xmm2,(%eax)
+	pxor	%xmm2,%xmm2
 	ret
 .size	aesni_encrypt,.-.L_aesni_encrypt_begin
 .globl	aesni_decrypt
@@ -84,32 +86,90 @@ aesni_decrypt:
 	leal	16(%edx),%edx
 	jnz	.L001dec1_loop_2
 .byte	102,15,56,223,209
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movups	%xmm2,(%eax)
+	pxor	%xmm2,%xmm2
 	ret
 .size	aesni_decrypt,.-.L_aesni_decrypt_begin
+.type	_aesni_encrypt2,@function
+.align	16
+_aesni_encrypt2:
+	movups	(%edx),%xmm0
+	shll	$4,%ecx
+	movups	16(%edx),%xmm1
+	xorps	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+.L002enc2_loop:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L002enc2_loop
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,221,208
+.byte	102,15,56,221,216
+	ret
+.size	_aesni_encrypt2,.-_aesni_encrypt2
+.type	_aesni_decrypt2,@function
+.align	16
+_aesni_decrypt2:
+	movups	(%edx),%xmm0
+	shll	$4,%ecx
+	movups	16(%edx),%xmm1
+	xorps	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+.L003dec2_loop:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L003dec2_loop
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,223,208
+.byte	102,15,56,223,216
+	ret
+.size	_aesni_decrypt2,.-_aesni_decrypt2
 .type	_aesni_encrypt3,@function
 .align	16
 _aesni_encrypt3:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
-	movups	(%edx),%xmm0
-.L002enc3_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+.L004enc3_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
-	movups	(%edx),%xmm0
-	jnz	.L002enc3_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L004enc3_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -122,25 +182,26 @@ _aesni_encrypt3:
 .align	16
 _aesni_decrypt3:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
-	movups	(%edx),%xmm0
-.L003dec3_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+.L005dec3_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
-	movups	(%edx),%xmm0
-	jnz	.L003dec3_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L005dec3_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -154,27 +215,29 @@ _aesni_decrypt3:
 _aesni_encrypt4:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
-	shrl	$1,%ecx
-	leal	32(%edx),%edx
+	shll	$4,%ecx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
 	pxor	%xmm0,%xmm5
-	movups	(%edx),%xmm0
-.L004enc4_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	15,31,64,0
+	addl	$16,%ecx
+.L006enc4_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
-	movups	(%edx),%xmm0
-	jnz	.L004enc4_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L006enc4_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -190,27 +253,29 @@ _aesni_encrypt4:
 _aesni_decrypt4:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
-	shrl	$1,%ecx
-	leal	32(%edx),%edx
+	shll	$4,%ecx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
 	pxor	%xmm0,%xmm5
-	movups	(%edx),%xmm0
-.L005dec4_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	15,31,64,0
+	addl	$16,%ecx
+.L007dec4_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
 .byte	102,15,56,222,232
-	movups	(%edx),%xmm0
-	jnz	.L005dec4_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L007dec4_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -225,45 +290,42 @@ _aesni_decrypt4:
 .align	16
 _aesni_encrypt6:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,220,217
+.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm5
-	decl	%ecx
-.byte	102,15,56,220,225
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,220,233
+.byte	102,15,56,220,217
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	102,15,56,220,225
 	pxor	%xmm0,%xmm7
-.byte	102,15,56,220,241
-	movups	(%edx),%xmm0
-.byte	102,15,56,220,249
-	jmp	.L_aesni_encrypt6_enter
+	movups	(%edx,%ecx,1),%xmm0
+	addl	$16,%ecx
+	jmp	.L008_aesni_encrypt6_inner
 .align	16
-.L006enc6_loop:
+.L009enc6_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
+.L008_aesni_encrypt6_inner:
 .byte	102,15,56,220,233
 .byte	102,15,56,220,241
 .byte	102,15,56,220,249
-.align	16
 .L_aesni_encrypt6_enter:
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
 .byte	102,15,56,220,240
 .byte	102,15,56,220,248
-	movups	(%edx),%xmm0
-	jnz	.L006enc6_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L009enc6_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -282,45 +344,42 @@ _aesni_encrypt6:
 .align	16
 _aesni_decrypt6:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,222,209
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,222,217
+.byte	102,15,56,222,209
 	pxor	%xmm0,%xmm5
-	decl	%ecx
-.byte	102,15,56,222,225
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,222,233
+.byte	102,15,56,222,217
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	102,15,56,222,225
 	pxor	%xmm0,%xmm7
-.byte	102,15,56,222,241
-	movups	(%edx),%xmm0
-.byte	102,15,56,222,249
-	jmp	.L_aesni_decrypt6_enter
+	movups	(%edx,%ecx,1),%xmm0
+	addl	$16,%ecx
+	jmp	.L010_aesni_decrypt6_inner
 .align	16
-.L007dec6_loop:
+.L011dec6_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
+.L010_aesni_decrypt6_inner:
 .byte	102,15,56,222,233
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
-.align	16
 .L_aesni_decrypt6_enter:
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
 .byte	102,15,56,222,232
 .byte	102,15,56,222,240
 .byte	102,15,56,222,248
-	movups	(%edx),%xmm0
-	jnz	.L007dec6_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L011dec6_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -350,14 +409,14 @@ aesni_ecb_encrypt:
 	movl	32(%esp),%edx
 	movl	36(%esp),%ebx
 	andl	$-16,%eax
-	jz	.L008ecb_ret
+	jz	.L012ecb_ret
 	movl	240(%edx),%ecx
 	testl	%ebx,%ebx
-	jz	.L009ecb_decrypt
+	jz	.L013ecb_decrypt
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	cmpl	$96,%eax
-	jb	.L010ecb_enc_tail
+	jb	.L014ecb_enc_tail
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -366,9 +425,9 @@ aesni_ecb_encrypt:
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
 	subl	$96,%eax
-	jmp	.L011ecb_enc_loop6_enter
+	jmp	.L015ecb_enc_loop6_enter
 .align	16
-.L012ecb_enc_loop6:
+.L016ecb_enc_loop6:
 	movups	%xmm2,(%edi)
 	movdqu	(%esi),%xmm2
 	movups	%xmm3,16(%edi)
@@ -383,12 +442,12 @@ aesni_ecb_encrypt:
 	leal	96(%edi),%edi
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
-.L011ecb_enc_loop6_enter:
+.L015ecb_enc_loop6_enter:
 	call	_aesni_encrypt6
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
 	subl	$96,%eax
-	jnc	.L012ecb_enc_loop6
+	jnc	.L016ecb_enc_loop6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
@@ -397,18 +456,18 @@ aesni_ecb_encrypt:
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
 	addl	$96,%eax
-	jz	.L008ecb_ret
-.L010ecb_enc_tail:
+	jz	.L012ecb_ret
+.L014ecb_enc_tail:
 	movups	(%esi),%xmm2
 	cmpl	$32,%eax
-	jb	.L013ecb_enc_one
+	jb	.L017ecb_enc_one
 	movups	16(%esi),%xmm3
-	je	.L014ecb_enc_two
+	je	.L018ecb_enc_two
 	movups	32(%esi),%xmm4
 	cmpl	$64,%eax
-	jb	.L015ecb_enc_three
+	jb	.L019ecb_enc_three
 	movups	48(%esi),%xmm5
-	je	.L016ecb_enc_four
+	je	.L020ecb_enc_four
 	movups	64(%esi),%xmm6
 	xorps	%xmm7,%xmm7
 	call	_aesni_encrypt6
@@ -417,50 +476,49 @@ aesni_ecb_encrypt:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L013ecb_enc_one:
+.L017ecb_enc_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L017enc1_loop_3:
+.L021enc1_loop_3:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L017enc1_loop_3
+	jnz	.L021enc1_loop_3
 .byte	102,15,56,221,209
 	movups	%xmm2,(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L014ecb_enc_two:
-	xorps	%xmm4,%xmm4
-	call	_aesni_encrypt3
+.L018ecb_enc_two:
+	call	_aesni_encrypt2
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L015ecb_enc_three:
+.L019ecb_enc_three:
 	call	_aesni_encrypt3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L016ecb_enc_four:
+.L020ecb_enc_four:
 	call	_aesni_encrypt4
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L009ecb_decrypt:
+.L013ecb_decrypt:
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	cmpl	$96,%eax
-	jb	.L018ecb_dec_tail
+	jb	.L022ecb_dec_tail
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -469,9 +527,9 @@ aesni_ecb_encrypt:
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
 	subl	$96,%eax
-	jmp	.L019ecb_dec_loop6_enter
+	jmp	.L023ecb_dec_loop6_enter
 .align	16
-.L020ecb_dec_loop6:
+.L024ecb_dec_loop6:
 	movups	%xmm2,(%edi)
 	movdqu	(%esi),%xmm2
 	movups	%xmm3,16(%edi)
@@ -486,12 +544,12 @@ aesni_ecb_encrypt:
 	leal	96(%edi),%edi
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
-.L019ecb_dec_loop6_enter:
+.L023ecb_dec_loop6_enter:
 	call	_aesni_decrypt6
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
 	subl	$96,%eax
-	jnc	.L020ecb_dec_loop6
+	jnc	.L024ecb_dec_loop6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
@@ -500,18 +558,18 @@ aesni_ecb_encrypt:
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
 	addl	$96,%eax
-	jz	.L008ecb_ret
-.L018ecb_dec_tail:
+	jz	.L012ecb_ret
+.L022ecb_dec_tail:
 	movups	(%esi),%xmm2
 	cmpl	$32,%eax
-	jb	.L021ecb_dec_one
+	jb	.L025ecb_dec_one
 	movups	16(%esi),%xmm3
-	je	.L022ecb_dec_two
+	je	.L026ecb_dec_two
 	movups	32(%esi),%xmm4
 	cmpl	$64,%eax
-	jb	.L023ecb_dec_three
+	jb	.L027ecb_dec_three
 	movups	48(%esi),%xmm5
-	je	.L024ecb_dec_four
+	je	.L028ecb_dec_four
 	movups	64(%esi),%xmm6
 	xorps	%xmm7,%xmm7
 	call	_aesni_decrypt6
@@ -520,44 +578,51 @@ aesni_ecb_encrypt:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L021ecb_dec_one:
+.L025ecb_dec_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L025dec1_loop_4:
+.L029dec1_loop_4:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L025dec1_loop_4
+	jnz	.L029dec1_loop_4
 .byte	102,15,56,223,209
 	movups	%xmm2,(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L022ecb_dec_two:
-	xorps	%xmm4,%xmm4
-	call	_aesni_decrypt3
+.L026ecb_dec_two:
+	call	_aesni_decrypt2
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L023ecb_dec_three:
+.L027ecb_dec_three:
 	call	_aesni_decrypt3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	.L008ecb_ret
+	jmp	.L012ecb_ret
 .align	16
-.L024ecb_dec_four:
+.L028ecb_dec_four:
 	call	_aesni_decrypt4
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-.L008ecb_ret:
+.L012ecb_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -596,48 +661,56 @@ aesni_ccm64_encrypt_blocks:
 	movl	%ebp,20(%esp)
 	movl	%ebp,24(%esp)
 	movl	%ebp,28(%esp)
-	shrl	$1,%ecx
+	shll	$4,%ecx
+	movl	$16,%ebx
 	leal	(%edx),%ebp
 	movdqa	(%esp),%xmm5
 	movdqa	%xmm7,%xmm2
-	movl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	subl	%ecx,%ebx
 .byte	102,15,56,0,253
-.L026ccm64_enc_outer:
+.L030ccm64_enc_outer:
 	movups	(%ebp),%xmm0
 	movl	%ebx,%ecx
 	movups	(%esi),%xmm6
 	xorps	%xmm0,%xmm2
 	movups	16(%ebp),%xmm1
 	xorps	%xmm6,%xmm0
-	leal	32(%ebp),%edx
 	xorps	%xmm0,%xmm3
-	movups	(%edx),%xmm0
-.L027ccm64_enc2_loop:
+	movups	32(%ebp),%xmm0
+.L031ccm64_enc2_loop:
 .byte	102,15,56,220,209
-	decl	%ecx
 .byte	102,15,56,220,217
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
-	leal	32(%edx),%edx
 .byte	102,15,56,220,216
-	movups	(%edx),%xmm0
-	jnz	.L027ccm64_enc2_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L031ccm64_enc2_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 	paddq	16(%esp),%xmm7
+	decl	%eax
 .byte	102,15,56,221,208
 .byte	102,15,56,221,216
-	decl	%eax
 	leal	16(%esi),%esi
 	xorps	%xmm2,%xmm6
 	movdqa	%xmm7,%xmm2
 	movups	%xmm6,(%edi)
-	leal	16(%edi),%edi
 .byte	102,15,56,0,213
-	jnz	.L026ccm64_enc_outer
+	leal	16(%edi),%edi
+	jnz	.L030ccm64_enc_outer
 	movl	48(%esp),%esp
 	movl	40(%esp),%edi
 	movups	%xmm3,(%edi)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -685,71 +758,82 @@ aesni_ccm64_decrypt_blocks:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L028enc1_loop_5:
+.L032enc1_loop_5:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L028enc1_loop_5
+	jnz	.L032enc1_loop_5
 .byte	102,15,56,221,209
+	shll	$4,%ebx
+	movl	$16,%ecx
 	movups	(%esi),%xmm6
 	paddq	16(%esp),%xmm7
 	leal	16(%esi),%esi
-	jmp	.L029ccm64_dec_outer
+	subl	%ebx,%ecx
+	leal	32(%ebp,%ebx,1),%edx
+	movl	%ecx,%ebx
+	jmp	.L033ccm64_dec_outer
 .align	16
-.L029ccm64_dec_outer:
+.L033ccm64_dec_outer:
 	xorps	%xmm2,%xmm6
 	movdqa	%xmm7,%xmm2
-	movl	%ebx,%ecx
 	movups	%xmm6,(%edi)
 	leal	16(%edi),%edi
 .byte	102,15,56,0,213
 	subl	$1,%eax
-	jz	.L030ccm64_dec_break
+	jz	.L034ccm64_dec_break
 	movups	(%ebp),%xmm0
-	shrl	$1,%ecx
+	movl	%ebx,%ecx
 	movups	16(%ebp),%xmm1
 	xorps	%xmm0,%xmm6
-	leal	32(%ebp),%edx
 	xorps	%xmm0,%xmm2
 	xorps	%xmm6,%xmm3
-	movups	(%edx),%xmm0
-.L031ccm64_dec2_loop:
+	movups	32(%ebp),%xmm0
+.L035ccm64_dec2_loop:
 .byte	102,15,56,220,209
-	decl	%ecx
 .byte	102,15,56,220,217
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
-	leal	32(%edx),%edx
 .byte	102,15,56,220,216
-	movups	(%edx),%xmm0
-	jnz	.L031ccm64_dec2_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	.L035ccm64_dec2_loop
 	movups	(%esi),%xmm6
 	paddq	16(%esp),%xmm7
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	leal	16(%esi),%esi
 .byte	102,15,56,221,208
 .byte	102,15,56,221,216
-	jmp	.L029ccm64_dec_outer
+	leal	16(%esi),%esi
+	jmp	.L033ccm64_dec_outer
 .align	16
-.L030ccm64_dec_break:
+.L034ccm64_dec_break:
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	xorps	%xmm0,%xmm6
 	leal	32(%edx),%edx
 	xorps	%xmm6,%xmm3
-.L032enc1_loop_6:
+.L036enc1_loop_6:
 .byte	102,15,56,220,217
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L032enc1_loop_6
+	jnz	.L036enc1_loop_6
 .byte	102,15,56,221,217
 	movl	48(%esp),%esp
 	movl	40(%esp),%edi
 	movups	%xmm3,(%edi)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -775,7 +859,7 @@ aesni_ctr32_encrypt_blocks:
 	andl	$-16,%esp
 	movl	%ebp,80(%esp)
 	cmpl	$1,%eax
-	je	.L033ctr32_one_shortcut
+	je	.L037ctr32_one_shortcut
 	movdqu	(%ebx),%xmm7
 	movl	$202182159,(%esp)
 	movl	$134810123,4(%esp)
@@ -791,63 +875,59 @@ aesni_ctr32_encrypt_blocks:
 .byte	102,15,58,34,253,3
 	movl	240(%edx),%ecx
 	bswap	%ebx
-	pxor	%xmm1,%xmm1
 	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movdqa	(%esp),%xmm2
-.byte	102,15,58,34,203,0
+.byte	102,15,58,34,195,0
 	leal	3(%ebx),%ebp
-.byte	102,15,58,34,197,0
+.byte	102,15,58,34,205,0
 	incl	%ebx
-.byte	102,15,58,34,203,1
+.byte	102,15,58,34,195,1
 	incl	%ebp
-.byte	102,15,58,34,197,1
+.byte	102,15,58,34,205,1
 	incl	%ebx
-.byte	102,15,58,34,203,2
+.byte	102,15,58,34,195,2
 	incl	%ebp
-.byte	102,15,58,34,197,2
-	movdqa	%xmm1,48(%esp)
-.byte	102,15,56,0,202
-	movdqa	%xmm0,64(%esp)
+.byte	102,15,58,34,205,2
+	movdqa	%xmm0,48(%esp)
 .byte	102,15,56,0,194
-	pshufd	$192,%xmm1,%xmm2
-	pshufd	$128,%xmm1,%xmm3
+	movdqu	(%edx),%xmm6
+	movdqa	%xmm1,64(%esp)
+.byte	102,15,56,0,202
+	pshufd	$192,%xmm0,%xmm2
+	pshufd	$128,%xmm0,%xmm3
 	cmpl	$6,%eax
-	jb	.L034ctr32_tail
+	jb	.L038ctr32_tail
+	pxor	%xmm6,%xmm7
+	shll	$4,%ecx
+	movl	$16,%ebx
 	movdqa	%xmm7,32(%esp)
-	shrl	$1,%ecx
 	movl	%edx,%ebp
-	movl	%ecx,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
 	subl	$6,%eax
-	jmp	.L035ctr32_loop6
-.align	16
-.L035ctr32_loop6:
-	pshufd	$64,%xmm1,%xmm4
-	movdqa	32(%esp),%xmm1
-	pshufd	$192,%xmm0,%xmm5
-	por	%xmm1,%xmm2
-	pshufd	$128,%xmm0,%xmm6
-	por	%xmm1,%xmm3
-	pshufd	$64,%xmm0,%xmm7
-	por	%xmm1,%xmm4
-	por	%xmm1,%xmm5
-	por	%xmm1,%xmm6
-	por	%xmm1,%xmm7
-	movups	(%ebp),%xmm0
-	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
-	decl	%ecx
+	jmp	.L039ctr32_loop6
+.align	16
+.L039ctr32_loop6:
+	pshufd	$64,%xmm0,%xmm4
+	movdqa	32(%esp),%xmm0
+	pshufd	$192,%xmm1,%xmm5
 	pxor	%xmm0,%xmm2
+	pshufd	$128,%xmm1,%xmm6
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,220,209
+	pshufd	$64,%xmm1,%xmm7
+	movups	16(%ebp),%xmm1
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,220,217
 	pxor	%xmm0,%xmm5
-.byte	102,15,56,220,225
+.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,220,233
 	pxor	%xmm0,%xmm7
+.byte	102,15,56,220,217
+	movups	32(%ebp),%xmm0
+	movl	%ebx,%ecx
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
 .byte	102,15,56,220,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,220,249
 	call	.L_aesni_encrypt6_enter
 	movups	(%esi),%xmm1
@@ -858,51 +938,51 @@ aesni_ctr32_encrypt_blocks:
 	movups	%xmm2,(%edi)
 	movdqa	16(%esp),%xmm0
 	xorps	%xmm1,%xmm4
-	movdqa	48(%esp),%xmm1
+	movdqa	64(%esp),%xmm1
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	paddd	%xmm0,%xmm1
-	paddd	64(%esp),%xmm0
+	paddd	48(%esp),%xmm0
 	movdqa	(%esp),%xmm2
 	movups	48(%esi),%xmm3
 	movups	64(%esi),%xmm4
 	xorps	%xmm3,%xmm5
 	movups	80(%esi),%xmm3
 	leal	96(%esi),%esi
-	movdqa	%xmm1,48(%esp)
-.byte	102,15,56,0,202
+	movdqa	%xmm0,48(%esp)
+.byte	102,15,56,0,194
 	xorps	%xmm4,%xmm6
 	movups	%xmm5,48(%edi)
 	xorps	%xmm3,%xmm7
-	movdqa	%xmm0,64(%esp)
-.byte	102,15,56,0,194
+	movdqa	%xmm1,64(%esp)
+.byte	102,15,56,0,202
 	movups	%xmm6,64(%edi)
-	pshufd	$192,%xmm1,%xmm2
+	pshufd	$192,%xmm0,%xmm2
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
-	movl	%ebx,%ecx
-	pshufd	$128,%xmm1,%xmm3
+	pshufd	$128,%xmm0,%xmm3
 	subl	$6,%eax
-	jnc	.L035ctr32_loop6
+	jnc	.L039ctr32_loop6
 	addl	$6,%eax
-	jz	.L036ctr32_ret
+	jz	.L040ctr32_ret
+	movdqu	(%ebp),%xmm7
 	movl	%ebp,%edx
-	leal	1(,%ecx,2),%ecx
-	movdqa	32(%esp),%xmm7
-.L034ctr32_tail:
+	pxor	32(%esp),%xmm7
+	movl	240(%ebp),%ecx
+.L038ctr32_tail:
 	por	%xmm7,%xmm2
 	cmpl	$2,%eax
-	jb	.L037ctr32_one
-	pshufd	$64,%xmm1,%xmm4
+	jb	.L041ctr32_one
+	pshufd	$64,%xmm0,%xmm4
 	por	%xmm7,%xmm3
-	je	.L038ctr32_two
-	pshufd	$192,%xmm0,%xmm5
+	je	.L042ctr32_two
+	pshufd	$192,%xmm1,%xmm5
 	por	%xmm7,%xmm4
 	cmpl	$4,%eax
-	jb	.L039ctr32_three
-	pshufd	$128,%xmm0,%xmm6
+	jb	.L043ctr32_three
+	pshufd	$128,%xmm1,%xmm6
 	por	%xmm7,%xmm5
-	je	.L040ctr32_four
+	je	.L044ctr32_four
 	por	%xmm7,%xmm6
 	call	_aesni_encrypt6
 	movups	(%esi),%xmm1
@@ -920,39 +1000,39 @@ aesni_ctr32_encrypt_blocks:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	.L036ctr32_ret
+	jmp	.L040ctr32_ret
 .align	16
-.L033ctr32_one_shortcut:
+.L037ctr32_one_shortcut:
 	movups	(%ebx),%xmm2
 	movl	240(%edx),%ecx
-.L037ctr32_one:
+.L041ctr32_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L041enc1_loop_7:
+.L045enc1_loop_7:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L041enc1_loop_7
+	jnz	.L045enc1_loop_7
 .byte	102,15,56,221,209
 	movups	(%esi),%xmm6
 	xorps	%xmm2,%xmm6
 	movups	%xmm6,(%edi)
-	jmp	.L036ctr32_ret
+	jmp	.L040ctr32_ret
 .align	16
-.L038ctr32_two:
-	call	_aesni_encrypt3
+.L042ctr32_two:
+	call	_aesni_encrypt2
 	movups	(%esi),%xmm5
 	movups	16(%esi),%xmm6
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	.L036ctr32_ret
+	jmp	.L040ctr32_ret
 .align	16
-.L039ctr32_three:
+.L043ctr32_three:
 	call	_aesni_encrypt3
 	movups	(%esi),%xmm5
 	movups	16(%esi),%xmm6
@@ -963,9 +1043,9 @@ aesni_ctr32_encrypt_blocks:
 	xorps	%xmm7,%xmm4
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	.L036ctr32_ret
+	jmp	.L040ctr32_ret
 .align	16
-.L040ctr32_four:
+.L044ctr32_four:
 	call	_aesni_encrypt4
 	movups	(%esi),%xmm6
 	movups	16(%esi),%xmm7
@@ -979,7 +1059,18 @@ aesni_ctr32_encrypt_blocks:
 	xorps	%xmm0,%xmm5
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-.L036ctr32_ret:
+.L040ctr32_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
 	movl	80(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -1004,12 +1095,12 @@ aesni_xts_encrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L042enc1_loop_8:
+.L046enc1_loop_8:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L042enc1_loop_8
+	jnz	.L046enc1_loop_8
 .byte	102,15,56,221,209
 	movl	20(%esp),%esi
 	movl	24(%esp),%edi
@@ -1033,12 +1124,14 @@ aesni_xts_encrypt:
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	subl	$96,%eax
-	jc	.L043xts_enc_short
-	shrl	$1,%ecx
-	movl	%ecx,%ebx
-	jmp	.L044xts_enc_loop6
+	jc	.L047xts_enc_short
+	shll	$4,%ecx
+	movl	$16,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	jmp	.L048xts_enc_loop6
 .align	16
-.L044xts_enc_loop6:
+.L048xts_enc_loop6:
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,(%esp)
@@ -1074,6 +1167,7 @@ aesni_xts_encrypt:
 	pand	%xmm3,%xmm7
 	movups	(%esi),%xmm2
 	pxor	%xmm1,%xmm7
+	movl	%ebx,%ecx
 	movdqu	16(%esi),%xmm3
 	xorps	%xmm0,%xmm2
 	movdqu	32(%esi),%xmm4
@@ -1089,19 +1183,17 @@ aesni_xts_encrypt:
 	movdqa	%xmm7,80(%esp)
 	pxor	%xmm1,%xmm7
 	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
 	pxor	16(%esp),%xmm3
-.byte	102,15,56,220,209
 	pxor	32(%esp),%xmm4
-.byte	102,15,56,220,217
+.byte	102,15,56,220,209
 	pxor	48(%esp),%xmm5
-	decl	%ecx
-.byte	102,15,56,220,225
 	pxor	64(%esp),%xmm6
-.byte	102,15,56,220,233
+.byte	102,15,56,220,217
 	pxor	%xmm0,%xmm7
+	movups	32(%ebp),%xmm0
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
 .byte	102,15,56,220,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,220,249
 	call	.L_aesni_encrypt6_enter
 	movdqa	80(%esp),%xmm1
@@ -1126,26 +1218,25 @@ aesni_xts_encrypt:
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
-	movl	%ebx,%ecx
 	pxor	%xmm2,%xmm1
 	subl	$96,%eax
-	jnc	.L044xts_enc_loop6
-	leal	1(,%ecx,2),%ecx
+	jnc	.L048xts_enc_loop6
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movl	%ecx,%ebx
-.L043xts_enc_short:
+.L047xts_enc_short:
 	addl	$96,%eax
-	jz	.L045xts_enc_done6x
+	jz	.L049xts_enc_done6x
 	movdqa	%xmm1,%xmm5
 	cmpl	$32,%eax
-	jb	.L046xts_enc_one
+	jb	.L050xts_enc_one
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-	je	.L047xts_enc_two
+	je	.L051xts_enc_two
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm6
@@ -1154,7 +1245,7 @@ aesni_xts_encrypt:
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
 	cmpl	$64,%eax
-	jb	.L048xts_enc_three
+	jb	.L052xts_enc_three
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm7
@@ -1164,7 +1255,7 @@ aesni_xts_encrypt:
 	pxor	%xmm2,%xmm1
 	movdqa	%xmm5,(%esp)
 	movdqa	%xmm6,16(%esp)
-	je	.L049xts_enc_four
+	je	.L053xts_enc_four
 	movdqa	%xmm7,32(%esp)
 	pshufd	$19,%xmm0,%xmm7
 	movdqa	%xmm1,48(%esp)
@@ -1196,9 +1287,9 @@ aesni_xts_encrypt:
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L046xts_enc_one:
+.L050xts_enc_one:
 	movups	(%esi),%xmm2
 	leal	16(%esi),%esi
 	xorps	%xmm5,%xmm2
@@ -1206,37 +1297,36 @@ aesni_xts_encrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L051enc1_loop_9:
+.L055enc1_loop_9:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L051enc1_loop_9
+	jnz	.L055enc1_loop_9
 .byte	102,15,56,221,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	movdqa	%xmm5,%xmm1
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L047xts_enc_two:
+.L051xts_enc_two:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
 	leal	32(%esi),%esi
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
-	xorps	%xmm4,%xmm4
-	call	_aesni_encrypt3
+	call	_aesni_encrypt2
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	leal	32(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L048xts_enc_three:
+.L052xts_enc_three:
 	movaps	%xmm1,%xmm7
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1254,9 +1344,9 @@ aesni_xts_encrypt:
 	movups	%xmm4,32(%edi)
 	leal	48(%edi),%edi
 	movdqa	%xmm7,%xmm1
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L049xts_enc_four:
+.L053xts_enc_four:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1278,28 +1368,28 @@ aesni_xts_encrypt:
 	movups	%xmm5,48(%edi)
 	leal	64(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	.L050xts_enc_done
+	jmp	.L054xts_enc_done
 .align	16
-.L045xts_enc_done6x:
+.L049xts_enc_done6x:
 	movl	112(%esp),%eax
 	andl	$15,%eax
-	jz	.L052xts_enc_ret
+	jz	.L056xts_enc_ret
 	movdqa	%xmm1,%xmm5
 	movl	%eax,112(%esp)
-	jmp	.L053xts_enc_steal
+	jmp	.L057xts_enc_steal
 .align	16
-.L050xts_enc_done:
+.L054xts_enc_done:
 	movl	112(%esp),%eax
 	pxor	%xmm0,%xmm0
 	andl	$15,%eax
-	jz	.L052xts_enc_ret
+	jz	.L056xts_enc_ret
 	pcmpgtd	%xmm1,%xmm0
 	movl	%eax,112(%esp)
 	pshufd	$19,%xmm0,%xmm5
 	paddq	%xmm1,%xmm1
 	pand	96(%esp),%xmm5
 	pxor	%xmm1,%xmm5
-.L053xts_enc_steal:
+.L057xts_enc_steal:
 	movzbl	(%esi),%ecx
 	movzbl	-16(%edi),%edx
 	leal	1(%esi),%esi
@@ -1307,7 +1397,7 @@ aesni_xts_encrypt:
 	movb	%dl,(%edi)
 	leal	1(%edi),%edi
 	subl	$1,%eax
-	jnz	.L053xts_enc_steal
+	jnz	.L057xts_enc_steal
 	subl	112(%esp),%edi
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
@@ -1317,16 +1407,30 @@ aesni_xts_encrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L054enc1_loop_10:
+.L058enc1_loop_10:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L054enc1_loop_10
+	jnz	.L058enc1_loop_10
 .byte	102,15,56,221,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,-16(%edi)
-.L052xts_enc_ret:
+.L056xts_enc_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	movdqa	%xmm0,(%esp)
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm0,16(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm0,80(%esp)
 	movl	116(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -1351,12 +1455,12 @@ aesni_xts_decrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L055enc1_loop_11:
+.L059enc1_loop_11:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L055enc1_loop_11
+	jnz	.L059enc1_loop_11
 .byte	102,15,56,221,209
 	movl	20(%esp),%esi
 	movl	24(%esp),%edi
@@ -1385,12 +1489,14 @@ aesni_xts_decrypt:
 	pcmpgtd	%xmm1,%xmm0
 	andl	$-16,%eax
 	subl	$96,%eax
-	jc	.L056xts_dec_short
-	shrl	$1,%ecx
-	movl	%ecx,%ebx
-	jmp	.L057xts_dec_loop6
+	jc	.L060xts_dec_short
+	shll	$4,%ecx
+	movl	$16,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	jmp	.L061xts_dec_loop6
 .align	16
-.L057xts_dec_loop6:
+.L061xts_dec_loop6:
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,(%esp)
@@ -1426,6 +1532,7 @@ aesni_xts_decrypt:
 	pand	%xmm3,%xmm7
 	movups	(%esi),%xmm2
 	pxor	%xmm1,%xmm7
+	movl	%ebx,%ecx
 	movdqu	16(%esi),%xmm3
 	xorps	%xmm0,%xmm2
 	movdqu	32(%esi),%xmm4
@@ -1441,19 +1548,17 @@ aesni_xts_decrypt:
 	movdqa	%xmm7,80(%esp)
 	pxor	%xmm1,%xmm7
 	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
 	pxor	16(%esp),%xmm3
-.byte	102,15,56,222,209
 	pxor	32(%esp),%xmm4
-.byte	102,15,56,222,217
+.byte	102,15,56,222,209
 	pxor	48(%esp),%xmm5
-	decl	%ecx
-.byte	102,15,56,222,225
 	pxor	64(%esp),%xmm6
-.byte	102,15,56,222,233
+.byte	102,15,56,222,217
 	pxor	%xmm0,%xmm7
+	movups	32(%ebp),%xmm0
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
 .byte	102,15,56,222,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,222,249
 	call	.L_aesni_decrypt6_enter
 	movdqa	80(%esp),%xmm1
@@ -1478,26 +1583,25 @@ aesni_xts_decrypt:
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
-	movl	%ebx,%ecx
 	pxor	%xmm2,%xmm1
 	subl	$96,%eax
-	jnc	.L057xts_dec_loop6
-	leal	1(,%ecx,2),%ecx
+	jnc	.L061xts_dec_loop6
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movl	%ecx,%ebx
-.L056xts_dec_short:
+.L060xts_dec_short:
 	addl	$96,%eax
-	jz	.L058xts_dec_done6x
+	jz	.L062xts_dec_done6x
 	movdqa	%xmm1,%xmm5
 	cmpl	$32,%eax
-	jb	.L059xts_dec_one
+	jb	.L063xts_dec_one
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-	je	.L060xts_dec_two
+	je	.L064xts_dec_two
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm6
@@ -1506,7 +1610,7 @@ aesni_xts_decrypt:
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
 	cmpl	$64,%eax
-	jb	.L061xts_dec_three
+	jb	.L065xts_dec_three
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm7
@@ -1516,7 +1620,7 @@ aesni_xts_decrypt:
 	pxor	%xmm2,%xmm1
 	movdqa	%xmm5,(%esp)
 	movdqa	%xmm6,16(%esp)
-	je	.L062xts_dec_four
+	je	.L066xts_dec_four
 	movdqa	%xmm7,32(%esp)
 	pshufd	$19,%xmm0,%xmm7
 	movdqa	%xmm1,48(%esp)
@@ -1548,9 +1652,9 @@ aesni_xts_decrypt:
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L059xts_dec_one:
+.L063xts_dec_one:
 	movups	(%esi),%xmm2
 	leal	16(%esi),%esi
 	xorps	%xmm5,%xmm2
@@ -1558,36 +1662,36 @@ aesni_xts_decrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L064dec1_loop_12:
+.L068dec1_loop_12:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L064dec1_loop_12
+	jnz	.L068dec1_loop_12
 .byte	102,15,56,223,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	movdqa	%xmm5,%xmm1
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L060xts_dec_two:
+.L064xts_dec_two:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
 	leal	32(%esi),%esi
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
-	call	_aesni_decrypt3
+	call	_aesni_decrypt2
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	leal	32(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L061xts_dec_three:
+.L065xts_dec_three:
 	movaps	%xmm1,%xmm7
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1605,9 +1709,9 @@ aesni_xts_decrypt:
 	movups	%xmm4,32(%edi)
 	leal	48(%edi),%edi
 	movdqa	%xmm7,%xmm1
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L062xts_dec_four:
+.L066xts_dec_four:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1629,20 +1733,20 @@ aesni_xts_decrypt:
 	movups	%xmm5,48(%edi)
 	leal	64(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	.L063xts_dec_done
+	jmp	.L067xts_dec_done
 .align	16
-.L058xts_dec_done6x:
+.L062xts_dec_done6x:
 	movl	112(%esp),%eax
 	andl	$15,%eax
-	jz	.L065xts_dec_ret
+	jz	.L069xts_dec_ret
 	movl	%eax,112(%esp)
-	jmp	.L066xts_dec_only_one_more
+	jmp	.L070xts_dec_only_one_more
 .align	16
-.L063xts_dec_done:
+.L067xts_dec_done:
 	movl	112(%esp),%eax
 	pxor	%xmm0,%xmm0
 	andl	$15,%eax
-	jz	.L065xts_dec_ret
+	jz	.L069xts_dec_ret
 	pcmpgtd	%xmm1,%xmm0
 	movl	%eax,112(%esp)
 	pshufd	$19,%xmm0,%xmm2
@@ -1652,7 +1756,7 @@ aesni_xts_decrypt:
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-.L066xts_dec_only_one_more:
+.L070xts_dec_only_one_more:
 	pshufd	$19,%xmm0,%xmm5
 	movdqa	%xmm1,%xmm6
 	paddq	%xmm1,%xmm1
@@ -1666,16 +1770,16 @@ aesni_xts_decrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L067dec1_loop_13:
+.L071dec1_loop_13:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L067dec1_loop_13
+	jnz	.L071dec1_loop_13
 .byte	102,15,56,223,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
-.L068xts_dec_steal:
+.L072xts_dec_steal:
 	movzbl	16(%esi),%ecx
 	movzbl	(%edi),%edx
 	leal	1(%esi),%esi
@@ -1683,7 +1787,7 @@ aesni_xts_decrypt:
 	movb	%dl,16(%edi)
 	leal	1(%edi),%edi
 	subl	$1,%eax
-	jnz	.L068xts_dec_steal
+	jnz	.L072xts_dec_steal
 	subl	112(%esp),%edi
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
@@ -1693,16 +1797,30 @@ aesni_xts_decrypt:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L069dec1_loop_14:
+.L073dec1_loop_14:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L069dec1_loop_14
+	jnz	.L073dec1_loop_14
 .byte	102,15,56,223,209
 	xorps	%xmm6,%xmm2
 	movups	%xmm2,(%edi)
-.L065xts_dec_ret:
+.L069xts_dec_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	movdqa	%xmm0,(%esp)
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm0,16(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm0,80(%esp)
 	movl	116(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -1710,6 +1828,796 @@ aesni_xts_decrypt:
 	popl	%ebp
 	ret
 .size	aesni_xts_decrypt,.-.L_aesni_xts_decrypt_begin
+.globl	aesni_ocb_encrypt
+.type	aesni_ocb_encrypt,@function
+.align	16
+aesni_ocb_encrypt:
+.L_aesni_ocb_encrypt_begin:
+	pushl	%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movl	20(%esp),%esi
+	movl	24(%esp),%edi
+	movl	28(%esp),%eax
+	movl	32(%esp),%edx
+	movdqu	(%ecx),%xmm0
+	movl	36(%esp),%ebp
+	movdqu	(%ebx),%xmm1
+	movl	44(%esp),%ebx
+	movl	%esp,%ecx
+	subl	$132,%esp
+	andl	$-16,%esp
+	subl	%esi,%edi
+	shll	$4,%eax
+	leal	-96(%esi,%eax,1),%eax
+	movl	%edi,120(%esp)
+	movl	%eax,124(%esp)
+	movl	%ecx,128(%esp)
+	movl	240(%edx),%ecx
+	testl	$1,%ebp
+	jnz	.L074odd
+	bsfl	%ebp,%eax
+	addl	$1,%ebp
+	shll	$4,%eax
+	movdqu	(%ebx,%eax,1),%xmm7
+	movl	%edx,%eax
+	movdqu	(%esi),%xmm2
+	leal	16(%esi),%esi
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+.L075enc1_loop_15:
+.byte	102,15,56,220,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	.L075enc1_loop_15
+.byte	102,15,56,221,209
+	xorps	%xmm7,%xmm2
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm6,%xmm1
+	movups	%xmm2,-16(%edi,%esi,1)
+	movl	240(%eax),%ecx
+	movl	%eax,%edx
+	movl	124(%esp),%eax
+.L074odd:
+	shll	$4,%ecx
+	movl	$16,%edi
+	subl	%ecx,%edi
+	movl	%edx,112(%esp)
+	leal	32(%edx,%ecx,1),%edx
+	movl	%edi,116(%esp)
+	cmpl	%eax,%esi
+	ja	.L076short
+	jmp	.L077grandloop
+.align	32
+.L077grandloop:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	leal	5(%ebp),%edi
+	addl	$6,%ebp
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	bsfl	%edi,%edi
+	shll	$4,%ecx
+	shll	$4,%eax
+	shll	$4,%edi
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	movdqu	(%ebx,%edi,1),%xmm7
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movdqa	%xmm7,80(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	movdqu	80(%esi),%xmm7
+	leal	96(%esi),%esi
+	pxor	%xmm2,%xmm1
+	pxor	%xmm0,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm0,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm0,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm0,%xmm5
+	pxor	%xmm6,%xmm1
+	pxor	%xmm0,%xmm6
+	pxor	%xmm7,%xmm1
+	pxor	%xmm0,%xmm7
+	movdqa	%xmm1,96(%esp)
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	80(%esp),%xmm7
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movl	120(%esp),%edi
+	movl	124(%esp),%eax
+	call	.L_aesni_encrypt6_enter
+	movdqa	80(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	%xmm0,%xmm7
+	movdqa	96(%esp),%xmm1
+	movdqu	%xmm2,-96(%edi,%esi,1)
+	movdqu	%xmm3,-80(%edi,%esi,1)
+	movdqu	%xmm4,-64(%edi,%esi,1)
+	movdqu	%xmm5,-48(%edi,%esi,1)
+	movdqu	%xmm6,-32(%edi,%esi,1)
+	movdqu	%xmm7,-16(%edi,%esi,1)
+	cmpl	%eax,%esi
+	jb	.L077grandloop
+.L076short:
+	addl	$96,%eax
+	subl	%esi,%eax
+	jz	.L078done
+	cmpl	$32,%eax
+	jb	.L079one
+	je	.L080two
+	cmpl	$64,%eax
+	jb	.L081three
+	je	.L082four
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	pxor	%xmm7,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm0,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm0,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm0,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm0,%xmm5
+	pxor	%xmm6,%xmm1
+	pxor	%xmm0,%xmm6
+	movdqa	%xmm1,96(%esp)
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movl	120(%esp),%edi
+	call	.L_aesni_encrypt6_enter
+	movdqa	64(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	%xmm0,%xmm6
+	movdqa	96(%esp),%xmm1
+	movdqu	%xmm2,(%edi,%esi,1)
+	movdqu	%xmm3,16(%edi,%esi,1)
+	movdqu	%xmm4,32(%edi,%esi,1)
+	movdqu	%xmm5,48(%edi,%esi,1)
+	movdqu	%xmm6,64(%edi,%esi,1)
+	jmp	.L078done
+.align	16
+.L079one:
+	movdqu	(%ebx),%xmm7
+	movl	112(%esp),%edx
+	movdqu	(%esi),%xmm2
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movl	120(%esp),%edi
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+.L083enc1_loop_16:
+.byte	102,15,56,220,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	.L083enc1_loop_16
+.byte	102,15,56,221,209
+	xorps	%xmm7,%xmm2
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm6,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	jmp	.L078done
+.align	16
+.L080two:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm6
+	movdqu	(%ebx,%ecx,1),%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm6,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm7,%xmm3
+	movdqa	%xmm1,%xmm5
+	movl	120(%esp),%edi
+	call	_aesni_encrypt2
+	xorps	%xmm6,%xmm2
+	xorps	%xmm7,%xmm3
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm5,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	movups	%xmm3,16(%edi,%esi,1)
+	jmp	.L078done
+.align	16
+.L081three:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm5
+	movdqu	(%ebx,%ecx,1),%xmm6
+	movdqa	%xmm5,%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm5
+	pxor	%xmm5,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm5,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm6,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm7,%xmm4
+	movdqa	%xmm1,96(%esp)
+	movl	120(%esp),%edi
+	call	_aesni_encrypt3
+	xorps	%xmm5,%xmm2
+	xorps	%xmm6,%xmm3
+	xorps	%xmm7,%xmm4
+	movdqa	%xmm7,%xmm0
+	movdqa	96(%esp),%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	movups	%xmm3,16(%edi,%esi,1)
+	movups	%xmm4,32(%edi,%esi,1)
+	jmp	.L078done
+.align	16
+.L082four:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	movl	112(%esp),%edx
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm4
+	movdqu	(%ebx,%ecx,1),%xmm5
+	movdqa	%xmm4,%xmm6
+	movdqu	(%ebx,%eax,1),%xmm7
+	pxor	%xmm0,%xmm4
+	movdqu	(%esi),%xmm2
+	pxor	%xmm4,%xmm5
+	movdqu	16(%esi),%xmm3
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm4,(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm5,16(%esp)
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movl	240(%edx),%ecx
+	pxor	%xmm2,%xmm1
+	pxor	(%esp),%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm6,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm7,%xmm5
+	movdqa	%xmm1,96(%esp)
+	movl	120(%esp),%edi
+	call	_aesni_encrypt4
+	xorps	(%esp),%xmm2
+	xorps	16(%esp),%xmm3
+	xorps	%xmm6,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	xorps	%xmm7,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	movdqa	%xmm7,%xmm0
+	movups	%xmm4,32(%edi,%esi,1)
+	movdqa	96(%esp),%xmm1
+	movups	%xmm5,48(%edi,%esi,1)
+.L078done:
+	movl	128(%esp),%edx
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm2,16(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm2,32(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm2,48(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm2,64(%esp)
+	movdqa	%xmm2,80(%esp)
+	movdqa	%xmm2,96(%esp)
+	leal	(%edx),%esp
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movdqu	%xmm0,(%ecx)
+	pxor	%xmm0,%xmm0
+	movdqu	%xmm1,(%ebx)
+	pxor	%xmm1,%xmm1
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
+.size	aesni_ocb_encrypt,.-.L_aesni_ocb_encrypt_begin
+.globl	aesni_ocb_decrypt
+.type	aesni_ocb_decrypt,@function
+.align	16
+aesni_ocb_decrypt:
+.L_aesni_ocb_decrypt_begin:
+	pushl	%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movl	20(%esp),%esi
+	movl	24(%esp),%edi
+	movl	28(%esp),%eax
+	movl	32(%esp),%edx
+	movdqu	(%ecx),%xmm0
+	movl	36(%esp),%ebp
+	movdqu	(%ebx),%xmm1
+	movl	44(%esp),%ebx
+	movl	%esp,%ecx
+	subl	$132,%esp
+	andl	$-16,%esp
+	subl	%esi,%edi
+	shll	$4,%eax
+	leal	-96(%esi,%eax,1),%eax
+	movl	%edi,120(%esp)
+	movl	%eax,124(%esp)
+	movl	%ecx,128(%esp)
+	movl	240(%edx),%ecx
+	testl	$1,%ebp
+	jnz	.L084odd
+	bsfl	%ebp,%eax
+	addl	$1,%ebp
+	shll	$4,%eax
+	movdqu	(%ebx,%eax,1),%xmm7
+	movl	%edx,%eax
+	movdqu	(%esi),%xmm2
+	leal	16(%esi),%esi
+	pxor	%xmm0,%xmm7
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+.L085dec1_loop_17:
+.byte	102,15,56,222,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	.L085dec1_loop_17
+.byte	102,15,56,223,209
+	xorps	%xmm7,%xmm2
+	movaps	%xmm6,%xmm1
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm1
+	movups	%xmm2,-16(%edi,%esi,1)
+	movl	240(%eax),%ecx
+	movl	%eax,%edx
+	movl	124(%esp),%eax
+.L084odd:
+	shll	$4,%ecx
+	movl	$16,%edi
+	subl	%ecx,%edi
+	movl	%edx,112(%esp)
+	leal	32(%edx,%ecx,1),%edx
+	movl	%edi,116(%esp)
+	cmpl	%eax,%esi
+	ja	.L086short
+	jmp	.L087grandloop
+.align	32
+.L087grandloop:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	leal	5(%ebp),%edi
+	addl	$6,%ebp
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	bsfl	%edi,%edi
+	shll	$4,%ecx
+	shll	$4,%eax
+	shll	$4,%edi
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	movdqu	(%ebx,%edi,1),%xmm7
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movdqa	%xmm7,80(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	movdqu	80(%esi),%xmm7
+	leal	96(%esi),%esi
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	pxor	%xmm0,%xmm4
+	pxor	%xmm0,%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm0,%xmm7
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	80(%esp),%xmm7
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movl	120(%esp),%edi
+	movl	124(%esp),%eax
+	call	.L_aesni_decrypt6_enter
+	movdqa	80(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	movdqa	96(%esp),%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	movdqu	%xmm2,-96(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqu	%xmm3,-80(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movdqu	%xmm4,-64(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+	movdqu	%xmm5,-48(%edi,%esi,1)
+	pxor	%xmm6,%xmm1
+	movdqu	%xmm6,-32(%edi,%esi,1)
+	pxor	%xmm7,%xmm1
+	movdqu	%xmm7,-16(%edi,%esi,1)
+	cmpl	%eax,%esi
+	jb	.L087grandloop
+.L086short:
+	addl	$96,%eax
+	subl	%esi,%eax
+	jz	.L088done
+	cmpl	$32,%eax
+	jb	.L089one
+	je	.L090two
+	cmpl	$64,%eax
+	jb	.L091three
+	je	.L092four
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	pxor	%xmm0,%xmm4
+	pxor	%xmm0,%xmm5
+	pxor	%xmm0,%xmm6
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movl	120(%esp),%edi
+	call	.L_aesni_decrypt6_enter
+	movdqa	64(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	movdqa	96(%esp),%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm2,%xmm1
+	movdqu	%xmm2,(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqu	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movdqu	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+	movdqu	%xmm5,48(%edi,%esi,1)
+	pxor	%xmm6,%xmm1
+	movdqu	%xmm6,64(%edi,%esi,1)
+	jmp	.L088done
+.align	16
+.L089one:
+	movdqu	(%ebx),%xmm7
+	movl	112(%esp),%edx
+	movdqu	(%esi),%xmm2
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm7
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movl	120(%esp),%edi
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+.L093dec1_loop_18:
+.byte	102,15,56,222,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	.L093dec1_loop_18
+.byte	102,15,56,223,209
+	xorps	%xmm7,%xmm2
+	movaps	%xmm6,%xmm1
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	jmp	.L088done
+.align	16
+.L090two:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm6
+	movdqu	(%ebx,%ecx,1),%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm6,%xmm2
+	pxor	%xmm7,%xmm3
+	movl	120(%esp),%edi
+	call	_aesni_decrypt2
+	xorps	%xmm6,%xmm2
+	xorps	%xmm7,%xmm3
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm5
+	movups	%xmm2,(%edi,%esi,1)
+	xorps	%xmm3,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	movaps	%xmm5,%xmm1
+	jmp	.L088done
+.align	16
+.L091three:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm5
+	movdqu	(%ebx,%ecx,1),%xmm6
+	movdqa	%xmm5,%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm5
+	pxor	%xmm5,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm5,%xmm2
+	pxor	%xmm6,%xmm3
+	pxor	%xmm7,%xmm4
+	movl	120(%esp),%edi
+	call	_aesni_decrypt3
+	movdqa	96(%esp),%xmm1
+	xorps	%xmm5,%xmm2
+	xorps	%xmm6,%xmm3
+	xorps	%xmm7,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	pxor	%xmm2,%xmm1
+	movdqa	%xmm7,%xmm0
+	movups	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movups	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	jmp	.L088done
+.align	16
+.L092four:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	movl	112(%esp),%edx
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm4
+	movdqu	(%ebx,%ecx,1),%xmm5
+	movdqa	%xmm4,%xmm6
+	movdqu	(%ebx,%eax,1),%xmm7
+	pxor	%xmm0,%xmm4
+	movdqu	(%esi),%xmm2
+	pxor	%xmm4,%xmm5
+	movdqu	16(%esi),%xmm3
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm4,(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm5,16(%esp)
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,96(%esp)
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	%xmm6,%xmm4
+	pxor	%xmm7,%xmm5
+	movl	120(%esp),%edi
+	call	_aesni_decrypt4
+	movdqa	96(%esp),%xmm1
+	xorps	(%esp),%xmm2
+	xorps	16(%esp),%xmm3
+	xorps	%xmm6,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	pxor	%xmm2,%xmm1
+	xorps	%xmm7,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqa	%xmm7,%xmm0
+	movups	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movups	%xmm5,48(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+.L088done:
+	movl	128(%esp),%edx
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm2,16(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm2,32(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm2,48(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm2,64(%esp)
+	movdqa	%xmm2,80(%esp)
+	movdqa	%xmm2,96(%esp)
+	leal	(%edx),%esp
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movdqu	%xmm0,(%ecx)
+	pxor	%xmm0,%xmm0
+	movdqu	%xmm1,(%ebx)
+	pxor	%xmm1,%xmm1
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
+.size	aesni_ocb_decrypt,.-.L_aesni_ocb_decrypt_begin
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
 .align	16
@@ -1728,7 +2636,7 @@ aesni_cbc_encrypt:
 	movl	32(%esp),%edx
 	movl	36(%esp),%ebp
 	testl	%eax,%eax
-	jz	.L070cbc_abort
+	jz	.L094cbc_abort
 	cmpl	$0,40(%esp)
 	xchgl	%esp,%ebx
 	movups	(%ebp),%xmm7
@@ -1736,14 +2644,14 @@ aesni_cbc_encrypt:
 	movl	%edx,%ebp
 	movl	%ebx,16(%esp)
 	movl	%ecx,%ebx
-	je	.L071cbc_decrypt
+	je	.L095cbc_decrypt
 	movaps	%xmm7,%xmm2
 	cmpl	$16,%eax
-	jb	.L072cbc_enc_tail
+	jb	.L096cbc_enc_tail
 	subl	$16,%eax
-	jmp	.L073cbc_enc_loop
+	jmp	.L097cbc_enc_loop
 .align	16
-.L073cbc_enc_loop:
+.L097cbc_enc_loop:
 	movups	(%esi),%xmm7
 	leal	16(%esi),%esi
 	movups	(%edx),%xmm0
@@ -1751,24 +2659,25 @@ aesni_cbc_encrypt:
 	xorps	%xmm0,%xmm7
 	leal	32(%edx),%edx
 	xorps	%xmm7,%xmm2
-.L074enc1_loop_15:
+.L098enc1_loop_19:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L074enc1_loop_15
+	jnz	.L098enc1_loop_19
 .byte	102,15,56,221,209
 	movl	%ebx,%ecx
 	movl	%ebp,%edx
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	subl	$16,%eax
-	jnc	.L073cbc_enc_loop
+	jnc	.L097cbc_enc_loop
 	addl	$16,%eax
-	jnz	.L072cbc_enc_tail
+	jnz	.L096cbc_enc_tail
 	movaps	%xmm2,%xmm7
-	jmp	.L075cbc_ret
-.L072cbc_enc_tail:
+	pxor	%xmm2,%xmm2
+	jmp	.L099cbc_ret
+.L096cbc_enc_tail:
 	movl	%eax,%ecx
 .long	2767451785
 	movl	$16,%ecx
@@ -1779,20 +2688,20 @@ aesni_cbc_encrypt:
 	movl	%ebx,%ecx
 	movl	%edi,%esi
 	movl	%ebp,%edx
-	jmp	.L073cbc_enc_loop
+	jmp	.L097cbc_enc_loop
 .align	16
-.L071cbc_decrypt:
+.L095cbc_decrypt:
 	cmpl	$80,%eax
-	jbe	.L076cbc_dec_tail
+	jbe	.L100cbc_dec_tail
 	movaps	%xmm7,(%esp)
 	subl	$80,%eax
-	jmp	.L077cbc_dec_loop6_enter
+	jmp	.L101cbc_dec_loop6_enter
 .align	16
-.L078cbc_dec_loop6:
+.L102cbc_dec_loop6:
 	movaps	%xmm0,(%esp)
 	movups	%xmm7,(%edi)
 	leal	16(%edi),%edi
-.L077cbc_dec_loop6_enter:
+.L101cbc_dec_loop6_enter:
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -1822,28 +2731,28 @@ aesni_cbc_encrypt:
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
 	subl	$96,%eax
-	ja	.L078cbc_dec_loop6
+	ja	.L102cbc_dec_loop6
 	movaps	%xmm7,%xmm2
 	movaps	%xmm0,%xmm7
 	addl	$80,%eax
-	jle	.L079cbc_dec_tail_collected
+	jle	.L103cbc_dec_clear_tail_collected
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
-.L076cbc_dec_tail:
+.L100cbc_dec_tail:
 	movups	(%esi),%xmm2
 	movaps	%xmm2,%xmm6
 	cmpl	$16,%eax
-	jbe	.L080cbc_dec_one
+	jbe	.L104cbc_dec_one
 	movups	16(%esi),%xmm3
 	movaps	%xmm3,%xmm5
 	cmpl	$32,%eax
-	jbe	.L081cbc_dec_two
+	jbe	.L105cbc_dec_two
 	movups	32(%esi),%xmm4
 	cmpl	$48,%eax
-	jbe	.L082cbc_dec_three
+	jbe	.L106cbc_dec_three
 	movups	48(%esi),%xmm5
 	cmpl	$64,%eax
-	jbe	.L083cbc_dec_four
+	jbe	.L107cbc_dec_four
 	movups	64(%esi),%xmm6
 	movaps	%xmm7,(%esp)
 	movups	(%esi),%xmm2
@@ -1861,56 +2770,62 @@ aesni_cbc_encrypt:
 	xorps	%xmm0,%xmm6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	movups	%xmm4,32(%edi)
+	pxor	%xmm4,%xmm4
 	movups	%xmm5,48(%edi)
+	pxor	%xmm5,%xmm5
 	leal	64(%edi),%edi
 	movaps	%xmm6,%xmm2
+	pxor	%xmm6,%xmm6
 	subl	$80,%eax
-	jmp	.L079cbc_dec_tail_collected
+	jmp	.L108cbc_dec_tail_collected
 .align	16
-.L080cbc_dec_one:
+.L104cbc_dec_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-.L084dec1_loop_16:
+.L109dec1_loop_20:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	.L084dec1_loop_16
+	jnz	.L109dec1_loop_20
 .byte	102,15,56,223,209
 	xorps	%xmm7,%xmm2
 	movaps	%xmm6,%xmm7
 	subl	$16,%eax
-	jmp	.L079cbc_dec_tail_collected
+	jmp	.L108cbc_dec_tail_collected
 .align	16
-.L081cbc_dec_two:
-	xorps	%xmm4,%xmm4
-	call	_aesni_decrypt3
+.L105cbc_dec_two:
+	call	_aesni_decrypt2
 	xorps	%xmm7,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movaps	%xmm3,%xmm2
+	pxor	%xmm3,%xmm3
 	leal	16(%edi),%edi
 	movaps	%xmm5,%xmm7
 	subl	$32,%eax
-	jmp	.L079cbc_dec_tail_collected
+	jmp	.L108cbc_dec_tail_collected
 .align	16
-.L082cbc_dec_three:
+.L106cbc_dec_three:
 	call	_aesni_decrypt3
 	xorps	%xmm7,%xmm2
 	xorps	%xmm6,%xmm3
 	xorps	%xmm5,%xmm4
 	movups	%xmm2,(%edi)
 	movaps	%xmm4,%xmm2
+	pxor	%xmm4,%xmm4
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	leal	32(%edi),%edi
 	movups	32(%esi),%xmm7
 	subl	$48,%eax
-	jmp	.L079cbc_dec_tail_collected
+	jmp	.L108cbc_dec_tail_collected
 .align	16
-.L083cbc_dec_four:
+.L107cbc_dec_four:
 	call	_aesni_decrypt4
 	movups	16(%esi),%xmm1
 	movups	32(%esi),%xmm0
@@ -1920,28 +2835,44 @@ aesni_cbc_encrypt:
 	movups	%xmm2,(%edi)
 	xorps	%xmm1,%xmm4
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	xorps	%xmm0,%xmm5
 	movups	%xmm4,32(%edi)
+	pxor	%xmm4,%xmm4
 	leal	48(%edi),%edi
 	movaps	%xmm5,%xmm2
+	pxor	%xmm5,%xmm5
 	subl	$64,%eax
-.L079cbc_dec_tail_collected:
+	jmp	.L108cbc_dec_tail_collected
+.align	16
+.L103cbc_dec_clear_tail_collected:
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+.L108cbc_dec_tail_collected:
 	andl	$15,%eax
-	jnz	.L085cbc_dec_tail_partial
+	jnz	.L110cbc_dec_tail_partial
 	movups	%xmm2,(%edi)
-	jmp	.L075cbc_ret
+	pxor	%xmm0,%xmm0
+	jmp	.L099cbc_ret
 .align	16
-.L085cbc_dec_tail_partial:
+.L110cbc_dec_tail_partial:
 	movaps	%xmm2,(%esp)
+	pxor	%xmm0,%xmm0
 	movl	$16,%ecx
 	movl	%esp,%esi
 	subl	%eax,%ecx
 .long	2767451785
-.L075cbc_ret:
+	movdqa	%xmm2,(%esp)
+.L099cbc_ret:
 	movl	16(%esp),%esp
 	movl	36(%esp),%ebp
+	pxor	%xmm2,%xmm2
+	pxor	%xmm1,%xmm1
 	movups	%xmm7,(%ebp)
-.L070cbc_abort:
+	pxor	%xmm7,%xmm7
+.L094cbc_abort:
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -1951,52 +2882,62 @@ aesni_cbc_encrypt:
 .type	_aesni_set_encrypt_key,@function
 .align	16
 _aesni_set_encrypt_key:
+	pushl	%ebp
+	pushl	%ebx
 	testl	%eax,%eax
-	jz	.L086bad_pointer
+	jz	.L111bad_pointer
 	testl	%edx,%edx
-	jz	.L086bad_pointer
+	jz	.L111bad_pointer
+	call	.L112pic
+.L112pic:
+	popl	%ebx
+	leal	.Lkey_const-.L112pic(%ebx),%ebx
+	leal	_gnutls_x86_cpuid_s,%ebp
 	movups	(%eax),%xmm0
 	xorps	%xmm4,%xmm4
+	movl	4(%ebp),%ebp
 	leal	16(%edx),%edx
+	andl	$268437504,%ebp
 	cmpl	$256,%ecx
-	je	.L08714rounds
+	je	.L11314rounds
 	cmpl	$192,%ecx
-	je	.L08812rounds
+	je	.L11412rounds
 	cmpl	$128,%ecx
-	jne	.L089bad_keybits
+	jne	.L115bad_keybits
 .align	16
-.L09010rounds:
+.L11610rounds:
+	cmpl	$268435456,%ebp
+	je	.L11710rounds_alt
 	movl	$9,%ecx
 	movups	%xmm0,-16(%edx)
 .byte	102,15,58,223,200,1
-	call	.L091key_128_cold
+	call	.L118key_128_cold
 .byte	102,15,58,223,200,2
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,4
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,8
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,16
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,32
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,64
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,128
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,27
-	call	.L092key_128
+	call	.L119key_128
 .byte	102,15,58,223,200,54
-	call	.L092key_128
+	call	.L119key_128
 	movups	%xmm0,(%edx)
 	movl	%ecx,80(%edx)
-	xorl	%eax,%eax
-	ret
+	jmp	.L120good_key
 .align	16
-.L092key_128:
+.L119key_128:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
-.L091key_128_cold:
+.L118key_128_cold:
 	shufps	$16,%xmm0,%xmm4
 	xorps	%xmm4,%xmm0
 	shufps	$140,%xmm0,%xmm4
@@ -2005,38 +2946,91 @@ _aesni_set_encrypt_key:
 	xorps	%xmm1,%xmm0
 	ret
 .align	16
-.L08812rounds:
+.L11710rounds_alt:
+	movdqa	(%ebx),%xmm5
+	movl	$8,%ecx
+	movdqa	32(%ebx),%xmm4
+	movdqa	%xmm0,%xmm2
+	movdqu	%xmm0,-16(%edx)
+.L121loop_key128:
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	pslld	$1,%xmm4
+	leal	16(%edx),%edx
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,-16(%edx)
+	movdqa	%xmm0,%xmm2
+	decl	%ecx
+	jnz	.L121loop_key128
+	movdqa	48(%ebx),%xmm4
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	pslld	$1,%xmm4
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,(%edx)
+	movdqa	%xmm0,%xmm2
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,16(%edx)
+	movl	$9,%ecx
+	movl	%ecx,96(%edx)
+	jmp	.L120good_key
+.align	16
+.L11412rounds:
 	movq	16(%eax),%xmm2
+	cmpl	$268435456,%ebp
+	je	.L12212rounds_alt
 	movl	$11,%ecx
 	movups	%xmm0,-16(%edx)
 .byte	102,15,58,223,202,1
-	call	.L093key_192a_cold
+	call	.L123key_192a_cold
 .byte	102,15,58,223,202,2
-	call	.L094key_192b
+	call	.L124key_192b
 .byte	102,15,58,223,202,4
-	call	.L095key_192a
+	call	.L125key_192a
 .byte	102,15,58,223,202,8
-	call	.L094key_192b
+	call	.L124key_192b
 .byte	102,15,58,223,202,16
-	call	.L095key_192a
+	call	.L125key_192a
 .byte	102,15,58,223,202,32
-	call	.L094key_192b
+	call	.L124key_192b
 .byte	102,15,58,223,202,64
-	call	.L095key_192a
+	call	.L125key_192a
 .byte	102,15,58,223,202,128
-	call	.L094key_192b
+	call	.L124key_192b
 	movups	%xmm0,(%edx)
 	movl	%ecx,48(%edx)
-	xorl	%eax,%eax
-	ret
+	jmp	.L120good_key
 .align	16
-.L095key_192a:
+.L125key_192a:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
 .align	16
-.L093key_192a_cold:
+.L123key_192a_cold:
 	movaps	%xmm2,%xmm5
-.L096key_192b_warm:
+.L126key_192b_warm:
 	shufps	$16,%xmm0,%xmm4
 	movdqa	%xmm2,%xmm3
 	xorps	%xmm4,%xmm0
@@ -2050,56 +3044,90 @@ _aesni_set_encrypt_key:
 	pxor	%xmm3,%xmm2
 	ret
 .align	16
-.L094key_192b:
+.L124key_192b:
 	movaps	%xmm0,%xmm3
 	shufps	$68,%xmm0,%xmm5
 	movups	%xmm5,(%edx)
 	shufps	$78,%xmm2,%xmm3
 	movups	%xmm3,16(%edx)
 	leal	32(%edx),%edx
-	jmp	.L096key_192b_warm
+	jmp	.L126key_192b_warm
+.align	16
+.L12212rounds_alt:
+	movdqa	16(%ebx),%xmm5
+	movdqa	32(%ebx),%xmm4
+	movl	$8,%ecx
+	movdqu	%xmm0,-16(%edx)
+.L127loop_key192:
+	movq	%xmm2,(%edx)
+	movdqa	%xmm2,%xmm1
+.byte	102,15,56,0,213
+.byte	102,15,56,221,212
+	pslld	$1,%xmm4
+	leal	24(%edx),%edx
+	movdqa	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm3,%xmm0
+	pshufd	$255,%xmm0,%xmm3
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pxor	%xmm2,%xmm0
+	pxor	%xmm3,%xmm2
+	movdqu	%xmm0,-16(%edx)
+	decl	%ecx
+	jnz	.L127loop_key192
+	movl	$11,%ecx
+	movl	%ecx,32(%edx)
+	jmp	.L120good_key
 .align	16
-.L08714rounds:
+.L11314rounds:
 	movups	16(%eax),%xmm2
-	movl	$13,%ecx
 	leal	16(%edx),%edx
+	cmpl	$268435456,%ebp
+	je	.L12814rounds_alt
+	movl	$13,%ecx
 	movups	%xmm0,-32(%edx)
 	movups	%xmm2,-16(%edx)
 .byte	102,15,58,223,202,1
-	call	.L097key_256a_cold
+	call	.L129key_256a_cold
 .byte	102,15,58,223,200,1
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,2
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,2
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,4
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,4
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,8
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,8
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,16
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,16
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,32
-	call	.L099key_256a
+	call	.L131key_256a
 .byte	102,15,58,223,200,32
-	call	.L098key_256b
+	call	.L130key_256b
 .byte	102,15,58,223,202,64
-	call	.L099key_256a
+	call	.L131key_256a
 	movups	%xmm0,(%edx)
 	movl	%ecx,16(%edx)
 	xorl	%eax,%eax
-	ret
+	jmp	.L120good_key
 .align	16
-.L099key_256a:
+.L131key_256a:
 	movups	%xmm2,(%edx)
 	leal	16(%edx),%edx
-.L097key_256a_cold:
+.L129key_256a_cold:
 	shufps	$16,%xmm0,%xmm4
 	xorps	%xmm4,%xmm0
 	shufps	$140,%xmm0,%xmm4
@@ -2108,7 +3136,7 @@ _aesni_set_encrypt_key:
 	xorps	%xmm1,%xmm0
 	ret
 .align	16
-.L098key_256b:
+.L130key_256b:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
 	shufps	$16,%xmm2,%xmm4
@@ -2118,13 +3146,70 @@ _aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	ret
+.align	16
+.L12814rounds_alt:
+	movdqa	(%ebx),%xmm5
+	movdqa	32(%ebx),%xmm4
+	movl	$7,%ecx
+	movdqu	%xmm0,-32(%edx)
+	movdqa	%xmm2,%xmm1
+	movdqu	%xmm2,-16(%edx)
+.L132loop_key256:
+.byte	102,15,56,0,213
+.byte	102,15,56,221,212
+	movdqa	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm3,%xmm0
+	pslld	$1,%xmm4
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,(%edx)
+	decl	%ecx
+	jz	.L133done_key256
+	pshufd	$255,%xmm0,%xmm2
+	pxor	%xmm3,%xmm3
+.byte	102,15,56,221,211
+	movdqa	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm3,%xmm1
+	pxor	%xmm1,%xmm2
+	movdqu	%xmm2,16(%edx)
+	leal	32(%edx),%edx
+	movdqa	%xmm2,%xmm1
+	jmp	.L132loop_key256
+.L133done_key256:
+	movl	$13,%ecx
+	movl	%ecx,16(%edx)
+.L120good_key:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	xorl	%eax,%eax
+	popl	%ebx
+	popl	%ebp
+	ret
 .align	4
-.L086bad_pointer:
+.L111bad_pointer:
 	movl	$-1,%eax
+	popl	%ebx
+	popl	%ebp
 	ret
 .align	4
-.L089bad_keybits:
+.L115bad_keybits:
+	pxor	%xmm0,%xmm0
 	movl	$-2,%eax
+	popl	%ebx
+	popl	%ebp
 	ret
 .size	_aesni_set_encrypt_key,.-_aesni_set_encrypt_key
 .globl	aesni_set_encrypt_key
@@ -2150,7 +3235,7 @@ aesni_set_decrypt_key:
 	movl	12(%esp),%edx
 	shll	$4,%ecx
 	testl	%eax,%eax
-	jnz	.L100dec_key_ret
+	jnz	.L134dec_key_ret
 	leal	16(%edx,%ecx,1),%eax
 	movups	(%edx),%xmm0
 	movups	(%eax),%xmm1
@@ -2158,7 +3243,7 @@ aesni_set_decrypt_key:
 	movups	%xmm1,(%edx)
 	leal	16(%edx),%edx
 	leal	-16(%eax),%eax
-.L101dec_key_inverse:
+.L135dec_key_inverse:
 	movups	(%edx),%xmm0
 	movups	(%eax),%xmm1
 .byte	102,15,56,219,192
@@ -2168,20 +3253,26 @@ aesni_set_decrypt_key:
 	movups	%xmm0,16(%eax)
 	movups	%xmm1,-16(%edx)
 	cmpl	%edx,%eax
-	ja	.L101dec_key_inverse
+	ja	.L135dec_key_inverse
 	movups	(%edx),%xmm0
 .byte	102,15,56,219,192
 	movups	%xmm0,(%edx)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	xorl	%eax,%eax
-.L100dec_key_ret:
+.L134dec_key_ret:
 	ret
 .size	aesni_set_decrypt_key,.-.L_aesni_set_decrypt_key_begin
+.align	64
+.Lkey_const:
+.long	202313229,202313229,202313229,202313229
+.long	67569157,67569157,67569157,67569157
+.long	1,1,1,1
+.long	27,27,27,27
 .byte	65,69,83,32,102,111,114,32,73,110,116,101,108,32,65,69
 .byte	83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83
 .byte	32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115
 .byte	115,108,46,111,114,103,62,0
-
+.comm	_gnutls_x86_cpuid_s,16,4
 
 .section .note.GNU-stack,"",%progbits
-
-
diff --git a/lib/accelerated/x86/elf/aesni-x86_64.s b/lib/accelerated/x86/elf/aesni-x86_64.s
index 76d44fc2a8..43cf4e68de 100644
--- a/lib/accelerated/x86/elf/aesni-x86_64.s
+++ b/lib/accelerated/x86/elf/aesni-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
 .type	aesni_encrypt,@function
 .align	16
 aesni_encrypt:
+.cfi_startproc	
 	movups	(%rdi),%xmm2
 	movl	240(%rdx),%eax
 	movups	(%rdx),%xmm0
@@ -61,12 +62,14 @@ aesni_encrypt:
 	movups	%xmm2,(%rsi)
 	pxor	%xmm2,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_encrypt,.-aesni_encrypt
 
 .globl	aesni_decrypt
 .type	aesni_decrypt,@function
 .align	16
 aesni_decrypt:
+.cfi_startproc	
 	movups	(%rdi),%xmm2
 	movl	240(%rdx),%eax
 	movups	(%rdx),%xmm0
@@ -85,10 +88,12 @@ aesni_decrypt:
 	movups	%xmm2,(%rsi)
 	pxor	%xmm2,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_decrypt, .-aesni_decrypt
 .type	_aesni_encrypt2,@function
 .align	16
 _aesni_encrypt2:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -114,10 +119,12 @@ _aesni_encrypt2:
 .byte	102,15,56,221,208
 .byte	102,15,56,221,216
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_encrypt2,.-_aesni_encrypt2
 .type	_aesni_decrypt2,@function
 .align	16
 _aesni_decrypt2:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -143,10 +150,12 @@ _aesni_decrypt2:
 .byte	102,15,56,223,208
 .byte	102,15,56,223,216
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_decrypt2,.-_aesni_decrypt2
 .type	_aesni_encrypt3,@function
 .align	16
 _aesni_encrypt3:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -177,10 +186,12 @@ _aesni_encrypt3:
 .byte	102,15,56,221,216
 .byte	102,15,56,221,224
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_encrypt3,.-_aesni_encrypt3
 .type	_aesni_decrypt3,@function
 .align	16
 _aesni_decrypt3:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -211,10 +222,12 @@ _aesni_decrypt3:
 .byte	102,15,56,223,216
 .byte	102,15,56,223,224
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_decrypt3,.-_aesni_decrypt3
 .type	_aesni_encrypt4,@function
 .align	16
 _aesni_encrypt4:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -251,10 +264,12 @@ _aesni_encrypt4:
 .byte	102,15,56,221,224
 .byte	102,15,56,221,232
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_encrypt4,.-_aesni_encrypt4
 .type	_aesni_decrypt4,@function
 .align	16
 _aesni_decrypt4:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -291,10 +306,12 @@ _aesni_decrypt4:
 .byte	102,15,56,223,224
 .byte	102,15,56,223,232
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_decrypt4,.-_aesni_decrypt4
 .type	_aesni_encrypt6,@function
 .align	16
 _aesni_encrypt6:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -345,10 +362,12 @@ _aesni_encrypt6:
 .byte	102,15,56,221,240
 .byte	102,15,56,221,248
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_encrypt6,.-_aesni_encrypt6
 .type	_aesni_decrypt6,@function
 .align	16
 _aesni_decrypt6:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -399,10 +418,12 @@ _aesni_decrypt6:
 .byte	102,15,56,223,240
 .byte	102,15,56,223,248
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_decrypt6,.-_aesni_decrypt6
 .type	_aesni_encrypt8,@function
 .align	16
 _aesni_encrypt8:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -463,10 +484,12 @@ _aesni_encrypt8:
 .byte	102,68,15,56,221,192
 .byte	102,68,15,56,221,200
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_encrypt8,.-_aesni_encrypt8
 .type	_aesni_decrypt8,@function
 .align	16
 _aesni_decrypt8:
+.cfi_startproc	
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -527,11 +550,13 @@ _aesni_decrypt8:
 .byte	102,68,15,56,223,192
 .byte	102,68,15,56,223,200
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	_aesni_decrypt8,.-_aesni_decrypt8
 .globl	aesni_ecb_encrypt
 .type	aesni_ecb_encrypt,@function
 .align	16
 aesni_ecb_encrypt:
+.cfi_startproc	
 	andq	$-16,%rdx
 	jz	.Lecb_ret
 
@@ -869,6 +894,7 @@ aesni_ecb_encrypt:
 	xorps	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_ecb_encrypt,.-aesni_ecb_encrypt
 .globl	aesni_ccm64_encrypt_blocks
 .type	aesni_ccm64_encrypt_blocks,@function
@@ -1034,6 +1060,7 @@ aesni_ccm64_decrypt_blocks:
 .type	aesni_ctr32_encrypt_blocks,@function
 .align	16
 aesni_ctr32_encrypt_blocks:
+.cfi_startproc	
 	cmpq	$1,%rdx
 	jne	.Lctr32_bulk
 
@@ -1063,11 +1090,12 @@ aesni_ctr32_encrypt_blocks:
 
 .align	16
 .Lctr32_bulk:
-	leaq	(%rsp),%rax
+	leaq	(%rsp),%r11
+.cfi_def_cfa_register	%r11
 	pushq	%rbp
+.cfi_offset	%rbp,-16
 	subq	$128,%rsp
 	andq	$-16,%rsp
-	leaq	-8(%rax),%rbp
 
 
 
@@ -1076,7 +1104,7 @@ aesni_ctr32_encrypt_blocks:
 	movdqu	(%rcx),%xmm0
 	movl	12(%r8),%r8d
 	pxor	%xmm0,%xmm2
-	movl	12(%rcx),%r11d
+	movl	12(%rcx),%ebp
 	movdqa	%xmm2,0(%rsp)
 	bswapl	%r8d
 	movdqa	%xmm2,%xmm3
@@ -1092,8 +1120,8 @@ aesni_ctr32_encrypt_blocks:
 	leaq	2(%r8),%rdx
 	bswapl	%eax
 	bswapl	%edx
-	xorl	%r11d,%eax
-	xorl	%r11d,%edx
+	xorl	%ebp,%eax
+	xorl	%ebp,%edx
 .byte	102,15,58,34,216,3
 	leaq	3(%r8),%rax
 	movdqa	%xmm3,16(%rsp)
@@ -1102,25 +1130,25 @@ aesni_ctr32_encrypt_blocks:
 	movq	%r10,%rdx
 	leaq	4(%r8),%r10
 	movdqa	%xmm4,32(%rsp)
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 	bswapl	%r10d
 .byte	102,15,58,34,232,3
-	xorl	%r11d,%r10d
+	xorl	%ebp,%r10d
 	movdqa	%xmm5,48(%rsp)
 	leaq	5(%r8),%r9
 	movl	%r10d,64+12(%rsp)
 	bswapl	%r9d
 	leaq	6(%r8),%r10
 	movl	240(%rcx),%eax
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	bswapl	%r10d
 	movl	%r9d,80+12(%rsp)
-	xorl	%r11d,%r10d
+	xorl	%ebp,%r10d
 	leaq	7(%r8),%r9
 	movl	%r10d,96+12(%rsp)
 	bswapl	%r9d
 	movl	_gnutls_x86_cpuid_s+4(%rip),%r10d
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	andl	$71303168,%r10d
 	movl	%r9d,112+12(%rsp)
 
@@ -1144,7 +1172,7 @@ aesni_ctr32_encrypt_blocks:
 .Lctr32_6x:
 	shll	$4,%eax
 	movl	$48,%r10d
-	bswapl	%r11d
+	bswapl	%ebp
 	leaq	32(%rcx,%rax,1),%rcx
 	subq	%rax,%r10
 	jmp	.Lctr32_loop6
@@ -1155,32 +1183,32 @@ aesni_ctr32_encrypt_blocks:
 	movups	-48(%rcx,%r10,1),%xmm0
 .byte	102,15,56,220,209
 	movl	%r8d,%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,217
 .byte	0x0f,0x38,0xf1,0x44,0x24,12
 	leal	1(%r8),%eax
 .byte	102,15,56,220,225
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	0x0f,0x38,0xf1,0x44,0x24,28
 .byte	102,15,56,220,233
 	leal	2(%r8),%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,241
 .byte	0x0f,0x38,0xf1,0x44,0x24,44
 	leal	3(%r8),%eax
 .byte	102,15,56,220,249
 	movups	-32(%rcx,%r10,1),%xmm1
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 
 .byte	102,15,56,220,208
 .byte	0x0f,0x38,0xf1,0x44,0x24,60
 	leal	4(%r8),%eax
 .byte	102,15,56,220,216
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	0x0f,0x38,0xf1,0x44,0x24,76
 .byte	102,15,56,220,224
 	leal	5(%r8),%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,232
 .byte	0x0f,0x38,0xf1,0x44,0x24,92
 	movq	%r10,%rax
@@ -1241,7 +1269,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 	movups	32-128(%rcx),%xmm0
 .byte	102,15,56,220,225
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	nop
 .byte	102,15,56,220,233
 	movl	%r9d,0+12(%rsp)
@@ -1254,7 +1282,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1268,7 +1296,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1282,7 +1310,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1296,7 +1324,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1310,7 +1338,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1324,7 +1352,7 @@ aesni_ctr32_encrypt_blocks:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1339,7 +1367,7 @@ aesni_ctr32_encrypt_blocks:
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
 .byte	102,15,56,220,224
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	movdqu	0(%rdi),%xmm10
 .byte	102,15,56,220,232
 	movl	%r9d,112+12(%rsp)
@@ -1574,7 +1602,7 @@ aesni_ctr32_encrypt_blocks:
 
 .Lctr32_done:
 	xorps	%xmm0,%xmm0
-	xorl	%r11d,%r11d
+	xorl	%ebp,%ebp
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
 	pxor	%xmm3,%xmm3
@@ -1598,20 +1626,25 @@ aesni_ctr32_encrypt_blocks:
 	pxor	%xmm14,%xmm14
 	movaps	%xmm0,112(%rsp)
 	pxor	%xmm15,%xmm15
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+.cfi_restore	%rbp
+	leaq	(%r11),%rsp
+.cfi_def_cfa_register	%rsp
 .Lctr32_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_ctr32_encrypt_blocks,.-aesni_ctr32_encrypt_blocks
 .globl	aesni_xts_encrypt
 .type	aesni_xts_encrypt,@function
 .align	16
 aesni_xts_encrypt:
-	leaq	(%rsp),%rax
+.cfi_startproc	
+	leaq	(%rsp),%r11
+.cfi_def_cfa_register	%r11
 	pushq	%rbp
+.cfi_offset	%rbp,-16
 	subq	$112,%rsp
 	andq	$-16,%rsp
-	leaq	-8(%rax),%rbp
 	movups	(%r9),%xmm2
 	movl	240(%r8),%eax
 	movl	240(%rcx),%r10d
@@ -1627,7 +1660,7 @@ aesni_xts_encrypt:
 	jnz	.Loop_enc1_8
 .byte	102,15,56,221,209
 	movups	(%rcx),%xmm0
-	movq	%rcx,%r11
+	movq	%rcx,%rbp
 	movl	%r10d,%eax
 	shll	$4,%r10d
 	movq	%rdx,%r9
@@ -1683,9 +1716,9 @@ aesni_xts_encrypt:
 	jc	.Lxts_enc_short
 
 	movl	$16+96,%eax
-	leaq	32(%r11,%r10,1),%rcx
+	leaq	32(%rbp,%r10,1),%rcx
 	subq	%r10,%rax
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 	movq	%rax,%r10
 	leaq	.Lxts_magic(%rip),%r8
 	jmp	.Lxts_enc_grandloop
@@ -1710,7 +1743,7 @@ aesni_xts_encrypt:
 	movdqa	96(%rsp),%xmm9
 	pxor	%xmm14,%xmm6
 .byte	102,15,56,220,233
-	movups	32(%r11),%xmm0
+	movups	32(%rbp),%xmm0
 	leaq	96(%rdi),%rdi
 	pxor	%xmm8,%xmm7
 
@@ -1719,7 +1752,7 @@ aesni_xts_encrypt:
 	pxor	%xmm9,%xmm11
 	movdqa	%xmm10,0(%rsp)
 .byte	102,15,56,220,249
-	movups	48(%r11),%xmm1
+	movups	48(%rbp),%xmm1
 	pxor	%xmm9,%xmm12
 
 .byte	102,15,56,220,208
@@ -1734,7 +1767,7 @@ aesni_xts_encrypt:
 	movdqa	%xmm14,64(%rsp)
 .byte	102,15,56,220,240
 .byte	102,15,56,220,248
-	movups	64(%r11),%xmm0
+	movups	64(%rbp),%xmm0
 	movdqa	%xmm8,80(%rsp)
 	pshufd	$0x5f,%xmm15,%xmm9
 	jmp	.Lxts_enc_loop6
@@ -1766,7 +1799,7 @@ aesni_xts_encrypt:
 	psrad	$31,%xmm14
 .byte	102,15,56,220,217
 	pand	%xmm8,%xmm14
-	movups	(%r11),%xmm10
+	movups	(%rbp),%xmm10
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
 .byte	102,15,56,220,241
@@ -1834,10 +1867,10 @@ aesni_xts_encrypt:
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
 	pxor	%xmm0,%xmm15
-	movups	(%r11),%xmm0
+	movups	(%rbp),%xmm0
 .byte	102,15,56,220,241
 .byte	102,15,56,220,249
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 
 	pxor	%xmm15,%xmm14
 .byte	102,15,56,221,84,36,0
@@ -1864,7 +1897,7 @@ aesni_xts_encrypt:
 
 	movl	$16+96,%eax
 	subl	%r10d,%eax
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	shrl	$4,%eax
 
 .Lxts_enc_short:
@@ -2020,7 +2053,7 @@ aesni_xts_encrypt:
 	jnz	.Lxts_enc_steal
 
 	subq	%r9,%rsi
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	-16(%rsi),%xmm2
@@ -2063,20 +2096,25 @@ aesni_xts_encrypt:
 	movaps	%xmm0,96(%rsp)
 	pxor	%xmm14,%xmm14
 	pxor	%xmm15,%xmm15
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+.cfi_restore	%rbp
+	leaq	(%r11),%rsp
+.cfi_def_cfa_register	%rsp
 .Lxts_enc_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_xts_encrypt,.-aesni_xts_encrypt
 .globl	aesni_xts_decrypt
 .type	aesni_xts_decrypt,@function
 .align	16
 aesni_xts_decrypt:
-	leaq	(%rsp),%rax
+.cfi_startproc	
+	leaq	(%rsp),%r11
+.cfi_def_cfa_register	%r11
 	pushq	%rbp
+.cfi_offset	%rbp,-16
 	subq	$112,%rsp
 	andq	$-16,%rsp
-	leaq	-8(%rax),%rbp
 	movups	(%r9),%xmm2
 	movl	240(%r8),%eax
 	movl	240(%rcx),%r10d
@@ -2098,7 +2136,7 @@ aesni_xts_decrypt:
 	subq	%rax,%rdx
 
 	movups	(%rcx),%xmm0
-	movq	%rcx,%r11
+	movq	%rcx,%rbp
 	movl	%r10d,%eax
 	shll	$4,%r10d
 	movq	%rdx,%r9
@@ -2154,9 +2192,9 @@ aesni_xts_decrypt:
 	jc	.Lxts_dec_short
 
 	movl	$16+96,%eax
-	leaq	32(%r11,%r10,1),%rcx
+	leaq	32(%rbp,%r10,1),%rcx
 	subq	%r10,%rax
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 	movq	%rax,%r10
 	leaq	.Lxts_magic(%rip),%r8
 	jmp	.Lxts_dec_grandloop
@@ -2181,7 +2219,7 @@ aesni_xts_decrypt:
 	movdqa	96(%rsp),%xmm9
 	pxor	%xmm14,%xmm6
 .byte	102,15,56,222,233
-	movups	32(%r11),%xmm0
+	movups	32(%rbp),%xmm0
 	leaq	96(%rdi),%rdi
 	pxor	%xmm8,%xmm7
 
@@ -2190,7 +2228,7 @@ aesni_xts_decrypt:
 	pxor	%xmm9,%xmm11
 	movdqa	%xmm10,0(%rsp)
 .byte	102,15,56,222,249
-	movups	48(%r11),%xmm1
+	movups	48(%rbp),%xmm1
 	pxor	%xmm9,%xmm12
 
 .byte	102,15,56,222,208
@@ -2205,7 +2243,7 @@ aesni_xts_decrypt:
 	movdqa	%xmm14,64(%rsp)
 .byte	102,15,56,222,240
 .byte	102,15,56,222,248
-	movups	64(%r11),%xmm0
+	movups	64(%rbp),%xmm0
 	movdqa	%xmm8,80(%rsp)
 	pshufd	$0x5f,%xmm15,%xmm9
 	jmp	.Lxts_dec_loop6
@@ -2237,7 +2275,7 @@ aesni_xts_decrypt:
 	psrad	$31,%xmm14
 .byte	102,15,56,222,217
 	pand	%xmm8,%xmm14
-	movups	(%r11),%xmm10
+	movups	(%rbp),%xmm10
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
 .byte	102,15,56,222,241
@@ -2305,10 +2343,10 @@ aesni_xts_decrypt:
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
 	pxor	%xmm0,%xmm15
-	movups	(%r11),%xmm0
+	movups	(%rbp),%xmm0
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 
 	pxor	%xmm15,%xmm14
 .byte	102,15,56,223,84,36,0
@@ -2335,7 +2373,7 @@ aesni_xts_decrypt:
 
 	movl	$16+96,%eax
 	subl	%r10d,%eax
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	shrl	$4,%eax
 
 .Lxts_dec_short:
@@ -2492,7 +2530,7 @@ aesni_xts_decrypt:
 	jz	.Lxts_dec_ret
 .Lxts_dec_done2:
 	movq	%r9,%rdx
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	(%rdi),%xmm2
@@ -2522,7 +2560,7 @@ aesni_xts_decrypt:
 	jnz	.Lxts_dec_steal
 
 	subq	%r9,%rsi
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	(%rsi),%xmm2
@@ -2565,15 +2603,871 @@ aesni_xts_decrypt:
 	movaps	%xmm0,96(%rsp)
 	pxor	%xmm14,%xmm14
 	pxor	%xmm15,%xmm15
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+.cfi_restore	%rbp
+	leaq	(%r11),%rsp
+.cfi_def_cfa_register	%rsp
 .Lxts_dec_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_xts_decrypt,.-aesni_xts_decrypt
+.globl	aesni_ocb_encrypt
+.type	aesni_ocb_encrypt,@function
+.align	32
+aesni_ocb_encrypt:
+.cfi_startproc	
+	leaq	(%rsp),%rax
+	pushq	%rbx
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r14,-48
+	movq	8(%rax),%rbx
+	movq	8+8(%rax),%rbp
+
+	movl	240(%rcx),%r10d
+	movq	%rcx,%r11
+	shll	$4,%r10d
+	movups	(%rcx),%xmm9
+	movups	16(%rcx,%r10,1),%xmm1
+
+	movdqu	(%r9),%xmm15
+	pxor	%xmm1,%xmm9
+	pxor	%xmm1,%xmm15
+
+	movl	$16+32,%eax
+	leaq	32(%r11,%r10,1),%rcx
+	movups	16(%r11),%xmm1
+	subq	%r10,%rax
+	movq	%rax,%r10
+
+	movdqu	(%rbx),%xmm10
+	movdqu	(%rbp),%xmm8
+
+	testq	$1,%r8
+	jnz	.Locb_enc_odd
+
+	bsfq	%r8,%r12
+	addq	$1,%r8
+	shlq	$4,%r12
+	movdqu	(%rbx,%r12,1),%xmm7
+	movdqu	(%rdi),%xmm2
+	leaq	16(%rdi),%rdi
+
+	call	__ocb_encrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,(%rsi)
+	leaq	16(%rsi),%rsi
+	subq	$1,%rdx
+	jz	.Locb_enc_done
+
+.Locb_enc_odd:
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	leaq	6(%r8),%r8
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+	shlq	$4,%r12
+	shlq	$4,%r13
+	shlq	$4,%r14
+
+	subq	$6,%rdx
+	jc	.Locb_enc_short
+	jmp	.Locb_enc_grandloop
+
+.align	32
+.Locb_enc_grandloop:
+	movdqu	0(%rdi),%xmm2
+	movdqu	16(%rdi),%xmm3
+	movdqu	32(%rdi),%xmm4
+	movdqu	48(%rdi),%xmm5
+	movdqu	64(%rdi),%xmm6
+	movdqu	80(%rdi),%xmm7
+	leaq	96(%rdi),%rdi
+
+	call	__ocb_encrypt6
+
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+	movups	%xmm6,64(%rsi)
+	movups	%xmm7,80(%rsi)
+	leaq	96(%rsi),%rsi
+	subq	$6,%rdx
+	jnc	.Locb_enc_grandloop
+
+.Locb_enc_short:
+	addq	$6,%rdx
+	jz	.Locb_enc_done
+
+	movdqu	0(%rdi),%xmm2
+	cmpq	$2,%rdx
+	jb	.Locb_enc_one
+	movdqu	16(%rdi),%xmm3
+	je	.Locb_enc_two
+
+	movdqu	32(%rdi),%xmm4
+	cmpq	$4,%rdx
+	jb	.Locb_enc_three
+	movdqu	48(%rdi),%xmm5
+	je	.Locb_enc_four
+
+	movdqu	64(%rdi),%xmm6
+	pxor	%xmm7,%xmm7
+
+	call	__ocb_encrypt6
+
+	movdqa	%xmm14,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+	movups	%xmm6,64(%rsi)
+
+	jmp	.Locb_enc_done
+
+.align	16
+.Locb_enc_one:
+	movdqa	%xmm10,%xmm7
+
+	call	__ocb_encrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,0(%rsi)
+	jmp	.Locb_enc_done
+
+.align	16
+.Locb_enc_two:
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_encrypt4
+
+	movdqa	%xmm11,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+
+	jmp	.Locb_enc_done
+
+.align	16
+.Locb_enc_three:
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_encrypt4
+
+	movdqa	%xmm12,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+
+	jmp	.Locb_enc_done
+
+.align	16
+.Locb_enc_four:
+	call	__ocb_encrypt4
+
+	movdqa	%xmm13,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+
+.Locb_enc_done:
+	pxor	%xmm0,%xmm15
+	movdqu	%xmm8,(%rbp)
+	movdqu	%xmm15,(%r9)
+
+	xorps	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
+	pxor	%xmm8,%xmm8
+	pxor	%xmm9,%xmm9
+	pxor	%xmm10,%xmm10
+	pxor	%xmm11,%xmm11
+	pxor	%xmm12,%xmm12
+	pxor	%xmm13,%xmm13
+	pxor	%xmm14,%xmm14
+	pxor	%xmm15,%xmm15
+	leaq	40(%rsp),%rax
+.cfi_def_cfa	%rax,8
+	movq	-40(%rax),%r14
+.cfi_restore	%r14
+	movq	-32(%rax),%r13
+.cfi_restore	%r13
+	movq	-24(%rax),%r12
+.cfi_restore	%r12
+	movq	-16(%rax),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rax),%rbx
+.cfi_restore	%rbx
+	leaq	(%rax),%rsp
+.cfi_def_cfa_register	%rsp
+.Locb_enc_epilogue:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	aesni_ocb_encrypt,.-aesni_ocb_encrypt
+
+.type	__ocb_encrypt6,@function
+.align	32
+__ocb_encrypt6:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	movdqa	%xmm10,%xmm14
+	pxor	%xmm15,%xmm10
+	movdqu	(%rbx,%r14,1),%xmm15
+	pxor	%xmm10,%xmm11
+	pxor	%xmm2,%xmm8
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm3,%xmm8
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm4,%xmm8
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm14
+	pxor	%xmm5,%xmm8
+	pxor	%xmm13,%xmm5
+	pxor	%xmm14,%xmm15
+	pxor	%xmm6,%xmm8
+	pxor	%xmm14,%xmm6
+	pxor	%xmm7,%xmm8
+	pxor	%xmm15,%xmm7
+	movups	32(%r11),%xmm0
+
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	addq	$6,%r8
+	pxor	%xmm9,%xmm10
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+.byte	102,15,56,220,241
+	pxor	%xmm9,%xmm13
+	pxor	%xmm9,%xmm14
+.byte	102,15,56,220,249
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm15
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+.byte	102,15,56,220,240
+.byte	102,15,56,220,248
+	movups	64(%r11),%xmm0
+	shlq	$4,%r12
+	shlq	$4,%r13
+	jmp	.Locb_enc_loop6
+
+.align	32
+.Locb_enc_loop6:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+.byte	102,15,56,220,240
+.byte	102,15,56,220,248
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_enc_loop6
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movups	16(%r11),%xmm1
+	shlq	$4,%r14
+
+.byte	102,65,15,56,221,210
+	movdqu	(%rbx),%xmm10
+	movq	%r10,%rax
+.byte	102,65,15,56,221,219
+.byte	102,65,15,56,221,228
+.byte	102,65,15,56,221,237
+.byte	102,65,15,56,221,246
+.byte	102,65,15,56,221,255
+	.byte	0xf3,0xc3
+.size	__ocb_encrypt6,.-__ocb_encrypt6
+
+.type	__ocb_encrypt4,@function
+.align	32
+__ocb_encrypt4:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	pxor	%xmm15,%xmm10
+	pxor	%xmm10,%xmm11
+	pxor	%xmm2,%xmm8
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm3,%xmm8
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm4,%xmm8
+	pxor	%xmm12,%xmm4
+	pxor	%xmm5,%xmm8
+	pxor	%xmm13,%xmm5
+	movups	32(%r11),%xmm0
+
+	pxor	%xmm9,%xmm10
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+	pxor	%xmm9,%xmm13
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	48(%r11),%xmm1
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+	movups	64(%r11),%xmm0
+	jmp	.Locb_enc_loop4
+
+.align	32
+.Locb_enc_loop4:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_enc_loop4
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,65,15,56,221,210
+.byte	102,65,15,56,221,219
+.byte	102,65,15,56,221,228
+.byte	102,65,15,56,221,237
+	.byte	0xf3,0xc3
+.size	__ocb_encrypt4,.-__ocb_encrypt4
+
+.type	__ocb_encrypt1,@function
+.align	32
+__ocb_encrypt1:
+	pxor	%xmm15,%xmm7
+	pxor	%xmm9,%xmm7
+	pxor	%xmm2,%xmm8
+	pxor	%xmm7,%xmm2
+	movups	32(%r11),%xmm0
+
+.byte	102,15,56,220,209
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm7
+
+.byte	102,15,56,220,208
+	movups	64(%r11),%xmm0
+	jmp	.Locb_enc_loop1
+
+.align	32
+.Locb_enc_loop1:
+.byte	102,15,56,220,209
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_enc_loop1
+
+.byte	102,15,56,220,209
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,15,56,221,215
+	.byte	0xf3,0xc3
+.size	__ocb_encrypt1,.-__ocb_encrypt1
+
+.globl	aesni_ocb_decrypt
+.type	aesni_ocb_decrypt,@function
+.align	32
+aesni_ocb_decrypt:
+.cfi_startproc	
+	leaq	(%rsp),%rax
+	pushq	%rbx
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r14,-48
+	movq	8(%rax),%rbx
+	movq	8+8(%rax),%rbp
+
+	movl	240(%rcx),%r10d
+	movq	%rcx,%r11
+	shll	$4,%r10d
+	movups	(%rcx),%xmm9
+	movups	16(%rcx,%r10,1),%xmm1
+
+	movdqu	(%r9),%xmm15
+	pxor	%xmm1,%xmm9
+	pxor	%xmm1,%xmm15
+
+	movl	$16+32,%eax
+	leaq	32(%r11,%r10,1),%rcx
+	movups	16(%r11),%xmm1
+	subq	%r10,%rax
+	movq	%rax,%r10
+
+	movdqu	(%rbx),%xmm10
+	movdqu	(%rbp),%xmm8
+
+	testq	$1,%r8
+	jnz	.Locb_dec_odd
+
+	bsfq	%r8,%r12
+	addq	$1,%r8
+	shlq	$4,%r12
+	movdqu	(%rbx,%r12,1),%xmm7
+	movdqu	(%rdi),%xmm2
+	leaq	16(%rdi),%rdi
+
+	call	__ocb_decrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,(%rsi)
+	xorps	%xmm2,%xmm8
+	leaq	16(%rsi),%rsi
+	subq	$1,%rdx
+	jz	.Locb_dec_done
+
+.Locb_dec_odd:
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	leaq	6(%r8),%r8
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+	shlq	$4,%r12
+	shlq	$4,%r13
+	shlq	$4,%r14
+
+	subq	$6,%rdx
+	jc	.Locb_dec_short
+	jmp	.Locb_dec_grandloop
+
+.align	32
+.Locb_dec_grandloop:
+	movdqu	0(%rdi),%xmm2
+	movdqu	16(%rdi),%xmm3
+	movdqu	32(%rdi),%xmm4
+	movdqu	48(%rdi),%xmm5
+	movdqu	64(%rdi),%xmm6
+	movdqu	80(%rdi),%xmm7
+	leaq	96(%rdi),%rdi
+
+	call	__ocb_decrypt6
+
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+	movups	%xmm6,64(%rsi)
+	pxor	%xmm6,%xmm8
+	movups	%xmm7,80(%rsi)
+	pxor	%xmm7,%xmm8
+	leaq	96(%rsi),%rsi
+	subq	$6,%rdx
+	jnc	.Locb_dec_grandloop
+
+.Locb_dec_short:
+	addq	$6,%rdx
+	jz	.Locb_dec_done
+
+	movdqu	0(%rdi),%xmm2
+	cmpq	$2,%rdx
+	jb	.Locb_dec_one
+	movdqu	16(%rdi),%xmm3
+	je	.Locb_dec_two
+
+	movdqu	32(%rdi),%xmm4
+	cmpq	$4,%rdx
+	jb	.Locb_dec_three
+	movdqu	48(%rdi),%xmm5
+	je	.Locb_dec_four
+
+	movdqu	64(%rdi),%xmm6
+	pxor	%xmm7,%xmm7
+
+	call	__ocb_decrypt6
+
+	movdqa	%xmm14,%xmm15
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+	movups	%xmm6,64(%rsi)
+	pxor	%xmm6,%xmm8
+
+	jmp	.Locb_dec_done
+
+.align	16
+.Locb_dec_one:
+	movdqa	%xmm10,%xmm7
+
+	call	__ocb_decrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	jmp	.Locb_dec_done
+
+.align	16
+.Locb_dec_two:
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_decrypt4
+
+	movdqa	%xmm11,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	xorps	%xmm3,%xmm8
+
+	jmp	.Locb_dec_done
+
+.align	16
+.Locb_dec_three:
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_decrypt4
+
+	movdqa	%xmm12,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	xorps	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	xorps	%xmm4,%xmm8
+
+	jmp	.Locb_dec_done
+
+.align	16
+.Locb_dec_four:
+	call	__ocb_decrypt4
+
+	movdqa	%xmm13,%xmm15
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+
+.Locb_dec_done:
+	pxor	%xmm0,%xmm15
+	movdqu	%xmm8,(%rbp)
+	movdqu	%xmm15,(%r9)
+
+	xorps	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
+	pxor	%xmm8,%xmm8
+	pxor	%xmm9,%xmm9
+	pxor	%xmm10,%xmm10
+	pxor	%xmm11,%xmm11
+	pxor	%xmm12,%xmm12
+	pxor	%xmm13,%xmm13
+	pxor	%xmm14,%xmm14
+	pxor	%xmm15,%xmm15
+	leaq	40(%rsp),%rax
+.cfi_def_cfa	%rax,8
+	movq	-40(%rax),%r14
+.cfi_restore	%r14
+	movq	-32(%rax),%r13
+.cfi_restore	%r13
+	movq	-24(%rax),%r12
+.cfi_restore	%r12
+	movq	-16(%rax),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rax),%rbx
+.cfi_restore	%rbx
+	leaq	(%rax),%rsp
+.cfi_def_cfa_register	%rsp
+.Locb_dec_epilogue:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	aesni_ocb_decrypt,.-aesni_ocb_decrypt
+
+.type	__ocb_decrypt6,@function
+.align	32
+__ocb_decrypt6:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	movdqa	%xmm10,%xmm14
+	pxor	%xmm15,%xmm10
+	movdqu	(%rbx,%r14,1),%xmm15
+	pxor	%xmm10,%xmm11
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm14
+	pxor	%xmm13,%xmm5
+	pxor	%xmm14,%xmm15
+	pxor	%xmm14,%xmm6
+	pxor	%xmm15,%xmm7
+	movups	32(%r11),%xmm0
+
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	addq	$6,%r8
+	pxor	%xmm9,%xmm10
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+.byte	102,15,56,222,241
+	pxor	%xmm9,%xmm13
+	pxor	%xmm9,%xmm14
+.byte	102,15,56,222,249
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm15
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+.byte	102,15,56,222,240
+.byte	102,15,56,222,248
+	movups	64(%r11),%xmm0
+	shlq	$4,%r12
+	shlq	$4,%r13
+	jmp	.Locb_dec_loop6
+
+.align	32
+.Locb_dec_loop6:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+.byte	102,15,56,222,240
+.byte	102,15,56,222,248
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_dec_loop6
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movups	16(%r11),%xmm1
+	shlq	$4,%r14
+
+.byte	102,65,15,56,223,210
+	movdqu	(%rbx),%xmm10
+	movq	%r10,%rax
+.byte	102,65,15,56,223,219
+.byte	102,65,15,56,223,228
+.byte	102,65,15,56,223,237
+.byte	102,65,15,56,223,246
+.byte	102,65,15,56,223,255
+	.byte	0xf3,0xc3
+.size	__ocb_decrypt6,.-__ocb_decrypt6
+
+.type	__ocb_decrypt4,@function
+.align	32
+__ocb_decrypt4:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	pxor	%xmm15,%xmm10
+	pxor	%xmm10,%xmm11
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm5
+	movups	32(%r11),%xmm0
+
+	pxor	%xmm9,%xmm10
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+	pxor	%xmm9,%xmm13
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	48(%r11),%xmm1
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+	movups	64(%r11),%xmm0
+	jmp	.Locb_dec_loop4
+
+.align	32
+.Locb_dec_loop4:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_dec_loop4
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,65,15,56,223,210
+.byte	102,65,15,56,223,219
+.byte	102,65,15,56,223,228
+.byte	102,65,15,56,223,237
+	.byte	0xf3,0xc3
+.size	__ocb_decrypt4,.-__ocb_decrypt4
+
+.type	__ocb_decrypt1,@function
+.align	32
+__ocb_decrypt1:
+	pxor	%xmm15,%xmm7
+	pxor	%xmm9,%xmm7
+	pxor	%xmm7,%xmm2
+	movups	32(%r11),%xmm0
+
+.byte	102,15,56,222,209
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm7
+
+.byte	102,15,56,222,208
+	movups	64(%r11),%xmm0
+	jmp	.Locb_dec_loop1
+
+.align	32
+.Locb_dec_loop1:
+.byte	102,15,56,222,209
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	.Locb_dec_loop1
+
+.byte	102,15,56,222,209
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,15,56,223,215
+	.byte	0xf3,0xc3
+.size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
 .align	16
 aesni_cbc_encrypt:
+.cfi_startproc	
 	testq	%rdx,%rdx
 	jz	.Lcbc_ret
 
@@ -2666,11 +3560,13 @@ aesni_cbc_encrypt:
 	jmp	.Lcbc_ret
 .align	16
 .Lcbc_decrypt_bulk:
-	leaq	(%rsp),%rax
+	leaq	(%rsp),%r11
+.cfi_def_cfa_register	%r11
 	pushq	%rbp
+.cfi_offset	%rbp,-16
 	subq	$16,%rsp
 	andq	$-16,%rsp
-	leaq	-8(%rax),%rbp
+	movq	%rcx,%rbp
 	movups	(%r8),%xmm10
 	movl	%r10d,%eax
 	cmpq	$0x50,%rdx
@@ -2710,7 +3606,7 @@ aesni_cbc_encrypt:
 	pxor	%xmm0,%xmm3
 	movups	16-112(%rcx),%xmm1
 	pxor	%xmm0,%xmm4
-	xorq	%r11,%r11
+	movq	$-1,%rbp
 	cmpq	$0x70,%rdx
 	pxor	%xmm0,%xmm5
 	pxor	%xmm0,%xmm6
@@ -2726,10 +3622,10 @@ aesni_cbc_encrypt:
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
 .byte	102,68,15,56,222,193
-	setnc	%r11b
-	shlq	$7,%r11
+	adcq	$0,%rbp
+	andq	$128,%rbp
 .byte	102,68,15,56,222,201
-	addq	%rdi,%r11
+	addq	%rdi,%rbp
 	movups	48-112(%rcx),%xmm1
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
@@ -2867,18 +3763,18 @@ aesni_cbc_encrypt:
 	movdqu	112(%rdi),%xmm0
 .byte	102,65,15,56,223,228
 	leaq	128(%rdi),%rdi
-	movdqu	0(%r11),%xmm11
+	movdqu	0(%rbp),%xmm11
 .byte	102,65,15,56,223,237
 .byte	102,65,15,56,223,246
-	movdqu	16(%r11),%xmm12
-	movdqu	32(%r11),%xmm13
+	movdqu	16(%rbp),%xmm12
+	movdqu	32(%rbp),%xmm13
 .byte	102,65,15,56,223,255
 .byte	102,68,15,56,223,193
-	movdqu	48(%r11),%xmm14
-	movdqu	64(%r11),%xmm15
+	movdqu	48(%rbp),%xmm14
+	movdqu	64(%rbp),%xmm15
 .byte	102,69,15,56,223,202
 	movdqa	%xmm0,%xmm10
-	movdqu	80(%r11),%xmm1
+	movdqu	80(%rbp),%xmm1
 	movups	-112(%rcx),%xmm0
 
 	movups	%xmm2,(%rsi)
@@ -2997,7 +3893,7 @@ aesni_cbc_encrypt:
 	pxor	%xmm13,%xmm5
 	movdqu	%xmm4,32(%rsi)
 	pxor	%xmm14,%xmm6
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movdqu	%xmm5,48(%rsi)
 	pxor	%xmm15,%xmm7
 	movl	%r10d,%eax
@@ -3150,16 +4046,21 @@ aesni_cbc_encrypt:
 .Lcbc_dec_ret:
 	xorps	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+.cfi_restore	%rbp
+	leaq	(%r11),%rsp
+.cfi_def_cfa_register	%rsp
 .Lcbc_ret:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	aesni_cbc_encrypt,.-aesni_cbc_encrypt
 .globl	aesni_set_decrypt_key
 .type	aesni_set_decrypt_key,@function
 .align	16
 aesni_set_decrypt_key:
+.cfi_startproc	
 .byte	0x48,0x83,0xEC,0x08
+.cfi_adjust_cfa_offset	8
 	call	__aesni_set_encrypt_key
 	shll	$4,%esi
 	testl	%eax,%eax
@@ -3192,7 +4093,9 @@ aesni_set_decrypt_key:
 	pxor	%xmm0,%xmm0
 .Ldec_key_ret:
 	addq	$8,%rsp
+.cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .LSEH_end_set_decrypt_key:
 .size	aesni_set_decrypt_key,.-aesni_set_decrypt_key
 .globl	aesni_set_encrypt_key
@@ -3200,7 +4103,9 @@ aesni_set_decrypt_key:
 .align	16
 aesni_set_encrypt_key:
 __aesni_set_encrypt_key:
+.cfi_startproc	
 .byte	0x48,0x83,0xEC,0x08
+.cfi_adjust_cfa_offset	8
 	movq	$-1,%rax
 	testq	%rdi,%rdi
 	jz	.Lenc_key_ret
@@ -3493,7 +4398,9 @@ __aesni_set_encrypt_key:
 	pxor	%xmm4,%xmm4
 	pxor	%xmm5,%xmm5
 	addq	$8,%rsp
+.cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
diff --git a/lib/accelerated/x86/elf/cpuid-x86.s b/lib/accelerated/x86/elf/cpuid-x86.s
deleted file mode 100644
index 8817cd34f2..0000000000
--- a/lib/accelerated/x86/elf/cpuid-x86.s
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-# Copyright (C) 2013 Nikos Mavrogiannopoulos
-#
-# Author: Nikos Mavrogiannopoulos
-#
-# This file is part of GnuTLS.
-#
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-# *** This file is auto-generated ***
-#
-.file	"devel/perlasm/cpuid-x86.s"
-.text
-.globl	gnutls_cpuid
-.type	gnutls_cpuid,@function
-.align	16
-gnutls_cpuid:
-.L_gnutls_cpuid_begin:
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$12,%esp
-	movl	%ebx,(%esp)
-	movl	8(%ebp),%eax
-	movl	%esi,4(%esp)
-	movl	%edi,8(%esp)
-	pushl	%ebx
-	.byte	0x0f,0xa2
-	movl	%ebx,%edi
-	popl	%ebx
-	movl	%edx,%esi
-	movl	12(%ebp),%edx
-	movl	%eax,(%edx)
-	movl	16(%ebp),%eax
-	movl	%edi,(%eax)
-	movl	20(%ebp),%eax
-	movl	%ecx,(%eax)
-	movl	24(%ebp),%eax
-	movl	%esi,(%eax)
-	movl	(%esp),%ebx
-	movl	4(%esp),%esi
-	movl	8(%esp),%edi
-	movl	%ebp,%esp
-	popl	%ebp
-	ret
-.size	gnutls_cpuid,.-.L_gnutls_cpuid_begin
-.globl	gnutls_have_cpuid
-.type	gnutls_have_cpuid,@function
-.align	16
-gnutls_have_cpuid:
-.L_gnutls_have_cpuid_begin:
-	pushfl
-	popl	%eax
-	orl	$2097152,%eax
-	pushl	%eax
-	popfl
-	pushfl
-	popl	%eax
-	andl	$2097152,%eax
-	ret
-.size	gnutls_have_cpuid,.-.L_gnutls_have_cpuid_begin
-.byte	67,80,85,73,68,32,102,111,114,32,120,56,54,0
-
-.section .note.GNU-stack,"",%progbits
diff --git a/lib/accelerated/x86/elf/cpuid-x86_64.s b/lib/accelerated/x86/elf/cpuid-x86_64.s
deleted file mode 100644
index 82858b2444..0000000000
--- a/lib/accelerated/x86/elf/cpuid-x86_64.s
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-# Copyright (C) 2013 Nikos Mavrogiannopoulos
-#
-# Author: Nikos Mavrogiannopoulos
-#
-# This file is part of GnuTLS.
-#
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-# *** This file is auto-generated ***
-#
-.text	
-.globl	gnutls_cpuid
-.type	gnutls_cpuid,@function
-.align	16
-gnutls_cpuid:
-	pushq	%rbp
-	movq	%rsp,%rbp
-	pushq	%rbx
-	movl	%edi,-12(%rbp)
-	movq	%rsi,-24(%rbp)
-	movq	%rdx,-32(%rbp)
-	movq	%rcx,-40(%rbp)
-	movq	%r8,-48(%rbp)
-	movl	-12(%rbp),%eax
-	movl	%eax,-60(%rbp)
-	movl	-60(%rbp),%eax
-	cpuid
-	movl	%edx,-56(%rbp)
-	movl	%ecx,%esi
-	movl	%eax,-52(%rbp)
-	movq	-24(%rbp),%rax
-	movl	-52(%rbp),%edx
-	movl	%edx,(%rax)
-	movq	-32(%rbp),%rax
-	movl	%ebx,(%rax)
-	movq	-40(%rbp),%rax
-	movl	%esi,(%rax)
-	movq	-48(%rbp),%rax
-	movl	-56(%rbp),%ecx
-	movl	%ecx,(%rax)
-	popq	%rbx
-	leave
-	.byte	0xf3,0xc3
-.size	gnutls_cpuid,.-gnutls_cpuid
-
-
-.section .note.GNU-stack,"",%progbits
-
-
diff --git a/lib/accelerated/x86/elf/ghash-x86_64.s b/lib/accelerated/x86/elf/ghash-x86_64.s
index e2568a6fd6..1e4d18b341 100644
--- a/lib/accelerated/x86/elf/ghash-x86_64.s
+++ b/lib/accelerated/x86/elf/ghash-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,9 +44,27 @@
 .type	gcm_gmult_4bit,@function
 .align	16
 gcm_gmult_4bit:
+.cfi_startproc	
 	pushq	%rbx
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%rbx,-16
 	pushq	%rbp
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%rbp,-24
 	pushq	%r12
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r14,-48
+	pushq	%r15
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r15,-56
+	subq	$280,%rsp
+.cfi_adjust_cfa_offset	280
 .Lgmult_prologue:
 
 	movzbq	15(%rdi),%r8
@@ -123,22 +141,41 @@ gcm_gmult_4bit:
 	movq	%r8,8(%rdi)
 	movq	%r9,(%rdi)
 
-	movq	16(%rsp),%rbx
-	leaq	24(%rsp),%rsp
+	leaq	280+48(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
 .Lgmult_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	gcm_gmult_4bit,.-gcm_gmult_4bit
 .globl	gcm_ghash_4bit
 .type	gcm_ghash_4bit,@function
 .align	16
 gcm_ghash_4bit:
+.cfi_startproc	
 	pushq	%rbx
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%rbx,-16
 	pushq	%rbp
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%rbp,-24
 	pushq	%r12
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r12,-32
 	pushq	%r13
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r13,-40
 	pushq	%r14
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r14,-48
 	pushq	%r15
+.cfi_adjust_cfa_offset	8
+.cfi_offset	%r15,-56
 	subq	$280,%rsp
+.cfi_adjust_cfa_offset	280
 .Lghash_prologue:
 	movq	%rdx,%r14
 	movq	%rcx,%r15
@@ -683,21 +720,31 @@ gcm_ghash_4bit:
 	movq	%r8,8(%rdi)
 	movq	%r9,(%rdi)
 
-	leaq	280(%rsp),%rsi
-	movq	0(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
+	leaq	280+48(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	0(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
 .Lghash_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	gcm_ghash_4bit,.-gcm_ghash_4bit
 .globl	gcm_init_clmul
 .type	gcm_init_clmul,@function
 .align	16
 gcm_init_clmul:
+.cfi_startproc	
 .L_init_clmul:
 	movdqu	(%rsi),%xmm2
 	pshufd	$78,%xmm2,%xmm2
@@ -849,11 +896,13 @@ gcm_init_clmul:
 .byte	102,15,58,15,227,8
 	movdqu	%xmm4,80(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	gcm_init_clmul,.-gcm_init_clmul
 .globl	gcm_gmult_clmul
 .type	gcm_gmult_clmul,@function
 .align	16
 gcm_gmult_clmul:
+.cfi_startproc	
 .L_gmult_clmul:
 	movdqu	(%rdi),%xmm0
 	movdqa	.Lbswap_mask(%rip),%xmm5
@@ -900,11 +949,13 @@ gcm_gmult_clmul:
 .byte	102,15,56,0,197
 	movdqu	%xmm0,(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	gcm_gmult_clmul,.-gcm_gmult_clmul
 .globl	gcm_ghash_clmul
 .type	gcm_ghash_clmul,@function
 .align	32
 gcm_ghash_clmul:
+.cfi_startproc	
 .L_ghash_clmul:
 	movdqa	.Lbswap_mask(%rip),%xmm10
 
@@ -1283,11 +1334,13 @@ gcm_ghash_clmul:
 .byte	102,65,15,56,0,194
 	movdqu	%xmm0,(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	gcm_ghash_clmul,.-gcm_ghash_clmul
 .globl	gcm_init_avx
 .type	gcm_init_avx,@function
 .align	32
 gcm_init_avx:
+.cfi_startproc	
 	vzeroupper
 
 	vmovdqu	(%rsi),%xmm2
@@ -1390,17 +1443,21 @@ gcm_init_avx:
 
 	vzeroupper
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	gcm_init_avx,.-gcm_init_avx
 .globl	gcm_gmult_avx
 .type	gcm_gmult_avx,@function
 .align	32
 gcm_gmult_avx:
+.cfi_startproc	
 	jmp	.L_gmult_clmul
+.cfi_endproc	
 .size	gcm_gmult_avx,.-gcm_gmult_avx
 .globl	gcm_ghash_avx
 .type	gcm_ghash_avx,@function
 .align	32
 gcm_ghash_avx:
+.cfi_startproc	
 	vzeroupper
 
 	vmovdqu	(%rdi),%xmm10
@@ -1772,6 +1829,7 @@ gcm_ghash_avx:
 	vmovdqu	%xmm10,(%rdi)
 	vzeroupper
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	gcm_ghash_avx,.-gcm_ghash_avx
 .align	64
 .Lbswap_mask:
diff --git a/lib/accelerated/x86/elf/sha1-ssse3-x86.s b/lib/accelerated/x86/elf/sha1-ssse3-x86.s
index 7b585a0f3e..8bfbcb6b39 100644
--- a/lib/accelerated/x86/elf/sha1-ssse3-x86.s
+++ b/lib/accelerated/x86/elf/sha1-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha1-586.s"
 .text
 .globl	sha1_block_data_order
 .type	sha1_block_data_order,@function
@@ -1418,7 +1417,4 @@ sha1_block_data_order:
 .byte	89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112
 .byte	114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 
-
 .section .note.GNU-stack,"",%progbits
-
-
diff --git a/lib/accelerated/x86/elf/sha1-ssse3-x86_64.s b/lib/accelerated/x86/elf/sha1-ssse3-x86_64.s
index af40532f12..1e6546e11e 100644
--- a/lib/accelerated/x86/elf/sha1-ssse3-x86_64.s
+++ b/lib/accelerated/x86/elf/sha1-ssse3-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,25 +44,45 @@
 .type	sha1_block_data_order,@function
 .align	16
 sha1_block_data_order:
+.cfi_startproc	
 	movl	_gnutls_x86_cpuid_s+0(%rip),%r9d
 	movl	_gnutls_x86_cpuid_s+4(%rip),%r8d
+	movl	_gnutls_x86_cpuid_s+8(%rip),%r10d
 	testl	$512,%r8d
 	jz	.Lialu
+	testl	$536870912,%r10d
+	jnz	_shaext_shortcut
+	andl	$296,%r10d
+	cmpl	$296,%r10d
+	je	_avx2_shortcut
+	andl	$268435456,%r8d
+	andl	$1073741824,%r9d
+	orl	%r9d,%r8d
+	cmpl	$1342177280,%r8d
+	je	_avx_shortcut
 	jmp	_ssse3_shortcut
 
 .align	16
 .Lialu:
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
 	pushq	%rbx
+.cfi_offset	%rbx,-16
 	pushq	%rbp
+.cfi_offset	%rbp,-24
 	pushq	%r12
+.cfi_offset	%r12,-32
 	pushq	%r13
-	movq	%rsp,%r11
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
 	movq	%rdi,%r8
 	subq	$72,%rsp
 	movq	%rsi,%r9
 	andq	$-64,%rsp
 	movq	%rdx,%r10
-	movq	%r11,64(%rsp)
+	movq	%rax,64(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0xc0,0x00,0x06,0x23,0x08
 .Lprologue:
 
 	movl	0(%r8),%esi
@@ -76,1230 +96,1168 @@ sha1_block_data_order:
 .Lloop:
 	movl	0(%r9),%edx
 	bswapl	%edx
-	movl	%edx,0(%rsp)
-	movl	%r11d,%eax
 	movl	4(%r9),%ebp
+	movl	%r12d,%eax
+	movl	%edx,0(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
 	bswapl	%ebp
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%ebp,4(%rsp)
+	leal	1518500249(%rdx,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
-	movl	8(%r9),%edx
+	movl	8(%r9),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,4(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%edx,8(%rsp)
+	leal	1518500249(%rbp,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
-	movl	12(%r9),%ebp
+	movl	12(%r9),%edx
+	movl	%edi,%eax
+	movl	%r14d,8(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%ebp,12(%rsp)
+	leal	1518500249(%r14,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	16(%r9),%edx
+	movl	16(%r9),%ebp
+	movl	%esi,%eax
+	movl	%edx,12(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%edx
+	bswapl	%ebp
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%edx,16(%rsp)
+	leal	1518500249(%rdx,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	20(%r9),%ebp
+	movl	20(%r9),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,16(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%ebp
+	bswapl	%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%ebp,20(%rsp)
+	leal	1518500249(%rbp,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	%r11d,%eax
 	movl	24(%r9),%edx
+	movl	%r12d,%eax
+	movl	%r14d,20(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
 	bswapl	%edx
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%edx,24(%rsp)
+	leal	1518500249(%r14,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
 	movl	28(%r9),%ebp
+	movl	%r11d,%eax
+	movl	%edx,24(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
 	bswapl	%ebp
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%ebp,28(%rsp)
+	leal	1518500249(%rdx,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
-	movl	32(%r9),%edx
+	movl	32(%r9),%r14d
+	movl	%edi,%eax
+	movl	%ebp,28(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%edx,32(%rsp)
+	leal	1518500249(%rbp,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	36(%r9),%ebp
+	movl	36(%r9),%edx
+	movl	%esi,%eax
+	movl	%r14d,32(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%ebp,36(%rsp)
+	leal	1518500249(%r14,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	40(%r9),%edx
+	movl	40(%r9),%ebp
+	movl	%r13d,%eax
+	movl	%edx,36(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%edx
+	bswapl	%ebp
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%edx,40(%rsp)
+	leal	1518500249(%rdx,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	%r11d,%eax
-	movl	44(%r9),%ebp
+	movl	44(%r9),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,40(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
-	bswapl	%ebp
+	bswapl	%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%ebp,44(%rsp)
+	leal	1518500249(%rbp,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
 	movl	48(%r9),%edx
+	movl	%r11d,%eax
+	movl	%r14d,44(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
 	bswapl	%edx
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%edx,48(%rsp)
+	leal	1518500249(%r14,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
 	movl	52(%r9),%ebp
+	movl	%edi,%eax
+	movl	%edx,48(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
 	bswapl	%ebp
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%ebp,52(%rsp)
+	leal	1518500249(%rdx,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	56(%r9),%edx
+	movl	56(%r9),%r14d
+	movl	%esi,%eax
+	movl	%ebp,52(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%edx,56(%rsp)
+	leal	1518500249(%rbp,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	60(%r9),%ebp
+	movl	60(%r9),%edx
+	movl	%r13d,%eax
+	movl	%r14d,56(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%ebp,60(%rsp)
+	leal	1518500249(%r14,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	0(%rsp),%edx
-	movl	%r11d,%eax
+	xorl	0(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,60(%rsp)
 	movl	%esi,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	8(%rsp),%ebp
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	xorl	32(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	andl	%edi,%eax
-	leal	1518500249(%rbp,%r13,1),%r13d
-	xorl	52(%rsp),%edx
+	leal	1518500249(%rdx,%r13,1),%r13d
+	roll	$30,%edi
 	xorl	%r12d,%eax
-	roll	$1,%edx
 	addl	%ecx,%r13d
-	roll	$30,%edi
-	movl	%edx,0(%rsp)
+	roll	$1,%ebp
 	addl	%eax,%r13d
-	movl	4(%rsp),%ebp
-	movl	%edi,%eax
+	xorl	4(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,0(%rsp)
 	movl	%r13d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r11d,%eax
+	xorl	12(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	xorl	36(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	andl	%esi,%eax
-	leal	1518500249(%rdx,%r12,1),%r12d
-	xorl	56(%rsp),%ebp
+	leal	1518500249(%rbp,%r12,1),%r12d
+	roll	$30,%esi
 	xorl	%r11d,%eax
-	roll	$1,%ebp
 	addl	%ecx,%r12d
-	roll	$30,%esi
-	movl	%ebp,4(%rsp)
+	roll	$1,%r14d
 	addl	%eax,%r12d
-	movl	8(%rsp),%edx
-	movl	%esi,%eax
+	xorl	8(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,4(%rsp)
 	movl	%r12d,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
 	xorl	40(%rsp),%edx
 	andl	%r13d,%eax
-	leal	1518500249(%rbp,%r11,1),%r11d
-	xorl	60(%rsp),%edx
+	leal	1518500249(%r14,%r11,1),%r11d
+	roll	$30,%r13d
 	xorl	%edi,%eax
-	roll	$1,%edx
 	addl	%ecx,%r11d
-	roll	$30,%r13d
-	movl	%edx,8(%rsp)
+	roll	$1,%edx
 	addl	%eax,%r11d
-	movl	12(%rsp),%ebp
-	movl	%r13d,%eax
+	xorl	12(%rsp),%ebp
+	movl	%esi,%eax
+	movl	%edx,8(%rsp)
 	movl	%r11d,%ecx
 	xorl	20(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
 	xorl	44(%rsp),%ebp
 	andl	%r12d,%eax
 	leal	1518500249(%rdx,%rdi,1),%edi
-	xorl	0(%rsp),%ebp
+	roll	$30,%r12d
 	xorl	%esi,%eax
-	roll	$1,%ebp
 	addl	%ecx,%edi
-	roll	$30,%r12d
-	movl	%ebp,12(%rsp)
+	roll	$1,%ebp
 	addl	%eax,%edi
-	movl	16(%rsp),%edx
-	movl	%r12d,%eax
+	xorl	16(%rsp),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,12(%rsp)
 	movl	%edi,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	24(%rsp),%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	xorl	48(%rsp),%edx
+	xorl	48(%rsp),%r14d
 	andl	%r11d,%eax
 	leal	1518500249(%rbp,%rsi,1),%esi
-	xorl	4(%rsp),%edx
+	roll	$30,%r11d
 	xorl	%r13d,%eax
-	roll	$1,%edx
 	addl	%ecx,%esi
-	roll	$30,%r11d
-	movl	%edx,16(%rsp)
+	roll	$1,%r14d
 	addl	%eax,%esi
-	movl	20(%rsp),%ebp
-	movl	%r11d,%eax
+	xorl	20(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,16(%rsp)
 	movl	%esi,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r13,1),%r13d
-	xorl	52(%rsp),%ebp
+	xorl	28(%rsp),%edx
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	52(%rsp),%edx
+	leal	1859775393(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	8(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%ebp
-	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%edi,%eax
+	roll	$1,%edx
+	xorl	24(%rsp),%ebp
+	movl	%esi,%eax
+	movl	%edx,20(%rsp)
 	movl	%r13d,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%r12,1),%r12d
-	xorl	56(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	56(%rsp),%ebp
+	leal	1859775393(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	12(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%ebp
+	xorl	28(%rsp),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,24(%rsp)
 	movl	%r12d,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r11,1),%r11d
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%r14d
+	leal	1859775393(%rbp,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	16(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	32(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,28(%rsp)
 	movl	%r11d,%ecx
 	xorl	40(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%rdi,1),%edi
 	xorl	0(%rsp),%edx
-	xorl	%esi,%eax
+	leal	1859775393(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	20(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
 	roll	$1,%edx
+	xorl	36(%rsp),%ebp
+	movl	%r11d,%eax
 	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	44(%rsp),%ebp
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%rsi,1),%esi
 	xorl	4(%rsp),%ebp
-	xorl	%r13d,%eax
+	leal	1859775393(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	24(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
 	roll	$1,%ebp
+	xorl	40(%rsp),%r14d
+	movl	%edi,%eax
 	movl	%ebp,36(%rsp)
-	movl	40(%rsp),%edx
-	movl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	48(%rsp),%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
+	xorl	8(%rsp),%r14d
 	leal	1859775393(%rbp,%r13,1),%r13d
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	28(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%edx
-	movl	%edx,40(%rsp)
-	movl	44(%rsp),%ebp
-	movl	%edi,%eax
+	roll	$1,%r14d
+	xorl	44(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,40(%rsp)
 	movl	%r13d,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r12,1),%r12d
-	xorl	12(%rsp),%ebp
+	xorl	52(%rsp),%edx
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	12(%rsp),%edx
+	leal	1859775393(%r14,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	32(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%ebp
-	movl	%ebp,44(%rsp)
-	movl	48(%rsp),%edx
-	movl	%esi,%eax
+	roll	$1,%edx
+	xorl	48(%rsp),%ebp
+	movl	%r13d,%eax
+	movl	%edx,44(%rsp)
 	movl	%r12d,%ecx
-	xorl	56(%rsp),%edx
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%r11,1),%r11d
-	xorl	16(%rsp),%edx
+	xorl	56(%rsp),%ebp
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	16(%rsp),%ebp
+	leal	1859775393(%rdx,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	36(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,48(%rsp)
-	movl	52(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%ebp
+	xorl	52(%rsp),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,48(%rsp)
 	movl	%r11d,%ecx
-	xorl	60(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rdi,1),%edi
-	xorl	20(%rsp),%ebp
+	xorl	60(%rsp),%r14d
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	20(%rsp),%r14d
+	leal	1859775393(%rbp,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	40(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,52(%rsp)
-	movl	56(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%r14d
+	xorl	56(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,52(%rsp)
 	movl	%edi,%ecx
 	xorl	0(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%rsi,1),%esi
 	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	leal	1859775393(%r14,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	44(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
 	roll	$1,%edx
+	xorl	60(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,56(%rsp)
-	movl	60(%rsp),%ebp
-	movl	%r11d,%eax
 	movl	%esi,%ecx
 	xorl	4(%rsp),%ebp
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%r13,1),%r13d
 	xorl	28(%rsp),%ebp
-	xorl	%r12d,%eax
+	leal	1859775393(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	48(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%ebp
+	xorl	0(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,60(%rsp)
-	movl	0(%rsp),%edx
-	movl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	8(%rsp),%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
+	xorl	32(%rsp),%r14d
 	leal	1859775393(%rbp,%r12,1),%r12d
-	xorl	32(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	52(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,0(%rsp)
-	movl	4(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	4(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,0(%rsp)
 	movl	%r12d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r11,1),%r11d
-	xorl	36(%rsp),%ebp
+	xorl	12(%rsp),%edx
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	36(%rsp),%edx
+	leal	1859775393(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	56(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,4(%rsp)
-	movl	8(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%edx
+	xorl	8(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,4(%rsp)
 	movl	%r11d,%ecx
-	xorl	16(%rsp),%edx
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%rdi,1),%edi
-	xorl	40(%rsp),%edx
+	xorl	16(%rsp),%ebp
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	40(%rsp),%ebp
+	leal	1859775393(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	60(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,8(%rsp)
-	movl	12(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	12(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,8(%rsp)
 	movl	%edi,%ecx
-	xorl	20(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rsi,1),%esi
-	xorl	44(%rsp),%ebp
+	xorl	20(%rsp),%r14d
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	44(%rsp),%r14d
+	leal	1859775393(%rbp,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	0(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,12(%rsp)
-	movl	16(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%r14d
+	xorl	16(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,12(%rsp)
 	movl	%esi,%ecx
 	xorl	24(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%r13,1),%r13d
 	xorl	48(%rsp),%edx
-	xorl	%r12d,%eax
+	leal	1859775393(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	4(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%edx
+	xorl	20(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,16(%rsp)
-	movl	20(%rsp),%ebp
-	movl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	28(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%r12,1),%r12d
 	xorl	52(%rsp),%ebp
-	xorl	%r11d,%eax
+	leal	1859775393(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	8(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%ebp
+	xorl	24(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	32(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
+	xorl	56(%rsp),%r14d
 	leal	1859775393(%rbp,%r11,1),%r11d
-	xorl	56(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	12(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	28(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,24(%rsp)
 	movl	%r11d,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rdi,1),%edi
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%edx
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%edx
+	leal	1859775393(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	16(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%edx
+	xorl	32(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,28(%rsp)
 	movl	%edi,%ecx
-	xorl	40(%rsp),%edx
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%rsi,1),%esi
-	xorl	0(%rsp),%edx
+	xorl	40(%rsp),%ebp
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	0(%rsp),%ebp
+	leal	1859775393(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	20(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%edx
-	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	44(%rsp),%ebp
-	andl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	36(%rsp),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,32(%rsp)
+	movl	%r12d,%ebx
+	xorl	44(%rsp),%r14d
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	4(%rsp),%r14d
+	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	24(%rsp),%ebp
 	addl	%eax,%r13d
+	roll	$1,%r14d
 	andl	%edi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%ebp,36(%rsp)
 	addl	%ecx,%r13d
-	movl	40(%rsp),%edx
-	movl	%edi,%eax
-	movl	%edi,%ebx
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	40(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,36(%rsp)
+	movl	%r11d,%ebx
 	xorl	48(%rsp),%edx
-	andl	%r11d,%eax
+	andl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	8(%rsp),%edx
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rbp,%r12,1),%r12d
+	leal	-1894007588(%r14,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	28(%rsp),%edx
 	addl	%eax,%r12d
-	andl	%esi,%ebx
 	roll	$1,%edx
-	addl	%ebx,%r12d
+	andl	%esi,%ebx
+	addl	%ecx,%r12d
 	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	44(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,40(%rsp)
-	addl	%ecx,%r12d
-	movl	44(%rsp),%ebp
-	movl	%esi,%eax
-	movl	%esi,%ebx
+	movl	%edi,%ebx
 	xorl	52(%rsp),%ebp
-	andl	%edi,%eax
+	andl	%esi,%eax
 	movl	%r12d,%ecx
 	xorl	12(%rsp),%ebp
-	xorl	%edi,%ebx
 	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	32(%rsp),%ebp
 	addl	%eax,%r11d
-	andl	%r13d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%r11d
+	andl	%r13d,%ebx
+	addl	%ecx,%r11d
 	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	48(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,44(%rsp)
-	addl	%ecx,%r11d
-	movl	48(%rsp),%edx
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
-	xorl	56(%rsp),%edx
-	andl	%esi,%eax
+	movl	%esi,%ebx
+	xorl	56(%rsp),%r14d
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
-	xorl	16(%rsp),%edx
-	xorl	%esi,%ebx
+	xorl	16(%rsp),%r14d
 	leal	-1894007588(%rbp,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	36(%rsp),%edx
 	addl	%eax,%edi
+	roll	$1,%r14d
 	andl	%r12d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%edi
-	roll	$30,%r12d
-	movl	%edx,48(%rsp)
 	addl	%ecx,%edi
-	movl	52(%rsp),%ebp
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
-	xorl	60(%rsp),%ebp
-	andl	%r13d,%eax
+	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	52(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,48(%rsp)
+	movl	%r13d,%ebx
+	xorl	60(%rsp),%edx
+	andl	%r12d,%eax
 	movl	%edi,%ecx
-	xorl	20(%rsp),%ebp
-	xorl	%r13d,%ebx
-	leal	-1894007588(%rdx,%rsi,1),%esi
+	xorl	20(%rsp),%edx
+	leal	-1894007588(%r14,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	40(%rsp),%ebp
 	addl	%eax,%esi
+	roll	$1,%edx
 	andl	%r11d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%esi
-	roll	$30,%r11d
-	movl	%ebp,52(%rsp)
 	addl	%ecx,%esi
-	movl	56(%rsp),%edx
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	0(%rsp),%edx
-	andl	%r12d,%eax
+	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	56(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,52(%rsp)
+	movl	%r12d,%ebx
+	xorl	0(%rsp),%ebp
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	24(%rsp),%ebp
+	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	44(%rsp),%edx
 	addl	%eax,%r13d
+	roll	$1,%ebp
 	andl	%edi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%edx,56(%rsp)
 	addl	%ecx,%r13d
-	movl	60(%rsp),%ebp
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	4(%rsp),%ebp
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	60(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,56(%rsp)
+	movl	%r11d,%ebx
+	xorl	4(%rsp),%r14d
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	28(%rsp),%r14d
+	leal	-1894007588(%rbp,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	48(%rsp),%ebp
 	addl	%eax,%r12d
+	roll	$1,%r14d
 	andl	%esi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%ebp,60(%rsp)
 	addl	%ecx,%r12d
-	movl	0(%rsp),%edx
-	movl	%esi,%eax
-	movl	%esi,%ebx
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	0(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,60(%rsp)
+	movl	%edi,%ebx
 	xorl	8(%rsp),%edx
-	andl	%edi,%eax
+	andl	%esi,%eax
 	movl	%r12d,%ecx
 	xorl	32(%rsp),%edx
-	xorl	%edi,%ebx
-	leal	-1894007588(%rbp,%r11,1),%r11d
+	leal	-1894007588(%r14,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	52(%rsp),%edx
 	addl	%eax,%r11d
-	andl	%r13d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%r11d
+	andl	%r13d,%ebx
+	addl	%ecx,%r11d
 	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	4(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,0(%rsp)
-	addl	%ecx,%r11d
-	movl	4(%rsp),%ebp
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
+	movl	%esi,%ebx
 	xorl	12(%rsp),%ebp
-	andl	%esi,%eax
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
 	xorl	36(%rsp),%ebp
-	xorl	%esi,%ebx
 	leal	-1894007588(%rdx,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	56(%rsp),%ebp
 	addl	%eax,%edi
-	andl	%r12d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%edi
+	andl	%r12d,%ebx
+	addl	%ecx,%edi
 	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	8(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,4(%rsp)
-	addl	%ecx,%edi
-	movl	8(%rsp),%edx
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
-	xorl	16(%rsp),%edx
-	andl	%r13d,%eax
+	movl	%r13d,%ebx
+	xorl	16(%rsp),%r14d
+	andl	%r12d,%eax
 	movl	%edi,%ecx
-	xorl	40(%rsp),%edx
-	xorl	%r13d,%ebx
+	xorl	40(%rsp),%r14d
 	leal	-1894007588(%rbp,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	60(%rsp),%edx
 	addl	%eax,%esi
+	roll	$1,%r14d
 	andl	%r11d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%esi
-	roll	$30,%r11d
-	movl	%edx,8(%rsp)
 	addl	%ecx,%esi
-	movl	12(%rsp),%ebp
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	20(%rsp),%ebp
-	andl	%r12d,%eax
+	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	12(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,8(%rsp)
+	movl	%r12d,%ebx
+	xorl	20(%rsp),%edx
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	44(%rsp),%ebp
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	44(%rsp),%edx
+	leal	-1894007588(%r14,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	0(%rsp),%ebp
 	addl	%eax,%r13d
+	roll	$1,%edx
 	andl	%edi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%ebp,12(%rsp)
 	addl	%ecx,%r13d
-	movl	16(%rsp),%edx
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	24(%rsp),%edx
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	16(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,12(%rsp)
+	movl	%r11d,%ebx
+	xorl	24(%rsp),%ebp
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rbp,%r12,1),%r12d
+	xorl	48(%rsp),%ebp
+	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	4(%rsp),%edx
 	addl	%eax,%r12d
+	roll	$1,%ebp
 	andl	%esi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%edx,16(%rsp)
 	addl	%ecx,%r12d
-	movl	20(%rsp),%ebp
-	movl	%esi,%eax
-	movl	%esi,%ebx
-	xorl	28(%rsp),%ebp
-	andl	%edi,%eax
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	20(%rsp),%r14d
+	movl	%edi,%eax
+	movl	%ebp,16(%rsp)
+	movl	%edi,%ebx
+	xorl	28(%rsp),%r14d
+	andl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%edi,%ebx
-	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	52(%rsp),%r14d
+	leal	-1894007588(%rbp,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	8(%rsp),%ebp
 	addl	%eax,%r11d
+	roll	$1,%r14d
 	andl	%r13d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r11d
-	roll	$30,%r13d
-	movl	%ebp,20(%rsp)
 	addl	%ecx,%r11d
-	movl	24(%rsp),%edx
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
+	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	24(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,20(%rsp)
+	movl	%esi,%ebx
 	xorl	32(%rsp),%edx
-	andl	%esi,%eax
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
 	xorl	56(%rsp),%edx
-	xorl	%esi,%ebx
-	leal	-1894007588(%rbp,%rdi,1),%edi
+	leal	-1894007588(%r14,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	12(%rsp),%edx
 	addl	%eax,%edi
-	andl	%r12d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%edi
+	andl	%r12d,%ebx
+	addl	%ecx,%edi
 	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	28(%rsp),%ebp
+	movl	%r13d,%eax
 	movl	%edx,24(%rsp)
-	addl	%ecx,%edi
-	movl	28(%rsp),%ebp
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
+	movl	%r13d,%ebx
 	xorl	36(%rsp),%ebp
-	andl	%r13d,%eax
+	andl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	60(%rsp),%ebp
-	xorl	%r13d,%ebx
 	leal	-1894007588(%rdx,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	16(%rsp),%ebp
 	addl	%eax,%esi
-	andl	%r11d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%esi
+	andl	%r11d,%ebx
+	addl	%ecx,%esi
 	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	32(%rsp),%r14d
+	movl	%r12d,%eax
 	movl	%ebp,28(%rsp)
-	addl	%ecx,%esi
-	movl	32(%rsp),%edx
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	40(%rsp),%edx
-	andl	%r12d,%eax
+	movl	%r12d,%ebx
+	xorl	40(%rsp),%r14d
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	0(%rsp),%edx
-	xorl	%r12d,%ebx
+	xorl	0(%rsp),%r14d
 	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	20(%rsp),%edx
 	addl	%eax,%r13d
+	roll	$1,%r14d
 	andl	%edi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%edx,32(%rsp)
 	addl	%ecx,%r13d
-	movl	36(%rsp),%ebp
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	44(%rsp),%ebp
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	36(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,32(%rsp)
+	movl	%r11d,%ebx
+	xorl	44(%rsp),%edx
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	4(%rsp),%edx
+	leal	-1894007588(%r14,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	24(%rsp),%ebp
 	addl	%eax,%r12d
+	roll	$1,%edx
 	andl	%esi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%ebp,36(%rsp)
 	addl	%ecx,%r12d
-	movl	40(%rsp),%edx
-	movl	%esi,%eax
-	movl	%esi,%ebx
-	xorl	48(%rsp),%edx
-	andl	%edi,%eax
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	40(%rsp),%ebp
+	movl	%edi,%eax
+	movl	%edx,36(%rsp)
+	movl	%edi,%ebx
+	xorl	48(%rsp),%ebp
+	andl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%edi,%ebx
-	leal	-1894007588(%rbp,%r11,1),%r11d
+	xorl	8(%rsp),%ebp
+	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	28(%rsp),%edx
 	addl	%eax,%r11d
+	roll	$1,%ebp
 	andl	%r13d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r11d
-	roll	$30,%r13d
-	movl	%edx,40(%rsp)
 	addl	%ecx,%r11d
-	movl	44(%rsp),%ebp
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
-	xorl	52(%rsp),%ebp
-	andl	%esi,%eax
+	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	44(%rsp),%r14d
+	movl	%esi,%eax
+	movl	%ebp,40(%rsp)
+	movl	%esi,%ebx
+	xorl	52(%rsp),%r14d
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%esi,%ebx
-	leal	-1894007588(%rdx,%rdi,1),%edi
+	xorl	12(%rsp),%r14d
+	leal	-1894007588(%rbp,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	32(%rsp),%ebp
 	addl	%eax,%edi
+	roll	$1,%r14d
 	andl	%r12d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%edi
-	roll	$30,%r12d
-	movl	%ebp,44(%rsp)
 	addl	%ecx,%edi
-	movl	48(%rsp),%edx
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
+	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	48(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,44(%rsp)
+	movl	%r13d,%ebx
 	xorl	56(%rsp),%edx
-	andl	%r13d,%eax
+	andl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%r13d,%ebx
-	leal	-1894007588(%rbp,%rsi,1),%esi
+	leal	-1894007588(%r14,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	36(%rsp),%edx
 	addl	%eax,%esi
-	andl	%r11d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%esi
+	andl	%r11d,%ebx
+	addl	%ecx,%esi
 	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	52(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,48(%rsp)
-	addl	%ecx,%esi
-	movl	52(%rsp),%ebp
-	movl	%r11d,%eax
 	movl	%esi,%ecx
 	xorl	60(%rsp),%ebp
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r13,1),%r13d
 	xorl	20(%rsp),%ebp
-	xorl	%r12d,%eax
+	leal	-899497514(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	40(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%ebp
+	xorl	56(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,52(%rsp)
-	movl	56(%rsp),%edx
-	movl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	0(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	0(%rsp),%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
+	xorl	24(%rsp),%r14d
 	leal	-899497514(%rbp,%r12,1),%r12d
-	xorl	24(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	44(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,56(%rsp)
-	movl	60(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	60(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,56(%rsp)
 	movl	%r12d,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r11,1),%r11d
-	xorl	28(%rsp),%ebp
+	xorl	4(%rsp),%edx
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	28(%rsp),%edx
+	leal	-899497514(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	48(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,60(%rsp)
-	movl	0(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%edx
+	xorl	0(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,60(%rsp)
 	movl	%r11d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%rdi,1),%edi
-	xorl	32(%rsp),%edx
+	xorl	8(%rsp),%ebp
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	32(%rsp),%ebp
+	leal	-899497514(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	52(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,0(%rsp)
-	movl	4(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	4(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,0(%rsp)
 	movl	%edi,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rsi,1),%esi
-	xorl	36(%rsp),%ebp
+	xorl	12(%rsp),%r14d
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	36(%rsp),%r14d
+	leal	-899497514(%rbp,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	56(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,4(%rsp)
-	movl	8(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%r14d
+	xorl	8(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,4(%rsp)
 	movl	%esi,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r13,1),%r13d
 	xorl	40(%rsp),%edx
-	xorl	%r12d,%eax
+	leal	-899497514(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	60(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%edx
+	xorl	12(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,8(%rsp)
-	movl	12(%rsp),%ebp
-	movl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	20(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r12,1),%r12d
 	xorl	44(%rsp),%ebp
-	xorl	%r11d,%eax
+	leal	-899497514(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	0(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%ebp
+	xorl	16(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,12(%rsp)
-	movl	16(%rsp),%edx
-	movl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	24(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
+	xorl	48(%rsp),%r14d
 	leal	-899497514(%rbp,%r11,1),%r11d
-	xorl	48(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	4(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,16(%rsp)
-	movl	20(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	20(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,16(%rsp)
 	movl	%r11d,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rdi,1),%edi
-	xorl	52(%rsp),%ebp
+	xorl	28(%rsp),%edx
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	52(%rsp),%edx
+	leal	-899497514(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	8(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%edx
+	xorl	24(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,20(%rsp)
 	movl	%edi,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%rsi,1),%esi
-	xorl	56(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	56(%rsp),%ebp
+	leal	-899497514(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	12(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%r11d,%eax
+	roll	$1,%ebp
+	xorl	28(%rsp),%r14d
+	movl	%edi,%eax
+	movl	%ebp,24(%rsp)
 	movl	%esi,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r13,1),%r13d
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%r14d
+	leal	-899497514(%rbp,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	16(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%edi,%eax
+	roll	$1,%r14d
+	xorl	32(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,28(%rsp)
 	movl	%r13d,%ecx
 	xorl	40(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r12,1),%r12d
 	xorl	0(%rsp),%edx
-	xorl	%r11d,%eax
+	leal	-899497514(%r14,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	20(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%edx
-	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%esi,%eax
+	xorl	36(%rsp),%ebp
+	movl	%r13d,%eax
+
 	movl	%r12d,%ecx
 	xorl	44(%rsp),%ebp
-	xorl	%r13d,%eax
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r11,1),%r11d
 	xorl	4(%rsp),%ebp
-	xorl	%edi,%eax
+	leal	-899497514(%rdx,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	24(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
 	roll	$1,%ebp
-	movl	%ebp,36(%rsp)
-	movl	40(%rsp),%edx
-	movl	%r13d,%eax
+	xorl	40(%rsp),%r14d
+	movl	%r12d,%eax
+
 	movl	%r11d,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	48(%rsp),%r14d
+	xorl	%esi,%eax
 	roll	$5,%ecx
+	xorl	8(%rsp),%r14d
 	leal	-899497514(%rbp,%rdi,1),%edi
-	xorl	8(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	28(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,40(%rsp)
-	movl	44(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%r14d
+	xorl	44(%rsp),%edx
+	movl	%r11d,%eax
+
 	movl	%edi,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rsi,1),%esi
-	xorl	12(%rsp),%ebp
+	xorl	52(%rsp),%edx
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	12(%rsp),%edx
+	leal	-899497514(%r14,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	32(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,44(%rsp)
-	movl	48(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%edx
+	xorl	48(%rsp),%ebp
+	movl	%edi,%eax
+
 	movl	%esi,%ecx
-	xorl	56(%rsp),%edx
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%r13,1),%r13d
-	xorl	16(%rsp),%edx
+	xorl	56(%rsp),%ebp
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	16(%rsp),%ebp
+	leal	-899497514(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	36(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%edx
-	movl	%edx,48(%rsp)
-	movl	52(%rsp),%ebp
-	movl	%edi,%eax
+	roll	$1,%ebp
+	xorl	52(%rsp),%r14d
+	movl	%esi,%eax
+
 	movl	%r13d,%ecx
-	xorl	60(%rsp),%ebp
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r12,1),%r12d
-	xorl	20(%rsp),%ebp
+	xorl	60(%rsp),%r14d
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	20(%rsp),%r14d
+	leal	-899497514(%rbp,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	40(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%ebp
-	movl	56(%rsp),%edx
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	56(%rsp),%edx
+	movl	%r13d,%eax
+
 	movl	%r12d,%ecx
 	xorl	0(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r11,1),%r11d
 	xorl	24(%rsp),%edx
-	xorl	%edi,%eax
+	leal	-899497514(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	44(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
 	roll	$1,%edx
-	movl	60(%rsp),%ebp
-	movl	%r13d,%eax
+	xorl	60(%rsp),%ebp
+	movl	%r12d,%eax
+
 	movl	%r11d,%ecx
 	xorl	4(%rsp),%ebp
-	xorl	%r12d,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%rdi,1),%edi
 	xorl	28(%rsp),%ebp
-	xorl	%esi,%eax
+	leal	-899497514(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	48(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
 	roll	$1,%ebp
-	movl	%r12d,%eax
+	movl	%r11d,%eax
 	movl	%edi,%ecx
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	leal	-899497514(%rbp,%rsi,1),%esi
 	roll	$5,%ecx
-	xorl	%r13d,%eax
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
 	roll	$30,%r11d
 	addl	%eax,%esi
@@ -1319,29 +1277,218 @@ sha1_block_data_order:
 	jnz	.Lloop
 
 	movq	64(%rsp),%rsi
-	movq	(%rsi),%r13
-	movq	8(%rsi),%r12
-	movq	16(%rsi),%rbp
-	movq	24(%rsi),%rbx
-	leaq	32(%rsi),%rsp
+.cfi_def_cfa	%rsi,8
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
 .Lepilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	sha1_block_data_order,.-sha1_block_data_order
+.type	sha1_block_data_order_shaext,@function
+.align	32
+sha1_block_data_order_shaext:
+_shaext_shortcut:
+.cfi_startproc	
+	movdqu	(%rdi),%xmm0
+	movd	16(%rdi),%xmm1
+	movdqa	K_XX_XX+160(%rip),%xmm3
+
+	movdqu	(%rsi),%xmm4
+	pshufd	$27,%xmm0,%xmm0
+	movdqu	16(%rsi),%xmm5
+	pshufd	$27,%xmm1,%xmm1
+	movdqu	32(%rsi),%xmm6
+.byte	102,15,56,0,227
+	movdqu	48(%rsi),%xmm7
+.byte	102,15,56,0,235
+.byte	102,15,56,0,243
+	movdqa	%xmm1,%xmm9
+.byte	102,15,56,0,251
+	jmp	.Loop_shaext
+
+.align	16
+.Loop_shaext:
+	decq	%rdx
+	leaq	64(%rsi),%r8
+	paddd	%xmm4,%xmm1
+	cmovneq	%r8,%rsi
+	movdqa	%xmm0,%xmm8
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,0
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,0
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,1
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,1
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,2
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,2
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+	movdqu	(%rsi),%xmm4
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,3
+.byte	15,56,200,213
+	movdqu	16(%rsi),%xmm5
+.byte	102,15,56,0,227
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	15,56,200,206
+	movdqu	32(%rsi),%xmm6
+.byte	102,15,56,0,235
+
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,3
+.byte	15,56,200,215
+	movdqu	48(%rsi),%xmm7
+.byte	102,15,56,0,243
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	65,15,56,200,201
+.byte	102,15,56,0,251
+
+	paddd	%xmm8,%xmm0
+	movdqa	%xmm1,%xmm9
+
+	jnz	.Loop_shaext
+
+	pshufd	$27,%xmm0,%xmm0
+	pshufd	$27,%xmm1,%xmm1
+	movdqu	%xmm0,(%rdi)
+	movd	%xmm1,16(%rdi)
+.cfi_endproc	
+	.byte	0xf3,0xc3
+.size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
 sha1_block_data_order_ssse3:
 _ssse3_shortcut:
+.cfi_startproc	
+	movq	%rsp,%r11
+.cfi_def_cfa_register	%r11
 	pushq	%rbx
+.cfi_offset	%rbx,-16
 	pushq	%rbp
+.cfi_offset	%rbp,-24
 	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
 	leaq	-64(%rsp),%rsp
+	andq	$-64,%rsp
 	movq	%rdi,%r8
 	movq	%rsi,%r9
 	movq	%rdx,%r10
 
 	shlq	$6,%r10
 	addq	%r9,%r10
-	leaq	K_XX_XX(%rip),%r11
+	leaq	K_XX_XX+64(%rip),%r14
 
 	movl	0(%r8),%eax
 	movl	4(%r8),%ebx
@@ -1353,18 +1500,18 @@ _ssse3_shortcut:
 	xorl	%edx,%edi
 	andl	%edi,%esi
 
-	movdqa	64(%r11),%xmm6
-	movdqa	0(%r11),%xmm9
+	movdqa	64(%r14),%xmm6
+	movdqa	-64(%r14),%xmm9
 	movdqu	0(%r9),%xmm0
 	movdqu	16(%r9),%xmm1
 	movdqu	32(%r9),%xmm2
 	movdqu	48(%r9),%xmm3
 .byte	102,15,56,0,198
-	addq	$64,%r9
 .byte	102,15,56,0,206
 .byte	102,15,56,0,214
-.byte	102,15,56,0,222
+	addq	$64,%r9
 	paddd	%xmm9,%xmm0
+.byte	102,15,56,0,222
 	paddd	%xmm9,%xmm1
 	paddd	%xmm9,%xmm2
 	movdqa	%xmm0,0(%rsp)
@@ -1376,24 +1523,24 @@ _ssse3_shortcut:
 	jmp	.Loop_ssse3
 .align	16
 .Loop_ssse3:
-	movdqa	%xmm1,%xmm4
 	rorl	$2,%ebx
+	pshufd	$238,%xmm0,%xmm4
 	xorl	%edx,%esi
 	movdqa	%xmm3,%xmm8
-.byte	102,15,58,15,224,8
+	paddd	%xmm3,%xmm9
 	movl	%eax,%edi
 	addl	0(%rsp),%ebp
-	paddd	%xmm3,%xmm9
+	punpcklqdq	%xmm1,%xmm4
 	xorl	%ecx,%ebx
 	roll	$5,%eax
-	psrldq	$4,%xmm8
 	addl	%esi,%ebp
+	psrldq	$4,%xmm8
 	andl	%ebx,%edi
-	pxor	%xmm0,%xmm4
 	xorl	%ecx,%ebx
+	pxor	%xmm0,%xmm4
 	addl	%eax,%ebp
-	pxor	%xmm2,%xmm8
 	rorl	$7,%eax
+	pxor	%xmm2,%xmm8
 	xorl	%ecx,%edi
 	movl	%ebp,%esi
 	addl	4(%rsp),%edx
@@ -1404,57 +1551,57 @@ _ssse3_shortcut:
 	addl	%edi,%edx
 	andl	%eax,%esi
 	movdqa	%xmm4,%xmm10
-	movdqa	%xmm4,%xmm8
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
 	rorl	$7,%ebp
+	movdqa	%xmm4,%xmm8
 	xorl	%ebx,%esi
 	pslldq	$12,%xmm10
 	paddd	%xmm4,%xmm4
 	movl	%edx,%edi
 	addl	8(%rsp),%ecx
+	psrld	$31,%xmm8
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	psrld	$31,%xmm8
 	addl	%esi,%ecx
-	andl	%ebp,%edi
 	movdqa	%xmm10,%xmm9
+	andl	%ebp,%edi
 	xorl	%eax,%ebp
-	addl	%edx,%ecx
 	psrld	$30,%xmm10
-	por	%xmm8,%xmm4
+	addl	%edx,%ecx
 	rorl	$7,%edx
+	por	%xmm8,%xmm4
 	xorl	%eax,%edi
 	movl	%ecx,%esi
 	addl	12(%rsp),%ebx
 	pslld	$2,%xmm9
 	pxor	%xmm10,%xmm4
 	xorl	%ebp,%edx
+	movdqa	-64(%r14),%xmm10
 	roll	$5,%ecx
-	movdqa	0(%r11),%xmm10
 	addl	%edi,%ebx
 	andl	%edx,%esi
 	pxor	%xmm9,%xmm4
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
-	movdqa	%xmm2,%xmm5
 	rorl	$7,%ecx
+	pshufd	$238,%xmm1,%xmm5
 	xorl	%ebp,%esi
 	movdqa	%xmm4,%xmm9
-.byte	102,15,58,15,233,8
+	paddd	%xmm4,%xmm10
 	movl	%ebx,%edi
 	addl	16(%rsp),%eax
-	paddd	%xmm4,%xmm10
+	punpcklqdq	%xmm2,%xmm5
 	xorl	%edx,%ecx
 	roll	$5,%ebx
-	psrldq	$4,%xmm9
 	addl	%esi,%eax
+	psrldq	$4,%xmm9
 	andl	%ecx,%edi
-	pxor	%xmm1,%xmm5
 	xorl	%edx,%ecx
+	pxor	%xmm1,%xmm5
 	addl	%ebx,%eax
-	pxor	%xmm3,%xmm9
 	rorl	$7,%ebx
+	pxor	%xmm3,%xmm9
 	xorl	%edx,%edi
 	movl	%eax,%esi
 	addl	20(%rsp),%ebp
@@ -1465,57 +1612,57 @@ _ssse3_shortcut:
 	addl	%edi,%ebp
 	andl	%ebx,%esi
 	movdqa	%xmm5,%xmm8
-	movdqa	%xmm5,%xmm9
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
 	rorl	$7,%eax
+	movdqa	%xmm5,%xmm9
 	xorl	%ecx,%esi
 	pslldq	$12,%xmm8
 	paddd	%xmm5,%xmm5
 	movl	%ebp,%edi
 	addl	24(%rsp),%edx
+	psrld	$31,%xmm9
 	xorl	%ebx,%eax
 	roll	$5,%ebp
-	psrld	$31,%xmm9
 	addl	%esi,%edx
-	andl	%eax,%edi
 	movdqa	%xmm8,%xmm10
+	andl	%eax,%edi
 	xorl	%ebx,%eax
-	addl	%ebp,%edx
 	psrld	$30,%xmm8
-	por	%xmm9,%xmm5
+	addl	%ebp,%edx
 	rorl	$7,%ebp
+	por	%xmm9,%xmm5
 	xorl	%ebx,%edi
 	movl	%edx,%esi
 	addl	28(%rsp),%ecx
 	pslld	$2,%xmm10
 	pxor	%xmm8,%xmm5
 	xorl	%eax,%ebp
+	movdqa	-32(%r14),%xmm8
 	roll	$5,%edx
-	movdqa	16(%r11),%xmm8
 	addl	%edi,%ecx
 	andl	%ebp,%esi
 	pxor	%xmm10,%xmm5
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
-	movdqa	%xmm3,%xmm6
 	rorl	$7,%edx
+	pshufd	$238,%xmm2,%xmm6
 	xorl	%eax,%esi
 	movdqa	%xmm5,%xmm10
-.byte	102,15,58,15,242,8
+	paddd	%xmm5,%xmm8
 	movl	%ecx,%edi
 	addl	32(%rsp),%ebx
-	paddd	%xmm5,%xmm8
+	punpcklqdq	%xmm3,%xmm6
 	xorl	%ebp,%edx
 	roll	$5,%ecx
-	psrldq	$4,%xmm10
 	addl	%esi,%ebx
+	psrldq	$4,%xmm10
 	andl	%edx,%edi
-	pxor	%xmm2,%xmm6
 	xorl	%ebp,%edx
+	pxor	%xmm2,%xmm6
 	addl	%ecx,%ebx
-	pxor	%xmm4,%xmm10
 	rorl	$7,%ecx
+	pxor	%xmm4,%xmm10
 	xorl	%ebp,%edi
 	movl	%ebx,%esi
 	addl	36(%rsp),%eax
@@ -1526,57 +1673,57 @@ _ssse3_shortcut:
 	addl	%edi,%eax
 	andl	%ecx,%esi
 	movdqa	%xmm6,%xmm9
-	movdqa	%xmm6,%xmm10
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
 	rorl	$7,%ebx
+	movdqa	%xmm6,%xmm10
 	xorl	%edx,%esi
 	pslldq	$12,%xmm9
 	paddd	%xmm6,%xmm6
 	movl	%eax,%edi
 	addl	40(%rsp),%ebp
+	psrld	$31,%xmm10
 	xorl	%ecx,%ebx
 	roll	$5,%eax
-	psrld	$31,%xmm10
 	addl	%esi,%ebp
-	andl	%ebx,%edi
 	movdqa	%xmm9,%xmm8
+	andl	%ebx,%edi
 	xorl	%ecx,%ebx
-	addl	%eax,%ebp
 	psrld	$30,%xmm9
-	por	%xmm10,%xmm6
+	addl	%eax,%ebp
 	rorl	$7,%eax
+	por	%xmm10,%xmm6
 	xorl	%ecx,%edi
 	movl	%ebp,%esi
 	addl	44(%rsp),%edx
 	pslld	$2,%xmm8
 	pxor	%xmm9,%xmm6
 	xorl	%ebx,%eax
+	movdqa	-32(%r14),%xmm9
 	roll	$5,%ebp
-	movdqa	16(%r11),%xmm9
 	addl	%edi,%edx
 	andl	%eax,%esi
 	pxor	%xmm8,%xmm6
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
-	movdqa	%xmm4,%xmm7
 	rorl	$7,%ebp
+	pshufd	$238,%xmm3,%xmm7
 	xorl	%ebx,%esi
 	movdqa	%xmm6,%xmm8
-.byte	102,15,58,15,251,8
+	paddd	%xmm6,%xmm9
 	movl	%edx,%edi
 	addl	48(%rsp),%ecx
-	paddd	%xmm6,%xmm9
+	punpcklqdq	%xmm4,%xmm7
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	psrldq	$4,%xmm8
 	addl	%esi,%ecx
+	psrldq	$4,%xmm8
 	andl	%ebp,%edi
-	pxor	%xmm3,%xmm7
 	xorl	%eax,%ebp
+	pxor	%xmm3,%xmm7
 	addl	%edx,%ecx
-	pxor	%xmm5,%xmm8
 	rorl	$7,%edx
+	pxor	%xmm5,%xmm8
 	xorl	%eax,%edi
 	movl	%ecx,%esi
 	addl	52(%rsp),%ebx
@@ -1587,78 +1734,78 @@ _ssse3_shortcut:
 	addl	%edi,%ebx
 	andl	%edx,%esi
 	movdqa	%xmm7,%xmm10
-	movdqa	%xmm7,%xmm8
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
 	rorl	$7,%ecx
+	movdqa	%xmm7,%xmm8
 	xorl	%ebp,%esi
 	pslldq	$12,%xmm10
 	paddd	%xmm7,%xmm7
 	movl	%ebx,%edi
 	addl	56(%rsp),%eax
+	psrld	$31,%xmm8
 	xorl	%edx,%ecx
 	roll	$5,%ebx
-	psrld	$31,%xmm8
 	addl	%esi,%eax
-	andl	%ecx,%edi
 	movdqa	%xmm10,%xmm9
+	andl	%ecx,%edi
 	xorl	%edx,%ecx
-	addl	%ebx,%eax
 	psrld	$30,%xmm10
-	por	%xmm8,%xmm7
+	addl	%ebx,%eax
 	rorl	$7,%ebx
+	por	%xmm8,%xmm7
 	xorl	%edx,%edi
 	movl	%eax,%esi
 	addl	60(%rsp),%ebp
 	pslld	$2,%xmm9
 	pxor	%xmm10,%xmm7
 	xorl	%ecx,%ebx
+	movdqa	-32(%r14),%xmm10
 	roll	$5,%eax
-	movdqa	16(%r11),%xmm10
 	addl	%edi,%ebp
 	andl	%ebx,%esi
 	pxor	%xmm9,%xmm7
+	pshufd	$238,%xmm6,%xmm9
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
-	movdqa	%xmm7,%xmm9
 	rorl	$7,%eax
 	pxor	%xmm4,%xmm0
-.byte	102,68,15,58,15,206,8
 	xorl	%ecx,%esi
 	movl	%ebp,%edi
 	addl	0(%rsp),%edx
-	pxor	%xmm1,%xmm0
+	punpcklqdq	%xmm7,%xmm9
 	xorl	%ebx,%eax
 	roll	$5,%ebp
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm7,%xmm10
+	pxor	%xmm1,%xmm0
 	addl	%esi,%edx
 	andl	%eax,%edi
-	pxor	%xmm9,%xmm0
+	movdqa	%xmm10,%xmm8
 	xorl	%ebx,%eax
+	paddd	%xmm7,%xmm10
 	addl	%ebp,%edx
+	pxor	%xmm9,%xmm0
 	rorl	$7,%ebp
 	xorl	%ebx,%edi
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm10,48(%rsp)
 	movl	%edx,%esi
 	addl	4(%rsp),%ecx
+	movdqa	%xmm0,%xmm9
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	pslld	$2,%xmm0
+	movdqa	%xmm10,48(%rsp)
 	addl	%edi,%ecx
 	andl	%ebp,%esi
-	psrld	$30,%xmm9
 	xorl	%eax,%ebp
+	pslld	$2,%xmm0
 	addl	%edx,%ecx
 	rorl	$7,%edx
+	psrld	$30,%xmm9
 	xorl	%eax,%esi
 	movl	%ecx,%edi
 	addl	8(%rsp),%ebx
 	por	%xmm9,%xmm0
 	xorl	%ebp,%edx
 	roll	$5,%ecx
-	movdqa	%xmm0,%xmm10
+	pshufd	$238,%xmm7,%xmm10
 	addl	%esi,%ebx
 	andl	%edx,%edi
 	xorl	%ebp,%edx
@@ -1671,18 +1818,18 @@ _ssse3_shortcut:
 	xorl	%edx,%esi
 	rorl	$7,%ecx
 	addl	%ebx,%eax
-	addl	16(%rsp),%ebp
 	pxor	%xmm5,%xmm1
-.byte	102,68,15,58,15,215,8
+	addl	16(%rsp),%ebp
 	xorl	%ecx,%esi
+	punpcklqdq	%xmm0,%xmm10
 	movl	%eax,%edi
 	roll	$5,%eax
 	pxor	%xmm2,%xmm1
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	movdqa	%xmm8,%xmm9
-	paddd	%xmm0,%xmm8
 	rorl	$7,%ebx
+	paddd	%xmm0,%xmm8
 	addl	%eax,%ebp
 	pxor	%xmm10,%xmm1
 	addl	20(%rsp),%edx
@@ -1690,43 +1837,43 @@ _ssse3_shortcut:
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	movdqa	%xmm1,%xmm10
-	movdqa	%xmm8,0(%rsp)
 	addl	%edi,%edx
 	xorl	%ebx,%esi
+	movdqa	%xmm8,0(%rsp)
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	pslld	$2,%xmm1
 	addl	24(%rsp),%ecx
+	pslld	$2,%xmm1
 	xorl	%eax,%esi
-	psrld	$30,%xmm10
 	movl	%edx,%edi
+	psrld	$30,%xmm10
 	roll	$5,%edx
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
-	addl	%edx,%ecx
 	por	%xmm10,%xmm1
+	addl	%edx,%ecx
 	addl	28(%rsp),%ebx
+	pshufd	$238,%xmm0,%xmm8
 	xorl	%ebp,%edi
-	movdqa	%xmm1,%xmm8
 	movl	%ecx,%esi
 	roll	$5,%ecx
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
 	rorl	$7,%edx
 	addl	%ecx,%ebx
-	addl	32(%rsp),%eax
 	pxor	%xmm6,%xmm2
-.byte	102,68,15,58,15,192,8
+	addl	32(%rsp),%eax
 	xorl	%edx,%esi
+	punpcklqdq	%xmm1,%xmm8
 	movl	%ebx,%edi
 	roll	$5,%ebx
 	pxor	%xmm3,%xmm2
 	addl	%esi,%eax
 	xorl	%edx,%edi
-	movdqa	32(%r11),%xmm10
-	paddd	%xmm1,%xmm9
+	movdqa	0(%r14),%xmm10
 	rorl	$7,%ecx
+	paddd	%xmm1,%xmm9
 	addl	%ebx,%eax
 	pxor	%xmm8,%xmm2
 	addl	36(%rsp),%ebp
@@ -1734,43 +1881,43 @@ _ssse3_shortcut:
 	movl	%eax,%esi
 	roll	$5,%eax
 	movdqa	%xmm2,%xmm8
-	movdqa	%xmm9,16(%rsp)
 	addl	%edi,%ebp
 	xorl	%ecx,%esi
+	movdqa	%xmm9,16(%rsp)
 	rorl	$7,%ebx
 	addl	%eax,%ebp
-	pslld	$2,%xmm2
 	addl	40(%rsp),%edx
+	pslld	$2,%xmm2
 	xorl	%ebx,%esi
-	psrld	$30,%xmm8
 	movl	%ebp,%edi
+	psrld	$30,%xmm8
 	roll	$5,%ebp
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	rorl	$7,%eax
-	addl	%ebp,%edx
 	por	%xmm8,%xmm2
+	addl	%ebp,%edx
 	addl	44(%rsp),%ecx
+	pshufd	$238,%xmm1,%xmm9
 	xorl	%eax,%edi
-	movdqa	%xmm2,%xmm9
 	movl	%edx,%esi
 	roll	$5,%edx
 	addl	%edi,%ecx
 	xorl	%eax,%esi
 	rorl	$7,%ebp
 	addl	%edx,%ecx
-	addl	48(%rsp),%ebx
 	pxor	%xmm7,%xmm3
-.byte	102,68,15,58,15,201,8
+	addl	48(%rsp),%ebx
 	xorl	%ebp,%esi
+	punpcklqdq	%xmm2,%xmm9
 	movl	%ecx,%edi
 	roll	$5,%ecx
 	pxor	%xmm4,%xmm3
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	movdqa	%xmm10,%xmm8
-	paddd	%xmm2,%xmm10
 	rorl	$7,%edx
+	paddd	%xmm2,%xmm10
 	addl	%ecx,%ebx
 	pxor	%xmm9,%xmm3
 	addl	52(%rsp),%eax
@@ -1778,43 +1925,43 @@ _ssse3_shortcut:
 	movl	%ebx,%esi
 	roll	$5,%ebx
 	movdqa	%xmm3,%xmm9
-	movdqa	%xmm10,32(%rsp)
 	addl	%edi,%eax
 	xorl	%edx,%esi
+	movdqa	%xmm10,32(%rsp)
 	rorl	$7,%ecx
 	addl	%ebx,%eax
-	pslld	$2,%xmm3
 	addl	56(%rsp),%ebp
+	pslld	$2,%xmm3
 	xorl	%ecx,%esi
-	psrld	$30,%xmm9
 	movl	%eax,%edi
+	psrld	$30,%xmm9
 	roll	$5,%eax
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	rorl	$7,%ebx
-	addl	%eax,%ebp
 	por	%xmm9,%xmm3
+	addl	%eax,%ebp
 	addl	60(%rsp),%edx
+	pshufd	$238,%xmm2,%xmm10
 	xorl	%ebx,%edi
-	movdqa	%xmm3,%xmm10
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	addl	%edi,%edx
 	xorl	%ebx,%esi
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	addl	0(%rsp),%ecx
 	pxor	%xmm0,%xmm4
-.byte	102,68,15,58,15,210,8
+	addl	0(%rsp),%ecx
 	xorl	%eax,%esi
+	punpcklqdq	%xmm3,%xmm10
 	movl	%edx,%edi
 	roll	$5,%edx
 	pxor	%xmm5,%xmm4
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	movdqa	%xmm8,%xmm9
-	paddd	%xmm3,%xmm8
 	rorl	$7,%ebp
+	paddd	%xmm3,%xmm8
 	addl	%edx,%ecx
 	pxor	%xmm10,%xmm4
 	addl	4(%rsp),%ebx
@@ -1822,43 +1969,43 @@ _ssse3_shortcut:
 	movl	%ecx,%esi
 	roll	$5,%ecx
 	movdqa	%xmm4,%xmm10
-	movdqa	%xmm8,48(%rsp)
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
+	movdqa	%xmm8,48(%rsp)
 	rorl	$7,%edx
 	addl	%ecx,%ebx
-	pslld	$2,%xmm4
 	addl	8(%rsp),%eax
+	pslld	$2,%xmm4
 	xorl	%edx,%esi
-	psrld	$30,%xmm10
 	movl	%ebx,%edi
+	psrld	$30,%xmm10
 	roll	$5,%ebx
 	addl	%esi,%eax
 	xorl	%edx,%edi
 	rorl	$7,%ecx
-	addl	%ebx,%eax
 	por	%xmm10,%xmm4
+	addl	%ebx,%eax
 	addl	12(%rsp),%ebp
+	pshufd	$238,%xmm3,%xmm8
 	xorl	%ecx,%edi
-	movdqa	%xmm4,%xmm8
 	movl	%eax,%esi
 	roll	$5,%eax
 	addl	%edi,%ebp
 	xorl	%ecx,%esi
 	rorl	$7,%ebx
 	addl	%eax,%ebp
-	addl	16(%rsp),%edx
 	pxor	%xmm1,%xmm5
-.byte	102,68,15,58,15,195,8
+	addl	16(%rsp),%edx
 	xorl	%ebx,%esi
+	punpcklqdq	%xmm4,%xmm8
 	movl	%ebp,%edi
 	roll	$5,%ebp
 	pxor	%xmm6,%xmm5
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	movdqa	%xmm9,%xmm10
-	paddd	%xmm4,%xmm9
 	rorl	$7,%eax
+	paddd	%xmm4,%xmm9
 	addl	%ebp,%edx
 	pxor	%xmm8,%xmm5
 	addl	20(%rsp),%ecx
@@ -1866,24 +2013,24 @@ _ssse3_shortcut:
 	movl	%edx,%esi
 	roll	$5,%edx
 	movdqa	%xmm5,%xmm8
-	movdqa	%xmm9,0(%rsp)
 	addl	%edi,%ecx
 	xorl	%eax,%esi
+	movdqa	%xmm9,0(%rsp)
 	rorl	$7,%ebp
 	addl	%edx,%ecx
-	pslld	$2,%xmm5
 	addl	24(%rsp),%ebx
+	pslld	$2,%xmm5
 	xorl	%ebp,%esi
-	psrld	$30,%xmm8
 	movl	%ecx,%edi
+	psrld	$30,%xmm8
 	roll	$5,%ecx
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	rorl	$7,%edx
-	addl	%ecx,%ebx
 	por	%xmm8,%xmm5
+	addl	%ecx,%ebx
 	addl	28(%rsp),%eax
-	movdqa	%xmm5,%xmm9
+	pshufd	$238,%xmm4,%xmm9
 	rorl	$7,%ecx
 	movl	%ebx,%esi
 	xorl	%edx,%edi
@@ -1892,47 +2039,47 @@ _ssse3_shortcut:
 	xorl	%ecx,%esi
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
-	addl	32(%rsp),%ebp
 	pxor	%xmm2,%xmm6
-.byte	102,68,15,58,15,204,8
+	addl	32(%rsp),%ebp
 	andl	%ecx,%esi
 	xorl	%edx,%ecx
 	rorl	$7,%ebx
-	pxor	%xmm7,%xmm6
+	punpcklqdq	%xmm5,%xmm9
 	movl	%eax,%edi
 	xorl	%ecx,%esi
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm5,%xmm10
+	pxor	%xmm7,%xmm6
 	roll	$5,%eax
 	addl	%esi,%ebp
-	pxor	%xmm9,%xmm6
+	movdqa	%xmm10,%xmm8
 	xorl	%ebx,%edi
+	paddd	%xmm5,%xmm10
 	xorl	%ecx,%ebx
+	pxor	%xmm9,%xmm6
 	addl	%eax,%ebp
 	addl	36(%rsp),%edx
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm10,16(%rsp)
 	andl	%ebx,%edi
 	xorl	%ecx,%ebx
 	rorl	$7,%eax
+	movdqa	%xmm6,%xmm9
 	movl	%ebp,%esi
-	pslld	$2,%xmm6
 	xorl	%ebx,%edi
+	movdqa	%xmm10,16(%rsp)
 	roll	$5,%ebp
-	psrld	$30,%xmm9
 	addl	%edi,%edx
 	xorl	%eax,%esi
+	pslld	$2,%xmm6
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
+	psrld	$30,%xmm9
 	addl	40(%rsp),%ecx
 	andl	%eax,%esi
-	por	%xmm9,%xmm6
 	xorl	%ebx,%eax
+	por	%xmm9,%xmm6
 	rorl	$7,%ebp
-	movdqa	%xmm6,%xmm10
 	movl	%edx,%edi
 	xorl	%eax,%esi
 	roll	$5,%edx
+	pshufd	$238,%xmm5,%xmm10
 	addl	%esi,%ecx
 	xorl	%ebp,%edi
 	xorl	%eax,%ebp
@@ -1948,47 +2095,47 @@ _ssse3_shortcut:
 	xorl	%edx,%esi
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
-	addl	48(%rsp),%eax
 	pxor	%xmm3,%xmm7
-.byte	102,68,15,58,15,213,8
+	addl	48(%rsp),%eax
 	andl	%edx,%esi
 	xorl	%ebp,%edx
 	rorl	$7,%ecx
-	pxor	%xmm0,%xmm7
+	punpcklqdq	%xmm6,%xmm10
 	movl	%ebx,%edi
 	xorl	%edx,%esi
-	movdqa	48(%r11),%xmm9
-	paddd	%xmm6,%xmm8
+	pxor	%xmm0,%xmm7
 	roll	$5,%ebx
 	addl	%esi,%eax
-	pxor	%xmm10,%xmm7
+	movdqa	32(%r14),%xmm9
 	xorl	%ecx,%edi
+	paddd	%xmm6,%xmm8
 	xorl	%edx,%ecx
+	pxor	%xmm10,%xmm7
 	addl	%ebx,%eax
 	addl	52(%rsp),%ebp
-	movdqa	%xmm7,%xmm10
-	movdqa	%xmm8,32(%rsp)
 	andl	%ecx,%edi
 	xorl	%edx,%ecx
 	rorl	$7,%ebx
+	movdqa	%xmm7,%xmm10
 	movl	%eax,%esi
-	pslld	$2,%xmm7
 	xorl	%ecx,%edi
+	movdqa	%xmm8,32(%rsp)
 	roll	$5,%eax
-	psrld	$30,%xmm10
 	addl	%edi,%ebp
 	xorl	%ebx,%esi
+	pslld	$2,%xmm7
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
+	psrld	$30,%xmm10
 	addl	56(%rsp),%edx
 	andl	%ebx,%esi
-	por	%xmm10,%xmm7
 	xorl	%ecx,%ebx
+	por	%xmm10,%xmm7
 	rorl	$7,%eax
-	movdqa	%xmm7,%xmm8
 	movl	%ebp,%edi
 	xorl	%ebx,%esi
 	roll	$5,%ebp
+	pshufd	$238,%xmm6,%xmm8
 	addl	%esi,%edx
 	xorl	%eax,%edi
 	xorl	%ebx,%eax
@@ -2004,47 +2151,47 @@ _ssse3_shortcut:
 	xorl	%ebp,%esi
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
-	addl	0(%rsp),%ebx
 	pxor	%xmm4,%xmm0
-.byte	102,68,15,58,15,198,8
+	addl	0(%rsp),%ebx
 	andl	%ebp,%esi
 	xorl	%eax,%ebp
 	rorl	$7,%edx
-	pxor	%xmm1,%xmm0
+	punpcklqdq	%xmm7,%xmm8
 	movl	%ecx,%edi
 	xorl	%ebp,%esi
-	movdqa	%xmm9,%xmm10
-	paddd	%xmm7,%xmm9
+	pxor	%xmm1,%xmm0
 	roll	$5,%ecx
 	addl	%esi,%ebx
-	pxor	%xmm8,%xmm0
+	movdqa	%xmm9,%xmm10
 	xorl	%edx,%edi
+	paddd	%xmm7,%xmm9
 	xorl	%ebp,%edx
+	pxor	%xmm8,%xmm0
 	addl	%ecx,%ebx
 	addl	4(%rsp),%eax
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm9,48(%rsp)
 	andl	%edx,%edi
 	xorl	%ebp,%edx
 	rorl	$7,%ecx
+	movdqa	%xmm0,%xmm8
 	movl	%ebx,%esi
-	pslld	$2,%xmm0
 	xorl	%edx,%edi
+	movdqa	%xmm9,48(%rsp)
 	roll	$5,%ebx
-	psrld	$30,%xmm8
 	addl	%edi,%eax
 	xorl	%ecx,%esi
+	pslld	$2,%xmm0
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
+	psrld	$30,%xmm8
 	addl	8(%rsp),%ebp
 	andl	%ecx,%esi
-	por	%xmm8,%xmm0
 	xorl	%edx,%ecx
+	por	%xmm8,%xmm0
 	rorl	$7,%ebx
-	movdqa	%xmm0,%xmm9
 	movl	%eax,%edi
 	xorl	%ecx,%esi
 	roll	$5,%eax
+	pshufd	$238,%xmm7,%xmm9
 	addl	%esi,%ebp
 	xorl	%ebx,%edi
 	xorl	%ecx,%ebx
@@ -2060,47 +2207,47 @@ _ssse3_shortcut:
 	xorl	%eax,%esi
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
-	addl	16(%rsp),%ecx
 	pxor	%xmm5,%xmm1
-.byte	102,68,15,58,15,207,8
+	addl	16(%rsp),%ecx
 	andl	%eax,%esi
 	xorl	%ebx,%eax
 	rorl	$7,%ebp
-	pxor	%xmm2,%xmm1
+	punpcklqdq	%xmm0,%xmm9
 	movl	%edx,%edi
 	xorl	%eax,%esi
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm0,%xmm10
+	pxor	%xmm2,%xmm1
 	roll	$5,%edx
 	addl	%esi,%ecx
-	pxor	%xmm9,%xmm1
+	movdqa	%xmm10,%xmm8
 	xorl	%ebp,%edi
+	paddd	%xmm0,%xmm10
 	xorl	%eax,%ebp
+	pxor	%xmm9,%xmm1
 	addl	%edx,%ecx
 	addl	20(%rsp),%ebx
-	movdqa	%xmm1,%xmm9
-	movdqa	%xmm10,0(%rsp)
 	andl	%ebp,%edi
 	xorl	%eax,%ebp
 	rorl	$7,%edx
+	movdqa	%xmm1,%xmm9
 	movl	%ecx,%esi
-	pslld	$2,%xmm1
 	xorl	%ebp,%edi
+	movdqa	%xmm10,0(%rsp)
 	roll	$5,%ecx
-	psrld	$30,%xmm9
 	addl	%edi,%ebx
 	xorl	%edx,%esi
+	pslld	$2,%xmm1
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
+	psrld	$30,%xmm9
 	addl	24(%rsp),%eax
 	andl	%edx,%esi
-	por	%xmm9,%xmm1
 	xorl	%ebp,%edx
+	por	%xmm9,%xmm1
 	rorl	$7,%ecx
-	movdqa	%xmm1,%xmm10
 	movl	%ebx,%edi
 	xorl	%edx,%esi
 	roll	$5,%ebx
+	pshufd	$238,%xmm0,%xmm10
 	addl	%esi,%eax
 	xorl	%ecx,%edi
 	xorl	%edx,%ecx
@@ -2116,47 +2263,47 @@ _ssse3_shortcut:
 	xorl	%ebx,%esi
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
-	addl	32(%rsp),%edx
 	pxor	%xmm6,%xmm2
-.byte	102,68,15,58,15,208,8
+	addl	32(%rsp),%edx
 	andl	%ebx,%esi
 	xorl	%ecx,%ebx
 	rorl	$7,%eax
-	pxor	%xmm3,%xmm2
+	punpcklqdq	%xmm1,%xmm10
 	movl	%ebp,%edi
 	xorl	%ebx,%esi
-	movdqa	%xmm8,%xmm9
-	paddd	%xmm1,%xmm8
+	pxor	%xmm3,%xmm2
 	roll	$5,%ebp
 	addl	%esi,%edx
-	pxor	%xmm10,%xmm2
+	movdqa	%xmm8,%xmm9
 	xorl	%eax,%edi
+	paddd	%xmm1,%xmm8
 	xorl	%ebx,%eax
+	pxor	%xmm10,%xmm2
 	addl	%ebp,%edx
 	addl	36(%rsp),%ecx
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm8,16(%rsp)
 	andl	%eax,%edi
 	xorl	%ebx,%eax
 	rorl	$7,%ebp
+	movdqa	%xmm2,%xmm10
 	movl	%edx,%esi
-	pslld	$2,%xmm2
 	xorl	%eax,%edi
+	movdqa	%xmm8,16(%rsp)
 	roll	$5,%edx
-	psrld	$30,%xmm10
 	addl	%edi,%ecx
 	xorl	%ebp,%esi
+	pslld	$2,%xmm2
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
+	psrld	$30,%xmm10
 	addl	40(%rsp),%ebx
 	andl	%ebp,%esi
-	por	%xmm10,%xmm2
 	xorl	%eax,%ebp
+	por	%xmm10,%xmm2
 	rorl	$7,%edx
-	movdqa	%xmm2,%xmm8
 	movl	%ecx,%edi
 	xorl	%ebp,%esi
 	roll	$5,%ecx
+	pshufd	$238,%xmm1,%xmm8
 	addl	%esi,%ebx
 	xorl	%edx,%edi
 	xorl	%ebp,%edx
@@ -2171,18 +2318,18 @@ _ssse3_shortcut:
 	addl	%edi,%eax
 	xorl	%edx,%esi
 	addl	%ebx,%eax
-	addl	48(%rsp),%ebp
 	pxor	%xmm7,%xmm3
-.byte	102,68,15,58,15,193,8
+	addl	48(%rsp),%ebp
 	xorl	%ecx,%esi
+	punpcklqdq	%xmm2,%xmm8
 	movl	%eax,%edi
 	roll	$5,%eax
 	pxor	%xmm4,%xmm3
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	movdqa	%xmm9,%xmm10
-	paddd	%xmm2,%xmm9
 	rorl	$7,%ebx
+	paddd	%xmm2,%xmm9
 	addl	%eax,%ebp
 	pxor	%xmm8,%xmm3
 	addl	52(%rsp),%edx
@@ -2190,22 +2337,22 @@ _ssse3_shortcut:
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	movdqa	%xmm3,%xmm8
-	movdqa	%xmm9,32(%rsp)
 	addl	%edi,%edx
 	xorl	%ebx,%esi
+	movdqa	%xmm9,32(%rsp)
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	pslld	$2,%xmm3
 	addl	56(%rsp),%ecx
+	pslld	$2,%xmm3
 	xorl	%eax,%esi
-	psrld	$30,%xmm8
 	movl	%edx,%edi
+	psrld	$30,%xmm8
 	roll	$5,%edx
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
-	addl	%edx,%ecx
 	por	%xmm8,%xmm3
+	addl	%edx,%ecx
 	addl	60(%rsp),%ebx
 	xorl	%ebp,%edi
 	movl	%ecx,%esi
@@ -2215,13 +2362,13 @@ _ssse3_shortcut:
 	rorl	$7,%edx
 	addl	%ecx,%ebx
 	addl	0(%rsp),%eax
-	paddd	%xmm3,%xmm10
 	xorl	%edx,%esi
 	movl	%ebx,%edi
 	roll	$5,%ebx
+	paddd	%xmm3,%xmm10
 	addl	%esi,%eax
-	movdqa	%xmm10,48(%rsp)
 	xorl	%edx,%edi
+	movdqa	%xmm10,48(%rsp)
 	rorl	$7,%ecx
 	addl	%ebx,%eax
 	addl	4(%rsp),%ebp
@@ -2250,8 +2397,8 @@ _ssse3_shortcut:
 	addl	%edx,%ecx
 	cmpq	%r10,%r9
 	je	.Ldone_ssse3
-	movdqa	64(%r11),%xmm6
-	movdqa	0(%r11),%xmm9
+	movdqa	64(%r14),%xmm6
+	movdqa	-64(%r14),%xmm9
 	movdqu	0(%r9),%xmm0
 	movdqu	16(%r9),%xmm1
 	movdqu	32(%r9),%xmm2
@@ -2260,23 +2407,23 @@ _ssse3_shortcut:
 	addq	$64,%r9
 	addl	16(%rsp),%ebx
 	xorl	%ebp,%esi
-.byte	102,15,56,0,206
 	movl	%ecx,%edi
+.byte	102,15,56,0,206
 	roll	$5,%ecx
-	paddd	%xmm9,%xmm0
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	rorl	$7,%edx
+	paddd	%xmm9,%xmm0
 	addl	%ecx,%ebx
-	movdqa	%xmm0,0(%rsp)
 	addl	20(%rsp),%eax
 	xorl	%edx,%edi
-	psubd	%xmm9,%xmm0
 	movl	%ebx,%esi
+	movdqa	%xmm0,0(%rsp)
 	roll	$5,%ebx
 	addl	%edi,%eax
 	xorl	%edx,%esi
 	rorl	$7,%ecx
+	psubd	%xmm9,%xmm0
 	addl	%ebx,%eax
 	addl	24(%rsp),%ebp
 	xorl	%ecx,%esi
@@ -2296,23 +2443,23 @@ _ssse3_shortcut:
 	addl	%ebp,%edx
 	addl	32(%rsp),%ecx
 	xorl	%eax,%esi
-.byte	102,15,56,0,214
 	movl	%edx,%edi
+.byte	102,15,56,0,214
 	roll	$5,%edx
-	paddd	%xmm9,%xmm1
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
+	paddd	%xmm9,%xmm1
 	addl	%edx,%ecx
-	movdqa	%xmm1,16(%rsp)
 	addl	36(%rsp),%ebx
 	xorl	%ebp,%edi
-	psubd	%xmm9,%xmm1
 	movl	%ecx,%esi
+	movdqa	%xmm1,16(%rsp)
 	roll	$5,%ecx
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
 	rorl	$7,%edx
+	psubd	%xmm9,%xmm1
 	addl	%ecx,%ebx
 	addl	40(%rsp),%eax
 	xorl	%edx,%esi
@@ -2332,23 +2479,23 @@ _ssse3_shortcut:
 	addl	%eax,%ebp
 	addl	48(%rsp),%edx
 	xorl	%ebx,%esi
-.byte	102,15,56,0,222
 	movl	%ebp,%edi
+.byte	102,15,56,0,222
 	roll	$5,%ebp
-	paddd	%xmm9,%xmm2
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	rorl	$7,%eax
+	paddd	%xmm9,%xmm2
 	addl	%ebp,%edx
-	movdqa	%xmm2,32(%rsp)
 	addl	52(%rsp),%ecx
 	xorl	%eax,%edi
-	psubd	%xmm9,%xmm2
 	movl	%edx,%esi
+	movdqa	%xmm2,32(%rsp)
 	roll	$5,%edx
 	addl	%edi,%ecx
 	xorl	%eax,%esi
 	rorl	$7,%ebp
+	psubd	%xmm9,%xmm2
 	addl	%edx,%ecx
 	addl	56(%rsp),%ebx
 	xorl	%ebp,%esi
@@ -2488,25 +2635,2857 @@ _ssse3_shortcut:
 	movl	%ecx,8(%r8)
 	movl	%edx,12(%r8)
 	movl	%ebp,16(%r8)
-	leaq	64(%rsp),%rsi
-	movq	0(%rsi),%r12
-	movq	8(%rsi),%rbp
-	movq	16(%rsi),%rbx
-	leaq	24(%rsi),%rsp
+	movq	-40(%r11),%r14
+.cfi_restore	%r14
+	movq	-32(%r11),%r13
+.cfi_restore	%r13
+	movq	-24(%r11),%r12
+.cfi_restore	%r12
+	movq	-16(%r11),%rbp
+.cfi_restore	%rbp
+	movq	-8(%r11),%rbx
+.cfi_restore	%rbx
+	leaq	(%r11),%rsp
+.cfi_def_cfa_register	%rsp
 .Lepilogue_ssse3:
 	.byte	0xf3,0xc3
+.cfi_endproc	
 .size	sha1_block_data_order_ssse3,.-sha1_block_data_order_ssse3
+.type	sha1_block_data_order_avx,@function
+.align	16
+sha1_block_data_order_avx:
+_avx_shortcut:
+.cfi_startproc	
+	movq	%rsp,%r11
+.cfi_def_cfa_register	%r11
+	pushq	%rbx
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
+	leaq	-64(%rsp),%rsp
+	vzeroupper
+	andq	$-64,%rsp
+	movq	%rdi,%r8
+	movq	%rsi,%r9
+	movq	%rdx,%r10
+
+	shlq	$6,%r10
+	addq	%r9,%r10
+	leaq	K_XX_XX+64(%rip),%r14
+
+	movl	0(%r8),%eax
+	movl	4(%r8),%ebx
+	movl	8(%r8),%ecx
+	movl	12(%r8),%edx
+	movl	%ebx,%esi
+	movl	16(%r8),%ebp
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	andl	%edi,%esi
+
+	vmovdqa	64(%r14),%xmm6
+	vmovdqa	-64(%r14),%xmm11
+	vmovdqu	0(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	vpshufb	%xmm6,%xmm0,%xmm0
+	addq	$64,%r9
+	vpshufb	%xmm6,%xmm1,%xmm1
+	vpshufb	%xmm6,%xmm2,%xmm2
+	vpshufb	%xmm6,%xmm3,%xmm3
+	vpaddd	%xmm11,%xmm0,%xmm4
+	vpaddd	%xmm11,%xmm1,%xmm5
+	vpaddd	%xmm11,%xmm2,%xmm6
+	vmovdqa	%xmm4,0(%rsp)
+	vmovdqa	%xmm5,16(%rsp)
+	vmovdqa	%xmm6,32(%rsp)
+	jmp	.Loop_avx
+.align	16
+.Loop_avx:
+	shrdl	$2,%ebx,%ebx
+	xorl	%edx,%esi
+	vpalignr	$8,%xmm0,%xmm1,%xmm4
+	movl	%eax,%edi
+	addl	0(%rsp),%ebp
+	vpaddd	%xmm3,%xmm11,%xmm9
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vpsrldq	$4,%xmm3,%xmm8
+	addl	%esi,%ebp
+	andl	%ebx,%edi
+	vpxor	%xmm0,%xmm4,%xmm4
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm2,%xmm8,%xmm8
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%edi
+	movl	%ebp,%esi
+	addl	4(%rsp),%edx
+	vpxor	%xmm8,%xmm4,%xmm4
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vmovdqa	%xmm9,48(%rsp)
+	addl	%edi,%edx
+	andl	%eax,%esi
+	vpsrld	$31,%xmm4,%xmm8
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%esi
+	vpslldq	$12,%xmm4,%xmm10
+	vpaddd	%xmm4,%xmm4,%xmm4
+	movl	%edx,%edi
+	addl	8(%rsp),%ecx
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm4,%xmm4
+	addl	%esi,%ecx
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm4,%xmm4
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%edi
+	movl	%ecx,%esi
+	addl	12(%rsp),%ebx
+	vpxor	%xmm10,%xmm4,%xmm4
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	andl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%esi
+	vpalignr	$8,%xmm1,%xmm2,%xmm5
+	movl	%ebx,%edi
+	addl	16(%rsp),%eax
+	vpaddd	%xmm4,%xmm11,%xmm9
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vpsrldq	$4,%xmm4,%xmm8
+	addl	%esi,%eax
+	andl	%ecx,%edi
+	vpxor	%xmm1,%xmm5,%xmm5
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpxor	%xmm3,%xmm8,%xmm8
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%edi
+	movl	%eax,%esi
+	addl	20(%rsp),%ebp
+	vpxor	%xmm8,%xmm5,%xmm5
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%ebp
+	andl	%ebx,%esi
+	vpsrld	$31,%xmm5,%xmm8
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%esi
+	vpslldq	$12,%xmm5,%xmm10
+	vpaddd	%xmm5,%xmm5,%xmm5
+	movl	%ebp,%edi
+	addl	24(%rsp),%edx
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm5,%xmm5
+	addl	%esi,%edx
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm5,%xmm5
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%edi
+	movl	%edx,%esi
+	addl	28(%rsp),%ecx
+	vpxor	%xmm10,%xmm5,%xmm5
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vmovdqa	-32(%r14),%xmm11
+	addl	%edi,%ecx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%esi
+	vpalignr	$8,%xmm2,%xmm3,%xmm6
+	movl	%ecx,%edi
+	addl	32(%rsp),%ebx
+	vpaddd	%xmm5,%xmm11,%xmm9
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	vpsrldq	$4,%xmm5,%xmm8
+	addl	%esi,%ebx
+	andl	%edx,%edi
+	vpxor	%xmm2,%xmm6,%xmm6
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	vpxor	%xmm4,%xmm8,%xmm8
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%edi
+	movl	%ebx,%esi
+	addl	36(%rsp),%eax
+	vpxor	%xmm8,%xmm6,%xmm6
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vmovdqa	%xmm9,16(%rsp)
+	addl	%edi,%eax
+	andl	%ecx,%esi
+	vpsrld	$31,%xmm6,%xmm8
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%esi
+	vpslldq	$12,%xmm6,%xmm10
+	vpaddd	%xmm6,%xmm6,%xmm6
+	movl	%eax,%edi
+	addl	40(%rsp),%ebp
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm6,%xmm6
+	addl	%esi,%ebp
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm6,%xmm6
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%edi
+	movl	%ebp,%esi
+	addl	44(%rsp),%edx
+	vpxor	%xmm10,%xmm6,%xmm6
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	andl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%esi
+	vpalignr	$8,%xmm3,%xmm4,%xmm7
+	movl	%edx,%edi
+	addl	48(%rsp),%ecx
+	vpaddd	%xmm6,%xmm11,%xmm9
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpsrldq	$4,%xmm6,%xmm8
+	addl	%esi,%ecx
+	andl	%ebp,%edi
+	vpxor	%xmm3,%xmm7,%xmm7
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpxor	%xmm5,%xmm8,%xmm8
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%edi
+	movl	%ecx,%esi
+	addl	52(%rsp),%ebx
+	vpxor	%xmm8,%xmm7,%xmm7
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%ebx
+	andl	%edx,%esi
+	vpsrld	$31,%xmm7,%xmm8
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%esi
+	vpslldq	$12,%xmm7,%xmm10
+	vpaddd	%xmm7,%xmm7,%xmm7
+	movl	%ebx,%edi
+	addl	56(%rsp),%eax
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm7,%xmm7
+	addl	%esi,%eax
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm7,%xmm7
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%edi
+	movl	%eax,%esi
+	addl	60(%rsp),%ebp
+	vpxor	%xmm10,%xmm7,%xmm7
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	andl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	vpxor	%xmm4,%xmm0,%xmm0
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%esi
+	movl	%ebp,%edi
+	addl	0(%rsp),%edx
+	vpxor	%xmm1,%xmm0,%xmm0
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vpaddd	%xmm7,%xmm11,%xmm9
+	addl	%esi,%edx
+	andl	%eax,%edi
+	vpxor	%xmm8,%xmm0,%xmm0
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%edi
+	vpsrld	$30,%xmm0,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	movl	%edx,%esi
+	addl	4(%rsp),%ecx
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpslld	$2,%xmm0,%xmm0
+	addl	%edi,%ecx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%esi
+	movl	%ecx,%edi
+	addl	8(%rsp),%ebx
+	vpor	%xmm8,%xmm0,%xmm0
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	12(%rsp),%eax
+	xorl	%ebp,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	vpxor	%xmm5,%xmm1,%xmm1
+	addl	16(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	vpxor	%xmm2,%xmm1,%xmm1
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	vpaddd	%xmm0,%xmm11,%xmm9
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm8,%xmm1,%xmm1
+	addl	20(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm1,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm1,%xmm1
+	addl	24(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpor	%xmm8,%xmm1,%xmm1
+	addl	28(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	vpxor	%xmm6,%xmm2,%xmm2
+	addl	32(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	vpxor	%xmm3,%xmm2,%xmm2
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	vpaddd	%xmm1,%xmm11,%xmm9
+	vmovdqa	0(%r14),%xmm11
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpxor	%xmm8,%xmm2,%xmm2
+	addl	36(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	vpsrld	$30,%xmm2,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpslld	$2,%xmm2,%xmm2
+	addl	40(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpor	%xmm8,%xmm2,%xmm2
+	addl	44(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	vpxor	%xmm7,%xmm3,%xmm3
+	addl	48(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	vpxor	%xmm4,%xmm3,%xmm3
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	vpaddd	%xmm2,%xmm11,%xmm9
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpxor	%xmm8,%xmm3,%xmm3
+	addl	52(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	vpsrld	$30,%xmm3,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpslld	$2,%xmm3,%xmm3
+	addl	56(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpor	%xmm8,%xmm3,%xmm3
+	addl	60(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	vpxor	%xmm0,%xmm4,%xmm4
+	addl	0(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	vpxor	%xmm5,%xmm4,%xmm4
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	vpaddd	%xmm3,%xmm11,%xmm9
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpxor	%xmm8,%xmm4,%xmm4
+	addl	4(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	vpsrld	$30,%xmm4,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpslld	$2,%xmm4,%xmm4
+	addl	8(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpor	%xmm8,%xmm4,%xmm4
+	addl	12(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	vpxor	%xmm1,%xmm5,%xmm5
+	addl	16(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	vpxor	%xmm6,%xmm5,%xmm5
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	vpaddd	%xmm4,%xmm11,%xmm9
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpxor	%xmm8,%xmm5,%xmm5
+	addl	20(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	vpsrld	$30,%xmm5,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpslld	$2,%xmm5,%xmm5
+	addl	24(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpor	%xmm8,%xmm5,%xmm5
+	addl	28(%rsp),%eax
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%ecx,%esi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	vpxor	%xmm2,%xmm6,%xmm6
+	addl	32(%rsp),%ebp
+	andl	%ecx,%esi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%eax,%edi
+	xorl	%ecx,%esi
+	vpaddd	%xmm5,%xmm11,%xmm9
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	vpxor	%xmm8,%xmm6,%xmm6
+	xorl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	36(%rsp),%edx
+	vpsrld	$30,%xmm6,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%esi
+	vpslld	$2,%xmm6,%xmm6
+	xorl	%ebx,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	40(%rsp),%ecx
+	andl	%eax,%esi
+	vpor	%xmm8,%xmm6,%xmm6
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%edi
+	xorl	%eax,%esi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	44(%rsp),%ebx
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%esi
+	xorl	%ebp,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	vpxor	%xmm3,%xmm7,%xmm7
+	addl	48(%rsp),%eax
+	andl	%edx,%esi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	vpxor	%xmm0,%xmm7,%xmm7
+	movl	%ebx,%edi
+	xorl	%edx,%esi
+	vpaddd	%xmm6,%xmm11,%xmm9
+	vmovdqa	32(%r14),%xmm11
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	vpxor	%xmm8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	52(%rsp),%ebp
+	vpsrld	$30,%xmm7,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%esi
+	vpslld	$2,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	56(%rsp),%edx
+	andl	%ebx,%esi
+	vpor	%xmm8,%xmm7,%xmm7
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	60(%rsp),%ecx
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%esi
+	xorl	%eax,%edi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	vpxor	%xmm4,%xmm0,%xmm0
+	addl	0(%rsp),%ebx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	vpxor	%xmm1,%xmm0,%xmm0
+	movl	%ecx,%edi
+	xorl	%ebp,%esi
+	vpaddd	%xmm7,%xmm11,%xmm9
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	vpxor	%xmm8,%xmm0,%xmm0
+	xorl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	4(%rsp),%eax
+	vpsrld	$30,%xmm0,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	vpslld	$2,%xmm0,%xmm0
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%ecx,%esi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	8(%rsp),%ebp
+	andl	%ecx,%esi
+	vpor	%xmm8,%xmm0,%xmm0
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%edi
+	xorl	%ecx,%esi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	12(%rsp),%edx
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%esi
+	xorl	%ebx,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	vpxor	%xmm5,%xmm1,%xmm1
+	addl	16(%rsp),%ecx
+	andl	%eax,%esi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	vpxor	%xmm2,%xmm1,%xmm1
+	movl	%edx,%edi
+	xorl	%eax,%esi
+	vpaddd	%xmm0,%xmm11,%xmm9
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	vpxor	%xmm8,%xmm1,%xmm1
+	xorl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	20(%rsp),%ebx
+	vpsrld	$30,%xmm1,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%esi
+	vpslld	$2,%xmm1,%xmm1
+	xorl	%ebp,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	24(%rsp),%eax
+	andl	%edx,%esi
+	vpor	%xmm8,%xmm1,%xmm1
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%edi
+	xorl	%edx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	28(%rsp),%ebp
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%esi
+	xorl	%ecx,%edi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	vpxor	%xmm6,%xmm2,%xmm2
+	addl	32(%rsp),%edx
+	andl	%ebx,%esi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	vpxor	%xmm3,%xmm2,%xmm2
+	movl	%ebp,%edi
+	xorl	%ebx,%esi
+	vpaddd	%xmm1,%xmm11,%xmm9
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	vpxor	%xmm8,%xmm2,%xmm2
+	xorl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	36(%rsp),%ecx
+	vpsrld	$30,%xmm2,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%esi
+	vpslld	$2,%xmm2,%xmm2
+	xorl	%eax,%edi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	40(%rsp),%ebx
+	andl	%ebp,%esi
+	vpor	%xmm8,%xmm2,%xmm2
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%edi
+	xorl	%ebp,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	44(%rsp),%eax
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	vpxor	%xmm7,%xmm3,%xmm3
+	addl	48(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	vpxor	%xmm4,%xmm3,%xmm3
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	vpaddd	%xmm2,%xmm11,%xmm9
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm8,%xmm3,%xmm3
+	addl	52(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm3,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm3,%xmm3
+	addl	56(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpor	%xmm8,%xmm3,%xmm3
+	addl	60(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	0(%rsp),%eax
+	vpaddd	%xmm3,%xmm11,%xmm9
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	vmovdqa	%xmm9,48(%rsp)
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	4(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	8(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	12(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	cmpq	%r10,%r9
+	je	.Ldone_avx
+	vmovdqa	64(%r14),%xmm6
+	vmovdqa	-64(%r14),%xmm11
+	vmovdqu	0(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	vpshufb	%xmm6,%xmm0,%xmm0
+	addq	$64,%r9
+	addl	16(%rsp),%ebx
+	xorl	%ebp,%esi
+	vpshufb	%xmm6,%xmm1,%xmm1
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	vpaddd	%xmm11,%xmm0,%xmm4
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vmovdqa	%xmm4,0(%rsp)
+	addl	20(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	24(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	28(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	32(%rsp),%ecx
+	xorl	%eax,%esi
+	vpshufb	%xmm6,%xmm2,%xmm2
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	vpaddd	%xmm11,%xmm1,%xmm5
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vmovdqa	%xmm5,16(%rsp)
+	addl	36(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	40(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	44(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	48(%rsp),%edx
+	xorl	%ebx,%esi
+	vpshufb	%xmm6,%xmm3,%xmm3
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	vpaddd	%xmm11,%xmm2,%xmm6
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vmovdqa	%xmm6,32(%rsp)
+	addl	52(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	56(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	60(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	0(%r8),%eax
+	addl	4(%r8),%esi
+	addl	8(%r8),%ecx
+	addl	12(%r8),%edx
+	movl	%eax,0(%r8)
+	addl	16(%r8),%ebp
+	movl	%esi,4(%r8)
+	movl	%esi,%ebx
+	movl	%ecx,8(%r8)
+	movl	%ecx,%edi
+	movl	%edx,12(%r8)
+	xorl	%edx,%edi
+	movl	%ebp,16(%r8)
+	andl	%edi,%esi
+	jmp	.Loop_avx
+
+.align	16
+.Ldone_avx:
+	addl	16(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	20(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	24(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	28(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	32(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	36(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	40(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	44(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	48(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	52(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	56(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	60(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vzeroupper
+
+	addl	0(%r8),%eax
+	addl	4(%r8),%esi
+	addl	8(%r8),%ecx
+	movl	%eax,0(%r8)
+	addl	12(%r8),%edx
+	movl	%esi,4(%r8)
+	addl	16(%r8),%ebp
+	movl	%ecx,8(%r8)
+	movl	%edx,12(%r8)
+	movl	%ebp,16(%r8)
+	movq	-40(%r11),%r14
+.cfi_restore	%r14
+	movq	-32(%r11),%r13
+.cfi_restore	%r13
+	movq	-24(%r11),%r12
+.cfi_restore	%r12
+	movq	-16(%r11),%rbp
+.cfi_restore	%rbp
+	movq	-8(%r11),%rbx
+.cfi_restore	%rbx
+	leaq	(%r11),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue_avx:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	sha1_block_data_order_avx,.-sha1_block_data_order_avx
+.type	sha1_block_data_order_avx2,@function
+.align	16
+sha1_block_data_order_avx2:
+_avx2_shortcut:
+.cfi_startproc	
+	movq	%rsp,%r11
+.cfi_def_cfa_register	%r11
+	pushq	%rbx
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
+	vzeroupper
+	movq	%rdi,%r8
+	movq	%rsi,%r9
+	movq	%rdx,%r10
+
+	leaq	-640(%rsp),%rsp
+	shlq	$6,%r10
+	leaq	64(%r9),%r13
+	andq	$-128,%rsp
+	addq	%r9,%r10
+	leaq	K_XX_XX+64(%rip),%r14
+
+	movl	0(%r8),%eax
+	cmpq	%r10,%r13
+	cmovaeq	%r9,%r13
+	movl	4(%r8),%ebp
+	movl	8(%r8),%ecx
+	movl	12(%r8),%edx
+	movl	16(%r8),%esi
+	vmovdqu	64(%r14),%ymm6
+
+	vmovdqu	(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	leaq	64(%r9),%r9
+	vinserti128	$1,(%r13),%ymm0,%ymm0
+	vinserti128	$1,16(%r13),%ymm1,%ymm1
+	vpshufb	%ymm6,%ymm0,%ymm0
+	vinserti128	$1,32(%r13),%ymm2,%ymm2
+	vpshufb	%ymm6,%ymm1,%ymm1
+	vinserti128	$1,48(%r13),%ymm3,%ymm3
+	vpshufb	%ymm6,%ymm2,%ymm2
+	vmovdqu	-64(%r14),%ymm11
+	vpshufb	%ymm6,%ymm3,%ymm3
+
+	vpaddd	%ymm11,%ymm0,%ymm4
+	vpaddd	%ymm11,%ymm1,%ymm5
+	vmovdqu	%ymm4,0(%rsp)
+	vpaddd	%ymm11,%ymm2,%ymm6
+	vmovdqu	%ymm5,32(%rsp)
+	vpaddd	%ymm11,%ymm3,%ymm7
+	vmovdqu	%ymm6,64(%rsp)
+	vmovdqu	%ymm7,96(%rsp)
+	vpalignr	$8,%ymm0,%ymm1,%ymm4
+	vpsrldq	$4,%ymm3,%ymm8
+	vpxor	%ymm0,%ymm4,%ymm4
+	vpxor	%ymm2,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm4,%ymm4
+	vpsrld	$31,%ymm4,%ymm8
+	vpslldq	$12,%ymm4,%ymm10
+	vpaddd	%ymm4,%ymm4,%ymm4
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm4,%ymm4
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm4,%ymm4
+	vpxor	%ymm10,%ymm4,%ymm4
+	vpaddd	%ymm11,%ymm4,%ymm9
+	vmovdqu	%ymm9,128(%rsp)
+	vpalignr	$8,%ymm1,%ymm2,%ymm5
+	vpsrldq	$4,%ymm4,%ymm8
+	vpxor	%ymm1,%ymm5,%ymm5
+	vpxor	%ymm3,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm5,%ymm5
+	vpsrld	$31,%ymm5,%ymm8
+	vmovdqu	-32(%r14),%ymm11
+	vpslldq	$12,%ymm5,%ymm10
+	vpaddd	%ymm5,%ymm5,%ymm5
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm5,%ymm5
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm5,%ymm5
+	vpxor	%ymm10,%ymm5,%ymm5
+	vpaddd	%ymm11,%ymm5,%ymm9
+	vmovdqu	%ymm9,160(%rsp)
+	vpalignr	$8,%ymm2,%ymm3,%ymm6
+	vpsrldq	$4,%ymm5,%ymm8
+	vpxor	%ymm2,%ymm6,%ymm6
+	vpxor	%ymm4,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm6,%ymm6
+	vpsrld	$31,%ymm6,%ymm8
+	vpslldq	$12,%ymm6,%ymm10
+	vpaddd	%ymm6,%ymm6,%ymm6
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm6,%ymm6
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm6,%ymm6
+	vpxor	%ymm10,%ymm6,%ymm6
+	vpaddd	%ymm11,%ymm6,%ymm9
+	vmovdqu	%ymm9,192(%rsp)
+	vpalignr	$8,%ymm3,%ymm4,%ymm7
+	vpsrldq	$4,%ymm6,%ymm8
+	vpxor	%ymm3,%ymm7,%ymm7
+	vpxor	%ymm5,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm7,%ymm7
+	vpsrld	$31,%ymm7,%ymm8
+	vpslldq	$12,%ymm7,%ymm10
+	vpaddd	%ymm7,%ymm7,%ymm7
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm7,%ymm7
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm7,%ymm7
+	vpxor	%ymm10,%ymm7,%ymm7
+	vpaddd	%ymm11,%ymm7,%ymm9
+	vmovdqu	%ymm9,224(%rsp)
+	leaq	128(%rsp),%r13
+	jmp	.Loop_avx2
+.align	32
+.Loop_avx2:
+	rorxl	$2,%ebp,%ebx
+	andnl	%edx,%ebp,%edi
+	andl	%ecx,%ebp
+	xorl	%edi,%ebp
+	jmp	.Lalign32_1
+.align	32
+.Lalign32_1:
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	vpxor	%ymm4,%ymm0,%ymm0
+	addl	-128(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	vpxor	%ymm1,%ymm0,%ymm0
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpxor	%ymm8,%ymm0,%ymm0
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	vpsrld	$30,%ymm0,%ymm8
+	vpslld	$2,%ymm0,%ymm0
+	addl	-124(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	vpor	%ymm8,%ymm0,%ymm0
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-120(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	vpaddd	%ymm11,%ymm0,%ymm9
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	vmovdqu	%ymm9,256(%rsp)
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-116(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-96(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	vpxor	%ymm5,%ymm1,%ymm1
+	addl	-92(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	vpxor	%ymm2,%ymm1,%ymm1
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	vpxor	%ymm8,%ymm1,%ymm1
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	vpsrld	$30,%ymm1,%ymm8
+	vpslld	$2,%ymm1,%ymm1
+	addl	-88(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	vpor	%ymm8,%ymm1,%ymm1
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-84(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	vmovdqu	%ymm9,288(%rsp)
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-64(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-60(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	vpxor	%ymm6,%ymm2,%ymm2
+	addl	-56(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	vpxor	%ymm3,%ymm2,%ymm2
+	vmovdqu	0(%r14),%ymm11
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpxor	%ymm8,%ymm2,%ymm2
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	vpsrld	$30,%ymm2,%ymm8
+	vpslld	$2,%ymm2,%ymm2
+	addl	-52(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	vpor	%ymm8,%ymm2,%ymm2
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-32(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	vpaddd	%ymm11,%ymm2,%ymm9
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	vmovdqu	%ymm9,320(%rsp)
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-28(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-24(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	vpxor	%ymm7,%ymm3,%ymm3
+	addl	-20(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	vpxor	%ymm4,%ymm3,%ymm3
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpxor	%ymm8,%ymm3,%ymm3
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	vpsrld	$30,%ymm3,%ymm8
+	vpslld	$2,%ymm3,%ymm3
+	addl	0(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	vpor	%ymm8,%ymm3,%ymm3
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	4(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	vpaddd	%ymm11,%ymm3,%ymm9
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	vmovdqu	%ymm9,352(%rsp)
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	8(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	12(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vpalignr	$8,%ymm2,%ymm3,%ymm8
+	vpxor	%ymm0,%ymm4,%ymm4
+	addl	32(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpxor	%ymm8,%ymm4,%ymm4
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	36(%r13),%ebx
+	vpsrld	$30,%ymm4,%ymm8
+	vpslld	$2,%ymm4,%ymm4
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vpor	%ymm8,%ymm4,%ymm4
+	addl	40(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpaddd	%ymm11,%ymm4,%ymm9
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	44(%r13),%eax
+	vmovdqu	%ymm9,384(%rsp)
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpalignr	$8,%ymm3,%ymm4,%ymm8
+	vpxor	%ymm1,%ymm5,%ymm5
+	addl	68(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm6,%ymm5,%ymm5
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	vpxor	%ymm8,%ymm5,%ymm5
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	72(%r13),%ecx
+	vpsrld	$30,%ymm5,%ymm8
+	vpslld	$2,%ymm5,%ymm5
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	vpor	%ymm8,%ymm5,%ymm5
+	addl	76(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpaddd	%ymm11,%ymm5,%ymm9
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	96(%r13),%ebp
+	vmovdqu	%ymm9,416(%rsp)
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	100(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpalignr	$8,%ymm4,%ymm5,%ymm8
+	vpxor	%ymm2,%ymm6,%ymm6
+	addl	104(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpxor	%ymm7,%ymm6,%ymm6
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	vpxor	%ymm8,%ymm6,%ymm6
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	108(%r13),%edx
+	leaq	256(%r13),%r13
+	vpsrld	$30,%ymm6,%ymm8
+	vpslld	$2,%ymm6,%ymm6
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vpor	%ymm8,%ymm6,%ymm6
+	addl	-128(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpaddd	%ymm11,%ymm6,%ymm9
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-124(%r13),%ebx
+	vmovdqu	%ymm9,448(%rsp)
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-120(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpalignr	$8,%ymm5,%ymm6,%ymm8
+	vpxor	%ymm3,%ymm7,%ymm7
+	addl	-116(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	vpxor	%ymm0,%ymm7,%ymm7
+	vmovdqu	32(%r14),%ymm11
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	vpxor	%ymm8,%ymm7,%ymm7
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-96(%r13),%esi
+	vpsrld	$30,%ymm7,%ymm8
+	vpslld	$2,%ymm7,%ymm7
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpor	%ymm8,%ymm7,%ymm7
+	addl	-92(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpaddd	%ymm11,%ymm7,%ymm9
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-88(%r13),%ecx
+	vmovdqu	%ymm9,480(%rsp)
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-84(%r13),%ebx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	jmp	.Lalign32_2
+.align	32
+.Lalign32_2:
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	vpxor	%ymm4,%ymm0,%ymm0
+	addl	-64(%r13),%ebp
+	xorl	%esi,%ecx
+	vpxor	%ymm1,%ymm0,%ymm0
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	vpxor	%ymm8,%ymm0,%ymm0
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	vpsrld	$30,%ymm0,%ymm8
+	vpslld	$2,%ymm0,%ymm0
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-60(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	vpor	%ymm8,%ymm0,%ymm0
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	vpaddd	%ymm11,%ymm0,%ymm9
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	-56(%r13),%esi
+	xorl	%ecx,%ebp
+	vmovdqu	%ymm9,512(%rsp)
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	-52(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	-32(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	vpxor	%ymm5,%ymm1,%ymm1
+	addl	-28(%r13),%ebx
+	xorl	%eax,%edx
+	vpxor	%ymm2,%ymm1,%ymm1
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	vpxor	%ymm8,%ymm1,%ymm1
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vpsrld	$30,%ymm1,%ymm8
+	vpslld	$2,%ymm1,%ymm1
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	-24(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	vpor	%ymm8,%ymm1,%ymm1
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-20(%r13),%eax
+	xorl	%edx,%ebx
+	vmovdqu	%ymm9,544(%rsp)
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	0(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	4(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	vpxor	%ymm6,%ymm2,%ymm2
+	addl	8(%r13),%ecx
+	xorl	%ebp,%esi
+	vpxor	%ymm3,%ymm2,%ymm2
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	vpxor	%ymm8,%ymm2,%ymm2
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpsrld	$30,%ymm2,%ymm8
+	vpslld	$2,%ymm2,%ymm2
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	12(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	vpor	%ymm8,%ymm2,%ymm2
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vpaddd	%ymm11,%ymm2,%ymm9
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	32(%r13),%ebp
+	xorl	%esi,%ecx
+	vmovdqu	%ymm9,576(%rsp)
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	36(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	40(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	vpxor	%ymm7,%ymm3,%ymm3
+	addl	44(%r13),%edx
+	xorl	%ebx,%eax
+	vpxor	%ymm4,%ymm3,%ymm3
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm8,%ymm3,%ymm3
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	vpsrld	$30,%ymm3,%ymm8
+	vpslld	$2,%ymm3,%ymm3
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	64(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	vpor	%ymm8,%ymm3,%ymm3
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpaddd	%ymm11,%ymm3,%ymm9
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	68(%r13),%ebx
+	xorl	%eax,%edx
+	vmovdqu	%ymm9,608(%rsp)
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	72(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	76(%r13),%eax
+	xorl	%edx,%ebx
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	100(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	104(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	108(%r13),%ebx
+	leaq	256(%r13),%r13
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-128(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-124(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-120(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-116(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-96(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-92(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-88(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-84(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-60(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-56(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-52(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-32(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-28(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-24(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-20(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	addl	%r12d,%edx
+	leaq	128(%r9),%r13
+	leaq	128(%r9),%rdi
+	cmpq	%r10,%r13
+	cmovaeq	%r9,%r13
+
+
+	addl	0(%r8),%edx
+	addl	4(%r8),%esi
+	addl	8(%r8),%ebp
+	movl	%edx,0(%r8)
+	addl	12(%r8),%ebx
+	movl	%esi,4(%r8)
+	movl	%edx,%eax
+	addl	16(%r8),%ecx
+	movl	%ebp,%r12d
+	movl	%ebp,8(%r8)
+	movl	%ebx,%edx
+
+	movl	%ebx,12(%r8)
+	movl	%esi,%ebp
+	movl	%ecx,16(%r8)
+
+	movl	%ecx,%esi
+	movl	%r12d,%ecx
+
+
+	cmpq	%r10,%r9
+	je	.Ldone_avx2
+	vmovdqu	64(%r14),%ymm6
+	cmpq	%r10,%rdi
+	ja	.Last_avx2
+
+	vmovdqu	-64(%rdi),%xmm0
+	vmovdqu	-48(%rdi),%xmm1
+	vmovdqu	-32(%rdi),%xmm2
+	vmovdqu	-16(%rdi),%xmm3
+	vinserti128	$1,0(%r13),%ymm0,%ymm0
+	vinserti128	$1,16(%r13),%ymm1,%ymm1
+	vinserti128	$1,32(%r13),%ymm2,%ymm2
+	vinserti128	$1,48(%r13),%ymm3,%ymm3
+	jmp	.Last_avx2
+
+.align	32
+.Last_avx2:
+	leaq	128+16(%rsp),%r13
+	rorxl	$2,%ebp,%ebx
+	andnl	%edx,%ebp,%edi
+	andl	%ecx,%ebp
+	xorl	%edi,%ebp
+	subq	$-128,%r9
+	addl	-128(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-124(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-120(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-116(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-96(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	-92(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-88(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-84(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-64(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-60(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-56(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	-52(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-32(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-28(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-24(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-20(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	0(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	4(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	8(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	12(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	32(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	36(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	40(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	44(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vmovdqu	-64(%r14),%ymm11
+	vpshufb	%ymm6,%ymm0,%ymm0
+	addl	68(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	72(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	76(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	96(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	100(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpshufb	%ymm6,%ymm1,%ymm1
+	vpaddd	%ymm11,%ymm0,%ymm8
+	addl	104(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	108(%r13),%edx
+	leaq	256(%r13),%r13
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-128(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-124(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-120(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vmovdqu	%ymm8,0(%rsp)
+	vpshufb	%ymm6,%ymm2,%ymm2
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	-116(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-92(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-88(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-84(%r13),%ebx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	vmovdqu	%ymm9,32(%rsp)
+	vpshufb	%ymm6,%ymm3,%ymm3
+	vpaddd	%ymm11,%ymm2,%ymm6
+	addl	-64(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-60(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	-56(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	-52(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	-32(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	jmp	.Lalign32_3
+.align	32
+.Lalign32_3:
+	vmovdqu	%ymm6,64(%rsp)
+	vpaddd	%ymm11,%ymm3,%ymm7
+	addl	-28(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	-24(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-20(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	0(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	4(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	vmovdqu	%ymm7,96(%rsp)
+	addl	8(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	12(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	32(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	36(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	40(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	vpalignr	$8,%ymm0,%ymm1,%ymm4
+	addl	44(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	vpsrldq	$4,%ymm3,%ymm8
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpxor	%ymm0,%ymm4,%ymm4
+	vpxor	%ymm2,%ymm8,%ymm8
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpxor	%ymm8,%ymm4,%ymm4
+	andl	%edi,%esi
+	addl	64(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	vpsrld	$31,%ymm4,%ymm8
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	vpslldq	$12,%ymm4,%ymm10
+	vpaddd	%ymm4,%ymm4,%ymm4
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm4,%ymm4
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm4,%ymm4
+	addl	68(%r13),%ebx
+	xorl	%eax,%edx
+	vpxor	%ymm10,%ymm4,%ymm4
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	vpaddd	%ymm11,%ymm4,%ymm9
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vmovdqu	%ymm9,128(%rsp)
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	72(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	76(%r13),%eax
+	xorl	%edx,%ebx
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpalignr	$8,%ymm1,%ymm2,%ymm5
+	addl	96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpsrldq	$4,%ymm4,%ymm8
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpxor	%ymm1,%ymm5,%ymm5
+	vpxor	%ymm3,%ymm8,%ymm8
+	addl	100(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm8,%ymm5,%ymm5
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpsrld	$31,%ymm5,%ymm8
+	vmovdqu	-32(%r14),%ymm11
+	xorl	%ebx,%esi
+	addl	104(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	vpslldq	$12,%ymm5,%ymm10
+	vpaddd	%ymm5,%ymm5,%ymm5
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm5,%ymm5
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm5,%ymm5
+	xorl	%ebp,%edx
+	addl	108(%r13),%ebx
+	leaq	256(%r13),%r13
+	vpxor	%ymm10,%ymm5,%ymm5
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpaddd	%ymm11,%ymm5,%ymm9
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vmovdqu	%ymm9,160(%rsp)
+	addl	-128(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpalignr	$8,%ymm2,%ymm3,%ymm6
+	addl	-124(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	vpsrldq	$4,%ymm5,%ymm8
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpxor	%ymm2,%ymm6,%ymm6
+	vpxor	%ymm4,%ymm8,%ymm8
+	addl	-120(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpxor	%ymm8,%ymm6,%ymm6
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	vpsrld	$31,%ymm6,%ymm8
+	xorl	%ecx,%eax
+	addl	-116(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpslldq	$12,%ymm6,%ymm10
+	vpaddd	%ymm6,%ymm6,%ymm6
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm6,%ymm6
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm6,%ymm6
+	xorl	%ebx,%esi
+	addl	-96(%r13),%ecx
+	vpxor	%ymm10,%ymm6,%ymm6
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpaddd	%ymm11,%ymm6,%ymm9
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	vmovdqu	%ymm9,192(%rsp)
+	addl	-92(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vpalignr	$8,%ymm3,%ymm4,%ymm7
+	addl	-88(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpsrldq	$4,%ymm6,%ymm8
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpxor	%ymm3,%ymm7,%ymm7
+	vpxor	%ymm5,%ymm8,%ymm8
+	addl	-84(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	vpxor	%ymm8,%ymm7,%ymm7
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	vpsrld	$31,%ymm7,%ymm8
+	xorl	%edx,%ebp
+	addl	-64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpslldq	$12,%ymm7,%ymm10
+	vpaddd	%ymm7,%ymm7,%ymm7
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm7,%ymm7
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm7,%ymm7
+	xorl	%ecx,%eax
+	addl	-60(%r13),%edx
+	vpxor	%ymm10,%ymm7,%ymm7
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpaddd	%ymm11,%ymm7,%ymm9
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vmovdqu	%ymm9,224(%rsp)
+	addl	-56(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-52(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-32(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-28(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-24(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-20(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	addl	%r12d,%edx
+	leaq	128(%rsp),%r13
+
+
+	addl	0(%r8),%edx
+	addl	4(%r8),%esi
+	addl	8(%r8),%ebp
+	movl	%edx,0(%r8)
+	addl	12(%r8),%ebx
+	movl	%esi,4(%r8)
+	movl	%edx,%eax
+	addl	16(%r8),%ecx
+	movl	%ebp,%r12d
+	movl	%ebp,8(%r8)
+	movl	%ebx,%edx
+
+	movl	%ebx,12(%r8)
+	movl	%esi,%ebp
+	movl	%ecx,16(%r8)
+
+	movl	%ecx,%esi
+	movl	%r12d,%ecx
+
+
+	cmpq	%r10,%r9
+	jbe	.Loop_avx2
+
+.Ldone_avx2:
+	vzeroupper
+	movq	-40(%r11),%r14
+.cfi_restore	%r14
+	movq	-32(%r11),%r13
+.cfi_restore	%r13
+	movq	-24(%r11),%r12
+.cfi_restore	%r12
+	movq	-16(%r11),%rbp
+.cfi_restore	%rbp
+	movq	-8(%r11),%rbx
+.cfi_restore	%rbx
+	leaq	(%r11),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue_avx2:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	sha1_block_data_order_avx2,.-sha1_block_data_order_avx2
 .align	64
 K_XX_XX:
-.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999	
-.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1	
-.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc	
-.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6	
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f	
+.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999
+.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999
+.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1
+.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1
+.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc
+.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc
+.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6
+.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.byte	0xf,0xe,0xd,0xc,0xb,0xa,0x9,0x8,0x7,0x6,0x5,0x4,0x3,0x2,0x1,0x0
 .byte	83,72,65,49,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .align	64
 
-
 .section .note.GNU-stack,"",%progbits
-
-
diff --git a/lib/accelerated/x86/elf/sha256-ssse3-x86.s b/lib/accelerated/x86/elf/sha256-ssse3-x86.s
index 7470ef7407..8d9aaa4a81 100644
--- a/lib/accelerated/x86/elf/sha256-ssse3-x86.s
+++ b/lib/accelerated/x86/elf/sha256-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha512-586.s"
 .text
 .globl	sha256_block_data_order
 .type	sha256_block_data_order,@function
@@ -64,20 +63,6 @@ sha256_block_data_order:
 	movl	%edi,4(%esp)
 	movl	%eax,8(%esp)
 	movl	%ebx,12(%esp)
-	leal	_gnutls_x86_cpuid_s-.L001K256(%ebp),%edx
-	movl	(%edx),%ecx
-	movl	4(%edx),%edx
-	testl	$1048576,%ecx
-	jnz	.L002loop
-	testl	$2048,%edx
-	andl	$1073741824,%ecx
-	andl	$268435456,%edx
-	orl	%edx,%ecx
-	cmpl	$1342177280,%ecx
-	je	.L003loop_shrd
-	subl	%edi,%eax
-	cmpl	$256,%eax
-	jae	.L004unrolled
 	jmp	.L002loop
 .align	16
 .L002loop:
@@ -149,7 +134,7 @@ sha256_block_data_order:
 	movl	%ecx,28(%esp)
 	movl	%edi,32(%esp)
 .align	16
-.L00500_15:
+.L00300_15:
 	movl	%edx,%ecx
 	movl	24(%esp),%esi
 	rorl	$14,%ecx
@@ -187,11 +172,11 @@ sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3248222580,%esi
-	jne	.L00500_15
+	jne	.L00300_15
 	movl	156(%esp),%ecx
-	jmp	.L00616_63
+	jmp	.L00416_63
 .align	16
-.L00616_63:
+.L00416_63:
 	movl	%ecx,%ebx
 	movl	104(%esp),%esi
 	rorl	$11,%ecx
@@ -246,7 +231,7 @@ sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3329325298,%esi
-	jne	.L00616_63
+	jne	.L00416_63
 	movl	356(%esp),%esi
 	movl	8(%esp),%ebx
 	movl	16(%esp),%ecx
@@ -280,8 +265,8 @@ sha256_block_data_order:
 	popl	%ebx
 	popl	%ebp
 	ret
-.align	16
-.L003loop_shrd:
+.align	32
+.L005loop_shrd:
 	movl	(%edi),%eax
 	movl	4(%edi),%ebx
 	movl	8(%edi),%ecx
@@ -350,7 +335,7 @@ sha256_block_data_order:
 	movl	%ecx,28(%esp)
 	movl	%edi,32(%esp)
 .align	16
-.L00700_15_shrd:
+.L00600_15_shrd:
 	movl	%edx,%ecx
 	movl	24(%esp),%esi
 	shrdl	$14,%ecx,%ecx
@@ -388,11 +373,11 @@ sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3248222580,%esi
-	jne	.L00700_15_shrd
+	jne	.L00600_15_shrd
 	movl	156(%esp),%ecx
-	jmp	.L00816_63_shrd
+	jmp	.L00716_63_shrd
 .align	16
-.L00816_63_shrd:
+.L00716_63_shrd:
 	movl	%ecx,%ebx
 	movl	104(%esp),%esi
 	shrdl	$11,%ecx,%ecx
@@ -447,7 +432,7 @@ sha256_block_data_order:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3329325298,%esi
-	jne	.L00816_63_shrd
+	jne	.L00716_63_shrd
 	movl	356(%esp),%esi
 	movl	8(%esp),%ebx
 	movl	16(%esp),%ecx
@@ -474,7 +459,7 @@ sha256_block_data_order:
 	leal	356(%esp),%esp
 	subl	$256,%ebp
 	cmpl	8(%esp),%edi
-	jb	.L003loop_shrd
+	jb	.L005loop_shrd
 	movl	12(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -485,8 +470,13 @@ sha256_block_data_order:
 .L001K256:
 .long	1116352408,1899447441,3049323471,3921009573,961987163,1508970993,2453635748,2870763221,3624381080,310598401,607225278,1426881987,1925078388,2162078206,2614888103,3248222580,3835390401,4022224774,264347078,604807628,770255983,1249150122,1555081692,1996064986,2554220882,2821834349,2952996808,3210313671,3336571891,3584528711,113926993,338241895,666307205,773529912,1294757372,1396182291,1695183700,1986661051,2177026350,2456956037,2730485921,2820302411,3259730800,3345764771,3516065817,3600352804,4094571909,275423344,430227734,506948616,659060556,883997877,958139571,1322822218,1537002063,1747873779,1955562222,2024104815,2227730452,2361852424,2428436474,2756734187,3204031479,3329325298
 .long	66051,67438087,134810123,202182159
+.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97
+.byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
+.byte	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
+.byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
+.byte	62,0
 .align	16
-.L004unrolled:
+.L008unrolled:
 	leal	-96(%esp),%esp
 	movl	(%esi),%eax
 	movl	4(%esi),%ebp
@@ -3393,14 +3383,5 @@ sha256_block_data_order:
 	popl	%ebp
 	ret
 .size	sha256_block_data_order,.-.L_sha256_block_data_order_begin
-.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97
-.byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
-.byte	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
-.byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
-.byte	62,0
-.comm	_gnutls_x86_cpuid_s,16,4
-
 
 .section .note.GNU-stack,"",%progbits
-
-
diff --git a/lib/accelerated/x86/elf/sha256-ssse3-x86_64.s b/lib/accelerated/x86/elf/sha256-ssse3-x86_64.s
new file mode 100644
index 0000000000..4b08e0c85e
--- /dev/null
+++ b/lib/accelerated/x86/elf/sha256-ssse3-x86_64.s
@@ -0,0 +1,5471 @@
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+#     * Redistributions of source code must retain copyright notices,
+#      this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+#     * Neither the name of the Andy Polyakov nor the names of its
+#      copyright holder and contributors may be used to endorse or
+#      promote products derived from this software without specific
+#      prior written permission.
+#
+# ALTERNATIVELY, provided that this notice is retained in full, this
+# product may be distributed under the terms of the GNU General Public
+# License (GPL), in which case the provisions of the GPL apply INSTEAD OF
+# those given above.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# *** This file is auto-generated ***
+#
+.text	
+
+
+.globl	sha256_block_data_order
+.type	sha256_block_data_order,@function
+.align	16
+sha256_block_data_order:
+.cfi_startproc	
+	leaq	_gnutls_x86_cpuid_s(%rip),%r11
+	movl	0(%r11),%r9d
+	movl	4(%r11),%r10d
+	movl	8(%r11),%r11d
+	testl	$536870912,%r11d
+	jnz	_shaext_shortcut
+	andl	$296,%r11d
+	cmpl	$296,%r11d
+	je	.Lavx2_shortcut
+	andl	$1073741824,%r9d
+	andl	$268435968,%r10d
+	orl	%r9d,%r10d
+	cmpl	$1342177792,%r10d
+	je	.Lavx_shortcut
+	testl	$512,%r10d
+	jnz	.Lssse3_shortcut
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
+	pushq	%rbx
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
+	pushq	%r15
+.cfi_offset	%r15,-56
+	shlq	$4,%rdx
+	subq	$64+32,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+.Lprologue:
+
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	jmp	.Lloop
+
+.align	16
+.Lloop:
+	movl	%ebx,%edi
+	leaq	K256(%rip),%rbp
+	xorl	%ecx,%edi
+	movl	0(%rsi),%r12d
+	movl	%r8d,%r13d
+	movl	%eax,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,0(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r11d
+	movl	4(%rsi),%r12d
+	movl	%edx,%r13d
+	movl	%r11d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,4(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r10d
+	movl	8(%rsi),%r12d
+	movl	%ecx,%r13d
+	movl	%r10d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,8(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r9d
+	movl	12(%rsi),%r12d
+	movl	%ebx,%r13d
+	movl	%r9d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,12(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%r8d
+	movl	16(%rsi),%r12d
+	movl	%eax,%r13d
+	movl	%r8d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,16(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%edx
+	movl	20(%rsi),%r12d
+	movl	%r11d,%r13d
+	movl	%edx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,20(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ecx
+	movl	24(%rsi),%r12d
+	movl	%r10d,%r13d
+	movl	%ecx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,24(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ebx
+	movl	28(%rsi),%r12d
+	movl	%r9d,%r13d
+	movl	%ebx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,28(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%eax
+	movl	32(%rsi),%r12d
+	movl	%r8d,%r13d
+	movl	%eax,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,32(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r11d
+	movl	36(%rsi),%r12d
+	movl	%edx,%r13d
+	movl	%r11d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,36(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r10d
+	movl	40(%rsi),%r12d
+	movl	%ecx,%r13d
+	movl	%r10d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,40(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r9d
+	movl	44(%rsi),%r12d
+	movl	%ebx,%r13d
+	movl	%r9d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,44(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%r8d
+	movl	48(%rsi),%r12d
+	movl	%eax,%r13d
+	movl	%r8d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,48(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%edx
+	movl	52(%rsi),%r12d
+	movl	%r11d,%r13d
+	movl	%edx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,52(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ecx
+	movl	56(%rsi),%r12d
+	movl	%r10d,%r13d
+	movl	%ecx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,56(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ebx
+	movl	60(%rsi),%r12d
+	movl	%r9d,%r13d
+	movl	%ebx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,60(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	jmp	.Lrounds_16_xx
+.align	16
+.Lrounds_16_xx:
+	movl	4(%rsp),%r13d
+	movl	56(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%eax
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	36(%rsp),%r12d
+
+	addl	0(%rsp),%r12d
+	movl	%r8d,%r13d
+	addl	%r15d,%r12d
+	movl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,0(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	movl	8(%rsp),%r13d
+	movl	60(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r11d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	40(%rsp),%r12d
+
+	addl	4(%rsp),%r12d
+	movl	%edx,%r13d
+	addl	%edi,%r12d
+	movl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,4(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	movl	12(%rsp),%r13d
+	movl	0(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r10d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	44(%rsp),%r12d
+
+	addl	8(%rsp),%r12d
+	movl	%ecx,%r13d
+	addl	%r15d,%r12d
+	movl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,8(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	movl	16(%rsp),%r13d
+	movl	4(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r9d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	48(%rsp),%r12d
+
+	addl	12(%rsp),%r12d
+	movl	%ebx,%r13d
+	addl	%edi,%r12d
+	movl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,12(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	movl	20(%rsp),%r13d
+	movl	8(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r8d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	52(%rsp),%r12d
+
+	addl	16(%rsp),%r12d
+	movl	%eax,%r13d
+	addl	%r15d,%r12d
+	movl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,16(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	movl	24(%rsp),%r13d
+	movl	12(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%edx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	56(%rsp),%r12d
+
+	addl	20(%rsp),%r12d
+	movl	%r11d,%r13d
+	addl	%edi,%r12d
+	movl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,20(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	movl	28(%rsp),%r13d
+	movl	16(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ecx
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	60(%rsp),%r12d
+
+	addl	24(%rsp),%r12d
+	movl	%r10d,%r13d
+	addl	%r15d,%r12d
+	movl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,24(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	movl	32(%rsp),%r13d
+	movl	20(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ebx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	0(%rsp),%r12d
+
+	addl	28(%rsp),%r12d
+	movl	%r9d,%r13d
+	addl	%edi,%r12d
+	movl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,28(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	movl	36(%rsp),%r13d
+	movl	24(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%eax
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	4(%rsp),%r12d
+
+	addl	32(%rsp),%r12d
+	movl	%r8d,%r13d
+	addl	%r15d,%r12d
+	movl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,32(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	movl	40(%rsp),%r13d
+	movl	28(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r11d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	8(%rsp),%r12d
+
+	addl	36(%rsp),%r12d
+	movl	%edx,%r13d
+	addl	%edi,%r12d
+	movl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,36(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	movl	44(%rsp),%r13d
+	movl	32(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r10d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	12(%rsp),%r12d
+
+	addl	40(%rsp),%r12d
+	movl	%ecx,%r13d
+	addl	%r15d,%r12d
+	movl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,40(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	movl	48(%rsp),%r13d
+	movl	36(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r9d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	16(%rsp),%r12d
+
+	addl	44(%rsp),%r12d
+	movl	%ebx,%r13d
+	addl	%edi,%r12d
+	movl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,44(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	movl	52(%rsp),%r13d
+	movl	40(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r8d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	20(%rsp),%r12d
+
+	addl	48(%rsp),%r12d
+	movl	%eax,%r13d
+	addl	%r15d,%r12d
+	movl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,48(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	movl	56(%rsp),%r13d
+	movl	44(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%edx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	24(%rsp),%r12d
+
+	addl	52(%rsp),%r12d
+	movl	%r11d,%r13d
+	addl	%edi,%r12d
+	movl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,52(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	movl	60(%rsp),%r13d
+	movl	48(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ecx
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	28(%rsp),%r12d
+
+	addl	56(%rsp),%r12d
+	movl	%r10d,%r13d
+	addl	%r15d,%r12d
+	movl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,56(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	movl	0(%rsp),%r13d
+	movl	52(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ebx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	32(%rsp),%r12d
+
+	addl	60(%rsp),%r12d
+	movl	%r9d,%r13d
+	addl	%edi,%r12d
+	movl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,60(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	cmpb	$0,3(%rbp)
+	jnz	.Lrounds_16_xx
+
+	movq	64+0(%rsp),%rdi
+	addl	%r14d,%eax
+	leaq	64(%rsi),%rsi
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	.Lloop
+
+	movq	88(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	sha256_block_data_order,.-sha256_block_data_order
+.align	64
+.type	K256,@object
+K256:
+.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
+.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
+.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
+.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
+.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
+.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
+.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
+.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
+.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
+.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
+.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
+.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
+.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
+.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
+.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
+.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
+.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
+.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
+.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
+.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
+.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
+.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
+.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
+.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
+.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
+.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
+.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
+.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
+.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
+.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
+.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
+.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
+.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
+.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
+.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
+.type	sha256_block_data_order_shaext,@function
+.align	64
+sha256_block_data_order_shaext:
+_shaext_shortcut:
+	leaq	K256+128(%rip),%rcx
+	movdqu	(%rdi),%xmm1
+	movdqu	16(%rdi),%xmm2
+	movdqa	512-128(%rcx),%xmm7
+
+	pshufd	$0x1b,%xmm1,%xmm0
+	pshufd	$0xb1,%xmm1,%xmm1
+	pshufd	$0x1b,%xmm2,%xmm2
+	movdqa	%xmm7,%xmm8
+.byte	102,15,58,15,202,8
+	punpcklqdq	%xmm0,%xmm2
+	jmp	.Loop_shaext
+
+.align	16
+.Loop_shaext:
+	movdqu	(%rsi),%xmm3
+	movdqu	16(%rsi),%xmm4
+	movdqu	32(%rsi),%xmm5
+.byte	102,15,56,0,223
+	movdqu	48(%rsi),%xmm6
+
+	movdqa	0-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	102,15,56,0,231
+	movdqa	%xmm2,%xmm10
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	nop
+	movdqa	%xmm1,%xmm9
+.byte	15,56,203,202
+
+	movdqa	32-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	102,15,56,0,239
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	leaq	64(%rsi),%rsi
+.byte	15,56,204,220
+.byte	15,56,203,202
+
+	movdqa	64-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	102,15,56,0,247
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+
+	movdqa	96-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	128-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	160-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+	nop
+	paddd	%xmm7,%xmm6
+.byte	15,56,204,220
+.byte	15,56,203,202
+	movdqa	192-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,205,245
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+	movdqa	224-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	256-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	288-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+	nop
+	paddd	%xmm7,%xmm6
+.byte	15,56,204,220
+.byte	15,56,203,202
+	movdqa	320-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,205,245
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+	movdqa	352-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	384-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	416-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+.byte	15,56,203,202
+	paddd	%xmm7,%xmm6
+
+	movdqa	448-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+.byte	15,56,205,245
+	movdqa	%xmm8,%xmm7
+.byte	15,56,203,202
+
+	movdqa	480-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+	nop
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	decq	%rdx
+	nop
+.byte	15,56,203,202
+
+	paddd	%xmm10,%xmm2
+	paddd	%xmm9,%xmm1
+	jnz	.Loop_shaext
+
+	pshufd	$0xb1,%xmm2,%xmm2
+	pshufd	$0x1b,%xmm1,%xmm7
+	pshufd	$0xb1,%xmm1,%xmm1
+	punpckhqdq	%xmm2,%xmm1
+.byte	102,15,58,15,215,8
+
+	movdqu	%xmm1,(%rdi)
+	movdqu	%xmm2,16(%rdi)
+	.byte	0xf3,0xc3
+.size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
+.type	sha256_block_data_order_ssse3,@function
+.align	64
+sha256_block_data_order_ssse3:
+.cfi_startproc	
+.Lssse3_shortcut:
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
+	pushq	%rbx
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
+	pushq	%r15
+.cfi_offset	%r15,-56
+	shlq	$4,%rdx
+	subq	$96,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+.Lprologue_ssse3:
+
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+
+
+	jmp	.Lloop_ssse3
+.align	16
+.Lloop_ssse3:
+	movdqa	K256+512(%rip),%xmm7
+	movdqu	0(%rsi),%xmm0
+	movdqu	16(%rsi),%xmm1
+	movdqu	32(%rsi),%xmm2
+.byte	102,15,56,0,199
+	movdqu	48(%rsi),%xmm3
+	leaq	K256(%rip),%rbp
+.byte	102,15,56,0,207
+	movdqa	0(%rbp),%xmm4
+	movdqa	32(%rbp),%xmm5
+.byte	102,15,56,0,215
+	paddd	%xmm0,%xmm4
+	movdqa	64(%rbp),%xmm6
+.byte	102,15,56,0,223
+	movdqa	96(%rbp),%xmm7
+	paddd	%xmm1,%xmm5
+	paddd	%xmm2,%xmm6
+	paddd	%xmm3,%xmm7
+	movdqa	%xmm4,0(%rsp)
+	movl	%eax,%r14d
+	movdqa	%xmm5,16(%rsp)
+	movl	%ebx,%edi
+	movdqa	%xmm6,32(%rsp)
+	xorl	%ecx,%edi
+	movdqa	%xmm7,48(%rsp)
+	movl	%r8d,%r13d
+	jmp	.Lssse3_00_47
+
+.align	16
+.Lssse3_00_47:
+	subq	$-128,%rbp
+	rorl	$14,%r13d
+	movdqa	%xmm1,%xmm4
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	movdqa	%xmm3,%xmm7
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+.byte	102,15,58,15,224,4
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+.byte	102,15,58,15,250,4
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	paddd	%xmm7,%xmm0
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	psrld	$7,%xmm6
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	pshufd	$250,%xmm3,%xmm7
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%r11d,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	pslld	$11,%xmm5
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	paddd	%xmm4,%xmm0
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	psrlq	$17,%xmm6
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	psrldq	$8,%xmm7
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm0
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	pshufd	$80,%xmm0,%xmm7
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	psrld	$10,%xmm7
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	psrlq	$2,%xmm6
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	pxor	%xmm6,%xmm7
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	movdqa	0(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	paddd	%xmm7,%xmm0
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	paddd	%xmm0,%xmm6
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	movdqa	%xmm6,0(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm2,%xmm4
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	movdqa	%xmm0,%xmm7
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+.byte	102,15,58,15,225,4
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+.byte	102,15,58,15,251,4
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	paddd	%xmm7,%xmm1
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	psrld	$7,%xmm6
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	pshufd	$250,%xmm0,%xmm7
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%edx,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	pslld	$11,%xmm5
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	paddd	%xmm4,%xmm1
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	psrlq	$17,%xmm6
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	psrldq	$8,%xmm7
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm1
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	pshufd	$80,%xmm1,%xmm7
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	psrld	$10,%xmm7
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	psrlq	$2,%xmm6
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	pxor	%xmm6,%xmm7
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	movdqa	32(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	paddd	%xmm7,%xmm1
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	paddd	%xmm1,%xmm6
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movdqa	%xmm6,16(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm3,%xmm4
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	movdqa	%xmm1,%xmm7
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+.byte	102,15,58,15,226,4
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+.byte	102,15,58,15,248,4
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	paddd	%xmm7,%xmm2
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	psrld	$7,%xmm6
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	pshufd	$250,%xmm1,%xmm7
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%r11d,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	pslld	$11,%xmm5
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	paddd	%xmm4,%xmm2
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	psrlq	$17,%xmm6
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	psrldq	$8,%xmm7
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm2
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	pshufd	$80,%xmm2,%xmm7
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	psrld	$10,%xmm7
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	psrlq	$2,%xmm6
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	pxor	%xmm6,%xmm7
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	movdqa	64(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	paddd	%xmm7,%xmm2
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	paddd	%xmm2,%xmm6
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	movdqa	%xmm6,32(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm0,%xmm4
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	movdqa	%xmm2,%xmm7
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+.byte	102,15,58,15,227,4
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+.byte	102,15,58,15,249,4
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	paddd	%xmm7,%xmm3
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	psrld	$7,%xmm6
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	pshufd	$250,%xmm2,%xmm7
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%edx,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	pslld	$11,%xmm5
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	paddd	%xmm4,%xmm3
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	psrlq	$17,%xmm6
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	psrldq	$8,%xmm7
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm3
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	pshufd	$80,%xmm3,%xmm7
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	psrld	$10,%xmm7
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	psrlq	$2,%xmm6
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	pxor	%xmm6,%xmm7
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	movdqa	96(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	paddd	%xmm7,%xmm3
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	paddd	%xmm3,%xmm6
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movdqa	%xmm6,48(%rsp)
+	cmpb	$0,131(%rbp)
+	jne	.Lssse3_00_47
+	rorl	$14,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movq	64+0(%rsp),%rdi
+	movl	%r14d,%eax
+
+	addl	0(%rdi),%eax
+	leaq	64(%rsi),%rsi
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	.Lloop_ssse3
+
+	movq	88(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue_ssse3:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	sha256_block_data_order_ssse3,.-sha256_block_data_order_ssse3
+.type	sha256_block_data_order_avx,@function
+.align	64
+sha256_block_data_order_avx:
+.cfi_startproc	
+.Lavx_shortcut:
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
+	pushq	%rbx
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
+	pushq	%r15
+.cfi_offset	%r15,-56
+	shlq	$4,%rdx
+	subq	$96,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+.Lprologue_avx:
+
+	vzeroupper
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	vmovdqa	K256+512+32(%rip),%xmm8
+	vmovdqa	K256+512+64(%rip),%xmm9
+	jmp	.Lloop_avx
+.align	16
+.Lloop_avx:
+	vmovdqa	K256+512(%rip),%xmm7
+	vmovdqu	0(%rsi),%xmm0
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm7,%xmm0,%xmm0
+	leaq	K256(%rip),%rbp
+	vpshufb	%xmm7,%xmm1,%xmm1
+	vpshufb	%xmm7,%xmm2,%xmm2
+	vpaddd	0(%rbp),%xmm0,%xmm4
+	vpshufb	%xmm7,%xmm3,%xmm3
+	vpaddd	32(%rbp),%xmm1,%xmm5
+	vpaddd	64(%rbp),%xmm2,%xmm6
+	vpaddd	96(%rbp),%xmm3,%xmm7
+	vmovdqa	%xmm4,0(%rsp)
+	movl	%eax,%r14d
+	vmovdqa	%xmm5,16(%rsp)
+	movl	%ebx,%edi
+	vmovdqa	%xmm6,32(%rsp)
+	xorl	%ecx,%edi
+	vmovdqa	%xmm7,48(%rsp)
+	movl	%r8d,%r13d
+	jmp	.Lavx_00_47
+
+.align	16
+.Lavx_00_47:
+	subq	$-128,%rbp
+	vpalignr	$4,%xmm0,%xmm1,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	vpalignr	$4,%xmm2,%xmm3,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	vpaddd	%xmm7,%xmm0,%xmm0
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	vpshufd	$250,%xmm3,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	vpaddd	%xmm4,%xmm0,%xmm0
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	vpaddd	%xmm6,%xmm0,%xmm0
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	vpshufd	$80,%xmm0,%xmm7
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	vpaddd	%xmm6,%xmm0,%xmm0
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	vpaddd	0(%rbp),%xmm0,%xmm6
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	vmovdqa	%xmm6,0(%rsp)
+	vpalignr	$4,%xmm1,%xmm2,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	vpalignr	$4,%xmm3,%xmm0,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	vpaddd	%xmm7,%xmm1,%xmm1
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	vpshufd	$250,%xmm0,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	vpaddd	%xmm4,%xmm1,%xmm1
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	vpaddd	%xmm6,%xmm1,%xmm1
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	vpshufd	$80,%xmm1,%xmm7
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	vpaddd	%xmm6,%xmm1,%xmm1
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	vpaddd	32(%rbp),%xmm1,%xmm6
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	vmovdqa	%xmm6,16(%rsp)
+	vpalignr	$4,%xmm2,%xmm3,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	vpalignr	$4,%xmm0,%xmm1,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	vpaddd	%xmm7,%xmm2,%xmm2
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	vpshufd	$250,%xmm1,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	vpaddd	%xmm4,%xmm2,%xmm2
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	vpaddd	%xmm6,%xmm2,%xmm2
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	vpshufd	$80,%xmm2,%xmm7
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	vpaddd	%xmm6,%xmm2,%xmm2
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	vpaddd	64(%rbp),%xmm2,%xmm6
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	vmovdqa	%xmm6,32(%rsp)
+	vpalignr	$4,%xmm3,%xmm0,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	vpalignr	$4,%xmm1,%xmm2,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	vpaddd	%xmm7,%xmm3,%xmm3
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	vpshufd	$250,%xmm2,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	vpaddd	%xmm4,%xmm3,%xmm3
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	vpaddd	%xmm6,%xmm3,%xmm3
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	vpshufd	$80,%xmm3,%xmm7
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	vpaddd	%xmm6,%xmm3,%xmm3
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	vpaddd	96(%rbp),%xmm3,%xmm6
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	vmovdqa	%xmm6,48(%rsp)
+	cmpb	$0,131(%rbp)
+	jne	.Lavx_00_47
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movq	64+0(%rsp),%rdi
+	movl	%r14d,%eax
+
+	addl	0(%rdi),%eax
+	leaq	64(%rsi),%rsi
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	.Lloop_avx
+
+	movq	88(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	vzeroupper
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue_avx:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	sha256_block_data_order_avx,.-sha256_block_data_order_avx
+.type	sha256_block_data_order_avx2,@function
+.align	64
+sha256_block_data_order_avx2:
+.cfi_startproc	
+.Lavx2_shortcut:
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
+	pushq	%rbx
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
+	pushq	%r15
+.cfi_offset	%r15,-56
+	subq	$544,%rsp
+	shlq	$4,%rdx
+	andq	$-1024,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	addq	$448,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+.Lprologue_avx2:
+
+	vzeroupper
+	subq	$-64,%rsi
+	movl	0(%rdi),%eax
+	movq	%rsi,%r12
+	movl	4(%rdi),%ebx
+	cmpq	%rdx,%rsi
+	movl	8(%rdi),%ecx
+	cmoveq	%rsp,%r12
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	vmovdqa	K256+512+32(%rip),%ymm8
+	vmovdqa	K256+512+64(%rip),%ymm9
+	jmp	.Loop_avx2
+.align	16
+.Loop_avx2:
+	vmovdqa	K256+512(%rip),%ymm7
+	vmovdqu	-64+0(%rsi),%xmm0
+	vmovdqu	-64+16(%rsi),%xmm1
+	vmovdqu	-64+32(%rsi),%xmm2
+	vmovdqu	-64+48(%rsi),%xmm3
+
+	vinserti128	$1,(%r12),%ymm0,%ymm0
+	vinserti128	$1,16(%r12),%ymm1,%ymm1
+	vpshufb	%ymm7,%ymm0,%ymm0
+	vinserti128	$1,32(%r12),%ymm2,%ymm2
+	vpshufb	%ymm7,%ymm1,%ymm1
+	vinserti128	$1,48(%r12),%ymm3,%ymm3
+
+	leaq	K256(%rip),%rbp
+	vpshufb	%ymm7,%ymm2,%ymm2
+	vpaddd	0(%rbp),%ymm0,%ymm4
+	vpshufb	%ymm7,%ymm3,%ymm3
+	vpaddd	32(%rbp),%ymm1,%ymm5
+	vpaddd	64(%rbp),%ymm2,%ymm6
+	vpaddd	96(%rbp),%ymm3,%ymm7
+	vmovdqa	%ymm4,0(%rsp)
+	xorl	%r14d,%r14d
+	vmovdqa	%ymm5,32(%rsp)
+	leaq	-64(%rsp),%rsp
+	movl	%ebx,%edi
+	vmovdqa	%ymm6,0(%rsp)
+	xorl	%ecx,%edi
+	vmovdqa	%ymm7,32(%rsp)
+	movl	%r9d,%r12d
+	subq	$-32*4,%rbp
+	jmp	.Lavx2_00_47
+
+.align	16
+.Lavx2_00_47:
+	leaq	-64(%rsp),%rsp
+	vpalignr	$4,%ymm0,%ymm1,%ymm4
+	addl	0+128(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	vpalignr	$4,%ymm2,%ymm3,%ymm7
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	vpaddd	%ymm7,%ymm0,%ymm0
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	vpshufd	$250,%ymm3,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	4+128(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	vpaddd	%ymm4,%ymm0,%ymm0
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	8+128(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	vpaddd	%ymm6,%ymm0,%ymm0
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	vpshufd	$80,%ymm0,%ymm7
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	12+128(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	vpaddd	%ymm6,%ymm0,%ymm0
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	vpaddd	0(%rbp),%ymm0,%ymm6
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	vmovdqa	%ymm6,0(%rsp)
+	vpalignr	$4,%ymm1,%ymm2,%ymm4
+	addl	32+128(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	vpalignr	$4,%ymm3,%ymm0,%ymm7
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	vpaddd	%ymm7,%ymm1,%ymm1
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	vpshufd	$250,%ymm0,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	36+128(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	vpaddd	%ymm4,%ymm1,%ymm1
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	40+128(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	vpaddd	%ymm6,%ymm1,%ymm1
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	vpshufd	$80,%ymm1,%ymm7
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	44+128(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	vpaddd	%ymm6,%ymm1,%ymm1
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	vpaddd	32(%rbp),%ymm1,%ymm6
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	vmovdqa	%ymm6,32(%rsp)
+	leaq	-64(%rsp),%rsp
+	vpalignr	$4,%ymm2,%ymm3,%ymm4
+	addl	0+128(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	vpalignr	$4,%ymm0,%ymm1,%ymm7
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	vpaddd	%ymm7,%ymm2,%ymm2
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	vpshufd	$250,%ymm1,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	4+128(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	vpaddd	%ymm4,%ymm2,%ymm2
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	8+128(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	vpaddd	%ymm6,%ymm2,%ymm2
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	vpshufd	$80,%ymm2,%ymm7
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	12+128(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	vpaddd	%ymm6,%ymm2,%ymm2
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	vpaddd	64(%rbp),%ymm2,%ymm6
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	vmovdqa	%ymm6,0(%rsp)
+	vpalignr	$4,%ymm3,%ymm0,%ymm4
+	addl	32+128(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	vpalignr	$4,%ymm1,%ymm2,%ymm7
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	vpaddd	%ymm7,%ymm3,%ymm3
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	vpshufd	$250,%ymm2,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	36+128(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	vpaddd	%ymm4,%ymm3,%ymm3
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	40+128(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	vpaddd	%ymm6,%ymm3,%ymm3
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	vpshufd	$80,%ymm3,%ymm7
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	44+128(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	vpaddd	%ymm6,%ymm3,%ymm3
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	vpaddd	96(%rbp),%ymm3,%ymm6
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	vmovdqa	%ymm6,32(%rsp)
+	leaq	128(%rbp),%rbp
+	cmpb	$0,3(%rbp)
+	jne	.Lavx2_00_47
+	addl	0+64(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4+64(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8+64(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12+64(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32+64(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36+64(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40+64(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44+64(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	addl	0(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	movq	512(%rsp),%rdi
+	addl	%r14d,%eax
+
+	leaq	448(%rsp),%rbp
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+
+	cmpq	80(%rbp),%rsi
+	je	.Ldone_avx2
+
+	xorl	%r14d,%r14d
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	movl	%r9d,%r12d
+	jmp	.Lower_avx2
+.align	16
+.Lower_avx2:
+	addl	0+16(%rbp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4+16(%rbp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8+16(%rbp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12+16(%rbp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32+16(%rbp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36+16(%rbp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40+16(%rbp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44+16(%rbp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	leaq	-64(%rbp),%rbp
+	cmpq	%rsp,%rbp
+	jae	.Lower_avx2
+
+	movq	512(%rsp),%rdi
+	addl	%r14d,%eax
+
+	leaq	448(%rsp),%rsp
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	leaq	128(%rsi),%rsi
+	addl	24(%rdi),%r10d
+	movq	%rsi,%r12
+	addl	28(%rdi),%r11d
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	cmoveq	%rsp,%r12
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+
+	jbe	.Loop_avx2
+	leaq	(%rsp),%rbp
+
+.Ldone_avx2:
+	leaq	(%rbp),%rsp
+	movq	88(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	vzeroupper
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue_avx2:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	sha256_block_data_order_avx2,.-sha256_block_data_order_avx2
+
+.section .note.GNU-stack,"",%progbits
diff --git a/lib/accelerated/x86/elf/sha512-ssse3-x86.s b/lib/accelerated/x86/elf/sha512-ssse3-x86.s
index 0b99b22ec9..481c777154 100644
--- a/lib/accelerated/x86/elf/sha512-ssse3-x86.s
+++ b/lib/accelerated/x86/elf/sha512-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha512-586.s"
 .text
 .globl	sha512_block_data_order
 .type	sha512_block_data_order,@function
@@ -594,6 +593,8 @@ sha512_block_data_order:
 .long	4234509866,1501505948
 .long	987167468,1607167915
 .long	1246189591,1816402316
+.long	67438087,66051
+.long	202182159,134810123
 .size	sha512_block_data_order,.-.L_sha512_block_data_order_begin
 .byte	83,72,65,53,49,50,32,98,108,111,99,107,32,116,114,97
 .byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
@@ -601,7 +602,4 @@ sha512_block_data_order:
 .byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
 .byte	62,0
 
-
 .section .note.GNU-stack,"",%progbits
-
-
diff --git a/lib/accelerated/x86/elf/sha512-ssse3-x86_64.s b/lib/accelerated/x86/elf/sha512-ssse3-x86_64.s
index d51d8169bc..e384d7e9e8 100644
--- a/lib/accelerated/x86/elf/sha512-ssse3-x86_64.s
+++ b/lib/accelerated/x86/elf/sha512-ssse3-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,2854 +40,5439 @@
 .text	
 
 
-.globl	sha256_block_data_order
-.type	sha256_block_data_order,@function
+.globl	sha512_block_data_order
+.type	sha512_block_data_order,@function
 .align	16
-sha256_block_data_order:
+sha512_block_data_order:
+.cfi_startproc	
 	leaq	_gnutls_x86_cpuid_s(%rip),%r11
 	movl	0(%r11),%r9d
 	movl	4(%r11),%r10d
 	movl	8(%r11),%r11d
-	testl	$512,%r10d
-	jnz	.Lssse3_shortcut
+	testl	$2048,%r10d
+	jnz	.Lxop_shortcut
+	andl	$296,%r11d
+	cmpl	$296,%r11d
+	je	.Lavx2_shortcut
+	andl	$1073741824,%r9d
+	andl	$268435968,%r10d
+	orl	%r9d,%r10d
+	cmpl	$1342177792,%r10d
+	je	.Lavx_shortcut
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
 	pushq	%rbx
+.cfi_offset	%rbx,-16
 	pushq	%rbp
+.cfi_offset	%rbp,-24
 	pushq	%r12
+.cfi_offset	%r12,-32
 	pushq	%r13
+.cfi_offset	%r13,-40
 	pushq	%r14
+.cfi_offset	%r14,-48
 	pushq	%r15
-	movq	%rsp,%r11
+.cfi_offset	%r15,-56
 	shlq	$4,%rdx
-	subq	$64+32,%rsp
-	leaq	(%rsi,%rdx,4),%rdx
+	subq	$128+32,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
 	andq	$-64,%rsp
-	movq	%rdi,64+0(%rsp)
-	movq	%rsi,64+8(%rsp)
-	movq	%rdx,64+16(%rsp)
-	movq	%r11,64+24(%rsp)
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
 .Lprologue:
 
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-	movl	16(%rdi),%r8d
-	movl	20(%rdi),%r9d
-	movl	24(%rdi),%r10d
-	movl	28(%rdi),%r11d
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
 	jmp	.Lloop
 
 .align	16
 .Lloop:
-	movl	%ebx,%edi
-	leaq	K256(%rip),%rbp
-	xorl	%ecx,%edi
-	movl	0(%rsi),%r12d
-	movl	%r8d,%r13d
-	movl	%eax,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,0(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-	movl	4(%rsi),%r12d
-	movl	%edx,%r13d
-	movl	%r11d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,4(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-	movl	8(%rsi),%r12d
-	movl	%ecx,%r13d
-	movl	%r10d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,8(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-	movl	12(%rsi),%r12d
-	movl	%ebx,%r13d
-	movl	%r9d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,12(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-	movl	16(%rsi),%r12d
-	movl	%eax,%r13d
-	movl	%r8d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,16(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-	movl	20(%rsi),%r12d
-	movl	%r11d,%r13d
-	movl	%edx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,20(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-	movl	24(%rsi),%r12d
-	movl	%r10d,%r13d
-	movl	%ecx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,24(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-	movl	28(%rsi),%r12d
-	movl	%r9d,%r13d
-	movl	%ebx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,28(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-	movl	32(%rsi),%r12d
-	movl	%r8d,%r13d
-	movl	%eax,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,32(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-	movl	36(%rsi),%r12d
-	movl	%edx,%r13d
-	movl	%r11d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,36(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-	movl	40(%rsi),%r12d
-	movl	%ecx,%r13d
-	movl	%r10d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,40(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-	movl	44(%rsi),%r12d
-	movl	%ebx,%r13d
-	movl	%r9d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,44(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-	movl	48(%rsi),%r12d
-	movl	%eax,%r13d
-	movl	%r8d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,48(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-	movl	52(%rsi),%r12d
-	movl	%r11d,%r13d
-	movl	%edx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,52(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-	movl	56(%rsi),%r12d
-	movl	%r10d,%r13d
-	movl	%ecx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,56(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-	movl	60(%rsi),%r12d
-	movl	%r9d,%r13d
-	movl	%ebx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,60(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	4(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
+	movq	%rbx,%rdi
+	leaq	K512(%rip),%rbp
+	xorq	%rcx,%rdi
+	movq	0(%rsi),%r12
+	movq	%r8,%r13
+	movq	%rax,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,0(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r11
+	movq	8(%rsi),%r12
+	movq	%rdx,%r13
+	movq	%r11,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,8(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r10
+	movq	16(%rsi),%r12
+	movq	%rcx,%r13
+	movq	%r10,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,16(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r9
+	movq	24(%rsi),%r12
+	movq	%rbx,%r13
+	movq	%r9,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,24(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r8
+	movq	32(%rsi),%r12
+	movq	%rax,%r13
+	movq	%r8,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,32(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rdx
+	movq	40(%rsi),%r12
+	movq	%r11,%r13
+	movq	%rdx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,40(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rcx
+	movq	48(%rsi),%r12
+	movq	%r10,%r13
+	movq	%rcx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,48(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rbx
+	movq	56(%rsi),%r12
+	movq	%r9,%r13
+	movq	%rbx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,56(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rax
+	movq	64(%rsi),%r12
+	movq	%r8,%r13
+	movq	%rax,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,64(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r11
+	movq	72(%rsi),%r12
+	movq	%rdx,%r13
+	movq	%r11,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,72(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r10
+	movq	80(%rsi),%r12
+	movq	%rcx,%r13
+	movq	%r10,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,80(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r9
+	movq	88(%rsi),%r12
+	movq	%rbx,%r13
+	movq	%r9,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,88(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r8
+	movq	96(%rsi),%r12
+	movq	%rax,%r13
+	movq	%r8,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,96(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rdx
+	movq	104(%rsi),%r12
+	movq	%r11,%r13
+	movq	%rdx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,104(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rcx
+	movq	112(%rsi),%r12
+	movq	%r10,%r13
+	movq	%rcx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,112(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rbx
+	movq	120(%rsi),%r12
+	movq	%r9,%r13
+	movq	%rbx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,120(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
 	jmp	.Lrounds_16_xx
 .align	16
 .Lrounds_16_xx:
-
-	movl	56(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	36(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	0(%rsp),%r12d
-	movl	%r8d,%r13d
-	addl	%r14d,%r12d
-	movl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,0(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	movl	8(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-
-	movl	60(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	40(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	4(%rsp),%r12d
-	movl	%edx,%r13d
-	addl	%r14d,%r12d
-	movl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,4(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	movl	12(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-
-	movl	0(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	44(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	8(%rsp),%r12d
-	movl	%ecx,%r13d
-	addl	%r14d,%r12d
-	movl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,8(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	movl	16(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-
-	movl	4(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	48(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	12(%rsp),%r12d
-	movl	%ebx,%r13d
-	addl	%r14d,%r12d
-	movl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,12(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	movl	20(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-
-	movl	8(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	52(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	16(%rsp),%r12d
-	movl	%eax,%r13d
-	addl	%r14d,%r12d
-	movl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,16(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	movl	24(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-
-	movl	12(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	56(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	20(%rsp),%r12d
-	movl	%r11d,%r13d
-	addl	%r14d,%r12d
-	movl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,20(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	movl	28(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-
-	movl	16(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	60(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	24(%rsp),%r12d
-	movl	%r10d,%r13d
-	addl	%r14d,%r12d
-	movl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,24(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	movl	32(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-
-	movl	20(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	0(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	28(%rsp),%r12d
-	movl	%r9d,%r13d
-	addl	%r14d,%r12d
-	movl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,28(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	36(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-
-	movl	24(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	4(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	32(%rsp),%r12d
-	movl	%r8d,%r13d
-	addl	%r14d,%r12d
-	movl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,32(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	movl	40(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-
-	movl	28(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	8(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	36(%rsp),%r12d
-	movl	%edx,%r13d
-	addl	%r14d,%r12d
-	movl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,36(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	movl	44(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-
-	movl	32(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	12(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	40(%rsp),%r12d
-	movl	%ecx,%r13d
-	addl	%r14d,%r12d
-	movl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,40(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	movl	48(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-
-	movl	36(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	16(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	44(%rsp),%r12d
-	movl	%ebx,%r13d
-	addl	%r14d,%r12d
-	movl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,44(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	movl	52(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-
-	movl	40(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	20(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	48(%rsp),%r12d
-	movl	%eax,%r13d
-	addl	%r14d,%r12d
-	movl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,48(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	movl	56(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-
-	movl	44(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	24(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	52(%rsp),%r12d
-	movl	%r11d,%r13d
-	addl	%r14d,%r12d
-	movl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,52(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	movl	60(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-
-	movl	48(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	28(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	56(%rsp),%r12d
-	movl	%r10d,%r13d
-	addl	%r14d,%r12d
-	movl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,56(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	movl	0(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-
-	movl	52(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	32(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	60(%rsp),%r12d
-	movl	%r9d,%r13d
-	addl	%r14d,%r12d
-	movl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,60(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	4(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-	cmpb	$0,3(%rbp)
+	movq	8(%rsp),%r13
+	movq	112(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rax
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	72(%rsp),%r12
+
+	addq	0(%rsp),%r12
+	movq	%r8,%r13
+	addq	%r15,%r12
+	movq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,0(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	movq	16(%rsp),%r13
+	movq	120(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r11
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	80(%rsp),%r12
+
+	addq	8(%rsp),%r12
+	movq	%rdx,%r13
+	addq	%rdi,%r12
+	movq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,8(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	movq	24(%rsp),%r13
+	movq	0(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r10
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	88(%rsp),%r12
+
+	addq	16(%rsp),%r12
+	movq	%rcx,%r13
+	addq	%r15,%r12
+	movq	%r10,%r14
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,16(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	movq	32(%rsp),%r13
+	movq	8(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r9
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	96(%rsp),%r12
+
+	addq	24(%rsp),%r12
+	movq	%rbx,%r13
+	addq	%rdi,%r12
+	movq	%r9,%r14
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,24(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	movq	40(%rsp),%r13
+	movq	16(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r8
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	104(%rsp),%r12
+
+	addq	32(%rsp),%r12
+	movq	%rax,%r13
+	addq	%r15,%r12
+	movq	%r8,%r14
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,32(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	movq	48(%rsp),%r13
+	movq	24(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rdx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	112(%rsp),%r12
+
+	addq	40(%rsp),%r12
+	movq	%r11,%r13
+	addq	%rdi,%r12
+	movq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,40(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	movq	56(%rsp),%r13
+	movq	32(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rcx
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	120(%rsp),%r12
+
+	addq	48(%rsp),%r12
+	movq	%r10,%r13
+	addq	%r15,%r12
+	movq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,48(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	movq	64(%rsp),%r13
+	movq	40(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rbx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	0(%rsp),%r12
+
+	addq	56(%rsp),%r12
+	movq	%r9,%r13
+	addq	%rdi,%r12
+	movq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,56(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	movq	72(%rsp),%r13
+	movq	48(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rax
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	8(%rsp),%r12
+
+	addq	64(%rsp),%r12
+	movq	%r8,%r13
+	addq	%r15,%r12
+	movq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,64(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	movq	80(%rsp),%r13
+	movq	56(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r11
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	16(%rsp),%r12
+
+	addq	72(%rsp),%r12
+	movq	%rdx,%r13
+	addq	%rdi,%r12
+	movq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,72(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	movq	88(%rsp),%r13
+	movq	64(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r10
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	24(%rsp),%r12
+
+	addq	80(%rsp),%r12
+	movq	%rcx,%r13
+	addq	%r15,%r12
+	movq	%r10,%r14
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,80(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	movq	96(%rsp),%r13
+	movq	72(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r9
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	32(%rsp),%r12
+
+	addq	88(%rsp),%r12
+	movq	%rbx,%r13
+	addq	%rdi,%r12
+	movq	%r9,%r14
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,88(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	movq	104(%rsp),%r13
+	movq	80(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r8
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	40(%rsp),%r12
+
+	addq	96(%rsp),%r12
+	movq	%rax,%r13
+	addq	%r15,%r12
+	movq	%r8,%r14
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,96(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	movq	112(%rsp),%r13
+	movq	88(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rdx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	48(%rsp),%r12
+
+	addq	104(%rsp),%r12
+	movq	%r11,%r13
+	addq	%rdi,%r12
+	movq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,104(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	movq	120(%rsp),%r13
+	movq	96(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rcx
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	56(%rsp),%r12
+
+	addq	112(%rsp),%r12
+	movq	%r10,%r13
+	addq	%r15,%r12
+	movq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,112(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	movq	0(%rsp),%r13
+	movq	104(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rbx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	64(%rsp),%r12
+
+	addq	120(%rsp),%r12
+	movq	%r9,%r13
+	addq	%rdi,%r12
+	movq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,120(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	cmpb	$0,7(%rbp)
 	jnz	.Lrounds_16_xx
 
-	movq	64+0(%rsp),%rdi
-	leaq	64(%rsi),%rsi
-
-	addl	0(%rdi),%eax
-	addl	4(%rdi),%ebx
-	addl	8(%rdi),%ecx
-	addl	12(%rdi),%edx
-	addl	16(%rdi),%r8d
-	addl	20(%rdi),%r9d
-	addl	24(%rdi),%r10d
-	addl	28(%rdi),%r11d
-
-	cmpq	64+16(%rsp),%rsi
-
-	movl	%eax,0(%rdi)
-	movl	%ebx,4(%rdi)
-	movl	%ecx,8(%rdi)
-	movl	%edx,12(%rdi)
-	movl	%r8d,16(%rdi)
-	movl	%r9d,20(%rdi)
-	movl	%r10d,24(%rdi)
-	movl	%r11d,28(%rdi)
+	movq	128+0(%rsp),%rdi
+	addq	%r14,%rax
+	leaq	128(%rsi),%rsi
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
 	jb	.Lloop
 
-	movq	64+24(%rsp),%rsi
-	movq	(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
+	movq	152(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
 .Lepilogue:
 	.byte	0xf3,0xc3
-.size	sha256_block_data_order,.-sha256_block_data_order
+.cfi_endproc	
+.size	sha512_block_data_order,.-sha512_block_data_order
 .align	64
-.type	K256,@object
-K256:
-.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
-.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
-.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
-.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
-.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
-.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
-.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
-.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
-.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
-.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
-.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
-.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
-.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
-.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
-.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
-.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
-.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
-.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
-.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
-.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
-.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
-.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
-.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
-.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
-.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
-.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
-.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
-.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
-.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
-.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
-.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
-.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
-
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
-.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
-.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
-.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
-.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
-.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.type	sha256_block_data_order_ssse3,@function
+.type	K512,@object
+K512:
+.quad	0x428a2f98d728ae22,0x7137449123ef65cd
+.quad	0x428a2f98d728ae22,0x7137449123ef65cd
+.quad	0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc
+.quad	0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc
+.quad	0x3956c25bf348b538,0x59f111f1b605d019
+.quad	0x3956c25bf348b538,0x59f111f1b605d019
+.quad	0x923f82a4af194f9b,0xab1c5ed5da6d8118
+.quad	0x923f82a4af194f9b,0xab1c5ed5da6d8118
+.quad	0xd807aa98a3030242,0x12835b0145706fbe
+.quad	0xd807aa98a3030242,0x12835b0145706fbe
+.quad	0x243185be4ee4b28c,0x550c7dc3d5ffb4e2
+.quad	0x243185be4ee4b28c,0x550c7dc3d5ffb4e2
+.quad	0x72be5d74f27b896f,0x80deb1fe3b1696b1
+.quad	0x72be5d74f27b896f,0x80deb1fe3b1696b1
+.quad	0x9bdc06a725c71235,0xc19bf174cf692694
+.quad	0x9bdc06a725c71235,0xc19bf174cf692694
+.quad	0xe49b69c19ef14ad2,0xefbe4786384f25e3
+.quad	0xe49b69c19ef14ad2,0xefbe4786384f25e3
+.quad	0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65
+.quad	0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65
+.quad	0x2de92c6f592b0275,0x4a7484aa6ea6e483
+.quad	0x2de92c6f592b0275,0x4a7484aa6ea6e483
+.quad	0x5cb0a9dcbd41fbd4,0x76f988da831153b5
+.quad	0x5cb0a9dcbd41fbd4,0x76f988da831153b5
+.quad	0x983e5152ee66dfab,0xa831c66d2db43210
+.quad	0x983e5152ee66dfab,0xa831c66d2db43210
+.quad	0xb00327c898fb213f,0xbf597fc7beef0ee4
+.quad	0xb00327c898fb213f,0xbf597fc7beef0ee4
+.quad	0xc6e00bf33da88fc2,0xd5a79147930aa725
+.quad	0xc6e00bf33da88fc2,0xd5a79147930aa725
+.quad	0x06ca6351e003826f,0x142929670a0e6e70
+.quad	0x06ca6351e003826f,0x142929670a0e6e70
+.quad	0x27b70a8546d22ffc,0x2e1b21385c26c926
+.quad	0x27b70a8546d22ffc,0x2e1b21385c26c926
+.quad	0x4d2c6dfc5ac42aed,0x53380d139d95b3df
+.quad	0x4d2c6dfc5ac42aed,0x53380d139d95b3df
+.quad	0x650a73548baf63de,0x766a0abb3c77b2a8
+.quad	0x650a73548baf63de,0x766a0abb3c77b2a8
+.quad	0x81c2c92e47edaee6,0x92722c851482353b
+.quad	0x81c2c92e47edaee6,0x92722c851482353b
+.quad	0xa2bfe8a14cf10364,0xa81a664bbc423001
+.quad	0xa2bfe8a14cf10364,0xa81a664bbc423001
+.quad	0xc24b8b70d0f89791,0xc76c51a30654be30
+.quad	0xc24b8b70d0f89791,0xc76c51a30654be30
+.quad	0xd192e819d6ef5218,0xd69906245565a910
+.quad	0xd192e819d6ef5218,0xd69906245565a910
+.quad	0xf40e35855771202a,0x106aa07032bbd1b8
+.quad	0xf40e35855771202a,0x106aa07032bbd1b8
+.quad	0x19a4c116b8d2d0c8,0x1e376c085141ab53
+.quad	0x19a4c116b8d2d0c8,0x1e376c085141ab53
+.quad	0x2748774cdf8eeb99,0x34b0bcb5e19b48a8
+.quad	0x2748774cdf8eeb99,0x34b0bcb5e19b48a8
+.quad	0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb
+.quad	0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb
+.quad	0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3
+.quad	0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3
+.quad	0x748f82ee5defb2fc,0x78a5636f43172f60
+.quad	0x748f82ee5defb2fc,0x78a5636f43172f60
+.quad	0x84c87814a1f0ab72,0x8cc702081a6439ec
+.quad	0x84c87814a1f0ab72,0x8cc702081a6439ec
+.quad	0x90befffa23631e28,0xa4506cebde82bde9
+.quad	0x90befffa23631e28,0xa4506cebde82bde9
+.quad	0xbef9a3f7b2c67915,0xc67178f2e372532b
+.quad	0xbef9a3f7b2c67915,0xc67178f2e372532b
+.quad	0xca273eceea26619c,0xd186b8c721c0c207
+.quad	0xca273eceea26619c,0xd186b8c721c0c207
+.quad	0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178
+.quad	0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178
+.quad	0x06f067aa72176fba,0x0a637dc5a2c898a6
+.quad	0x06f067aa72176fba,0x0a637dc5a2c898a6
+.quad	0x113f9804bef90dae,0x1b710b35131c471b
+.quad	0x113f9804bef90dae,0x1b710b35131c471b
+.quad	0x28db77f523047d84,0x32caab7b40c72493
+.quad	0x28db77f523047d84,0x32caab7b40c72493
+.quad	0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
+.quad	0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
+.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a
+.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a
+.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817
+.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817
+
+.quad	0x0001020304050607,0x08090a0b0c0d0e0f
+.quad	0x0001020304050607,0x08090a0b0c0d0e0f
+.byte	83,72,65,53,49,50,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
+.type	sha512_block_data_order_xop,@function
 .align	64
-sha256_block_data_order_ssse3:
-.Lssse3_shortcut:
+sha512_block_data_order_xop:
+.cfi_startproc	
+.Lxop_shortcut:
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
 	pushq	%rbx
+.cfi_offset	%rbx,-16
 	pushq	%rbp
+.cfi_offset	%rbp,-24
 	pushq	%r12
+.cfi_offset	%r12,-32
 	pushq	%r13
+.cfi_offset	%r13,-40
 	pushq	%r14
+.cfi_offset	%r14,-48
 	pushq	%r15
-	movq	%rsp,%r11
+.cfi_offset	%r15,-56
 	shlq	$4,%rdx
-	subq	$96,%rsp
-	leaq	(%rsi,%rdx,4),%rdx
+	subq	$160,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
 	andq	$-64,%rsp
-	movq	%rdi,64+0(%rsp)
-	movq	%rsi,64+8(%rsp)
-	movq	%rdx,64+16(%rsp)
-	movq	%r11,64+24(%rsp)
-.Lprologue_ssse3:
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-	movl	16(%rdi),%r8d
-	movl	20(%rdi),%r9d
-	movl	24(%rdi),%r10d
-	movl	28(%rdi),%r11d
-	movdqa	K256+512+32(%rip),%xmm8
-	movdqa	K256+512+64(%rip),%xmm9
-	jmp	.Lloop_ssse3
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+.Lprologue_xop:
+
+	vzeroupper
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	.Lloop_xop
 .align	16
-.Lloop_ssse3:
-	movdqa	K256+512(%rip),%xmm7
-	movdqu	0(%rsi),%xmm0
-	movdqu	16(%rsi),%xmm1
-	movdqu	32(%rsi),%xmm2
-	movdqu	48(%rsi),%xmm3
-.byte	102,15,56,0,199
-	leaq	K256(%rip),%rbp
-.byte	102,15,56,0,207
-	movdqa	0(%rbp),%xmm4
-.byte	102,15,56,0,215
-	movdqa	32(%rbp),%xmm5
-	paddd	%xmm0,%xmm4
-	movdqa	64(%rbp),%xmm6
-.byte	102,15,56,0,223
-	movdqa	96(%rbp),%xmm7
-	paddd	%xmm1,%xmm5
-	paddd	%xmm2,%xmm6
-	paddd	%xmm3,%xmm7
-	movdqa	%xmm4,0(%rsp)
-	movl	%eax,%r14d
-	movdqa	%xmm5,16(%rsp)
-	movl	%ebx,%edi
-	movdqa	%xmm6,32(%rsp)
-	xorl	%ecx,%edi
-	movdqa	%xmm7,48(%rsp)
-	movl	%r8d,%r13d
-	jmp	.Lssse3_00_47
+.Lloop_xop:
+	vmovdqa	K512+1280(%rip),%xmm11
+	vmovdqu	0(%rsi),%xmm0
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vpshufb	%xmm11,%xmm0,%xmm0
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm11,%xmm1,%xmm1
+	vmovdqu	64(%rsi),%xmm4
+	vpshufb	%xmm11,%xmm2,%xmm2
+	vmovdqu	80(%rsi),%xmm5
+	vpshufb	%xmm11,%xmm3,%xmm3
+	vmovdqu	96(%rsi),%xmm6
+	vpshufb	%xmm11,%xmm4,%xmm4
+	vmovdqu	112(%rsi),%xmm7
+	vpshufb	%xmm11,%xmm5,%xmm5
+	vpaddq	-128(%rbp),%xmm0,%xmm8
+	vpshufb	%xmm11,%xmm6,%xmm6
+	vpaddq	-96(%rbp),%xmm1,%xmm9
+	vpshufb	%xmm11,%xmm7,%xmm7
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	vpaddq	-32(%rbp),%xmm3,%xmm11
+	vmovdqa	%xmm8,0(%rsp)
+	vpaddq	0(%rbp),%xmm4,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	vpaddq	32(%rbp),%xmm5,%xmm9
+	vmovdqa	%xmm10,32(%rsp)
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	vmovdqa	%xmm11,48(%rsp)
+	vpaddq	96(%rbp),%xmm7,%xmm11
+	vmovdqa	%xmm8,64(%rsp)
+	movq	%rax,%r14
+	vmovdqa	%xmm9,80(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%xmm10,96(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%xmm11,112(%rsp)
+	movq	%r8,%r13
+	jmp	.Lxop_00_47
 
 .align	16
-.Lssse3_00_47:
-	subq	$-32*4,%rbp
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movdqa	%xmm1,%xmm4
-	movl	%r9d,%r12d
-	movdqa	%xmm3,%xmm7
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-.byte	102,15,58,15,224,4
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-.byte	102,15,58,15,250,4
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	0(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%ebx,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	paddd	%xmm7,%xmm0
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	psrld	$7,%xmm6
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	pshufd	$250,%xmm3,%xmm7
-	movl	%r8d,%r12d
-	pslld	$14,%xmm5
-	xorl	%edx,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	pslld	$11,%xmm5
-	addl	4(%rsp),%r10d
-	pxor	%xmm6,%xmm4
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	paddd	%xmm4,%xmm0
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	8(%rsp),%r9d
-.byte	102,65,15,56,0,248
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm0
-	addl	%r12d,%r9d
-	pshufd	$80,%xmm0,%xmm7
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	psrld	$10,%xmm7
-	movl	%ebx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	pxor	%xmm6,%xmm7
-	addl	12(%rsp),%r8d
-	movl	%r9d,%edi
-	movdqa	0(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	paddd	%xmm7,%xmm0
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	paddd	%xmm0,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	movdqa	%xmm6,0(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movdqa	%xmm2,%xmm4
-	movl	%ebx,%r12d
-	movdqa	%xmm0,%xmm7
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-.byte	102,15,58,15,225,4
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-.byte	102,15,58,15,251,4
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	16(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%r9d,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	paddd	%xmm7,%xmm1
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	psrld	$7,%xmm6
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	pshufd	$250,%xmm0,%xmm7
-	movl	%eax,%r12d
-	pslld	$14,%xmm5
-	xorl	%r11d,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	pslld	$11,%xmm5
-	addl	20(%rsp),%ecx
-	pxor	%xmm6,%xmm4
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	paddd	%xmm4,%xmm1
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	24(%rsp),%ebx
-.byte	102,65,15,56,0,248
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm1
-	addl	%r12d,%ebx
-	pshufd	$80,%xmm1,%xmm7
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	psrld	$10,%xmm7
-	movl	%r9d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	pxor	%xmm6,%xmm7
-	addl	28(%rsp),%eax
-	movl	%ebx,%edi
-	movdqa	32(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	paddd	%xmm7,%xmm1
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	paddd	%xmm1,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movdqa	%xmm6,16(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movdqa	%xmm3,%xmm4
-	movl	%r9d,%r12d
-	movdqa	%xmm1,%xmm7
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-.byte	102,15,58,15,226,4
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-.byte	102,15,58,15,248,4
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	32(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%ebx,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	paddd	%xmm7,%xmm2
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	psrld	$7,%xmm6
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	pshufd	$250,%xmm1,%xmm7
-	movl	%r8d,%r12d
-	pslld	$14,%xmm5
-	xorl	%edx,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	pslld	$11,%xmm5
-	addl	36(%rsp),%r10d
-	pxor	%xmm6,%xmm4
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	paddd	%xmm4,%xmm2
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	40(%rsp),%r9d
-.byte	102,65,15,56,0,248
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm2
-	addl	%r12d,%r9d
-	pshufd	$80,%xmm2,%xmm7
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	psrld	$10,%xmm7
-	movl	%ebx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	pxor	%xmm6,%xmm7
-	addl	44(%rsp),%r8d
-	movl	%r9d,%edi
-	movdqa	64(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	paddd	%xmm7,%xmm2
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	paddd	%xmm2,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	movdqa	%xmm6,32(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movdqa	%xmm0,%xmm4
-	movl	%ebx,%r12d
-	movdqa	%xmm2,%xmm7
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-.byte	102,15,58,15,227,4
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-.byte	102,15,58,15,249,4
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	48(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%r9d,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	paddd	%xmm7,%xmm3
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	psrld	$7,%xmm6
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	pshufd	$250,%xmm2,%xmm7
-	movl	%eax,%r12d
-	pslld	$14,%xmm5
-	xorl	%r11d,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	pslld	$11,%xmm5
-	addl	52(%rsp),%ecx
-	pxor	%xmm6,%xmm4
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	paddd	%xmm4,%xmm3
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	56(%rsp),%ebx
-.byte	102,65,15,56,0,248
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm3
-	addl	%r12d,%ebx
-	pshufd	$80,%xmm3,%xmm7
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	psrld	$10,%xmm7
-	movl	%r9d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	pxor	%xmm6,%xmm7
-	addl	60(%rsp),%eax
-	movl	%ebx,%edi
-	movdqa	96(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	paddd	%xmm7,%xmm3
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	paddd	%xmm3,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movdqa	%xmm6,48(%rsp)
-	cmpb	$0,131(%rbp)
-	jne	.Lssse3_00_47
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movl	%r9d,%r12d
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	0(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	xorl	%ebx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	movl	%r8d,%r12d
-	xorl	%edx,%r13d
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	addl	4(%rsp),%r10d
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	8(%rsp),%r9d
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r9d
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	movl	%ebx,%r13d
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	addl	12(%rsp),%r8d
-	movl	%r9d,%edi
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movl	%ebx,%r12d
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	16(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	xorl	%r9d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	movl	%eax,%r12d
-	xorl	%r11d,%r13d
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	addl	20(%rsp),%ecx
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	24(%rsp),%ebx
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%ebx
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	movl	%r9d,%r13d
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	addl	28(%rsp),%eax
-	movl	%ebx,%edi
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movl	%r9d,%r12d
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	32(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	xorl	%ebx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	movl	%r8d,%r12d
-	xorl	%edx,%r13d
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	addl	36(%rsp),%r10d
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	40(%rsp),%r9d
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r9d
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	movl	%ebx,%r13d
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	addl	44(%rsp),%r8d
-	movl	%r9d,%edi
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movl	%ebx,%r12d
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	48(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	xorl	%r9d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	movl	%eax,%r12d
-	xorl	%r11d,%r13d
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	addl	52(%rsp),%ecx
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	56(%rsp),%ebx
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%ebx
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	movl	%r9d,%r13d
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	addl	60(%rsp),%eax
-	movl	%ebx,%edi
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movq	64+0(%rsp),%rdi
-	movl	%r14d,%eax
-
-	addl	0(%rdi),%eax
-	leaq	64(%rsi),%rsi
-	addl	4(%rdi),%ebx
-	addl	8(%rdi),%ecx
-	addl	12(%rdi),%edx
-	addl	16(%rdi),%r8d
-	addl	20(%rdi),%r9d
-	addl	24(%rdi),%r10d
-	addl	28(%rdi),%r11d
-
-	cmpq	64+16(%rsp),%rsi
-
-	movl	%eax,0(%rdi)
-	movl	%ebx,4(%rdi)
-	movl	%ecx,8(%rdi)
-	movl	%edx,12(%rdi)
-	movl	%r8d,16(%rdi)
-	movl	%r9d,20(%rdi)
-	movl	%r10d,24(%rdi)
-	movl	%r11d,28(%rdi)
-	jb	.Lloop_ssse3
-
-	movq	64+24(%rsp),%rsi
-	movq	(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
-.Lepilogue_ssse3:
+.Lxop_00_47:
+	addq	$256,%rbp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm4,%xmm5,%xmm11
+	movq	%r9,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	vpaddq	%xmm11,%xmm0,%xmm0
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,223,3
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm7,%xmm10
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpaddq	%xmm8,%xmm0,%xmm0
+	movq	%rdx,%r13
+	addq	%r11,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r11
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpaddq	%xmm11,%xmm0,%xmm0
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	vpaddq	-128(%rbp),%xmm0,%xmm10
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,0(%rsp)
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm5,%xmm6,%xmm11
+	movq	%rdx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	vpaddq	%xmm11,%xmm1,%xmm1
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,216,3
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm0,%xmm10
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpaddq	%xmm8,%xmm1,%xmm1
+	movq	%rbx,%r13
+	addq	%r9,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r9
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpaddq	%xmm11,%xmm1,%xmm1
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	vpaddq	-96(%rbp),%xmm1,%xmm10
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,16(%rsp)
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm6,%xmm7,%xmm11
+	movq	%rbx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	vpaddq	%xmm11,%xmm2,%xmm2
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,217,3
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm1,%xmm10
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpaddq	%xmm8,%xmm2,%xmm2
+	movq	%r11,%r13
+	addq	%rdx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpaddq	%xmm11,%xmm2,%xmm2
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,32(%rsp)
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm7,%xmm0,%xmm11
+	movq	%r11,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	vpaddq	%xmm11,%xmm3,%xmm3
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,218,3
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm2,%xmm10
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpaddq	%xmm8,%xmm3,%xmm3
+	movq	%r9,%r13
+	addq	%rbx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpaddq	%xmm11,%xmm3,%xmm3
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	vpaddq	-32(%rbp),%xmm3,%xmm10
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,48(%rsp)
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm0,%xmm1,%xmm11
+	movq	%r9,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	vpaddq	%xmm11,%xmm4,%xmm4
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,219,3
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm3,%xmm10
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpaddq	%xmm8,%xmm4,%xmm4
+	movq	%rdx,%r13
+	addq	%r11,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r11
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpaddq	%xmm11,%xmm4,%xmm4
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	vpaddq	0(%rbp),%xmm4,%xmm10
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,64(%rsp)
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm1,%xmm2,%xmm11
+	movq	%rdx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	vpaddq	%xmm11,%xmm5,%xmm5
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,220,3
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm4,%xmm10
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpaddq	%xmm8,%xmm5,%xmm5
+	movq	%rbx,%r13
+	addq	%r9,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r9
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpaddq	%xmm11,%xmm5,%xmm5
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	vpaddq	32(%rbp),%xmm5,%xmm10
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,80(%rsp)
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm2,%xmm3,%xmm11
+	movq	%rbx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	vpaddq	%xmm11,%xmm6,%xmm6
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,221,3
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm5,%xmm10
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpaddq	%xmm8,%xmm6,%xmm6
+	movq	%r11,%r13
+	addq	%rdx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpaddq	%xmm11,%xmm6,%xmm6
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,96(%rsp)
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm3,%xmm4,%xmm11
+	movq	%r11,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	vpaddq	%xmm11,%xmm7,%xmm7
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,222,3
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm6,%xmm10
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpaddq	%xmm8,%xmm7,%xmm7
+	movq	%r9,%r13
+	addq	%rbx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpaddq	%xmm11,%xmm7,%xmm7
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	vpaddq	96(%rbp),%xmm7,%xmm10
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,112(%rsp)
+	cmpb	$0,135(%rbp)
+	jne	.Lxop_00_47
+	rorq	$23,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	rorq	$5,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	rorq	$23,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	rorq	$5,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	rorq	$23,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	rorq	$23,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	rorq	$5,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	rorq	$5,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	rorq	$5,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	rorq	$23,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	rorq	$5,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	rorq	$23,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	rorq	$23,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	rorq	$5,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	rorq	$5,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	movq	128+0(%rsp),%rdi
+	movq	%r14,%rax
+
+	addq	0(%rdi),%rax
+	leaq	128(%rsi),%rsi
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+	jb	.Lloop_xop
+
+	movq	152(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	vzeroupper
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue_xop:
 	.byte	0xf3,0xc3
-.size	sha256_block_data_order_ssse3,.-sha256_block_data_order_ssse3
-
+.cfi_endproc	
+.size	sha512_block_data_order_xop,.-sha512_block_data_order_xop
+.type	sha512_block_data_order_avx,@function
+.align	64
+sha512_block_data_order_avx:
+.cfi_startproc	
+.Lavx_shortcut:
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
+	pushq	%rbx
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
+	pushq	%r15
+.cfi_offset	%r15,-56
+	shlq	$4,%rdx
+	subq	$160,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+.Lprologue_avx:
+
+	vzeroupper
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	.Lloop_avx
+.align	16
+.Lloop_avx:
+	vmovdqa	K512+1280(%rip),%xmm11
+	vmovdqu	0(%rsi),%xmm0
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vpshufb	%xmm11,%xmm0,%xmm0
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm11,%xmm1,%xmm1
+	vmovdqu	64(%rsi),%xmm4
+	vpshufb	%xmm11,%xmm2,%xmm2
+	vmovdqu	80(%rsi),%xmm5
+	vpshufb	%xmm11,%xmm3,%xmm3
+	vmovdqu	96(%rsi),%xmm6
+	vpshufb	%xmm11,%xmm4,%xmm4
+	vmovdqu	112(%rsi),%xmm7
+	vpshufb	%xmm11,%xmm5,%xmm5
+	vpaddq	-128(%rbp),%xmm0,%xmm8
+	vpshufb	%xmm11,%xmm6,%xmm6
+	vpaddq	-96(%rbp),%xmm1,%xmm9
+	vpshufb	%xmm11,%xmm7,%xmm7
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	vpaddq	-32(%rbp),%xmm3,%xmm11
+	vmovdqa	%xmm8,0(%rsp)
+	vpaddq	0(%rbp),%xmm4,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	vpaddq	32(%rbp),%xmm5,%xmm9
+	vmovdqa	%xmm10,32(%rsp)
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	vmovdqa	%xmm11,48(%rsp)
+	vpaddq	96(%rbp),%xmm7,%xmm11
+	vmovdqa	%xmm8,64(%rsp)
+	movq	%rax,%r14
+	vmovdqa	%xmm9,80(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%xmm10,96(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%xmm11,112(%rsp)
+	movq	%r8,%r13
+	jmp	.Lavx_00_47
 
-.section .note.GNU-stack,"",%progbits
+.align	16
+.Lavx_00_47:
+	addq	$256,%rbp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm4,%xmm5,%xmm11
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpaddq	%xmm11,%xmm0,%xmm0
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm7,%xmm11
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	vpsllq	$3,%xmm7,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	vpaddq	%xmm8,%xmm0,%xmm0
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm7,%xmm9
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm0,%xmm0
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	vpaddq	-128(%rbp),%xmm0,%xmm10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,0(%rsp)
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm5,%xmm6,%xmm11
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpaddq	%xmm11,%xmm1,%xmm1
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm0,%xmm11
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	vpsllq	$3,%xmm0,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	vpaddq	%xmm8,%xmm1,%xmm1
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm0,%xmm9
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm1,%xmm1
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	vpaddq	-96(%rbp),%xmm1,%xmm10
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,16(%rsp)
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm6,%xmm7,%xmm11
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpaddq	%xmm11,%xmm2,%xmm2
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm1,%xmm11
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	vpsllq	$3,%xmm1,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	vpaddq	%xmm8,%xmm2,%xmm2
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm1,%xmm9
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm2,%xmm2
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,32(%rsp)
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm7,%xmm0,%xmm11
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpaddq	%xmm11,%xmm3,%xmm3
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm2,%xmm11
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	vpsllq	$3,%xmm2,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	vpaddq	%xmm8,%xmm3,%xmm3
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm2,%xmm9
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm3,%xmm3
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	vpaddq	-32(%rbp),%xmm3,%xmm10
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,48(%rsp)
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm0,%xmm1,%xmm11
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpaddq	%xmm11,%xmm4,%xmm4
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm3,%xmm11
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	vpsllq	$3,%xmm3,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	vpaddq	%xmm8,%xmm4,%xmm4
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm3,%xmm9
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm4,%xmm4
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	vpaddq	0(%rbp),%xmm4,%xmm10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,64(%rsp)
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm1,%xmm2,%xmm11
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpaddq	%xmm11,%xmm5,%xmm5
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm4,%xmm11
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	vpsllq	$3,%xmm4,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	vpaddq	%xmm8,%xmm5,%xmm5
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm4,%xmm9
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm5,%xmm5
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	vpaddq	32(%rbp),%xmm5,%xmm10
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,80(%rsp)
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm2,%xmm3,%xmm11
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpaddq	%xmm11,%xmm6,%xmm6
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm5,%xmm11
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	vpsllq	$3,%xmm5,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	vpaddq	%xmm8,%xmm6,%xmm6
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm5,%xmm9
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm6,%xmm6
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,96(%rsp)
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm3,%xmm4,%xmm11
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpaddq	%xmm11,%xmm7,%xmm7
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm6,%xmm11
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	vpsllq	$3,%xmm6,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	vpaddq	%xmm8,%xmm7,%xmm7
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm6,%xmm9
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm7,%xmm7
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	vpaddq	96(%rbp),%xmm7,%xmm10
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,112(%rsp)
+	cmpb	$0,135(%rbp)
+	jne	.Lavx_00_47
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	movq	128+0(%rsp),%rdi
+	movq	%r14,%rax
+
+	addq	0(%rdi),%rax
+	leaq	128(%rsi),%rsi
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+	jb	.Lloop_avx
+
+	movq	152(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	vzeroupper
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue_avx:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	sha512_block_data_order_avx,.-sha512_block_data_order_avx
+.type	sha512_block_data_order_avx2,@function
+.align	64
+sha512_block_data_order_avx2:
+.cfi_startproc	
+.Lavx2_shortcut:
+	movq	%rsp,%rax
+.cfi_def_cfa_register	%rax
+	pushq	%rbx
+.cfi_offset	%rbx,-16
+	pushq	%rbp
+.cfi_offset	%rbp,-24
+	pushq	%r12
+.cfi_offset	%r12,-32
+	pushq	%r13
+.cfi_offset	%r13,-40
+	pushq	%r14
+.cfi_offset	%r14,-48
+	pushq	%r15
+.cfi_offset	%r15,-56
+	subq	$1312,%rsp
+	shlq	$4,%rdx
+	andq	$-2048,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
+	addq	$1152,%rsp
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+.Lprologue_avx2:
+
+	vzeroupper
+	subq	$-128,%rsi
+	movq	0(%rdi),%rax
+	movq	%rsi,%r12
+	movq	8(%rdi),%rbx
+	cmpq	%rdx,%rsi
+	movq	16(%rdi),%rcx
+	cmoveq	%rsp,%r12
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	.Loop_avx2
+.align	16
+.Loop_avx2:
+	vmovdqu	-128(%rsi),%xmm0
+	vmovdqu	-128+16(%rsi),%xmm1
+	vmovdqu	-128+32(%rsi),%xmm2
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	-128+48(%rsi),%xmm3
+	vmovdqu	-128+64(%rsi),%xmm4
+	vmovdqu	-128+80(%rsi),%xmm5
+	vmovdqu	-128+96(%rsi),%xmm6
+	vmovdqu	-128+112(%rsi),%xmm7
+
+	vmovdqa	1152(%rbp),%ymm10
+	vinserti128	$1,(%r12),%ymm0,%ymm0
+	vinserti128	$1,16(%r12),%ymm1,%ymm1
+	vpshufb	%ymm10,%ymm0,%ymm0
+	vinserti128	$1,32(%r12),%ymm2,%ymm2
+	vpshufb	%ymm10,%ymm1,%ymm1
+	vinserti128	$1,48(%r12),%ymm3,%ymm3
+	vpshufb	%ymm10,%ymm2,%ymm2
+	vinserti128	$1,64(%r12),%ymm4,%ymm4
+	vpshufb	%ymm10,%ymm3,%ymm3
+	vinserti128	$1,80(%r12),%ymm5,%ymm5
+	vpshufb	%ymm10,%ymm4,%ymm4
+	vinserti128	$1,96(%r12),%ymm6,%ymm6
+	vpshufb	%ymm10,%ymm5,%ymm5
+	vinserti128	$1,112(%r12),%ymm7,%ymm7
+
+	vpaddq	-128(%rbp),%ymm0,%ymm8
+	vpshufb	%ymm10,%ymm6,%ymm6
+	vpaddq	-96(%rbp),%ymm1,%ymm9
+	vpshufb	%ymm10,%ymm7,%ymm7
+	vpaddq	-64(%rbp),%ymm2,%ymm10
+	vpaddq	-32(%rbp),%ymm3,%ymm11
+	vmovdqa	%ymm8,0(%rsp)
+	vpaddq	0(%rbp),%ymm4,%ymm8
+	vmovdqa	%ymm9,32(%rsp)
+	vpaddq	32(%rbp),%ymm5,%ymm9
+	vmovdqa	%ymm10,64(%rsp)
+	vpaddq	64(%rbp),%ymm6,%ymm10
+	vmovdqa	%ymm11,96(%rsp)
+	leaq	-128(%rsp),%rsp
+	vpaddq	96(%rbp),%ymm7,%ymm11
+	vmovdqa	%ymm8,0(%rsp)
+	xorq	%r14,%r14
+	vmovdqa	%ymm9,32(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%ymm10,64(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%ymm11,96(%rsp)
+	movq	%r9,%r12
+	addq	$32*8,%rbp
+	jmp	.Lavx2_00_47
 
+.align	16
+.Lavx2_00_47:
+	leaq	-128(%rsp),%rsp
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	addq	0+256(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	vpalignr	$8,%ymm4,%ymm5,%ymm11
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	vpaddq	%ymm11,%ymm0,%ymm0
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	vpsrlq	$6,%ymm7,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	vpsllq	$3,%ymm7,%ymm10
+	vpaddq	%ymm8,%ymm0,%ymm0
+	addq	8+256(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	vpsrlq	$19,%ymm7,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	vpaddq	%ymm11,%ymm0,%ymm0
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	vpaddq	-128(%rbp),%ymm0,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	vmovdqa	%ymm10,0(%rsp)
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	addq	32+256(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	vpalignr	$8,%ymm5,%ymm6,%ymm11
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	vpaddq	%ymm11,%ymm1,%ymm1
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	vpsrlq	$6,%ymm0,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	vpsllq	$3,%ymm0,%ymm10
+	vpaddq	%ymm8,%ymm1,%ymm1
+	addq	40+256(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	vpsrlq	$19,%ymm0,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	vpaddq	%ymm11,%ymm1,%ymm1
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	vpaddq	-96(%rbp),%ymm1,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	vmovdqa	%ymm10,32(%rsp)
+	vpalignr	$8,%ymm2,%ymm3,%ymm8
+	addq	64+256(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	vpalignr	$8,%ymm6,%ymm7,%ymm11
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	vpaddq	%ymm11,%ymm2,%ymm2
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	vpsrlq	$6,%ymm1,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	vpsllq	$3,%ymm1,%ymm10
+	vpaddq	%ymm8,%ymm2,%ymm2
+	addq	72+256(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	vpsrlq	$19,%ymm1,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	vpaddq	%ymm11,%ymm2,%ymm2
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	vpaddq	-64(%rbp),%ymm2,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	vmovdqa	%ymm10,64(%rsp)
+	vpalignr	$8,%ymm3,%ymm4,%ymm8
+	addq	96+256(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	vpalignr	$8,%ymm7,%ymm0,%ymm11
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	vpaddq	%ymm11,%ymm3,%ymm3
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	vpsrlq	$6,%ymm2,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	vpsllq	$3,%ymm2,%ymm10
+	vpaddq	%ymm8,%ymm3,%ymm3
+	addq	104+256(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	vpsrlq	$19,%ymm2,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	vpaddq	%ymm11,%ymm3,%ymm3
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	vpaddq	-32(%rbp),%ymm3,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	vmovdqa	%ymm10,96(%rsp)
+	leaq	-128(%rsp),%rsp
+	vpalignr	$8,%ymm4,%ymm5,%ymm8
+	addq	0+256(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	vpalignr	$8,%ymm0,%ymm1,%ymm11
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	vpaddq	%ymm11,%ymm4,%ymm4
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	vpsrlq	$6,%ymm3,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	vpsllq	$3,%ymm3,%ymm10
+	vpaddq	%ymm8,%ymm4,%ymm4
+	addq	8+256(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	vpsrlq	$19,%ymm3,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	vpaddq	%ymm11,%ymm4,%ymm4
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	vpaddq	0(%rbp),%ymm4,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	vmovdqa	%ymm10,0(%rsp)
+	vpalignr	$8,%ymm5,%ymm6,%ymm8
+	addq	32+256(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	vpalignr	$8,%ymm1,%ymm2,%ymm11
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	vpaddq	%ymm11,%ymm5,%ymm5
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	vpsrlq	$6,%ymm4,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	vpsllq	$3,%ymm4,%ymm10
+	vpaddq	%ymm8,%ymm5,%ymm5
+	addq	40+256(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	vpsrlq	$19,%ymm4,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	vpaddq	%ymm11,%ymm5,%ymm5
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	vpaddq	32(%rbp),%ymm5,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	vmovdqa	%ymm10,32(%rsp)
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	addq	64+256(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	vpalignr	$8,%ymm2,%ymm3,%ymm11
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	vpaddq	%ymm11,%ymm6,%ymm6
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	vpsrlq	$6,%ymm5,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	vpsllq	$3,%ymm5,%ymm10
+	vpaddq	%ymm8,%ymm6,%ymm6
+	addq	72+256(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	vpsrlq	$19,%ymm5,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	vpaddq	%ymm11,%ymm6,%ymm6
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	vpaddq	64(%rbp),%ymm6,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	vmovdqa	%ymm10,64(%rsp)
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	addq	96+256(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	vpalignr	$8,%ymm3,%ymm4,%ymm11
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	vpaddq	%ymm11,%ymm7,%ymm7
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	vpsrlq	$6,%ymm6,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	vpsllq	$3,%ymm6,%ymm10
+	vpaddq	%ymm8,%ymm7,%ymm7
+	addq	104+256(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	vpsrlq	$19,%ymm6,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	vpaddq	%ymm11,%ymm7,%ymm7
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	vpaddq	96(%rbp),%ymm7,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	vmovdqa	%ymm10,96(%rsp)
+	leaq	256(%rbp),%rbp
+	cmpb	$0,-121(%rbp)
+	jne	.Lavx2_00_47
+	addq	0+128(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8+128(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32+128(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40+128(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64+128(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72+128(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96+128(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104+128(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	addq	0(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	movq	1280(%rsp),%rdi
+	addq	%r14,%rax
+
+	leaq	1152(%rsp),%rbp
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+
+	cmpq	144(%rbp),%rsi
+	je	.Ldone_avx2
+
+	xorq	%r14,%r14
+	movq	%rbx,%rdi
+	xorq	%rcx,%rdi
+	movq	%r9,%r12
+	jmp	.Lower_avx2
+.align	16
+.Lower_avx2:
+	addq	0+16(%rbp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8+16(%rbp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32+16(%rbp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40+16(%rbp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64+16(%rbp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72+16(%rbp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96+16(%rbp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104+16(%rbp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	leaq	-128(%rbp),%rbp
+	cmpq	%rsp,%rbp
+	jae	.Lower_avx2
+
+	movq	1280(%rsp),%rdi
+	addq	%r14,%rax
+
+	leaq	1152(%rsp),%rsp
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	leaq	256(%rsi),%rsi
+	addq	48(%rdi),%r10
+	movq	%rsi,%r12
+	addq	56(%rdi),%r11
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	cmoveq	%rsp,%r12
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+
+	jbe	.Loop_avx2
+	leaq	(%rsp),%rbp
+
+.Ldone_avx2:
+	leaq	(%rbp),%rsp
+	movq	152(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
+	vzeroupper
+	movq	-48(%rsi),%r15
+.cfi_restore	%r15
+	movq	-40(%rsi),%r14
+.cfi_restore	%r14
+	movq	-32(%rsi),%r13
+.cfi_restore	%r13
+	movq	-24(%rsi),%r12
+.cfi_restore	%r12
+	movq	-16(%rsi),%rbp
+.cfi_restore	%rbp
+	movq	-8(%rsi),%rbx
+.cfi_restore	%rbx
+	leaq	(%rsi),%rsp
+.cfi_def_cfa_register	%rsp
+.Lepilogue_avx2:
+	.byte	0xf3,0xc3
+.cfi_endproc	
+.size	sha512_block_data_order_avx2,.-sha512_block_data_order_avx2
 
+.section .note.GNU-stack,"",%progbits
diff --git a/lib/accelerated/x86/files.mk b/lib/accelerated/x86/files.mk
index a134213922..ac1f2b05bd 100644
--- a/lib/accelerated/x86/files.mk
+++ b/lib/accelerated/x86/files.mk
@@ -1,9 +1,9 @@
-X86_FILES_ELF=elf/aesni-x86.s elf/cpuid-x86.s elf/sha1-ssse3-x86.s elf/sha256-ssse3-x86.s elf/sha512-ssse3-x86.s elf/aes-ssse3-x86.s
-X86_FILES_COFF=coff/aesni-x86.s coff/cpuid-x86.s coff/sha1-ssse3-x86.s coff/sha256-ssse3-x86.s coff/sha512-ssse3-x86.s coff/aes-ssse3-x86.s
-X86_FILES_MACOSX=macosx/aesni-x86.s macosx/cpuid-x86.s macosx/sha1-ssse3-x86.s macosx/sha256-ssse3-x86.s macosx/sha512-ssse3-x86.s macosx/aes-ssse3-x86.s
-X86_64_FILES_ELF=elf/aesni-x86_64.s elf/cpuid-x86_64.s elf/ghash-x86_64.s elf/sha1-ssse3-x86_64.s elf/sha512-ssse3-x86_64.s elf/aes-ssse3-x86_64.s elf/aesni-gcm-x86_64.s
-X86_64_FILES_COFF=coff/aesni-x86_64.s coff/cpuid-x86_64.s coff/ghash-x86_64.s coff/sha1-ssse3-x86_64.s coff/sha512-ssse3-x86_64.s coff/aes-ssse3-x86_64.s coff/aesni-gcm-x86_64.s
-X86_64_FILES_MACOSX=macosx/aesni-x86_64.s macosx/cpuid-x86_64.s macosx/ghash-x86_64.s macosx/sha1-ssse3-x86_64.s macosx/sha512-ssse3-x86_64.s macosx/aes-ssse3-x86_64.s macosx/aesni-gcm-x86_64.s
+X86_FILES_ELF=elf/aesni-x86.s elf/sha1-ssse3-x86.s elf/sha256-ssse3-x86.s elf/sha512-ssse3-x86.s elf/aes-ssse3-x86.s
+X86_FILES_COFF=coff/aesni-x86.s coff/sha1-ssse3-x86.s coff/sha256-ssse3-x86.s coff/sha512-ssse3-x86.s coff/aes-ssse3-x86.s
+X86_FILES_MACOSX=macosx/aesni-x86.s macosx/sha1-ssse3-x86.s macosx/sha256-ssse3-x86.s macosx/sha512-ssse3-x86.s macosx/aes-ssse3-x86.s
+X86_64_FILES_ELF=elf/aesni-x86_64.s elf/ghash-x86_64.s elf/sha1-ssse3-x86_64.s elf/sha512-ssse3-x86_64.s elf/aes-ssse3-x86_64.s elf/aesni-gcm-x86_64.s elf/sha256-ssse3-x86_64.s
+X86_64_FILES_COFF=coff/aesni-x86_64.s coff/ghash-x86_64.s coff/sha1-ssse3-x86_64.s coff/sha512-ssse3-x86_64.s coff/aes-ssse3-x86_64.s coff/aesni-gcm-x86_64.s coff/sha256-ssse3-x86_64.s
+X86_64_FILES_MACOSX=macosx/aesni-x86_64.s macosx/ghash-x86_64.s macosx/sha1-ssse3-x86_64.s macosx/sha512-ssse3-x86_64.s macosx/aes-ssse3-x86_64.s macosx/aesni-gcm-x86_64.s macosx/sha256-ssse3-x86_64.s
 X86_PADLOCK_FILES_ELF=elf/e_padlock-x86.s
 X86_PADLOCK_FILES_COFF=coff/e_padlock-x86.s
 X86_PADLOCK_FILES_MACOSX=macosx/e_padlock-x86.s
diff --git a/lib/accelerated/x86/hmac-padlock.c b/lib/accelerated/x86/hmac-padlock.c
index 5e1f918fa7..be6c55bc33 100644
--- a/lib/accelerated/x86/hmac-padlock.c
+++ b/lib/accelerated/x86/hmac-padlock.c
@@ -223,6 +223,25 @@ static int wrap_padlock_hmac_init(gnutls_mac_algorithm_t algo, void **_ctx)
 	return 0;
 }
 
+static void *
+wrap_padlock_hmac_copy(const void *_ctx)
+{
+	struct padlock_hmac_ctx *new_ctx;
+	const struct padlock_hmac_ctx *ctx=_ctx;
+	ptrdiff_t off = (uint8_t *)ctx->ctx_ptr - (uint8_t *)(&ctx->ctx);
+
+	new_ctx = gnutls_malloc(sizeof(struct padlock_hmac_ctx));
+	if (new_ctx == NULL) {
+		gnutls_assert();
+		return NULL;
+	}
+
+	memcpy(new_ctx, ctx, sizeof(*new_ctx));
+	new_ctx->ctx_ptr = (uint8_t *)&new_ctx->ctx + off;
+
+	return new_ctx;
+}
+
 static int
 wrap_padlock_hmac_setkey(void *_ctx, const void *key, size_t keylen)
 {
@@ -344,6 +363,7 @@ const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock_nano = {
 	.setnonce = NULL,
 	.hash = wrap_padlock_hmac_update,
 	.output = wrap_padlock_hmac_output,
+	.copy = wrap_padlock_hmac_copy,
 	.deinit = wrap_padlock_hmac_deinit,
 	.fast = wrap_padlock_hmac_fast,
 };
diff --git a/lib/accelerated/x86/hmac-x86-ssse3.c b/lib/accelerated/x86/hmac-x86-ssse3.c
index 62adf0c4ef..f4ead02c47 100644
--- a/lib/accelerated/x86/hmac-x86-ssse3.c
+++ b/lib/accelerated/x86/hmac-x86-ssse3.c
@@ -45,10 +45,8 @@ struct x86_hmac_ctx {
 		struct hmac_sha1_ctx sha1;
 		struct hmac_sha224_ctx sha224;
 		struct hmac_sha256_ctx sha256;
-#ifdef ENABLE_SHA512
 		struct hmac_sha384_ctx sha384;
 		struct hmac_sha512_ctx sha512;
-#endif
 	} ctx;
 
 	void *ctx_ptr;
@@ -115,7 +113,6 @@ x86_hmac_sha224_digest(struct hmac_sha224_ctx *ctx,
 	HMAC_DIGEST(ctx, &x86_sha224, length, digest);
 }
 
-#ifdef ENABLE_SHA512
 static void
 x86_hmac_sha384_set_key(struct hmac_sha384_ctx *ctx,
 			    size_t key_length, const uint8_t * key)
@@ -150,7 +147,6 @@ x86_hmac_sha512_digest(struct hmac_sha512_ctx *ctx,
 {
 	HMAC_DIGEST(ctx, &x86_sha512, length, digest);
 }
-#endif
 
 static int
 _hmac_ctx_init(gnutls_mac_algorithm_t algo, struct x86_hmac_ctx *ctx)
@@ -177,7 +173,6 @@ _hmac_ctx_init(gnutls_mac_algorithm_t algo, struct x86_hmac_ctx *ctx)
 		ctx->ctx_ptr = &ctx->ctx.sha256;
 		ctx->length = SHA256_DIGEST_SIZE;
 		break;
-#ifdef ENABLE_SHA512
 	case GNUTLS_MAC_SHA384:
 		ctx->update = (update_func) x86_hmac_sha512_update;
 		ctx->digest = (digest_func) x86_hmac_sha384_digest;
@@ -192,7 +187,6 @@ _hmac_ctx_init(gnutls_mac_algorithm_t algo, struct x86_hmac_ctx *ctx)
 		ctx->ctx_ptr = &ctx->ctx.sha512;
 		ctx->length = SHA512_DIGEST_SIZE;
 		break;
-#endif
 	default:
 		gnutls_assert();
 		return GNUTLS_E_INVALID_REQUEST;
@@ -224,6 +218,25 @@ static int wrap_x86_hmac_init(gnutls_mac_algorithm_t algo, void **_ctx)
 	return 0;
 }
 
+static void *
+wrap_x86_hmac_copy(const void *_ctx)
+{
+	struct x86_hmac_ctx *new_ctx;
+	const struct x86_hmac_ctx *ctx=_ctx;
+	ptrdiff_t off = (uint8_t *)ctx->ctx_ptr - (uint8_t *)(&ctx->ctx);
+
+	new_ctx = gnutls_malloc(sizeof(struct x86_hmac_ctx));
+	if (new_ctx == NULL) {
+		gnutls_assert();
+		return NULL;
+	}
+
+	memcpy(new_ctx, ctx, sizeof(*new_ctx));
+	new_ctx->ctx_ptr = (uint8_t *)&new_ctx->ctx + off;
+
+	return new_ctx;
+}
+
 static int
 wrap_x86_hmac_setkey(void *_ctx, const void *key, size_t keylen)
 {
@@ -293,6 +306,7 @@ const gnutls_crypto_mac_st _gnutls_hmac_sha_x86_ssse3 = {
 	.setnonce = NULL,
 	.hash = wrap_x86_hmac_update,
 	.output = wrap_x86_hmac_output,
+	.copy = wrap_x86_hmac_copy,
 	.deinit = wrap_x86_hmac_deinit,
 	.fast = wrap_x86_hmac_fast,
 };
diff --git a/lib/accelerated/x86/macosx/aes-ssse3-x86.s b/lib/accelerated/x86/macosx/aes-ssse3-x86.s
index c881a3d888..4be899281b 100644
--- a/lib/accelerated/x86/macosx/aes-ssse3-x86.s
+++ b/lib/accelerated/x86/macosx/aes-ssse3-x86.s
@@ -5,12 +5,11 @@
 ## By Mike Hamburg (Stanford University), 2009
 ## Public domain.
 ##
-## For details see https://shiftleft.org/papers/vector_aes/ and
-## https://crypto.stanford.edu/vpaes/.
+## For details see http://shiftleft.org/papers/vector_aes/ and
+## http://crypto.stanford.edu/vpaes/.
 #
 # *** This file is auto-generated ***
 #
-.file	"vpaes-x86.s"
 .text
 .align	6,0x90
 L_vpaes_consts:
diff --git a/lib/accelerated/x86/macosx/aes-ssse3-x86_64.s b/lib/accelerated/x86/macosx/aes-ssse3-x86_64.s
index 414bb483e0..3d5c652266 100644
--- a/lib/accelerated/x86/macosx/aes-ssse3-x86_64.s
+++ b/lib/accelerated/x86/macosx/aes-ssse3-x86_64.s
@@ -5,8 +5,8 @@
 ## By Mike Hamburg (Stanford University), 2009
 ## Public domain.
 ##
-## For details see https://shiftleft.org/papers/vector_aes/ and
-## https://crypto.stanford.edu/vpaes/.
+## For details see http://shiftleft.org/papers/vector_aes/ and
+## http://crypto.stanford.edu/vpaes/.
 #
 # *** This file is auto-generated ***
 #
@@ -30,6 +30,7 @@
 
 .p2align	4
 _vpaes_encrypt_core:
+
 	movq	%rdx,%r9
 	movq	$16,%r11
 	movl	240(%rdx),%eax
@@ -118,8 +119,10 @@ L$enc_entry:
 
 
 
+
 .p2align	4
 _vpaes_decrypt_core:
+
 	movq	%rdx,%r9
 	movl	240(%rdx),%eax
 	movdqa	%xmm9,%xmm1
@@ -224,6 +227,7 @@ L$dec_entry:
 
 
 
+
 .p2align	4
 _vpaes_schedule_core:
 
@@ -231,6 +235,7 @@ _vpaes_schedule_core:
 
 
 
+
 	call	_vpaes_preheat
 	movdqa	L$k_rcon(%rip),%xmm8
 	movdqu	(%rdi),%xmm0
@@ -409,8 +414,10 @@ L$schedule_mangle_last_dec:
 
 
 
+
 .p2align	4
 _vpaes_schedule_192_smear:
+
 	pshufd	$0x80,%xmm6,%xmm1
 	pshufd	$0xFE,%xmm7,%xmm0
 	pxor	%xmm1,%xmm6
@@ -440,9 +447,11 @@ _vpaes_schedule_192_smear:
 
 
 
+
 .p2align	4
 _vpaes_schedule_round:
 
+
 	pxor	%xmm1,%xmm1
 .byte	102,65,15,58,15,200,15
 .byte	102,69,15,58,15,192,15
@@ -507,8 +516,10 @@ _vpaes_schedule_low_round:
 
 
 
+
 .p2align	4
 _vpaes_schedule_transform:
+
 	movdqa	%xmm9,%xmm1
 	pandn	%xmm0,%xmm1
 	psrld	$4,%xmm1
@@ -545,8 +556,10 @@ _vpaes_schedule_transform:
 
 
 
+
 .p2align	4
 _vpaes_schedule_mangle:
+
 	movdqa	%xmm0,%xmm4
 	movdqa	L$k_mc_forward(%rip),%xmm5
 	testq	%rcx,%rcx
@@ -616,10 +629,12 @@ L$schedule_mangle_both:
 
 
 
+
 .globl	_vpaes_set_encrypt_key
 
 .p2align	4
 _vpaes_set_encrypt_key:
+
 	movl	%esi,%eax
 	shrl	$5,%eax
 	addl	$5,%eax
@@ -632,10 +647,12 @@ _vpaes_set_encrypt_key:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_vpaes_set_decrypt_key
 
 .p2align	4
 _vpaes_set_decrypt_key:
+
 	movl	%esi,%eax
 	shrl	$5,%eax
 	addl	$5,%eax
@@ -653,10 +670,12 @@ _vpaes_set_decrypt_key:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_vpaes_encrypt
 
 .p2align	4
 _vpaes_encrypt:
+
 	movdqu	(%rdi),%xmm0
 	call	_vpaes_preheat
 	call	_vpaes_encrypt_core
@@ -664,20 +683,24 @@ _vpaes_encrypt:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_vpaes_decrypt
 
 .p2align	4
 _vpaes_decrypt:
+
 	movdqu	(%rdi),%xmm0
 	call	_vpaes_preheat
 	call	_vpaes_decrypt_core
 	movdqu	%xmm0,(%rsi)
 	.byte	0xf3,0xc3
 
+
 .globl	_vpaes_cbc_encrypt
 
 .p2align	4
 _vpaes_cbc_encrypt:
+
 	xchgq	%rcx,%rdx
 	subq	$16,%rcx
 	jc	L$cbc_abort
@@ -721,8 +744,10 @@ L$cbc_abort:
 
 
 
+
 .p2align	4
 _vpaes_preheat:
+
 	leaq	L$k_s0F(%rip),%r10
 	movdqa	-32(%r10),%xmm10
 	movdqa	-16(%r10),%xmm11
@@ -739,6 +764,7 @@ _vpaes_preheat:
 
 
 
+
 .p2align	6
 _vpaes_consts:
 L$k_inv:
diff --git a/lib/accelerated/x86/macosx/aesni-gcm-x86_64.s b/lib/accelerated/x86/macosx/aesni-gcm-x86_64.s
index 002041cee2..d540930b5b 100644
--- a/lib/accelerated/x86/macosx/aesni-gcm-x86_64.s
+++ b/lib/accelerated/x86/macosx/aesni-gcm-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -354,17 +354,25 @@ L$6x_done:
 
 .p2align	5
 _aesni_gcm_decrypt:
+
 	xorq	%r10,%r10
 	cmpq	$0x60,%rdx
 	jb	L$gcm_dec_abort
 
 	leaq	(%rsp),%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
+
 	vzeroupper
 
 	vmovdqu	(%r8),%xmm1
@@ -426,17 +434,25 @@ L$dec_no_key_aliasing:
 
 	vzeroupper
 	movq	-48(%rax),%r15
+
 	movq	-40(%rax),%r14
+
 	movq	-32(%rax),%r13
+
 	movq	-24(%rax),%r12
+
 	movq	-16(%rax),%rbp
+
 	movq	-8(%rax),%rbx
+
 	leaq	(%rax),%rsp
+
 L$gcm_dec_abort:
 	movq	%r10,%rax
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 _aesni_ctr32_6x:
 	vmovdqu	0-128(%rcx),%xmm4
@@ -531,17 +547,25 @@ L$handle_ctr32_2:
 
 .p2align	5
 _aesni_gcm_encrypt:
+
 	xorq	%r10,%r10
 	cmpq	$288,%rdx
 	jb	L$gcm_enc_abort
 
 	leaq	(%rsp),%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
+
 	vzeroupper
 
 	vmovdqu	(%r8),%xmm1
@@ -767,16 +791,24 @@ L$enc_no_key_aliasing:
 
 	vzeroupper
 	movq	-48(%rax),%r15
+
 	movq	-40(%rax),%r14
+
 	movq	-32(%rax),%r13
+
 	movq	-24(%rax),%r12
+
 	movq	-16(%rax),%rbp
+
 	movq	-8(%rax),%rbx
+
 	leaq	(%rax),%rsp
+
 L$gcm_enc_abort:
 	movq	%r10,%rax
 	.byte	0xf3,0xc3
 
+
 .p2align	6
 L$bswap_mask:
 .byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
diff --git a/lib/accelerated/x86/macosx/aesni-x86.s b/lib/accelerated/x86/macosx/aesni-x86.s
index 09ca1cbc5c..ee50089146 100644
--- a/lib/accelerated/x86/macosx/aesni-x86.s
+++ b/lib/accelerated/x86/macosx/aesni-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"devel/perlasm/aesni-x86.s"
 .text
 .globl	_aesni_encrypt
 .align	4
@@ -59,7 +58,10 @@ L000enc1_loop_1:
 	leal	16(%edx),%edx
 	jnz	L000enc1_loop_1
 .byte	102,15,56,221,209
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movups	%xmm2,(%eax)
+	pxor	%xmm2,%xmm2
 	ret
 .globl	_aesni_decrypt
 .align	4
@@ -81,30 +83,84 @@ L001dec1_loop_2:
 	leal	16(%edx),%edx
 	jnz	L001dec1_loop_2
 .byte	102,15,56,223,209
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movups	%xmm2,(%eax)
+	pxor	%xmm2,%xmm2
+	ret
+.align	4
+__aesni_encrypt2:
+	movups	(%edx),%xmm0
+	shll	$4,%ecx
+	movups	16(%edx),%xmm1
+	xorps	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+L002enc2_loop:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L002enc2_loop
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,221,208
+.byte	102,15,56,221,216
+	ret
+.align	4
+__aesni_decrypt2:
+	movups	(%edx),%xmm0
+	shll	$4,%ecx
+	movups	16(%edx),%xmm1
+	xorps	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+L003dec2_loop:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L003dec2_loop
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,223,208
+.byte	102,15,56,223,216
 	ret
 .align	4
 __aesni_encrypt3:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
-	movups	(%edx),%xmm0
-L002enc3_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+L004enc3_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
-	movups	(%edx),%xmm0
-	jnz	L002enc3_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L004enc3_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -115,25 +171,26 @@ L002enc3_loop:
 .align	4
 __aesni_decrypt3:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
-	movups	(%edx),%xmm0
-L003dec3_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+	addl	$16,%ecx
+L005dec3_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
-	movups	(%edx),%xmm0
-	jnz	L003dec3_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L005dec3_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -145,27 +202,29 @@ L003dec3_loop:
 __aesni_encrypt4:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
-	shrl	$1,%ecx
-	leal	32(%edx),%edx
+	shll	$4,%ecx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
 	pxor	%xmm0,%xmm5
-	movups	(%edx),%xmm0
-L004enc4_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	15,31,64,0
+	addl	$16,%ecx
+L006enc4_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
-	movups	(%edx),%xmm0
-	jnz	L004enc4_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L006enc4_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -179,27 +238,29 @@ L004enc4_loop:
 __aesni_decrypt4:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
-	shrl	$1,%ecx
-	leal	32(%edx),%edx
+	shll	$4,%ecx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
 	pxor	%xmm0,%xmm4
 	pxor	%xmm0,%xmm5
-	movups	(%edx),%xmm0
-L005dec4_loop:
+	movups	32(%edx),%xmm0
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	15,31,64,0
+	addl	$16,%ecx
+L007dec4_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
 .byte	102,15,56,222,232
-	movups	(%edx),%xmm0
-	jnz	L005dec4_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L007dec4_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -212,45 +273,42 @@ L005dec4_loop:
 .align	4
 __aesni_encrypt6:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,220,217
+.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm5
-	decl	%ecx
-.byte	102,15,56,220,225
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,220,233
+.byte	102,15,56,220,217
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	102,15,56,220,225
 	pxor	%xmm0,%xmm7
-.byte	102,15,56,220,241
-	movups	(%edx),%xmm0
-.byte	102,15,56,220,249
-	jmp	L_aesni_encrypt6_enter
+	movups	(%edx,%ecx,1),%xmm0
+	addl	$16,%ecx
+	jmp	L008_aesni_encrypt6_inner
 .align	4,0x90
-L006enc6_loop:
+L009enc6_loop:
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	decl	%ecx
 .byte	102,15,56,220,225
+L008_aesni_encrypt6_inner:
 .byte	102,15,56,220,233
 .byte	102,15,56,220,241
 .byte	102,15,56,220,249
-.align	4,0x90
 L_aesni_encrypt6_enter:
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	leal	32(%edx),%edx
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
 .byte	102,15,56,220,240
 .byte	102,15,56,220,248
-	movups	(%edx),%xmm0
-	jnz	L006enc6_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L009enc6_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 .byte	102,15,56,220,225
@@ -267,45 +325,42 @@ L_aesni_encrypt6_enter:
 .align	4
 __aesni_decrypt6:
 	movups	(%edx),%xmm0
-	shrl	$1,%ecx
+	shll	$4,%ecx
 	movups	16(%edx),%xmm1
-	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,222,209
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,222,217
+.byte	102,15,56,222,209
 	pxor	%xmm0,%xmm5
-	decl	%ecx
-.byte	102,15,56,222,225
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,222,233
+.byte	102,15,56,222,217
+	leal	32(%edx,%ecx,1),%edx
+	negl	%ecx
+.byte	102,15,56,222,225
 	pxor	%xmm0,%xmm7
-.byte	102,15,56,222,241
-	movups	(%edx),%xmm0
-.byte	102,15,56,222,249
-	jmp	L_aesni_decrypt6_enter
+	movups	(%edx,%ecx,1),%xmm0
+	addl	$16,%ecx
+	jmp	L010_aesni_decrypt6_inner
 .align	4,0x90
-L007dec6_loop:
+L011dec6_loop:
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
-	decl	%ecx
 .byte	102,15,56,222,225
+L010_aesni_decrypt6_inner:
 .byte	102,15,56,222,233
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
-.align	4,0x90
 L_aesni_decrypt6_enter:
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
-	leal	32(%edx),%edx
 .byte	102,15,56,222,224
 .byte	102,15,56,222,232
 .byte	102,15,56,222,240
 .byte	102,15,56,222,248
-	movups	(%edx),%xmm0
-	jnz	L007dec6_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L011dec6_loop
 .byte	102,15,56,222,209
 .byte	102,15,56,222,217
 .byte	102,15,56,222,225
@@ -333,14 +388,14 @@ L_aesni_ecb_encrypt_begin:
 	movl	32(%esp),%edx
 	movl	36(%esp),%ebx
 	andl	$-16,%eax
-	jz	L008ecb_ret
+	jz	L012ecb_ret
 	movl	240(%edx),%ecx
 	testl	%ebx,%ebx
-	jz	L009ecb_decrypt
+	jz	L013ecb_decrypt
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	cmpl	$96,%eax
-	jb	L010ecb_enc_tail
+	jb	L014ecb_enc_tail
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -349,9 +404,9 @@ L_aesni_ecb_encrypt_begin:
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
 	subl	$96,%eax
-	jmp	L011ecb_enc_loop6_enter
+	jmp	L015ecb_enc_loop6_enter
 .align	4,0x90
-L012ecb_enc_loop6:
+L016ecb_enc_loop6:
 	movups	%xmm2,(%edi)
 	movdqu	(%esi),%xmm2
 	movups	%xmm3,16(%edi)
@@ -366,12 +421,12 @@ L012ecb_enc_loop6:
 	leal	96(%edi),%edi
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
-L011ecb_enc_loop6_enter:
+L015ecb_enc_loop6_enter:
 	call	__aesni_encrypt6
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
 	subl	$96,%eax
-	jnc	L012ecb_enc_loop6
+	jnc	L016ecb_enc_loop6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
@@ -380,18 +435,18 @@ L011ecb_enc_loop6_enter:
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
 	addl	$96,%eax
-	jz	L008ecb_ret
-L010ecb_enc_tail:
+	jz	L012ecb_ret
+L014ecb_enc_tail:
 	movups	(%esi),%xmm2
 	cmpl	$32,%eax
-	jb	L013ecb_enc_one
+	jb	L017ecb_enc_one
 	movups	16(%esi),%xmm3
-	je	L014ecb_enc_two
+	je	L018ecb_enc_two
 	movups	32(%esi),%xmm4
 	cmpl	$64,%eax
-	jb	L015ecb_enc_three
+	jb	L019ecb_enc_three
 	movups	48(%esi),%xmm5
-	je	L016ecb_enc_four
+	je	L020ecb_enc_four
 	movups	64(%esi),%xmm6
 	xorps	%xmm7,%xmm7
 	call	__aesni_encrypt6
@@ -400,50 +455,49 @@ L010ecb_enc_tail:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L013ecb_enc_one:
+L017ecb_enc_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L017enc1_loop_3:
+L021enc1_loop_3:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L017enc1_loop_3
+	jnz	L021enc1_loop_3
 .byte	102,15,56,221,209
 	movups	%xmm2,(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L014ecb_enc_two:
-	xorps	%xmm4,%xmm4
-	call	__aesni_encrypt3
+L018ecb_enc_two:
+	call	__aesni_encrypt2
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L015ecb_enc_three:
+L019ecb_enc_three:
 	call	__aesni_encrypt3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L016ecb_enc_four:
+L020ecb_enc_four:
 	call	__aesni_encrypt4
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L009ecb_decrypt:
+L013ecb_decrypt:
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	cmpl	$96,%eax
-	jb	L018ecb_dec_tail
+	jb	L022ecb_dec_tail
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -452,9 +506,9 @@ L009ecb_decrypt:
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
 	subl	$96,%eax
-	jmp	L019ecb_dec_loop6_enter
+	jmp	L023ecb_dec_loop6_enter
 .align	4,0x90
-L020ecb_dec_loop6:
+L024ecb_dec_loop6:
 	movups	%xmm2,(%edi)
 	movdqu	(%esi),%xmm2
 	movups	%xmm3,16(%edi)
@@ -469,12 +523,12 @@ L020ecb_dec_loop6:
 	leal	96(%edi),%edi
 	movdqu	80(%esi),%xmm7
 	leal	96(%esi),%esi
-L019ecb_dec_loop6_enter:
+L023ecb_dec_loop6_enter:
 	call	__aesni_decrypt6
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
 	subl	$96,%eax
-	jnc	L020ecb_dec_loop6
+	jnc	L024ecb_dec_loop6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
@@ -483,18 +537,18 @@ L019ecb_dec_loop6_enter:
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
 	addl	$96,%eax
-	jz	L008ecb_ret
-L018ecb_dec_tail:
+	jz	L012ecb_ret
+L022ecb_dec_tail:
 	movups	(%esi),%xmm2
 	cmpl	$32,%eax
-	jb	L021ecb_dec_one
+	jb	L025ecb_dec_one
 	movups	16(%esi),%xmm3
-	je	L022ecb_dec_two
+	je	L026ecb_dec_two
 	movups	32(%esi),%xmm4
 	cmpl	$64,%eax
-	jb	L023ecb_dec_three
+	jb	L027ecb_dec_three
 	movups	48(%esi),%xmm5
-	je	L024ecb_dec_four
+	je	L028ecb_dec_four
 	movups	64(%esi),%xmm6
 	xorps	%xmm7,%xmm7
 	call	__aesni_decrypt6
@@ -503,44 +557,51 @@ L018ecb_dec_tail:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L021ecb_dec_one:
+L025ecb_dec_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L025dec1_loop_4:
+L029dec1_loop_4:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L025dec1_loop_4
+	jnz	L029dec1_loop_4
 .byte	102,15,56,223,209
 	movups	%xmm2,(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L022ecb_dec_two:
-	xorps	%xmm4,%xmm4
-	call	__aesni_decrypt3
+L026ecb_dec_two:
+	call	__aesni_decrypt2
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L023ecb_dec_three:
+L027ecb_dec_three:
 	call	__aesni_decrypt3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	L008ecb_ret
+	jmp	L012ecb_ret
 .align	4,0x90
-L024ecb_dec_four:
+L028ecb_dec_four:
 	call	__aesni_decrypt4
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-L008ecb_ret:
+L012ecb_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -577,48 +638,56 @@ L_aesni_ccm64_encrypt_blocks_begin:
 	movl	%ebp,20(%esp)
 	movl	%ebp,24(%esp)
 	movl	%ebp,28(%esp)
-	shrl	$1,%ecx
+	shll	$4,%ecx
+	movl	$16,%ebx
 	leal	(%edx),%ebp
 	movdqa	(%esp),%xmm5
 	movdqa	%xmm7,%xmm2
-	movl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	subl	%ecx,%ebx
 .byte	102,15,56,0,253
-L026ccm64_enc_outer:
+L030ccm64_enc_outer:
 	movups	(%ebp),%xmm0
 	movl	%ebx,%ecx
 	movups	(%esi),%xmm6
 	xorps	%xmm0,%xmm2
 	movups	16(%ebp),%xmm1
 	xorps	%xmm6,%xmm0
-	leal	32(%ebp),%edx
 	xorps	%xmm0,%xmm3
-	movups	(%edx),%xmm0
-L027ccm64_enc2_loop:
+	movups	32(%ebp),%xmm0
+L031ccm64_enc2_loop:
 .byte	102,15,56,220,209
-	decl	%ecx
 .byte	102,15,56,220,217
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
-	leal	32(%edx),%edx
 .byte	102,15,56,220,216
-	movups	(%edx),%xmm0
-	jnz	L027ccm64_enc2_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L031ccm64_enc2_loop
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
 	paddq	16(%esp),%xmm7
+	decl	%eax
 .byte	102,15,56,221,208
 .byte	102,15,56,221,216
-	decl	%eax
 	leal	16(%esi),%esi
 	xorps	%xmm2,%xmm6
 	movdqa	%xmm7,%xmm2
 	movups	%xmm6,(%edi)
-	leal	16(%edi),%edi
 .byte	102,15,56,0,213
-	jnz	L026ccm64_enc_outer
+	leal	16(%edi),%edi
+	jnz	L030ccm64_enc_outer
 	movl	48(%esp),%esp
 	movl	40(%esp),%edi
 	movups	%xmm3,(%edi)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -664,71 +733,82 @@ L_aesni_ccm64_decrypt_blocks_begin:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L028enc1_loop_5:
+L032enc1_loop_5:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L028enc1_loop_5
+	jnz	L032enc1_loop_5
 .byte	102,15,56,221,209
+	shll	$4,%ebx
+	movl	$16,%ecx
 	movups	(%esi),%xmm6
 	paddq	16(%esp),%xmm7
 	leal	16(%esi),%esi
-	jmp	L029ccm64_dec_outer
+	subl	%ebx,%ecx
+	leal	32(%ebp,%ebx,1),%edx
+	movl	%ecx,%ebx
+	jmp	L033ccm64_dec_outer
 .align	4,0x90
-L029ccm64_dec_outer:
+L033ccm64_dec_outer:
 	xorps	%xmm2,%xmm6
 	movdqa	%xmm7,%xmm2
-	movl	%ebx,%ecx
 	movups	%xmm6,(%edi)
 	leal	16(%edi),%edi
 .byte	102,15,56,0,213
 	subl	$1,%eax
-	jz	L030ccm64_dec_break
+	jz	L034ccm64_dec_break
 	movups	(%ebp),%xmm0
-	shrl	$1,%ecx
+	movl	%ebx,%ecx
 	movups	16(%ebp),%xmm1
 	xorps	%xmm0,%xmm6
-	leal	32(%ebp),%edx
 	xorps	%xmm0,%xmm2
 	xorps	%xmm6,%xmm3
-	movups	(%edx),%xmm0
-L031ccm64_dec2_loop:
+	movups	32(%ebp),%xmm0
+L035ccm64_dec2_loop:
 .byte	102,15,56,220,209
-	decl	%ecx
 .byte	102,15,56,220,217
-	movups	16(%edx),%xmm1
+	movups	(%edx,%ecx,1),%xmm1
+	addl	$32,%ecx
 .byte	102,15,56,220,208
-	leal	32(%edx),%edx
 .byte	102,15,56,220,216
-	movups	(%edx),%xmm0
-	jnz	L031ccm64_dec2_loop
+	movups	-16(%edx,%ecx,1),%xmm0
+	jnz	L035ccm64_dec2_loop
 	movups	(%esi),%xmm6
 	paddq	16(%esp),%xmm7
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	leal	16(%esi),%esi
 .byte	102,15,56,221,208
 .byte	102,15,56,221,216
-	jmp	L029ccm64_dec_outer
+	leal	16(%esi),%esi
+	jmp	L033ccm64_dec_outer
 .align	4,0x90
-L030ccm64_dec_break:
+L034ccm64_dec_break:
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	xorps	%xmm0,%xmm6
 	leal	32(%edx),%edx
 	xorps	%xmm6,%xmm3
-L032enc1_loop_6:
+L036enc1_loop_6:
 .byte	102,15,56,220,217
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L032enc1_loop_6
+	jnz	L036enc1_loop_6
 .byte	102,15,56,221,217
 	movl	48(%esp),%esp
 	movl	40(%esp),%edi
 	movups	%xmm3,(%edi)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -752,7 +832,7 @@ L_aesni_ctr32_encrypt_blocks_begin:
 	andl	$-16,%esp
 	movl	%ebp,80(%esp)
 	cmpl	$1,%eax
-	je	L033ctr32_one_shortcut
+	je	L037ctr32_one_shortcut
 	movdqu	(%ebx),%xmm7
 	movl	$202182159,(%esp)
 	movl	$134810123,4(%esp)
@@ -768,63 +848,59 @@ L_aesni_ctr32_encrypt_blocks_begin:
 .byte	102,15,58,34,253,3
 	movl	240(%edx),%ecx
 	bswap	%ebx
-	pxor	%xmm1,%xmm1
 	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	movdqa	(%esp),%xmm2
-.byte	102,15,58,34,203,0
+.byte	102,15,58,34,195,0
 	leal	3(%ebx),%ebp
-.byte	102,15,58,34,197,0
+.byte	102,15,58,34,205,0
 	incl	%ebx
-.byte	102,15,58,34,203,1
+.byte	102,15,58,34,195,1
 	incl	%ebp
-.byte	102,15,58,34,197,1
+.byte	102,15,58,34,205,1
 	incl	%ebx
-.byte	102,15,58,34,203,2
+.byte	102,15,58,34,195,2
 	incl	%ebp
-.byte	102,15,58,34,197,2
-	movdqa	%xmm1,48(%esp)
-.byte	102,15,56,0,202
-	movdqa	%xmm0,64(%esp)
+.byte	102,15,58,34,205,2
+	movdqa	%xmm0,48(%esp)
 .byte	102,15,56,0,194
-	pshufd	$192,%xmm1,%xmm2
-	pshufd	$128,%xmm1,%xmm3
+	movdqu	(%edx),%xmm6
+	movdqa	%xmm1,64(%esp)
+.byte	102,15,56,0,202
+	pshufd	$192,%xmm0,%xmm2
+	pshufd	$128,%xmm0,%xmm3
 	cmpl	$6,%eax
-	jb	L034ctr32_tail
+	jb	L038ctr32_tail
+	pxor	%xmm6,%xmm7
+	shll	$4,%ecx
+	movl	$16,%ebx
 	movdqa	%xmm7,32(%esp)
-	shrl	$1,%ecx
 	movl	%edx,%ebp
-	movl	%ecx,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
 	subl	$6,%eax
-	jmp	L035ctr32_loop6
+	jmp	L039ctr32_loop6
 .align	4,0x90
-L035ctr32_loop6:
-	pshufd	$64,%xmm1,%xmm4
-	movdqa	32(%esp),%xmm1
-	pshufd	$192,%xmm0,%xmm5
-	por	%xmm1,%xmm2
-	pshufd	$128,%xmm0,%xmm6
-	por	%xmm1,%xmm3
-	pshufd	$64,%xmm0,%xmm7
-	por	%xmm1,%xmm4
-	por	%xmm1,%xmm5
-	por	%xmm1,%xmm6
-	por	%xmm1,%xmm7
-	movups	(%ebp),%xmm0
-	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
-	decl	%ecx
+L039ctr32_loop6:
+	pshufd	$64,%xmm0,%xmm4
+	movdqa	32(%esp),%xmm0
+	pshufd	$192,%xmm1,%xmm5
 	pxor	%xmm0,%xmm2
+	pshufd	$128,%xmm1,%xmm6
 	pxor	%xmm0,%xmm3
-.byte	102,15,56,220,209
+	pshufd	$64,%xmm1,%xmm7
+	movups	16(%ebp),%xmm1
 	pxor	%xmm0,%xmm4
-.byte	102,15,56,220,217
 	pxor	%xmm0,%xmm5
-.byte	102,15,56,220,225
+.byte	102,15,56,220,209
 	pxor	%xmm0,%xmm6
-.byte	102,15,56,220,233
 	pxor	%xmm0,%xmm7
+.byte	102,15,56,220,217
+	movups	32(%ebp),%xmm0
+	movl	%ebx,%ecx
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
 .byte	102,15,56,220,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,220,249
 	call	L_aesni_encrypt6_enter
 	movups	(%esi),%xmm1
@@ -835,51 +911,51 @@ L035ctr32_loop6:
 	movups	%xmm2,(%edi)
 	movdqa	16(%esp),%xmm0
 	xorps	%xmm1,%xmm4
-	movdqa	48(%esp),%xmm1
+	movdqa	64(%esp),%xmm1
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
 	paddd	%xmm0,%xmm1
-	paddd	64(%esp),%xmm0
+	paddd	48(%esp),%xmm0
 	movdqa	(%esp),%xmm2
 	movups	48(%esi),%xmm3
 	movups	64(%esi),%xmm4
 	xorps	%xmm3,%xmm5
 	movups	80(%esi),%xmm3
 	leal	96(%esi),%esi
-	movdqa	%xmm1,48(%esp)
-.byte	102,15,56,0,202
+	movdqa	%xmm0,48(%esp)
+.byte	102,15,56,0,194
 	xorps	%xmm4,%xmm6
 	movups	%xmm5,48(%edi)
 	xorps	%xmm3,%xmm7
-	movdqa	%xmm0,64(%esp)
-.byte	102,15,56,0,194
+	movdqa	%xmm1,64(%esp)
+.byte	102,15,56,0,202
 	movups	%xmm6,64(%edi)
-	pshufd	$192,%xmm1,%xmm2
+	pshufd	$192,%xmm0,%xmm2
 	movups	%xmm7,80(%edi)
 	leal	96(%edi),%edi
-	movl	%ebx,%ecx
-	pshufd	$128,%xmm1,%xmm3
+	pshufd	$128,%xmm0,%xmm3
 	subl	$6,%eax
-	jnc	L035ctr32_loop6
+	jnc	L039ctr32_loop6
 	addl	$6,%eax
-	jz	L036ctr32_ret
+	jz	L040ctr32_ret
+	movdqu	(%ebp),%xmm7
 	movl	%ebp,%edx
-	leal	1(,%ecx,2),%ecx
-	movdqa	32(%esp),%xmm7
-L034ctr32_tail:
+	pxor	32(%esp),%xmm7
+	movl	240(%ebp),%ecx
+L038ctr32_tail:
 	por	%xmm7,%xmm2
 	cmpl	$2,%eax
-	jb	L037ctr32_one
-	pshufd	$64,%xmm1,%xmm4
+	jb	L041ctr32_one
+	pshufd	$64,%xmm0,%xmm4
 	por	%xmm7,%xmm3
-	je	L038ctr32_two
-	pshufd	$192,%xmm0,%xmm5
+	je	L042ctr32_two
+	pshufd	$192,%xmm1,%xmm5
 	por	%xmm7,%xmm4
 	cmpl	$4,%eax
-	jb	L039ctr32_three
-	pshufd	$128,%xmm0,%xmm6
+	jb	L043ctr32_three
+	pshufd	$128,%xmm1,%xmm6
 	por	%xmm7,%xmm5
-	je	L040ctr32_four
+	je	L044ctr32_four
 	por	%xmm7,%xmm6
 	call	__aesni_encrypt6
 	movups	(%esi),%xmm1
@@ -897,39 +973,39 @@ L034ctr32_tail:
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
-	jmp	L036ctr32_ret
+	jmp	L040ctr32_ret
 .align	4,0x90
-L033ctr32_one_shortcut:
+L037ctr32_one_shortcut:
 	movups	(%ebx),%xmm2
 	movl	240(%edx),%ecx
-L037ctr32_one:
+L041ctr32_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L041enc1_loop_7:
+L045enc1_loop_7:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L041enc1_loop_7
+	jnz	L045enc1_loop_7
 .byte	102,15,56,221,209
 	movups	(%esi),%xmm6
 	xorps	%xmm2,%xmm6
 	movups	%xmm6,(%edi)
-	jmp	L036ctr32_ret
+	jmp	L040ctr32_ret
 .align	4,0x90
-L038ctr32_two:
-	call	__aesni_encrypt3
+L042ctr32_two:
+	call	__aesni_encrypt2
 	movups	(%esi),%xmm5
 	movups	16(%esi),%xmm6
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
-	jmp	L036ctr32_ret
+	jmp	L040ctr32_ret
 .align	4,0x90
-L039ctr32_three:
+L043ctr32_three:
 	call	__aesni_encrypt3
 	movups	(%esi),%xmm5
 	movups	16(%esi),%xmm6
@@ -940,9 +1016,9 @@ L039ctr32_three:
 	xorps	%xmm7,%xmm4
 	movups	%xmm3,16(%edi)
 	movups	%xmm4,32(%edi)
-	jmp	L036ctr32_ret
+	jmp	L040ctr32_ret
 .align	4,0x90
-L040ctr32_four:
+L044ctr32_four:
 	call	__aesni_encrypt4
 	movups	(%esi),%xmm6
 	movups	16(%esi),%xmm7
@@ -956,7 +1032,18 @@ L040ctr32_four:
 	xorps	%xmm0,%xmm5
 	movups	%xmm4,32(%edi)
 	movups	%xmm5,48(%edi)
-L036ctr32_ret:
+L040ctr32_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
 	movl	80(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -979,12 +1066,12 @@ L_aesni_xts_encrypt_begin:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L042enc1_loop_8:
+L046enc1_loop_8:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L042enc1_loop_8
+	jnz	L046enc1_loop_8
 .byte	102,15,56,221,209
 	movl	20(%esp),%esi
 	movl	24(%esp),%edi
@@ -1008,12 +1095,14 @@ L042enc1_loop_8:
 	movl	%edx,%ebp
 	movl	%ecx,%ebx
 	subl	$96,%eax
-	jc	L043xts_enc_short
-	shrl	$1,%ecx
-	movl	%ecx,%ebx
-	jmp	L044xts_enc_loop6
+	jc	L047xts_enc_short
+	shll	$4,%ecx
+	movl	$16,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	jmp	L048xts_enc_loop6
 .align	4,0x90
-L044xts_enc_loop6:
+L048xts_enc_loop6:
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,(%esp)
@@ -1049,6 +1138,7 @@ L044xts_enc_loop6:
 	pand	%xmm3,%xmm7
 	movups	(%esi),%xmm2
 	pxor	%xmm1,%xmm7
+	movl	%ebx,%ecx
 	movdqu	16(%esi),%xmm3
 	xorps	%xmm0,%xmm2
 	movdqu	32(%esi),%xmm4
@@ -1064,19 +1154,17 @@ L044xts_enc_loop6:
 	movdqa	%xmm7,80(%esp)
 	pxor	%xmm1,%xmm7
 	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
 	pxor	16(%esp),%xmm3
-.byte	102,15,56,220,209
 	pxor	32(%esp),%xmm4
-.byte	102,15,56,220,217
+.byte	102,15,56,220,209
 	pxor	48(%esp),%xmm5
-	decl	%ecx
-.byte	102,15,56,220,225
 	pxor	64(%esp),%xmm6
-.byte	102,15,56,220,233
+.byte	102,15,56,220,217
 	pxor	%xmm0,%xmm7
+	movups	32(%ebp),%xmm0
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
 .byte	102,15,56,220,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,220,249
 	call	L_aesni_encrypt6_enter
 	movdqa	80(%esp),%xmm1
@@ -1101,26 +1189,25 @@ L044xts_enc_loop6:
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
-	movl	%ebx,%ecx
 	pxor	%xmm2,%xmm1
 	subl	$96,%eax
-	jnc	L044xts_enc_loop6
-	leal	1(,%ecx,2),%ecx
+	jnc	L048xts_enc_loop6
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movl	%ecx,%ebx
-L043xts_enc_short:
+L047xts_enc_short:
 	addl	$96,%eax
-	jz	L045xts_enc_done6x
+	jz	L049xts_enc_done6x
 	movdqa	%xmm1,%xmm5
 	cmpl	$32,%eax
-	jb	L046xts_enc_one
+	jb	L050xts_enc_one
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-	je	L047xts_enc_two
+	je	L051xts_enc_two
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm6
@@ -1129,7 +1216,7 @@ L043xts_enc_short:
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
 	cmpl	$64,%eax
-	jb	L048xts_enc_three
+	jb	L052xts_enc_three
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm7
@@ -1139,7 +1226,7 @@ L043xts_enc_short:
 	pxor	%xmm2,%xmm1
 	movdqa	%xmm5,(%esp)
 	movdqa	%xmm6,16(%esp)
-	je	L049xts_enc_four
+	je	L053xts_enc_four
 	movdqa	%xmm7,32(%esp)
 	pshufd	$19,%xmm0,%xmm7
 	movdqa	%xmm1,48(%esp)
@@ -1171,9 +1258,9 @@ L043xts_enc_short:
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
-	jmp	L050xts_enc_done
+	jmp	L054xts_enc_done
 .align	4,0x90
-L046xts_enc_one:
+L050xts_enc_one:
 	movups	(%esi),%xmm2
 	leal	16(%esi),%esi
 	xorps	%xmm5,%xmm2
@@ -1181,37 +1268,36 @@ L046xts_enc_one:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L051enc1_loop_9:
+L055enc1_loop_9:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L051enc1_loop_9
+	jnz	L055enc1_loop_9
 .byte	102,15,56,221,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	movdqa	%xmm5,%xmm1
-	jmp	L050xts_enc_done
+	jmp	L054xts_enc_done
 .align	4,0x90
-L047xts_enc_two:
+L051xts_enc_two:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
 	leal	32(%esi),%esi
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
-	xorps	%xmm4,%xmm4
-	call	__aesni_encrypt3
+	call	__aesni_encrypt2
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	leal	32(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	L050xts_enc_done
+	jmp	L054xts_enc_done
 .align	4,0x90
-L048xts_enc_three:
+L052xts_enc_three:
 	movaps	%xmm1,%xmm7
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1229,9 +1315,9 @@ L048xts_enc_three:
 	movups	%xmm4,32(%edi)
 	leal	48(%edi),%edi
 	movdqa	%xmm7,%xmm1
-	jmp	L050xts_enc_done
+	jmp	L054xts_enc_done
 .align	4,0x90
-L049xts_enc_four:
+L053xts_enc_four:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1253,28 +1339,28 @@ L049xts_enc_four:
 	movups	%xmm5,48(%edi)
 	leal	64(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	L050xts_enc_done
+	jmp	L054xts_enc_done
 .align	4,0x90
-L045xts_enc_done6x:
+L049xts_enc_done6x:
 	movl	112(%esp),%eax
 	andl	$15,%eax
-	jz	L052xts_enc_ret
+	jz	L056xts_enc_ret
 	movdqa	%xmm1,%xmm5
 	movl	%eax,112(%esp)
-	jmp	L053xts_enc_steal
+	jmp	L057xts_enc_steal
 .align	4,0x90
-L050xts_enc_done:
+L054xts_enc_done:
 	movl	112(%esp),%eax
 	pxor	%xmm0,%xmm0
 	andl	$15,%eax
-	jz	L052xts_enc_ret
+	jz	L056xts_enc_ret
 	pcmpgtd	%xmm1,%xmm0
 	movl	%eax,112(%esp)
 	pshufd	$19,%xmm0,%xmm5
 	paddq	%xmm1,%xmm1
 	pand	96(%esp),%xmm5
 	pxor	%xmm1,%xmm5
-L053xts_enc_steal:
+L057xts_enc_steal:
 	movzbl	(%esi),%ecx
 	movzbl	-16(%edi),%edx
 	leal	1(%esi),%esi
@@ -1282,7 +1368,7 @@ L053xts_enc_steal:
 	movb	%dl,(%edi)
 	leal	1(%edi),%edi
 	subl	$1,%eax
-	jnz	L053xts_enc_steal
+	jnz	L057xts_enc_steal
 	subl	112(%esp),%edi
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
@@ -1292,16 +1378,30 @@ L053xts_enc_steal:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L054enc1_loop_10:
+L058enc1_loop_10:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L054enc1_loop_10
+	jnz	L058enc1_loop_10
 .byte	102,15,56,221,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,-16(%edi)
-L052xts_enc_ret:
+L056xts_enc_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	movdqa	%xmm0,(%esp)
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm0,16(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm0,80(%esp)
 	movl	116(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -1324,12 +1424,12 @@ L_aesni_xts_decrypt_begin:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L055enc1_loop_11:
+L059enc1_loop_11:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L055enc1_loop_11
+	jnz	L059enc1_loop_11
 .byte	102,15,56,221,209
 	movl	20(%esp),%esi
 	movl	24(%esp),%edi
@@ -1358,12 +1458,14 @@ L055enc1_loop_11:
 	pcmpgtd	%xmm1,%xmm0
 	andl	$-16,%eax
 	subl	$96,%eax
-	jc	L056xts_dec_short
-	shrl	$1,%ecx
-	movl	%ecx,%ebx
-	jmp	L057xts_dec_loop6
+	jc	L060xts_dec_short
+	shll	$4,%ecx
+	movl	$16,%ebx
+	subl	%ecx,%ebx
+	leal	32(%edx,%ecx,1),%edx
+	jmp	L061xts_dec_loop6
 .align	4,0x90
-L057xts_dec_loop6:
+L061xts_dec_loop6:
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,(%esp)
@@ -1399,6 +1501,7 @@ L057xts_dec_loop6:
 	pand	%xmm3,%xmm7
 	movups	(%esi),%xmm2
 	pxor	%xmm1,%xmm7
+	movl	%ebx,%ecx
 	movdqu	16(%esi),%xmm3
 	xorps	%xmm0,%xmm2
 	movdqu	32(%esi),%xmm4
@@ -1414,19 +1517,17 @@ L057xts_dec_loop6:
 	movdqa	%xmm7,80(%esp)
 	pxor	%xmm1,%xmm7
 	movups	16(%ebp),%xmm1
-	leal	32(%ebp),%edx
 	pxor	16(%esp),%xmm3
-.byte	102,15,56,222,209
 	pxor	32(%esp),%xmm4
-.byte	102,15,56,222,217
+.byte	102,15,56,222,209
 	pxor	48(%esp),%xmm5
-	decl	%ecx
-.byte	102,15,56,222,225
 	pxor	64(%esp),%xmm6
-.byte	102,15,56,222,233
+.byte	102,15,56,222,217
 	pxor	%xmm0,%xmm7
+	movups	32(%ebp),%xmm0
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
 .byte	102,15,56,222,241
-	movups	(%edx),%xmm0
 .byte	102,15,56,222,249
 	call	L_aesni_decrypt6_enter
 	movdqa	80(%esp),%xmm1
@@ -1451,26 +1552,25 @@ L057xts_dec_loop6:
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
-	movl	%ebx,%ecx
 	pxor	%xmm2,%xmm1
 	subl	$96,%eax
-	jnc	L057xts_dec_loop6
-	leal	1(,%ecx,2),%ecx
+	jnc	L061xts_dec_loop6
+	movl	240(%ebp),%ecx
 	movl	%ebp,%edx
 	movl	%ecx,%ebx
-L056xts_dec_short:
+L060xts_dec_short:
 	addl	$96,%eax
-	jz	L058xts_dec_done6x
+	jz	L062xts_dec_done6x
 	movdqa	%xmm1,%xmm5
 	cmpl	$32,%eax
-	jb	L059xts_dec_one
+	jb	L063xts_dec_one
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	paddq	%xmm1,%xmm1
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-	je	L060xts_dec_two
+	je	L064xts_dec_two
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm6
@@ -1479,7 +1579,7 @@ L056xts_dec_short:
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
 	cmpl	$64,%eax
-	jb	L061xts_dec_three
+	jb	L065xts_dec_three
 	pshufd	$19,%xmm0,%xmm2
 	pxor	%xmm0,%xmm0
 	movdqa	%xmm1,%xmm7
@@ -1489,7 +1589,7 @@ L056xts_dec_short:
 	pxor	%xmm2,%xmm1
 	movdqa	%xmm5,(%esp)
 	movdqa	%xmm6,16(%esp)
-	je	L062xts_dec_four
+	je	L066xts_dec_four
 	movdqa	%xmm7,32(%esp)
 	pshufd	$19,%xmm0,%xmm7
 	movdqa	%xmm1,48(%esp)
@@ -1521,9 +1621,9 @@ L056xts_dec_short:
 	movups	%xmm5,48(%edi)
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
-	jmp	L063xts_dec_done
+	jmp	L067xts_dec_done
 .align	4,0x90
-L059xts_dec_one:
+L063xts_dec_one:
 	movups	(%esi),%xmm2
 	leal	16(%esi),%esi
 	xorps	%xmm5,%xmm2
@@ -1531,36 +1631,36 @@ L059xts_dec_one:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L064dec1_loop_12:
+L068dec1_loop_12:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L064dec1_loop_12
+	jnz	L068dec1_loop_12
 .byte	102,15,56,223,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	movdqa	%xmm5,%xmm1
-	jmp	L063xts_dec_done
+	jmp	L067xts_dec_done
 .align	4,0x90
-L060xts_dec_two:
+L064xts_dec_two:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
 	leal	32(%esi),%esi
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
-	call	__aesni_decrypt3
+	call	__aesni_decrypt2
 	xorps	%xmm5,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
 	leal	32(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	L063xts_dec_done
+	jmp	L067xts_dec_done
 .align	4,0x90
-L061xts_dec_three:
+L065xts_dec_three:
 	movaps	%xmm1,%xmm7
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1578,9 +1678,9 @@ L061xts_dec_three:
 	movups	%xmm4,32(%edi)
 	leal	48(%edi),%edi
 	movdqa	%xmm7,%xmm1
-	jmp	L063xts_dec_done
+	jmp	L067xts_dec_done
 .align	4,0x90
-L062xts_dec_four:
+L066xts_dec_four:
 	movaps	%xmm1,%xmm6
 	movups	(%esi),%xmm2
 	movups	16(%esi),%xmm3
@@ -1602,20 +1702,20 @@ L062xts_dec_four:
 	movups	%xmm5,48(%edi)
 	leal	64(%edi),%edi
 	movdqa	%xmm6,%xmm1
-	jmp	L063xts_dec_done
+	jmp	L067xts_dec_done
 .align	4,0x90
-L058xts_dec_done6x:
+L062xts_dec_done6x:
 	movl	112(%esp),%eax
 	andl	$15,%eax
-	jz	L065xts_dec_ret
+	jz	L069xts_dec_ret
 	movl	%eax,112(%esp)
-	jmp	L066xts_dec_only_one_more
+	jmp	L070xts_dec_only_one_more
 .align	4,0x90
-L063xts_dec_done:
+L067xts_dec_done:
 	movl	112(%esp),%eax
 	pxor	%xmm0,%xmm0
 	andl	$15,%eax
-	jz	L065xts_dec_ret
+	jz	L069xts_dec_ret
 	pcmpgtd	%xmm1,%xmm0
 	movl	%eax,112(%esp)
 	pshufd	$19,%xmm0,%xmm2
@@ -1625,7 +1725,7 @@ L063xts_dec_done:
 	pand	%xmm3,%xmm2
 	pcmpgtd	%xmm1,%xmm0
 	pxor	%xmm2,%xmm1
-L066xts_dec_only_one_more:
+L070xts_dec_only_one_more:
 	pshufd	$19,%xmm0,%xmm5
 	movdqa	%xmm1,%xmm6
 	paddq	%xmm1,%xmm1
@@ -1639,16 +1739,16 @@ L066xts_dec_only_one_more:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L067dec1_loop_13:
+L071dec1_loop_13:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L067dec1_loop_13
+	jnz	L071dec1_loop_13
 .byte	102,15,56,223,209
 	xorps	%xmm5,%xmm2
 	movups	%xmm2,(%edi)
-L068xts_dec_steal:
+L072xts_dec_steal:
 	movzbl	16(%esi),%ecx
 	movzbl	(%edi),%edx
 	leal	1(%esi),%esi
@@ -1656,7 +1756,7 @@ L068xts_dec_steal:
 	movb	%dl,16(%edi)
 	leal	1(%edi),%edi
 	subl	$1,%eax
-	jnz	L068xts_dec_steal
+	jnz	L072xts_dec_steal
 	subl	112(%esp),%edi
 	movl	%ebp,%edx
 	movl	%ebx,%ecx
@@ -1666,22 +1766,822 @@ L068xts_dec_steal:
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L069dec1_loop_14:
+L073dec1_loop_14:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L069dec1_loop_14
+	jnz	L073dec1_loop_14
 .byte	102,15,56,223,209
 	xorps	%xmm6,%xmm2
 	movups	%xmm2,(%edi)
-L065xts_dec_ret:
+L069xts_dec_ret:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	movdqa	%xmm0,(%esp)
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm0,16(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm0,32(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm0,48(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm0,64(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm0,80(%esp)
 	movl	116(%esp),%esp
 	popl	%edi
 	popl	%esi
 	popl	%ebx
 	popl	%ebp
 	ret
+.globl	_aesni_ocb_encrypt
+.align	4
+_aesni_ocb_encrypt:
+L_aesni_ocb_encrypt_begin:
+	pushl	%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movl	20(%esp),%esi
+	movl	24(%esp),%edi
+	movl	28(%esp),%eax
+	movl	32(%esp),%edx
+	movdqu	(%ecx),%xmm0
+	movl	36(%esp),%ebp
+	movdqu	(%ebx),%xmm1
+	movl	44(%esp),%ebx
+	movl	%esp,%ecx
+	subl	$132,%esp
+	andl	$-16,%esp
+	subl	%esi,%edi
+	shll	$4,%eax
+	leal	-96(%esi,%eax,1),%eax
+	movl	%edi,120(%esp)
+	movl	%eax,124(%esp)
+	movl	%ecx,128(%esp)
+	movl	240(%edx),%ecx
+	testl	$1,%ebp
+	jnz	L074odd
+	bsfl	%ebp,%eax
+	addl	$1,%ebp
+	shll	$4,%eax
+	movdqu	(%ebx,%eax,1),%xmm7
+	movl	%edx,%eax
+	movdqu	(%esi),%xmm2
+	leal	16(%esi),%esi
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+L075enc1_loop_15:
+.byte	102,15,56,220,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	L075enc1_loop_15
+.byte	102,15,56,221,209
+	xorps	%xmm7,%xmm2
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm6,%xmm1
+	movups	%xmm2,-16(%edi,%esi,1)
+	movl	240(%eax),%ecx
+	movl	%eax,%edx
+	movl	124(%esp),%eax
+L074odd:
+	shll	$4,%ecx
+	movl	$16,%edi
+	subl	%ecx,%edi
+	movl	%edx,112(%esp)
+	leal	32(%edx,%ecx,1),%edx
+	movl	%edi,116(%esp)
+	cmpl	%eax,%esi
+	ja	L076short
+	jmp	L077grandloop
+.align	5,0x90
+L077grandloop:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	leal	5(%ebp),%edi
+	addl	$6,%ebp
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	bsfl	%edi,%edi
+	shll	$4,%ecx
+	shll	$4,%eax
+	shll	$4,%edi
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	movdqu	(%ebx,%edi,1),%xmm7
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movdqa	%xmm7,80(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	movdqu	80(%esi),%xmm7
+	leal	96(%esi),%esi
+	pxor	%xmm2,%xmm1
+	pxor	%xmm0,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm0,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm0,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm0,%xmm5
+	pxor	%xmm6,%xmm1
+	pxor	%xmm0,%xmm6
+	pxor	%xmm7,%xmm1
+	pxor	%xmm0,%xmm7
+	movdqa	%xmm1,96(%esp)
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	80(%esp),%xmm7
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movl	120(%esp),%edi
+	movl	124(%esp),%eax
+	call	L_aesni_encrypt6_enter
+	movdqa	80(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	%xmm0,%xmm7
+	movdqa	96(%esp),%xmm1
+	movdqu	%xmm2,-96(%edi,%esi,1)
+	movdqu	%xmm3,-80(%edi,%esi,1)
+	movdqu	%xmm4,-64(%edi,%esi,1)
+	movdqu	%xmm5,-48(%edi,%esi,1)
+	movdqu	%xmm6,-32(%edi,%esi,1)
+	movdqu	%xmm7,-16(%edi,%esi,1)
+	cmpl	%eax,%esi
+	jb	L077grandloop
+L076short:
+	addl	$96,%eax
+	subl	%esi,%eax
+	jz	L078done
+	cmpl	$32,%eax
+	jb	L079one
+	je	L080two
+	cmpl	$64,%eax
+	jb	L081three
+	je	L082four
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	pxor	%xmm7,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm0,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm0,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm0,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm0,%xmm5
+	pxor	%xmm6,%xmm1
+	pxor	%xmm0,%xmm6
+	movdqa	%xmm1,96(%esp)
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movl	120(%esp),%edi
+	call	L_aesni_encrypt6_enter
+	movdqa	64(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	%xmm0,%xmm6
+	movdqa	96(%esp),%xmm1
+	movdqu	%xmm2,(%edi,%esi,1)
+	movdqu	%xmm3,16(%edi,%esi,1)
+	movdqu	%xmm4,32(%edi,%esi,1)
+	movdqu	%xmm5,48(%edi,%esi,1)
+	movdqu	%xmm6,64(%edi,%esi,1)
+	jmp	L078done
+.align	4,0x90
+L079one:
+	movdqu	(%ebx),%xmm7
+	movl	112(%esp),%edx
+	movdqu	(%esi),%xmm2
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movl	120(%esp),%edi
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+L083enc1_loop_16:
+.byte	102,15,56,220,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	L083enc1_loop_16
+.byte	102,15,56,221,209
+	xorps	%xmm7,%xmm2
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm6,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	jmp	L078done
+.align	4,0x90
+L080two:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm6
+	movdqu	(%ebx,%ecx,1),%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm6,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm7,%xmm3
+	movdqa	%xmm1,%xmm5
+	movl	120(%esp),%edi
+	call	__aesni_encrypt2
+	xorps	%xmm6,%xmm2
+	xorps	%xmm7,%xmm3
+	movdqa	%xmm7,%xmm0
+	movdqa	%xmm5,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	movups	%xmm3,16(%edi,%esi,1)
+	jmp	L078done
+.align	4,0x90
+L081three:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm5
+	movdqu	(%ebx,%ecx,1),%xmm6
+	movdqa	%xmm5,%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm5
+	pxor	%xmm5,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm2,%xmm1
+	pxor	%xmm5,%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	%xmm6,%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm7,%xmm4
+	movdqa	%xmm1,96(%esp)
+	movl	120(%esp),%edi
+	call	__aesni_encrypt3
+	xorps	%xmm5,%xmm2
+	xorps	%xmm6,%xmm3
+	xorps	%xmm7,%xmm4
+	movdqa	%xmm7,%xmm0
+	movdqa	96(%esp),%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	movups	%xmm3,16(%edi,%esi,1)
+	movups	%xmm4,32(%edi,%esi,1)
+	jmp	L078done
+.align	4,0x90
+L082four:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	movl	112(%esp),%edx
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm4
+	movdqu	(%ebx,%ecx,1),%xmm5
+	movdqa	%xmm4,%xmm6
+	movdqu	(%ebx,%eax,1),%xmm7
+	pxor	%xmm0,%xmm4
+	movdqu	(%esi),%xmm2
+	pxor	%xmm4,%xmm5
+	movdqu	16(%esi),%xmm3
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm4,(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm5,16(%esp)
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movl	240(%edx),%ecx
+	pxor	%xmm2,%xmm1
+	pxor	(%esp),%xmm2
+	pxor	%xmm3,%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	%xmm4,%xmm1
+	pxor	%xmm6,%xmm4
+	pxor	%xmm5,%xmm1
+	pxor	%xmm7,%xmm5
+	movdqa	%xmm1,96(%esp)
+	movl	120(%esp),%edi
+	call	__aesni_encrypt4
+	xorps	(%esp),%xmm2
+	xorps	16(%esp),%xmm3
+	xorps	%xmm6,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	xorps	%xmm7,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	movdqa	%xmm7,%xmm0
+	movups	%xmm4,32(%edi,%esi,1)
+	movdqa	96(%esp),%xmm1
+	movups	%xmm5,48(%edi,%esi,1)
+L078done:
+	movl	128(%esp),%edx
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm2,16(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm2,32(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm2,48(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm2,64(%esp)
+	movdqa	%xmm2,80(%esp)
+	movdqa	%xmm2,96(%esp)
+	leal	(%edx),%esp
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movdqu	%xmm0,(%ecx)
+	pxor	%xmm0,%xmm0
+	movdqu	%xmm1,(%ebx)
+	pxor	%xmm1,%xmm1
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
+.globl	_aesni_ocb_decrypt
+.align	4
+_aesni_ocb_decrypt:
+L_aesni_ocb_decrypt_begin:
+	pushl	%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movl	20(%esp),%esi
+	movl	24(%esp),%edi
+	movl	28(%esp),%eax
+	movl	32(%esp),%edx
+	movdqu	(%ecx),%xmm0
+	movl	36(%esp),%ebp
+	movdqu	(%ebx),%xmm1
+	movl	44(%esp),%ebx
+	movl	%esp,%ecx
+	subl	$132,%esp
+	andl	$-16,%esp
+	subl	%esi,%edi
+	shll	$4,%eax
+	leal	-96(%esi,%eax,1),%eax
+	movl	%edi,120(%esp)
+	movl	%eax,124(%esp)
+	movl	%ecx,128(%esp)
+	movl	240(%edx),%ecx
+	testl	$1,%ebp
+	jnz	L084odd
+	bsfl	%ebp,%eax
+	addl	$1,%ebp
+	shll	$4,%eax
+	movdqu	(%ebx,%eax,1),%xmm7
+	movl	%edx,%eax
+	movdqu	(%esi),%xmm2
+	leal	16(%esi),%esi
+	pxor	%xmm0,%xmm7
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+L085dec1_loop_17:
+.byte	102,15,56,222,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	L085dec1_loop_17
+.byte	102,15,56,223,209
+	xorps	%xmm7,%xmm2
+	movaps	%xmm6,%xmm1
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm1
+	movups	%xmm2,-16(%edi,%esi,1)
+	movl	240(%eax),%ecx
+	movl	%eax,%edx
+	movl	124(%esp),%eax
+L084odd:
+	shll	$4,%ecx
+	movl	$16,%edi
+	subl	%ecx,%edi
+	movl	%edx,112(%esp)
+	leal	32(%edx,%ecx,1),%edx
+	movl	%edi,116(%esp)
+	cmpl	%eax,%esi
+	ja	L086short
+	jmp	L087grandloop
+.align	5,0x90
+L087grandloop:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	leal	5(%ebp),%edi
+	addl	$6,%ebp
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	bsfl	%edi,%edi
+	shll	$4,%ecx
+	shll	$4,%eax
+	shll	$4,%edi
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	movdqu	(%ebx,%edi,1),%xmm7
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movdqa	%xmm7,80(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	movdqu	80(%esi),%xmm7
+	leal	96(%esi),%esi
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	pxor	%xmm0,%xmm4
+	pxor	%xmm0,%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm0,%xmm7
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	80(%esp),%xmm7
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movl	120(%esp),%edi
+	movl	124(%esp),%eax
+	call	L_aesni_decrypt6_enter
+	movdqa	80(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	movdqa	96(%esp),%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	pxor	%xmm0,%xmm7
+	pxor	%xmm2,%xmm1
+	movdqu	%xmm2,-96(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqu	%xmm3,-80(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movdqu	%xmm4,-64(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+	movdqu	%xmm5,-48(%edi,%esi,1)
+	pxor	%xmm6,%xmm1
+	movdqu	%xmm6,-32(%edi,%esi,1)
+	pxor	%xmm7,%xmm1
+	movdqu	%xmm7,-16(%edi,%esi,1)
+	cmpl	%eax,%esi
+	jb	L087grandloop
+L086short:
+	addl	$96,%eax
+	subl	%esi,%eax
+	jz	L088done
+	cmpl	$32,%eax
+	jb	L089one
+	je	L090two
+	cmpl	$64,%eax
+	jb	L091three
+	je	L092four
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm2
+	movdqu	(%ebx,%ecx,1),%xmm3
+	movl	116(%esp),%ecx
+	movdqa	%xmm2,%xmm4
+	movdqu	(%ebx,%eax,1),%xmm5
+	movdqa	%xmm2,%xmm6
+	pxor	%xmm0,%xmm2
+	pxor	%xmm2,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm3,%xmm4
+	movdqa	%xmm3,16(%esp)
+	pxor	%xmm4,%xmm5
+	movdqa	%xmm4,32(%esp)
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm5,48(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm6,64(%esp)
+	movups	-48(%edx,%ecx,1),%xmm0
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movdqu	64(%esi),%xmm6
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm2
+	pxor	%xmm0,%xmm3
+	pxor	%xmm0,%xmm4
+	pxor	%xmm0,%xmm5
+	pxor	%xmm0,%xmm6
+	movups	-32(%edx,%ecx,1),%xmm1
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	64(%esp),%xmm6
+	movups	-16(%edx,%ecx,1),%xmm0
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movl	120(%esp),%edi
+	call	L_aesni_decrypt6_enter
+	movdqa	64(%esp),%xmm0
+	pxor	(%esp),%xmm2
+	movdqa	96(%esp),%xmm1
+	pxor	16(%esp),%xmm3
+	pxor	32(%esp),%xmm4
+	pxor	48(%esp),%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm2,%xmm1
+	movdqu	%xmm2,(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqu	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movdqu	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+	movdqu	%xmm5,48(%edi,%esi,1)
+	pxor	%xmm6,%xmm1
+	movdqu	%xmm6,64(%edi,%esi,1)
+	jmp	L088done
+.align	4,0x90
+L089one:
+	movdqu	(%ebx),%xmm7
+	movl	112(%esp),%edx
+	movdqu	(%esi),%xmm2
+	movl	240(%edx),%ecx
+	pxor	%xmm0,%xmm7
+	pxor	%xmm7,%xmm2
+	movdqa	%xmm1,%xmm6
+	movl	120(%esp),%edi
+	movups	(%edx),%xmm0
+	movups	16(%edx),%xmm1
+	leal	32(%edx),%edx
+	xorps	%xmm0,%xmm2
+L093dec1_loop_18:
+.byte	102,15,56,222,209
+	decl	%ecx
+	movups	(%edx),%xmm1
+	leal	16(%edx),%edx
+	jnz	L093dec1_loop_18
+.byte	102,15,56,223,209
+	xorps	%xmm7,%xmm2
+	movaps	%xmm6,%xmm1
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm1
+	movups	%xmm2,(%edi,%esi,1)
+	jmp	L088done
+.align	4,0x90
+L090two:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm6
+	movdqu	(%ebx,%ecx,1),%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,%xmm5
+	pxor	%xmm0,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm6,%xmm2
+	pxor	%xmm7,%xmm3
+	movl	120(%esp),%edi
+	call	__aesni_decrypt2
+	xorps	%xmm6,%xmm2
+	xorps	%xmm7,%xmm3
+	movdqa	%xmm7,%xmm0
+	xorps	%xmm2,%xmm5
+	movups	%xmm2,(%edi,%esi,1)
+	xorps	%xmm3,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	movaps	%xmm5,%xmm1
+	jmp	L088done
+.align	4,0x90
+L091three:
+	leal	1(%ebp),%ecx
+	movl	112(%esp),%edx
+	bsfl	%ecx,%ecx
+	shll	$4,%ecx
+	movdqu	(%ebx),%xmm5
+	movdqu	(%ebx,%ecx,1),%xmm6
+	movdqa	%xmm5,%xmm7
+	movdqu	(%esi),%xmm2
+	movdqu	16(%esi),%xmm3
+	movdqu	32(%esi),%xmm4
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,96(%esp)
+	pxor	%xmm0,%xmm5
+	pxor	%xmm5,%xmm6
+	pxor	%xmm6,%xmm7
+	pxor	%xmm5,%xmm2
+	pxor	%xmm6,%xmm3
+	pxor	%xmm7,%xmm4
+	movl	120(%esp),%edi
+	call	__aesni_decrypt3
+	movdqa	96(%esp),%xmm1
+	xorps	%xmm5,%xmm2
+	xorps	%xmm6,%xmm3
+	xorps	%xmm7,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	pxor	%xmm2,%xmm1
+	movdqa	%xmm7,%xmm0
+	movups	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movups	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	jmp	L088done
+.align	4,0x90
+L092four:
+	leal	1(%ebp),%ecx
+	leal	3(%ebp),%eax
+	bsfl	%ecx,%ecx
+	bsfl	%eax,%eax
+	movl	112(%esp),%edx
+	shll	$4,%ecx
+	shll	$4,%eax
+	movdqu	(%ebx),%xmm4
+	movdqu	(%ebx,%ecx,1),%xmm5
+	movdqa	%xmm4,%xmm6
+	movdqu	(%ebx,%eax,1),%xmm7
+	pxor	%xmm0,%xmm4
+	movdqu	(%esi),%xmm2
+	pxor	%xmm4,%xmm5
+	movdqu	16(%esi),%xmm3
+	pxor	%xmm5,%xmm6
+	movdqa	%xmm4,(%esp)
+	pxor	%xmm6,%xmm7
+	movdqa	%xmm5,16(%esp)
+	movdqu	32(%esi),%xmm4
+	movdqu	48(%esi),%xmm5
+	movl	240(%edx),%ecx
+	movdqa	%xmm1,96(%esp)
+	pxor	(%esp),%xmm2
+	pxor	16(%esp),%xmm3
+	pxor	%xmm6,%xmm4
+	pxor	%xmm7,%xmm5
+	movl	120(%esp),%edi
+	call	__aesni_decrypt4
+	movdqa	96(%esp),%xmm1
+	xorps	(%esp),%xmm2
+	xorps	16(%esp),%xmm3
+	xorps	%xmm6,%xmm4
+	movups	%xmm2,(%edi,%esi,1)
+	pxor	%xmm2,%xmm1
+	xorps	%xmm7,%xmm5
+	movups	%xmm3,16(%edi,%esi,1)
+	pxor	%xmm3,%xmm1
+	movdqa	%xmm7,%xmm0
+	movups	%xmm4,32(%edi,%esi,1)
+	pxor	%xmm4,%xmm1
+	movups	%xmm5,48(%edi,%esi,1)
+	pxor	%xmm5,%xmm1
+L088done:
+	movl	128(%esp),%edx
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	movdqa	%xmm2,(%esp)
+	pxor	%xmm4,%xmm4
+	movdqa	%xmm2,16(%esp)
+	pxor	%xmm5,%xmm5
+	movdqa	%xmm2,32(%esp)
+	pxor	%xmm6,%xmm6
+	movdqa	%xmm2,48(%esp)
+	pxor	%xmm7,%xmm7
+	movdqa	%xmm2,64(%esp)
+	movdqa	%xmm2,80(%esp)
+	movdqa	%xmm2,96(%esp)
+	leal	(%edx),%esp
+	movl	40(%esp),%ecx
+	movl	48(%esp),%ebx
+	movdqu	%xmm0,(%ecx)
+	pxor	%xmm0,%xmm0
+	movdqu	%xmm1,(%ebx)
+	pxor	%xmm1,%xmm1
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
 .globl	_aesni_cbc_encrypt
 .align	4
 _aesni_cbc_encrypt:
@@ -1699,7 +2599,7 @@ L_aesni_cbc_encrypt_begin:
 	movl	32(%esp),%edx
 	movl	36(%esp),%ebp
 	testl	%eax,%eax
-	jz	L070cbc_abort
+	jz	L094cbc_abort
 	cmpl	$0,40(%esp)
 	xchgl	%esp,%ebx
 	movups	(%ebp),%xmm7
@@ -1707,14 +2607,14 @@ L_aesni_cbc_encrypt_begin:
 	movl	%edx,%ebp
 	movl	%ebx,16(%esp)
 	movl	%ecx,%ebx
-	je	L071cbc_decrypt
+	je	L095cbc_decrypt
 	movaps	%xmm7,%xmm2
 	cmpl	$16,%eax
-	jb	L072cbc_enc_tail
+	jb	L096cbc_enc_tail
 	subl	$16,%eax
-	jmp	L073cbc_enc_loop
+	jmp	L097cbc_enc_loop
 .align	4,0x90
-L073cbc_enc_loop:
+L097cbc_enc_loop:
 	movups	(%esi),%xmm7
 	leal	16(%esi),%esi
 	movups	(%edx),%xmm0
@@ -1722,24 +2622,25 @@ L073cbc_enc_loop:
 	xorps	%xmm0,%xmm7
 	leal	32(%edx),%edx
 	xorps	%xmm7,%xmm2
-L074enc1_loop_15:
+L098enc1_loop_19:
 .byte	102,15,56,220,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L074enc1_loop_15
+	jnz	L098enc1_loop_19
 .byte	102,15,56,221,209
 	movl	%ebx,%ecx
 	movl	%ebp,%edx
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
 	subl	$16,%eax
-	jnc	L073cbc_enc_loop
+	jnc	L097cbc_enc_loop
 	addl	$16,%eax
-	jnz	L072cbc_enc_tail
+	jnz	L096cbc_enc_tail
 	movaps	%xmm2,%xmm7
-	jmp	L075cbc_ret
-L072cbc_enc_tail:
+	pxor	%xmm2,%xmm2
+	jmp	L099cbc_ret
+L096cbc_enc_tail:
 	movl	%eax,%ecx
 .long	2767451785
 	movl	$16,%ecx
@@ -1750,20 +2651,20 @@ L072cbc_enc_tail:
 	movl	%ebx,%ecx
 	movl	%edi,%esi
 	movl	%ebp,%edx
-	jmp	L073cbc_enc_loop
+	jmp	L097cbc_enc_loop
 .align	4,0x90
-L071cbc_decrypt:
+L095cbc_decrypt:
 	cmpl	$80,%eax
-	jbe	L076cbc_dec_tail
+	jbe	L100cbc_dec_tail
 	movaps	%xmm7,(%esp)
 	subl	$80,%eax
-	jmp	L077cbc_dec_loop6_enter
+	jmp	L101cbc_dec_loop6_enter
 .align	4,0x90
-L078cbc_dec_loop6:
+L102cbc_dec_loop6:
 	movaps	%xmm0,(%esp)
 	movups	%xmm7,(%edi)
 	leal	16(%edi),%edi
-L077cbc_dec_loop6_enter:
+L101cbc_dec_loop6_enter:
 	movdqu	(%esi),%xmm2
 	movdqu	16(%esi),%xmm3
 	movdqu	32(%esi),%xmm4
@@ -1793,28 +2694,28 @@ L077cbc_dec_loop6_enter:
 	movups	%xmm6,64(%edi)
 	leal	80(%edi),%edi
 	subl	$96,%eax
-	ja	L078cbc_dec_loop6
+	ja	L102cbc_dec_loop6
 	movaps	%xmm7,%xmm2
 	movaps	%xmm0,%xmm7
 	addl	$80,%eax
-	jle	L079cbc_dec_tail_collected
+	jle	L103cbc_dec_clear_tail_collected
 	movups	%xmm2,(%edi)
 	leal	16(%edi),%edi
-L076cbc_dec_tail:
+L100cbc_dec_tail:
 	movups	(%esi),%xmm2
 	movaps	%xmm2,%xmm6
 	cmpl	$16,%eax
-	jbe	L080cbc_dec_one
+	jbe	L104cbc_dec_one
 	movups	16(%esi),%xmm3
 	movaps	%xmm3,%xmm5
 	cmpl	$32,%eax
-	jbe	L081cbc_dec_two
+	jbe	L105cbc_dec_two
 	movups	32(%esi),%xmm4
 	cmpl	$48,%eax
-	jbe	L082cbc_dec_three
+	jbe	L106cbc_dec_three
 	movups	48(%esi),%xmm5
 	cmpl	$64,%eax
-	jbe	L083cbc_dec_four
+	jbe	L107cbc_dec_four
 	movups	64(%esi),%xmm6
 	movaps	%xmm7,(%esp)
 	movups	(%esi),%xmm2
@@ -1832,56 +2733,62 @@ L076cbc_dec_tail:
 	xorps	%xmm0,%xmm6
 	movups	%xmm2,(%edi)
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	movups	%xmm4,32(%edi)
+	pxor	%xmm4,%xmm4
 	movups	%xmm5,48(%edi)
+	pxor	%xmm5,%xmm5
 	leal	64(%edi),%edi
 	movaps	%xmm6,%xmm2
+	pxor	%xmm6,%xmm6
 	subl	$80,%eax
-	jmp	L079cbc_dec_tail_collected
+	jmp	L108cbc_dec_tail_collected
 .align	4,0x90
-L080cbc_dec_one:
+L104cbc_dec_one:
 	movups	(%edx),%xmm0
 	movups	16(%edx),%xmm1
 	leal	32(%edx),%edx
 	xorps	%xmm0,%xmm2
-L084dec1_loop_16:
+L109dec1_loop_20:
 .byte	102,15,56,222,209
 	decl	%ecx
 	movups	(%edx),%xmm1
 	leal	16(%edx),%edx
-	jnz	L084dec1_loop_16
+	jnz	L109dec1_loop_20
 .byte	102,15,56,223,209
 	xorps	%xmm7,%xmm2
 	movaps	%xmm6,%xmm7
 	subl	$16,%eax
-	jmp	L079cbc_dec_tail_collected
+	jmp	L108cbc_dec_tail_collected
 .align	4,0x90
-L081cbc_dec_two:
-	xorps	%xmm4,%xmm4
-	call	__aesni_decrypt3
+L105cbc_dec_two:
+	call	__aesni_decrypt2
 	xorps	%xmm7,%xmm2
 	xorps	%xmm6,%xmm3
 	movups	%xmm2,(%edi)
 	movaps	%xmm3,%xmm2
+	pxor	%xmm3,%xmm3
 	leal	16(%edi),%edi
 	movaps	%xmm5,%xmm7
 	subl	$32,%eax
-	jmp	L079cbc_dec_tail_collected
+	jmp	L108cbc_dec_tail_collected
 .align	4,0x90
-L082cbc_dec_three:
+L106cbc_dec_three:
 	call	__aesni_decrypt3
 	xorps	%xmm7,%xmm2
 	xorps	%xmm6,%xmm3
 	xorps	%xmm5,%xmm4
 	movups	%xmm2,(%edi)
 	movaps	%xmm4,%xmm2
+	pxor	%xmm4,%xmm4
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	leal	32(%edi),%edi
 	movups	32(%esi),%xmm7
 	subl	$48,%eax
-	jmp	L079cbc_dec_tail_collected
+	jmp	L108cbc_dec_tail_collected
 .align	4,0x90
-L083cbc_dec_four:
+L107cbc_dec_four:
 	call	__aesni_decrypt4
 	movups	16(%esi),%xmm1
 	movups	32(%esi),%xmm0
@@ -1891,28 +2798,44 @@ L083cbc_dec_four:
 	movups	%xmm2,(%edi)
 	xorps	%xmm1,%xmm4
 	movups	%xmm3,16(%edi)
+	pxor	%xmm3,%xmm3
 	xorps	%xmm0,%xmm5
 	movups	%xmm4,32(%edi)
+	pxor	%xmm4,%xmm4
 	leal	48(%edi),%edi
 	movaps	%xmm5,%xmm2
+	pxor	%xmm5,%xmm5
 	subl	$64,%eax
-L079cbc_dec_tail_collected:
+	jmp	L108cbc_dec_tail_collected
+.align	4,0x90
+L103cbc_dec_clear_tail_collected:
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+L108cbc_dec_tail_collected:
 	andl	$15,%eax
-	jnz	L085cbc_dec_tail_partial
+	jnz	L110cbc_dec_tail_partial
 	movups	%xmm2,(%edi)
-	jmp	L075cbc_ret
+	pxor	%xmm0,%xmm0
+	jmp	L099cbc_ret
 .align	4,0x90
-L085cbc_dec_tail_partial:
+L110cbc_dec_tail_partial:
 	movaps	%xmm2,(%esp)
+	pxor	%xmm0,%xmm0
 	movl	$16,%ecx
 	movl	%esp,%esi
 	subl	%eax,%ecx
 .long	2767451785
-L075cbc_ret:
+	movdqa	%xmm2,(%esp)
+L099cbc_ret:
 	movl	16(%esp),%esp
 	movl	36(%esp),%ebp
+	pxor	%xmm2,%xmm2
+	pxor	%xmm1,%xmm1
 	movups	%xmm7,(%ebp)
-L070cbc_abort:
+	pxor	%xmm7,%xmm7
+L094cbc_abort:
 	popl	%edi
 	popl	%esi
 	popl	%ebx
@@ -1920,52 +2843,62 @@ L070cbc_abort:
 	ret
 .align	4
 __aesni_set_encrypt_key:
+	pushl	%ebp
+	pushl	%ebx
 	testl	%eax,%eax
-	jz	L086bad_pointer
+	jz	L111bad_pointer
 	testl	%edx,%edx
-	jz	L086bad_pointer
+	jz	L111bad_pointer
+	call	L112pic
+L112pic:
+	popl	%ebx
+	leal	Lkey_const-L112pic(%ebx),%ebx
+	movl	L__gnutls_x86_cpuid_s$non_lazy_ptr-Lkey_const(%ebx),%ebp
 	movups	(%eax),%xmm0
 	xorps	%xmm4,%xmm4
+	movl	4(%ebp),%ebp
 	leal	16(%edx),%edx
+	andl	$268437504,%ebp
 	cmpl	$256,%ecx
-	je	L08714rounds
+	je	L11314rounds
 	cmpl	$192,%ecx
-	je	L08812rounds
+	je	L11412rounds
 	cmpl	$128,%ecx
-	jne	L089bad_keybits
+	jne	L115bad_keybits
 .align	4,0x90
-L09010rounds:
+L11610rounds:
+	cmpl	$268435456,%ebp
+	je	L11710rounds_alt
 	movl	$9,%ecx
 	movups	%xmm0,-16(%edx)
 .byte	102,15,58,223,200,1
-	call	L091key_128_cold
+	call	L118key_128_cold
 .byte	102,15,58,223,200,2
-	call	L092key_128
+	call	L119key_128
 .byte	102,15,58,223,200,4
-	call	L092key_128
+	call	L119key_128
 .byte	102,15,58,223,200,8
-	call	L092key_128
+	call	L119key_128
 .byte	102,15,58,223,200,16
-	call	L092key_128
+	call	L119key_128
 .byte	102,15,58,223,200,32
-	call	L092key_128
+	call	L119key_128
 .byte	102,15,58,223,200,64
-	call	L092key_128
+	call	L119key_128
 .byte	102,15,58,223,200,128
-	call	L092key_128
+	call	L119key_128
 .byte	102,15,58,223,200,27
-	call	L092key_128
+	call	L119key_128
 .byte	102,15,58,223,200,54
-	call	L092key_128
+	call	L119key_128
 	movups	%xmm0,(%edx)
 	movl	%ecx,80(%edx)
-	xorl	%eax,%eax
-	ret
+	jmp	L120good_key
 .align	4,0x90
-L092key_128:
+L119key_128:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
-L091key_128_cold:
+L118key_128_cold:
 	shufps	$16,%xmm0,%xmm4
 	xorps	%xmm4,%xmm0
 	shufps	$140,%xmm0,%xmm4
@@ -1974,38 +2907,91 @@ L091key_128_cold:
 	xorps	%xmm1,%xmm0
 	ret
 .align	4,0x90
-L08812rounds:
+L11710rounds_alt:
+	movdqa	(%ebx),%xmm5
+	movl	$8,%ecx
+	movdqa	32(%ebx),%xmm4
+	movdqa	%xmm0,%xmm2
+	movdqu	%xmm0,-16(%edx)
+L121loop_key128:
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	pslld	$1,%xmm4
+	leal	16(%edx),%edx
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,-16(%edx)
+	movdqa	%xmm0,%xmm2
+	decl	%ecx
+	jnz	L121loop_key128
+	movdqa	48(%ebx),%xmm4
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	pslld	$1,%xmm4
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,(%edx)
+	movdqa	%xmm0,%xmm2
+.byte	102,15,56,0,197
+.byte	102,15,56,221,196
+	movdqa	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm2,%xmm3
+	pslldq	$4,%xmm2
+	pxor	%xmm3,%xmm2
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,16(%edx)
+	movl	$9,%ecx
+	movl	%ecx,96(%edx)
+	jmp	L120good_key
+.align	4,0x90
+L11412rounds:
 	movq	16(%eax),%xmm2
+	cmpl	$268435456,%ebp
+	je	L12212rounds_alt
 	movl	$11,%ecx
 	movups	%xmm0,-16(%edx)
 .byte	102,15,58,223,202,1
-	call	L093key_192a_cold
+	call	L123key_192a_cold
 .byte	102,15,58,223,202,2
-	call	L094key_192b
+	call	L124key_192b
 .byte	102,15,58,223,202,4
-	call	L095key_192a
+	call	L125key_192a
 .byte	102,15,58,223,202,8
-	call	L094key_192b
+	call	L124key_192b
 .byte	102,15,58,223,202,16
-	call	L095key_192a
+	call	L125key_192a
 .byte	102,15,58,223,202,32
-	call	L094key_192b
+	call	L124key_192b
 .byte	102,15,58,223,202,64
-	call	L095key_192a
+	call	L125key_192a
 .byte	102,15,58,223,202,128
-	call	L094key_192b
+	call	L124key_192b
 	movups	%xmm0,(%edx)
 	movl	%ecx,48(%edx)
-	xorl	%eax,%eax
-	ret
+	jmp	L120good_key
 .align	4,0x90
-L095key_192a:
+L125key_192a:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
 .align	4,0x90
-L093key_192a_cold:
+L123key_192a_cold:
 	movaps	%xmm2,%xmm5
-L096key_192b_warm:
+L126key_192b_warm:
 	shufps	$16,%xmm0,%xmm4
 	movdqa	%xmm2,%xmm3
 	xorps	%xmm4,%xmm0
@@ -2019,56 +3005,90 @@ L096key_192b_warm:
 	pxor	%xmm3,%xmm2
 	ret
 .align	4,0x90
-L094key_192b:
+L124key_192b:
 	movaps	%xmm0,%xmm3
 	shufps	$68,%xmm0,%xmm5
 	movups	%xmm5,(%edx)
 	shufps	$78,%xmm2,%xmm3
 	movups	%xmm3,16(%edx)
 	leal	32(%edx),%edx
-	jmp	L096key_192b_warm
+	jmp	L126key_192b_warm
+.align	4,0x90
+L12212rounds_alt:
+	movdqa	16(%ebx),%xmm5
+	movdqa	32(%ebx),%xmm4
+	movl	$8,%ecx
+	movdqu	%xmm0,-16(%edx)
+L127loop_key192:
+	movq	%xmm2,(%edx)
+	movdqa	%xmm2,%xmm1
+.byte	102,15,56,0,213
+.byte	102,15,56,221,212
+	pslld	$1,%xmm4
+	leal	24(%edx),%edx
+	movdqa	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm3,%xmm0
+	pshufd	$255,%xmm0,%xmm3
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pxor	%xmm2,%xmm0
+	pxor	%xmm3,%xmm2
+	movdqu	%xmm0,-16(%edx)
+	decl	%ecx
+	jnz	L127loop_key192
+	movl	$11,%ecx
+	movl	%ecx,32(%edx)
+	jmp	L120good_key
 .align	4,0x90
-L08714rounds:
+L11314rounds:
 	movups	16(%eax),%xmm2
-	movl	$13,%ecx
 	leal	16(%edx),%edx
+	cmpl	$268435456,%ebp
+	je	L12814rounds_alt
+	movl	$13,%ecx
 	movups	%xmm0,-32(%edx)
 	movups	%xmm2,-16(%edx)
 .byte	102,15,58,223,202,1
-	call	L097key_256a_cold
+	call	L129key_256a_cold
 .byte	102,15,58,223,200,1
-	call	L098key_256b
+	call	L130key_256b
 .byte	102,15,58,223,202,2
-	call	L099key_256a
+	call	L131key_256a
 .byte	102,15,58,223,200,2
-	call	L098key_256b
+	call	L130key_256b
 .byte	102,15,58,223,202,4
-	call	L099key_256a
+	call	L131key_256a
 .byte	102,15,58,223,200,4
-	call	L098key_256b
+	call	L130key_256b
 .byte	102,15,58,223,202,8
-	call	L099key_256a
+	call	L131key_256a
 .byte	102,15,58,223,200,8
-	call	L098key_256b
+	call	L130key_256b
 .byte	102,15,58,223,202,16
-	call	L099key_256a
+	call	L131key_256a
 .byte	102,15,58,223,200,16
-	call	L098key_256b
+	call	L130key_256b
 .byte	102,15,58,223,202,32
-	call	L099key_256a
+	call	L131key_256a
 .byte	102,15,58,223,200,32
-	call	L098key_256b
+	call	L130key_256b
 .byte	102,15,58,223,202,64
-	call	L099key_256a
+	call	L131key_256a
 	movups	%xmm0,(%edx)
 	movl	%ecx,16(%edx)
 	xorl	%eax,%eax
-	ret
+	jmp	L120good_key
 .align	4,0x90
-L099key_256a:
+L131key_256a:
 	movups	%xmm2,(%edx)
 	leal	16(%edx),%edx
-L097key_256a_cold:
+L129key_256a_cold:
 	shufps	$16,%xmm0,%xmm4
 	xorps	%xmm4,%xmm0
 	shufps	$140,%xmm0,%xmm4
@@ -2077,7 +3097,7 @@ L097key_256a_cold:
 	xorps	%xmm1,%xmm0
 	ret
 .align	4,0x90
-L098key_256b:
+L130key_256b:
 	movups	%xmm0,(%edx)
 	leal	16(%edx),%edx
 	shufps	$16,%xmm2,%xmm4
@@ -2087,13 +3107,70 @@ L098key_256b:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	ret
+.align	4,0x90
+L12814rounds_alt:
+	movdqa	(%ebx),%xmm5
+	movdqa	32(%ebx),%xmm4
+	movl	$7,%ecx
+	movdqu	%xmm0,-32(%edx)
+	movdqa	%xmm2,%xmm1
+	movdqu	%xmm2,-16(%edx)
+L132loop_key256:
+.byte	102,15,56,0,213
+.byte	102,15,56,221,212
+	movdqa	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm0,%xmm3
+	pslldq	$4,%xmm0
+	pxor	%xmm3,%xmm0
+	pslld	$1,%xmm4
+	pxor	%xmm2,%xmm0
+	movdqu	%xmm0,(%edx)
+	decl	%ecx
+	jz	L133done_key256
+	pshufd	$255,%xmm0,%xmm2
+	pxor	%xmm3,%xmm3
+.byte	102,15,56,221,211
+	movdqa	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm1,%xmm3
+	pslldq	$4,%xmm1
+	pxor	%xmm3,%xmm1
+	pxor	%xmm1,%xmm2
+	movdqu	%xmm2,16(%edx)
+	leal	32(%edx),%edx
+	movdqa	%xmm2,%xmm1
+	jmp	L132loop_key256
+L133done_key256:
+	movl	$13,%ecx
+	movl	%ecx,16(%edx)
+L120good_key:
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	xorl	%eax,%eax
+	popl	%ebx
+	popl	%ebp
+	ret
 .align	2,0x90
-L086bad_pointer:
+L111bad_pointer:
 	movl	$-1,%eax
+	popl	%ebx
+	popl	%ebp
 	ret
 .align	2,0x90
-L089bad_keybits:
+L115bad_keybits:
+	pxor	%xmm0,%xmm0
 	movl	$-2,%eax
+	popl	%ebx
+	popl	%ebp
 	ret
 .globl	_aesni_set_encrypt_key
 .align	4
@@ -2115,7 +3192,7 @@ L_aesni_set_decrypt_key_begin:
 	movl	12(%esp),%edx
 	shll	$4,%ecx
 	testl	%eax,%eax
-	jnz	L100dec_key_ret
+	jnz	L134dec_key_ret
 	leal	16(%edx,%ecx,1),%eax
 	movups	(%edx),%xmm0
 	movups	(%eax),%xmm1
@@ -2123,7 +3200,7 @@ L_aesni_set_decrypt_key_begin:
 	movups	%xmm1,(%edx)
 	leal	16(%edx),%edx
 	leal	-16(%eax),%eax
-L101dec_key_inverse:
+L135dec_key_inverse:
 	movups	(%edx),%xmm0
 	movups	(%eax),%xmm1
 .byte	102,15,56,219,192
@@ -2133,15 +3210,28 @@ L101dec_key_inverse:
 	movups	%xmm0,16(%eax)
 	movups	%xmm1,-16(%edx)
 	cmpl	%edx,%eax
-	ja	L101dec_key_inverse
+	ja	L135dec_key_inverse
 	movups	(%edx),%xmm0
 .byte	102,15,56,219,192
 	movups	%xmm0,(%edx)
+	pxor	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
 	xorl	%eax,%eax
-L100dec_key_ret:
+L134dec_key_ret:
 	ret
+.align	6,0x90
+Lkey_const:
+.long	202313229,202313229,202313229,202313229
+.long	67569157,67569157,67569157,67569157
+.long	1,1,1,1
+.long	27,27,27,27
 .byte	65,69,83,32,102,111,114,32,73,110,116,101,108,32,65,69
 .byte	83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83
 .byte	32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115
 .byte	115,108,46,111,114,103,62,0
+.section __IMPORT,__pointers,non_lazy_symbol_pointers
+L__gnutls_x86_cpuid_s$non_lazy_ptr:
+.indirect_symbol	__gnutls_x86_cpuid_s
+.long	0
+.comm	__gnutls_x86_cpuid_s,16,2
 
diff --git a/lib/accelerated/x86/macosx/aesni-x86_64.s b/lib/accelerated/x86/macosx/aesni-x86_64.s
index f0a5606348..f6145f166b 100644
--- a/lib/accelerated/x86/macosx/aesni-x86_64.s
+++ b/lib/accelerated/x86/macosx/aesni-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
 
 .p2align	4
 _aesni_encrypt:
+
 	movups	(%rdi),%xmm2
 	movl	240(%rdx),%eax
 	movups	(%rdx),%xmm0
@@ -63,10 +64,12 @@ L$oop_enc1_1:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_aesni_decrypt
 
 .p2align	4
 _aesni_decrypt:
+
 	movups	(%rdi),%xmm2
 	movl	240(%rdx),%eax
 	movups	(%rdx),%xmm0
@@ -87,8 +90,10 @@ L$oop_dec1_2:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_encrypt2:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -116,8 +121,10 @@ L$enc_loop2:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_decrypt2:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -145,8 +152,10 @@ L$dec_loop2:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_encrypt3:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -179,8 +188,10 @@ L$enc_loop3:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_decrypt3:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -213,8 +224,10 @@ L$dec_loop3:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_encrypt4:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -253,8 +266,10 @@ L$enc_loop4:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_decrypt4:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -293,8 +308,10 @@ L$dec_loop4:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_encrypt6:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -347,8 +364,10 @@ L$enc_loop6_enter:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_decrypt6:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -401,8 +420,10 @@ L$dec_loop6_enter:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_encrypt8:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -465,8 +486,10 @@ L$enc_loop8_enter:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 _aesni_decrypt8:
+
 	movups	(%rcx),%xmm0
 	shll	$4,%eax
 	movups	16(%rcx),%xmm1
@@ -528,10 +551,12 @@ L$dec_loop8_enter:
 .byte	102,68,15,56,223,200
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_ecb_encrypt
 
 .p2align	4
 _aesni_ecb_encrypt:
+
 	andq	$-16,%rdx
 	jz	L$ecb_ret
 
@@ -870,6 +895,7 @@ L$ecb_ret:
 	pxor	%xmm1,%xmm1
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_ccm64_encrypt_blocks
 
 .p2align	4
@@ -1034,6 +1060,7 @@ L$oop_enc1_6:
 
 .p2align	4
 _aesni_ctr32_encrypt_blocks:
+
 	cmpq	$1,%rdx
 	jne	L$ctr32_bulk
 
@@ -1063,11 +1090,12 @@ L$oop_enc1_7:
 
 .p2align	4
 L$ctr32_bulk:
-	leaq	(%rsp),%rax
+	leaq	(%rsp),%r11
+
 	pushq	%rbp
+
 	subq	$128,%rsp
 	andq	$-16,%rsp
-	leaq	-8(%rax),%rbp
 
 
 
@@ -1076,7 +1104,7 @@ L$ctr32_bulk:
 	movdqu	(%rcx),%xmm0
 	movl	12(%r8),%r8d
 	pxor	%xmm0,%xmm2
-	movl	12(%rcx),%r11d
+	movl	12(%rcx),%ebp
 	movdqa	%xmm2,0(%rsp)
 	bswapl	%r8d
 	movdqa	%xmm2,%xmm3
@@ -1092,8 +1120,8 @@ L$ctr32_bulk:
 	leaq	2(%r8),%rdx
 	bswapl	%eax
 	bswapl	%edx
-	xorl	%r11d,%eax
-	xorl	%r11d,%edx
+	xorl	%ebp,%eax
+	xorl	%ebp,%edx
 .byte	102,15,58,34,216,3
 	leaq	3(%r8),%rax
 	movdqa	%xmm3,16(%rsp)
@@ -1102,25 +1130,25 @@ L$ctr32_bulk:
 	movq	%r10,%rdx
 	leaq	4(%r8),%r10
 	movdqa	%xmm4,32(%rsp)
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 	bswapl	%r10d
 .byte	102,15,58,34,232,3
-	xorl	%r11d,%r10d
+	xorl	%ebp,%r10d
 	movdqa	%xmm5,48(%rsp)
 	leaq	5(%r8),%r9
 	movl	%r10d,64+12(%rsp)
 	bswapl	%r9d
 	leaq	6(%r8),%r10
 	movl	240(%rcx),%eax
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	bswapl	%r10d
 	movl	%r9d,80+12(%rsp)
-	xorl	%r11d,%r10d
+	xorl	%ebp,%r10d
 	leaq	7(%r8),%r9
 	movl	%r10d,96+12(%rsp)
 	bswapl	%r9d
 	movl	__gnutls_x86_cpuid_s+4(%rip),%r10d
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	andl	$71303168,%r10d
 	movl	%r9d,112+12(%rsp)
 
@@ -1144,7 +1172,7 @@ L$ctr32_bulk:
 L$ctr32_6x:
 	shll	$4,%eax
 	movl	$48,%r10d
-	bswapl	%r11d
+	bswapl	%ebp
 	leaq	32(%rcx,%rax,1),%rcx
 	subq	%rax,%r10
 	jmp	L$ctr32_loop6
@@ -1155,32 +1183,32 @@ L$ctr32_loop6:
 	movups	-48(%rcx,%r10,1),%xmm0
 .byte	102,15,56,220,209
 	movl	%r8d,%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,217
 .byte	0x0f,0x38,0xf1,0x44,0x24,12
 	leal	1(%r8),%eax
 .byte	102,15,56,220,225
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	0x0f,0x38,0xf1,0x44,0x24,28
 .byte	102,15,56,220,233
 	leal	2(%r8),%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,241
 .byte	0x0f,0x38,0xf1,0x44,0x24,44
 	leal	3(%r8),%eax
 .byte	102,15,56,220,249
 	movups	-32(%rcx,%r10,1),%xmm1
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 
 .byte	102,15,56,220,208
 .byte	0x0f,0x38,0xf1,0x44,0x24,60
 	leal	4(%r8),%eax
 .byte	102,15,56,220,216
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	0x0f,0x38,0xf1,0x44,0x24,76
 .byte	102,15,56,220,224
 	leal	5(%r8),%eax
-	xorl	%r11d,%eax
+	xorl	%ebp,%eax
 .byte	102,15,56,220,232
 .byte	0x0f,0x38,0xf1,0x44,0x24,92
 	movq	%r10,%rax
@@ -1241,7 +1269,7 @@ L$ctr32_loop8:
 	bswapl	%r9d
 	movups	32-128(%rcx),%xmm0
 .byte	102,15,56,220,225
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	nop
 .byte	102,15,56,220,233
 	movl	%r9d,0+12(%rsp)
@@ -1254,7 +1282,7 @@ L$ctr32_loop8:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1268,7 +1296,7 @@ L$ctr32_loop8:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1282,7 +1310,7 @@ L$ctr32_loop8:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1296,7 +1324,7 @@ L$ctr32_loop8:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1310,7 +1338,7 @@ L$ctr32_loop8:
 	bswapl	%r9d
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,224
 .byte	102,15,56,220,232
@@ -1324,7 +1352,7 @@ L$ctr32_loop8:
 	bswapl	%r9d
 .byte	102,15,56,220,209
 .byte	102,15,56,220,217
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 .byte	0x66,0x90
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
@@ -1339,7 +1367,7 @@ L$ctr32_loop8:
 .byte	102,15,56,220,208
 .byte	102,15,56,220,216
 .byte	102,15,56,220,224
-	xorl	%r11d,%r9d
+	xorl	%ebp,%r9d
 	movdqu	0(%rdi),%xmm10
 .byte	102,15,56,220,232
 	movl	%r9d,112+12(%rsp)
@@ -1574,7 +1602,7 @@ L$ctr32_loop3:
 
 L$ctr32_done:
 	xorps	%xmm0,%xmm0
-	xorl	%r11d,%r11d
+	xorl	%ebp,%ebp
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
 	pxor	%xmm3,%xmm3
@@ -1598,20 +1626,25 @@ L$ctr32_done:
 	pxor	%xmm14,%xmm14
 	movaps	%xmm0,112(%rsp)
 	pxor	%xmm15,%xmm15
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+
+	leaq	(%r11),%rsp
+
 L$ctr32_epilogue:
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_xts_encrypt
 
 .p2align	4
 _aesni_xts_encrypt:
-	leaq	(%rsp),%rax
+
+	leaq	(%rsp),%r11
+
 	pushq	%rbp
+
 	subq	$112,%rsp
 	andq	$-16,%rsp
-	leaq	-8(%rax),%rbp
 	movups	(%r9),%xmm2
 	movl	240(%r8),%eax
 	movl	240(%rcx),%r10d
@@ -1627,7 +1660,7 @@ L$oop_enc1_8:
 	jnz	L$oop_enc1_8
 .byte	102,15,56,221,209
 	movups	(%rcx),%xmm0
-	movq	%rcx,%r11
+	movq	%rcx,%rbp
 	movl	%r10d,%eax
 	shll	$4,%r10d
 	movq	%rdx,%r9
@@ -1683,9 +1716,9 @@ L$oop_enc1_8:
 	jc	L$xts_enc_short
 
 	movl	$16+96,%eax
-	leaq	32(%r11,%r10,1),%rcx
+	leaq	32(%rbp,%r10,1),%rcx
 	subq	%r10,%rax
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 	movq	%rax,%r10
 	leaq	L$xts_magic(%rip),%r8
 	jmp	L$xts_enc_grandloop
@@ -1710,7 +1743,7 @@ L$xts_enc_grandloop:
 	movdqa	96(%rsp),%xmm9
 	pxor	%xmm14,%xmm6
 .byte	102,15,56,220,233
-	movups	32(%r11),%xmm0
+	movups	32(%rbp),%xmm0
 	leaq	96(%rdi),%rdi
 	pxor	%xmm8,%xmm7
 
@@ -1719,7 +1752,7 @@ L$xts_enc_grandloop:
 	pxor	%xmm9,%xmm11
 	movdqa	%xmm10,0(%rsp)
 .byte	102,15,56,220,249
-	movups	48(%r11),%xmm1
+	movups	48(%rbp),%xmm1
 	pxor	%xmm9,%xmm12
 
 .byte	102,15,56,220,208
@@ -1734,7 +1767,7 @@ L$xts_enc_grandloop:
 	movdqa	%xmm14,64(%rsp)
 .byte	102,15,56,220,240
 .byte	102,15,56,220,248
-	movups	64(%r11),%xmm0
+	movups	64(%rbp),%xmm0
 	movdqa	%xmm8,80(%rsp)
 	pshufd	$0x5f,%xmm15,%xmm9
 	jmp	L$xts_enc_loop6
@@ -1766,7 +1799,7 @@ L$xts_enc_loop6:
 	psrad	$31,%xmm14
 .byte	102,15,56,220,217
 	pand	%xmm8,%xmm14
-	movups	(%r11),%xmm10
+	movups	(%rbp),%xmm10
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
 .byte	102,15,56,220,241
@@ -1834,10 +1867,10 @@ L$xts_enc_loop6:
 .byte	102,15,56,220,225
 .byte	102,15,56,220,233
 	pxor	%xmm0,%xmm15
-	movups	(%r11),%xmm0
+	movups	(%rbp),%xmm0
 .byte	102,15,56,220,241
 .byte	102,15,56,220,249
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 
 	pxor	%xmm15,%xmm14
 .byte	102,15,56,221,84,36,0
@@ -1864,7 +1897,7 @@ L$xts_enc_loop6:
 
 	movl	$16+96,%eax
 	subl	%r10d,%eax
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	shrl	$4,%eax
 
 L$xts_enc_short:
@@ -2020,7 +2053,7 @@ L$xts_enc_steal:
 	jnz	L$xts_enc_steal
 
 	subq	%r9,%rsi
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	-16(%rsi),%xmm2
@@ -2063,20 +2096,25 @@ L$xts_enc_ret:
 	movaps	%xmm0,96(%rsp)
 	pxor	%xmm14,%xmm14
 	pxor	%xmm15,%xmm15
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+
+	leaq	(%r11),%rsp
+
 L$xts_enc_epilogue:
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_xts_decrypt
 
 .p2align	4
 _aesni_xts_decrypt:
-	leaq	(%rsp),%rax
+
+	leaq	(%rsp),%r11
+
 	pushq	%rbp
+
 	subq	$112,%rsp
 	andq	$-16,%rsp
-	leaq	-8(%rax),%rbp
 	movups	(%r9),%xmm2
 	movl	240(%r8),%eax
 	movl	240(%rcx),%r10d
@@ -2098,7 +2136,7 @@ L$oop_enc1_11:
 	subq	%rax,%rdx
 
 	movups	(%rcx),%xmm0
-	movq	%rcx,%r11
+	movq	%rcx,%rbp
 	movl	%r10d,%eax
 	shll	$4,%r10d
 	movq	%rdx,%r9
@@ -2154,9 +2192,9 @@ L$oop_enc1_11:
 	jc	L$xts_dec_short
 
 	movl	$16+96,%eax
-	leaq	32(%r11,%r10,1),%rcx
+	leaq	32(%rbp,%r10,1),%rcx
 	subq	%r10,%rax
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 	movq	%rax,%r10
 	leaq	L$xts_magic(%rip),%r8
 	jmp	L$xts_dec_grandloop
@@ -2181,7 +2219,7 @@ L$xts_dec_grandloop:
 	movdqa	96(%rsp),%xmm9
 	pxor	%xmm14,%xmm6
 .byte	102,15,56,222,233
-	movups	32(%r11),%xmm0
+	movups	32(%rbp),%xmm0
 	leaq	96(%rdi),%rdi
 	pxor	%xmm8,%xmm7
 
@@ -2190,7 +2228,7 @@ L$xts_dec_grandloop:
 	pxor	%xmm9,%xmm11
 	movdqa	%xmm10,0(%rsp)
 .byte	102,15,56,222,249
-	movups	48(%r11),%xmm1
+	movups	48(%rbp),%xmm1
 	pxor	%xmm9,%xmm12
 
 .byte	102,15,56,222,208
@@ -2205,7 +2243,7 @@ L$xts_dec_grandloop:
 	movdqa	%xmm14,64(%rsp)
 .byte	102,15,56,222,240
 .byte	102,15,56,222,248
-	movups	64(%r11),%xmm0
+	movups	64(%rbp),%xmm0
 	movdqa	%xmm8,80(%rsp)
 	pshufd	$0x5f,%xmm15,%xmm9
 	jmp	L$xts_dec_loop6
@@ -2237,7 +2275,7 @@ L$xts_dec_loop6:
 	psrad	$31,%xmm14
 .byte	102,15,56,222,217
 	pand	%xmm8,%xmm14
-	movups	(%r11),%xmm10
+	movups	(%rbp),%xmm10
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
 .byte	102,15,56,222,241
@@ -2305,10 +2343,10 @@ L$xts_dec_loop6:
 .byte	102,15,56,222,225
 .byte	102,15,56,222,233
 	pxor	%xmm0,%xmm15
-	movups	(%r11),%xmm0
+	movups	(%rbp),%xmm0
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
-	movups	16(%r11),%xmm1
+	movups	16(%rbp),%xmm1
 
 	pxor	%xmm15,%xmm14
 .byte	102,15,56,223,84,36,0
@@ -2335,7 +2373,7 @@ L$xts_dec_loop6:
 
 	movl	$16+96,%eax
 	subl	%r10d,%eax
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	shrl	$4,%eax
 
 L$xts_dec_short:
@@ -2492,7 +2530,7 @@ L$xts_dec_done:
 	jz	L$xts_dec_ret
 L$xts_dec_done2:
 	movq	%r9,%rdx
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	(%rdi),%xmm2
@@ -2522,7 +2560,7 @@ L$xts_dec_steal:
 	jnz	L$xts_dec_steal
 
 	subq	%r9,%rsi
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movl	%r10d,%eax
 
 	movups	(%rsi),%xmm2
@@ -2565,15 +2603,861 @@ L$xts_dec_ret:
 	movaps	%xmm0,96(%rsp)
 	pxor	%xmm14,%xmm14
 	pxor	%xmm15,%xmm15
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+
+	leaq	(%r11),%rsp
+
 L$xts_dec_epilogue:
 	.byte	0xf3,0xc3
 
+
+.globl	_aesni_ocb_encrypt
+
+.p2align	5
+_aesni_ocb_encrypt:
+
+	leaq	(%rsp),%rax
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	movq	8(%rax),%rbx
+	movq	8+8(%rax),%rbp
+
+	movl	240(%rcx),%r10d
+	movq	%rcx,%r11
+	shll	$4,%r10d
+	movups	(%rcx),%xmm9
+	movups	16(%rcx,%r10,1),%xmm1
+
+	movdqu	(%r9),%xmm15
+	pxor	%xmm1,%xmm9
+	pxor	%xmm1,%xmm15
+
+	movl	$16+32,%eax
+	leaq	32(%r11,%r10,1),%rcx
+	movups	16(%r11),%xmm1
+	subq	%r10,%rax
+	movq	%rax,%r10
+
+	movdqu	(%rbx),%xmm10
+	movdqu	(%rbp),%xmm8
+
+	testq	$1,%r8
+	jnz	L$ocb_enc_odd
+
+	bsfq	%r8,%r12
+	addq	$1,%r8
+	shlq	$4,%r12
+	movdqu	(%rbx,%r12,1),%xmm7
+	movdqu	(%rdi),%xmm2
+	leaq	16(%rdi),%rdi
+
+	call	__ocb_encrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,(%rsi)
+	leaq	16(%rsi),%rsi
+	subq	$1,%rdx
+	jz	L$ocb_enc_done
+
+L$ocb_enc_odd:
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	leaq	6(%r8),%r8
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+	shlq	$4,%r12
+	shlq	$4,%r13
+	shlq	$4,%r14
+
+	subq	$6,%rdx
+	jc	L$ocb_enc_short
+	jmp	L$ocb_enc_grandloop
+
+.p2align	5
+L$ocb_enc_grandloop:
+	movdqu	0(%rdi),%xmm2
+	movdqu	16(%rdi),%xmm3
+	movdqu	32(%rdi),%xmm4
+	movdqu	48(%rdi),%xmm5
+	movdqu	64(%rdi),%xmm6
+	movdqu	80(%rdi),%xmm7
+	leaq	96(%rdi),%rdi
+
+	call	__ocb_encrypt6
+
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+	movups	%xmm6,64(%rsi)
+	movups	%xmm7,80(%rsi)
+	leaq	96(%rsi),%rsi
+	subq	$6,%rdx
+	jnc	L$ocb_enc_grandloop
+
+L$ocb_enc_short:
+	addq	$6,%rdx
+	jz	L$ocb_enc_done
+
+	movdqu	0(%rdi),%xmm2
+	cmpq	$2,%rdx
+	jb	L$ocb_enc_one
+	movdqu	16(%rdi),%xmm3
+	je	L$ocb_enc_two
+
+	movdqu	32(%rdi),%xmm4
+	cmpq	$4,%rdx
+	jb	L$ocb_enc_three
+	movdqu	48(%rdi),%xmm5
+	je	L$ocb_enc_four
+
+	movdqu	64(%rdi),%xmm6
+	pxor	%xmm7,%xmm7
+
+	call	__ocb_encrypt6
+
+	movdqa	%xmm14,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+	movups	%xmm6,64(%rsi)
+
+	jmp	L$ocb_enc_done
+
+.p2align	4
+L$ocb_enc_one:
+	movdqa	%xmm10,%xmm7
+
+	call	__ocb_encrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,0(%rsi)
+	jmp	L$ocb_enc_done
+
+.p2align	4
+L$ocb_enc_two:
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_encrypt4
+
+	movdqa	%xmm11,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+
+	jmp	L$ocb_enc_done
+
+.p2align	4
+L$ocb_enc_three:
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_encrypt4
+
+	movdqa	%xmm12,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+
+	jmp	L$ocb_enc_done
+
+.p2align	4
+L$ocb_enc_four:
+	call	__ocb_encrypt4
+
+	movdqa	%xmm13,%xmm15
+	movups	%xmm2,0(%rsi)
+	movups	%xmm3,16(%rsi)
+	movups	%xmm4,32(%rsi)
+	movups	%xmm5,48(%rsi)
+
+L$ocb_enc_done:
+	pxor	%xmm0,%xmm15
+	movdqu	%xmm8,(%rbp)
+	movdqu	%xmm15,(%r9)
+
+	xorps	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
+	pxor	%xmm8,%xmm8
+	pxor	%xmm9,%xmm9
+	pxor	%xmm10,%xmm10
+	pxor	%xmm11,%xmm11
+	pxor	%xmm12,%xmm12
+	pxor	%xmm13,%xmm13
+	pxor	%xmm14,%xmm14
+	pxor	%xmm15,%xmm15
+	leaq	40(%rsp),%rax
+
+	movq	-40(%rax),%r14
+
+	movq	-32(%rax),%r13
+
+	movq	-24(%rax),%r12
+
+	movq	-16(%rax),%rbp
+
+	movq	-8(%rax),%rbx
+
+	leaq	(%rax),%rsp
+
+L$ocb_enc_epilogue:
+	.byte	0xf3,0xc3
+
+
+
+
+.p2align	5
+__ocb_encrypt6:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	movdqa	%xmm10,%xmm14
+	pxor	%xmm15,%xmm10
+	movdqu	(%rbx,%r14,1),%xmm15
+	pxor	%xmm10,%xmm11
+	pxor	%xmm2,%xmm8
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm3,%xmm8
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm4,%xmm8
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm14
+	pxor	%xmm5,%xmm8
+	pxor	%xmm13,%xmm5
+	pxor	%xmm14,%xmm15
+	pxor	%xmm6,%xmm8
+	pxor	%xmm14,%xmm6
+	pxor	%xmm7,%xmm8
+	pxor	%xmm15,%xmm7
+	movups	32(%r11),%xmm0
+
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	addq	$6,%r8
+	pxor	%xmm9,%xmm10
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+.byte	102,15,56,220,241
+	pxor	%xmm9,%xmm13
+	pxor	%xmm9,%xmm14
+.byte	102,15,56,220,249
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm15
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+.byte	102,15,56,220,240
+.byte	102,15,56,220,248
+	movups	64(%r11),%xmm0
+	shlq	$4,%r12
+	shlq	$4,%r13
+	jmp	L$ocb_enc_loop6
+
+.p2align	5
+L$ocb_enc_loop6:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+.byte	102,15,56,220,240
+.byte	102,15,56,220,248
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	L$ocb_enc_loop6
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+.byte	102,15,56,220,241
+.byte	102,15,56,220,249
+	movups	16(%r11),%xmm1
+	shlq	$4,%r14
+
+.byte	102,65,15,56,221,210
+	movdqu	(%rbx),%xmm10
+	movq	%r10,%rax
+.byte	102,65,15,56,221,219
+.byte	102,65,15,56,221,228
+.byte	102,65,15,56,221,237
+.byte	102,65,15,56,221,246
+.byte	102,65,15,56,221,255
+	.byte	0xf3,0xc3
+
+
+
+.p2align	5
+__ocb_encrypt4:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	pxor	%xmm15,%xmm10
+	pxor	%xmm10,%xmm11
+	pxor	%xmm2,%xmm8
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm3,%xmm8
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm4,%xmm8
+	pxor	%xmm12,%xmm4
+	pxor	%xmm5,%xmm8
+	pxor	%xmm13,%xmm5
+	movups	32(%r11),%xmm0
+
+	pxor	%xmm9,%xmm10
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+	pxor	%xmm9,%xmm13
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	48(%r11),%xmm1
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+	movups	64(%r11),%xmm0
+	jmp	L$ocb_enc_loop4
+
+.p2align	5
+L$ocb_enc_loop4:
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+.byte	102,15,56,220,216
+.byte	102,15,56,220,224
+.byte	102,15,56,220,232
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	L$ocb_enc_loop4
+
+.byte	102,15,56,220,209
+.byte	102,15,56,220,217
+.byte	102,15,56,220,225
+.byte	102,15,56,220,233
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,65,15,56,221,210
+.byte	102,65,15,56,221,219
+.byte	102,65,15,56,221,228
+.byte	102,65,15,56,221,237
+	.byte	0xf3,0xc3
+
+
+
+.p2align	5
+__ocb_encrypt1:
+	pxor	%xmm15,%xmm7
+	pxor	%xmm9,%xmm7
+	pxor	%xmm2,%xmm8
+	pxor	%xmm7,%xmm2
+	movups	32(%r11),%xmm0
+
+.byte	102,15,56,220,209
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm7
+
+.byte	102,15,56,220,208
+	movups	64(%r11),%xmm0
+	jmp	L$ocb_enc_loop1
+
+.p2align	5
+L$ocb_enc_loop1:
+.byte	102,15,56,220,209
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,220,208
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	L$ocb_enc_loop1
+
+.byte	102,15,56,220,209
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,15,56,221,215
+	.byte	0xf3,0xc3
+
+
+.globl	_aesni_ocb_decrypt
+
+.p2align	5
+_aesni_ocb_decrypt:
+
+	leaq	(%rsp),%rax
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	movq	8(%rax),%rbx
+	movq	8+8(%rax),%rbp
+
+	movl	240(%rcx),%r10d
+	movq	%rcx,%r11
+	shll	$4,%r10d
+	movups	(%rcx),%xmm9
+	movups	16(%rcx,%r10,1),%xmm1
+
+	movdqu	(%r9),%xmm15
+	pxor	%xmm1,%xmm9
+	pxor	%xmm1,%xmm15
+
+	movl	$16+32,%eax
+	leaq	32(%r11,%r10,1),%rcx
+	movups	16(%r11),%xmm1
+	subq	%r10,%rax
+	movq	%rax,%r10
+
+	movdqu	(%rbx),%xmm10
+	movdqu	(%rbp),%xmm8
+
+	testq	$1,%r8
+	jnz	L$ocb_dec_odd
+
+	bsfq	%r8,%r12
+	addq	$1,%r8
+	shlq	$4,%r12
+	movdqu	(%rbx,%r12,1),%xmm7
+	movdqu	(%rdi),%xmm2
+	leaq	16(%rdi),%rdi
+
+	call	__ocb_decrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,(%rsi)
+	xorps	%xmm2,%xmm8
+	leaq	16(%rsi),%rsi
+	subq	$1,%rdx
+	jz	L$ocb_dec_done
+
+L$ocb_dec_odd:
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	leaq	6(%r8),%r8
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+	shlq	$4,%r12
+	shlq	$4,%r13
+	shlq	$4,%r14
+
+	subq	$6,%rdx
+	jc	L$ocb_dec_short
+	jmp	L$ocb_dec_grandloop
+
+.p2align	5
+L$ocb_dec_grandloop:
+	movdqu	0(%rdi),%xmm2
+	movdqu	16(%rdi),%xmm3
+	movdqu	32(%rdi),%xmm4
+	movdqu	48(%rdi),%xmm5
+	movdqu	64(%rdi),%xmm6
+	movdqu	80(%rdi),%xmm7
+	leaq	96(%rdi),%rdi
+
+	call	__ocb_decrypt6
+
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+	movups	%xmm6,64(%rsi)
+	pxor	%xmm6,%xmm8
+	movups	%xmm7,80(%rsi)
+	pxor	%xmm7,%xmm8
+	leaq	96(%rsi),%rsi
+	subq	$6,%rdx
+	jnc	L$ocb_dec_grandloop
+
+L$ocb_dec_short:
+	addq	$6,%rdx
+	jz	L$ocb_dec_done
+
+	movdqu	0(%rdi),%xmm2
+	cmpq	$2,%rdx
+	jb	L$ocb_dec_one
+	movdqu	16(%rdi),%xmm3
+	je	L$ocb_dec_two
+
+	movdqu	32(%rdi),%xmm4
+	cmpq	$4,%rdx
+	jb	L$ocb_dec_three
+	movdqu	48(%rdi),%xmm5
+	je	L$ocb_dec_four
+
+	movdqu	64(%rdi),%xmm6
+	pxor	%xmm7,%xmm7
+
+	call	__ocb_decrypt6
+
+	movdqa	%xmm14,%xmm15
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+	movups	%xmm6,64(%rsi)
+	pxor	%xmm6,%xmm8
+
+	jmp	L$ocb_dec_done
+
+.p2align	4
+L$ocb_dec_one:
+	movdqa	%xmm10,%xmm7
+
+	call	__ocb_decrypt1
+
+	movdqa	%xmm7,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	jmp	L$ocb_dec_done
+
+.p2align	4
+L$ocb_dec_two:
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_decrypt4
+
+	movdqa	%xmm11,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	xorps	%xmm3,%xmm8
+
+	jmp	L$ocb_dec_done
+
+.p2align	4
+L$ocb_dec_three:
+	pxor	%xmm5,%xmm5
+
+	call	__ocb_decrypt4
+
+	movdqa	%xmm12,%xmm15
+	movups	%xmm2,0(%rsi)
+	xorps	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	xorps	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	xorps	%xmm4,%xmm8
+
+	jmp	L$ocb_dec_done
+
+.p2align	4
+L$ocb_dec_four:
+	call	__ocb_decrypt4
+
+	movdqa	%xmm13,%xmm15
+	movups	%xmm2,0(%rsi)
+	pxor	%xmm2,%xmm8
+	movups	%xmm3,16(%rsi)
+	pxor	%xmm3,%xmm8
+	movups	%xmm4,32(%rsi)
+	pxor	%xmm4,%xmm8
+	movups	%xmm5,48(%rsi)
+	pxor	%xmm5,%xmm8
+
+L$ocb_dec_done:
+	pxor	%xmm0,%xmm15
+	movdqu	%xmm8,(%rbp)
+	movdqu	%xmm15,(%r9)
+
+	xorps	%xmm0,%xmm0
+	pxor	%xmm1,%xmm1
+	pxor	%xmm2,%xmm2
+	pxor	%xmm3,%xmm3
+	pxor	%xmm4,%xmm4
+	pxor	%xmm5,%xmm5
+	pxor	%xmm6,%xmm6
+	pxor	%xmm7,%xmm7
+	pxor	%xmm8,%xmm8
+	pxor	%xmm9,%xmm9
+	pxor	%xmm10,%xmm10
+	pxor	%xmm11,%xmm11
+	pxor	%xmm12,%xmm12
+	pxor	%xmm13,%xmm13
+	pxor	%xmm14,%xmm14
+	pxor	%xmm15,%xmm15
+	leaq	40(%rsp),%rax
+
+	movq	-40(%rax),%r14
+
+	movq	-32(%rax),%r13
+
+	movq	-24(%rax),%r12
+
+	movq	-16(%rax),%rbp
+
+	movq	-8(%rax),%rbx
+
+	leaq	(%rax),%rsp
+
+L$ocb_dec_epilogue:
+	.byte	0xf3,0xc3
+
+
+
+
+.p2align	5
+__ocb_decrypt6:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	movdqa	%xmm10,%xmm14
+	pxor	%xmm15,%xmm10
+	movdqu	(%rbx,%r14,1),%xmm15
+	pxor	%xmm10,%xmm11
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm14
+	pxor	%xmm13,%xmm5
+	pxor	%xmm14,%xmm15
+	pxor	%xmm14,%xmm6
+	pxor	%xmm15,%xmm7
+	movups	32(%r11),%xmm0
+
+	leaq	1(%r8),%r12
+	leaq	3(%r8),%r13
+	leaq	5(%r8),%r14
+	addq	$6,%r8
+	pxor	%xmm9,%xmm10
+	bsfq	%r12,%r12
+	bsfq	%r13,%r13
+	bsfq	%r14,%r14
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+.byte	102,15,56,222,241
+	pxor	%xmm9,%xmm13
+	pxor	%xmm9,%xmm14
+.byte	102,15,56,222,249
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm15
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+.byte	102,15,56,222,240
+.byte	102,15,56,222,248
+	movups	64(%r11),%xmm0
+	shlq	$4,%r12
+	shlq	$4,%r13
+	jmp	L$ocb_dec_loop6
+
+.p2align	5
+L$ocb_dec_loop6:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+.byte	102,15,56,222,240
+.byte	102,15,56,222,248
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	L$ocb_dec_loop6
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+.byte	102,15,56,222,241
+.byte	102,15,56,222,249
+	movups	16(%r11),%xmm1
+	shlq	$4,%r14
+
+.byte	102,65,15,56,223,210
+	movdqu	(%rbx),%xmm10
+	movq	%r10,%rax
+.byte	102,65,15,56,223,219
+.byte	102,65,15,56,223,228
+.byte	102,65,15,56,223,237
+.byte	102,65,15,56,223,246
+.byte	102,65,15,56,223,255
+	.byte	0xf3,0xc3
+
+
+
+.p2align	5
+__ocb_decrypt4:
+	pxor	%xmm9,%xmm15
+	movdqu	(%rbx,%r12,1),%xmm11
+	movdqa	%xmm10,%xmm12
+	movdqu	(%rbx,%r13,1),%xmm13
+	pxor	%xmm15,%xmm10
+	pxor	%xmm10,%xmm11
+	pxor	%xmm10,%xmm2
+	pxor	%xmm11,%xmm12
+	pxor	%xmm11,%xmm3
+	pxor	%xmm12,%xmm13
+	pxor	%xmm12,%xmm4
+	pxor	%xmm13,%xmm5
+	movups	32(%r11),%xmm0
+
+	pxor	%xmm9,%xmm10
+	pxor	%xmm9,%xmm11
+	pxor	%xmm9,%xmm12
+	pxor	%xmm9,%xmm13
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	48(%r11),%xmm1
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+	movups	64(%r11),%xmm0
+	jmp	L$ocb_dec_loop4
+
+.p2align	5
+L$ocb_dec_loop4:
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+.byte	102,15,56,222,216
+.byte	102,15,56,222,224
+.byte	102,15,56,222,232
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	L$ocb_dec_loop4
+
+.byte	102,15,56,222,209
+.byte	102,15,56,222,217
+.byte	102,15,56,222,225
+.byte	102,15,56,222,233
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,65,15,56,223,210
+.byte	102,65,15,56,223,219
+.byte	102,65,15,56,223,228
+.byte	102,65,15,56,223,237
+	.byte	0xf3,0xc3
+
+
+
+.p2align	5
+__ocb_decrypt1:
+	pxor	%xmm15,%xmm7
+	pxor	%xmm9,%xmm7
+	pxor	%xmm7,%xmm2
+	movups	32(%r11),%xmm0
+
+.byte	102,15,56,222,209
+	movups	48(%r11),%xmm1
+	pxor	%xmm9,%xmm7
+
+.byte	102,15,56,222,208
+	movups	64(%r11),%xmm0
+	jmp	L$ocb_dec_loop1
+
+.p2align	5
+L$ocb_dec_loop1:
+.byte	102,15,56,222,209
+	movups	(%rcx,%rax,1),%xmm1
+	addq	$32,%rax
+
+.byte	102,15,56,222,208
+	movups	-16(%rcx,%rax,1),%xmm0
+	jnz	L$ocb_dec_loop1
+
+.byte	102,15,56,222,209
+	movups	16(%r11),%xmm1
+	movq	%r10,%rax
+
+.byte	102,15,56,223,215
+	.byte	0xf3,0xc3
+
 .globl	_aesni_cbc_encrypt
 
 .p2align	4
 _aesni_cbc_encrypt:
+
 	testq	%rdx,%rdx
 	jz	L$cbc_ret
 
@@ -2666,11 +3550,13 @@ L$oop_dec1_16:
 	jmp	L$cbc_ret
 .p2align	4
 L$cbc_decrypt_bulk:
-	leaq	(%rsp),%rax
+	leaq	(%rsp),%r11
+
 	pushq	%rbp
+
 	subq	$16,%rsp
 	andq	$-16,%rsp
-	leaq	-8(%rax),%rbp
+	movq	%rcx,%rbp
 	movups	(%r8),%xmm10
 	movl	%r10d,%eax
 	cmpq	$0x50,%rdx
@@ -2710,7 +3596,7 @@ L$cbc_dec_loop8_enter:
 	pxor	%xmm0,%xmm3
 	movups	16-112(%rcx),%xmm1
 	pxor	%xmm0,%xmm4
-	xorq	%r11,%r11
+	movq	$-1,%rbp
 	cmpq	$0x70,%rdx
 	pxor	%xmm0,%xmm5
 	pxor	%xmm0,%xmm6
@@ -2726,10 +3612,10 @@ L$cbc_dec_loop8_enter:
 .byte	102,15,56,222,241
 .byte	102,15,56,222,249
 .byte	102,68,15,56,222,193
-	setnc	%r11b
-	shlq	$7,%r11
+	adcq	$0,%rbp
+	andq	$128,%rbp
 .byte	102,68,15,56,222,201
-	addq	%rdi,%r11
+	addq	%rdi,%rbp
 	movups	48-112(%rcx),%xmm1
 .byte	102,15,56,222,208
 .byte	102,15,56,222,216
@@ -2867,18 +3753,18 @@ L$cbc_dec_done:
 	movdqu	112(%rdi),%xmm0
 .byte	102,65,15,56,223,228
 	leaq	128(%rdi),%rdi
-	movdqu	0(%r11),%xmm11
+	movdqu	0(%rbp),%xmm11
 .byte	102,65,15,56,223,237
 .byte	102,65,15,56,223,246
-	movdqu	16(%r11),%xmm12
-	movdqu	32(%r11),%xmm13
+	movdqu	16(%rbp),%xmm12
+	movdqu	32(%rbp),%xmm13
 .byte	102,65,15,56,223,255
 .byte	102,68,15,56,223,193
-	movdqu	48(%r11),%xmm14
-	movdqu	64(%r11),%xmm15
+	movdqu	48(%rbp),%xmm14
+	movdqu	64(%rbp),%xmm15
 .byte	102,69,15,56,223,202
 	movdqa	%xmm0,%xmm10
-	movdqu	80(%r11),%xmm1
+	movdqu	80(%rbp),%xmm1
 	movups	-112(%rcx),%xmm0
 
 	movups	%xmm2,(%rsi)
@@ -2997,7 +3883,7 @@ L$cbc_dec_loop6_enter:
 	pxor	%xmm13,%xmm5
 	movdqu	%xmm4,32(%rsi)
 	pxor	%xmm14,%xmm6
-	movq	%r11,%rcx
+	movq	%rbp,%rcx
 	movdqu	%xmm5,48(%rsi)
 	pxor	%xmm15,%xmm7
 	movl	%r10d,%eax
@@ -3150,16 +4036,21 @@ L$cbc_dec_tail_partial:
 L$cbc_dec_ret:
 	xorps	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
-	leaq	(%rbp),%rsp
-	popq	%rbp
+	movq	-8(%r11),%rbp
+
+	leaq	(%r11),%rsp
+
 L$cbc_ret:
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_set_decrypt_key
 
 .p2align	4
 _aesni_set_decrypt_key:
+
 .byte	0x48,0x83,0xEC,0x08
+
 	call	__aesni_set_encrypt_key
 	shll	$4,%esi
 	testl	%eax,%eax
@@ -3192,7 +4083,9 @@ L$dec_key_inverse:
 	pxor	%xmm0,%xmm0
 L$dec_key_ret:
 	addq	$8,%rsp
+
 	.byte	0xf3,0xc3
+
 L$SEH_end_set_decrypt_key:
 
 .globl	_aesni_set_encrypt_key
@@ -3200,7 +4093,9 @@ L$SEH_end_set_decrypt_key:
 .p2align	4
 _aesni_set_encrypt_key:
 __aesni_set_encrypt_key:
+
 .byte	0x48,0x83,0xEC,0x08
+
 	movq	$-1,%rax
 	testq	%rdi,%rdi
 	jz	L$enc_key_ret
@@ -3493,7 +4388,9 @@ L$enc_key_ret:
 	pxor	%xmm4,%xmm4
 	pxor	%xmm5,%xmm5
 	addq	$8,%rsp
+
 	.byte	0xf3,0xc3
+
 L$SEH_end_set_encrypt_key:
 
 .p2align	4
diff --git a/lib/accelerated/x86/macosx/cpuid-x86.s b/lib/accelerated/x86/macosx/cpuid-x86.s
deleted file mode 100644
index a8371ab56e..0000000000
--- a/lib/accelerated/x86/macosx/cpuid-x86.s
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-# Copyright (C) 2013 Nikos Mavrogiannopoulos
-#
-# Author: Nikos Mavrogiannopoulos
-#
-# This file is part of GnuTLS.
-#
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-# *** This file is auto-generated ***
-#
-.file	"devel/perlasm/cpuid-x86.s"
-.text
-.globl	_gnutls_cpuid
-.align	4
-_gnutls_cpuid:
-L_gnutls_cpuid_begin:
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$12,%esp
-	movl	%ebx,(%esp)
-	movl	8(%ebp),%eax
-	movl	%esi,4(%esp)
-	movl	%edi,8(%esp)
-	pushl	%ebx
-	.byte	0x0f,0xa2
-	movl	%ebx,%edi
-	popl	%ebx
-	movl	%edx,%esi
-	movl	12(%ebp),%edx
-	movl	%eax,(%edx)
-	movl	16(%ebp),%eax
-	movl	%edi,(%eax)
-	movl	20(%ebp),%eax
-	movl	%ecx,(%eax)
-	movl	24(%ebp),%eax
-	movl	%esi,(%eax)
-	movl	(%esp),%ebx
-	movl	4(%esp),%esi
-	movl	8(%esp),%edi
-	movl	%ebp,%esp
-	popl	%ebp
-	ret
-.globl	_gnutls_have_cpuid
-.align	4
-_gnutls_have_cpuid:
-L_gnutls_have_cpuid_begin:
-	pushfl
-	popl	%eax
-	orl	$2097152,%eax
-	pushl	%eax
-	popfl
-	pushfl
-	popl	%eax
-	andl	$2097152,%eax
-	ret
-.byte	67,80,85,73,68,32,102,111,114,32,120,56,54,0
-
diff --git a/lib/accelerated/x86/macosx/cpuid-x86_64.s b/lib/accelerated/x86/macosx/cpuid-x86_64.s
deleted file mode 100644
index 05dc5c8e71..0000000000
--- a/lib/accelerated/x86/macosx/cpuid-x86_64.s
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-# Copyright (C) 2013 Nikos Mavrogiannopoulos
-#
-# Author: Nikos Mavrogiannopoulos
-#
-# This file is part of GnuTLS.
-#
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-# *** This file is auto-generated ***
-#
-.text	
-.globl	_gnutls_cpuid
-
-.p2align	4
-_gnutls_cpuid:
-	pushq	%rbp
-	movq	%rsp,%rbp
-	pushq	%rbx
-	movl	%edi,-12(%rbp)
-	movq	%rsi,-24(%rbp)
-	movq	%rdx,-32(%rbp)
-	movq	%rcx,-40(%rbp)
-	movq	%r8,-48(%rbp)
-	movl	-12(%rbp),%eax
-	movl	%eax,-60(%rbp)
-	movl	-60(%rbp),%eax
-	cpuid
-	movl	%edx,-56(%rbp)
-	movl	%ecx,%esi
-	movl	%eax,-52(%rbp)
-	movq	-24(%rbp),%rax
-	movl	-52(%rbp),%edx
-	movl	%edx,(%rax)
-	movq	-32(%rbp),%rax
-	movl	%ebx,(%rax)
-	movq	-40(%rbp),%rax
-	movl	%esi,(%rax)
-	movq	-48(%rbp),%rax
-	movl	-56(%rbp),%ecx
-	movl	%ecx,(%rax)
-	popq	%rbx
-	leave
-	.byte	0xf3,0xc3
-
-
diff --git a/lib/accelerated/x86/macosx/ghash-x86_64.s b/lib/accelerated/x86/macosx/ghash-x86_64.s
index 8fe772fd35..5fd3216755 100644
--- a/lib/accelerated/x86/macosx/ghash-x86_64.s
+++ b/lib/accelerated/x86/macosx/ghash-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,9 +44,21 @@
 
 .p2align	4
 _gcm_gmult_4bit:
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	subq	$280,%rsp
+
 L$gmult_prologue:
 
 	movzbq	15(%rdi),%r8
@@ -123,22 +135,35 @@ L$break1:
 	movq	%r8,8(%rdi)
 	movq	%r9,(%rdi)
 
-	movq	16(%rsp),%rbx
-	leaq	24(%rsp),%rsp
+	leaq	280+48(%rsp),%rsi
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
 L$gmult_epilogue:
 	.byte	0xf3,0xc3
 
+
 .globl	_gcm_ghash_4bit
 
 .p2align	4
 _gcm_ghash_4bit:
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
+
 	subq	$280,%rsp
+
 L$ghash_prologue:
 	movq	%rdx,%r14
 	movq	%rcx,%r15
@@ -683,21 +708,31 @@ L$outer_loop:
 	movq	%r8,8(%rdi)
 	movq	%r9,(%rdi)
 
-	leaq	280(%rsp),%rsi
-	movq	0(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
+	leaq	280+48(%rsp),%rsi
+
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	0(%rsi),%rsp
+
 L$ghash_epilogue:
 	.byte	0xf3,0xc3
 
+
 .globl	_gcm_init_clmul
 
 .p2align	4
 _gcm_init_clmul:
+
 L$_init_clmul:
 	movdqu	(%rsi),%xmm2
 	pshufd	$78,%xmm2,%xmm2
@@ -850,10 +885,12 @@ L$_init_clmul:
 	movdqu	%xmm4,80(%rdi)
 	.byte	0xf3,0xc3
 
+
 .globl	_gcm_gmult_clmul
 
 .p2align	4
 _gcm_gmult_clmul:
+
 L$_gmult_clmul:
 	movdqu	(%rdi),%xmm0
 	movdqa	L$bswap_mask(%rip),%xmm5
@@ -901,10 +938,12 @@ L$_gmult_clmul:
 	movdqu	%xmm0,(%rdi)
 	.byte	0xf3,0xc3
 
+
 .globl	_gcm_ghash_clmul
 
 .p2align	5
 _gcm_ghash_clmul:
+
 L$_ghash_clmul:
 	movdqa	L$bswap_mask(%rip),%xmm10
 
@@ -1284,10 +1323,12 @@ L$done:
 	movdqu	%xmm0,(%rdi)
 	.byte	0xf3,0xc3
 
+
 .globl	_gcm_init_avx
 
 .p2align	5
 _gcm_init_avx:
+
 	vzeroupper
 
 	vmovdqu	(%rsi),%xmm2
@@ -1391,16 +1432,20 @@ L$init_start_avx:
 	vzeroupper
 	.byte	0xf3,0xc3
 
+
 .globl	_gcm_gmult_avx
 
 .p2align	5
 _gcm_gmult_avx:
+
 	jmp	L$_gmult_clmul
 
+
 .globl	_gcm_ghash_avx
 
 .p2align	5
 _gcm_ghash_avx:
+
 	vzeroupper
 
 	vmovdqu	(%rdi),%xmm10
@@ -1773,6 +1818,7 @@ L$tail_no_xor_avx:
 	vzeroupper
 	.byte	0xf3,0xc3
 
+
 .p2align	6
 L$bswap_mask:
 .byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
diff --git a/lib/accelerated/x86/macosx/sha1-ssse3-x86.s b/lib/accelerated/x86/macosx/sha1-ssse3-x86.s
index 8e01010ce3..985d4af8db 100644
--- a/lib/accelerated/x86/macosx/sha1-ssse3-x86.s
+++ b/lib/accelerated/x86/macosx/sha1-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha1-586.s"
 .text
 .globl	_sha1_block_data_order
 .align	4
diff --git a/lib/accelerated/x86/macosx/sha1-ssse3-x86_64.s b/lib/accelerated/x86/macosx/sha1-ssse3-x86_64.s
index 79c10de2ed..a576acc25f 100644
--- a/lib/accelerated/x86/macosx/sha1-ssse3-x86_64.s
+++ b/lib/accelerated/x86/macosx/sha1-ssse3-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,25 +44,45 @@
 
 .p2align	4
 _sha1_block_data_order:
+
 	movl	__gnutls_x86_cpuid_s+0(%rip),%r9d
 	movl	__gnutls_x86_cpuid_s+4(%rip),%r8d
+	movl	__gnutls_x86_cpuid_s+8(%rip),%r10d
 	testl	$512,%r8d
 	jz	L$ialu
+	testl	$536870912,%r10d
+	jnz	_shaext_shortcut
+	andl	$296,%r10d
+	cmpl	$296,%r10d
+	je	_avx2_shortcut
+	andl	$268435456,%r8d
+	andl	$1073741824,%r9d
+	orl	%r9d,%r8d
+	cmpl	$1342177280,%r8d
+	je	_avx_shortcut
 	jmp	_ssse3_shortcut
 
 .p2align	4
 L$ialu:
+	movq	%rsp,%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
-	movq	%rsp,%r11
+
+	pushq	%r14
+
 	movq	%rdi,%r8
 	subq	$72,%rsp
 	movq	%rsi,%r9
 	andq	$-64,%rsp
 	movq	%rdx,%r10
-	movq	%r11,64(%rsp)
+	movq	%rax,64(%rsp)
+
 L$prologue:
 
 	movl	0(%r8),%esi
@@ -76,1230 +96,1168 @@ L$prologue:
 L$loop:
 	movl	0(%r9),%edx
 	bswapl	%edx
-	movl	%edx,0(%rsp)
-	movl	%r11d,%eax
 	movl	4(%r9),%ebp
+	movl	%r12d,%eax
+	movl	%edx,0(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
 	bswapl	%ebp
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%ebp,4(%rsp)
+	leal	1518500249(%rdx,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
-	movl	8(%r9),%edx
+	movl	8(%r9),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,4(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%edx,8(%rsp)
+	leal	1518500249(%rbp,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
-	movl	12(%r9),%ebp
+	movl	12(%r9),%edx
+	movl	%edi,%eax
+	movl	%r14d,8(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%ebp,12(%rsp)
+	leal	1518500249(%r14,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	16(%r9),%edx
+	movl	16(%r9),%ebp
+	movl	%esi,%eax
+	movl	%edx,12(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%edx
+	bswapl	%ebp
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%edx,16(%rsp)
+	leal	1518500249(%rdx,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	20(%r9),%ebp
+	movl	20(%r9),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,16(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%ebp
+	bswapl	%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%ebp,20(%rsp)
+	leal	1518500249(%rbp,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	%r11d,%eax
 	movl	24(%r9),%edx
+	movl	%r12d,%eax
+	movl	%r14d,20(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
 	bswapl	%edx
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%edx,24(%rsp)
+	leal	1518500249(%r14,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
 	movl	28(%r9),%ebp
+	movl	%r11d,%eax
+	movl	%edx,24(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
 	bswapl	%ebp
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%ebp,28(%rsp)
+	leal	1518500249(%rdx,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
-	movl	32(%r9),%edx
+	movl	32(%r9),%r14d
+	movl	%edi,%eax
+	movl	%ebp,28(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%edx,32(%rsp)
+	leal	1518500249(%rbp,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	36(%r9),%ebp
+	movl	36(%r9),%edx
+	movl	%esi,%eax
+	movl	%r14d,32(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%ebp,36(%rsp)
+	leal	1518500249(%r14,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	40(%r9),%edx
+	movl	40(%r9),%ebp
+	movl	%r13d,%eax
+	movl	%edx,36(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%edx
+	bswapl	%ebp
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%edx,40(%rsp)
+	leal	1518500249(%rdx,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	%r11d,%eax
-	movl	44(%r9),%ebp
+	movl	44(%r9),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,40(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
-	bswapl	%ebp
+	bswapl	%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%ebp,44(%rsp)
+	leal	1518500249(%rbp,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
 	movl	48(%r9),%edx
+	movl	%r11d,%eax
+	movl	%r14d,44(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
 	bswapl	%edx
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%edx,48(%rsp)
+	leal	1518500249(%r14,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
 	movl	52(%r9),%ebp
+	movl	%edi,%eax
+	movl	%edx,48(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
 	bswapl	%ebp
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%ebp,52(%rsp)
+	leal	1518500249(%rdx,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	56(%r9),%edx
+	movl	56(%r9),%r14d
+	movl	%esi,%eax
+	movl	%ebp,52(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%edx,56(%rsp)
+	leal	1518500249(%rbp,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	60(%r9),%ebp
+	movl	60(%r9),%edx
+	movl	%r13d,%eax
+	movl	%r14d,56(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%ebp,60(%rsp)
+	leal	1518500249(%r14,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	0(%rsp),%edx
-	movl	%r11d,%eax
+	xorl	0(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,60(%rsp)
 	movl	%esi,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	8(%rsp),%ebp
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	xorl	32(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	andl	%edi,%eax
-	leal	1518500249(%rbp,%r13,1),%r13d
-	xorl	52(%rsp),%edx
+	leal	1518500249(%rdx,%r13,1),%r13d
+	roll	$30,%edi
 	xorl	%r12d,%eax
-	roll	$1,%edx
 	addl	%ecx,%r13d
-	roll	$30,%edi
-	movl	%edx,0(%rsp)
+	roll	$1,%ebp
 	addl	%eax,%r13d
-	movl	4(%rsp),%ebp
-	movl	%edi,%eax
+	xorl	4(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,0(%rsp)
 	movl	%r13d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r11d,%eax
+	xorl	12(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	xorl	36(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	andl	%esi,%eax
-	leal	1518500249(%rdx,%r12,1),%r12d
-	xorl	56(%rsp),%ebp
+	leal	1518500249(%rbp,%r12,1),%r12d
+	roll	$30,%esi
 	xorl	%r11d,%eax
-	roll	$1,%ebp
 	addl	%ecx,%r12d
-	roll	$30,%esi
-	movl	%ebp,4(%rsp)
+	roll	$1,%r14d
 	addl	%eax,%r12d
-	movl	8(%rsp),%edx
-	movl	%esi,%eax
+	xorl	8(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,4(%rsp)
 	movl	%r12d,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
 	xorl	40(%rsp),%edx
 	andl	%r13d,%eax
-	leal	1518500249(%rbp,%r11,1),%r11d
-	xorl	60(%rsp),%edx
+	leal	1518500249(%r14,%r11,1),%r11d
+	roll	$30,%r13d
 	xorl	%edi,%eax
-	roll	$1,%edx
 	addl	%ecx,%r11d
-	roll	$30,%r13d
-	movl	%edx,8(%rsp)
+	roll	$1,%edx
 	addl	%eax,%r11d
-	movl	12(%rsp),%ebp
-	movl	%r13d,%eax
+	xorl	12(%rsp),%ebp
+	movl	%esi,%eax
+	movl	%edx,8(%rsp)
 	movl	%r11d,%ecx
 	xorl	20(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
 	xorl	44(%rsp),%ebp
 	andl	%r12d,%eax
 	leal	1518500249(%rdx,%rdi,1),%edi
-	xorl	0(%rsp),%ebp
+	roll	$30,%r12d
 	xorl	%esi,%eax
-	roll	$1,%ebp
 	addl	%ecx,%edi
-	roll	$30,%r12d
-	movl	%ebp,12(%rsp)
+	roll	$1,%ebp
 	addl	%eax,%edi
-	movl	16(%rsp),%edx
-	movl	%r12d,%eax
+	xorl	16(%rsp),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,12(%rsp)
 	movl	%edi,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	24(%rsp),%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	xorl	48(%rsp),%edx
+	xorl	48(%rsp),%r14d
 	andl	%r11d,%eax
 	leal	1518500249(%rbp,%rsi,1),%esi
-	xorl	4(%rsp),%edx
+	roll	$30,%r11d
 	xorl	%r13d,%eax
-	roll	$1,%edx
 	addl	%ecx,%esi
-	roll	$30,%r11d
-	movl	%edx,16(%rsp)
+	roll	$1,%r14d
 	addl	%eax,%esi
-	movl	20(%rsp),%ebp
-	movl	%r11d,%eax
+	xorl	20(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,16(%rsp)
 	movl	%esi,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r13,1),%r13d
-	xorl	52(%rsp),%ebp
+	xorl	28(%rsp),%edx
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	52(%rsp),%edx
+	leal	1859775393(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	8(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%ebp
-	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%edi,%eax
+	roll	$1,%edx
+	xorl	24(%rsp),%ebp
+	movl	%esi,%eax
+	movl	%edx,20(%rsp)
 	movl	%r13d,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%r12,1),%r12d
-	xorl	56(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	56(%rsp),%ebp
+	leal	1859775393(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	12(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%ebp
+	xorl	28(%rsp),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,24(%rsp)
 	movl	%r12d,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r11,1),%r11d
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%r14d
+	leal	1859775393(%rbp,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	16(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	32(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,28(%rsp)
 	movl	%r11d,%ecx
 	xorl	40(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%rdi,1),%edi
 	xorl	0(%rsp),%edx
-	xorl	%esi,%eax
+	leal	1859775393(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	20(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
 	roll	$1,%edx
+	xorl	36(%rsp),%ebp
+	movl	%r11d,%eax
 	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	44(%rsp),%ebp
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%rsi,1),%esi
 	xorl	4(%rsp),%ebp
-	xorl	%r13d,%eax
+	leal	1859775393(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	24(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
 	roll	$1,%ebp
+	xorl	40(%rsp),%r14d
+	movl	%edi,%eax
 	movl	%ebp,36(%rsp)
-	movl	40(%rsp),%edx
-	movl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	48(%rsp),%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
+	xorl	8(%rsp),%r14d
 	leal	1859775393(%rbp,%r13,1),%r13d
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	28(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%edx
-	movl	%edx,40(%rsp)
-	movl	44(%rsp),%ebp
-	movl	%edi,%eax
+	roll	$1,%r14d
+	xorl	44(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,40(%rsp)
 	movl	%r13d,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r12,1),%r12d
-	xorl	12(%rsp),%ebp
+	xorl	52(%rsp),%edx
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	12(%rsp),%edx
+	leal	1859775393(%r14,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	32(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%ebp
-	movl	%ebp,44(%rsp)
-	movl	48(%rsp),%edx
-	movl	%esi,%eax
+	roll	$1,%edx
+	xorl	48(%rsp),%ebp
+	movl	%r13d,%eax
+	movl	%edx,44(%rsp)
 	movl	%r12d,%ecx
-	xorl	56(%rsp),%edx
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%r11,1),%r11d
-	xorl	16(%rsp),%edx
+	xorl	56(%rsp),%ebp
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	16(%rsp),%ebp
+	leal	1859775393(%rdx,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	36(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,48(%rsp)
-	movl	52(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%ebp
+	xorl	52(%rsp),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,48(%rsp)
 	movl	%r11d,%ecx
-	xorl	60(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rdi,1),%edi
-	xorl	20(%rsp),%ebp
+	xorl	60(%rsp),%r14d
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	20(%rsp),%r14d
+	leal	1859775393(%rbp,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	40(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,52(%rsp)
-	movl	56(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%r14d
+	xorl	56(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,52(%rsp)
 	movl	%edi,%ecx
 	xorl	0(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%rsi,1),%esi
 	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	leal	1859775393(%r14,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	44(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
 	roll	$1,%edx
+	xorl	60(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,56(%rsp)
-	movl	60(%rsp),%ebp
-	movl	%r11d,%eax
 	movl	%esi,%ecx
 	xorl	4(%rsp),%ebp
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%r13,1),%r13d
 	xorl	28(%rsp),%ebp
-	xorl	%r12d,%eax
+	leal	1859775393(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	48(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%ebp
+	xorl	0(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,60(%rsp)
-	movl	0(%rsp),%edx
-	movl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	8(%rsp),%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
+	xorl	32(%rsp),%r14d
 	leal	1859775393(%rbp,%r12,1),%r12d
-	xorl	32(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	52(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,0(%rsp)
-	movl	4(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	4(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,0(%rsp)
 	movl	%r12d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%r11,1),%r11d
-	xorl	36(%rsp),%ebp
+	xorl	12(%rsp),%edx
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	36(%rsp),%edx
+	leal	1859775393(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	56(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,4(%rsp)
-	movl	8(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%edx
+	xorl	8(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,4(%rsp)
 	movl	%r11d,%ecx
-	xorl	16(%rsp),%edx
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%rdi,1),%edi
-	xorl	40(%rsp),%edx
+	xorl	16(%rsp),%ebp
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	40(%rsp),%ebp
+	leal	1859775393(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	60(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,8(%rsp)
-	movl	12(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	12(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,8(%rsp)
 	movl	%edi,%ecx
-	xorl	20(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rsi,1),%esi
-	xorl	44(%rsp),%ebp
+	xorl	20(%rsp),%r14d
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	44(%rsp),%r14d
+	leal	1859775393(%rbp,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	0(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,12(%rsp)
-	movl	16(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%r14d
+	xorl	16(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,12(%rsp)
 	movl	%esi,%ecx
 	xorl	24(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rbp,%r13,1),%r13d
 	xorl	48(%rsp),%edx
-	xorl	%r12d,%eax
+	leal	1859775393(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	4(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%edx
+	xorl	20(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,16(%rsp)
-	movl	20(%rsp),%ebp
-	movl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	28(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1859775393(%rdx,%r12,1),%r12d
 	xorl	52(%rsp),%ebp
-	xorl	%r11d,%eax
+	leal	1859775393(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	8(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%ebp
+	xorl	24(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	32(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
+	xorl	56(%rsp),%r14d
 	leal	1859775393(%rbp,%r11,1),%r11d
-	xorl	56(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	12(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	28(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,24(%rsp)
 	movl	%r11d,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rdx,%rdi,1),%edi
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%edx
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%edx
+	leal	1859775393(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	16(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%edx
+	xorl	32(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,28(%rsp)
 	movl	%edi,%ecx
-	xorl	40(%rsp),%edx
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	1859775393(%rbp,%rsi,1),%esi
-	xorl	0(%rsp),%edx
+	xorl	40(%rsp),%ebp
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	0(%rsp),%ebp
+	leal	1859775393(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	20(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%edx
-	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	44(%rsp),%ebp
-	andl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	36(%rsp),%r14d
+	movl	%r12d,%eax
+	movl	%ebp,32(%rsp)
+	movl	%r12d,%ebx
+	xorl	44(%rsp),%r14d
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	4(%rsp),%r14d
+	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	24(%rsp),%ebp
 	addl	%eax,%r13d
+	roll	$1,%r14d
 	andl	%edi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%ebp,36(%rsp)
 	addl	%ecx,%r13d
-	movl	40(%rsp),%edx
-	movl	%edi,%eax
-	movl	%edi,%ebx
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	40(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,36(%rsp)
+	movl	%r11d,%ebx
 	xorl	48(%rsp),%edx
-	andl	%r11d,%eax
+	andl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	8(%rsp),%edx
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rbp,%r12,1),%r12d
+	leal	-1894007588(%r14,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	28(%rsp),%edx
 	addl	%eax,%r12d
-	andl	%esi,%ebx
 	roll	$1,%edx
-	addl	%ebx,%r12d
+	andl	%esi,%ebx
+	addl	%ecx,%r12d
 	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	44(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,40(%rsp)
-	addl	%ecx,%r12d
-	movl	44(%rsp),%ebp
-	movl	%esi,%eax
-	movl	%esi,%ebx
+	movl	%edi,%ebx
 	xorl	52(%rsp),%ebp
-	andl	%edi,%eax
+	andl	%esi,%eax
 	movl	%r12d,%ecx
 	xorl	12(%rsp),%ebp
-	xorl	%edi,%ebx
 	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	32(%rsp),%ebp
 	addl	%eax,%r11d
-	andl	%r13d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%r11d
+	andl	%r13d,%ebx
+	addl	%ecx,%r11d
 	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	48(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,44(%rsp)
-	addl	%ecx,%r11d
-	movl	48(%rsp),%edx
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
-	xorl	56(%rsp),%edx
-	andl	%esi,%eax
+	movl	%esi,%ebx
+	xorl	56(%rsp),%r14d
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
-	xorl	16(%rsp),%edx
-	xorl	%esi,%ebx
+	xorl	16(%rsp),%r14d
 	leal	-1894007588(%rbp,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	36(%rsp),%edx
 	addl	%eax,%edi
+	roll	$1,%r14d
 	andl	%r12d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%edi
-	roll	$30,%r12d
-	movl	%edx,48(%rsp)
 	addl	%ecx,%edi
-	movl	52(%rsp),%ebp
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
-	xorl	60(%rsp),%ebp
-	andl	%r13d,%eax
+	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	52(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,48(%rsp)
+	movl	%r13d,%ebx
+	xorl	60(%rsp),%edx
+	andl	%r12d,%eax
 	movl	%edi,%ecx
-	xorl	20(%rsp),%ebp
-	xorl	%r13d,%ebx
-	leal	-1894007588(%rdx,%rsi,1),%esi
+	xorl	20(%rsp),%edx
+	leal	-1894007588(%r14,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	40(%rsp),%ebp
 	addl	%eax,%esi
+	roll	$1,%edx
 	andl	%r11d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%esi
-	roll	$30,%r11d
-	movl	%ebp,52(%rsp)
 	addl	%ecx,%esi
-	movl	56(%rsp),%edx
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	0(%rsp),%edx
-	andl	%r12d,%eax
+	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	56(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,52(%rsp)
+	movl	%r12d,%ebx
+	xorl	0(%rsp),%ebp
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	24(%rsp),%ebp
+	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	44(%rsp),%edx
 	addl	%eax,%r13d
+	roll	$1,%ebp
 	andl	%edi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%edx,56(%rsp)
 	addl	%ecx,%r13d
-	movl	60(%rsp),%ebp
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	4(%rsp),%ebp
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	60(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,56(%rsp)
+	movl	%r11d,%ebx
+	xorl	4(%rsp),%r14d
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	28(%rsp),%r14d
+	leal	-1894007588(%rbp,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	48(%rsp),%ebp
 	addl	%eax,%r12d
+	roll	$1,%r14d
 	andl	%esi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%ebp,60(%rsp)
 	addl	%ecx,%r12d
-	movl	0(%rsp),%edx
-	movl	%esi,%eax
-	movl	%esi,%ebx
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	0(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,60(%rsp)
+	movl	%edi,%ebx
 	xorl	8(%rsp),%edx
-	andl	%edi,%eax
+	andl	%esi,%eax
 	movl	%r12d,%ecx
 	xorl	32(%rsp),%edx
-	xorl	%edi,%ebx
-	leal	-1894007588(%rbp,%r11,1),%r11d
+	leal	-1894007588(%r14,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	52(%rsp),%edx
 	addl	%eax,%r11d
-	andl	%r13d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%r11d
+	andl	%r13d,%ebx
+	addl	%ecx,%r11d
 	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	4(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,0(%rsp)
-	addl	%ecx,%r11d
-	movl	4(%rsp),%ebp
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
+	movl	%esi,%ebx
 	xorl	12(%rsp),%ebp
-	andl	%esi,%eax
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
 	xorl	36(%rsp),%ebp
-	xorl	%esi,%ebx
 	leal	-1894007588(%rdx,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	56(%rsp),%ebp
 	addl	%eax,%edi
-	andl	%r12d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%edi
+	andl	%r12d,%ebx
+	addl	%ecx,%edi
 	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	8(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,4(%rsp)
-	addl	%ecx,%edi
-	movl	8(%rsp),%edx
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
-	xorl	16(%rsp),%edx
-	andl	%r13d,%eax
+	movl	%r13d,%ebx
+	xorl	16(%rsp),%r14d
+	andl	%r12d,%eax
 	movl	%edi,%ecx
-	xorl	40(%rsp),%edx
-	xorl	%r13d,%ebx
+	xorl	40(%rsp),%r14d
 	leal	-1894007588(%rbp,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	60(%rsp),%edx
 	addl	%eax,%esi
+	roll	$1,%r14d
 	andl	%r11d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%esi
-	roll	$30,%r11d
-	movl	%edx,8(%rsp)
 	addl	%ecx,%esi
-	movl	12(%rsp),%ebp
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	20(%rsp),%ebp
-	andl	%r12d,%eax
+	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	12(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,8(%rsp)
+	movl	%r12d,%ebx
+	xorl	20(%rsp),%edx
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	44(%rsp),%ebp
-	xorl	%r12d,%ebx
-	leal	-1894007588(%rdx,%r13,1),%r13d
+	xorl	44(%rsp),%edx
+	leal	-1894007588(%r14,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	0(%rsp),%ebp
 	addl	%eax,%r13d
+	roll	$1,%edx
 	andl	%edi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%ebp,12(%rsp)
 	addl	%ecx,%r13d
-	movl	16(%rsp),%edx
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	24(%rsp),%edx
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	16(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,12(%rsp)
+	movl	%r11d,%ebx
+	xorl	24(%rsp),%ebp
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rbp,%r12,1),%r12d
+	xorl	48(%rsp),%ebp
+	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	4(%rsp),%edx
 	addl	%eax,%r12d
+	roll	$1,%ebp
 	andl	%esi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%edx,16(%rsp)
 	addl	%ecx,%r12d
-	movl	20(%rsp),%ebp
-	movl	%esi,%eax
-	movl	%esi,%ebx
-	xorl	28(%rsp),%ebp
-	andl	%edi,%eax
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	20(%rsp),%r14d
+	movl	%edi,%eax
+	movl	%ebp,16(%rsp)
+	movl	%edi,%ebx
+	xorl	28(%rsp),%r14d
+	andl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%edi,%ebx
-	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	52(%rsp),%r14d
+	leal	-1894007588(%rbp,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	8(%rsp),%ebp
 	addl	%eax,%r11d
+	roll	$1,%r14d
 	andl	%r13d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r11d
-	roll	$30,%r13d
-	movl	%ebp,20(%rsp)
 	addl	%ecx,%r11d
-	movl	24(%rsp),%edx
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
+	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	24(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,20(%rsp)
+	movl	%esi,%ebx
 	xorl	32(%rsp),%edx
-	andl	%esi,%eax
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
 	xorl	56(%rsp),%edx
-	xorl	%esi,%ebx
-	leal	-1894007588(%rbp,%rdi,1),%edi
+	leal	-1894007588(%r14,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	12(%rsp),%edx
 	addl	%eax,%edi
-	andl	%r12d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%edi
+	andl	%r12d,%ebx
+	addl	%ecx,%edi
 	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	28(%rsp),%ebp
+	movl	%r13d,%eax
 	movl	%edx,24(%rsp)
-	addl	%ecx,%edi
-	movl	28(%rsp),%ebp
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
+	movl	%r13d,%ebx
 	xorl	36(%rsp),%ebp
-	andl	%r13d,%eax
+	andl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	60(%rsp),%ebp
-	xorl	%r13d,%ebx
 	leal	-1894007588(%rdx,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	16(%rsp),%ebp
 	addl	%eax,%esi
-	andl	%r11d,%ebx
 	roll	$1,%ebp
-	addl	%ebx,%esi
+	andl	%r11d,%ebx
+	addl	%ecx,%esi
 	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	32(%rsp),%r14d
+	movl	%r12d,%eax
 	movl	%ebp,28(%rsp)
-	addl	%ecx,%esi
-	movl	32(%rsp),%edx
-	movl	%r11d,%eax
-	movl	%r11d,%ebx
-	xorl	40(%rsp),%edx
-	andl	%r12d,%eax
+	movl	%r12d,%ebx
+	xorl	40(%rsp),%r14d
+	andl	%r11d,%eax
 	movl	%esi,%ecx
-	xorl	0(%rsp),%edx
-	xorl	%r12d,%ebx
+	xorl	0(%rsp),%r14d
 	leal	-1894007588(%rbp,%r13,1),%r13d
+	xorl	%r11d,%ebx
 	roll	$5,%ecx
-	xorl	20(%rsp),%edx
 	addl	%eax,%r13d
+	roll	$1,%r14d
 	andl	%edi,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r13d
-	roll	$30,%edi
-	movl	%edx,32(%rsp)
 	addl	%ecx,%r13d
-	movl	36(%rsp),%ebp
-	movl	%edi,%eax
-	movl	%edi,%ebx
-	xorl	44(%rsp),%ebp
-	andl	%r11d,%eax
+	roll	$30,%edi
+	addl	%ebx,%r13d
+	xorl	36(%rsp),%edx
+	movl	%r11d,%eax
+	movl	%r14d,32(%rsp)
+	movl	%r11d,%ebx
+	xorl	44(%rsp),%edx
+	andl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r11d,%ebx
-	leal	-1894007588(%rdx,%r12,1),%r12d
+	xorl	4(%rsp),%edx
+	leal	-1894007588(%r14,%r12,1),%r12d
+	xorl	%edi,%ebx
 	roll	$5,%ecx
-	xorl	24(%rsp),%ebp
 	addl	%eax,%r12d
+	roll	$1,%edx
 	andl	%esi,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%r12d
-	roll	$30,%esi
-	movl	%ebp,36(%rsp)
 	addl	%ecx,%r12d
-	movl	40(%rsp),%edx
-	movl	%esi,%eax
-	movl	%esi,%ebx
-	xorl	48(%rsp),%edx
-	andl	%edi,%eax
+	roll	$30,%esi
+	addl	%ebx,%r12d
+	xorl	40(%rsp),%ebp
+	movl	%edi,%eax
+	movl	%edx,36(%rsp)
+	movl	%edi,%ebx
+	xorl	48(%rsp),%ebp
+	andl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%edi,%ebx
-	leal	-1894007588(%rbp,%r11,1),%r11d
+	xorl	8(%rsp),%ebp
+	leal	-1894007588(%rdx,%r11,1),%r11d
+	xorl	%esi,%ebx
 	roll	$5,%ecx
-	xorl	28(%rsp),%edx
 	addl	%eax,%r11d
+	roll	$1,%ebp
 	andl	%r13d,%ebx
-	roll	$1,%edx
-	addl	%ebx,%r11d
-	roll	$30,%r13d
-	movl	%edx,40(%rsp)
 	addl	%ecx,%r11d
-	movl	44(%rsp),%ebp
-	movl	%r13d,%eax
-	movl	%r13d,%ebx
-	xorl	52(%rsp),%ebp
-	andl	%esi,%eax
+	roll	$30,%r13d
+	addl	%ebx,%r11d
+	xorl	44(%rsp),%r14d
+	movl	%esi,%eax
+	movl	%ebp,40(%rsp)
+	movl	%esi,%ebx
+	xorl	52(%rsp),%r14d
+	andl	%r13d,%eax
 	movl	%r11d,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%esi,%ebx
-	leal	-1894007588(%rdx,%rdi,1),%edi
+	xorl	12(%rsp),%r14d
+	leal	-1894007588(%rbp,%rdi,1),%edi
+	xorl	%r13d,%ebx
 	roll	$5,%ecx
-	xorl	32(%rsp),%ebp
 	addl	%eax,%edi
+	roll	$1,%r14d
 	andl	%r12d,%ebx
-	roll	$1,%ebp
-	addl	%ebx,%edi
-	roll	$30,%r12d
-	movl	%ebp,44(%rsp)
 	addl	%ecx,%edi
-	movl	48(%rsp),%edx
-	movl	%r12d,%eax
-	movl	%r12d,%ebx
+	roll	$30,%r12d
+	addl	%ebx,%edi
+	xorl	48(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,44(%rsp)
+	movl	%r13d,%ebx
 	xorl	56(%rsp),%edx
-	andl	%r13d,%eax
+	andl	%r12d,%eax
 	movl	%edi,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%r13d,%ebx
-	leal	-1894007588(%rbp,%rsi,1),%esi
+	leal	-1894007588(%r14,%rsi,1),%esi
+	xorl	%r12d,%ebx
 	roll	$5,%ecx
-	xorl	36(%rsp),%edx
 	addl	%eax,%esi
-	andl	%r11d,%ebx
 	roll	$1,%edx
-	addl	%ebx,%esi
+	andl	%r11d,%ebx
+	addl	%ecx,%esi
 	roll	$30,%r11d
+	addl	%ebx,%esi
+	xorl	52(%rsp),%ebp
+	movl	%edi,%eax
 	movl	%edx,48(%rsp)
-	addl	%ecx,%esi
-	movl	52(%rsp),%ebp
-	movl	%r11d,%eax
 	movl	%esi,%ecx
 	xorl	60(%rsp),%ebp
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r13,1),%r13d
 	xorl	20(%rsp),%ebp
-	xorl	%r12d,%eax
+	leal	-899497514(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	40(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%ebp
+	xorl	56(%rsp),%r14d
+	movl	%esi,%eax
 	movl	%ebp,52(%rsp)
-	movl	56(%rsp),%edx
-	movl	%edi,%eax
 	movl	%r13d,%ecx
-	xorl	0(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	0(%rsp),%r14d
+	xorl	%r11d,%eax
 	roll	$5,%ecx
+	xorl	24(%rsp),%r14d
 	leal	-899497514(%rbp,%r12,1),%r12d
-	xorl	24(%rsp),%edx
-	xorl	%r11d,%eax
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	44(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%edx
-	movl	%edx,56(%rsp)
-	movl	60(%rsp),%ebp
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	60(%rsp),%edx
+	movl	%r13d,%eax
+	movl	%r14d,56(%rsp)
 	movl	%r12d,%ecx
-	xorl	4(%rsp),%ebp
-	xorl	%r13d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r11,1),%r11d
-	xorl	28(%rsp),%ebp
+	xorl	4(%rsp),%edx
 	xorl	%edi,%eax
+	roll	$5,%ecx
+	xorl	28(%rsp),%edx
+	leal	-899497514(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	48(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%ebp
-	movl	%ebp,60(%rsp)
-	movl	0(%rsp),%edx
-	movl	%r13d,%eax
+	roll	$1,%edx
+	xorl	0(%rsp),%ebp
+	movl	%r12d,%eax
+	movl	%edx,60(%rsp)
 	movl	%r11d,%ecx
-	xorl	8(%rsp),%edx
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%rdi,1),%edi
-	xorl	32(%rsp),%edx
+	xorl	8(%rsp),%ebp
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	32(%rsp),%ebp
+	leal	-899497514(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	52(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,0(%rsp)
-	movl	4(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%ebp
+	xorl	4(%rsp),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,0(%rsp)
 	movl	%edi,%ecx
-	xorl	12(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rsi,1),%esi
-	xorl	36(%rsp),%ebp
+	xorl	12(%rsp),%r14d
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	36(%rsp),%r14d
+	leal	-899497514(%rbp,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	56(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,4(%rsp)
-	movl	8(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%r14d
+	xorl	8(%rsp),%edx
+	movl	%edi,%eax
+	movl	%r14d,4(%rsp)
 	movl	%esi,%ecx
 	xorl	16(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r13,1),%r13d
 	xorl	40(%rsp),%edx
-	xorl	%r12d,%eax
+	leal	-899497514(%r14,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	60(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
 	roll	$1,%edx
+	xorl	12(%rsp),%ebp
+	movl	%esi,%eax
 	movl	%edx,8(%rsp)
-	movl	12(%rsp),%ebp
-	movl	%edi,%eax
 	movl	%r13d,%ecx
 	xorl	20(%rsp),%ebp
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r12,1),%r12d
 	xorl	44(%rsp),%ebp
-	xorl	%r11d,%eax
+	leal	-899497514(%rdx,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	0(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%ebp
+	xorl	16(%rsp),%r14d
+	movl	%r13d,%eax
 	movl	%ebp,12(%rsp)
-	movl	16(%rsp),%edx
-	movl	%esi,%eax
 	movl	%r12d,%ecx
-	xorl	24(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	24(%rsp),%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
+	xorl	48(%rsp),%r14d
 	leal	-899497514(%rbp,%r11,1),%r11d
-	xorl	48(%rsp),%edx
-	xorl	%edi,%eax
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	4(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	roll	$1,%edx
-	movl	%edx,16(%rsp)
-	movl	20(%rsp),%ebp
-	movl	%r13d,%eax
+	roll	$1,%r14d
+	xorl	20(%rsp),%edx
+	movl	%r12d,%eax
+	movl	%r14d,16(%rsp)
 	movl	%r11d,%ecx
-	xorl	28(%rsp),%ebp
-	xorl	%r12d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rdi,1),%edi
-	xorl	52(%rsp),%ebp
+	xorl	28(%rsp),%edx
 	xorl	%esi,%eax
+	roll	$5,%ecx
+	xorl	52(%rsp),%edx
+	leal	-899497514(%r14,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	8(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%ebp
-	movl	%ebp,20(%rsp)
-	movl	24(%rsp),%edx
-	movl	%r12d,%eax
+	roll	$1,%edx
+	xorl	24(%rsp),%ebp
+	movl	%r11d,%eax
+	movl	%edx,20(%rsp)
 	movl	%edi,%ecx
-	xorl	32(%rsp),%edx
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%rsi,1),%esi
-	xorl	56(%rsp),%edx
+	xorl	32(%rsp),%ebp
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	56(%rsp),%ebp
+	leal	-899497514(%rdx,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	12(%rsp),%edx
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%edx
-	movl	%edx,24(%rsp)
-	movl	28(%rsp),%ebp
-	movl	%r11d,%eax
+	roll	$1,%ebp
+	xorl	28(%rsp),%r14d
+	movl	%edi,%eax
+	movl	%ebp,24(%rsp)
 	movl	%esi,%ecx
-	xorl	36(%rsp),%ebp
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r13,1),%r13d
-	xorl	60(%rsp),%ebp
+	xorl	36(%rsp),%r14d
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	60(%rsp),%r14d
+	leal	-899497514(%rbp,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	16(%rsp),%ebp
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%ebp
-	movl	%ebp,28(%rsp)
-	movl	32(%rsp),%edx
-	movl	%edi,%eax
+	roll	$1,%r14d
+	xorl	32(%rsp),%edx
+	movl	%esi,%eax
+	movl	%r14d,28(%rsp)
 	movl	%r13d,%ecx
 	xorl	40(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r12,1),%r12d
 	xorl	0(%rsp),%edx
-	xorl	%r11d,%eax
+	leal	-899497514(%r14,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	20(%rsp),%edx
 	roll	$30,%esi
 	addl	%eax,%r12d
 	roll	$1,%edx
-	movl	%edx,32(%rsp)
-	movl	36(%rsp),%ebp
-	movl	%esi,%eax
+	xorl	36(%rsp),%ebp
+	movl	%r13d,%eax
+
 	movl	%r12d,%ecx
 	xorl	44(%rsp),%ebp
-	xorl	%r13d,%eax
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%r11,1),%r11d
 	xorl	4(%rsp),%ebp
-	xorl	%edi,%eax
+	leal	-899497514(%rdx,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	24(%rsp),%ebp
 	roll	$30,%r13d
 	addl	%eax,%r11d
 	roll	$1,%ebp
-	movl	%ebp,36(%rsp)
-	movl	40(%rsp),%edx
-	movl	%r13d,%eax
+	xorl	40(%rsp),%r14d
+	movl	%r12d,%eax
+
 	movl	%r11d,%ecx
-	xorl	48(%rsp),%edx
-	xorl	%r12d,%eax
+	xorl	48(%rsp),%r14d
+	xorl	%esi,%eax
 	roll	$5,%ecx
+	xorl	8(%rsp),%r14d
 	leal	-899497514(%rbp,%rdi,1),%edi
-	xorl	8(%rsp),%edx
-	xorl	%esi,%eax
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	28(%rsp),%edx
 	roll	$30,%r12d
 	addl	%eax,%edi
-	roll	$1,%edx
-	movl	%edx,40(%rsp)
-	movl	44(%rsp),%ebp
-	movl	%r12d,%eax
+	roll	$1,%r14d
+	xorl	44(%rsp),%edx
+	movl	%r11d,%eax
+
 	movl	%edi,%ecx
-	xorl	52(%rsp),%ebp
-	xorl	%r11d,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%rsi,1),%esi
-	xorl	12(%rsp),%ebp
+	xorl	52(%rsp),%edx
 	xorl	%r13d,%eax
+	roll	$5,%ecx
+	xorl	12(%rsp),%edx
+	leal	-899497514(%r14,%rsi,1),%esi
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
-	xorl	32(%rsp),%ebp
 	roll	$30,%r11d
 	addl	%eax,%esi
-	roll	$1,%ebp
-	movl	%ebp,44(%rsp)
-	movl	48(%rsp),%edx
-	movl	%r11d,%eax
+	roll	$1,%edx
+	xorl	48(%rsp),%ebp
+	movl	%edi,%eax
+
 	movl	%esi,%ecx
-	xorl	56(%rsp),%edx
-	xorl	%edi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rbp,%r13,1),%r13d
-	xorl	16(%rsp),%edx
+	xorl	56(%rsp),%ebp
 	xorl	%r12d,%eax
+	roll	$5,%ecx
+	xorl	16(%rsp),%ebp
+	leal	-899497514(%rdx,%r13,1),%r13d
+	xorl	%r11d,%eax
 	addl	%ecx,%r13d
-	xorl	36(%rsp),%edx
 	roll	$30,%edi
 	addl	%eax,%r13d
-	roll	$1,%edx
-	movl	%edx,48(%rsp)
-	movl	52(%rsp),%ebp
-	movl	%edi,%eax
+	roll	$1,%ebp
+	xorl	52(%rsp),%r14d
+	movl	%esi,%eax
+
 	movl	%r13d,%ecx
-	xorl	60(%rsp),%ebp
-	xorl	%esi,%eax
-	roll	$5,%ecx
-	leal	-899497514(%rdx,%r12,1),%r12d
-	xorl	20(%rsp),%ebp
+	xorl	60(%rsp),%r14d
 	xorl	%r11d,%eax
+	roll	$5,%ecx
+	xorl	20(%rsp),%r14d
+	leal	-899497514(%rbp,%r12,1),%r12d
+	xorl	%edi,%eax
 	addl	%ecx,%r12d
-	xorl	40(%rsp),%ebp
 	roll	$30,%esi
 	addl	%eax,%r12d
-	roll	$1,%ebp
-	movl	56(%rsp),%edx
-	movl	%esi,%eax
+	roll	$1,%r14d
+	xorl	56(%rsp),%edx
+	movl	%r13d,%eax
+
 	movl	%r12d,%ecx
 	xorl	0(%rsp),%edx
-	xorl	%r13d,%eax
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rbp,%r11,1),%r11d
 	xorl	24(%rsp),%edx
-	xorl	%edi,%eax
+	leal	-899497514(%r14,%r11,1),%r11d
+	xorl	%esi,%eax
 	addl	%ecx,%r11d
-	xorl	44(%rsp),%edx
 	roll	$30,%r13d
 	addl	%eax,%r11d
 	roll	$1,%edx
-	movl	60(%rsp),%ebp
-	movl	%r13d,%eax
+	xorl	60(%rsp),%ebp
+	movl	%r12d,%eax
+
 	movl	%r11d,%ecx
 	xorl	4(%rsp),%ebp
-	xorl	%r12d,%eax
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	-899497514(%rdx,%rdi,1),%edi
 	xorl	28(%rsp),%ebp
-	xorl	%esi,%eax
+	leal	-899497514(%rdx,%rdi,1),%edi
+	xorl	%r13d,%eax
 	addl	%ecx,%edi
-	xorl	48(%rsp),%ebp
 	roll	$30,%r12d
 	addl	%eax,%edi
 	roll	$1,%ebp
-	movl	%r12d,%eax
+	movl	%r11d,%eax
 	movl	%edi,%ecx
-	xorl	%r11d,%eax
+	xorl	%r13d,%eax
 	leal	-899497514(%rbp,%rsi,1),%esi
 	roll	$5,%ecx
-	xorl	%r13d,%eax
+	xorl	%r12d,%eax
 	addl	%ecx,%esi
 	roll	$30,%r11d
 	addl	%eax,%esi
@@ -1319,29 +1277,218 @@ L$loop:
 	jnz	L$loop
 
 	movq	64(%rsp),%rsi
-	movq	(%rsi),%r13
-	movq	8(%rsi),%r12
-	movq	16(%rsi),%rbp
-	movq	24(%rsi),%rbx
-	leaq	32(%rsi),%rsp
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
 L$epilogue:
 	.byte	0xf3,0xc3
 
 
+
+.p2align	5
+sha1_block_data_order_shaext:
+_shaext_shortcut:
+
+	movdqu	(%rdi),%xmm0
+	movd	16(%rdi),%xmm1
+	movdqa	K_XX_XX+160(%rip),%xmm3
+
+	movdqu	(%rsi),%xmm4
+	pshufd	$27,%xmm0,%xmm0
+	movdqu	16(%rsi),%xmm5
+	pshufd	$27,%xmm1,%xmm1
+	movdqu	32(%rsi),%xmm6
+.byte	102,15,56,0,227
+	movdqu	48(%rsi),%xmm7
+.byte	102,15,56,0,235
+.byte	102,15,56,0,243
+	movdqa	%xmm1,%xmm9
+.byte	102,15,56,0,251
+	jmp	L$oop_shaext
+
+.p2align	4
+L$oop_shaext:
+	decq	%rdx
+	leaq	64(%rsi),%r8
+	paddd	%xmm4,%xmm1
+	cmovneq	%r8,%rsi
+	movdqa	%xmm0,%xmm8
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,0
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,0
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,0
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,1
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,1
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,1
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,2
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+.byte	15,56,201,229
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,213
+	pxor	%xmm6,%xmm4
+.byte	15,56,201,238
+.byte	15,56,202,231
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,2
+.byte	15,56,200,206
+	pxor	%xmm7,%xmm5
+.byte	15,56,202,236
+.byte	15,56,201,247
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,2
+.byte	15,56,200,215
+	pxor	%xmm4,%xmm6
+.byte	15,56,201,252
+.byte	15,56,202,245
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	15,56,200,204
+	pxor	%xmm5,%xmm7
+.byte	15,56,202,254
+	movdqu	(%rsi),%xmm4
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,3
+.byte	15,56,200,213
+	movdqu	16(%rsi),%xmm5
+.byte	102,15,56,0,227
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	15,56,200,206
+	movdqu	32(%rsi),%xmm6
+.byte	102,15,56,0,235
+
+	movdqa	%xmm0,%xmm2
+.byte	15,58,204,193,3
+.byte	15,56,200,215
+	movdqu	48(%rsi),%xmm7
+.byte	102,15,56,0,243
+
+	movdqa	%xmm0,%xmm1
+.byte	15,58,204,194,3
+.byte	65,15,56,200,201
+.byte	102,15,56,0,251
+
+	paddd	%xmm8,%xmm0
+	movdqa	%xmm1,%xmm9
+
+	jnz	L$oop_shaext
+
+	pshufd	$27,%xmm0,%xmm0
+	pshufd	$27,%xmm1,%xmm1
+	movdqu	%xmm0,(%rdi)
+	movd	%xmm1,16(%rdi)
+
+	.byte	0xf3,0xc3
+
+
 .p2align	4
 sha1_block_data_order_ssse3:
 _ssse3_shortcut:
+
+	movq	%rsp,%r11
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
 	leaq	-64(%rsp),%rsp
+	andq	$-64,%rsp
 	movq	%rdi,%r8
 	movq	%rsi,%r9
 	movq	%rdx,%r10
 
 	shlq	$6,%r10
 	addq	%r9,%r10
-	leaq	K_XX_XX(%rip),%r11
+	leaq	K_XX_XX+64(%rip),%r14
 
 	movl	0(%r8),%eax
 	movl	4(%r8),%ebx
@@ -1353,18 +1500,18 @@ _ssse3_shortcut:
 	xorl	%edx,%edi
 	andl	%edi,%esi
 
-	movdqa	64(%r11),%xmm6
-	movdqa	0(%r11),%xmm9
+	movdqa	64(%r14),%xmm6
+	movdqa	-64(%r14),%xmm9
 	movdqu	0(%r9),%xmm0
 	movdqu	16(%r9),%xmm1
 	movdqu	32(%r9),%xmm2
 	movdqu	48(%r9),%xmm3
 .byte	102,15,56,0,198
-	addq	$64,%r9
 .byte	102,15,56,0,206
 .byte	102,15,56,0,214
-.byte	102,15,56,0,222
+	addq	$64,%r9
 	paddd	%xmm9,%xmm0
+.byte	102,15,56,0,222
 	paddd	%xmm9,%xmm1
 	paddd	%xmm9,%xmm2
 	movdqa	%xmm0,0(%rsp)
@@ -1376,24 +1523,24 @@ _ssse3_shortcut:
 	jmp	L$oop_ssse3
 .p2align	4
 L$oop_ssse3:
-	movdqa	%xmm1,%xmm4
 	rorl	$2,%ebx
+	pshufd	$238,%xmm0,%xmm4
 	xorl	%edx,%esi
 	movdqa	%xmm3,%xmm8
-.byte	102,15,58,15,224,8
+	paddd	%xmm3,%xmm9
 	movl	%eax,%edi
 	addl	0(%rsp),%ebp
-	paddd	%xmm3,%xmm9
+	punpcklqdq	%xmm1,%xmm4
 	xorl	%ecx,%ebx
 	roll	$5,%eax
-	psrldq	$4,%xmm8
 	addl	%esi,%ebp
+	psrldq	$4,%xmm8
 	andl	%ebx,%edi
-	pxor	%xmm0,%xmm4
 	xorl	%ecx,%ebx
+	pxor	%xmm0,%xmm4
 	addl	%eax,%ebp
-	pxor	%xmm2,%xmm8
 	rorl	$7,%eax
+	pxor	%xmm2,%xmm8
 	xorl	%ecx,%edi
 	movl	%ebp,%esi
 	addl	4(%rsp),%edx
@@ -1404,57 +1551,57 @@ L$oop_ssse3:
 	addl	%edi,%edx
 	andl	%eax,%esi
 	movdqa	%xmm4,%xmm10
-	movdqa	%xmm4,%xmm8
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
 	rorl	$7,%ebp
+	movdqa	%xmm4,%xmm8
 	xorl	%ebx,%esi
 	pslldq	$12,%xmm10
 	paddd	%xmm4,%xmm4
 	movl	%edx,%edi
 	addl	8(%rsp),%ecx
+	psrld	$31,%xmm8
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	psrld	$31,%xmm8
 	addl	%esi,%ecx
-	andl	%ebp,%edi
 	movdqa	%xmm10,%xmm9
+	andl	%ebp,%edi
 	xorl	%eax,%ebp
-	addl	%edx,%ecx
 	psrld	$30,%xmm10
-	por	%xmm8,%xmm4
+	addl	%edx,%ecx
 	rorl	$7,%edx
+	por	%xmm8,%xmm4
 	xorl	%eax,%edi
 	movl	%ecx,%esi
 	addl	12(%rsp),%ebx
 	pslld	$2,%xmm9
 	pxor	%xmm10,%xmm4
 	xorl	%ebp,%edx
+	movdqa	-64(%r14),%xmm10
 	roll	$5,%ecx
-	movdqa	0(%r11),%xmm10
 	addl	%edi,%ebx
 	andl	%edx,%esi
 	pxor	%xmm9,%xmm4
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
-	movdqa	%xmm2,%xmm5
 	rorl	$7,%ecx
+	pshufd	$238,%xmm1,%xmm5
 	xorl	%ebp,%esi
 	movdqa	%xmm4,%xmm9
-.byte	102,15,58,15,233,8
+	paddd	%xmm4,%xmm10
 	movl	%ebx,%edi
 	addl	16(%rsp),%eax
-	paddd	%xmm4,%xmm10
+	punpcklqdq	%xmm2,%xmm5
 	xorl	%edx,%ecx
 	roll	$5,%ebx
-	psrldq	$4,%xmm9
 	addl	%esi,%eax
+	psrldq	$4,%xmm9
 	andl	%ecx,%edi
-	pxor	%xmm1,%xmm5
 	xorl	%edx,%ecx
+	pxor	%xmm1,%xmm5
 	addl	%ebx,%eax
-	pxor	%xmm3,%xmm9
 	rorl	$7,%ebx
+	pxor	%xmm3,%xmm9
 	xorl	%edx,%edi
 	movl	%eax,%esi
 	addl	20(%rsp),%ebp
@@ -1465,57 +1612,57 @@ L$oop_ssse3:
 	addl	%edi,%ebp
 	andl	%ebx,%esi
 	movdqa	%xmm5,%xmm8
-	movdqa	%xmm5,%xmm9
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
 	rorl	$7,%eax
+	movdqa	%xmm5,%xmm9
 	xorl	%ecx,%esi
 	pslldq	$12,%xmm8
 	paddd	%xmm5,%xmm5
 	movl	%ebp,%edi
 	addl	24(%rsp),%edx
+	psrld	$31,%xmm9
 	xorl	%ebx,%eax
 	roll	$5,%ebp
-	psrld	$31,%xmm9
 	addl	%esi,%edx
-	andl	%eax,%edi
 	movdqa	%xmm8,%xmm10
+	andl	%eax,%edi
 	xorl	%ebx,%eax
-	addl	%ebp,%edx
 	psrld	$30,%xmm8
-	por	%xmm9,%xmm5
+	addl	%ebp,%edx
 	rorl	$7,%ebp
+	por	%xmm9,%xmm5
 	xorl	%ebx,%edi
 	movl	%edx,%esi
 	addl	28(%rsp),%ecx
 	pslld	$2,%xmm10
 	pxor	%xmm8,%xmm5
 	xorl	%eax,%ebp
+	movdqa	-32(%r14),%xmm8
 	roll	$5,%edx
-	movdqa	16(%r11),%xmm8
 	addl	%edi,%ecx
 	andl	%ebp,%esi
 	pxor	%xmm10,%xmm5
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
-	movdqa	%xmm3,%xmm6
 	rorl	$7,%edx
+	pshufd	$238,%xmm2,%xmm6
 	xorl	%eax,%esi
 	movdqa	%xmm5,%xmm10
-.byte	102,15,58,15,242,8
+	paddd	%xmm5,%xmm8
 	movl	%ecx,%edi
 	addl	32(%rsp),%ebx
-	paddd	%xmm5,%xmm8
+	punpcklqdq	%xmm3,%xmm6
 	xorl	%ebp,%edx
 	roll	$5,%ecx
-	psrldq	$4,%xmm10
 	addl	%esi,%ebx
+	psrldq	$4,%xmm10
 	andl	%edx,%edi
-	pxor	%xmm2,%xmm6
 	xorl	%ebp,%edx
+	pxor	%xmm2,%xmm6
 	addl	%ecx,%ebx
-	pxor	%xmm4,%xmm10
 	rorl	$7,%ecx
+	pxor	%xmm4,%xmm10
 	xorl	%ebp,%edi
 	movl	%ebx,%esi
 	addl	36(%rsp),%eax
@@ -1526,57 +1673,57 @@ L$oop_ssse3:
 	addl	%edi,%eax
 	andl	%ecx,%esi
 	movdqa	%xmm6,%xmm9
-	movdqa	%xmm6,%xmm10
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
 	rorl	$7,%ebx
+	movdqa	%xmm6,%xmm10
 	xorl	%edx,%esi
 	pslldq	$12,%xmm9
 	paddd	%xmm6,%xmm6
 	movl	%eax,%edi
 	addl	40(%rsp),%ebp
+	psrld	$31,%xmm10
 	xorl	%ecx,%ebx
 	roll	$5,%eax
-	psrld	$31,%xmm10
 	addl	%esi,%ebp
-	andl	%ebx,%edi
 	movdqa	%xmm9,%xmm8
+	andl	%ebx,%edi
 	xorl	%ecx,%ebx
-	addl	%eax,%ebp
 	psrld	$30,%xmm9
-	por	%xmm10,%xmm6
+	addl	%eax,%ebp
 	rorl	$7,%eax
+	por	%xmm10,%xmm6
 	xorl	%ecx,%edi
 	movl	%ebp,%esi
 	addl	44(%rsp),%edx
 	pslld	$2,%xmm8
 	pxor	%xmm9,%xmm6
 	xorl	%ebx,%eax
+	movdqa	-32(%r14),%xmm9
 	roll	$5,%ebp
-	movdqa	16(%r11),%xmm9
 	addl	%edi,%edx
 	andl	%eax,%esi
 	pxor	%xmm8,%xmm6
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
-	movdqa	%xmm4,%xmm7
 	rorl	$7,%ebp
+	pshufd	$238,%xmm3,%xmm7
 	xorl	%ebx,%esi
 	movdqa	%xmm6,%xmm8
-.byte	102,15,58,15,251,8
+	paddd	%xmm6,%xmm9
 	movl	%edx,%edi
 	addl	48(%rsp),%ecx
-	paddd	%xmm6,%xmm9
+	punpcklqdq	%xmm4,%xmm7
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	psrldq	$4,%xmm8
 	addl	%esi,%ecx
+	psrldq	$4,%xmm8
 	andl	%ebp,%edi
-	pxor	%xmm3,%xmm7
 	xorl	%eax,%ebp
+	pxor	%xmm3,%xmm7
 	addl	%edx,%ecx
-	pxor	%xmm5,%xmm8
 	rorl	$7,%edx
+	pxor	%xmm5,%xmm8
 	xorl	%eax,%edi
 	movl	%ecx,%esi
 	addl	52(%rsp),%ebx
@@ -1587,78 +1734,78 @@ L$oop_ssse3:
 	addl	%edi,%ebx
 	andl	%edx,%esi
 	movdqa	%xmm7,%xmm10
-	movdqa	%xmm7,%xmm8
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
 	rorl	$7,%ecx
+	movdqa	%xmm7,%xmm8
 	xorl	%ebp,%esi
 	pslldq	$12,%xmm10
 	paddd	%xmm7,%xmm7
 	movl	%ebx,%edi
 	addl	56(%rsp),%eax
+	psrld	$31,%xmm8
 	xorl	%edx,%ecx
 	roll	$5,%ebx
-	psrld	$31,%xmm8
 	addl	%esi,%eax
-	andl	%ecx,%edi
 	movdqa	%xmm10,%xmm9
+	andl	%ecx,%edi
 	xorl	%edx,%ecx
-	addl	%ebx,%eax
 	psrld	$30,%xmm10
-	por	%xmm8,%xmm7
+	addl	%ebx,%eax
 	rorl	$7,%ebx
+	por	%xmm8,%xmm7
 	xorl	%edx,%edi
 	movl	%eax,%esi
 	addl	60(%rsp),%ebp
 	pslld	$2,%xmm9
 	pxor	%xmm10,%xmm7
 	xorl	%ecx,%ebx
+	movdqa	-32(%r14),%xmm10
 	roll	$5,%eax
-	movdqa	16(%r11),%xmm10
 	addl	%edi,%ebp
 	andl	%ebx,%esi
 	pxor	%xmm9,%xmm7
+	pshufd	$238,%xmm6,%xmm9
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
-	movdqa	%xmm7,%xmm9
 	rorl	$7,%eax
 	pxor	%xmm4,%xmm0
-.byte	102,68,15,58,15,206,8
 	xorl	%ecx,%esi
 	movl	%ebp,%edi
 	addl	0(%rsp),%edx
-	pxor	%xmm1,%xmm0
+	punpcklqdq	%xmm7,%xmm9
 	xorl	%ebx,%eax
 	roll	$5,%ebp
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm7,%xmm10
+	pxor	%xmm1,%xmm0
 	addl	%esi,%edx
 	andl	%eax,%edi
-	pxor	%xmm9,%xmm0
+	movdqa	%xmm10,%xmm8
 	xorl	%ebx,%eax
+	paddd	%xmm7,%xmm10
 	addl	%ebp,%edx
+	pxor	%xmm9,%xmm0
 	rorl	$7,%ebp
 	xorl	%ebx,%edi
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm10,48(%rsp)
 	movl	%edx,%esi
 	addl	4(%rsp),%ecx
+	movdqa	%xmm0,%xmm9
 	xorl	%eax,%ebp
 	roll	$5,%edx
-	pslld	$2,%xmm0
+	movdqa	%xmm10,48(%rsp)
 	addl	%edi,%ecx
 	andl	%ebp,%esi
-	psrld	$30,%xmm9
 	xorl	%eax,%ebp
+	pslld	$2,%xmm0
 	addl	%edx,%ecx
 	rorl	$7,%edx
+	psrld	$30,%xmm9
 	xorl	%eax,%esi
 	movl	%ecx,%edi
 	addl	8(%rsp),%ebx
 	por	%xmm9,%xmm0
 	xorl	%ebp,%edx
 	roll	$5,%ecx
-	movdqa	%xmm0,%xmm10
+	pshufd	$238,%xmm7,%xmm10
 	addl	%esi,%ebx
 	andl	%edx,%edi
 	xorl	%ebp,%edx
@@ -1671,18 +1818,18 @@ L$oop_ssse3:
 	xorl	%edx,%esi
 	rorl	$7,%ecx
 	addl	%ebx,%eax
-	addl	16(%rsp),%ebp
 	pxor	%xmm5,%xmm1
-.byte	102,68,15,58,15,215,8
+	addl	16(%rsp),%ebp
 	xorl	%ecx,%esi
+	punpcklqdq	%xmm0,%xmm10
 	movl	%eax,%edi
 	roll	$5,%eax
 	pxor	%xmm2,%xmm1
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	movdqa	%xmm8,%xmm9
-	paddd	%xmm0,%xmm8
 	rorl	$7,%ebx
+	paddd	%xmm0,%xmm8
 	addl	%eax,%ebp
 	pxor	%xmm10,%xmm1
 	addl	20(%rsp),%edx
@@ -1690,43 +1837,43 @@ L$oop_ssse3:
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	movdqa	%xmm1,%xmm10
-	movdqa	%xmm8,0(%rsp)
 	addl	%edi,%edx
 	xorl	%ebx,%esi
+	movdqa	%xmm8,0(%rsp)
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	pslld	$2,%xmm1
 	addl	24(%rsp),%ecx
+	pslld	$2,%xmm1
 	xorl	%eax,%esi
-	psrld	$30,%xmm10
 	movl	%edx,%edi
+	psrld	$30,%xmm10
 	roll	$5,%edx
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
-	addl	%edx,%ecx
 	por	%xmm10,%xmm1
+	addl	%edx,%ecx
 	addl	28(%rsp),%ebx
+	pshufd	$238,%xmm0,%xmm8
 	xorl	%ebp,%edi
-	movdqa	%xmm1,%xmm8
 	movl	%ecx,%esi
 	roll	$5,%ecx
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
 	rorl	$7,%edx
 	addl	%ecx,%ebx
-	addl	32(%rsp),%eax
 	pxor	%xmm6,%xmm2
-.byte	102,68,15,58,15,192,8
+	addl	32(%rsp),%eax
 	xorl	%edx,%esi
+	punpcklqdq	%xmm1,%xmm8
 	movl	%ebx,%edi
 	roll	$5,%ebx
 	pxor	%xmm3,%xmm2
 	addl	%esi,%eax
 	xorl	%edx,%edi
-	movdqa	32(%r11),%xmm10
-	paddd	%xmm1,%xmm9
+	movdqa	0(%r14),%xmm10
 	rorl	$7,%ecx
+	paddd	%xmm1,%xmm9
 	addl	%ebx,%eax
 	pxor	%xmm8,%xmm2
 	addl	36(%rsp),%ebp
@@ -1734,43 +1881,43 @@ L$oop_ssse3:
 	movl	%eax,%esi
 	roll	$5,%eax
 	movdqa	%xmm2,%xmm8
-	movdqa	%xmm9,16(%rsp)
 	addl	%edi,%ebp
 	xorl	%ecx,%esi
+	movdqa	%xmm9,16(%rsp)
 	rorl	$7,%ebx
 	addl	%eax,%ebp
-	pslld	$2,%xmm2
 	addl	40(%rsp),%edx
+	pslld	$2,%xmm2
 	xorl	%ebx,%esi
-	psrld	$30,%xmm8
 	movl	%ebp,%edi
+	psrld	$30,%xmm8
 	roll	$5,%ebp
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	rorl	$7,%eax
-	addl	%ebp,%edx
 	por	%xmm8,%xmm2
+	addl	%ebp,%edx
 	addl	44(%rsp),%ecx
+	pshufd	$238,%xmm1,%xmm9
 	xorl	%eax,%edi
-	movdqa	%xmm2,%xmm9
 	movl	%edx,%esi
 	roll	$5,%edx
 	addl	%edi,%ecx
 	xorl	%eax,%esi
 	rorl	$7,%ebp
 	addl	%edx,%ecx
-	addl	48(%rsp),%ebx
 	pxor	%xmm7,%xmm3
-.byte	102,68,15,58,15,201,8
+	addl	48(%rsp),%ebx
 	xorl	%ebp,%esi
+	punpcklqdq	%xmm2,%xmm9
 	movl	%ecx,%edi
 	roll	$5,%ecx
 	pxor	%xmm4,%xmm3
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	movdqa	%xmm10,%xmm8
-	paddd	%xmm2,%xmm10
 	rorl	$7,%edx
+	paddd	%xmm2,%xmm10
 	addl	%ecx,%ebx
 	pxor	%xmm9,%xmm3
 	addl	52(%rsp),%eax
@@ -1778,43 +1925,43 @@ L$oop_ssse3:
 	movl	%ebx,%esi
 	roll	$5,%ebx
 	movdqa	%xmm3,%xmm9
-	movdqa	%xmm10,32(%rsp)
 	addl	%edi,%eax
 	xorl	%edx,%esi
+	movdqa	%xmm10,32(%rsp)
 	rorl	$7,%ecx
 	addl	%ebx,%eax
-	pslld	$2,%xmm3
 	addl	56(%rsp),%ebp
+	pslld	$2,%xmm3
 	xorl	%ecx,%esi
-	psrld	$30,%xmm9
 	movl	%eax,%edi
+	psrld	$30,%xmm9
 	roll	$5,%eax
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	rorl	$7,%ebx
-	addl	%eax,%ebp
 	por	%xmm9,%xmm3
+	addl	%eax,%ebp
 	addl	60(%rsp),%edx
+	pshufd	$238,%xmm2,%xmm10
 	xorl	%ebx,%edi
-	movdqa	%xmm3,%xmm10
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	addl	%edi,%edx
 	xorl	%ebx,%esi
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	addl	0(%rsp),%ecx
 	pxor	%xmm0,%xmm4
-.byte	102,68,15,58,15,210,8
+	addl	0(%rsp),%ecx
 	xorl	%eax,%esi
+	punpcklqdq	%xmm3,%xmm10
 	movl	%edx,%edi
 	roll	$5,%edx
 	pxor	%xmm5,%xmm4
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	movdqa	%xmm8,%xmm9
-	paddd	%xmm3,%xmm8
 	rorl	$7,%ebp
+	paddd	%xmm3,%xmm8
 	addl	%edx,%ecx
 	pxor	%xmm10,%xmm4
 	addl	4(%rsp),%ebx
@@ -1822,43 +1969,43 @@ L$oop_ssse3:
 	movl	%ecx,%esi
 	roll	$5,%ecx
 	movdqa	%xmm4,%xmm10
-	movdqa	%xmm8,48(%rsp)
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
+	movdqa	%xmm8,48(%rsp)
 	rorl	$7,%edx
 	addl	%ecx,%ebx
-	pslld	$2,%xmm4
 	addl	8(%rsp),%eax
+	pslld	$2,%xmm4
 	xorl	%edx,%esi
-	psrld	$30,%xmm10
 	movl	%ebx,%edi
+	psrld	$30,%xmm10
 	roll	$5,%ebx
 	addl	%esi,%eax
 	xorl	%edx,%edi
 	rorl	$7,%ecx
-	addl	%ebx,%eax
 	por	%xmm10,%xmm4
+	addl	%ebx,%eax
 	addl	12(%rsp),%ebp
+	pshufd	$238,%xmm3,%xmm8
 	xorl	%ecx,%edi
-	movdqa	%xmm4,%xmm8
 	movl	%eax,%esi
 	roll	$5,%eax
 	addl	%edi,%ebp
 	xorl	%ecx,%esi
 	rorl	$7,%ebx
 	addl	%eax,%ebp
-	addl	16(%rsp),%edx
 	pxor	%xmm1,%xmm5
-.byte	102,68,15,58,15,195,8
+	addl	16(%rsp),%edx
 	xorl	%ebx,%esi
+	punpcklqdq	%xmm4,%xmm8
 	movl	%ebp,%edi
 	roll	$5,%ebp
 	pxor	%xmm6,%xmm5
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	movdqa	%xmm9,%xmm10
-	paddd	%xmm4,%xmm9
 	rorl	$7,%eax
+	paddd	%xmm4,%xmm9
 	addl	%ebp,%edx
 	pxor	%xmm8,%xmm5
 	addl	20(%rsp),%ecx
@@ -1866,24 +2013,24 @@ L$oop_ssse3:
 	movl	%edx,%esi
 	roll	$5,%edx
 	movdqa	%xmm5,%xmm8
-	movdqa	%xmm9,0(%rsp)
 	addl	%edi,%ecx
 	xorl	%eax,%esi
+	movdqa	%xmm9,0(%rsp)
 	rorl	$7,%ebp
 	addl	%edx,%ecx
-	pslld	$2,%xmm5
 	addl	24(%rsp),%ebx
+	pslld	$2,%xmm5
 	xorl	%ebp,%esi
-	psrld	$30,%xmm8
 	movl	%ecx,%edi
+	psrld	$30,%xmm8
 	roll	$5,%ecx
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	rorl	$7,%edx
-	addl	%ecx,%ebx
 	por	%xmm8,%xmm5
+	addl	%ecx,%ebx
 	addl	28(%rsp),%eax
-	movdqa	%xmm5,%xmm9
+	pshufd	$238,%xmm4,%xmm9
 	rorl	$7,%ecx
 	movl	%ebx,%esi
 	xorl	%edx,%edi
@@ -1892,47 +2039,47 @@ L$oop_ssse3:
 	xorl	%ecx,%esi
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
-	addl	32(%rsp),%ebp
 	pxor	%xmm2,%xmm6
-.byte	102,68,15,58,15,204,8
+	addl	32(%rsp),%ebp
 	andl	%ecx,%esi
 	xorl	%edx,%ecx
 	rorl	$7,%ebx
-	pxor	%xmm7,%xmm6
+	punpcklqdq	%xmm5,%xmm9
 	movl	%eax,%edi
 	xorl	%ecx,%esi
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm5,%xmm10
+	pxor	%xmm7,%xmm6
 	roll	$5,%eax
 	addl	%esi,%ebp
-	pxor	%xmm9,%xmm6
+	movdqa	%xmm10,%xmm8
 	xorl	%ebx,%edi
+	paddd	%xmm5,%xmm10
 	xorl	%ecx,%ebx
+	pxor	%xmm9,%xmm6
 	addl	%eax,%ebp
 	addl	36(%rsp),%edx
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm10,16(%rsp)
 	andl	%ebx,%edi
 	xorl	%ecx,%ebx
 	rorl	$7,%eax
+	movdqa	%xmm6,%xmm9
 	movl	%ebp,%esi
-	pslld	$2,%xmm6
 	xorl	%ebx,%edi
+	movdqa	%xmm10,16(%rsp)
 	roll	$5,%ebp
-	psrld	$30,%xmm9
 	addl	%edi,%edx
 	xorl	%eax,%esi
+	pslld	$2,%xmm6
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
+	psrld	$30,%xmm9
 	addl	40(%rsp),%ecx
 	andl	%eax,%esi
-	por	%xmm9,%xmm6
 	xorl	%ebx,%eax
+	por	%xmm9,%xmm6
 	rorl	$7,%ebp
-	movdqa	%xmm6,%xmm10
 	movl	%edx,%edi
 	xorl	%eax,%esi
 	roll	$5,%edx
+	pshufd	$238,%xmm5,%xmm10
 	addl	%esi,%ecx
 	xorl	%ebp,%edi
 	xorl	%eax,%ebp
@@ -1948,47 +2095,47 @@ L$oop_ssse3:
 	xorl	%edx,%esi
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
-	addl	48(%rsp),%eax
 	pxor	%xmm3,%xmm7
-.byte	102,68,15,58,15,213,8
+	addl	48(%rsp),%eax
 	andl	%edx,%esi
 	xorl	%ebp,%edx
 	rorl	$7,%ecx
-	pxor	%xmm0,%xmm7
+	punpcklqdq	%xmm6,%xmm10
 	movl	%ebx,%edi
 	xorl	%edx,%esi
-	movdqa	48(%r11),%xmm9
-	paddd	%xmm6,%xmm8
+	pxor	%xmm0,%xmm7
 	roll	$5,%ebx
 	addl	%esi,%eax
-	pxor	%xmm10,%xmm7
+	movdqa	32(%r14),%xmm9
 	xorl	%ecx,%edi
+	paddd	%xmm6,%xmm8
 	xorl	%edx,%ecx
+	pxor	%xmm10,%xmm7
 	addl	%ebx,%eax
 	addl	52(%rsp),%ebp
-	movdqa	%xmm7,%xmm10
-	movdqa	%xmm8,32(%rsp)
 	andl	%ecx,%edi
 	xorl	%edx,%ecx
 	rorl	$7,%ebx
+	movdqa	%xmm7,%xmm10
 	movl	%eax,%esi
-	pslld	$2,%xmm7
 	xorl	%ecx,%edi
+	movdqa	%xmm8,32(%rsp)
 	roll	$5,%eax
-	psrld	$30,%xmm10
 	addl	%edi,%ebp
 	xorl	%ebx,%esi
+	pslld	$2,%xmm7
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
+	psrld	$30,%xmm10
 	addl	56(%rsp),%edx
 	andl	%ebx,%esi
-	por	%xmm10,%xmm7
 	xorl	%ecx,%ebx
+	por	%xmm10,%xmm7
 	rorl	$7,%eax
-	movdqa	%xmm7,%xmm8
 	movl	%ebp,%edi
 	xorl	%ebx,%esi
 	roll	$5,%ebp
+	pshufd	$238,%xmm6,%xmm8
 	addl	%esi,%edx
 	xorl	%eax,%edi
 	xorl	%ebx,%eax
@@ -2004,47 +2151,47 @@ L$oop_ssse3:
 	xorl	%ebp,%esi
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
-	addl	0(%rsp),%ebx
 	pxor	%xmm4,%xmm0
-.byte	102,68,15,58,15,198,8
+	addl	0(%rsp),%ebx
 	andl	%ebp,%esi
 	xorl	%eax,%ebp
 	rorl	$7,%edx
-	pxor	%xmm1,%xmm0
+	punpcklqdq	%xmm7,%xmm8
 	movl	%ecx,%edi
 	xorl	%ebp,%esi
-	movdqa	%xmm9,%xmm10
-	paddd	%xmm7,%xmm9
+	pxor	%xmm1,%xmm0
 	roll	$5,%ecx
 	addl	%esi,%ebx
-	pxor	%xmm8,%xmm0
+	movdqa	%xmm9,%xmm10
 	xorl	%edx,%edi
+	paddd	%xmm7,%xmm9
 	xorl	%ebp,%edx
+	pxor	%xmm8,%xmm0
 	addl	%ecx,%ebx
 	addl	4(%rsp),%eax
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm9,48(%rsp)
 	andl	%edx,%edi
 	xorl	%ebp,%edx
 	rorl	$7,%ecx
+	movdqa	%xmm0,%xmm8
 	movl	%ebx,%esi
-	pslld	$2,%xmm0
 	xorl	%edx,%edi
+	movdqa	%xmm9,48(%rsp)
 	roll	$5,%ebx
-	psrld	$30,%xmm8
 	addl	%edi,%eax
 	xorl	%ecx,%esi
+	pslld	$2,%xmm0
 	xorl	%edx,%ecx
 	addl	%ebx,%eax
+	psrld	$30,%xmm8
 	addl	8(%rsp),%ebp
 	andl	%ecx,%esi
-	por	%xmm8,%xmm0
 	xorl	%edx,%ecx
+	por	%xmm8,%xmm0
 	rorl	$7,%ebx
-	movdqa	%xmm0,%xmm9
 	movl	%eax,%edi
 	xorl	%ecx,%esi
 	roll	$5,%eax
+	pshufd	$238,%xmm7,%xmm9
 	addl	%esi,%ebp
 	xorl	%ebx,%edi
 	xorl	%ecx,%ebx
@@ -2060,47 +2207,47 @@ L$oop_ssse3:
 	xorl	%eax,%esi
 	xorl	%ebx,%eax
 	addl	%ebp,%edx
-	addl	16(%rsp),%ecx
 	pxor	%xmm5,%xmm1
-.byte	102,68,15,58,15,207,8
+	addl	16(%rsp),%ecx
 	andl	%eax,%esi
 	xorl	%ebx,%eax
 	rorl	$7,%ebp
-	pxor	%xmm2,%xmm1
+	punpcklqdq	%xmm0,%xmm9
 	movl	%edx,%edi
 	xorl	%eax,%esi
-	movdqa	%xmm10,%xmm8
-	paddd	%xmm0,%xmm10
+	pxor	%xmm2,%xmm1
 	roll	$5,%edx
 	addl	%esi,%ecx
-	pxor	%xmm9,%xmm1
+	movdqa	%xmm10,%xmm8
 	xorl	%ebp,%edi
+	paddd	%xmm0,%xmm10
 	xorl	%eax,%ebp
+	pxor	%xmm9,%xmm1
 	addl	%edx,%ecx
 	addl	20(%rsp),%ebx
-	movdqa	%xmm1,%xmm9
-	movdqa	%xmm10,0(%rsp)
 	andl	%ebp,%edi
 	xorl	%eax,%ebp
 	rorl	$7,%edx
+	movdqa	%xmm1,%xmm9
 	movl	%ecx,%esi
-	pslld	$2,%xmm1
 	xorl	%ebp,%edi
+	movdqa	%xmm10,0(%rsp)
 	roll	$5,%ecx
-	psrld	$30,%xmm9
 	addl	%edi,%ebx
 	xorl	%edx,%esi
+	pslld	$2,%xmm1
 	xorl	%ebp,%edx
 	addl	%ecx,%ebx
+	psrld	$30,%xmm9
 	addl	24(%rsp),%eax
 	andl	%edx,%esi
-	por	%xmm9,%xmm1
 	xorl	%ebp,%edx
+	por	%xmm9,%xmm1
 	rorl	$7,%ecx
-	movdqa	%xmm1,%xmm10
 	movl	%ebx,%edi
 	xorl	%edx,%esi
 	roll	$5,%ebx
+	pshufd	$238,%xmm0,%xmm10
 	addl	%esi,%eax
 	xorl	%ecx,%edi
 	xorl	%edx,%ecx
@@ -2116,47 +2263,47 @@ L$oop_ssse3:
 	xorl	%ebx,%esi
 	xorl	%ecx,%ebx
 	addl	%eax,%ebp
-	addl	32(%rsp),%edx
 	pxor	%xmm6,%xmm2
-.byte	102,68,15,58,15,208,8
+	addl	32(%rsp),%edx
 	andl	%ebx,%esi
 	xorl	%ecx,%ebx
 	rorl	$7,%eax
-	pxor	%xmm3,%xmm2
+	punpcklqdq	%xmm1,%xmm10
 	movl	%ebp,%edi
 	xorl	%ebx,%esi
-	movdqa	%xmm8,%xmm9
-	paddd	%xmm1,%xmm8
+	pxor	%xmm3,%xmm2
 	roll	$5,%ebp
 	addl	%esi,%edx
-	pxor	%xmm10,%xmm2
+	movdqa	%xmm8,%xmm9
 	xorl	%eax,%edi
+	paddd	%xmm1,%xmm8
 	xorl	%ebx,%eax
+	pxor	%xmm10,%xmm2
 	addl	%ebp,%edx
 	addl	36(%rsp),%ecx
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm8,16(%rsp)
 	andl	%eax,%edi
 	xorl	%ebx,%eax
 	rorl	$7,%ebp
+	movdqa	%xmm2,%xmm10
 	movl	%edx,%esi
-	pslld	$2,%xmm2
 	xorl	%eax,%edi
+	movdqa	%xmm8,16(%rsp)
 	roll	$5,%edx
-	psrld	$30,%xmm10
 	addl	%edi,%ecx
 	xorl	%ebp,%esi
+	pslld	$2,%xmm2
 	xorl	%eax,%ebp
 	addl	%edx,%ecx
+	psrld	$30,%xmm10
 	addl	40(%rsp),%ebx
 	andl	%ebp,%esi
-	por	%xmm10,%xmm2
 	xorl	%eax,%ebp
+	por	%xmm10,%xmm2
 	rorl	$7,%edx
-	movdqa	%xmm2,%xmm8
 	movl	%ecx,%edi
 	xorl	%ebp,%esi
 	roll	$5,%ecx
+	pshufd	$238,%xmm1,%xmm8
 	addl	%esi,%ebx
 	xorl	%edx,%edi
 	xorl	%ebp,%edx
@@ -2171,18 +2318,18 @@ L$oop_ssse3:
 	addl	%edi,%eax
 	xorl	%edx,%esi
 	addl	%ebx,%eax
-	addl	48(%rsp),%ebp
 	pxor	%xmm7,%xmm3
-.byte	102,68,15,58,15,193,8
+	addl	48(%rsp),%ebp
 	xorl	%ecx,%esi
+	punpcklqdq	%xmm2,%xmm8
 	movl	%eax,%edi
 	roll	$5,%eax
 	pxor	%xmm4,%xmm3
 	addl	%esi,%ebp
 	xorl	%ecx,%edi
 	movdqa	%xmm9,%xmm10
-	paddd	%xmm2,%xmm9
 	rorl	$7,%ebx
+	paddd	%xmm2,%xmm9
 	addl	%eax,%ebp
 	pxor	%xmm8,%xmm3
 	addl	52(%rsp),%edx
@@ -2190,22 +2337,22 @@ L$oop_ssse3:
 	movl	%ebp,%esi
 	roll	$5,%ebp
 	movdqa	%xmm3,%xmm8
-	movdqa	%xmm9,32(%rsp)
 	addl	%edi,%edx
 	xorl	%ebx,%esi
+	movdqa	%xmm9,32(%rsp)
 	rorl	$7,%eax
 	addl	%ebp,%edx
-	pslld	$2,%xmm3
 	addl	56(%rsp),%ecx
+	pslld	$2,%xmm3
 	xorl	%eax,%esi
-	psrld	$30,%xmm8
 	movl	%edx,%edi
+	psrld	$30,%xmm8
 	roll	$5,%edx
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
-	addl	%edx,%ecx
 	por	%xmm8,%xmm3
+	addl	%edx,%ecx
 	addl	60(%rsp),%ebx
 	xorl	%ebp,%edi
 	movl	%ecx,%esi
@@ -2215,13 +2362,13 @@ L$oop_ssse3:
 	rorl	$7,%edx
 	addl	%ecx,%ebx
 	addl	0(%rsp),%eax
-	paddd	%xmm3,%xmm10
 	xorl	%edx,%esi
 	movl	%ebx,%edi
 	roll	$5,%ebx
+	paddd	%xmm3,%xmm10
 	addl	%esi,%eax
-	movdqa	%xmm10,48(%rsp)
 	xorl	%edx,%edi
+	movdqa	%xmm10,48(%rsp)
 	rorl	$7,%ecx
 	addl	%ebx,%eax
 	addl	4(%rsp),%ebp
@@ -2250,8 +2397,8 @@ L$oop_ssse3:
 	addl	%edx,%ecx
 	cmpq	%r10,%r9
 	je	L$done_ssse3
-	movdqa	64(%r11),%xmm6
-	movdqa	0(%r11),%xmm9
+	movdqa	64(%r14),%xmm6
+	movdqa	-64(%r14),%xmm9
 	movdqu	0(%r9),%xmm0
 	movdqu	16(%r9),%xmm1
 	movdqu	32(%r9),%xmm2
@@ -2260,23 +2407,23 @@ L$oop_ssse3:
 	addq	$64,%r9
 	addl	16(%rsp),%ebx
 	xorl	%ebp,%esi
-.byte	102,15,56,0,206
 	movl	%ecx,%edi
+.byte	102,15,56,0,206
 	roll	$5,%ecx
-	paddd	%xmm9,%xmm0
 	addl	%esi,%ebx
 	xorl	%ebp,%edi
 	rorl	$7,%edx
+	paddd	%xmm9,%xmm0
 	addl	%ecx,%ebx
-	movdqa	%xmm0,0(%rsp)
 	addl	20(%rsp),%eax
 	xorl	%edx,%edi
-	psubd	%xmm9,%xmm0
 	movl	%ebx,%esi
+	movdqa	%xmm0,0(%rsp)
 	roll	$5,%ebx
 	addl	%edi,%eax
 	xorl	%edx,%esi
 	rorl	$7,%ecx
+	psubd	%xmm9,%xmm0
 	addl	%ebx,%eax
 	addl	24(%rsp),%ebp
 	xorl	%ecx,%esi
@@ -2296,23 +2443,23 @@ L$oop_ssse3:
 	addl	%ebp,%edx
 	addl	32(%rsp),%ecx
 	xorl	%eax,%esi
-.byte	102,15,56,0,214
 	movl	%edx,%edi
+.byte	102,15,56,0,214
 	roll	$5,%edx
-	paddd	%xmm9,%xmm1
 	addl	%esi,%ecx
 	xorl	%eax,%edi
 	rorl	$7,%ebp
+	paddd	%xmm9,%xmm1
 	addl	%edx,%ecx
-	movdqa	%xmm1,16(%rsp)
 	addl	36(%rsp),%ebx
 	xorl	%ebp,%edi
-	psubd	%xmm9,%xmm1
 	movl	%ecx,%esi
+	movdqa	%xmm1,16(%rsp)
 	roll	$5,%ecx
 	addl	%edi,%ebx
 	xorl	%ebp,%esi
 	rorl	$7,%edx
+	psubd	%xmm9,%xmm1
 	addl	%ecx,%ebx
 	addl	40(%rsp),%eax
 	xorl	%edx,%esi
@@ -2332,23 +2479,23 @@ L$oop_ssse3:
 	addl	%eax,%ebp
 	addl	48(%rsp),%edx
 	xorl	%ebx,%esi
-.byte	102,15,56,0,222
 	movl	%ebp,%edi
+.byte	102,15,56,0,222
 	roll	$5,%ebp
-	paddd	%xmm9,%xmm2
 	addl	%esi,%edx
 	xorl	%ebx,%edi
 	rorl	$7,%eax
+	paddd	%xmm9,%xmm2
 	addl	%ebp,%edx
-	movdqa	%xmm2,32(%rsp)
 	addl	52(%rsp),%ecx
 	xorl	%eax,%edi
-	psubd	%xmm9,%xmm2
 	movl	%edx,%esi
+	movdqa	%xmm2,32(%rsp)
 	roll	$5,%edx
 	addl	%edi,%ecx
 	xorl	%eax,%esi
 	rorl	$7,%ebp
+	psubd	%xmm9,%xmm2
 	addl	%edx,%ecx
 	addl	56(%rsp),%ebx
 	xorl	%ebp,%esi
@@ -2488,21 +2635,2856 @@ L$done_ssse3:
 	movl	%ecx,8(%r8)
 	movl	%edx,12(%r8)
 	movl	%ebp,16(%r8)
-	leaq	64(%rsp),%rsi
-	movq	0(%rsi),%r12
-	movq	8(%rsi),%rbp
-	movq	16(%rsi),%rbx
-	leaq	24(%rsi),%rsp
+	movq	-40(%r11),%r14
+
+	movq	-32(%r11),%r13
+
+	movq	-24(%r11),%r12
+
+	movq	-16(%r11),%rbp
+
+	movq	-8(%r11),%rbx
+
+	leaq	(%r11),%rsp
+
 L$epilogue_ssse3:
 	.byte	0xf3,0xc3
 
+
+
+.p2align	4
+sha1_block_data_order_avx:
+_avx_shortcut:
+
+	movq	%rsp,%r11
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	leaq	-64(%rsp),%rsp
+	vzeroupper
+	andq	$-64,%rsp
+	movq	%rdi,%r8
+	movq	%rsi,%r9
+	movq	%rdx,%r10
+
+	shlq	$6,%r10
+	addq	%r9,%r10
+	leaq	K_XX_XX+64(%rip),%r14
+
+	movl	0(%r8),%eax
+	movl	4(%r8),%ebx
+	movl	8(%r8),%ecx
+	movl	12(%r8),%edx
+	movl	%ebx,%esi
+	movl	16(%r8),%ebp
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	andl	%edi,%esi
+
+	vmovdqa	64(%r14),%xmm6
+	vmovdqa	-64(%r14),%xmm11
+	vmovdqu	0(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	vpshufb	%xmm6,%xmm0,%xmm0
+	addq	$64,%r9
+	vpshufb	%xmm6,%xmm1,%xmm1
+	vpshufb	%xmm6,%xmm2,%xmm2
+	vpshufb	%xmm6,%xmm3,%xmm3
+	vpaddd	%xmm11,%xmm0,%xmm4
+	vpaddd	%xmm11,%xmm1,%xmm5
+	vpaddd	%xmm11,%xmm2,%xmm6
+	vmovdqa	%xmm4,0(%rsp)
+	vmovdqa	%xmm5,16(%rsp)
+	vmovdqa	%xmm6,32(%rsp)
+	jmp	L$oop_avx
+.p2align	4
+L$oop_avx:
+	shrdl	$2,%ebx,%ebx
+	xorl	%edx,%esi
+	vpalignr	$8,%xmm0,%xmm1,%xmm4
+	movl	%eax,%edi
+	addl	0(%rsp),%ebp
+	vpaddd	%xmm3,%xmm11,%xmm9
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vpsrldq	$4,%xmm3,%xmm8
+	addl	%esi,%ebp
+	andl	%ebx,%edi
+	vpxor	%xmm0,%xmm4,%xmm4
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm2,%xmm8,%xmm8
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%edi
+	movl	%ebp,%esi
+	addl	4(%rsp),%edx
+	vpxor	%xmm8,%xmm4,%xmm4
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vmovdqa	%xmm9,48(%rsp)
+	addl	%edi,%edx
+	andl	%eax,%esi
+	vpsrld	$31,%xmm4,%xmm8
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%esi
+	vpslldq	$12,%xmm4,%xmm10
+	vpaddd	%xmm4,%xmm4,%xmm4
+	movl	%edx,%edi
+	addl	8(%rsp),%ecx
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm4,%xmm4
+	addl	%esi,%ecx
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm4,%xmm4
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%edi
+	movl	%ecx,%esi
+	addl	12(%rsp),%ebx
+	vpxor	%xmm10,%xmm4,%xmm4
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	andl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%esi
+	vpalignr	$8,%xmm1,%xmm2,%xmm5
+	movl	%ebx,%edi
+	addl	16(%rsp),%eax
+	vpaddd	%xmm4,%xmm11,%xmm9
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vpsrldq	$4,%xmm4,%xmm8
+	addl	%esi,%eax
+	andl	%ecx,%edi
+	vpxor	%xmm1,%xmm5,%xmm5
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpxor	%xmm3,%xmm8,%xmm8
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%edi
+	movl	%eax,%esi
+	addl	20(%rsp),%ebp
+	vpxor	%xmm8,%xmm5,%xmm5
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%ebp
+	andl	%ebx,%esi
+	vpsrld	$31,%xmm5,%xmm8
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%esi
+	vpslldq	$12,%xmm5,%xmm10
+	vpaddd	%xmm5,%xmm5,%xmm5
+	movl	%ebp,%edi
+	addl	24(%rsp),%edx
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm5,%xmm5
+	addl	%esi,%edx
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm5,%xmm5
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%edi
+	movl	%edx,%esi
+	addl	28(%rsp),%ecx
+	vpxor	%xmm10,%xmm5,%xmm5
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vmovdqa	-32(%r14),%xmm11
+	addl	%edi,%ecx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%esi
+	vpalignr	$8,%xmm2,%xmm3,%xmm6
+	movl	%ecx,%edi
+	addl	32(%rsp),%ebx
+	vpaddd	%xmm5,%xmm11,%xmm9
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	vpsrldq	$4,%xmm5,%xmm8
+	addl	%esi,%ebx
+	andl	%edx,%edi
+	vpxor	%xmm2,%xmm6,%xmm6
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	vpxor	%xmm4,%xmm8,%xmm8
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%edi
+	movl	%ebx,%esi
+	addl	36(%rsp),%eax
+	vpxor	%xmm8,%xmm6,%xmm6
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vmovdqa	%xmm9,16(%rsp)
+	addl	%edi,%eax
+	andl	%ecx,%esi
+	vpsrld	$31,%xmm6,%xmm8
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%esi
+	vpslldq	$12,%xmm6,%xmm10
+	vpaddd	%xmm6,%xmm6,%xmm6
+	movl	%eax,%edi
+	addl	40(%rsp),%ebp
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm6,%xmm6
+	addl	%esi,%ebp
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm6,%xmm6
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%edi
+	movl	%ebp,%esi
+	addl	44(%rsp),%edx
+	vpxor	%xmm10,%xmm6,%xmm6
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	andl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%esi
+	vpalignr	$8,%xmm3,%xmm4,%xmm7
+	movl	%edx,%edi
+	addl	48(%rsp),%ecx
+	vpaddd	%xmm6,%xmm11,%xmm9
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpsrldq	$4,%xmm6,%xmm8
+	addl	%esi,%ecx
+	andl	%ebp,%edi
+	vpxor	%xmm3,%xmm7,%xmm7
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpxor	%xmm5,%xmm8,%xmm8
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%edi
+	movl	%ecx,%esi
+	addl	52(%rsp),%ebx
+	vpxor	%xmm8,%xmm7,%xmm7
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%ebx
+	andl	%edx,%esi
+	vpsrld	$31,%xmm7,%xmm8
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	shrdl	$7,%ecx,%ecx
+	xorl	%ebp,%esi
+	vpslldq	$12,%xmm7,%xmm10
+	vpaddd	%xmm7,%xmm7,%xmm7
+	movl	%ebx,%edi
+	addl	56(%rsp),%eax
+	xorl	%edx,%ecx
+	shldl	$5,%ebx,%ebx
+	vpsrld	$30,%xmm10,%xmm9
+	vpor	%xmm8,%xmm7,%xmm7
+	addl	%esi,%eax
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpslld	$2,%xmm10,%xmm10
+	vpxor	%xmm9,%xmm7,%xmm7
+	shrdl	$7,%ebx,%ebx
+	xorl	%edx,%edi
+	movl	%eax,%esi
+	addl	60(%rsp),%ebp
+	vpxor	%xmm10,%xmm7,%xmm7
+	xorl	%ecx,%ebx
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	andl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	vpxor	%xmm4,%xmm0,%xmm0
+	shrdl	$7,%eax,%eax
+	xorl	%ecx,%esi
+	movl	%ebp,%edi
+	addl	0(%rsp),%edx
+	vpxor	%xmm1,%xmm0,%xmm0
+	xorl	%ebx,%eax
+	shldl	$5,%ebp,%ebp
+	vpaddd	%xmm7,%xmm11,%xmm9
+	addl	%esi,%edx
+	andl	%eax,%edi
+	vpxor	%xmm8,%xmm0,%xmm0
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	shrdl	$7,%ebp,%ebp
+	xorl	%ebx,%edi
+	vpsrld	$30,%xmm0,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	movl	%edx,%esi
+	addl	4(%rsp),%ecx
+	xorl	%eax,%ebp
+	shldl	$5,%edx,%edx
+	vpslld	$2,%xmm0,%xmm0
+	addl	%edi,%ecx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	shrdl	$7,%edx,%edx
+	xorl	%eax,%esi
+	movl	%ecx,%edi
+	addl	8(%rsp),%ebx
+	vpor	%xmm8,%xmm0,%xmm0
+	xorl	%ebp,%edx
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	12(%rsp),%eax
+	xorl	%ebp,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	vpxor	%xmm5,%xmm1,%xmm1
+	addl	16(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	vpxor	%xmm2,%xmm1,%xmm1
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	vpaddd	%xmm0,%xmm11,%xmm9
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm8,%xmm1,%xmm1
+	addl	20(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm1,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm1,%xmm1
+	addl	24(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpor	%xmm8,%xmm1,%xmm1
+	addl	28(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	vpxor	%xmm6,%xmm2,%xmm2
+	addl	32(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	vpxor	%xmm3,%xmm2,%xmm2
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	vpaddd	%xmm1,%xmm11,%xmm9
+	vmovdqa	0(%r14),%xmm11
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpxor	%xmm8,%xmm2,%xmm2
+	addl	36(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	vpsrld	$30,%xmm2,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpslld	$2,%xmm2,%xmm2
+	addl	40(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpor	%xmm8,%xmm2,%xmm2
+	addl	44(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	vpxor	%xmm7,%xmm3,%xmm3
+	addl	48(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	vpxor	%xmm4,%xmm3,%xmm3
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	vpaddd	%xmm2,%xmm11,%xmm9
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpxor	%xmm8,%xmm3,%xmm3
+	addl	52(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	vpsrld	$30,%xmm3,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpslld	$2,%xmm3,%xmm3
+	addl	56(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpor	%xmm8,%xmm3,%xmm3
+	addl	60(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	vpxor	%xmm0,%xmm4,%xmm4
+	addl	0(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	vpxor	%xmm5,%xmm4,%xmm4
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	vpaddd	%xmm3,%xmm11,%xmm9
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpxor	%xmm8,%xmm4,%xmm4
+	addl	4(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	vpsrld	$30,%xmm4,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpslld	$2,%xmm4,%xmm4
+	addl	8(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vpor	%xmm8,%xmm4,%xmm4
+	addl	12(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	vpxor	%xmm1,%xmm5,%xmm5
+	addl	16(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	vpxor	%xmm6,%xmm5,%xmm5
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	vpaddd	%xmm4,%xmm11,%xmm9
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpxor	%xmm8,%xmm5,%xmm5
+	addl	20(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	vpsrld	$30,%xmm5,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpslld	$2,%xmm5,%xmm5
+	addl	24(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vpor	%xmm8,%xmm5,%xmm5
+	addl	28(%rsp),%eax
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%ecx,%esi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	vpxor	%xmm2,%xmm6,%xmm6
+	addl	32(%rsp),%ebp
+	andl	%ecx,%esi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%eax,%edi
+	xorl	%ecx,%esi
+	vpaddd	%xmm5,%xmm11,%xmm9
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	vpxor	%xmm8,%xmm6,%xmm6
+	xorl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	36(%rsp),%edx
+	vpsrld	$30,%xmm6,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%esi
+	vpslld	$2,%xmm6,%xmm6
+	xorl	%ebx,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	40(%rsp),%ecx
+	andl	%eax,%esi
+	vpor	%xmm8,%xmm6,%xmm6
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%edi
+	xorl	%eax,%esi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	44(%rsp),%ebx
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%esi
+	xorl	%ebp,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	vpxor	%xmm3,%xmm7,%xmm7
+	addl	48(%rsp),%eax
+	andl	%edx,%esi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	vpxor	%xmm0,%xmm7,%xmm7
+	movl	%ebx,%edi
+	xorl	%edx,%esi
+	vpaddd	%xmm6,%xmm11,%xmm9
+	vmovdqa	32(%r14),%xmm11
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	vpxor	%xmm8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	52(%rsp),%ebp
+	vpsrld	$30,%xmm7,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%esi
+	vpslld	$2,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	56(%rsp),%edx
+	andl	%ebx,%esi
+	vpor	%xmm8,%xmm7,%xmm7
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	60(%rsp),%ecx
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%esi
+	xorl	%eax,%edi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	vpxor	%xmm4,%xmm0,%xmm0
+	addl	0(%rsp),%ebx
+	andl	%ebp,%esi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	vpxor	%xmm1,%xmm0,%xmm0
+	movl	%ecx,%edi
+	xorl	%ebp,%esi
+	vpaddd	%xmm7,%xmm11,%xmm9
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	vpxor	%xmm8,%xmm0,%xmm0
+	xorl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	4(%rsp),%eax
+	vpsrld	$30,%xmm0,%xmm8
+	vmovdqa	%xmm9,48(%rsp)
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	vpslld	$2,%xmm0,%xmm0
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%ecx,%esi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	8(%rsp),%ebp
+	andl	%ecx,%esi
+	vpor	%xmm8,%xmm0,%xmm0
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%edi
+	xorl	%ecx,%esi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ebx,%edi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	addl	12(%rsp),%edx
+	andl	%ebx,%edi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	movl	%ebp,%esi
+	xorl	%ebx,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%eax,%esi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	vpxor	%xmm5,%xmm1,%xmm1
+	addl	16(%rsp),%ecx
+	andl	%eax,%esi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	vpxor	%xmm2,%xmm1,%xmm1
+	movl	%edx,%edi
+	xorl	%eax,%esi
+	vpaddd	%xmm0,%xmm11,%xmm9
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	vpxor	%xmm8,%xmm1,%xmm1
+	xorl	%ebp,%edi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	20(%rsp),%ebx
+	vpsrld	$30,%xmm1,%xmm8
+	vmovdqa	%xmm9,0(%rsp)
+	andl	%ebp,%edi
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%esi
+	vpslld	$2,%xmm1,%xmm1
+	xorl	%ebp,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%edx,%esi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	24(%rsp),%eax
+	andl	%edx,%esi
+	vpor	%xmm8,%xmm1,%xmm1
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%edi
+	xorl	%edx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%ecx,%edi
+	xorl	%edx,%ecx
+	addl	%ebx,%eax
+	addl	28(%rsp),%ebp
+	andl	%ecx,%edi
+	xorl	%edx,%ecx
+	shrdl	$7,%ebx,%ebx
+	movl	%eax,%esi
+	xorl	%ecx,%edi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ebx,%esi
+	xorl	%ecx,%ebx
+	addl	%eax,%ebp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	vpxor	%xmm6,%xmm2,%xmm2
+	addl	32(%rsp),%edx
+	andl	%ebx,%esi
+	xorl	%ecx,%ebx
+	shrdl	$7,%eax,%eax
+	vpxor	%xmm3,%xmm2,%xmm2
+	movl	%ebp,%edi
+	xorl	%ebx,%esi
+	vpaddd	%xmm1,%xmm11,%xmm9
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	vpxor	%xmm8,%xmm2,%xmm2
+	xorl	%eax,%edi
+	xorl	%ebx,%eax
+	addl	%ebp,%edx
+	addl	36(%rsp),%ecx
+	vpsrld	$30,%xmm2,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	andl	%eax,%edi
+	xorl	%ebx,%eax
+	shrdl	$7,%ebp,%ebp
+	movl	%edx,%esi
+	vpslld	$2,%xmm2,%xmm2
+	xorl	%eax,%edi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%ebp,%esi
+	xorl	%eax,%ebp
+	addl	%edx,%ecx
+	addl	40(%rsp),%ebx
+	andl	%ebp,%esi
+	vpor	%xmm8,%xmm2,%xmm2
+	xorl	%eax,%ebp
+	shrdl	$7,%edx,%edx
+	movl	%ecx,%edi
+	xorl	%ebp,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%edx,%edi
+	xorl	%ebp,%edx
+	addl	%ecx,%ebx
+	addl	44(%rsp),%eax
+	andl	%edx,%edi
+	xorl	%ebp,%edx
+	shrdl	$7,%ecx,%ecx
+	movl	%ebx,%esi
+	xorl	%edx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	addl	%ebx,%eax
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	vpxor	%xmm7,%xmm3,%xmm3
+	addl	48(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	vpxor	%xmm4,%xmm3,%xmm3
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	vpaddd	%xmm2,%xmm11,%xmm9
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	vpxor	%xmm8,%xmm3,%xmm3
+	addl	52(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	vpsrld	$30,%xmm3,%xmm8
+	vmovdqa	%xmm9,32(%rsp)
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vpslld	$2,%xmm3,%xmm3
+	addl	56(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vpor	%xmm8,%xmm3,%xmm3
+	addl	60(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	0(%rsp),%eax
+	vpaddd	%xmm3,%xmm11,%xmm9
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	vmovdqa	%xmm9,48(%rsp)
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	4(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	8(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	12(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	cmpq	%r10,%r9
+	je	L$done_avx
+	vmovdqa	64(%r14),%xmm6
+	vmovdqa	-64(%r14),%xmm11
+	vmovdqu	0(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	vpshufb	%xmm6,%xmm0,%xmm0
+	addq	$64,%r9
+	addl	16(%rsp),%ebx
+	xorl	%ebp,%esi
+	vpshufb	%xmm6,%xmm1,%xmm1
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	vpaddd	%xmm11,%xmm0,%xmm4
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	vmovdqa	%xmm4,0(%rsp)
+	addl	20(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	24(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	28(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	32(%rsp),%ecx
+	xorl	%eax,%esi
+	vpshufb	%xmm6,%xmm2,%xmm2
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	vpaddd	%xmm11,%xmm1,%xmm5
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	vmovdqa	%xmm5,16(%rsp)
+	addl	36(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	40(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	44(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	48(%rsp),%edx
+	xorl	%ebx,%esi
+	vpshufb	%xmm6,%xmm3,%xmm3
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	vpaddd	%xmm11,%xmm2,%xmm6
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	vmovdqa	%xmm6,32(%rsp)
+	addl	52(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	56(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	60(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	0(%r8),%eax
+	addl	4(%r8),%esi
+	addl	8(%r8),%ecx
+	addl	12(%r8),%edx
+	movl	%eax,0(%r8)
+	addl	16(%r8),%ebp
+	movl	%esi,4(%r8)
+	movl	%esi,%ebx
+	movl	%ecx,8(%r8)
+	movl	%ecx,%edi
+	movl	%edx,12(%r8)
+	xorl	%edx,%edi
+	movl	%ebp,16(%r8)
+	andl	%edi,%esi
+	jmp	L$oop_avx
+
+.p2align	4
+L$done_avx:
+	addl	16(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	20(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	xorl	%edx,%esi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	24(%rsp),%ebp
+	xorl	%ecx,%esi
+	movl	%eax,%edi
+	shldl	$5,%eax,%eax
+	addl	%esi,%ebp
+	xorl	%ecx,%edi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	28(%rsp),%edx
+	xorl	%ebx,%edi
+	movl	%ebp,%esi
+	shldl	$5,%ebp,%ebp
+	addl	%edi,%edx
+	xorl	%ebx,%esi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	32(%rsp),%ecx
+	xorl	%eax,%esi
+	movl	%edx,%edi
+	shldl	$5,%edx,%edx
+	addl	%esi,%ecx
+	xorl	%eax,%edi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	36(%rsp),%ebx
+	xorl	%ebp,%edi
+	movl	%ecx,%esi
+	shldl	$5,%ecx,%ecx
+	addl	%edi,%ebx
+	xorl	%ebp,%esi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	40(%rsp),%eax
+	xorl	%edx,%esi
+	movl	%ebx,%edi
+	shldl	$5,%ebx,%ebx
+	addl	%esi,%eax
+	xorl	%edx,%edi
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	addl	44(%rsp),%ebp
+	xorl	%ecx,%edi
+	movl	%eax,%esi
+	shldl	$5,%eax,%eax
+	addl	%edi,%ebp
+	xorl	%ecx,%esi
+	shrdl	$7,%ebx,%ebx
+	addl	%eax,%ebp
+	addl	48(%rsp),%edx
+	xorl	%ebx,%esi
+	movl	%ebp,%edi
+	shldl	$5,%ebp,%ebp
+	addl	%esi,%edx
+	xorl	%ebx,%edi
+	shrdl	$7,%eax,%eax
+	addl	%ebp,%edx
+	addl	52(%rsp),%ecx
+	xorl	%eax,%edi
+	movl	%edx,%esi
+	shldl	$5,%edx,%edx
+	addl	%edi,%ecx
+	xorl	%eax,%esi
+	shrdl	$7,%ebp,%ebp
+	addl	%edx,%ecx
+	addl	56(%rsp),%ebx
+	xorl	%ebp,%esi
+	movl	%ecx,%edi
+	shldl	$5,%ecx,%ecx
+	addl	%esi,%ebx
+	xorl	%ebp,%edi
+	shrdl	$7,%edx,%edx
+	addl	%ecx,%ebx
+	addl	60(%rsp),%eax
+	xorl	%edx,%edi
+	movl	%ebx,%esi
+	shldl	$5,%ebx,%ebx
+	addl	%edi,%eax
+	shrdl	$7,%ecx,%ecx
+	addl	%ebx,%eax
+	vzeroupper
+
+	addl	0(%r8),%eax
+	addl	4(%r8),%esi
+	addl	8(%r8),%ecx
+	movl	%eax,0(%r8)
+	addl	12(%r8),%edx
+	movl	%esi,4(%r8)
+	addl	16(%r8),%ebp
+	movl	%ecx,8(%r8)
+	movl	%edx,12(%r8)
+	movl	%ebp,16(%r8)
+	movq	-40(%r11),%r14
+
+	movq	-32(%r11),%r13
+
+	movq	-24(%r11),%r12
+
+	movq	-16(%r11),%rbp
+
+	movq	-8(%r11),%rbx
+
+	leaq	(%r11),%rsp
+
+L$epilogue_avx:
+	.byte	0xf3,0xc3
+
+
+
+.p2align	4
+sha1_block_data_order_avx2:
+_avx2_shortcut:
+
+	movq	%rsp,%r11
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	vzeroupper
+	movq	%rdi,%r8
+	movq	%rsi,%r9
+	movq	%rdx,%r10
+
+	leaq	-640(%rsp),%rsp
+	shlq	$6,%r10
+	leaq	64(%r9),%r13
+	andq	$-128,%rsp
+	addq	%r9,%r10
+	leaq	K_XX_XX+64(%rip),%r14
+
+	movl	0(%r8),%eax
+	cmpq	%r10,%r13
+	cmovaeq	%r9,%r13
+	movl	4(%r8),%ebp
+	movl	8(%r8),%ecx
+	movl	12(%r8),%edx
+	movl	16(%r8),%esi
+	vmovdqu	64(%r14),%ymm6
+
+	vmovdqu	(%r9),%xmm0
+	vmovdqu	16(%r9),%xmm1
+	vmovdqu	32(%r9),%xmm2
+	vmovdqu	48(%r9),%xmm3
+	leaq	64(%r9),%r9
+	vinserti128	$1,(%r13),%ymm0,%ymm0
+	vinserti128	$1,16(%r13),%ymm1,%ymm1
+	vpshufb	%ymm6,%ymm0,%ymm0
+	vinserti128	$1,32(%r13),%ymm2,%ymm2
+	vpshufb	%ymm6,%ymm1,%ymm1
+	vinserti128	$1,48(%r13),%ymm3,%ymm3
+	vpshufb	%ymm6,%ymm2,%ymm2
+	vmovdqu	-64(%r14),%ymm11
+	vpshufb	%ymm6,%ymm3,%ymm3
+
+	vpaddd	%ymm11,%ymm0,%ymm4
+	vpaddd	%ymm11,%ymm1,%ymm5
+	vmovdqu	%ymm4,0(%rsp)
+	vpaddd	%ymm11,%ymm2,%ymm6
+	vmovdqu	%ymm5,32(%rsp)
+	vpaddd	%ymm11,%ymm3,%ymm7
+	vmovdqu	%ymm6,64(%rsp)
+	vmovdqu	%ymm7,96(%rsp)
+	vpalignr	$8,%ymm0,%ymm1,%ymm4
+	vpsrldq	$4,%ymm3,%ymm8
+	vpxor	%ymm0,%ymm4,%ymm4
+	vpxor	%ymm2,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm4,%ymm4
+	vpsrld	$31,%ymm4,%ymm8
+	vpslldq	$12,%ymm4,%ymm10
+	vpaddd	%ymm4,%ymm4,%ymm4
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm4,%ymm4
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm4,%ymm4
+	vpxor	%ymm10,%ymm4,%ymm4
+	vpaddd	%ymm11,%ymm4,%ymm9
+	vmovdqu	%ymm9,128(%rsp)
+	vpalignr	$8,%ymm1,%ymm2,%ymm5
+	vpsrldq	$4,%ymm4,%ymm8
+	vpxor	%ymm1,%ymm5,%ymm5
+	vpxor	%ymm3,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm5,%ymm5
+	vpsrld	$31,%ymm5,%ymm8
+	vmovdqu	-32(%r14),%ymm11
+	vpslldq	$12,%ymm5,%ymm10
+	vpaddd	%ymm5,%ymm5,%ymm5
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm5,%ymm5
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm5,%ymm5
+	vpxor	%ymm10,%ymm5,%ymm5
+	vpaddd	%ymm11,%ymm5,%ymm9
+	vmovdqu	%ymm9,160(%rsp)
+	vpalignr	$8,%ymm2,%ymm3,%ymm6
+	vpsrldq	$4,%ymm5,%ymm8
+	vpxor	%ymm2,%ymm6,%ymm6
+	vpxor	%ymm4,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm6,%ymm6
+	vpsrld	$31,%ymm6,%ymm8
+	vpslldq	$12,%ymm6,%ymm10
+	vpaddd	%ymm6,%ymm6,%ymm6
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm6,%ymm6
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm6,%ymm6
+	vpxor	%ymm10,%ymm6,%ymm6
+	vpaddd	%ymm11,%ymm6,%ymm9
+	vmovdqu	%ymm9,192(%rsp)
+	vpalignr	$8,%ymm3,%ymm4,%ymm7
+	vpsrldq	$4,%ymm6,%ymm8
+	vpxor	%ymm3,%ymm7,%ymm7
+	vpxor	%ymm5,%ymm8,%ymm8
+	vpxor	%ymm8,%ymm7,%ymm7
+	vpsrld	$31,%ymm7,%ymm8
+	vpslldq	$12,%ymm7,%ymm10
+	vpaddd	%ymm7,%ymm7,%ymm7
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm7,%ymm7
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm7,%ymm7
+	vpxor	%ymm10,%ymm7,%ymm7
+	vpaddd	%ymm11,%ymm7,%ymm9
+	vmovdqu	%ymm9,224(%rsp)
+	leaq	128(%rsp),%r13
+	jmp	L$oop_avx2
+.p2align	5
+L$oop_avx2:
+	rorxl	$2,%ebp,%ebx
+	andnl	%edx,%ebp,%edi
+	andl	%ecx,%ebp
+	xorl	%edi,%ebp
+	jmp	L$align32_1
+.p2align	5
+L$align32_1:
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	vpxor	%ymm4,%ymm0,%ymm0
+	addl	-128(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	vpxor	%ymm1,%ymm0,%ymm0
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpxor	%ymm8,%ymm0,%ymm0
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	vpsrld	$30,%ymm0,%ymm8
+	vpslld	$2,%ymm0,%ymm0
+	addl	-124(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	vpor	%ymm8,%ymm0,%ymm0
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-120(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	vpaddd	%ymm11,%ymm0,%ymm9
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	vmovdqu	%ymm9,256(%rsp)
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-116(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-96(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	vpxor	%ymm5,%ymm1,%ymm1
+	addl	-92(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	vpxor	%ymm2,%ymm1,%ymm1
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	vpxor	%ymm8,%ymm1,%ymm1
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	vpsrld	$30,%ymm1,%ymm8
+	vpslld	$2,%ymm1,%ymm1
+	addl	-88(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	vpor	%ymm8,%ymm1,%ymm1
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-84(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	vmovdqu	%ymm9,288(%rsp)
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-64(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-60(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	vpxor	%ymm6,%ymm2,%ymm2
+	addl	-56(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	vpxor	%ymm3,%ymm2,%ymm2
+	vmovdqu	0(%r14),%ymm11
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpxor	%ymm8,%ymm2,%ymm2
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	vpsrld	$30,%ymm2,%ymm8
+	vpslld	$2,%ymm2,%ymm2
+	addl	-52(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	vpor	%ymm8,%ymm2,%ymm2
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-32(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	vpaddd	%ymm11,%ymm2,%ymm9
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	vmovdqu	%ymm9,320(%rsp)
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-28(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-24(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	vpxor	%ymm7,%ymm3,%ymm3
+	addl	-20(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	vpxor	%ymm4,%ymm3,%ymm3
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpxor	%ymm8,%ymm3,%ymm3
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	vpsrld	$30,%ymm3,%ymm8
+	vpslld	$2,%ymm3,%ymm3
+	addl	0(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	vpor	%ymm8,%ymm3,%ymm3
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	4(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	vpaddd	%ymm11,%ymm3,%ymm9
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	vmovdqu	%ymm9,352(%rsp)
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	8(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	12(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vpalignr	$8,%ymm2,%ymm3,%ymm8
+	vpxor	%ymm0,%ymm4,%ymm4
+	addl	32(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpxor	%ymm8,%ymm4,%ymm4
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	36(%r13),%ebx
+	vpsrld	$30,%ymm4,%ymm8
+	vpslld	$2,%ymm4,%ymm4
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vpor	%ymm8,%ymm4,%ymm4
+	addl	40(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpaddd	%ymm11,%ymm4,%ymm9
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	44(%r13),%eax
+	vmovdqu	%ymm9,384(%rsp)
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpalignr	$8,%ymm3,%ymm4,%ymm8
+	vpxor	%ymm1,%ymm5,%ymm5
+	addl	68(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm6,%ymm5,%ymm5
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	vpxor	%ymm8,%ymm5,%ymm5
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	72(%r13),%ecx
+	vpsrld	$30,%ymm5,%ymm8
+	vpslld	$2,%ymm5,%ymm5
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	vpor	%ymm8,%ymm5,%ymm5
+	addl	76(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpaddd	%ymm11,%ymm5,%ymm9
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	96(%r13),%ebp
+	vmovdqu	%ymm9,416(%rsp)
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	100(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpalignr	$8,%ymm4,%ymm5,%ymm8
+	vpxor	%ymm2,%ymm6,%ymm6
+	addl	104(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpxor	%ymm7,%ymm6,%ymm6
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	vpxor	%ymm8,%ymm6,%ymm6
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	108(%r13),%edx
+	leaq	256(%r13),%r13
+	vpsrld	$30,%ymm6,%ymm8
+	vpslld	$2,%ymm6,%ymm6
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vpor	%ymm8,%ymm6,%ymm6
+	addl	-128(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpaddd	%ymm11,%ymm6,%ymm9
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-124(%r13),%ebx
+	vmovdqu	%ymm9,448(%rsp)
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-120(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpalignr	$8,%ymm5,%ymm6,%ymm8
+	vpxor	%ymm3,%ymm7,%ymm7
+	addl	-116(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	vpxor	%ymm0,%ymm7,%ymm7
+	vmovdqu	32(%r14),%ymm11
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	vpxor	%ymm8,%ymm7,%ymm7
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-96(%r13),%esi
+	vpsrld	$30,%ymm7,%ymm8
+	vpslld	$2,%ymm7,%ymm7
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpor	%ymm8,%ymm7,%ymm7
+	addl	-92(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpaddd	%ymm11,%ymm7,%ymm9
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-88(%r13),%ecx
+	vmovdqu	%ymm9,480(%rsp)
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-84(%r13),%ebx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	jmp	L$align32_2
+.p2align	5
+L$align32_2:
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	vpxor	%ymm4,%ymm0,%ymm0
+	addl	-64(%r13),%ebp
+	xorl	%esi,%ecx
+	vpxor	%ymm1,%ymm0,%ymm0
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	vpxor	%ymm8,%ymm0,%ymm0
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	vpsrld	$30,%ymm0,%ymm8
+	vpslld	$2,%ymm0,%ymm0
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-60(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	vpor	%ymm8,%ymm0,%ymm0
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	vpaddd	%ymm11,%ymm0,%ymm9
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	-56(%r13),%esi
+	xorl	%ecx,%ebp
+	vmovdqu	%ymm9,512(%rsp)
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	-52(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	-32(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	vpxor	%ymm5,%ymm1,%ymm1
+	addl	-28(%r13),%ebx
+	xorl	%eax,%edx
+	vpxor	%ymm2,%ymm1,%ymm1
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	vpxor	%ymm8,%ymm1,%ymm1
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vpsrld	$30,%ymm1,%ymm8
+	vpslld	$2,%ymm1,%ymm1
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	-24(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	vpor	%ymm8,%ymm1,%ymm1
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-20(%r13),%eax
+	xorl	%edx,%ebx
+	vmovdqu	%ymm9,544(%rsp)
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	0(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	4(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	vpxor	%ymm6,%ymm2,%ymm2
+	addl	8(%r13),%ecx
+	xorl	%ebp,%esi
+	vpxor	%ymm3,%ymm2,%ymm2
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	vpxor	%ymm8,%ymm2,%ymm2
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpsrld	$30,%ymm2,%ymm8
+	vpslld	$2,%ymm2,%ymm2
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	12(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	vpor	%ymm8,%ymm2,%ymm2
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vpaddd	%ymm11,%ymm2,%ymm9
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	32(%r13),%ebp
+	xorl	%esi,%ecx
+	vmovdqu	%ymm9,576(%rsp)
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	36(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	40(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	vpxor	%ymm7,%ymm3,%ymm3
+	addl	44(%r13),%edx
+	xorl	%ebx,%eax
+	vpxor	%ymm4,%ymm3,%ymm3
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm8,%ymm3,%ymm3
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	vpsrld	$30,%ymm3,%ymm8
+	vpslld	$2,%ymm3,%ymm3
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	64(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	vpor	%ymm8,%ymm3,%ymm3
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpaddd	%ymm11,%ymm3,%ymm9
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	68(%r13),%ebx
+	xorl	%eax,%edx
+	vmovdqu	%ymm9,608(%rsp)
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	72(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	76(%r13),%eax
+	xorl	%edx,%ebx
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	100(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	104(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	108(%r13),%ebx
+	leaq	256(%r13),%r13
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-128(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-124(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-120(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-116(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-96(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-92(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-88(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-84(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-60(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-56(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-52(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-32(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-28(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-24(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-20(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	addl	%r12d,%edx
+	leaq	128(%r9),%r13
+	leaq	128(%r9),%rdi
+	cmpq	%r10,%r13
+	cmovaeq	%r9,%r13
+
+
+	addl	0(%r8),%edx
+	addl	4(%r8),%esi
+	addl	8(%r8),%ebp
+	movl	%edx,0(%r8)
+	addl	12(%r8),%ebx
+	movl	%esi,4(%r8)
+	movl	%edx,%eax
+	addl	16(%r8),%ecx
+	movl	%ebp,%r12d
+	movl	%ebp,8(%r8)
+	movl	%ebx,%edx
+
+	movl	%ebx,12(%r8)
+	movl	%esi,%ebp
+	movl	%ecx,16(%r8)
+
+	movl	%ecx,%esi
+	movl	%r12d,%ecx
+
+
+	cmpq	%r10,%r9
+	je	L$done_avx2
+	vmovdqu	64(%r14),%ymm6
+	cmpq	%r10,%rdi
+	ja	L$ast_avx2
+
+	vmovdqu	-64(%rdi),%xmm0
+	vmovdqu	-48(%rdi),%xmm1
+	vmovdqu	-32(%rdi),%xmm2
+	vmovdqu	-16(%rdi),%xmm3
+	vinserti128	$1,0(%r13),%ymm0,%ymm0
+	vinserti128	$1,16(%r13),%ymm1,%ymm1
+	vinserti128	$1,32(%r13),%ymm2,%ymm2
+	vinserti128	$1,48(%r13),%ymm3,%ymm3
+	jmp	L$ast_avx2
+
+.p2align	5
+L$ast_avx2:
+	leaq	128+16(%rsp),%r13
+	rorxl	$2,%ebp,%ebx
+	andnl	%edx,%ebp,%edi
+	andl	%ecx,%ebp
+	xorl	%edi,%ebp
+	subq	$-128,%r9
+	addl	-128(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-124(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-120(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-116(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-96(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	-92(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-88(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-84(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-64(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-60(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	-56(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	-52(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	-32(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	-28(%r13),%edx
+	andnl	%ebx,%esi,%edi
+	addl	%eax,%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	andl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%edi,%esi
+	addl	-24(%r13),%ecx
+	andnl	%ebp,%edx,%edi
+	addl	%esi,%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	andl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%edi,%edx
+	addl	-20(%r13),%ebx
+	andnl	%eax,%ecx,%edi
+	addl	%edx,%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	andl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%edi,%ecx
+	addl	0(%r13),%ebp
+	andnl	%esi,%ebx,%edi
+	addl	%ecx,%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	andl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%edi,%ebx
+	addl	4(%r13),%eax
+	andnl	%edx,%ebp,%edi
+	addl	%ebx,%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	andl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edi,%ebp
+	addl	8(%r13),%esi
+	andnl	%ecx,%eax,%edi
+	addl	%ebp,%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	andl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%edi,%eax
+	addl	12(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	32(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	36(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	40(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	44(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vmovdqu	-64(%r14),%ymm11
+	vpshufb	%ymm6,%ymm0,%ymm0
+	addl	68(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	72(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	76(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	96(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	100(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpshufb	%ymm6,%ymm1,%ymm1
+	vpaddd	%ymm11,%ymm0,%ymm8
+	addl	104(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	108(%r13),%edx
+	leaq	256(%r13),%r13
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-128(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-124(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-120(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vmovdqu	%ymm8,0(%rsp)
+	vpshufb	%ymm6,%ymm2,%ymm2
+	vpaddd	%ymm11,%ymm1,%ymm9
+	addl	-116(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-92(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	addl	-88(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-84(%r13),%ebx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	vmovdqu	%ymm9,32(%rsp)
+	vpshufb	%ymm6,%ymm3,%ymm3
+	vpaddd	%ymm11,%ymm2,%ymm6
+	addl	-64(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-60(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	-56(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	-52(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	addl	-32(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	jmp	L$align32_3
+.p2align	5
+L$align32_3:
+	vmovdqu	%ymm6,64(%rsp)
+	vpaddd	%ymm11,%ymm3,%ymm7
+	addl	-28(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	-24(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	-20(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	0(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	addl	4(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	andl	%edi,%esi
+	vmovdqu	%ymm7,96(%rsp)
+	addl	8(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	addl	12(%r13),%ebx
+	xorl	%eax,%edx
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	32(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	36(%r13),%eax
+	xorl	%edx,%ebx
+	movl	%ecx,%edi
+	xorl	%edx,%edi
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	andl	%edi,%ebp
+	addl	40(%r13),%esi
+	xorl	%ecx,%ebp
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	andl	%edi,%eax
+	vpalignr	$8,%ymm0,%ymm1,%ymm4
+	addl	44(%r13),%edx
+	xorl	%ebx,%eax
+	movl	%ebp,%edi
+	xorl	%ebx,%edi
+	vpsrldq	$4,%ymm3,%ymm8
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpxor	%ymm0,%ymm4,%ymm4
+	vpxor	%ymm2,%ymm8,%ymm8
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpxor	%ymm8,%ymm4,%ymm4
+	andl	%edi,%esi
+	addl	64(%r13),%ecx
+	xorl	%ebp,%esi
+	movl	%eax,%edi
+	vpsrld	$31,%ymm4,%ymm8
+	xorl	%ebp,%edi
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	vpslldq	$12,%ymm4,%ymm10
+	vpaddd	%ymm4,%ymm4,%ymm4
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm4,%ymm4
+	addl	%r12d,%ecx
+	andl	%edi,%edx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm4,%ymm4
+	addl	68(%r13),%ebx
+	xorl	%eax,%edx
+	vpxor	%ymm10,%ymm4,%ymm4
+	movl	%esi,%edi
+	xorl	%eax,%edi
+	leal	(%rbx,%rdx,1),%ebx
+	vpaddd	%ymm11,%ymm4,%ymm9
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	vmovdqu	%ymm9,128(%rsp)
+	addl	%r12d,%ebx
+	andl	%edi,%ecx
+	addl	72(%r13),%ebp
+	xorl	%esi,%ecx
+	movl	%edx,%edi
+	xorl	%esi,%edi
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	andl	%edi,%ebx
+	addl	76(%r13),%eax
+	xorl	%edx,%ebx
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpalignr	$8,%ymm1,%ymm2,%ymm5
+	addl	96(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpsrldq	$4,%ymm4,%ymm8
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	vpxor	%ymm1,%ymm5,%ymm5
+	vpxor	%ymm3,%ymm8,%ymm8
+	addl	100(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpxor	%ymm8,%ymm5,%ymm5
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpsrld	$31,%ymm5,%ymm8
+	vmovdqu	-32(%r14),%ymm11
+	xorl	%ebx,%esi
+	addl	104(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	vpslldq	$12,%ymm5,%ymm10
+	vpaddd	%ymm5,%ymm5,%ymm5
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm5,%ymm5
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm5,%ymm5
+	xorl	%ebp,%edx
+	addl	108(%r13),%ebx
+	leaq	256(%r13),%r13
+	vpxor	%ymm10,%ymm5,%ymm5
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	vpaddd	%ymm11,%ymm5,%ymm9
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vmovdqu	%ymm9,160(%rsp)
+	addl	-128(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpalignr	$8,%ymm2,%ymm3,%ymm6
+	addl	-124(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	vpsrldq	$4,%ymm5,%ymm8
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	vpxor	%ymm2,%ymm6,%ymm6
+	vpxor	%ymm4,%ymm8,%ymm8
+	addl	-120(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpxor	%ymm8,%ymm6,%ymm6
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	vpsrld	$31,%ymm6,%ymm8
+	xorl	%ecx,%eax
+	addl	-116(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	vpslldq	$12,%ymm6,%ymm10
+	vpaddd	%ymm6,%ymm6,%ymm6
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm6,%ymm6
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm6,%ymm6
+	xorl	%ebx,%esi
+	addl	-96(%r13),%ecx
+	vpxor	%ymm10,%ymm6,%ymm6
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	vpaddd	%ymm11,%ymm6,%ymm9
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	vmovdqu	%ymm9,192(%rsp)
+	addl	-92(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	vpalignr	$8,%ymm3,%ymm4,%ymm7
+	addl	-88(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	vpsrldq	$4,%ymm6,%ymm8
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	vpxor	%ymm3,%ymm7,%ymm7
+	vpxor	%ymm5,%ymm8,%ymm8
+	addl	-84(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	vpxor	%ymm8,%ymm7,%ymm7
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	vpsrld	$31,%ymm7,%ymm8
+	xorl	%edx,%ebp
+	addl	-64(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	vpslldq	$12,%ymm7,%ymm10
+	vpaddd	%ymm7,%ymm7,%ymm7
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	vpsrld	$30,%ymm10,%ymm9
+	vpor	%ymm8,%ymm7,%ymm7
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	vpslld	$2,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm7,%ymm7
+	xorl	%ecx,%eax
+	addl	-60(%r13),%edx
+	vpxor	%ymm10,%ymm7,%ymm7
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	rorxl	$2,%esi,%eax
+	vpaddd	%ymm11,%ymm7,%ymm9
+	xorl	%ebp,%esi
+	addl	%r12d,%edx
+	xorl	%ebx,%esi
+	vmovdqu	%ymm9,224(%rsp)
+	addl	-56(%r13),%ecx
+	leal	(%rcx,%rsi,1),%ecx
+	rorxl	$27,%edx,%r12d
+	rorxl	$2,%edx,%esi
+	xorl	%eax,%edx
+	addl	%r12d,%ecx
+	xorl	%ebp,%edx
+	addl	-52(%r13),%ebx
+	leal	(%rbx,%rdx,1),%ebx
+	rorxl	$27,%ecx,%r12d
+	rorxl	$2,%ecx,%edx
+	xorl	%esi,%ecx
+	addl	%r12d,%ebx
+	xorl	%eax,%ecx
+	addl	-32(%r13),%ebp
+	leal	(%rcx,%rbp,1),%ebp
+	rorxl	$27,%ebx,%r12d
+	rorxl	$2,%ebx,%ecx
+	xorl	%edx,%ebx
+	addl	%r12d,%ebp
+	xorl	%esi,%ebx
+	addl	-28(%r13),%eax
+	leal	(%rax,%rbx,1),%eax
+	rorxl	$27,%ebp,%r12d
+	rorxl	$2,%ebp,%ebx
+	xorl	%ecx,%ebp
+	addl	%r12d,%eax
+	xorl	%edx,%ebp
+	addl	-24(%r13),%esi
+	leal	(%rsi,%rbp,1),%esi
+	rorxl	$27,%eax,%r12d
+	rorxl	$2,%eax,%ebp
+	xorl	%ebx,%eax
+	addl	%r12d,%esi
+	xorl	%ecx,%eax
+	addl	-20(%r13),%edx
+	leal	(%rdx,%rax,1),%edx
+	rorxl	$27,%esi,%r12d
+	addl	%r12d,%edx
+	leaq	128(%rsp),%r13
+
+
+	addl	0(%r8),%edx
+	addl	4(%r8),%esi
+	addl	8(%r8),%ebp
+	movl	%edx,0(%r8)
+	addl	12(%r8),%ebx
+	movl	%esi,4(%r8)
+	movl	%edx,%eax
+	addl	16(%r8),%ecx
+	movl	%ebp,%r12d
+	movl	%ebp,8(%r8)
+	movl	%ebx,%edx
+
+	movl	%ebx,12(%r8)
+	movl	%esi,%ebp
+	movl	%ecx,16(%r8)
+
+	movl	%ecx,%esi
+	movl	%r12d,%ecx
+
+
+	cmpq	%r10,%r9
+	jbe	L$oop_avx2
+
+L$done_avx2:
+	vzeroupper
+	movq	-40(%r11),%r14
+
+	movq	-32(%r11),%r13
+
+	movq	-24(%r11),%r12
+
+	movq	-16(%r11),%rbp
+
+	movq	-8(%r11),%rbx
+
+	leaq	(%r11),%rsp
+
+L$epilogue_avx2:
+	.byte	0xf3,0xc3
+
+
 .p2align	6
 K_XX_XX:
-.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999	
-.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1	
-.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc	
-.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6	
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f	
+.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999
+.long	0x5a827999,0x5a827999,0x5a827999,0x5a827999
+.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1
+.long	0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1
+.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc
+.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc
+.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6
+.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.byte	0xf,0xe,0xd,0xc,0xb,0xa,0x9,0x8,0x7,0x6,0x5,0x4,0x3,0x2,0x1,0x0
 .byte	83,72,65,49,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .p2align	6
 
diff --git a/lib/accelerated/x86/macosx/sha256-ssse3-x86.s b/lib/accelerated/x86/macosx/sha256-ssse3-x86.s
index 300212c915..8d257109ca 100644
--- a/lib/accelerated/x86/macosx/sha256-ssse3-x86.s
+++ b/lib/accelerated/x86/macosx/sha256-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha512-586.s"
 .text
 .globl	_sha256_block_data_order
 .align	4
@@ -63,20 +62,6 @@ L000pic_point:
 	movl	%edi,4(%esp)
 	movl	%eax,8(%esp)
 	movl	%ebx,12(%esp)
-	movl	L__gnutls_x86_cpuid_s$non_lazy_ptr-L001K256(%ebp),%edx
-	movl	(%edx),%ecx
-	movl	4(%edx),%edx
-	testl	$1048576,%ecx
-	jnz	L002loop
-	testl	$2048,%edx
-	andl	$1073741824,%ecx
-	andl	$268435456,%edx
-	orl	%edx,%ecx
-	cmpl	$1342177280,%ecx
-	je	L003loop_shrd
-	subl	%edi,%eax
-	cmpl	$256,%eax
-	jae	L004unrolled
 	jmp	L002loop
 .align	4,0x90
 L002loop:
@@ -148,7 +133,7 @@ L002loop:
 	movl	%ecx,28(%esp)
 	movl	%edi,32(%esp)
 .align	4,0x90
-L00500_15:
+L00300_15:
 	movl	%edx,%ecx
 	movl	24(%esp),%esi
 	rorl	$14,%ecx
@@ -186,11 +171,11 @@ L00500_15:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3248222580,%esi
-	jne	L00500_15
+	jne	L00300_15
 	movl	156(%esp),%ecx
-	jmp	L00616_63
+	jmp	L00416_63
 .align	4,0x90
-L00616_63:
+L00416_63:
 	movl	%ecx,%ebx
 	movl	104(%esp),%esi
 	rorl	$11,%ecx
@@ -245,7 +230,7 @@ L00616_63:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3329325298,%esi
-	jne	L00616_63
+	jne	L00416_63
 	movl	356(%esp),%esi
 	movl	8(%esp),%ebx
 	movl	16(%esp),%ecx
@@ -279,8 +264,8 @@ L00616_63:
 	popl	%ebx
 	popl	%ebp
 	ret
-.align	4,0x90
-L003loop_shrd:
+.align	5,0x90
+L005loop_shrd:
 	movl	(%edi),%eax
 	movl	4(%edi),%ebx
 	movl	8(%edi),%ecx
@@ -349,7 +334,7 @@ L003loop_shrd:
 	movl	%ecx,28(%esp)
 	movl	%edi,32(%esp)
 .align	4,0x90
-L00700_15_shrd:
+L00600_15_shrd:
 	movl	%edx,%ecx
 	movl	24(%esp),%esi
 	shrdl	$14,%ecx,%ecx
@@ -387,11 +372,11 @@ L00700_15_shrd:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3248222580,%esi
-	jne	L00700_15_shrd
+	jne	L00600_15_shrd
 	movl	156(%esp),%ecx
-	jmp	L00816_63_shrd
+	jmp	L00716_63_shrd
 .align	4,0x90
-L00816_63_shrd:
+L00716_63_shrd:
 	movl	%ecx,%ebx
 	movl	104(%esp),%esi
 	shrdl	$11,%ecx,%ecx
@@ -446,7 +431,7 @@ L00816_63_shrd:
 	addl	$4,%ebp
 	addl	%ebx,%eax
 	cmpl	$3329325298,%esi
-	jne	L00816_63_shrd
+	jne	L00716_63_shrd
 	movl	356(%esp),%esi
 	movl	8(%esp),%ebx
 	movl	16(%esp),%ecx
@@ -473,7 +458,7 @@ L00816_63_shrd:
 	leal	356(%esp),%esp
 	subl	$256,%ebp
 	cmpl	8(%esp),%edi
-	jb	L003loop_shrd
+	jb	L005loop_shrd
 	movl	12(%esp),%esp
 	popl	%edi
 	popl	%esi
@@ -484,8 +469,13 @@ L00816_63_shrd:
 L001K256:
 .long	1116352408,1899447441,3049323471,3921009573,961987163,1508970993,2453635748,2870763221,3624381080,310598401,607225278,1426881987,1925078388,2162078206,2614888103,3248222580,3835390401,4022224774,264347078,604807628,770255983,1249150122,1555081692,1996064986,2554220882,2821834349,2952996808,3210313671,3336571891,3584528711,113926993,338241895,666307205,773529912,1294757372,1396182291,1695183700,1986661051,2177026350,2456956037,2730485921,2820302411,3259730800,3345764771,3516065817,3600352804,4094571909,275423344,430227734,506948616,659060556,883997877,958139571,1322822218,1537002063,1747873779,1955562222,2024104815,2227730452,2361852424,2428436474,2756734187,3204031479,3329325298
 .long	66051,67438087,134810123,202182159
+.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97
+.byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
+.byte	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
+.byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
+.byte	62,0
 .align	4,0x90
-L004unrolled:
+L008unrolled:
 	leal	-96(%esp),%esp
 	movl	(%esi),%eax
 	movl	4(%esi),%ebp
@@ -3391,14 +3381,4 @@ L009grand_loop:
 	popl	%ebx
 	popl	%ebp
 	ret
-.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97
-.byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
-.byte	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
-.byte	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
-.byte	62,0
-.section __IMPORT,__pointers,non_lazy_symbol_pointers
-L__gnutls_x86_cpuid_s$non_lazy_ptr:
-.indirect_symbol	__gnutls_x86_cpuid_s
-.long	0
-.comm	__gnutls_x86_cpuid_s,16,2
 
diff --git a/lib/accelerated/x86/macosx/sha256-ssse3-x86_64.s b/lib/accelerated/x86/macosx/sha256-ssse3-x86_64.s
new file mode 100644
index 0000000000..fd0c247359
--- /dev/null
+++ b/lib/accelerated/x86/macosx/sha256-ssse3-x86_64.s
@@ -0,0 +1,5470 @@
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+#     * Redistributions of source code must retain copyright notices,
+#      this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+#     * Neither the name of the Andy Polyakov nor the names of its
+#      copyright holder and contributors may be used to endorse or
+#      promote products derived from this software without specific
+#      prior written permission.
+#
+# ALTERNATIVELY, provided that this notice is retained in full, this
+# product may be distributed under the terms of the GNU General Public
+# License (GPL), in which case the provisions of the GPL apply INSTEAD OF
+# those given above.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# *** This file is auto-generated ***
+#
+.text	
+
+
+.globl	_sha256_block_data_order
+
+.p2align	4
+_sha256_block_data_order:
+
+	leaq	__gnutls_x86_cpuid_s(%rip),%r11
+	movl	0(%r11),%r9d
+	movl	4(%r11),%r10d
+	movl	8(%r11),%r11d
+	testl	$536870912,%r11d
+	jnz	_shaext_shortcut
+	andl	$296,%r11d
+	cmpl	$296,%r11d
+	je	L$avx2_shortcut
+	andl	$1073741824,%r9d
+	andl	$268435968,%r10d
+	orl	%r9d,%r10d
+	cmpl	$1342177792,%r10d
+	je	L$avx_shortcut
+	testl	$512,%r10d
+	jnz	L$ssse3_shortcut
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	shlq	$4,%rdx
+	subq	$64+32,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+
+L$prologue:
+
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	jmp	L$loop
+
+.p2align	4
+L$loop:
+	movl	%ebx,%edi
+	leaq	K256(%rip),%rbp
+	xorl	%ecx,%edi
+	movl	0(%rsi),%r12d
+	movl	%r8d,%r13d
+	movl	%eax,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,0(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r11d
+	movl	4(%rsi),%r12d
+	movl	%edx,%r13d
+	movl	%r11d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,4(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r10d
+	movl	8(%rsi),%r12d
+	movl	%ecx,%r13d
+	movl	%r10d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,8(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r9d
+	movl	12(%rsi),%r12d
+	movl	%ebx,%r13d
+	movl	%r9d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,12(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%r8d
+	movl	16(%rsi),%r12d
+	movl	%eax,%r13d
+	movl	%r8d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,16(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%edx
+	movl	20(%rsi),%r12d
+	movl	%r11d,%r13d
+	movl	%edx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,20(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ecx
+	movl	24(%rsi),%r12d
+	movl	%r10d,%r13d
+	movl	%ecx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,24(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ebx
+	movl	28(%rsi),%r12d
+	movl	%r9d,%r13d
+	movl	%ebx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,28(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%eax
+	movl	32(%rsi),%r12d
+	movl	%r8d,%r13d
+	movl	%eax,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,32(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r11d
+	movl	36(%rsi),%r12d
+	movl	%edx,%r13d
+	movl	%r11d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,36(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r10d
+	movl	40(%rsi),%r12d
+	movl	%ecx,%r13d
+	movl	%r10d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,40(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%r9d
+	movl	44(%rsi),%r12d
+	movl	%ebx,%r13d
+	movl	%r9d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,44(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	addl	%r14d,%r8d
+	movl	48(%rsi),%r12d
+	movl	%eax,%r13d
+	movl	%r8d,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,48(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%edx
+	movl	52(%rsi),%r12d
+	movl	%r11d,%r13d
+	movl	%edx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,52(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ecx
+	movl	56(%rsi),%r12d
+	movl	%r10d,%r13d
+	movl	%ecx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,56(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	addl	%r14d,%ebx
+	movl	60(%rsi),%r12d
+	movl	%r9d,%r13d
+	movl	%ebx,%r14d
+	bswapl	%r12d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,60(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	jmp	L$rounds_16_xx
+.p2align	4
+L$rounds_16_xx:
+	movl	4(%rsp),%r13d
+	movl	56(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%eax
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	36(%rsp),%r12d
+
+	addl	0(%rsp),%r12d
+	movl	%r8d,%r13d
+	addl	%r15d,%r12d
+	movl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,0(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	movl	8(%rsp),%r13d
+	movl	60(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r11d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	40(%rsp),%r12d
+
+	addl	4(%rsp),%r12d
+	movl	%edx,%r13d
+	addl	%edi,%r12d
+	movl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,4(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	movl	12(%rsp),%r13d
+	movl	0(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r10d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	44(%rsp),%r12d
+
+	addl	8(%rsp),%r12d
+	movl	%ecx,%r13d
+	addl	%r15d,%r12d
+	movl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,8(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	movl	16(%rsp),%r13d
+	movl	4(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r9d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	48(%rsp),%r12d
+
+	addl	12(%rsp),%r12d
+	movl	%ebx,%r13d
+	addl	%edi,%r12d
+	movl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,12(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	movl	20(%rsp),%r13d
+	movl	8(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r8d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	52(%rsp),%r12d
+
+	addl	16(%rsp),%r12d
+	movl	%eax,%r13d
+	addl	%r15d,%r12d
+	movl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,16(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	movl	24(%rsp),%r13d
+	movl	12(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%edx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	56(%rsp),%r12d
+
+	addl	20(%rsp),%r12d
+	movl	%r11d,%r13d
+	addl	%edi,%r12d
+	movl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,20(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	movl	28(%rsp),%r13d
+	movl	16(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ecx
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	60(%rsp),%r12d
+
+	addl	24(%rsp),%r12d
+	movl	%r10d,%r13d
+	addl	%r15d,%r12d
+	movl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,24(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	movl	32(%rsp),%r13d
+	movl	20(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ebx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	0(%rsp),%r12d
+
+	addl	28(%rsp),%r12d
+	movl	%r9d,%r13d
+	addl	%edi,%r12d
+	movl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,28(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	movl	36(%rsp),%r13d
+	movl	24(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%eax
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	4(%rsp),%r12d
+
+	addl	32(%rsp),%r12d
+	movl	%r8d,%r13d
+	addl	%r15d,%r12d
+	movl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r9d,%r15d
+
+	xorl	%r8d,%r13d
+	rorl	$9,%r14d
+	xorl	%r10d,%r15d
+
+	movl	%r12d,32(%rsp)
+	xorl	%eax,%r14d
+	andl	%r8d,%r15d
+
+	rorl	$5,%r13d
+	addl	%r11d,%r12d
+	xorl	%r10d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r8d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%eax,%r15d
+	addl	(%rbp),%r12d
+	xorl	%eax,%r14d
+
+	xorl	%ebx,%r15d
+	rorl	$6,%r13d
+	movl	%ebx,%r11d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r11d
+	addl	%r12d,%edx
+	addl	%r12d,%r11d
+
+	leaq	4(%rbp),%rbp
+	movl	40(%rsp),%r13d
+	movl	28(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r11d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	8(%rsp),%r12d
+
+	addl	36(%rsp),%r12d
+	movl	%edx,%r13d
+	addl	%edi,%r12d
+	movl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r8d,%edi
+
+	xorl	%edx,%r13d
+	rorl	$9,%r14d
+	xorl	%r9d,%edi
+
+	movl	%r12d,36(%rsp)
+	xorl	%r11d,%r14d
+	andl	%edx,%edi
+
+	rorl	$5,%r13d
+	addl	%r10d,%r12d
+	xorl	%r9d,%edi
+
+	rorl	$11,%r14d
+	xorl	%edx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r11d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r11d,%r14d
+
+	xorl	%eax,%edi
+	rorl	$6,%r13d
+	movl	%eax,%r10d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r10d
+	addl	%r12d,%ecx
+	addl	%r12d,%r10d
+
+	leaq	4(%rbp),%rbp
+	movl	44(%rsp),%r13d
+	movl	32(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r10d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	12(%rsp),%r12d
+
+	addl	40(%rsp),%r12d
+	movl	%ecx,%r13d
+	addl	%r15d,%r12d
+	movl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%edx,%r15d
+
+	xorl	%ecx,%r13d
+	rorl	$9,%r14d
+	xorl	%r8d,%r15d
+
+	movl	%r12d,40(%rsp)
+	xorl	%r10d,%r14d
+	andl	%ecx,%r15d
+
+	rorl	$5,%r13d
+	addl	%r9d,%r12d
+	xorl	%r8d,%r15d
+
+	rorl	$11,%r14d
+	xorl	%ecx,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r10d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r10d,%r14d
+
+	xorl	%r11d,%r15d
+	rorl	$6,%r13d
+	movl	%r11d,%r9d
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%r9d
+	addl	%r12d,%ebx
+	addl	%r12d,%r9d
+
+	leaq	4(%rbp),%rbp
+	movl	48(%rsp),%r13d
+	movl	36(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r9d
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	16(%rsp),%r12d
+
+	addl	44(%rsp),%r12d
+	movl	%ebx,%r13d
+	addl	%edi,%r12d
+	movl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%ecx,%edi
+
+	xorl	%ebx,%r13d
+	rorl	$9,%r14d
+	xorl	%edx,%edi
+
+	movl	%r12d,44(%rsp)
+	xorl	%r9d,%r14d
+	andl	%ebx,%edi
+
+	rorl	$5,%r13d
+	addl	%r8d,%r12d
+	xorl	%edx,%edi
+
+	rorl	$11,%r14d
+	xorl	%ebx,%r13d
+	addl	%edi,%r12d
+
+	movl	%r9d,%edi
+	addl	(%rbp),%r12d
+	xorl	%r9d,%r14d
+
+	xorl	%r10d,%edi
+	rorl	$6,%r13d
+	movl	%r10d,%r8d
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%r8d
+	addl	%r12d,%eax
+	addl	%r12d,%r8d
+
+	leaq	20(%rbp),%rbp
+	movl	52(%rsp),%r13d
+	movl	40(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%r8d
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	20(%rsp),%r12d
+
+	addl	48(%rsp),%r12d
+	movl	%eax,%r13d
+	addl	%r15d,%r12d
+	movl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%ebx,%r15d
+
+	xorl	%eax,%r13d
+	rorl	$9,%r14d
+	xorl	%ecx,%r15d
+
+	movl	%r12d,48(%rsp)
+	xorl	%r8d,%r14d
+	andl	%eax,%r15d
+
+	rorl	$5,%r13d
+	addl	%edx,%r12d
+	xorl	%ecx,%r15d
+
+	rorl	$11,%r14d
+	xorl	%eax,%r13d
+	addl	%r15d,%r12d
+
+	movl	%r8d,%r15d
+	addl	(%rbp),%r12d
+	xorl	%r8d,%r14d
+
+	xorl	%r9d,%r15d
+	rorl	$6,%r13d
+	movl	%r9d,%edx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%edx
+	addl	%r12d,%r11d
+	addl	%r12d,%edx
+
+	leaq	4(%rbp),%rbp
+	movl	56(%rsp),%r13d
+	movl	44(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%edx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	24(%rsp),%r12d
+
+	addl	52(%rsp),%r12d
+	movl	%r11d,%r13d
+	addl	%edi,%r12d
+	movl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%eax,%edi
+
+	xorl	%r11d,%r13d
+	rorl	$9,%r14d
+	xorl	%ebx,%edi
+
+	movl	%r12d,52(%rsp)
+	xorl	%edx,%r14d
+	andl	%r11d,%edi
+
+	rorl	$5,%r13d
+	addl	%ecx,%r12d
+	xorl	%ebx,%edi
+
+	rorl	$11,%r14d
+	xorl	%r11d,%r13d
+	addl	%edi,%r12d
+
+	movl	%edx,%edi
+	addl	(%rbp),%r12d
+	xorl	%edx,%r14d
+
+	xorl	%r8d,%edi
+	rorl	$6,%r13d
+	movl	%r8d,%ecx
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%ecx
+	addl	%r12d,%r10d
+	addl	%r12d,%ecx
+
+	leaq	4(%rbp),%rbp
+	movl	60(%rsp),%r13d
+	movl	48(%rsp),%r15d
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ecx
+	movl	%r15d,%r14d
+	rorl	$2,%r15d
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%r15d
+	shrl	$10,%r14d
+
+	rorl	$17,%r15d
+	xorl	%r13d,%r12d
+	xorl	%r14d,%r15d
+	addl	28(%rsp),%r12d
+
+	addl	56(%rsp),%r12d
+	movl	%r10d,%r13d
+	addl	%r15d,%r12d
+	movl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r11d,%r15d
+
+	xorl	%r10d,%r13d
+	rorl	$9,%r14d
+	xorl	%eax,%r15d
+
+	movl	%r12d,56(%rsp)
+	xorl	%ecx,%r14d
+	andl	%r10d,%r15d
+
+	rorl	$5,%r13d
+	addl	%ebx,%r12d
+	xorl	%eax,%r15d
+
+	rorl	$11,%r14d
+	xorl	%r10d,%r13d
+	addl	%r15d,%r12d
+
+	movl	%ecx,%r15d
+	addl	(%rbp),%r12d
+	xorl	%ecx,%r14d
+
+	xorl	%edx,%r15d
+	rorl	$6,%r13d
+	movl	%edx,%ebx
+
+	andl	%r15d,%edi
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%edi,%ebx
+	addl	%r12d,%r9d
+	addl	%r12d,%ebx
+
+	leaq	4(%rbp),%rbp
+	movl	0(%rsp),%r13d
+	movl	52(%rsp),%edi
+
+	movl	%r13d,%r12d
+	rorl	$11,%r13d
+	addl	%r14d,%ebx
+	movl	%edi,%r14d
+	rorl	$2,%edi
+
+	xorl	%r12d,%r13d
+	shrl	$3,%r12d
+	rorl	$7,%r13d
+	xorl	%r14d,%edi
+	shrl	$10,%r14d
+
+	rorl	$17,%edi
+	xorl	%r13d,%r12d
+	xorl	%r14d,%edi
+	addl	32(%rsp),%r12d
+
+	addl	60(%rsp),%r12d
+	movl	%r9d,%r13d
+	addl	%edi,%r12d
+	movl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r10d,%edi
+
+	xorl	%r9d,%r13d
+	rorl	$9,%r14d
+	xorl	%r11d,%edi
+
+	movl	%r12d,60(%rsp)
+	xorl	%ebx,%r14d
+	andl	%r9d,%edi
+
+	rorl	$5,%r13d
+	addl	%eax,%r12d
+	xorl	%r11d,%edi
+
+	rorl	$11,%r14d
+	xorl	%r9d,%r13d
+	addl	%edi,%r12d
+
+	movl	%ebx,%edi
+	addl	(%rbp),%r12d
+	xorl	%ebx,%r14d
+
+	xorl	%ecx,%edi
+	rorl	$6,%r13d
+	movl	%ecx,%eax
+
+	andl	%edi,%r15d
+	rorl	$2,%r14d
+	addl	%r13d,%r12d
+
+	xorl	%r15d,%eax
+	addl	%r12d,%r8d
+	addl	%r12d,%eax
+
+	leaq	20(%rbp),%rbp
+	cmpb	$0,3(%rbp)
+	jnz	L$rounds_16_xx
+
+	movq	64+0(%rsp),%rdi
+	addl	%r14d,%eax
+	leaq	64(%rsi),%rsi
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	L$loop
+
+	movq	88(%rsp),%rsi
+
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+L$epilogue:
+	.byte	0xf3,0xc3
+
+
+.p2align	6
+
+K256:
+.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
+.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
+.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
+.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
+.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
+.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
+.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
+.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
+.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
+.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
+.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
+.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
+.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
+.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
+.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
+.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
+.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
+.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
+.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
+.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
+.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
+.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
+.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
+.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
+.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
+.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
+.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
+.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
+.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
+.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
+.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
+.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
+.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
+.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
+.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
+.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
+
+.p2align	6
+sha256_block_data_order_shaext:
+_shaext_shortcut:
+	leaq	K256+128(%rip),%rcx
+	movdqu	(%rdi),%xmm1
+	movdqu	16(%rdi),%xmm2
+	movdqa	512-128(%rcx),%xmm7
+
+	pshufd	$0x1b,%xmm1,%xmm0
+	pshufd	$0xb1,%xmm1,%xmm1
+	pshufd	$0x1b,%xmm2,%xmm2
+	movdqa	%xmm7,%xmm8
+.byte	102,15,58,15,202,8
+	punpcklqdq	%xmm0,%xmm2
+	jmp	L$oop_shaext
+
+.p2align	4
+L$oop_shaext:
+	movdqu	(%rsi),%xmm3
+	movdqu	16(%rsi),%xmm4
+	movdqu	32(%rsi),%xmm5
+.byte	102,15,56,0,223
+	movdqu	48(%rsi),%xmm6
+
+	movdqa	0-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	102,15,56,0,231
+	movdqa	%xmm2,%xmm10
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	nop
+	movdqa	%xmm1,%xmm9
+.byte	15,56,203,202
+
+	movdqa	32-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	102,15,56,0,239
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	leaq	64(%rsi),%rsi
+.byte	15,56,204,220
+.byte	15,56,203,202
+
+	movdqa	64-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	102,15,56,0,247
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+
+	movdqa	96-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	128-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	160-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+	nop
+	paddd	%xmm7,%xmm6
+.byte	15,56,204,220
+.byte	15,56,203,202
+	movdqa	192-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,205,245
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+	movdqa	224-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	256-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	288-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+	nop
+	paddd	%xmm7,%xmm6
+.byte	15,56,204,220
+.byte	15,56,203,202
+	movdqa	320-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,205,245
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm6,%xmm7
+.byte	102,15,58,15,253,4
+	nop
+	paddd	%xmm7,%xmm3
+.byte	15,56,204,229
+.byte	15,56,203,202
+	movdqa	352-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+.byte	15,56,205,222
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm3,%xmm7
+.byte	102,15,58,15,254,4
+	nop
+	paddd	%xmm7,%xmm4
+.byte	15,56,204,238
+.byte	15,56,203,202
+	movdqa	384-128(%rcx),%xmm0
+	paddd	%xmm3,%xmm0
+.byte	15,56,205,227
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm4,%xmm7
+.byte	102,15,58,15,251,4
+	nop
+	paddd	%xmm7,%xmm5
+.byte	15,56,204,243
+.byte	15,56,203,202
+	movdqa	416-128(%rcx),%xmm0
+	paddd	%xmm4,%xmm0
+.byte	15,56,205,236
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	movdqa	%xmm5,%xmm7
+.byte	102,15,58,15,252,4
+.byte	15,56,203,202
+	paddd	%xmm7,%xmm6
+
+	movdqa	448-128(%rcx),%xmm0
+	paddd	%xmm5,%xmm0
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+.byte	15,56,205,245
+	movdqa	%xmm8,%xmm7
+.byte	15,56,203,202
+
+	movdqa	480-128(%rcx),%xmm0
+	paddd	%xmm6,%xmm0
+	nop
+.byte	15,56,203,209
+	pshufd	$0x0e,%xmm0,%xmm0
+	decq	%rdx
+	nop
+.byte	15,56,203,202
+
+	paddd	%xmm10,%xmm2
+	paddd	%xmm9,%xmm1
+	jnz	L$oop_shaext
+
+	pshufd	$0xb1,%xmm2,%xmm2
+	pshufd	$0x1b,%xmm1,%xmm7
+	pshufd	$0xb1,%xmm1,%xmm1
+	punpckhqdq	%xmm2,%xmm1
+.byte	102,15,58,15,215,8
+
+	movdqu	%xmm1,(%rdi)
+	movdqu	%xmm2,16(%rdi)
+	.byte	0xf3,0xc3
+
+
+.p2align	6
+sha256_block_data_order_ssse3:
+
+L$ssse3_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	shlq	$4,%rdx
+	subq	$96,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+
+L$prologue_ssse3:
+
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+
+
+	jmp	L$loop_ssse3
+.p2align	4
+L$loop_ssse3:
+	movdqa	K256+512(%rip),%xmm7
+	movdqu	0(%rsi),%xmm0
+	movdqu	16(%rsi),%xmm1
+	movdqu	32(%rsi),%xmm2
+.byte	102,15,56,0,199
+	movdqu	48(%rsi),%xmm3
+	leaq	K256(%rip),%rbp
+.byte	102,15,56,0,207
+	movdqa	0(%rbp),%xmm4
+	movdqa	32(%rbp),%xmm5
+.byte	102,15,56,0,215
+	paddd	%xmm0,%xmm4
+	movdqa	64(%rbp),%xmm6
+.byte	102,15,56,0,223
+	movdqa	96(%rbp),%xmm7
+	paddd	%xmm1,%xmm5
+	paddd	%xmm2,%xmm6
+	paddd	%xmm3,%xmm7
+	movdqa	%xmm4,0(%rsp)
+	movl	%eax,%r14d
+	movdqa	%xmm5,16(%rsp)
+	movl	%ebx,%edi
+	movdqa	%xmm6,32(%rsp)
+	xorl	%ecx,%edi
+	movdqa	%xmm7,48(%rsp)
+	movl	%r8d,%r13d
+	jmp	L$ssse3_00_47
+
+.p2align	4
+L$ssse3_00_47:
+	subq	$-128,%rbp
+	rorl	$14,%r13d
+	movdqa	%xmm1,%xmm4
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	movdqa	%xmm3,%xmm7
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+.byte	102,15,58,15,224,4
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+.byte	102,15,58,15,250,4
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	paddd	%xmm7,%xmm0
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	psrld	$7,%xmm6
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	pshufd	$250,%xmm3,%xmm7
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%r11d,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	pslld	$11,%xmm5
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	paddd	%xmm4,%xmm0
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	psrlq	$17,%xmm6
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	psrldq	$8,%xmm7
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm0
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	pshufd	$80,%xmm0,%xmm7
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	psrld	$10,%xmm7
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	psrlq	$2,%xmm6
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	pxor	%xmm6,%xmm7
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	movdqa	0(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	paddd	%xmm7,%xmm0
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	paddd	%xmm0,%xmm6
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	movdqa	%xmm6,0(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm2,%xmm4
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	movdqa	%xmm0,%xmm7
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+.byte	102,15,58,15,225,4
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+.byte	102,15,58,15,251,4
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	paddd	%xmm7,%xmm1
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	psrld	$7,%xmm6
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	pshufd	$250,%xmm0,%xmm7
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%edx,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	pslld	$11,%xmm5
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	paddd	%xmm4,%xmm1
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	psrlq	$17,%xmm6
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	psrldq	$8,%xmm7
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm1
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	pshufd	$80,%xmm1,%xmm7
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	psrld	$10,%xmm7
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	psrlq	$2,%xmm6
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	pxor	%xmm6,%xmm7
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	movdqa	32(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	paddd	%xmm7,%xmm1
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	paddd	%xmm1,%xmm6
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movdqa	%xmm6,16(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm3,%xmm4
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	movdqa	%xmm1,%xmm7
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+.byte	102,15,58,15,226,4
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+.byte	102,15,58,15,248,4
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	paddd	%xmm7,%xmm2
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	psrld	$7,%xmm6
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	pshufd	$250,%xmm1,%xmm7
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%r11d,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	pslld	$11,%xmm5
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	paddd	%xmm4,%xmm2
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	psrlq	$17,%xmm6
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	psrldq	$8,%xmm7
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm2
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	pshufd	$80,%xmm2,%xmm7
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	psrld	$10,%xmm7
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	psrlq	$2,%xmm6
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	pxor	%xmm6,%xmm7
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	movdqa	64(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	paddd	%xmm7,%xmm2
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	paddd	%xmm2,%xmm6
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	movdqa	%xmm6,32(%rsp)
+	rorl	$14,%r13d
+	movdqa	%xmm0,%xmm4
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	movdqa	%xmm2,%xmm7
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+.byte	102,15,58,15,227,4
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+.byte	102,15,58,15,249,4
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm4,%xmm5
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	movdqa	%xmm4,%xmm6
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	psrld	$3,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	paddd	%xmm7,%xmm3
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	psrld	$7,%xmm6
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	pshufd	$250,%xmm2,%xmm7
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	pslld	$14,%xmm5
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	pxor	%xmm6,%xmm4
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	psrld	$11,%xmm6
+	xorl	%edx,%r14d
+	pxor	%xmm5,%xmm4
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	pslld	$11,%xmm5
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	pxor	%xmm6,%xmm4
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	movdqa	%xmm7,%xmm6
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	pxor	%xmm5,%xmm4
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	psrld	$10,%xmm7
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	paddd	%xmm4,%xmm3
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	psrlq	$17,%xmm6
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	pxor	%xmm6,%xmm7
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	psrlq	$2,%xmm6
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	pshufd	$128,%xmm7,%xmm7
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	psrldq	$8,%xmm7
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	paddd	%xmm7,%xmm3
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	pshufd	$80,%xmm3,%xmm7
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	movdqa	%xmm7,%xmm6
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	psrld	$10,%xmm7
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	psrlq	$17,%xmm6
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	pxor	%xmm6,%xmm7
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	psrlq	$2,%xmm6
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	pxor	%xmm6,%xmm7
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	pshufd	$8,%xmm7,%xmm7
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	movdqa	96(%rbp),%xmm6
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	pslldq	$8,%xmm7
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	paddd	%xmm7,%xmm3
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	paddd	%xmm3,%xmm6
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movdqa	%xmm6,48(%rsp)
+	cmpb	$0,131(%rbp)
+	jne	L$ssse3_00_47
+	rorl	$14,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	rorl	$9,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	rorl	$5,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	rorl	$11,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	rorl	$2,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	rorl	$9,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	rorl	$5,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	rorl	$11,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	rorl	$2,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	rorl	$9,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	rorl	$5,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	rorl	$11,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	rorl	$2,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	rorl	$9,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	rorl	$5,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	rorl	$11,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	rorl	$2,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	rorl	$9,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	rorl	$5,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	rorl	$11,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	rorl	$2,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	rorl	$9,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	rorl	$5,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	rorl	$11,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	rorl	$2,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	rorl	$9,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	rorl	$5,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	rorl	$11,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	rorl	$6,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	rorl	$2,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	rorl	$14,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	rorl	$9,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	rorl	$5,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	rorl	$11,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	rorl	$6,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	rorl	$2,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movq	64+0(%rsp),%rdi
+	movl	%r14d,%eax
+
+	addl	0(%rdi),%eax
+	leaq	64(%rsi),%rsi
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	L$loop_ssse3
+
+	movq	88(%rsp),%rsi
+
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+L$epilogue_ssse3:
+	.byte	0xf3,0xc3
+
+
+
+.p2align	6
+sha256_block_data_order_avx:
+
+L$avx_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	shlq	$4,%rdx
+	subq	$96,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+
+L$prologue_avx:
+
+	vzeroupper
+	movl	0(%rdi),%eax
+	movl	4(%rdi),%ebx
+	movl	8(%rdi),%ecx
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	vmovdqa	K256+512+32(%rip),%xmm8
+	vmovdqa	K256+512+64(%rip),%xmm9
+	jmp	L$loop_avx
+.p2align	4
+L$loop_avx:
+	vmovdqa	K256+512(%rip),%xmm7
+	vmovdqu	0(%rsi),%xmm0
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm7,%xmm0,%xmm0
+	leaq	K256(%rip),%rbp
+	vpshufb	%xmm7,%xmm1,%xmm1
+	vpshufb	%xmm7,%xmm2,%xmm2
+	vpaddd	0(%rbp),%xmm0,%xmm4
+	vpshufb	%xmm7,%xmm3,%xmm3
+	vpaddd	32(%rbp),%xmm1,%xmm5
+	vpaddd	64(%rbp),%xmm2,%xmm6
+	vpaddd	96(%rbp),%xmm3,%xmm7
+	vmovdqa	%xmm4,0(%rsp)
+	movl	%eax,%r14d
+	vmovdqa	%xmm5,16(%rsp)
+	movl	%ebx,%edi
+	vmovdqa	%xmm6,32(%rsp)
+	xorl	%ecx,%edi
+	vmovdqa	%xmm7,48(%rsp)
+	movl	%r8d,%r13d
+	jmp	L$avx_00_47
+
+.p2align	4
+L$avx_00_47:
+	subq	$-128,%rbp
+	vpalignr	$4,%xmm0,%xmm1,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	vpalignr	$4,%xmm2,%xmm3,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	vpaddd	%xmm7,%xmm0,%xmm0
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	vpshufd	$250,%xmm3,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	vpaddd	%xmm4,%xmm0,%xmm0
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	vpaddd	%xmm6,%xmm0,%xmm0
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	vpshufd	$80,%xmm0,%xmm7
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	vpaddd	%xmm6,%xmm0,%xmm0
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	vpaddd	0(%rbp),%xmm0,%xmm6
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	vmovdqa	%xmm6,0(%rsp)
+	vpalignr	$4,%xmm1,%xmm2,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	vpalignr	$4,%xmm3,%xmm0,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	vpaddd	%xmm7,%xmm1,%xmm1
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	vpshufd	$250,%xmm0,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	vpaddd	%xmm4,%xmm1,%xmm1
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	vpaddd	%xmm6,%xmm1,%xmm1
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	vpshufd	$80,%xmm1,%xmm7
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	vpaddd	%xmm6,%xmm1,%xmm1
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	vpaddd	32(%rbp),%xmm1,%xmm6
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	vmovdqa	%xmm6,16(%rsp)
+	vpalignr	$4,%xmm2,%xmm3,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	vpalignr	$4,%xmm0,%xmm1,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	vpaddd	%xmm7,%xmm2,%xmm2
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	vpshufd	$250,%xmm1,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	vpaddd	%xmm4,%xmm2,%xmm2
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	vpaddd	%xmm6,%xmm2,%xmm2
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	vpshufd	$80,%xmm2,%xmm7
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	vpaddd	%xmm6,%xmm2,%xmm2
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	vpaddd	64(%rbp),%xmm2,%xmm6
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	vmovdqa	%xmm6,32(%rsp)
+	vpalignr	$4,%xmm3,%xmm0,%xmm4
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	vpalignr	$4,%xmm1,%xmm2,%xmm7
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	vpsrld	$7,%xmm4,%xmm6
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	vpaddd	%xmm7,%xmm3,%xmm3
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	vpsrld	$3,%xmm4,%xmm7
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	vpslld	$14,%xmm4,%xmm5
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	vpxor	%xmm6,%xmm7,%xmm4
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	vpshufd	$250,%xmm2,%xmm7
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	vpsrld	$11,%xmm6,%xmm6
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	vpxor	%xmm5,%xmm4,%xmm4
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	vpslld	$11,%xmm5,%xmm5
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	vpxor	%xmm6,%xmm4,%xmm4
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	vpsrld	$10,%xmm7,%xmm6
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	vpxor	%xmm5,%xmm4,%xmm4
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	vpsrlq	$17,%xmm7,%xmm7
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	vpaddd	%xmm4,%xmm3,%xmm3
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	vpxor	%xmm7,%xmm6,%xmm6
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	vpshufb	%xmm8,%xmm6,%xmm6
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	vpaddd	%xmm6,%xmm3,%xmm3
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	vpshufd	$80,%xmm3,%xmm7
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	vpsrld	$10,%xmm7,%xmm6
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	vpsrlq	$17,%xmm7,%xmm7
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	vpxor	%xmm7,%xmm6,%xmm6
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	vpsrlq	$2,%xmm7,%xmm7
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	vpxor	%xmm7,%xmm6,%xmm6
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	vpshufb	%xmm9,%xmm6,%xmm6
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	vpaddd	%xmm6,%xmm3,%xmm3
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	vpaddd	96(%rbp),%xmm3,%xmm6
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	vmovdqa	%xmm6,48(%rsp)
+	cmpb	$0,131(%rbp)
+	jne	L$avx_00_47
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	0(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	4(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	8(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	12(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	16(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	20(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	24(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	28(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%eax
+	movl	%r9d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r8d,%r13d
+	xorl	%r10d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%eax,%r14d
+	andl	%r8d,%r12d
+	xorl	%r8d,%r13d
+	addl	32(%rsp),%r11d
+	movl	%eax,%r15d
+	xorl	%r10d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ebx,%r15d
+	addl	%r12d,%r11d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%eax,%r14d
+	addl	%r13d,%r11d
+	xorl	%ebx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r11d,%edx
+	addl	%edi,%r11d
+	movl	%edx,%r13d
+	addl	%r11d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r11d
+	movl	%r8d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%edx,%r13d
+	xorl	%r9d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r11d,%r14d
+	andl	%edx,%r12d
+	xorl	%edx,%r13d
+	addl	36(%rsp),%r10d
+	movl	%r11d,%edi
+	xorl	%r9d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%eax,%edi
+	addl	%r12d,%r10d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r11d,%r14d
+	addl	%r13d,%r10d
+	xorl	%eax,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r10d,%ecx
+	addl	%r15d,%r10d
+	movl	%ecx,%r13d
+	addl	%r10d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r10d
+	movl	%edx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ecx,%r13d
+	xorl	%r8d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r10d,%r14d
+	andl	%ecx,%r12d
+	xorl	%ecx,%r13d
+	addl	40(%rsp),%r9d
+	movl	%r10d,%r15d
+	xorl	%r8d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r11d,%r15d
+	addl	%r12d,%r9d
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r10d,%r14d
+	addl	%r13d,%r9d
+	xorl	%r11d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%r9d,%ebx
+	addl	%edi,%r9d
+	movl	%ebx,%r13d
+	addl	%r9d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r9d
+	movl	%ecx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%ebx,%r13d
+	xorl	%edx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r9d,%r14d
+	andl	%ebx,%r12d
+	xorl	%ebx,%r13d
+	addl	44(%rsp),%r8d
+	movl	%r9d,%edi
+	xorl	%edx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r10d,%edi
+	addl	%r12d,%r8d
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%r9d,%r14d
+	addl	%r13d,%r8d
+	xorl	%r10d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%r8d,%eax
+	addl	%r15d,%r8d
+	movl	%eax,%r13d
+	addl	%r8d,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%r8d
+	movl	%ebx,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%eax,%r13d
+	xorl	%ecx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%r8d,%r14d
+	andl	%eax,%r12d
+	xorl	%eax,%r13d
+	addl	48(%rsp),%edx
+	movl	%r8d,%r15d
+	xorl	%ecx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r9d,%r15d
+	addl	%r12d,%edx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%r8d,%r14d
+	addl	%r13d,%edx
+	xorl	%r9d,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%edx,%r11d
+	addl	%edi,%edx
+	movl	%r11d,%r13d
+	addl	%edx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%edx
+	movl	%eax,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r11d,%r13d
+	xorl	%ebx,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%edx,%r14d
+	andl	%r11d,%r12d
+	xorl	%r11d,%r13d
+	addl	52(%rsp),%ecx
+	movl	%edx,%edi
+	xorl	%ebx,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%r8d,%edi
+	addl	%r12d,%ecx
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%edx,%r14d
+	addl	%r13d,%ecx
+	xorl	%r8d,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%ecx,%r10d
+	addl	%r15d,%ecx
+	movl	%r10d,%r13d
+	addl	%ecx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ecx
+	movl	%r11d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r10d,%r13d
+	xorl	%eax,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ecx,%r14d
+	andl	%r10d,%r12d
+	xorl	%r10d,%r13d
+	addl	56(%rsp),%ebx
+	movl	%ecx,%r15d
+	xorl	%eax,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%edx,%r15d
+	addl	%r12d,%ebx
+	shrdl	$6,%r13d,%r13d
+	andl	%r15d,%edi
+	xorl	%ecx,%r14d
+	addl	%r13d,%ebx
+	xorl	%edx,%edi
+	shrdl	$2,%r14d,%r14d
+	addl	%ebx,%r9d
+	addl	%edi,%ebx
+	movl	%r9d,%r13d
+	addl	%ebx,%r14d
+	shrdl	$14,%r13d,%r13d
+	movl	%r14d,%ebx
+	movl	%r10d,%r12d
+	shrdl	$9,%r14d,%r14d
+	xorl	%r9d,%r13d
+	xorl	%r11d,%r12d
+	shrdl	$5,%r13d,%r13d
+	xorl	%ebx,%r14d
+	andl	%r9d,%r12d
+	xorl	%r9d,%r13d
+	addl	60(%rsp),%eax
+	movl	%ebx,%edi
+	xorl	%r11d,%r12d
+	shrdl	$11,%r14d,%r14d
+	xorl	%ecx,%edi
+	addl	%r12d,%eax
+	shrdl	$6,%r13d,%r13d
+	andl	%edi,%r15d
+	xorl	%ebx,%r14d
+	addl	%r13d,%eax
+	xorl	%ecx,%r15d
+	shrdl	$2,%r14d,%r14d
+	addl	%eax,%r8d
+	addl	%r15d,%eax
+	movl	%r8d,%r13d
+	addl	%eax,%r14d
+	movq	64+0(%rsp),%rdi
+	movl	%r14d,%eax
+
+	addl	0(%rdi),%eax
+	leaq	64(%rsi),%rsi
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+	jb	L$loop_avx
+
+	movq	88(%rsp),%rsi
+
+	vzeroupper
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+L$epilogue_avx:
+	.byte	0xf3,0xc3
+
+
+
+.p2align	6
+sha256_block_data_order_avx2:
+
+L$avx2_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	subq	$544,%rsp
+	shlq	$4,%rdx
+	andq	$-1024,%rsp
+	leaq	(%rsi,%rdx,4),%rdx
+	addq	$448,%rsp
+	movq	%rdi,64+0(%rsp)
+	movq	%rsi,64+8(%rsp)
+	movq	%rdx,64+16(%rsp)
+	movq	%rax,88(%rsp)
+
+L$prologue_avx2:
+
+	vzeroupper
+	subq	$-64,%rsi
+	movl	0(%rdi),%eax
+	movq	%rsi,%r12
+	movl	4(%rdi),%ebx
+	cmpq	%rdx,%rsi
+	movl	8(%rdi),%ecx
+	cmoveq	%rsp,%r12
+	movl	12(%rdi),%edx
+	movl	16(%rdi),%r8d
+	movl	20(%rdi),%r9d
+	movl	24(%rdi),%r10d
+	movl	28(%rdi),%r11d
+	vmovdqa	K256+512+32(%rip),%ymm8
+	vmovdqa	K256+512+64(%rip),%ymm9
+	jmp	L$oop_avx2
+.p2align	4
+L$oop_avx2:
+	vmovdqa	K256+512(%rip),%ymm7
+	vmovdqu	-64+0(%rsi),%xmm0
+	vmovdqu	-64+16(%rsi),%xmm1
+	vmovdqu	-64+32(%rsi),%xmm2
+	vmovdqu	-64+48(%rsi),%xmm3
+
+	vinserti128	$1,(%r12),%ymm0,%ymm0
+	vinserti128	$1,16(%r12),%ymm1,%ymm1
+	vpshufb	%ymm7,%ymm0,%ymm0
+	vinserti128	$1,32(%r12),%ymm2,%ymm2
+	vpshufb	%ymm7,%ymm1,%ymm1
+	vinserti128	$1,48(%r12),%ymm3,%ymm3
+
+	leaq	K256(%rip),%rbp
+	vpshufb	%ymm7,%ymm2,%ymm2
+	vpaddd	0(%rbp),%ymm0,%ymm4
+	vpshufb	%ymm7,%ymm3,%ymm3
+	vpaddd	32(%rbp),%ymm1,%ymm5
+	vpaddd	64(%rbp),%ymm2,%ymm6
+	vpaddd	96(%rbp),%ymm3,%ymm7
+	vmovdqa	%ymm4,0(%rsp)
+	xorl	%r14d,%r14d
+	vmovdqa	%ymm5,32(%rsp)
+	leaq	-64(%rsp),%rsp
+	movl	%ebx,%edi
+	vmovdqa	%ymm6,0(%rsp)
+	xorl	%ecx,%edi
+	vmovdqa	%ymm7,32(%rsp)
+	movl	%r9d,%r12d
+	subq	$-32*4,%rbp
+	jmp	L$avx2_00_47
+
+.p2align	4
+L$avx2_00_47:
+	leaq	-64(%rsp),%rsp
+	vpalignr	$4,%ymm0,%ymm1,%ymm4
+	addl	0+128(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	vpalignr	$4,%ymm2,%ymm3,%ymm7
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	vpaddd	%ymm7,%ymm0,%ymm0
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	vpshufd	$250,%ymm3,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	4+128(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	vpaddd	%ymm4,%ymm0,%ymm0
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	8+128(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	vpaddd	%ymm6,%ymm0,%ymm0
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	vpshufd	$80,%ymm0,%ymm7
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	12+128(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	vpaddd	%ymm6,%ymm0,%ymm0
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	vpaddd	0(%rbp),%ymm0,%ymm6
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	vmovdqa	%ymm6,0(%rsp)
+	vpalignr	$4,%ymm1,%ymm2,%ymm4
+	addl	32+128(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	vpalignr	$4,%ymm3,%ymm0,%ymm7
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	vpaddd	%ymm7,%ymm1,%ymm1
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	vpshufd	$250,%ymm0,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	36+128(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	vpaddd	%ymm4,%ymm1,%ymm1
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	40+128(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	vpaddd	%ymm6,%ymm1,%ymm1
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	vpshufd	$80,%ymm1,%ymm7
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	44+128(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	vpaddd	%ymm6,%ymm1,%ymm1
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	vpaddd	32(%rbp),%ymm1,%ymm6
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	vmovdqa	%ymm6,32(%rsp)
+	leaq	-64(%rsp),%rsp
+	vpalignr	$4,%ymm2,%ymm3,%ymm4
+	addl	0+128(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	vpalignr	$4,%ymm0,%ymm1,%ymm7
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	vpaddd	%ymm7,%ymm2,%ymm2
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	vpshufd	$250,%ymm1,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	4+128(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	vpaddd	%ymm4,%ymm2,%ymm2
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	8+128(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	vpaddd	%ymm6,%ymm2,%ymm2
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	vpshufd	$80,%ymm2,%ymm7
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	12+128(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	vpaddd	%ymm6,%ymm2,%ymm2
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	vpaddd	64(%rbp),%ymm2,%ymm6
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	vmovdqa	%ymm6,0(%rsp)
+	vpalignr	$4,%ymm3,%ymm0,%ymm4
+	addl	32+128(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	vpalignr	$4,%ymm1,%ymm2,%ymm7
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	vpsrld	$7,%ymm4,%ymm6
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	vpaddd	%ymm7,%ymm3,%ymm3
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	vpsrld	$3,%ymm4,%ymm7
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	vpslld	$14,%ymm4,%ymm5
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	vpxor	%ymm6,%ymm7,%ymm4
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	vpshufd	$250,%ymm2,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	vpsrld	$11,%ymm6,%ymm6
+	addl	36+128(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	vpslld	$11,%ymm5,%ymm5
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	vpxor	%ymm6,%ymm4,%ymm4
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	vpsrld	$10,%ymm7,%ymm6
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	vpxor	%ymm5,%ymm4,%ymm4
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	vpsrlq	$17,%ymm7,%ymm7
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	vpaddd	%ymm4,%ymm3,%ymm3
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	40+128(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	vpshufb	%ymm8,%ymm6,%ymm6
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	vpaddd	%ymm6,%ymm3,%ymm3
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	vpshufd	$80,%ymm3,%ymm7
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	vpsrld	$10,%ymm7,%ymm6
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	vpsrlq	$17,%ymm7,%ymm7
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	vpxor	%ymm7,%ymm6,%ymm6
+	addl	44+128(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	vpsrlq	$2,%ymm7,%ymm7
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	vpxor	%ymm7,%ymm6,%ymm6
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	vpshufb	%ymm9,%ymm6,%ymm6
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	vpaddd	%ymm6,%ymm3,%ymm3
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	vpaddd	96(%rbp),%ymm3,%ymm6
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	vmovdqa	%ymm6,32(%rsp)
+	leaq	128(%rbp),%rbp
+	cmpb	$0,3(%rbp)
+	jne	L$avx2_00_47
+	addl	0+64(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4+64(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8+64(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12+64(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32+64(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36+64(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40+64(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44+64(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	addl	0(%rsp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4(%rsp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8(%rsp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12(%rsp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32(%rsp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36(%rsp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40(%rsp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44(%rsp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	movq	512(%rsp),%rdi
+	addl	%r14d,%eax
+
+	leaq	448(%rsp),%rbp
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	addl	24(%rdi),%r10d
+	addl	28(%rdi),%r11d
+
+	movl	%eax,0(%rdi)
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+
+	cmpq	80(%rbp),%rsi
+	je	L$done_avx2
+
+	xorl	%r14d,%r14d
+	movl	%ebx,%edi
+	xorl	%ecx,%edi
+	movl	%r9d,%r12d
+	jmp	L$ower_avx2
+.p2align	4
+L$ower_avx2:
+	addl	0+16(%rbp),%r11d
+	andl	%r8d,%r12d
+	rorxl	$25,%r8d,%r13d
+	rorxl	$11,%r8d,%r15d
+	leal	(%rax,%r14,1),%eax
+	leal	(%r11,%r12,1),%r11d
+	andnl	%r10d,%r8d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r8d,%r14d
+	leal	(%r11,%r12,1),%r11d
+	xorl	%r14d,%r13d
+	movl	%eax,%r15d
+	rorxl	$22,%eax,%r12d
+	leal	(%r11,%r13,1),%r11d
+	xorl	%ebx,%r15d
+	rorxl	$13,%eax,%r14d
+	rorxl	$2,%eax,%r13d
+	leal	(%rdx,%r11,1),%edx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%ebx,%edi
+	xorl	%r13d,%r14d
+	leal	(%r11,%rdi,1),%r11d
+	movl	%r8d,%r12d
+	addl	4+16(%rbp),%r10d
+	andl	%edx,%r12d
+	rorxl	$25,%edx,%r13d
+	rorxl	$11,%edx,%edi
+	leal	(%r11,%r14,1),%r11d
+	leal	(%r10,%r12,1),%r10d
+	andnl	%r9d,%edx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%edx,%r14d
+	leal	(%r10,%r12,1),%r10d
+	xorl	%r14d,%r13d
+	movl	%r11d,%edi
+	rorxl	$22,%r11d,%r12d
+	leal	(%r10,%r13,1),%r10d
+	xorl	%eax,%edi
+	rorxl	$13,%r11d,%r14d
+	rorxl	$2,%r11d,%r13d
+	leal	(%rcx,%r10,1),%ecx
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%eax,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r10,%r15,1),%r10d
+	movl	%edx,%r12d
+	addl	8+16(%rbp),%r9d
+	andl	%ecx,%r12d
+	rorxl	$25,%ecx,%r13d
+	rorxl	$11,%ecx,%r15d
+	leal	(%r10,%r14,1),%r10d
+	leal	(%r9,%r12,1),%r9d
+	andnl	%r8d,%ecx,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%ecx,%r14d
+	leal	(%r9,%r12,1),%r9d
+	xorl	%r14d,%r13d
+	movl	%r10d,%r15d
+	rorxl	$22,%r10d,%r12d
+	leal	(%r9,%r13,1),%r9d
+	xorl	%r11d,%r15d
+	rorxl	$13,%r10d,%r14d
+	rorxl	$2,%r10d,%r13d
+	leal	(%rbx,%r9,1),%ebx
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r11d,%edi
+	xorl	%r13d,%r14d
+	leal	(%r9,%rdi,1),%r9d
+	movl	%ecx,%r12d
+	addl	12+16(%rbp),%r8d
+	andl	%ebx,%r12d
+	rorxl	$25,%ebx,%r13d
+	rorxl	$11,%ebx,%edi
+	leal	(%r9,%r14,1),%r9d
+	leal	(%r8,%r12,1),%r8d
+	andnl	%edx,%ebx,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%ebx,%r14d
+	leal	(%r8,%r12,1),%r8d
+	xorl	%r14d,%r13d
+	movl	%r9d,%edi
+	rorxl	$22,%r9d,%r12d
+	leal	(%r8,%r13,1),%r8d
+	xorl	%r10d,%edi
+	rorxl	$13,%r9d,%r14d
+	rorxl	$2,%r9d,%r13d
+	leal	(%rax,%r8,1),%eax
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r10d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%r8,%r15,1),%r8d
+	movl	%ebx,%r12d
+	addl	32+16(%rbp),%edx
+	andl	%eax,%r12d
+	rorxl	$25,%eax,%r13d
+	rorxl	$11,%eax,%r15d
+	leal	(%r8,%r14,1),%r8d
+	leal	(%rdx,%r12,1),%edx
+	andnl	%ecx,%eax,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%eax,%r14d
+	leal	(%rdx,%r12,1),%edx
+	xorl	%r14d,%r13d
+	movl	%r8d,%r15d
+	rorxl	$22,%r8d,%r12d
+	leal	(%rdx,%r13,1),%edx
+	xorl	%r9d,%r15d
+	rorxl	$13,%r8d,%r14d
+	rorxl	$2,%r8d,%r13d
+	leal	(%r11,%rdx,1),%r11d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%r9d,%edi
+	xorl	%r13d,%r14d
+	leal	(%rdx,%rdi,1),%edx
+	movl	%eax,%r12d
+	addl	36+16(%rbp),%ecx
+	andl	%r11d,%r12d
+	rorxl	$25,%r11d,%r13d
+	rorxl	$11,%r11d,%edi
+	leal	(%rdx,%r14,1),%edx
+	leal	(%rcx,%r12,1),%ecx
+	andnl	%ebx,%r11d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r11d,%r14d
+	leal	(%rcx,%r12,1),%ecx
+	xorl	%r14d,%r13d
+	movl	%edx,%edi
+	rorxl	$22,%edx,%r12d
+	leal	(%rcx,%r13,1),%ecx
+	xorl	%r8d,%edi
+	rorxl	$13,%edx,%r14d
+	rorxl	$2,%edx,%r13d
+	leal	(%r10,%rcx,1),%r10d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%r8d,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rcx,%r15,1),%ecx
+	movl	%r11d,%r12d
+	addl	40+16(%rbp),%ebx
+	andl	%r10d,%r12d
+	rorxl	$25,%r10d,%r13d
+	rorxl	$11,%r10d,%r15d
+	leal	(%rcx,%r14,1),%ecx
+	leal	(%rbx,%r12,1),%ebx
+	andnl	%eax,%r10d,%r12d
+	xorl	%r15d,%r13d
+	rorxl	$6,%r10d,%r14d
+	leal	(%rbx,%r12,1),%ebx
+	xorl	%r14d,%r13d
+	movl	%ecx,%r15d
+	rorxl	$22,%ecx,%r12d
+	leal	(%rbx,%r13,1),%ebx
+	xorl	%edx,%r15d
+	rorxl	$13,%ecx,%r14d
+	rorxl	$2,%ecx,%r13d
+	leal	(%r9,%rbx,1),%r9d
+	andl	%r15d,%edi
+	xorl	%r12d,%r14d
+	xorl	%edx,%edi
+	xorl	%r13d,%r14d
+	leal	(%rbx,%rdi,1),%ebx
+	movl	%r10d,%r12d
+	addl	44+16(%rbp),%eax
+	andl	%r9d,%r12d
+	rorxl	$25,%r9d,%r13d
+	rorxl	$11,%r9d,%edi
+	leal	(%rbx,%r14,1),%ebx
+	leal	(%rax,%r12,1),%eax
+	andnl	%r11d,%r9d,%r12d
+	xorl	%edi,%r13d
+	rorxl	$6,%r9d,%r14d
+	leal	(%rax,%r12,1),%eax
+	xorl	%r14d,%r13d
+	movl	%ebx,%edi
+	rorxl	$22,%ebx,%r12d
+	leal	(%rax,%r13,1),%eax
+	xorl	%ecx,%edi
+	rorxl	$13,%ebx,%r14d
+	rorxl	$2,%ebx,%r13d
+	leal	(%r8,%rax,1),%r8d
+	andl	%edi,%r15d
+	xorl	%r12d,%r14d
+	xorl	%ecx,%r15d
+	xorl	%r13d,%r14d
+	leal	(%rax,%r15,1),%eax
+	movl	%r9d,%r12d
+	leaq	-64(%rbp),%rbp
+	cmpq	%rsp,%rbp
+	jae	L$ower_avx2
+
+	movq	512(%rsp),%rdi
+	addl	%r14d,%eax
+
+	leaq	448(%rsp),%rsp
+
+	addl	0(%rdi),%eax
+	addl	4(%rdi),%ebx
+	addl	8(%rdi),%ecx
+	addl	12(%rdi),%edx
+	addl	16(%rdi),%r8d
+	addl	20(%rdi),%r9d
+	leaq	128(%rsi),%rsi
+	addl	24(%rdi),%r10d
+	movq	%rsi,%r12
+	addl	28(%rdi),%r11d
+	cmpq	64+16(%rsp),%rsi
+
+	movl	%eax,0(%rdi)
+	cmoveq	%rsp,%r12
+	movl	%ebx,4(%rdi)
+	movl	%ecx,8(%rdi)
+	movl	%edx,12(%rdi)
+	movl	%r8d,16(%rdi)
+	movl	%r9d,20(%rdi)
+	movl	%r10d,24(%rdi)
+	movl	%r11d,28(%rdi)
+
+	jbe	L$oop_avx2
+	leaq	(%rsp),%rbp
+
+L$done_avx2:
+	leaq	(%rbp),%rsp
+	movq	88(%rsp),%rsi
+
+	vzeroupper
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+L$epilogue_avx2:
+	.byte	0xf3,0xc3
+
+
+
diff --git a/lib/accelerated/x86/macosx/sha512-ssse3-x86.s b/lib/accelerated/x86/macosx/sha512-ssse3-x86.s
index 0014a8116b..4e60bb45f6 100644
--- a/lib/accelerated/x86/macosx/sha512-ssse3-x86.s
+++ b/lib/accelerated/x86/macosx/sha512-ssse3-x86.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,6 @@
 #
 # *** This file is auto-generated ***
 #
-.file	"sha512-586.s"
 .text
 .globl	_sha512_block_data_order
 .align	4
@@ -593,6 +592,8 @@ L001K512:
 .long	4234509866,1501505948
 .long	987167468,1607167915
 .long	1246189591,1816402316
+.long	67438087,66051
+.long	202182159,134810123
 .byte	83,72,65,53,49,50,32,98,108,111,99,107,32,116,114,97
 .byte	110,115,102,111,114,109,32,102,111,114,32,120,56,54,44,32
 .byte	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
diff --git a/lib/accelerated/x86/macosx/sha512-ssse3-x86_64.s b/lib/accelerated/x86/macosx/sha512-ssse3-x86_64.s
index 7e73227c2b..8bf161601e 100644
--- a/lib/accelerated/x86/macosx/sha512-ssse3-x86_64.s
+++ b/lib/accelerated/x86/macosx/sha512-ssse3-x86_64.s
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013, Andy Polyakov <appro@openssl.org>
+# Copyright (c) 2011-2016, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,2850 +40,5438 @@
 .text	
 
 
-.globl	_sha256_block_data_order
+.globl	_sha512_block_data_order
 
 .p2align	4
-_sha256_block_data_order:
+_sha512_block_data_order:
+
 	leaq	__gnutls_x86_cpuid_s(%rip),%r11
 	movl	0(%r11),%r9d
 	movl	4(%r11),%r10d
 	movl	8(%r11),%r11d
-	testl	$512,%r10d
-	jnz	L$ssse3_shortcut
+	testl	$2048,%r10d
+	jnz	L$xop_shortcut
+	andl	$296,%r11d
+	cmpl	$296,%r11d
+	je	L$avx2_shortcut
+	andl	$1073741824,%r9d
+	andl	$268435968,%r10d
+	orl	%r9d,%r10d
+	cmpl	$1342177792,%r10d
+	je	L$avx_shortcut
+	movq	%rsp,%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
-	movq	%rsp,%r11
+
 	shlq	$4,%rdx
-	subq	$64+32,%rsp
-	leaq	(%rsi,%rdx,4),%rdx
+	subq	$128+32,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
 	andq	$-64,%rsp
-	movq	%rdi,64+0(%rsp)
-	movq	%rsi,64+8(%rsp)
-	movq	%rdx,64+16(%rsp)
-	movq	%r11,64+24(%rsp)
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+
 L$prologue:
 
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-	movl	16(%rdi),%r8d
-	movl	20(%rdi),%r9d
-	movl	24(%rdi),%r10d
-	movl	28(%rdi),%r11d
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
 	jmp	L$loop
 
 .p2align	4
 L$loop:
-	movl	%ebx,%edi
-	leaq	K256(%rip),%rbp
-	xorl	%ecx,%edi
-	movl	0(%rsi),%r12d
-	movl	%r8d,%r13d
-	movl	%eax,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,0(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-	movl	4(%rsi),%r12d
-	movl	%edx,%r13d
-	movl	%r11d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,4(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-	movl	8(%rsi),%r12d
-	movl	%ecx,%r13d
-	movl	%r10d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,8(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-	movl	12(%rsi),%r12d
-	movl	%ebx,%r13d
-	movl	%r9d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,12(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-	movl	16(%rsi),%r12d
-	movl	%eax,%r13d
-	movl	%r8d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,16(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-	movl	20(%rsi),%r12d
-	movl	%r11d,%r13d
-	movl	%edx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,20(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-	movl	24(%rsi),%r12d
-	movl	%r10d,%r13d
-	movl	%ecx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,24(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-	movl	28(%rsi),%r12d
-	movl	%r9d,%r13d
-	movl	%ebx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,28(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-	movl	32(%rsi),%r12d
-	movl	%r8d,%r13d
-	movl	%eax,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,32(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-	movl	36(%rsi),%r12d
-	movl	%edx,%r13d
-	movl	%r11d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,36(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-	movl	40(%rsi),%r12d
-	movl	%ecx,%r13d
-	movl	%r10d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,40(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-	movl	44(%rsi),%r12d
-	movl	%ebx,%r13d
-	movl	%r9d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,44(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-	movl	48(%rsi),%r12d
-	movl	%eax,%r13d
-	movl	%r8d,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,48(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-	movl	52(%rsi),%r12d
-	movl	%r11d,%r13d
-	movl	%edx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,52(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-	movl	56(%rsi),%r12d
-	movl	%r10d,%r13d
-	movl	%ecx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,56(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-	movl	60(%rsi),%r12d
-	movl	%r9d,%r13d
-	movl	%ebx,%r14d
-	bswapl	%r12d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,60(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	4(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
+	movq	%rbx,%rdi
+	leaq	K512(%rip),%rbp
+	xorq	%rcx,%rdi
+	movq	0(%rsi),%r12
+	movq	%r8,%r13
+	movq	%rax,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,0(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r11
+	movq	8(%rsi),%r12
+	movq	%rdx,%r13
+	movq	%r11,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,8(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r10
+	movq	16(%rsi),%r12
+	movq	%rcx,%r13
+	movq	%r10,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,16(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r9
+	movq	24(%rsi),%r12
+	movq	%rbx,%r13
+	movq	%r9,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,24(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r8
+	movq	32(%rsi),%r12
+	movq	%rax,%r13
+	movq	%r8,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,32(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rdx
+	movq	40(%rsi),%r12
+	movq	%r11,%r13
+	movq	%rdx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,40(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rcx
+	movq	48(%rsi),%r12
+	movq	%r10,%r13
+	movq	%rcx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,48(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rbx
+	movq	56(%rsi),%r12
+	movq	%r9,%r13
+	movq	%rbx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,56(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rax
+	movq	64(%rsi),%r12
+	movq	%r8,%r13
+	movq	%rax,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,64(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r11
+	movq	72(%rsi),%r12
+	movq	%rdx,%r13
+	movq	%r11,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,72(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r10
+	movq	80(%rsi),%r12
+	movq	%rcx,%r13
+	movq	%r10,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,80(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%r9
+	movq	88(%rsi),%r12
+	movq	%rbx,%r13
+	movq	%r9,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,88(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%r8
+	movq	96(%rsi),%r12
+	movq	%rax,%r13
+	movq	%r8,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,96(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rdx
+	movq	104(%rsi),%r12
+	movq	%r11,%r13
+	movq	%rdx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,104(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	addq	%r14,%rcx
+	movq	112(%rsi),%r12
+	movq	%r10,%r13
+	movq	%rcx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,112(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	addq	%r14,%rbx
+	movq	120(%rsi),%r12
+	movq	%r9,%r13
+	movq	%rbx,%r14
+	bswapq	%r12
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,120(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
 	jmp	L$rounds_16_xx
 .p2align	4
 L$rounds_16_xx:
-
-	movl	56(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	36(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	0(%rsp),%r12d
-	movl	%r8d,%r13d
-	addl	%r14d,%r12d
-	movl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,0(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	movl	8(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-
-	movl	60(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	40(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	4(%rsp),%r12d
-	movl	%edx,%r13d
-	addl	%r14d,%r12d
-	movl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,4(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	movl	12(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-
-	movl	0(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	44(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	8(%rsp),%r12d
-	movl	%ecx,%r13d
-	addl	%r14d,%r12d
-	movl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,8(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	movl	16(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-
-	movl	4(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	48(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	12(%rsp),%r12d
-	movl	%ebx,%r13d
-	addl	%r14d,%r12d
-	movl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,12(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	movl	20(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-
-	movl	8(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	52(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	16(%rsp),%r12d
-	movl	%eax,%r13d
-	addl	%r14d,%r12d
-	movl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,16(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	movl	24(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-
-	movl	12(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	56(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	20(%rsp),%r12d
-	movl	%r11d,%r13d
-	addl	%r14d,%r12d
-	movl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,20(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	movl	28(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-
-	movl	16(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	60(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	24(%rsp),%r12d
-	movl	%r10d,%r13d
-	addl	%r14d,%r12d
-	movl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,24(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	movl	32(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-
-	movl	20(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	0(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	28(%rsp),%r12d
-	movl	%r9d,%r13d
-	addl	%r14d,%r12d
-	movl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,28(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	36(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-
-	movl	24(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	4(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	32(%rsp),%r12d
-	movl	%r8d,%r13d
-	addl	%r14d,%r12d
-	movl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r9d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r8d,%r13d
-	xorl	%r10d,%r15d
-
-	movl	%r12d,32(%rsp)
-	xorl	%eax,%r14d
-	andl	%r8d,%r15d
-
-	rorl	$5,%r13d
-	addl	%r11d,%r12d
-	xorl	%r10d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r8d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%eax,%r15d
-	addl	(%rbp),%r12d
-	xorl	%eax,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ebx,%r15d
-	movl	%ebx,%r11d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r11d
-	addl	%r12d,%edx
-	addl	%r12d,%r11d
-	movl	40(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r11d
-
-
-	movl	28(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	8(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	36(%rsp),%r12d
-	movl	%edx,%r13d
-	addl	%r14d,%r12d
-	movl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r8d,%edi
-
-	rorl	$9,%r14d
-	xorl	%edx,%r13d
-	xorl	%r9d,%edi
-
-	movl	%r12d,36(%rsp)
-	xorl	%r11d,%r14d
-	andl	%edx,%edi
-
-	rorl	$5,%r13d
-	addl	%r10d,%r12d
-	xorl	%r9d,%edi
-
-	rorl	$11,%r14d
-	xorl	%edx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r11d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r11d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%eax,%edi
-	movl	%eax,%r10d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r10d
-	addl	%r12d,%ecx
-	addl	%r12d,%r10d
-	movl	44(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r10d
-
-
-	movl	32(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	12(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	40(%rsp),%r12d
-	movl	%ecx,%r13d
-	addl	%r14d,%r12d
-	movl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%edx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%ecx,%r13d
-	xorl	%r8d,%r15d
-
-	movl	%r12d,40(%rsp)
-	xorl	%r10d,%r14d
-	andl	%ecx,%r15d
-
-	rorl	$5,%r13d
-	addl	%r9d,%r12d
-	xorl	%r8d,%r15d
-
-	rorl	$11,%r14d
-	xorl	%ecx,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r10d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r10d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r11d,%r15d
-	movl	%r11d,%r9d
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%r9d
-	addl	%r12d,%ebx
-	addl	%r12d,%r9d
-	movl	48(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%r9d
-
-
-	movl	36(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	16(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	44(%rsp),%r12d
-	movl	%ebx,%r13d
-	addl	%r14d,%r12d
-	movl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%ecx,%edi
-
-	rorl	$9,%r14d
-	xorl	%ebx,%r13d
-	xorl	%edx,%edi
-
-	movl	%r12d,44(%rsp)
-	xorl	%r9d,%r14d
-	andl	%ebx,%edi
-
-	rorl	$5,%r13d
-	addl	%r8d,%r12d
-	xorl	%edx,%edi
-
-	rorl	$11,%r14d
-	xorl	%ebx,%r13d
-	addl	%edi,%r12d
-
-	movl	%r9d,%edi
-	addl	(%rbp),%r12d
-	xorl	%r9d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r10d,%edi
-	movl	%r10d,%r8d
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%r8d
-	addl	%r12d,%eax
-	addl	%r12d,%r8d
-	movl	52(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%r8d
-
-
-	movl	40(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	20(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	48(%rsp),%r12d
-	movl	%eax,%r13d
-	addl	%r14d,%r12d
-	movl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%ebx,%r15d
-
-	rorl	$9,%r14d
-	xorl	%eax,%r13d
-	xorl	%ecx,%r15d
-
-	movl	%r12d,48(%rsp)
-	xorl	%r8d,%r14d
-	andl	%eax,%r15d
-
-	rorl	$5,%r13d
-	addl	%edx,%r12d
-	xorl	%ecx,%r15d
-
-	rorl	$11,%r14d
-	xorl	%eax,%r13d
-	addl	%r15d,%r12d
-
-	movl	%r8d,%r15d
-	addl	(%rbp),%r12d
-	xorl	%r8d,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r9d,%r15d
-	movl	%r9d,%edx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%edx
-	addl	%r12d,%r11d
-	addl	%r12d,%edx
-	movl	56(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%edx
-
-
-	movl	44(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	24(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	52(%rsp),%r12d
-	movl	%r11d,%r13d
-	addl	%r14d,%r12d
-	movl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%eax,%edi
-
-	rorl	$9,%r14d
-	xorl	%r11d,%r13d
-	xorl	%ebx,%edi
-
-	movl	%r12d,52(%rsp)
-	xorl	%edx,%r14d
-	andl	%r11d,%edi
-
-	rorl	$5,%r13d
-	addl	%ecx,%r12d
-	xorl	%ebx,%edi
-
-	rorl	$11,%r14d
-	xorl	%r11d,%r13d
-	addl	%edi,%r12d
-
-	movl	%edx,%edi
-	addl	(%rbp),%r12d
-	xorl	%edx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%r8d,%edi
-	movl	%r8d,%ecx
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%ecx
-	addl	%r12d,%r10d
-	addl	%r12d,%ecx
-	movl	60(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ecx
-
-
-	movl	48(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%r15d
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%r15d,%r14d
-	shrl	$10,%r15d
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	28(%rsp),%r12d
-	xorl	%r15d,%r14d
-
-	addl	56(%rsp),%r12d
-	movl	%r10d,%r13d
-	addl	%r14d,%r12d
-	movl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r11d,%r15d
-
-	rorl	$9,%r14d
-	xorl	%r10d,%r13d
-	xorl	%eax,%r15d
-
-	movl	%r12d,56(%rsp)
-	xorl	%ecx,%r14d
-	andl	%r10d,%r15d
-
-	rorl	$5,%r13d
-	addl	%ebx,%r12d
-	xorl	%eax,%r15d
-
-	rorl	$11,%r14d
-	xorl	%r10d,%r13d
-	addl	%r15d,%r12d
-
-	movl	%ecx,%r15d
-	addl	(%rbp),%r12d
-	xorl	%ecx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%edx,%r15d
-	movl	%edx,%ebx
-
-	rorl	$2,%r14d
-	andl	%r15d,%edi
-	addl	%r13d,%r12d
-
-	xorl	%edi,%ebx
-	addl	%r12d,%r9d
-	addl	%r12d,%ebx
-	movl	0(%rsp),%r13d
-	leaq	4(%rbp),%rbp
-	addl	%r14d,%ebx
-
-
-	movl	52(%rsp),%r14d
-
-	movl	%r13d,%r12d
-	rorl	$11,%r13d
-	movl	%r14d,%edi
-	rorl	$2,%r14d
-
-	xorl	%r12d,%r13d
-	shrl	$3,%r12d
-	rorl	$7,%r13d
-	xorl	%edi,%r14d
-	shrl	$10,%edi
-
-	xorl	%r13d,%r12d
-	rorl	$17,%r14d
-	addl	32(%rsp),%r12d
-	xorl	%edi,%r14d
-
-	addl	60(%rsp),%r12d
-	movl	%r9d,%r13d
-	addl	%r14d,%r12d
-	movl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r10d,%edi
-
-	rorl	$9,%r14d
-	xorl	%r9d,%r13d
-	xorl	%r11d,%edi
-
-	movl	%r12d,60(%rsp)
-	xorl	%ebx,%r14d
-	andl	%r9d,%edi
-
-	rorl	$5,%r13d
-	addl	%eax,%r12d
-	xorl	%r11d,%edi
-
-	rorl	$11,%r14d
-	xorl	%r9d,%r13d
-	addl	%edi,%r12d
-
-	movl	%ebx,%edi
-	addl	(%rbp),%r12d
-	xorl	%ebx,%r14d
-
-	rorl	$6,%r13d
-	xorl	%ecx,%edi
-	movl	%ecx,%eax
-
-	rorl	$2,%r14d
-	andl	%edi,%r15d
-	addl	%r13d,%r12d
-
-	xorl	%r15d,%eax
-	addl	%r12d,%r8d
-	addl	%r12d,%eax
-	movl	4(%rsp),%r13d
-	leaq	20(%rbp),%rbp
-	addl	%r14d,%eax
-
-	cmpb	$0,3(%rbp)
+	movq	8(%rsp),%r13
+	movq	112(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rax
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	72(%rsp),%r12
+
+	addq	0(%rsp),%r12
+	movq	%r8,%r13
+	addq	%r15,%r12
+	movq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,0(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	movq	16(%rsp),%r13
+	movq	120(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r11
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	80(%rsp),%r12
+
+	addq	8(%rsp),%r12
+	movq	%rdx,%r13
+	addq	%rdi,%r12
+	movq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,8(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	movq	24(%rsp),%r13
+	movq	0(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r10
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	88(%rsp),%r12
+
+	addq	16(%rsp),%r12
+	movq	%rcx,%r13
+	addq	%r15,%r12
+	movq	%r10,%r14
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,16(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	movq	32(%rsp),%r13
+	movq	8(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r9
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	96(%rsp),%r12
+
+	addq	24(%rsp),%r12
+	movq	%rbx,%r13
+	addq	%rdi,%r12
+	movq	%r9,%r14
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,24(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	movq	40(%rsp),%r13
+	movq	16(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r8
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	104(%rsp),%r12
+
+	addq	32(%rsp),%r12
+	movq	%rax,%r13
+	addq	%r15,%r12
+	movq	%r8,%r14
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,32(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	movq	48(%rsp),%r13
+	movq	24(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rdx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	112(%rsp),%r12
+
+	addq	40(%rsp),%r12
+	movq	%r11,%r13
+	addq	%rdi,%r12
+	movq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,40(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	movq	56(%rsp),%r13
+	movq	32(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rcx
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	120(%rsp),%r12
+
+	addq	48(%rsp),%r12
+	movq	%r10,%r13
+	addq	%r15,%r12
+	movq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,48(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	movq	64(%rsp),%r13
+	movq	40(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rbx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	0(%rsp),%r12
+
+	addq	56(%rsp),%r12
+	movq	%r9,%r13
+	addq	%rdi,%r12
+	movq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,56(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	movq	72(%rsp),%r13
+	movq	48(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rax
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	8(%rsp),%r12
+
+	addq	64(%rsp),%r12
+	movq	%r8,%r13
+	addq	%r15,%r12
+	movq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r9,%r15
+
+	xorq	%r8,%r13
+	rorq	$5,%r14
+	xorq	%r10,%r15
+
+	movq	%r12,64(%rsp)
+	xorq	%rax,%r14
+	andq	%r8,%r15
+
+	rorq	$4,%r13
+	addq	%r11,%r12
+	xorq	%r10,%r15
+
+	rorq	$6,%r14
+	xorq	%r8,%r13
+	addq	%r15,%r12
+
+	movq	%rax,%r15
+	addq	(%rbp),%r12
+	xorq	%rax,%r14
+
+	xorq	%rbx,%r15
+	rorq	$14,%r13
+	movq	%rbx,%r11
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r11
+	addq	%r12,%rdx
+	addq	%r12,%r11
+
+	leaq	8(%rbp),%rbp
+	movq	80(%rsp),%r13
+	movq	56(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r11
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	16(%rsp),%r12
+
+	addq	72(%rsp),%r12
+	movq	%rdx,%r13
+	addq	%rdi,%r12
+	movq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r8,%rdi
+
+	xorq	%rdx,%r13
+	rorq	$5,%r14
+	xorq	%r9,%rdi
+
+	movq	%r12,72(%rsp)
+	xorq	%r11,%r14
+	andq	%rdx,%rdi
+
+	rorq	$4,%r13
+	addq	%r10,%r12
+	xorq	%r9,%rdi
+
+	rorq	$6,%r14
+	xorq	%rdx,%r13
+	addq	%rdi,%r12
+
+	movq	%r11,%rdi
+	addq	(%rbp),%r12
+	xorq	%r11,%r14
+
+	xorq	%rax,%rdi
+	rorq	$14,%r13
+	movq	%rax,%r10
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r10
+	addq	%r12,%rcx
+	addq	%r12,%r10
+
+	leaq	24(%rbp),%rbp
+	movq	88(%rsp),%r13
+	movq	64(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r10
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	24(%rsp),%r12
+
+	addq	80(%rsp),%r12
+	movq	%rcx,%r13
+	addq	%r15,%r12
+	movq	%r10,%r14
+	rorq	$23,%r13
+	movq	%rdx,%r15
+
+	xorq	%rcx,%r13
+	rorq	$5,%r14
+	xorq	%r8,%r15
+
+	movq	%r12,80(%rsp)
+	xorq	%r10,%r14
+	andq	%rcx,%r15
+
+	rorq	$4,%r13
+	addq	%r9,%r12
+	xorq	%r8,%r15
+
+	rorq	$6,%r14
+	xorq	%rcx,%r13
+	addq	%r15,%r12
+
+	movq	%r10,%r15
+	addq	(%rbp),%r12
+	xorq	%r10,%r14
+
+	xorq	%r11,%r15
+	rorq	$14,%r13
+	movq	%r11,%r9
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%r9
+	addq	%r12,%rbx
+	addq	%r12,%r9
+
+	leaq	8(%rbp),%rbp
+	movq	96(%rsp),%r13
+	movq	72(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r9
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	32(%rsp),%r12
+
+	addq	88(%rsp),%r12
+	movq	%rbx,%r13
+	addq	%rdi,%r12
+	movq	%r9,%r14
+	rorq	$23,%r13
+	movq	%rcx,%rdi
+
+	xorq	%rbx,%r13
+	rorq	$5,%r14
+	xorq	%rdx,%rdi
+
+	movq	%r12,88(%rsp)
+	xorq	%r9,%r14
+	andq	%rbx,%rdi
+
+	rorq	$4,%r13
+	addq	%r8,%r12
+	xorq	%rdx,%rdi
+
+	rorq	$6,%r14
+	xorq	%rbx,%r13
+	addq	%rdi,%r12
+
+	movq	%r9,%rdi
+	addq	(%rbp),%r12
+	xorq	%r9,%r14
+
+	xorq	%r10,%rdi
+	rorq	$14,%r13
+	movq	%r10,%r8
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%r8
+	addq	%r12,%rax
+	addq	%r12,%r8
+
+	leaq	24(%rbp),%rbp
+	movq	104(%rsp),%r13
+	movq	80(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%r8
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	40(%rsp),%r12
+
+	addq	96(%rsp),%r12
+	movq	%rax,%r13
+	addq	%r15,%r12
+	movq	%r8,%r14
+	rorq	$23,%r13
+	movq	%rbx,%r15
+
+	xorq	%rax,%r13
+	rorq	$5,%r14
+	xorq	%rcx,%r15
+
+	movq	%r12,96(%rsp)
+	xorq	%r8,%r14
+	andq	%rax,%r15
+
+	rorq	$4,%r13
+	addq	%rdx,%r12
+	xorq	%rcx,%r15
+
+	rorq	$6,%r14
+	xorq	%rax,%r13
+	addq	%r15,%r12
+
+	movq	%r8,%r15
+	addq	(%rbp),%r12
+	xorq	%r8,%r14
+
+	xorq	%r9,%r15
+	rorq	$14,%r13
+	movq	%r9,%rdx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rdx
+	addq	%r12,%r11
+	addq	%r12,%rdx
+
+	leaq	8(%rbp),%rbp
+	movq	112(%rsp),%r13
+	movq	88(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rdx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	48(%rsp),%r12
+
+	addq	104(%rsp),%r12
+	movq	%r11,%r13
+	addq	%rdi,%r12
+	movq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%rax,%rdi
+
+	xorq	%r11,%r13
+	rorq	$5,%r14
+	xorq	%rbx,%rdi
+
+	movq	%r12,104(%rsp)
+	xorq	%rdx,%r14
+	andq	%r11,%rdi
+
+	rorq	$4,%r13
+	addq	%rcx,%r12
+	xorq	%rbx,%rdi
+
+	rorq	$6,%r14
+	xorq	%r11,%r13
+	addq	%rdi,%r12
+
+	movq	%rdx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rdx,%r14
+
+	xorq	%r8,%rdi
+	rorq	$14,%r13
+	movq	%r8,%rcx
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rcx
+	addq	%r12,%r10
+	addq	%r12,%rcx
+
+	leaq	24(%rbp),%rbp
+	movq	120(%rsp),%r13
+	movq	96(%rsp),%r15
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rcx
+	movq	%r15,%r14
+	rorq	$42,%r15
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%r15
+	shrq	$6,%r14
+
+	rorq	$19,%r15
+	xorq	%r13,%r12
+	xorq	%r14,%r15
+	addq	56(%rsp),%r12
+
+	addq	112(%rsp),%r12
+	movq	%r10,%r13
+	addq	%r15,%r12
+	movq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r11,%r15
+
+	xorq	%r10,%r13
+	rorq	$5,%r14
+	xorq	%rax,%r15
+
+	movq	%r12,112(%rsp)
+	xorq	%rcx,%r14
+	andq	%r10,%r15
+
+	rorq	$4,%r13
+	addq	%rbx,%r12
+	xorq	%rax,%r15
+
+	rorq	$6,%r14
+	xorq	%r10,%r13
+	addq	%r15,%r12
+
+	movq	%rcx,%r15
+	addq	(%rbp),%r12
+	xorq	%rcx,%r14
+
+	xorq	%rdx,%r15
+	rorq	$14,%r13
+	movq	%rdx,%rbx
+
+	andq	%r15,%rdi
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%rdi,%rbx
+	addq	%r12,%r9
+	addq	%r12,%rbx
+
+	leaq	8(%rbp),%rbp
+	movq	0(%rsp),%r13
+	movq	104(%rsp),%rdi
+
+	movq	%r13,%r12
+	rorq	$7,%r13
+	addq	%r14,%rbx
+	movq	%rdi,%r14
+	rorq	$42,%rdi
+
+	xorq	%r12,%r13
+	shrq	$7,%r12
+	rorq	$1,%r13
+	xorq	%r14,%rdi
+	shrq	$6,%r14
+
+	rorq	$19,%rdi
+	xorq	%r13,%r12
+	xorq	%r14,%rdi
+	addq	64(%rsp),%r12
+
+	addq	120(%rsp),%r12
+	movq	%r9,%r13
+	addq	%rdi,%r12
+	movq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r10,%rdi
+
+	xorq	%r9,%r13
+	rorq	$5,%r14
+	xorq	%r11,%rdi
+
+	movq	%r12,120(%rsp)
+	xorq	%rbx,%r14
+	andq	%r9,%rdi
+
+	rorq	$4,%r13
+	addq	%rax,%r12
+	xorq	%r11,%rdi
+
+	rorq	$6,%r14
+	xorq	%r9,%r13
+	addq	%rdi,%r12
+
+	movq	%rbx,%rdi
+	addq	(%rbp),%r12
+	xorq	%rbx,%r14
+
+	xorq	%rcx,%rdi
+	rorq	$14,%r13
+	movq	%rcx,%rax
+
+	andq	%rdi,%r15
+	rorq	$28,%r14
+	addq	%r13,%r12
+
+	xorq	%r15,%rax
+	addq	%r12,%r8
+	addq	%r12,%rax
+
+	leaq	24(%rbp),%rbp
+	cmpb	$0,7(%rbp)
 	jnz	L$rounds_16_xx
 
-	movq	64+0(%rsp),%rdi
-	leaq	64(%rsi),%rsi
-
-	addl	0(%rdi),%eax
-	addl	4(%rdi),%ebx
-	addl	8(%rdi),%ecx
-	addl	12(%rdi),%edx
-	addl	16(%rdi),%r8d
-	addl	20(%rdi),%r9d
-	addl	24(%rdi),%r10d
-	addl	28(%rdi),%r11d
-
-	cmpq	64+16(%rsp),%rsi
-
-	movl	%eax,0(%rdi)
-	movl	%ebx,4(%rdi)
-	movl	%ecx,8(%rdi)
-	movl	%edx,12(%rdi)
-	movl	%r8d,16(%rdi)
-	movl	%r9d,20(%rdi)
-	movl	%r10d,24(%rdi)
-	movl	%r11d,28(%rdi)
+	movq	128+0(%rsp),%rdi
+	addq	%r14,%rax
+	leaq	128(%rsi),%rsi
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
 	jb	L$loop
 
-	movq	64+24(%rsp),%rsi
-	movq	(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
+	movq	152(%rsp),%rsi
+
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
 L$epilogue:
 	.byte	0xf3,0xc3
 
+
 .p2align	6
 
-K256:
-.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
-.long	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
-.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
-.long	0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
-.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
-.long	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
-.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
-.long	0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
-.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
-.long	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
-.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
-.long	0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
-.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
-.long	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
-.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
-.long	0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
-.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
-.long	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
-.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
-.long	0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
-.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
-.long	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
-.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
-.long	0xd192e819,0xd6990624,0xf40e3585,0x106aa070
-.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
-.long	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
-.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
-.long	0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
-.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
-.long	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
-.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
-.long	0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
-
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
-.long	0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f
-.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
-.long	0x03020100,0x0b0a0908,0xffffffff,0xffffffff
-.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
-.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
-.byte	83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
+K512:
+.quad	0x428a2f98d728ae22,0x7137449123ef65cd
+.quad	0x428a2f98d728ae22,0x7137449123ef65cd
+.quad	0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc
+.quad	0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc
+.quad	0x3956c25bf348b538,0x59f111f1b605d019
+.quad	0x3956c25bf348b538,0x59f111f1b605d019
+.quad	0x923f82a4af194f9b,0xab1c5ed5da6d8118
+.quad	0x923f82a4af194f9b,0xab1c5ed5da6d8118
+.quad	0xd807aa98a3030242,0x12835b0145706fbe
+.quad	0xd807aa98a3030242,0x12835b0145706fbe
+.quad	0x243185be4ee4b28c,0x550c7dc3d5ffb4e2
+.quad	0x243185be4ee4b28c,0x550c7dc3d5ffb4e2
+.quad	0x72be5d74f27b896f,0x80deb1fe3b1696b1
+.quad	0x72be5d74f27b896f,0x80deb1fe3b1696b1
+.quad	0x9bdc06a725c71235,0xc19bf174cf692694
+.quad	0x9bdc06a725c71235,0xc19bf174cf692694
+.quad	0xe49b69c19ef14ad2,0xefbe4786384f25e3
+.quad	0xe49b69c19ef14ad2,0xefbe4786384f25e3
+.quad	0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65
+.quad	0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65
+.quad	0x2de92c6f592b0275,0x4a7484aa6ea6e483
+.quad	0x2de92c6f592b0275,0x4a7484aa6ea6e483
+.quad	0x5cb0a9dcbd41fbd4,0x76f988da831153b5
+.quad	0x5cb0a9dcbd41fbd4,0x76f988da831153b5
+.quad	0x983e5152ee66dfab,0xa831c66d2db43210
+.quad	0x983e5152ee66dfab,0xa831c66d2db43210
+.quad	0xb00327c898fb213f,0xbf597fc7beef0ee4
+.quad	0xb00327c898fb213f,0xbf597fc7beef0ee4
+.quad	0xc6e00bf33da88fc2,0xd5a79147930aa725
+.quad	0xc6e00bf33da88fc2,0xd5a79147930aa725
+.quad	0x06ca6351e003826f,0x142929670a0e6e70
+.quad	0x06ca6351e003826f,0x142929670a0e6e70
+.quad	0x27b70a8546d22ffc,0x2e1b21385c26c926
+.quad	0x27b70a8546d22ffc,0x2e1b21385c26c926
+.quad	0x4d2c6dfc5ac42aed,0x53380d139d95b3df
+.quad	0x4d2c6dfc5ac42aed,0x53380d139d95b3df
+.quad	0x650a73548baf63de,0x766a0abb3c77b2a8
+.quad	0x650a73548baf63de,0x766a0abb3c77b2a8
+.quad	0x81c2c92e47edaee6,0x92722c851482353b
+.quad	0x81c2c92e47edaee6,0x92722c851482353b
+.quad	0xa2bfe8a14cf10364,0xa81a664bbc423001
+.quad	0xa2bfe8a14cf10364,0xa81a664bbc423001
+.quad	0xc24b8b70d0f89791,0xc76c51a30654be30
+.quad	0xc24b8b70d0f89791,0xc76c51a30654be30
+.quad	0xd192e819d6ef5218,0xd69906245565a910
+.quad	0xd192e819d6ef5218,0xd69906245565a910
+.quad	0xf40e35855771202a,0x106aa07032bbd1b8
+.quad	0xf40e35855771202a,0x106aa07032bbd1b8
+.quad	0x19a4c116b8d2d0c8,0x1e376c085141ab53
+.quad	0x19a4c116b8d2d0c8,0x1e376c085141ab53
+.quad	0x2748774cdf8eeb99,0x34b0bcb5e19b48a8
+.quad	0x2748774cdf8eeb99,0x34b0bcb5e19b48a8
+.quad	0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb
+.quad	0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb
+.quad	0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3
+.quad	0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3
+.quad	0x748f82ee5defb2fc,0x78a5636f43172f60
+.quad	0x748f82ee5defb2fc,0x78a5636f43172f60
+.quad	0x84c87814a1f0ab72,0x8cc702081a6439ec
+.quad	0x84c87814a1f0ab72,0x8cc702081a6439ec
+.quad	0x90befffa23631e28,0xa4506cebde82bde9
+.quad	0x90befffa23631e28,0xa4506cebde82bde9
+.quad	0xbef9a3f7b2c67915,0xc67178f2e372532b
+.quad	0xbef9a3f7b2c67915,0xc67178f2e372532b
+.quad	0xca273eceea26619c,0xd186b8c721c0c207
+.quad	0xca273eceea26619c,0xd186b8c721c0c207
+.quad	0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178
+.quad	0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178
+.quad	0x06f067aa72176fba,0x0a637dc5a2c898a6
+.quad	0x06f067aa72176fba,0x0a637dc5a2c898a6
+.quad	0x113f9804bef90dae,0x1b710b35131c471b
+.quad	0x113f9804bef90dae,0x1b710b35131c471b
+.quad	0x28db77f523047d84,0x32caab7b40c72493
+.quad	0x28db77f523047d84,0x32caab7b40c72493
+.quad	0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
+.quad	0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
+.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a
+.quad	0x4cc5d4becb3e42b6,0x597f299cfc657e2a
+.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817
+.quad	0x5fcb6fab3ad6faec,0x6c44198c4a475817
+
+.quad	0x0001020304050607,0x08090a0b0c0d0e0f
+.quad	0x0001020304050607,0x08090a0b0c0d0e0f
+.byte	83,72,65,53,49,50,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 
 .p2align	6
-sha256_block_data_order_ssse3:
-L$ssse3_shortcut:
+sha512_block_data_order_xop:
+
+L$xop_shortcut:
+	movq	%rsp,%rax
+
 	pushq	%rbx
+
 	pushq	%rbp
+
 	pushq	%r12
+
 	pushq	%r13
+
 	pushq	%r14
+
 	pushq	%r15
-	movq	%rsp,%r11
+
 	shlq	$4,%rdx
-	subq	$96,%rsp
-	leaq	(%rsi,%rdx,4),%rdx
+	subq	$160,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
 	andq	$-64,%rsp
-	movq	%rdi,64+0(%rsp)
-	movq	%rsi,64+8(%rsp)
-	movq	%rdx,64+16(%rsp)
-	movq	%r11,64+24(%rsp)
-L$prologue_ssse3:
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-	movl	16(%rdi),%r8d
-	movl	20(%rdi),%r9d
-	movl	24(%rdi),%r10d
-	movl	28(%rdi),%r11d
-	movdqa	K256+512+32(%rip),%xmm8
-	movdqa	K256+512+64(%rip),%xmm9
-	jmp	L$loop_ssse3
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+
+L$prologue_xop:
+
+	vzeroupper
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	L$loop_xop
 .p2align	4
-L$loop_ssse3:
-	movdqa	K256+512(%rip),%xmm7
-	movdqu	0(%rsi),%xmm0
-	movdqu	16(%rsi),%xmm1
-	movdqu	32(%rsi),%xmm2
-	movdqu	48(%rsi),%xmm3
-.byte	102,15,56,0,199
-	leaq	K256(%rip),%rbp
-.byte	102,15,56,0,207
-	movdqa	0(%rbp),%xmm4
-.byte	102,15,56,0,215
-	movdqa	32(%rbp),%xmm5
-	paddd	%xmm0,%xmm4
-	movdqa	64(%rbp),%xmm6
-.byte	102,15,56,0,223
-	movdqa	96(%rbp),%xmm7
-	paddd	%xmm1,%xmm5
-	paddd	%xmm2,%xmm6
-	paddd	%xmm3,%xmm7
-	movdqa	%xmm4,0(%rsp)
-	movl	%eax,%r14d
-	movdqa	%xmm5,16(%rsp)
-	movl	%ebx,%edi
-	movdqa	%xmm6,32(%rsp)
-	xorl	%ecx,%edi
-	movdqa	%xmm7,48(%rsp)
-	movl	%r8d,%r13d
-	jmp	L$ssse3_00_47
+L$loop_xop:
+	vmovdqa	K512+1280(%rip),%xmm11
+	vmovdqu	0(%rsi),%xmm0
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vpshufb	%xmm11,%xmm0,%xmm0
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm11,%xmm1,%xmm1
+	vmovdqu	64(%rsi),%xmm4
+	vpshufb	%xmm11,%xmm2,%xmm2
+	vmovdqu	80(%rsi),%xmm5
+	vpshufb	%xmm11,%xmm3,%xmm3
+	vmovdqu	96(%rsi),%xmm6
+	vpshufb	%xmm11,%xmm4,%xmm4
+	vmovdqu	112(%rsi),%xmm7
+	vpshufb	%xmm11,%xmm5,%xmm5
+	vpaddq	-128(%rbp),%xmm0,%xmm8
+	vpshufb	%xmm11,%xmm6,%xmm6
+	vpaddq	-96(%rbp),%xmm1,%xmm9
+	vpshufb	%xmm11,%xmm7,%xmm7
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	vpaddq	-32(%rbp),%xmm3,%xmm11
+	vmovdqa	%xmm8,0(%rsp)
+	vpaddq	0(%rbp),%xmm4,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	vpaddq	32(%rbp),%xmm5,%xmm9
+	vmovdqa	%xmm10,32(%rsp)
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	vmovdqa	%xmm11,48(%rsp)
+	vpaddq	96(%rbp),%xmm7,%xmm11
+	vmovdqa	%xmm8,64(%rsp)
+	movq	%rax,%r14
+	vmovdqa	%xmm9,80(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%xmm10,96(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%xmm11,112(%rsp)
+	movq	%r8,%r13
+	jmp	L$xop_00_47
 
 .p2align	4
-L$ssse3_00_47:
-	subq	$-32*4,%rbp
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movdqa	%xmm1,%xmm4
-	movl	%r9d,%r12d
-	movdqa	%xmm3,%xmm7
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-.byte	102,15,58,15,224,4
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-.byte	102,15,58,15,250,4
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	0(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%ebx,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	paddd	%xmm7,%xmm0
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	psrld	$7,%xmm6
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	pshufd	$250,%xmm3,%xmm7
-	movl	%r8d,%r12d
-	pslld	$14,%xmm5
-	xorl	%edx,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	pslld	$11,%xmm5
-	addl	4(%rsp),%r10d
-	pxor	%xmm6,%xmm4
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	paddd	%xmm4,%xmm0
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	8(%rsp),%r9d
-.byte	102,65,15,56,0,248
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm0
-	addl	%r12d,%r9d
-	pshufd	$80,%xmm0,%xmm7
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	psrld	$10,%xmm7
-	movl	%ebx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	pxor	%xmm6,%xmm7
-	addl	12(%rsp),%r8d
-	movl	%r9d,%edi
-	movdqa	0(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	paddd	%xmm7,%xmm0
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	paddd	%xmm0,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	movdqa	%xmm6,0(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movdqa	%xmm2,%xmm4
-	movl	%ebx,%r12d
-	movdqa	%xmm0,%xmm7
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-.byte	102,15,58,15,225,4
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-.byte	102,15,58,15,251,4
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	16(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%r9d,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	paddd	%xmm7,%xmm1
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	psrld	$7,%xmm6
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	pshufd	$250,%xmm0,%xmm7
-	movl	%eax,%r12d
-	pslld	$14,%xmm5
-	xorl	%r11d,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	pslld	$11,%xmm5
-	addl	20(%rsp),%ecx
-	pxor	%xmm6,%xmm4
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	paddd	%xmm4,%xmm1
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	24(%rsp),%ebx
-.byte	102,65,15,56,0,248
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm1
-	addl	%r12d,%ebx
-	pshufd	$80,%xmm1,%xmm7
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	psrld	$10,%xmm7
-	movl	%r9d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	pxor	%xmm6,%xmm7
-	addl	28(%rsp),%eax
-	movl	%ebx,%edi
-	movdqa	32(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	paddd	%xmm7,%xmm1
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	paddd	%xmm1,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movdqa	%xmm6,16(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movdqa	%xmm3,%xmm4
-	movl	%r9d,%r12d
-	movdqa	%xmm1,%xmm7
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-.byte	102,15,58,15,226,4
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-.byte	102,15,58,15,248,4
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	32(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%ebx,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	paddd	%xmm7,%xmm2
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	psrld	$7,%xmm6
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	pshufd	$250,%xmm1,%xmm7
-	movl	%r8d,%r12d
-	pslld	$14,%xmm5
-	xorl	%edx,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	pslld	$11,%xmm5
-	addl	36(%rsp),%r10d
-	pxor	%xmm6,%xmm4
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	paddd	%xmm4,%xmm2
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	40(%rsp),%r9d
-.byte	102,65,15,56,0,248
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm2
-	addl	%r12d,%r9d
-	pshufd	$80,%xmm2,%xmm7
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	psrld	$10,%xmm7
-	movl	%ebx,%r13d
-	psrlq	$17,%xmm6
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	pxor	%xmm6,%xmm7
-	addl	44(%rsp),%r8d
-	movl	%r9d,%edi
-	movdqa	64(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	paddd	%xmm7,%xmm2
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	paddd	%xmm2,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	movdqa	%xmm6,32(%rsp)
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movdqa	%xmm0,%xmm4
-	movl	%ebx,%r12d
-	movdqa	%xmm2,%xmm7
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-.byte	102,15,58,15,227,4
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-.byte	102,15,58,15,249,4
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	48(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	movdqa	%xmm4,%xmm5
-	xorl	%r9d,%r15d
-	movdqa	%xmm4,%xmm6
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	psrld	$3,%xmm4
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	paddd	%xmm7,%xmm3
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	psrld	$7,%xmm6
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	pshufd	$250,%xmm2,%xmm7
-	movl	%eax,%r12d
-	pslld	$14,%xmm5
-	xorl	%r11d,%r13d
-	pxor	%xmm6,%xmm4
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	psrld	$11,%xmm6
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	pxor	%xmm5,%xmm4
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	pslld	$11,%xmm5
-	addl	52(%rsp),%ecx
-	pxor	%xmm6,%xmm4
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	movdqa	%xmm7,%xmm6
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	pxor	%xmm5,%xmm4
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	psrld	$10,%xmm7
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	paddd	%xmm4,%xmm3
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	psrlq	$2,%xmm6
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	pxor	%xmm6,%xmm7
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	56(%rsp),%ebx
-.byte	102,65,15,56,0,248
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	paddd	%xmm7,%xmm3
-	addl	%r12d,%ebx
-	pshufd	$80,%xmm3,%xmm7
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	movdqa	%xmm7,%xmm6
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	psrld	$10,%xmm7
-	movl	%r9d,%r13d
-	psrlq	$17,%xmm6
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	pxor	%xmm6,%xmm7
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	psrlq	$2,%xmm6
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	pxor	%xmm6,%xmm7
-	addl	60(%rsp),%eax
-	movl	%ebx,%edi
-	movdqa	96(%rbp),%xmm6
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-.byte	102,65,15,56,0,249
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	paddd	%xmm7,%xmm3
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	paddd	%xmm3,%xmm6
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movdqa	%xmm6,48(%rsp)
-	cmpb	$0,131(%rbp)
-	jne	L$ssse3_00_47
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movl	%r9d,%r12d
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	0(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	xorl	%ebx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	movl	%r8d,%r12d
-	xorl	%edx,%r13d
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	addl	4(%rsp),%r10d
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	8(%rsp),%r9d
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r9d
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	movl	%ebx,%r13d
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	addl	12(%rsp),%r8d
-	movl	%r9d,%edi
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movl	%ebx,%r12d
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	16(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	xorl	%r9d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	movl	%eax,%r12d
-	xorl	%r11d,%r13d
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	addl	20(%rsp),%ecx
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	24(%rsp),%ebx
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%ebx
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	movl	%r9d,%r13d
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	addl	28(%rsp),%eax
-	movl	%ebx,%edi
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%eax
-	movl	%r9d,%r12d
-	xorl	%r8d,%r13d
-	rorl	$9,%r14d
-	xorl	%r10d,%r12d
-	rorl	$5,%r13d
-	xorl	%eax,%r14d
-	andl	%r8d,%r12d
-	xorl	%r8d,%r13d
-	addl	32(%rsp),%r11d
-	movl	%eax,%r15d
-	rorl	$11,%r14d
-	xorl	%r10d,%r12d
-	xorl	%ebx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r11d
-	andl	%r15d,%edi
-	xorl	%eax,%r14d
-	addl	%r13d,%r11d
-	xorl	%ebx,%edi
-	addl	%r11d,%edx
-	rorl	$2,%r14d
-	addl	%edi,%r11d
-	movl	%edx,%r13d
-	addl	%r11d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r11d
-	movl	%r8d,%r12d
-	xorl	%edx,%r13d
-	rorl	$9,%r14d
-	xorl	%r9d,%r12d
-	rorl	$5,%r13d
-	xorl	%r11d,%r14d
-	andl	%edx,%r12d
-	xorl	%edx,%r13d
-	addl	36(%rsp),%r10d
-	movl	%r11d,%edi
-	rorl	$11,%r14d
-	xorl	%r9d,%r12d
-	xorl	%eax,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r10d
-	andl	%edi,%r15d
-	xorl	%r11d,%r14d
-	addl	%r13d,%r10d
-	xorl	%eax,%r15d
-	addl	%r10d,%ecx
-	rorl	$2,%r14d
-	addl	%r15d,%r10d
-	movl	%ecx,%r13d
-	addl	%r10d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r10d
-	movl	%edx,%r12d
-	xorl	%ecx,%r13d
-	rorl	$9,%r14d
-	xorl	%r8d,%r12d
-	rorl	$5,%r13d
-	xorl	%r10d,%r14d
-	andl	%ecx,%r12d
-	xorl	%ecx,%r13d
-	addl	40(%rsp),%r9d
-	movl	%r10d,%r15d
-	rorl	$11,%r14d
-	xorl	%r8d,%r12d
-	xorl	%r11d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%r9d
-	andl	%r15d,%edi
-	xorl	%r10d,%r14d
-	addl	%r13d,%r9d
-	xorl	%r11d,%edi
-	addl	%r9d,%ebx
-	rorl	$2,%r14d
-	addl	%edi,%r9d
-	movl	%ebx,%r13d
-	addl	%r9d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r9d
-	movl	%ecx,%r12d
-	xorl	%ebx,%r13d
-	rorl	$9,%r14d
-	xorl	%edx,%r12d
-	rorl	$5,%r13d
-	xorl	%r9d,%r14d
-	andl	%ebx,%r12d
-	xorl	%ebx,%r13d
-	addl	44(%rsp),%r8d
-	movl	%r9d,%edi
-	rorl	$11,%r14d
-	xorl	%edx,%r12d
-	xorl	%r10d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%r8d
-	andl	%edi,%r15d
-	xorl	%r9d,%r14d
-	addl	%r13d,%r8d
-	xorl	%r10d,%r15d
-	addl	%r8d,%eax
-	rorl	$2,%r14d
-	addl	%r15d,%r8d
-	movl	%eax,%r13d
-	addl	%r8d,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%r8d
-	movl	%ebx,%r12d
-	xorl	%eax,%r13d
-	rorl	$9,%r14d
-	xorl	%ecx,%r12d
-	rorl	$5,%r13d
-	xorl	%r8d,%r14d
-	andl	%eax,%r12d
-	xorl	%eax,%r13d
-	addl	48(%rsp),%edx
-	movl	%r8d,%r15d
-	rorl	$11,%r14d
-	xorl	%ecx,%r12d
-	xorl	%r9d,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%edx
-	andl	%r15d,%edi
-	xorl	%r8d,%r14d
-	addl	%r13d,%edx
-	xorl	%r9d,%edi
-	addl	%edx,%r11d
-	rorl	$2,%r14d
-	addl	%edi,%edx
-	movl	%r11d,%r13d
-	addl	%edx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%edx
-	movl	%eax,%r12d
-	xorl	%r11d,%r13d
-	rorl	$9,%r14d
-	xorl	%ebx,%r12d
-	rorl	$5,%r13d
-	xorl	%edx,%r14d
-	andl	%r11d,%r12d
-	xorl	%r11d,%r13d
-	addl	52(%rsp),%ecx
-	movl	%edx,%edi
-	rorl	$11,%r14d
-	xorl	%ebx,%r12d
-	xorl	%r8d,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%ecx
-	andl	%edi,%r15d
-	xorl	%edx,%r14d
-	addl	%r13d,%ecx
-	xorl	%r8d,%r15d
-	addl	%ecx,%r10d
-	rorl	$2,%r14d
-	addl	%r15d,%ecx
-	movl	%r10d,%r13d
-	addl	%ecx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ecx
-	movl	%r11d,%r12d
-	xorl	%r10d,%r13d
-	rorl	$9,%r14d
-	xorl	%eax,%r12d
-	rorl	$5,%r13d
-	xorl	%ecx,%r14d
-	andl	%r10d,%r12d
-	xorl	%r10d,%r13d
-	addl	56(%rsp),%ebx
-	movl	%ecx,%r15d
-	rorl	$11,%r14d
-	xorl	%eax,%r12d
-	xorl	%edx,%r15d
-	rorl	$6,%r13d
-	addl	%r12d,%ebx
-	andl	%r15d,%edi
-	xorl	%ecx,%r14d
-	addl	%r13d,%ebx
-	xorl	%edx,%edi
-	addl	%ebx,%r9d
-	rorl	$2,%r14d
-	addl	%edi,%ebx
-	movl	%r9d,%r13d
-	addl	%ebx,%r14d
-	rorl	$14,%r13d
-	movl	%r14d,%ebx
-	movl	%r10d,%r12d
-	xorl	%r9d,%r13d
-	rorl	$9,%r14d
-	xorl	%r11d,%r12d
-	rorl	$5,%r13d
-	xorl	%ebx,%r14d
-	andl	%r9d,%r12d
-	xorl	%r9d,%r13d
-	addl	60(%rsp),%eax
-	movl	%ebx,%edi
-	rorl	$11,%r14d
-	xorl	%r11d,%r12d
-	xorl	%ecx,%edi
-	rorl	$6,%r13d
-	addl	%r12d,%eax
-	andl	%edi,%r15d
-	xorl	%ebx,%r14d
-	addl	%r13d,%eax
-	xorl	%ecx,%r15d
-	addl	%eax,%r8d
-	rorl	$2,%r14d
-	addl	%r15d,%eax
-	movl	%r8d,%r13d
-	addl	%eax,%r14d
-	movq	64+0(%rsp),%rdi
-	movl	%r14d,%eax
-
-	addl	0(%rdi),%eax
-	leaq	64(%rsi),%rsi
-	addl	4(%rdi),%ebx
-	addl	8(%rdi),%ecx
-	addl	12(%rdi),%edx
-	addl	16(%rdi),%r8d
-	addl	20(%rdi),%r9d
-	addl	24(%rdi),%r10d
-	addl	28(%rdi),%r11d
-
-	cmpq	64+16(%rsp),%rsi
-
-	movl	%eax,0(%rdi)
-	movl	%ebx,4(%rdi)
-	movl	%ecx,8(%rdi)
-	movl	%edx,12(%rdi)
-	movl	%r8d,16(%rdi)
-	movl	%r9d,20(%rdi)
-	movl	%r10d,24(%rdi)
-	movl	%r11d,28(%rdi)
-	jb	L$loop_ssse3
-
-	movq	64+24(%rsp),%rsi
-	movq	(%rsi),%r15
-	movq	8(%rsi),%r14
-	movq	16(%rsi),%r13
-	movq	24(%rsi),%r12
-	movq	32(%rsi),%rbp
-	movq	40(%rsi),%rbx
-	leaq	48(%rsi),%rsp
-L$epilogue_ssse3:
+L$xop_00_47:
+	addq	$256,%rbp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm4,%xmm5,%xmm11
+	movq	%r9,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	vpaddq	%xmm11,%xmm0,%xmm0
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,223,3
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm7,%xmm10
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpaddq	%xmm8,%xmm0,%xmm0
+	movq	%rdx,%r13
+	addq	%r11,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r11
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpaddq	%xmm11,%xmm0,%xmm0
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	vpaddq	-128(%rbp),%xmm0,%xmm10
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,0(%rsp)
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm5,%xmm6,%xmm11
+	movq	%rdx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	vpaddq	%xmm11,%xmm1,%xmm1
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,216,3
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm0,%xmm10
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpaddq	%xmm8,%xmm1,%xmm1
+	movq	%rbx,%r13
+	addq	%r9,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r9
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpaddq	%xmm11,%xmm1,%xmm1
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	vpaddq	-96(%rbp),%xmm1,%xmm10
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,16(%rsp)
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm6,%xmm7,%xmm11
+	movq	%rbx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	vpaddq	%xmm11,%xmm2,%xmm2
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,217,3
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm1,%xmm10
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpaddq	%xmm8,%xmm2,%xmm2
+	movq	%r11,%r13
+	addq	%rdx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpaddq	%xmm11,%xmm2,%xmm2
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,32(%rsp)
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm7,%xmm0,%xmm11
+	movq	%r11,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	vpaddq	%xmm11,%xmm3,%xmm3
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,218,3
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm2,%xmm10
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpaddq	%xmm8,%xmm3,%xmm3
+	movq	%r9,%r13
+	addq	%rbx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpaddq	%xmm11,%xmm3,%xmm3
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	vpaddq	-32(%rbp),%xmm3,%xmm10
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,48(%rsp)
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm0,%xmm1,%xmm11
+	movq	%r9,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	vpaddq	%xmm11,%xmm4,%xmm4
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,219,3
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm3,%xmm10
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpaddq	%xmm8,%xmm4,%xmm4
+	movq	%rdx,%r13
+	addq	%r11,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r11
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpaddq	%xmm11,%xmm4,%xmm4
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	vpaddq	0(%rbp),%xmm4,%xmm10
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,64(%rsp)
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm1,%xmm2,%xmm11
+	movq	%rdx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	vpaddq	%xmm11,%xmm5,%xmm5
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+.byte	143,72,120,195,209,7
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,220,3
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm4,%xmm10
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpaddq	%xmm8,%xmm5,%xmm5
+	movq	%rbx,%r13
+	addq	%r9,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%r9
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpaddq	%xmm11,%xmm5,%xmm5
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	vpaddq	32(%rbp),%xmm5,%xmm10
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,80(%rsp)
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm2,%xmm3,%xmm11
+	movq	%rbx,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	vpaddq	%xmm11,%xmm6,%xmm6
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,221,3
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm5,%xmm10
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpaddq	%xmm8,%xmm6,%xmm6
+	movq	%r11,%r13
+	addq	%rdx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpaddq	%xmm11,%xmm6,%xmm6
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,96(%rsp)
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm3,%xmm4,%xmm11
+	movq	%r11,%r12
+	rorq	$5,%r14
+.byte	143,72,120,195,200,56
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpsrlq	$7,%xmm8,%xmm8
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	vpaddq	%xmm11,%xmm7,%xmm7
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+.byte	143,72,120,195,209,7
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	vpxor	%xmm9,%xmm8,%xmm8
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+.byte	143,104,120,195,222,3
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	vpsrlq	$6,%xmm6,%xmm10
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpaddq	%xmm8,%xmm7,%xmm7
+	movq	%r9,%r13
+	addq	%rbx,%r14
+.byte	143,72,120,195,203,42
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	vpxor	%xmm10,%xmm11,%xmm11
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm9,%xmm11,%xmm11
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpaddq	%xmm11,%xmm7,%xmm7
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	vpaddq	96(%rbp),%xmm7,%xmm10
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,112(%rsp)
+	cmpb	$0,135(%rbp)
+	jne	L$xop_00_47
+	rorq	$23,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	rorq	$5,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	rorq	$23,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	rorq	$5,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	rorq	$23,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	rorq	$23,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	rorq	$5,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	rorq	$5,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	rorq	$23,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	rorq	$5,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	rorq	$4,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	rorq	$6,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	rorq	$28,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	rorq	$23,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	rorq	$5,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	rorq	$4,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	rorq	$6,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	rorq	$28,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	rorq	$23,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	rorq	$5,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	rorq	$4,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	rorq	$6,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	rorq	$28,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	rorq	$23,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	rorq	$5,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	rorq	$4,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	rorq	$6,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	rorq	$28,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	rorq	$23,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	rorq	$5,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	rorq	$4,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	rorq	$6,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	rorq	$28,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	rorq	$5,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	rorq	$4,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	rorq	$6,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	rorq	$28,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	rorq	$5,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	rorq	$4,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	rorq	$6,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	rorq	$14,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	rorq	$28,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	rorq	$23,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	rorq	$5,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	rorq	$4,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	rorq	$6,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	rorq	$14,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	rorq	$28,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	movq	128+0(%rsp),%rdi
+	movq	%r14,%rax
+
+	addq	0(%rdi),%rax
+	leaq	128(%rsi),%rsi
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+	jb	L$loop_xop
+
+	movq	152(%rsp),%rsi
+
+	vzeroupper
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+L$epilogue_xop:
+	.byte	0xf3,0xc3
+
+
+
+.p2align	6
+sha512_block_data_order_avx:
+
+L$avx_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	shlq	$4,%rdx
+	subq	$160,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
+	andq	$-64,%rsp
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+
+L$prologue_avx:
+
+	vzeroupper
+	movq	0(%rdi),%rax
+	movq	8(%rdi),%rbx
+	movq	16(%rdi),%rcx
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	L$loop_avx
+.p2align	4
+L$loop_avx:
+	vmovdqa	K512+1280(%rip),%xmm11
+	vmovdqu	0(%rsi),%xmm0
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	16(%rsi),%xmm1
+	vmovdqu	32(%rsi),%xmm2
+	vpshufb	%xmm11,%xmm0,%xmm0
+	vmovdqu	48(%rsi),%xmm3
+	vpshufb	%xmm11,%xmm1,%xmm1
+	vmovdqu	64(%rsi),%xmm4
+	vpshufb	%xmm11,%xmm2,%xmm2
+	vmovdqu	80(%rsi),%xmm5
+	vpshufb	%xmm11,%xmm3,%xmm3
+	vmovdqu	96(%rsi),%xmm6
+	vpshufb	%xmm11,%xmm4,%xmm4
+	vmovdqu	112(%rsi),%xmm7
+	vpshufb	%xmm11,%xmm5,%xmm5
+	vpaddq	-128(%rbp),%xmm0,%xmm8
+	vpshufb	%xmm11,%xmm6,%xmm6
+	vpaddq	-96(%rbp),%xmm1,%xmm9
+	vpshufb	%xmm11,%xmm7,%xmm7
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	vpaddq	-32(%rbp),%xmm3,%xmm11
+	vmovdqa	%xmm8,0(%rsp)
+	vpaddq	0(%rbp),%xmm4,%xmm8
+	vmovdqa	%xmm9,16(%rsp)
+	vpaddq	32(%rbp),%xmm5,%xmm9
+	vmovdqa	%xmm10,32(%rsp)
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	vmovdqa	%xmm11,48(%rsp)
+	vpaddq	96(%rbp),%xmm7,%xmm11
+	vmovdqa	%xmm8,64(%rsp)
+	movq	%rax,%r14
+	vmovdqa	%xmm9,80(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%xmm10,96(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%xmm11,112(%rsp)
+	movq	%r8,%r13
+	jmp	L$avx_00_47
+
+.p2align	4
+L$avx_00_47:
+	addq	$256,%rbp
+	vpalignr	$8,%xmm0,%xmm1,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm4,%xmm5,%xmm11
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpaddq	%xmm11,%xmm0,%xmm0
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm7,%xmm11
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	vpsllq	$3,%xmm7,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	vpaddq	%xmm8,%xmm0,%xmm0
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm7,%xmm9
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm0,%xmm0
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	vpaddq	-128(%rbp),%xmm0,%xmm10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,0(%rsp)
+	vpalignr	$8,%xmm1,%xmm2,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm5,%xmm6,%xmm11
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpaddq	%xmm11,%xmm1,%xmm1
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm0,%xmm11
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	vpsllq	$3,%xmm0,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	vpaddq	%xmm8,%xmm1,%xmm1
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm0,%xmm9
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm1,%xmm1
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	vpaddq	-96(%rbp),%xmm1,%xmm10
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,16(%rsp)
+	vpalignr	$8,%xmm2,%xmm3,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm6,%xmm7,%xmm11
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpaddq	%xmm11,%xmm2,%xmm2
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm1,%xmm11
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	vpsllq	$3,%xmm1,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	vpaddq	%xmm8,%xmm2,%xmm2
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm1,%xmm9
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm2,%xmm2
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	vpaddq	-64(%rbp),%xmm2,%xmm10
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,32(%rsp)
+	vpalignr	$8,%xmm3,%xmm4,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm7,%xmm0,%xmm11
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpaddq	%xmm11,%xmm3,%xmm3
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm2,%xmm11
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	vpsllq	$3,%xmm2,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	vpaddq	%xmm8,%xmm3,%xmm3
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm2,%xmm9
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm3,%xmm3
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	vpaddq	-32(%rbp),%xmm3,%xmm10
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,48(%rsp)
+	vpalignr	$8,%xmm4,%xmm5,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	vpalignr	$8,%xmm0,%xmm1,%xmm11
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	vpaddq	%xmm11,%xmm4,%xmm4
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm3,%xmm11
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	vpsllq	$3,%xmm3,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	vpaddq	%xmm8,%xmm4,%xmm4
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm3,%xmm9
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm4,%xmm4
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	vpaddq	0(%rbp),%xmm4,%xmm10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	vmovdqa	%xmm10,64(%rsp)
+	vpalignr	$8,%xmm5,%xmm6,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	vpalignr	$8,%xmm1,%xmm2,%xmm11
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	vpaddq	%xmm11,%xmm5,%xmm5
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm4,%xmm11
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	vpsllq	$3,%xmm4,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	vpaddq	%xmm8,%xmm5,%xmm5
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm4,%xmm9
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm5,%xmm5
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	vpaddq	32(%rbp),%xmm5,%xmm10
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	vmovdqa	%xmm10,80(%rsp)
+	vpalignr	$8,%xmm6,%xmm7,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	vpalignr	$8,%xmm2,%xmm3,%xmm11
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	vpaddq	%xmm11,%xmm6,%xmm6
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm5,%xmm11
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	vpsllq	$3,%xmm5,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	vpaddq	%xmm8,%xmm6,%xmm6
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm5,%xmm9
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm6,%xmm6
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	vpaddq	64(%rbp),%xmm6,%xmm10
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	vmovdqa	%xmm10,96(%rsp)
+	vpalignr	$8,%xmm7,%xmm0,%xmm8
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	vpalignr	$8,%xmm3,%xmm4,%xmm11
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$1,%xmm8,%xmm10
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	vpaddq	%xmm11,%xmm7,%xmm7
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	vpsrlq	$7,%xmm8,%xmm11
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	vpsllq	$56,%xmm8,%xmm9
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	vpxor	%xmm10,%xmm11,%xmm8
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	vpsrlq	$7,%xmm10,%xmm10
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	vpsllq	$7,%xmm9,%xmm9
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	vpxor	%xmm10,%xmm8,%xmm8
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	vpsrlq	$6,%xmm6,%xmm11
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	vpxor	%xmm9,%xmm8,%xmm8
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	vpsllq	$3,%xmm6,%xmm10
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	vpaddq	%xmm8,%xmm7,%xmm7
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	vpsrlq	$19,%xmm6,%xmm9
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	vpxor	%xmm10,%xmm11,%xmm11
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	vpsllq	$42,%xmm10,%xmm10
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	vpxor	%xmm9,%xmm11,%xmm11
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	vpsrlq	$42,%xmm9,%xmm9
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	vpxor	%xmm10,%xmm11,%xmm11
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	vpxor	%xmm9,%xmm11,%xmm11
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	vpaddq	%xmm11,%xmm7,%xmm7
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	vpaddq	96(%rbp),%xmm7,%xmm10
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	vmovdqa	%xmm10,112(%rsp)
+	cmpb	$0,135(%rbp)
+	jne	L$avx_00_47
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	0(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	8(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	16(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	24(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	32(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	40(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	48(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	56(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rax
+	movq	%r9,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r8,%r13
+	xorq	%r10,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rax,%r14
+	andq	%r8,%r12
+	xorq	%r8,%r13
+	addq	64(%rsp),%r11
+	movq	%rax,%r15
+	xorq	%r10,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rbx,%r15
+	addq	%r12,%r11
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rax,%r14
+	addq	%r13,%r11
+	xorq	%rbx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r11,%rdx
+	addq	%rdi,%r11
+	movq	%rdx,%r13
+	addq	%r11,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r11
+	movq	%r8,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rdx,%r13
+	xorq	%r9,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r11,%r14
+	andq	%rdx,%r12
+	xorq	%rdx,%r13
+	addq	72(%rsp),%r10
+	movq	%r11,%rdi
+	xorq	%r9,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rax,%rdi
+	addq	%r12,%r10
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r11,%r14
+	addq	%r13,%r10
+	xorq	%rax,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r10,%rcx
+	addq	%r15,%r10
+	movq	%rcx,%r13
+	addq	%r10,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r10
+	movq	%rdx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rcx,%r13
+	xorq	%r8,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r10,%r14
+	andq	%rcx,%r12
+	xorq	%rcx,%r13
+	addq	80(%rsp),%r9
+	movq	%r10,%r15
+	xorq	%r8,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r11,%r15
+	addq	%r12,%r9
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r10,%r14
+	addq	%r13,%r9
+	xorq	%r11,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%r9,%rbx
+	addq	%rdi,%r9
+	movq	%rbx,%r13
+	addq	%r9,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r9
+	movq	%rcx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rbx,%r13
+	xorq	%rdx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r9,%r14
+	andq	%rbx,%r12
+	xorq	%rbx,%r13
+	addq	88(%rsp),%r8
+	movq	%r9,%rdi
+	xorq	%rdx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r10,%rdi
+	addq	%r12,%r8
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%r9,%r14
+	addq	%r13,%r8
+	xorq	%r10,%r15
+	shrdq	$28,%r14,%r14
+	addq	%r8,%rax
+	addq	%r15,%r8
+	movq	%rax,%r13
+	addq	%r8,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%r8
+	movq	%rbx,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%rax,%r13
+	xorq	%rcx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%r8,%r14
+	andq	%rax,%r12
+	xorq	%rax,%r13
+	addq	96(%rsp),%rdx
+	movq	%r8,%r15
+	xorq	%rcx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r9,%r15
+	addq	%r12,%rdx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%r8,%r14
+	addq	%r13,%rdx
+	xorq	%r9,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rdx,%r11
+	addq	%rdi,%rdx
+	movq	%r11,%r13
+	addq	%rdx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rdx
+	movq	%rax,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r11,%r13
+	xorq	%rbx,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rdx,%r14
+	andq	%r11,%r12
+	xorq	%r11,%r13
+	addq	104(%rsp),%rcx
+	movq	%rdx,%rdi
+	xorq	%rbx,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%r8,%rdi
+	addq	%r12,%rcx
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rdx,%r14
+	addq	%r13,%rcx
+	xorq	%r8,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rcx,%r10
+	addq	%r15,%rcx
+	movq	%r10,%r13
+	addq	%rcx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rcx
+	movq	%r11,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r10,%r13
+	xorq	%rax,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rcx,%r14
+	andq	%r10,%r12
+	xorq	%r10,%r13
+	addq	112(%rsp),%rbx
+	movq	%rcx,%r15
+	xorq	%rax,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rdx,%r15
+	addq	%r12,%rbx
+	shrdq	$14,%r13,%r13
+	andq	%r15,%rdi
+	xorq	%rcx,%r14
+	addq	%r13,%rbx
+	xorq	%rdx,%rdi
+	shrdq	$28,%r14,%r14
+	addq	%rbx,%r9
+	addq	%rdi,%rbx
+	movq	%r9,%r13
+	addq	%rbx,%r14
+	shrdq	$23,%r13,%r13
+	movq	%r14,%rbx
+	movq	%r10,%r12
+	shrdq	$5,%r14,%r14
+	xorq	%r9,%r13
+	xorq	%r11,%r12
+	shrdq	$4,%r13,%r13
+	xorq	%rbx,%r14
+	andq	%r9,%r12
+	xorq	%r9,%r13
+	addq	120(%rsp),%rax
+	movq	%rbx,%rdi
+	xorq	%r11,%r12
+	shrdq	$6,%r14,%r14
+	xorq	%rcx,%rdi
+	addq	%r12,%rax
+	shrdq	$14,%r13,%r13
+	andq	%rdi,%r15
+	xorq	%rbx,%r14
+	addq	%r13,%rax
+	xorq	%rcx,%r15
+	shrdq	$28,%r14,%r14
+	addq	%rax,%r8
+	addq	%r15,%rax
+	movq	%r8,%r13
+	addq	%rax,%r14
+	movq	128+0(%rsp),%rdi
+	movq	%r14,%rax
+
+	addq	0(%rdi),%rax
+	leaq	128(%rsi),%rsi
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+	jb	L$loop_avx
+
+	movq	152(%rsp),%rsi
+
+	vzeroupper
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+L$epilogue_avx:
+	.byte	0xf3,0xc3
+
+
+
+.p2align	6
+sha512_block_data_order_avx2:
+
+L$avx2_shortcut:
+	movq	%rsp,%rax
+
+	pushq	%rbx
+
+	pushq	%rbp
+
+	pushq	%r12
+
+	pushq	%r13
+
+	pushq	%r14
+
+	pushq	%r15
+
+	subq	$1312,%rsp
+	shlq	$4,%rdx
+	andq	$-2048,%rsp
+	leaq	(%rsi,%rdx,8),%rdx
+	addq	$1152,%rsp
+	movq	%rdi,128+0(%rsp)
+	movq	%rsi,128+8(%rsp)
+	movq	%rdx,128+16(%rsp)
+	movq	%rax,152(%rsp)
+
+L$prologue_avx2:
+
+	vzeroupper
+	subq	$-128,%rsi
+	movq	0(%rdi),%rax
+	movq	%rsi,%r12
+	movq	8(%rdi),%rbx
+	cmpq	%rdx,%rsi
+	movq	16(%rdi),%rcx
+	cmoveq	%rsp,%r12
+	movq	24(%rdi),%rdx
+	movq	32(%rdi),%r8
+	movq	40(%rdi),%r9
+	movq	48(%rdi),%r10
+	movq	56(%rdi),%r11
+	jmp	L$oop_avx2
+.p2align	4
+L$oop_avx2:
+	vmovdqu	-128(%rsi),%xmm0
+	vmovdqu	-128+16(%rsi),%xmm1
+	vmovdqu	-128+32(%rsi),%xmm2
+	leaq	K512+128(%rip),%rbp
+	vmovdqu	-128+48(%rsi),%xmm3
+	vmovdqu	-128+64(%rsi),%xmm4
+	vmovdqu	-128+80(%rsi),%xmm5
+	vmovdqu	-128+96(%rsi),%xmm6
+	vmovdqu	-128+112(%rsi),%xmm7
+
+	vmovdqa	1152(%rbp),%ymm10
+	vinserti128	$1,(%r12),%ymm0,%ymm0
+	vinserti128	$1,16(%r12),%ymm1,%ymm1
+	vpshufb	%ymm10,%ymm0,%ymm0
+	vinserti128	$1,32(%r12),%ymm2,%ymm2
+	vpshufb	%ymm10,%ymm1,%ymm1
+	vinserti128	$1,48(%r12),%ymm3,%ymm3
+	vpshufb	%ymm10,%ymm2,%ymm2
+	vinserti128	$1,64(%r12),%ymm4,%ymm4
+	vpshufb	%ymm10,%ymm3,%ymm3
+	vinserti128	$1,80(%r12),%ymm5,%ymm5
+	vpshufb	%ymm10,%ymm4,%ymm4
+	vinserti128	$1,96(%r12),%ymm6,%ymm6
+	vpshufb	%ymm10,%ymm5,%ymm5
+	vinserti128	$1,112(%r12),%ymm7,%ymm7
+
+	vpaddq	-128(%rbp),%ymm0,%ymm8
+	vpshufb	%ymm10,%ymm6,%ymm6
+	vpaddq	-96(%rbp),%ymm1,%ymm9
+	vpshufb	%ymm10,%ymm7,%ymm7
+	vpaddq	-64(%rbp),%ymm2,%ymm10
+	vpaddq	-32(%rbp),%ymm3,%ymm11
+	vmovdqa	%ymm8,0(%rsp)
+	vpaddq	0(%rbp),%ymm4,%ymm8
+	vmovdqa	%ymm9,32(%rsp)
+	vpaddq	32(%rbp),%ymm5,%ymm9
+	vmovdqa	%ymm10,64(%rsp)
+	vpaddq	64(%rbp),%ymm6,%ymm10
+	vmovdqa	%ymm11,96(%rsp)
+	leaq	-128(%rsp),%rsp
+	vpaddq	96(%rbp),%ymm7,%ymm11
+	vmovdqa	%ymm8,0(%rsp)
+	xorq	%r14,%r14
+	vmovdqa	%ymm9,32(%rsp)
+	movq	%rbx,%rdi
+	vmovdqa	%ymm10,64(%rsp)
+	xorq	%rcx,%rdi
+	vmovdqa	%ymm11,96(%rsp)
+	movq	%r9,%r12
+	addq	$32*8,%rbp
+	jmp	L$avx2_00_47
+
+.p2align	4
+L$avx2_00_47:
+	leaq	-128(%rsp),%rsp
+	vpalignr	$8,%ymm0,%ymm1,%ymm8
+	addq	0+256(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	vpalignr	$8,%ymm4,%ymm5,%ymm11
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	vpaddq	%ymm11,%ymm0,%ymm0
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	vpsrlq	$6,%ymm7,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	vpsllq	$3,%ymm7,%ymm10
+	vpaddq	%ymm8,%ymm0,%ymm0
+	addq	8+256(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	vpsrlq	$19,%ymm7,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	vpaddq	%ymm11,%ymm0,%ymm0
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	vpaddq	-128(%rbp),%ymm0,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	vmovdqa	%ymm10,0(%rsp)
+	vpalignr	$8,%ymm1,%ymm2,%ymm8
+	addq	32+256(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	vpalignr	$8,%ymm5,%ymm6,%ymm11
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	vpaddq	%ymm11,%ymm1,%ymm1
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	vpsrlq	$6,%ymm0,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	vpsllq	$3,%ymm0,%ymm10
+	vpaddq	%ymm8,%ymm1,%ymm1
+	addq	40+256(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	vpsrlq	$19,%ymm0,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	vpaddq	%ymm11,%ymm1,%ymm1
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	vpaddq	-96(%rbp),%ymm1,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	vmovdqa	%ymm10,32(%rsp)
+	vpalignr	$8,%ymm2,%ymm3,%ymm8
+	addq	64+256(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	vpalignr	$8,%ymm6,%ymm7,%ymm11
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	vpaddq	%ymm11,%ymm2,%ymm2
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	vpsrlq	$6,%ymm1,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	vpsllq	$3,%ymm1,%ymm10
+	vpaddq	%ymm8,%ymm2,%ymm2
+	addq	72+256(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	vpsrlq	$19,%ymm1,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	vpaddq	%ymm11,%ymm2,%ymm2
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	vpaddq	-64(%rbp),%ymm2,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	vmovdqa	%ymm10,64(%rsp)
+	vpalignr	$8,%ymm3,%ymm4,%ymm8
+	addq	96+256(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	vpalignr	$8,%ymm7,%ymm0,%ymm11
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	vpaddq	%ymm11,%ymm3,%ymm3
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	vpsrlq	$6,%ymm2,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	vpsllq	$3,%ymm2,%ymm10
+	vpaddq	%ymm8,%ymm3,%ymm3
+	addq	104+256(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	vpsrlq	$19,%ymm2,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	vpaddq	%ymm11,%ymm3,%ymm3
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	vpaddq	-32(%rbp),%ymm3,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	vmovdqa	%ymm10,96(%rsp)
+	leaq	-128(%rsp),%rsp
+	vpalignr	$8,%ymm4,%ymm5,%ymm8
+	addq	0+256(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	vpalignr	$8,%ymm0,%ymm1,%ymm11
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	vpaddq	%ymm11,%ymm4,%ymm4
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	vpsrlq	$6,%ymm3,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	vpsllq	$3,%ymm3,%ymm10
+	vpaddq	%ymm8,%ymm4,%ymm4
+	addq	8+256(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	vpsrlq	$19,%ymm3,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	vpaddq	%ymm11,%ymm4,%ymm4
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	vpaddq	0(%rbp),%ymm4,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	vmovdqa	%ymm10,0(%rsp)
+	vpalignr	$8,%ymm5,%ymm6,%ymm8
+	addq	32+256(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	vpalignr	$8,%ymm1,%ymm2,%ymm11
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	vpaddq	%ymm11,%ymm5,%ymm5
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	vpsrlq	$6,%ymm4,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	vpsllq	$3,%ymm4,%ymm10
+	vpaddq	%ymm8,%ymm5,%ymm5
+	addq	40+256(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	vpsrlq	$19,%ymm4,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	vpaddq	%ymm11,%ymm5,%ymm5
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	vpaddq	32(%rbp),%ymm5,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	vmovdqa	%ymm10,32(%rsp)
+	vpalignr	$8,%ymm6,%ymm7,%ymm8
+	addq	64+256(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	vpalignr	$8,%ymm2,%ymm3,%ymm11
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	vpaddq	%ymm11,%ymm6,%ymm6
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	vpsrlq	$6,%ymm5,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	vpsllq	$3,%ymm5,%ymm10
+	vpaddq	%ymm8,%ymm6,%ymm6
+	addq	72+256(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	vpsrlq	$19,%ymm5,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	vpaddq	%ymm11,%ymm6,%ymm6
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	vpaddq	64(%rbp),%ymm6,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	vmovdqa	%ymm10,64(%rsp)
+	vpalignr	$8,%ymm7,%ymm0,%ymm8
+	addq	96+256(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	vpalignr	$8,%ymm3,%ymm4,%ymm11
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	vpsrlq	$1,%ymm8,%ymm10
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	vpaddq	%ymm11,%ymm7,%ymm7
+	vpsrlq	$7,%ymm8,%ymm11
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	vpsllq	$56,%ymm8,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm8
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	vpsrlq	$7,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm8,%ymm8
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	vpsllq	$7,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm8,%ymm8
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	vpsrlq	$6,%ymm6,%ymm11
+	vpxor	%ymm9,%ymm8,%ymm8
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	vpsllq	$3,%ymm6,%ymm10
+	vpaddq	%ymm8,%ymm7,%ymm7
+	addq	104+256(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	vpsrlq	$19,%ymm6,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	vpsllq	$42,%ymm10,%ymm10
+	vpxor	%ymm9,%ymm11,%ymm11
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	vpsrlq	$42,%ymm9,%ymm9
+	vpxor	%ymm10,%ymm11,%ymm11
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	vpxor	%ymm9,%ymm11,%ymm11
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	vpaddq	%ymm11,%ymm7,%ymm7
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	vpaddq	96(%rbp),%ymm7,%ymm10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	vmovdqa	%ymm10,96(%rsp)
+	leaq	256(%rbp),%rbp
+	cmpb	$0,-121(%rbp)
+	jne	L$avx2_00_47
+	addq	0+128(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8+128(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32+128(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40+128(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64+128(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72+128(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96+128(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104+128(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	addq	0(%rsp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8(%rsp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32(%rsp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40(%rsp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64(%rsp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72(%rsp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96(%rsp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104(%rsp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	movq	1280(%rsp),%rdi
+	addq	%r14,%rax
+
+	leaq	1152(%rsp),%rbp
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	addq	48(%rdi),%r10
+	addq	56(%rdi),%r11
+
+	movq	%rax,0(%rdi)
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+
+	cmpq	144(%rbp),%rsi
+	je	L$done_avx2
+
+	xorq	%r14,%r14
+	movq	%rbx,%rdi
+	xorq	%rcx,%rdi
+	movq	%r9,%r12
+	jmp	L$ower_avx2
+.p2align	4
+L$ower_avx2:
+	addq	0+16(%rbp),%r11
+	andq	%r8,%r12
+	rorxq	$41,%r8,%r13
+	rorxq	$18,%r8,%r15
+	leaq	(%rax,%r14,1),%rax
+	leaq	(%r11,%r12,1),%r11
+	andnq	%r10,%r8,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r8,%r14
+	leaq	(%r11,%r12,1),%r11
+	xorq	%r14,%r13
+	movq	%rax,%r15
+	rorxq	$39,%rax,%r12
+	leaq	(%r11,%r13,1),%r11
+	xorq	%rbx,%r15
+	rorxq	$34,%rax,%r14
+	rorxq	$28,%rax,%r13
+	leaq	(%rdx,%r11,1),%rdx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rbx,%rdi
+	xorq	%r13,%r14
+	leaq	(%r11,%rdi,1),%r11
+	movq	%r8,%r12
+	addq	8+16(%rbp),%r10
+	andq	%rdx,%r12
+	rorxq	$41,%rdx,%r13
+	rorxq	$18,%rdx,%rdi
+	leaq	(%r11,%r14,1),%r11
+	leaq	(%r10,%r12,1),%r10
+	andnq	%r9,%rdx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rdx,%r14
+	leaq	(%r10,%r12,1),%r10
+	xorq	%r14,%r13
+	movq	%r11,%rdi
+	rorxq	$39,%r11,%r12
+	leaq	(%r10,%r13,1),%r10
+	xorq	%rax,%rdi
+	rorxq	$34,%r11,%r14
+	rorxq	$28,%r11,%r13
+	leaq	(%rcx,%r10,1),%rcx
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rax,%r15
+	xorq	%r13,%r14
+	leaq	(%r10,%r15,1),%r10
+	movq	%rdx,%r12
+	addq	32+16(%rbp),%r9
+	andq	%rcx,%r12
+	rorxq	$41,%rcx,%r13
+	rorxq	$18,%rcx,%r15
+	leaq	(%r10,%r14,1),%r10
+	leaq	(%r9,%r12,1),%r9
+	andnq	%r8,%rcx,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rcx,%r14
+	leaq	(%r9,%r12,1),%r9
+	xorq	%r14,%r13
+	movq	%r10,%r15
+	rorxq	$39,%r10,%r12
+	leaq	(%r9,%r13,1),%r9
+	xorq	%r11,%r15
+	rorxq	$34,%r10,%r14
+	rorxq	$28,%r10,%r13
+	leaq	(%rbx,%r9,1),%rbx
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r11,%rdi
+	xorq	%r13,%r14
+	leaq	(%r9,%rdi,1),%r9
+	movq	%rcx,%r12
+	addq	40+16(%rbp),%r8
+	andq	%rbx,%r12
+	rorxq	$41,%rbx,%r13
+	rorxq	$18,%rbx,%rdi
+	leaq	(%r9,%r14,1),%r9
+	leaq	(%r8,%r12,1),%r8
+	andnq	%rdx,%rbx,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%rbx,%r14
+	leaq	(%r8,%r12,1),%r8
+	xorq	%r14,%r13
+	movq	%r9,%rdi
+	rorxq	$39,%r9,%r12
+	leaq	(%r8,%r13,1),%r8
+	xorq	%r10,%rdi
+	rorxq	$34,%r9,%r14
+	rorxq	$28,%r9,%r13
+	leaq	(%rax,%r8,1),%rax
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r10,%r15
+	xorq	%r13,%r14
+	leaq	(%r8,%r15,1),%r8
+	movq	%rbx,%r12
+	addq	64+16(%rbp),%rdx
+	andq	%rax,%r12
+	rorxq	$41,%rax,%r13
+	rorxq	$18,%rax,%r15
+	leaq	(%r8,%r14,1),%r8
+	leaq	(%rdx,%r12,1),%rdx
+	andnq	%rcx,%rax,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%rax,%r14
+	leaq	(%rdx,%r12,1),%rdx
+	xorq	%r14,%r13
+	movq	%r8,%r15
+	rorxq	$39,%r8,%r12
+	leaq	(%rdx,%r13,1),%rdx
+	xorq	%r9,%r15
+	rorxq	$34,%r8,%r14
+	rorxq	$28,%r8,%r13
+	leaq	(%r11,%rdx,1),%r11
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%r9,%rdi
+	xorq	%r13,%r14
+	leaq	(%rdx,%rdi,1),%rdx
+	movq	%rax,%r12
+	addq	72+16(%rbp),%rcx
+	andq	%r11,%r12
+	rorxq	$41,%r11,%r13
+	rorxq	$18,%r11,%rdi
+	leaq	(%rdx,%r14,1),%rdx
+	leaq	(%rcx,%r12,1),%rcx
+	andnq	%rbx,%r11,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r11,%r14
+	leaq	(%rcx,%r12,1),%rcx
+	xorq	%r14,%r13
+	movq	%rdx,%rdi
+	rorxq	$39,%rdx,%r12
+	leaq	(%rcx,%r13,1),%rcx
+	xorq	%r8,%rdi
+	rorxq	$34,%rdx,%r14
+	rorxq	$28,%rdx,%r13
+	leaq	(%r10,%rcx,1),%r10
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%r8,%r15
+	xorq	%r13,%r14
+	leaq	(%rcx,%r15,1),%rcx
+	movq	%r11,%r12
+	addq	96+16(%rbp),%rbx
+	andq	%r10,%r12
+	rorxq	$41,%r10,%r13
+	rorxq	$18,%r10,%r15
+	leaq	(%rcx,%r14,1),%rcx
+	leaq	(%rbx,%r12,1),%rbx
+	andnq	%rax,%r10,%r12
+	xorq	%r15,%r13
+	rorxq	$14,%r10,%r14
+	leaq	(%rbx,%r12,1),%rbx
+	xorq	%r14,%r13
+	movq	%rcx,%r15
+	rorxq	$39,%rcx,%r12
+	leaq	(%rbx,%r13,1),%rbx
+	xorq	%rdx,%r15
+	rorxq	$34,%rcx,%r14
+	rorxq	$28,%rcx,%r13
+	leaq	(%r9,%rbx,1),%r9
+	andq	%r15,%rdi
+	xorq	%r12,%r14
+	xorq	%rdx,%rdi
+	xorq	%r13,%r14
+	leaq	(%rbx,%rdi,1),%rbx
+	movq	%r10,%r12
+	addq	104+16(%rbp),%rax
+	andq	%r9,%r12
+	rorxq	$41,%r9,%r13
+	rorxq	$18,%r9,%rdi
+	leaq	(%rbx,%r14,1),%rbx
+	leaq	(%rax,%r12,1),%rax
+	andnq	%r11,%r9,%r12
+	xorq	%rdi,%r13
+	rorxq	$14,%r9,%r14
+	leaq	(%rax,%r12,1),%rax
+	xorq	%r14,%r13
+	movq	%rbx,%rdi
+	rorxq	$39,%rbx,%r12
+	leaq	(%rax,%r13,1),%rax
+	xorq	%rcx,%rdi
+	rorxq	$34,%rbx,%r14
+	rorxq	$28,%rbx,%r13
+	leaq	(%r8,%rax,1),%r8
+	andq	%rdi,%r15
+	xorq	%r12,%r14
+	xorq	%rcx,%r15
+	xorq	%r13,%r14
+	leaq	(%rax,%r15,1),%rax
+	movq	%r9,%r12
+	leaq	-128(%rbp),%rbp
+	cmpq	%rsp,%rbp
+	jae	L$ower_avx2
+
+	movq	1280(%rsp),%rdi
+	addq	%r14,%rax
+
+	leaq	1152(%rsp),%rsp
+
+	addq	0(%rdi),%rax
+	addq	8(%rdi),%rbx
+	addq	16(%rdi),%rcx
+	addq	24(%rdi),%rdx
+	addq	32(%rdi),%r8
+	addq	40(%rdi),%r9
+	leaq	256(%rsi),%rsi
+	addq	48(%rdi),%r10
+	movq	%rsi,%r12
+	addq	56(%rdi),%r11
+	cmpq	128+16(%rsp),%rsi
+
+	movq	%rax,0(%rdi)
+	cmoveq	%rsp,%r12
+	movq	%rbx,8(%rdi)
+	movq	%rcx,16(%rdi)
+	movq	%rdx,24(%rdi)
+	movq	%r8,32(%rdi)
+	movq	%r9,40(%rdi)
+	movq	%r10,48(%rdi)
+	movq	%r11,56(%rdi)
+
+	jbe	L$oop_avx2
+	leaq	(%rsp),%rbp
+
+L$done_avx2:
+	leaq	(%rbp),%rsp
+	movq	152(%rsp),%rsi
+
+	vzeroupper
+	movq	-48(%rsi),%r15
+
+	movq	-40(%rsi),%r14
+
+	movq	-32(%rsi),%r13
+
+	movq	-24(%rsi),%r12
+
+	movq	-16(%rsi),%rbp
+
+	movq	-8(%rsi),%rbx
+
+	leaq	(%rsi),%rsp
+
+L$epilogue_avx2:
 	.byte	0xf3,0xc3
 
 
+
diff --git a/lib/accelerated/x86/sha-padlock.c b/lib/accelerated/x86/sha-padlock.c
index 16a63d80cb..e878ebe310 100644
--- a/lib/accelerated/x86/sha-padlock.c
+++ b/lib/accelerated/x86/sha-padlock.c
@@ -292,6 +292,25 @@ wrap_padlock_hash_init(gnutls_digest_algorithm_t algo, void **_ctx)
 	return 0;
 }
 
+static void *
+wrap_padlock_hash_copy(const void *_ctx)
+{
+	struct padlock_hash_ctx *new_ctx;
+	const struct padlock_hash_ctx *ctx=_ctx;
+	ptrdiff_t off = (uint8_t *)ctx->ctx_ptr - (uint8_t *)(&ctx->ctx);
+
+	new_ctx = gnutls_malloc(sizeof(struct padlock_hash_ctx));
+	if (new_ctx == NULL) {
+		gnutls_assert();
+		return NULL;
+	}
+
+	memcpy(new_ctx, ctx, sizeof(*new_ctx));
+	new_ctx->ctx_ptr = (uint8_t *)&new_ctx->ctx + off;
+
+	return new_ctx;
+}
+
 static int
 wrap_padlock_hash_output(void *src_ctx, void *digest, size_t digestsize)
 {
@@ -367,6 +386,7 @@ const gnutls_crypto_digest_st _gnutls_sha_padlock_nano = {
 	.init = wrap_padlock_hash_init,
 	.hash = wrap_padlock_hash_update,
 	.output = wrap_padlock_hash_output,
+	.copy = wrap_padlock_hash_copy,
 	.deinit = wrap_padlock_hash_deinit,
 	.fast = wrap_padlock_hash_fast,
 };
diff --git a/lib/accelerated/x86/sha-x86-ssse3.c b/lib/accelerated/x86/sha-x86-ssse3.c
index 5dc9da6349..8ea4e54aee 100644
--- a/lib/accelerated/x86/sha-x86-ssse3.c
+++ b/lib/accelerated/x86/sha-x86-ssse3.c
@@ -45,10 +45,8 @@ struct x86_hash_ctx {
 		struct sha1_ctx sha1;
 		struct sha224_ctx sha224;
 		struct sha256_ctx sha256;
-#ifdef ENABLE_SHA512
 		struct sha384_ctx sha384;
 		struct sha512_ctx sha512;
-#endif
 	} ctx;
 	void *ctx_ptr;
 	gnutls_digest_algorithm_t algo;
@@ -180,7 +178,6 @@ void x86_sha256_update(struct sha256_ctx *ctx, size_t length,
 	}
 }
 
-#ifdef ENABLE_SHA512
 void x86_sha512_update(struct sha512_ctx *ctx, size_t length,
 		     const uint8_t * data)
 {
@@ -231,7 +228,6 @@ void x86_sha512_update(struct sha512_ctx *ctx, size_t length,
 		sha512_update(ctx, res, data);
 	}
 }
-#endif
 
 static int _ctx_init(gnutls_digest_algorithm_t algo,
 		     struct x86_hash_ctx *ctx)
@@ -261,7 +257,6 @@ static int _ctx_init(gnutls_digest_algorithm_t algo,
 		ctx->ctx_ptr = &ctx->ctx.sha256;
 		ctx->length = SHA256_DIGEST_SIZE;
 		break;
-#ifdef ENABLE_SHA512
 	case GNUTLS_DIG_SHA384:
 		sha384_init(&ctx->ctx.sha384);
 		ctx->update = (update_func) x86_sha512_update;
@@ -278,7 +273,6 @@ static int _ctx_init(gnutls_digest_algorithm_t algo,
 		ctx->ctx_ptr = &ctx->ctx.sha512;
 		ctx->length = SHA512_DIGEST_SIZE;
 		break;
-#endif
 	default:
 		gnutls_assert();
 		return GNUTLS_E_INVALID_REQUEST;
@@ -311,6 +305,25 @@ static int wrap_x86_hash_init(gnutls_digest_algorithm_t algo, void **_ctx)
 	return 0;
 }
 
+static void *
+wrap_x86_hash_copy(const void *_ctx)
+{
+	struct x86_hash_ctx *new_ctx;
+	const struct x86_hash_ctx *ctx=_ctx;
+	ptrdiff_t off = (uint8_t *)ctx->ctx_ptr - (uint8_t *)(&ctx->ctx);
+
+	new_ctx = gnutls_malloc(sizeof(struct x86_hash_ctx));
+	if (new_ctx == NULL) {
+		gnutls_assert();
+		return NULL;
+	}
+
+	memcpy(new_ctx, ctx, sizeof(*new_ctx));
+	new_ctx->ctx_ptr = (uint8_t *)&new_ctx->ctx + off;
+
+	return new_ctx;
+}
+
 static int
 wrap_x86_hash_output(void *src_ctx, void *digest, size_t digestsize)
 {
@@ -349,17 +362,16 @@ NN_HASH(sha224, x86_sha256_update, sha224_digest, SHA224);
 const struct nettle_hash x86_sha256 =
 NN_HASH(sha256, x86_sha256_update, sha256_digest, SHA256);
 
-#ifdef ENABLE_SHA512
 const struct nettle_hash x86_sha384 =
 NN_HASH(sha384, x86_sha512_update, sha384_digest, SHA384);
 const struct nettle_hash x86_sha512 =
 NN_HASH(sha512, x86_sha512_update, sha512_digest, SHA512);
-#endif
 
 const gnutls_crypto_digest_st _gnutls_sha_x86_ssse3 = {
 	.init = wrap_x86_hash_init,
 	.hash = wrap_x86_hash_update,
 	.output = wrap_x86_hash_output,
+	.copy = wrap_x86_hash_copy,
 	.deinit = wrap_x86_hash_deinit,
 	.fast = wrap_x86_hash_fast,
 };
diff --git a/lib/accelerated/x86/sha-x86.h b/lib/accelerated/x86/sha-x86.h
index 4724604bdd..6bbbfb8641 100644
--- a/lib/accelerated/x86/sha-x86.h
+++ b/lib/accelerated/x86/sha-x86.h
@@ -3,9 +3,6 @@
 
 #include <nettle/sha.h>
 
-/* nettle's SHA512 is faster than openssl's */
-#undef ENABLE_SHA512
-
 extern const struct nettle_hash x86_sha1;
 extern const struct nettle_hash x86_sha224;
 extern const struct nettle_hash x86_sha256;
diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
index acd4586e4e..fb3ff90919 100644
--- a/lib/accelerated/x86/x86-common.c
+++ b/lib/accelerated/x86/x86-common.c
@@ -38,6 +38,12 @@
 # include <sha-padlock.h>
 #endif
 #include <aes-padlock.h>
+#ifdef HAVE_CPUID_H
+# include <cpuid.h>
+#else
+# define __get_cpuid(...) 0
+# define __get_cpuid_count(...) 0
+#endif
 
 /* ebx, ecx, edx 
  * This is a format compatible with openssl's CPUID detection.
@@ -49,11 +55,21 @@ __hidden
 #endif
 unsigned int _gnutls_x86_cpuid_s[4];
 
+#ifndef bit_SHA
+# define bit_SHA (1<<29)
+#endif
+
+/* ecx */
+#ifndef bit_AVX512BITALG
+# define bit_AVX512BITALG 0x4000
+#endif
+
 #ifndef bit_PCLMUL
 # define bit_PCLMUL 0x2
 #endif
 
 #ifndef bit_SSSE3
+/* ecx */
 # define bit_SSSE3 0x0000200
 #endif
 
@@ -85,10 +101,26 @@ unsigned int _gnutls_x86_cpuid_s[4];
 #define INTEL_SSSE3 (1<<2)
 #define INTEL_PCLMUL (1<<3)
 #define INTEL_AVX (1<<4)
+#define INTEL_SHA (1<<5)
 #define VIA_PADLOCK (1<<20)
 #define VIA_PADLOCK_PHE (1<<21)
 #define VIA_PADLOCK_PHE_SHA512 (1<<22)
 
+static unsigned read_cpuid_vals(unsigned int vals[4])
+{
+	unsigned t1, t2, t3;
+	if (!__get_cpuid(1, &t1, &vals[0],
+			 &vals[1], &t2))
+		return 0;
+	/* suppress AVX512; it works conditionally on certain CPUs on the original code */
+	vals[1] &= 0xfffff7ff;
+
+	if (!__get_cpuid_count(7, 0, &t1, &vals[2], &t2, &t3))
+		return 0;
+
+	return 1;
+}
+
 /* Based on the example in "How to detect New Instruction support in
  * the 4th generation Intel Core processor family.
  * https://software.intel.com/en-us/articles/how-to-detect-new-instruction-support-in-the-4th-generation-intel-core-processor-family
@@ -111,18 +143,17 @@ static unsigned check_4th_gen_intel_features(unsigned ecx)
 
 static void capabilities_to_intel_cpuid(unsigned capabilities)
 {
-	unsigned a,b,c,t;
-
-	memset(_gnutls_x86_cpuid_s, 0, sizeof(_gnutls_x86_cpuid_s));
+	unsigned a[4];
 
 	if (capabilities & EMPTY_SET) {
 		return;
 	}
 
-	gnutls_cpuid(1, &t, &a, &b, &c);
+	if (!read_cpuid_vals(a))
+		return;
 
 	if (capabilities & INTEL_AES_NI) {
-		if (b & bit_AES) {
+		if (a[1] & bit_AES) {
 			_gnutls_x86_cpuid_s[1] |= bit_AES;
 		} else {
 			_gnutls_debug_log
@@ -131,7 +162,7 @@ static void capabilities_to_intel_cpuid(unsigned capabilities)
 	}
 
 	if (capabilities & INTEL_SSSE3) {
-		if (b & bit_SSSE3) {
+		if (a[1] & bit_SSSE3) {
 			_gnutls_x86_cpuid_s[1] |= bit_SSSE3;
 		} else {
 			_gnutls_debug_log
@@ -140,7 +171,7 @@ static void capabilities_to_intel_cpuid(unsigned capabilities)
 	}
 
 	if (capabilities & INTEL_AVX) {
-		if ((b & bit_AVX) && check_4th_gen_intel_features(b)) {
+		if ((a[1] & bit_AVX) && check_4th_gen_intel_features(a[1])) {
 			_gnutls_x86_cpuid_s[1] |= bit_AVX|bit_MOVBE;
 		} else {
 			_gnutls_debug_log
@@ -149,7 +180,7 @@ static void capabilities_to_intel_cpuid(unsigned capabilities)
 	}
 
 	if (capabilities & INTEL_PCLMUL) {
-		if (b & bit_PCLMUL) {
+		if (a[1] & bit_PCLMUL) {
 			_gnutls_x86_cpuid_s[1] |= bit_PCLMUL;
 		} else {
 			_gnutls_debug_log
@@ -157,6 +188,14 @@ static void capabilities_to_intel_cpuid(unsigned capabilities)
 		}
 	}
 
+	if (capabilities & INTEL_SHA) {
+		if (a[2] & bit_SHA) {
+			_gnutls_x86_cpuid_s[2] |= bit_SHA;
+		} else {
+			_gnutls_debug_log
+			    ("SHA acceleration requested but not available\n");
+		}
+	}
 }
 
 
@@ -170,6 +209,11 @@ static unsigned check_ssse3(void)
 	return (_gnutls_x86_cpuid_s[1] & bit_SSSE3);
 }
 
+static unsigned check_sha(void)
+{
+	return (_gnutls_x86_cpuid_s[2] & bit_SHA);
+}
+
 #ifdef ASM_X86_64
 static unsigned check_avx_movbe(void)
 {
@@ -196,8 +240,8 @@ static unsigned capabilities_to_via_edx(unsigned capabilities)
 		return 0;
 	}
 
-	gnutls_cpuid(1, &t, &a, &b, &c);
-
+	if (!__get_cpuid(1, &t, &a, &b, &c))
+		return 0;
 	if (capabilities & VIA_PADLOCK) {
 		if (c & via_bit_PADLOCK) {
 			_gnutls_x86_cpuid_s[2] |= via_bit_PADLOCK;
@@ -265,7 +309,9 @@ static int check_phe_partial(void)
 static unsigned check_via(void)
 {
 	unsigned int a, b, c, d;
-	gnutls_cpuid(0, &a, &b, &c, &d);
+
+	if (!__get_cpuid(0, &a, &b, &c, &d))
+		return 0;
 
 	if ((memcmp(&b, "Cent", 4) == 0 &&
 	     memcmp(&d, "aurH", 4) == 0 && memcmp(&c, "auls", 4) == 0)) {
@@ -455,7 +501,9 @@ void register_x86_padlock_crypto(unsigned capabilities)
 static unsigned check_intel_or_amd(void)
 {
 	unsigned int a, b, c, d;
-	gnutls_cpuid(0, &a, &b, &c, &d);
+
+	if (!__get_cpuid(0, &a, &b, &c, &d))
+		return 0;
 
 	if ((memcmp(&b, "Genu", 4) == 0 &&
 	     memcmp(&d, "ineI", 4) == 0 &&
@@ -472,14 +520,15 @@ static
 void register_x86_intel_crypto(unsigned capabilities)
 {
 	int ret;
-	unsigned t;
+
+	memset(_gnutls_x86_cpuid_s, 0, sizeof(_gnutls_x86_cpuid_s));
 
 	if (check_intel_or_amd() == 0)
 		return;
 
 	if (capabilities == 0) {
-		gnutls_cpuid(1, &t, &_gnutls_x86_cpuid_s[0], 
-			&_gnutls_x86_cpuid_s[1], &_gnutls_x86_cpuid_s[2]);
+		if (!read_cpuid_vals(_gnutls_x86_cpuid_s))
+			return;
 	} else {
 		capabilities_to_intel_cpuid(capabilities);
 	}
@@ -523,6 +572,11 @@ void register_x86_intel_crypto(unsigned capabilities)
 		if (ret < 0) {
 			gnutls_assert();
 		}
+	}
+
+	if (check_sha() || check_ssse3()) {
+		if (check_sha())
+			_gnutls_debug_log("Intel SHA was detected\n");
 
 		ret =
 		    gnutls_crypto_single_digest_register(GNUTLS_DIG_SHA1,
@@ -570,7 +624,6 @@ void register_x86_intel_crypto(unsigned capabilities)
 		if (ret < 0)
 			gnutls_assert();
 
-#ifdef ENABLE_SHA512
 		ret =
 		    gnutls_crypto_single_digest_register(GNUTLS_DIG_SHA384,
 							 80,
@@ -597,7 +650,6 @@ void register_x86_intel_crypto(unsigned capabilities)
 							 &_gnutls_hmac_sha_x86_ssse3, 0);
 		if (ret < 0)
 			gnutls_assert();
-#endif
 	}
 
 	if (check_optimized_aes()) {
diff --git a/lib/accelerated/x86/x86-common.h b/lib/accelerated/x86/x86-common.h
index 0e2d86d510..d15786f378 100644
--- a/lib/accelerated/x86/x86-common.h
+++ b/lib/accelerated/x86/x86-common.h
@@ -29,12 +29,6 @@
 void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
 		  unsigned int *cx, unsigned int *dx);
 
-# ifdef ASM_X86_32
-unsigned int gnutls_have_cpuid(void);
-# else
-#  define gnutls_have_cpuid() 1
-# endif				/* ASM_X86_32 */
-
 #endif
 
 #define CHECK_AES_KEYSIZE(s) \
diff --git a/lib/algorithms.h b/lib/algorithms.h
index 870e9d6d35..7f27b2270d 100644
--- a/lib/algorithms.h
+++ b/lib/algorithms.h
@@ -26,6 +26,12 @@
 
 #include "auth.h"
 
+#ifdef DISABLE_SYSTEM_CONFIG
+# define SYSTEM_CONFIG_OR_CONST const
+#else
+# define SYSTEM_CONFIG_OR_CONST
+#endif
+
 #define version_to_entry _gnutls_version_to_entry
 
 #define GNUTLS_RENEGO_PROTECTION_REQUEST_MAJOR 0x00
@@ -324,6 +330,13 @@ typedef enum hash_security_level_t {
 	_INSECURE
 } hash_security_level_t;
 
+int _gnutls_ecc_curve_mark_disabled(const char *name);
+int _gnutls_sign_mark_insecure(const char *name, hash_security_level_t);
+int _gnutls_digest_mark_insecure(const char *name);
+unsigned _gnutls_digest_is_insecure(gnutls_digest_algorithm_t dig);
+int _gnutls_version_mark_disabled(const char *name);
+gnutls_protocol_t _gnutls_protocol_get_id_if_supported(const char *name);
+
 struct gnutls_sign_entry_st {
 	const char *name;
 	const char *oid;
@@ -414,11 +427,14 @@ typedef struct gnutls_ecc_curve_entry_st {
 	unsigned size;		/* the size in bytes */
 	unsigned sig_size;	/* the size of curve signatures in bytes (EdDSA) */
 	unsigned gost_curve;
+	bool supported;
 } gnutls_ecc_curve_entry_st;
 
 const gnutls_ecc_curve_entry_st
     *_gnutls_ecc_curve_get_params(gnutls_ecc_curve_t curve);
 
+unsigned _gnutls_ecc_curve_is_supported(gnutls_ecc_curve_t);
+
 const gnutls_group_entry_st *_gnutls_tls_id_to_group(unsigned num);
 const gnutls_group_entry_st * _gnutls_id_to_group(unsigned id);
 
diff --git a/lib/algorithms/ecc.c b/lib/algorithms/ecc.c
index d90278074e..72b0864e75 100644
--- a/lib/algorithms/ecc.c
+++ b/lib/algorithms/ecc.c
@@ -30,13 +30,16 @@
 /* Supported ECC curves
  */
 
-static const gnutls_ecc_curve_entry_st ecc_curves[] = {
+static SYSTEM_CONFIG_OR_CONST
+gnutls_ecc_curve_entry_st ecc_curves[] = {
+#ifdef ENABLE_NON_SUITEB_CURVES
 	{
 	 .name = "SECP192R1",
 	 .oid = "1.2.840.10045.3.1.1",
 	 .id = GNUTLS_ECC_CURVE_SECP192R1,
 	 .pk = GNUTLS_PK_ECDSA,
 	 .size = 24,
+	 .supported = 1,
 	},
 	{
 	 .name = "SECP224R1",
@@ -44,13 +47,16 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .id = GNUTLS_ECC_CURVE_SECP224R1,
 	 .pk = GNUTLS_PK_ECDSA,
 	 .size = 28,
+	 .supported = 1,
 	},
+#endif
 	{
 	 .name = "SECP256R1",
 	 .oid = "1.2.840.10045.3.1.7",
 	 .id = GNUTLS_ECC_CURVE_SECP256R1,
 	 .pk = GNUTLS_PK_ECDSA,
 	 .size = 32,
+	 .supported = 1,
 	},
 	{
 	 .name = "SECP384R1",
@@ -58,6 +64,7 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .id = GNUTLS_ECC_CURVE_SECP384R1,
 	 .pk = GNUTLS_PK_ECDSA,
 	 .size = 48,
+	 .supported = 1,
 	},
 	{
 	 .name = "SECP521R1",
@@ -65,12 +72,14 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .id = GNUTLS_ECC_CURVE_SECP521R1,
 	 .pk = GNUTLS_PK_ECDSA,
 	 .size = 66,
+	 .supported = 1,
 	},
 	{
 	 .name = "X25519",
 	 .id = GNUTLS_ECC_CURVE_X25519,
 	 .pk = GNUTLS_PK_ECDH_X25519,
 	 .size = 32,
+	 .supported = 1,
 	},
 	{
 	 .name = "Ed25519",
@@ -78,8 +87,10 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .id = GNUTLS_ECC_CURVE_ED25519,
 	 .pk = GNUTLS_PK_EDDSA_ED25519,
 	 .size = 32,
-	 .sig_size = 64
+	 .sig_size = 64,
+	 .supported = 1,
 	},
+#if ENABLE_GOST
 	{
 	 .name = "CryptoPro-A",
 	 .oid = "1.2.643.2.2.35.1",
@@ -87,6 +98,7 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .pk = GNUTLS_PK_UNKNOWN,
 	 .size = 32,
 	 .gost_curve = 1,
+	 .supported = 1,
 	},
 	{
 	 .name = "CryptoPro-B",
@@ -95,6 +107,7 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .pk = GNUTLS_PK_UNKNOWN,
 	 .size = 32,
 	 .gost_curve = 1,
+	 .supported = 1,
 	},
 	{
 	 .name = "CryptoPro-C",
@@ -103,6 +116,7 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .pk = GNUTLS_PK_UNKNOWN,
 	 .size = 32,
 	 .gost_curve = 1,
+	 .supported = 1,
 	},
 	{
 	 .name = "CryptoPro-XchA",
@@ -111,6 +125,7 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .pk = GNUTLS_PK_UNKNOWN,
 	 .size = 32,
 	 .gost_curve = 1,
+	 .supported = 1,
 	},
 	{
 	 .name = "CryptoPro-XchB",
@@ -119,6 +134,7 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .pk = GNUTLS_PK_UNKNOWN,
 	 .size = 32,
 	 .gost_curve = 1,
+	 .supported = 1,
 	},
 	{
 	 .name = "TC26-512-A",
@@ -127,6 +143,7 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .pk = GNUTLS_PK_GOST_12_512,
 	 .size = 64,
 	 .gost_curve = 1,
+	 .supported = 1,
 	},
 	{
 	 .name = "TC26-512-B",
@@ -135,7 +152,9 @@ static const gnutls_ecc_curve_entry_st ecc_curves[] = {
 	 .pk = GNUTLS_PK_GOST_12_512,
 	 .size = 64,
 	 .gost_curve = 1,
+	 .supported = 1,
 	},
+#endif
 	{0, 0, 0}
 };
 
@@ -162,7 +181,7 @@ const gnutls_ecc_curve_t *gnutls_ecc_curve_list(void)
 		int i = 0;
 
 		GNUTLS_ECC_CURVE_LOOP(
-			if (_gnutls_pk_curve_exists(p->id))
+			if (p->supported && _gnutls_pk_curve_exists(p->id))
 				supported_curves[i++] = p->id;
 		);
 		supported_curves[i++] = 0;
@@ -171,6 +190,15 @@ const gnutls_ecc_curve_t *gnutls_ecc_curve_list(void)
 	return supported_curves;
 }
 
+unsigned _gnutls_ecc_curve_is_supported(gnutls_ecc_curve_t curve)
+{
+	GNUTLS_ECC_CURVE_LOOP(
+		if (p->id == curve && p->supported && _gnutls_pk_curve_exists(p->id))
+			return 1;
+	);
+	return 0;
+}
+
 /**
  * gnutls_oid_to_ecc_curve:
  * @oid: is a curve's OID
@@ -185,7 +213,8 @@ gnutls_ecc_curve_t gnutls_oid_to_ecc_curve(const char *oid)
 	gnutls_ecc_curve_t ret = GNUTLS_ECC_CURVE_INVALID;
 
 	GNUTLS_ECC_CURVE_LOOP(
-		if (p->oid != NULL && c_strcasecmp(p->oid, oid) == 0 && _gnutls_pk_curve_exists(p->id)) {
+		if (p->oid != NULL && c_strcasecmp(p->oid, oid) == 0 && p->supported &&
+		    _gnutls_pk_curve_exists(p->id)) {
 			ret = p->id;
 			break;
 		}
@@ -210,7 +239,8 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get_id(const char *name)
 	gnutls_ecc_curve_t ret = GNUTLS_ECC_CURVE_INVALID;
 
 	GNUTLS_ECC_CURVE_LOOP(
-		if (c_strcasecmp(p->name, name) == 0 && _gnutls_pk_curve_exists(p->id)) {
+		if (c_strcasecmp(p->name, name) == 0 && p->supported &&
+		    _gnutls_pk_curve_exists(p->id)) {
 			ret = p->id;
 			break;
 		}
@@ -219,10 +249,24 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get_id(const char *name)
 	return ret;
 }
 
+int _gnutls_ecc_curve_mark_disabled(const char *name)
+{
+	gnutls_ecc_curve_entry_st *p;
+
+	for(p = ecc_curves; p->name != NULL; p++) {
+		if (c_strcasecmp(p->name, name) == 0) {
+			p->supported = 0;
+			return 0;
+		}
+	}
+
+	return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+}
+
 static int _gnutls_ecc_pk_compatible(const gnutls_ecc_curve_entry_st *p,
 				     gnutls_pk_algorithm_t pk)
 {
-	if (!_gnutls_pk_curve_exists(p->id))
+	if (!p->supported || !_gnutls_pk_curve_exists(p->id))
 		return 0;
 
 	if (pk == GNUTLS_PK_GOST_01 ||
@@ -371,7 +415,7 @@ gnutls_pk_algorithm_t gnutls_ecc_curve_get_pk(gnutls_ecc_curve_t curve)
 	int ret = GNUTLS_PK_UNKNOWN;
 
 	GNUTLS_ECC_CURVE_LOOP(
-		if (p->id == curve) {
+		if (p->id == curve && p->supported) {
 			ret = p->pk;
 			break;
 		}
diff --git a/lib/algorithms/groups.c b/lib/algorithms/groups.c
index 25195c121c..1f82bf678a 100644
--- a/lib/algorithms/groups.c
+++ b/lib/algorithms/groups.c
@@ -139,7 +139,7 @@ const gnutls_group_entry_st * _gnutls_tls_id_to_group(unsigned num)
 {
 	GNUTLS_GROUP_LOOP(
 		if (p->tls_id == num &&
-		    (p->curve == 0 || _gnutls_pk_curve_exists(p->curve))) {
+		    (p->curve == 0 || _gnutls_ecc_curve_is_supported(p->curve))) {
 			return p;
 		}
 	);
@@ -154,7 +154,7 @@ const gnutls_group_entry_st * _gnutls_id_to_group(unsigned id)
 
 	GNUTLS_GROUP_LOOP(
 		if (p->id == id &&
-		    (p->curve == 0 || _gnutls_pk_curve_exists(p->curve))) {
+		    (p->curve == 0 || _gnutls_ecc_curve_is_supported(p->curve))) {
 			return p;
 		}
 	);
@@ -182,7 +182,7 @@ const gnutls_group_t *gnutls_group_list(void)
 		int i = 0;
 
 		GNUTLS_GROUP_LOOP(
-			if (p->curve == 0 || _gnutls_pk_curve_exists(p->curve))
+			if (p->curve == 0 || _gnutls_ecc_curve_is_supported(p->curve))
 				groups[i++] = p->id;
 		);
 		groups[i++] = 0;
@@ -208,7 +208,7 @@ gnutls_group_t gnutls_group_get_id(const char *name)
 
 	GNUTLS_GROUP_LOOP(
 		if (c_strcasecmp(p->name, name) == 0 && (
-		    p->curve == 0 ||_gnutls_pk_curve_exists(p->curve))) {
+		    p->curve == 0 ||_gnutls_ecc_curve_is_supported(p->curve))) {
 			ret = p->id;
 			break;
 		}
diff --git a/lib/algorithms/mac.c b/lib/algorithms/mac.c
index 3117e8c936..ddbba2f453 100644
--- a/lib/algorithms/mac.c
+++ b/lib/algorithms/mac.c
@@ -36,7 +36,8 @@
 #define MAC_OID_STREEBOG_256 "1.2.643.7.1.1.4.1"
 #define MAC_OID_STREEBOG_512 "1.2.643.7.1.1.4.2"
 
-static const mac_entry_st hash_algorithms[] = {
+static SYSTEM_CONFIG_OR_CONST
+mac_entry_st hash_algorithms[] = {
 	{.name = "SHA1",
 	 .oid = HASH_OID_SHA1,
 	 .mac_oid = MAC_OID_SHA1,
@@ -161,6 +162,21 @@ static const mac_entry_st hash_algorithms[] = {
 	 .id = GNUTLS_MAC_AES_CMAC_256,
 	 .output_size = 16,
 	 .key_size = 32},
+	{.name = "AES-GMAC-128",
+	 .id = GNUTLS_MAC_AES_GMAC_128,
+	 .output_size = 16,
+	 .key_size = 16,
+	 .nonce_size = 12},
+	{.name = "AES-GMAC-192",
+	 .id = GNUTLS_MAC_AES_GMAC_192,
+	 .output_size = 16,
+	 .key_size = 24,
+	 .nonce_size = 12},
+	{.name = "AES-GMAC-256",
+	 .id = GNUTLS_MAC_AES_GMAC_256,
+	 .output_size = 16,
+	 .key_size = 32,
+	 .nonce_size = 12},
 	{.name = "MAC-NULL",
 	 .id = GNUTLS_MAC_NULL},
 	{0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -248,6 +264,35 @@ gnutls_digest_algorithm_t gnutls_digest_get_id(const char *name)
 	return ret;
 }
 
+int _gnutls_digest_mark_insecure(const char *name)
+{
+#ifndef DISABLE_SYSTEM_CONFIG
+	mac_entry_st *p;
+
+	for(p = hash_algorithms; p->name != NULL; p++) {
+		if (p->oid != NULL && c_strcasecmp(p->name, name) == 0) {
+			p->preimage_insecure = 1;
+			return 0;
+		}
+	}
+
+#endif
+	return GNUTLS_E_INVALID_REQUEST;
+}
+
+unsigned _gnutls_digest_is_insecure(gnutls_digest_algorithm_t dig)
+{
+	const mac_entry_st *p;
+
+	for(p = hash_algorithms; p->name != NULL; p++) {
+		if (p->oid != NULL && p->id == (gnutls_mac_algorithm_t)dig) {
+			return p->preimage_insecure;
+		}
+	}
+
+	return 1;
+}
+
 /**
  * gnutls_mac_get_id:
  * @name: is a MAC algorithm name
diff --git a/lib/algorithms/protocols.c b/lib/algorithms/protocols.c
index 72b43fcf77..7242e1aa0c 100644
--- a/lib/algorithms/protocols.c
+++ b/lib/algorithms/protocols.c
@@ -27,7 +27,9 @@
 #include "c-strcase.h"
 
 /* TLS Versions */
-static const version_entry_st sup_versions[] = {
+
+static SYSTEM_CONFIG_OR_CONST
+version_entry_st sup_versions[] = {
 	{.name = "SSL3.0",
 	 .id = GNUTLS_SSL3,
 	 .age = 0,
@@ -195,6 +197,21 @@ version_is_valid_for_session(gnutls_session_t session,
 	return 0;
 }
 
+int _gnutls_version_mark_disabled(const char *name)
+{
+#ifndef DISABLE_SYSTEM_CONFIG
+	version_entry_st *p;
+
+	for (p = sup_versions; p->name != NULL; p++)
+		if (c_strcasecmp(p->name, name) == 0) {
+			p->supported = 0;
+			return 0;
+		}
+
+#endif
+	return GNUTLS_E_INVALID_REQUEST;
+}
+
 /* Return the priority of the provided version number */
 int
 _gnutls_version_priority(gnutls_session_t session,
@@ -440,8 +457,11 @@ const gnutls_protocol_t *gnutls_protocol_list(void)
 	if (supported_protocols[0] == 0) {
 		int i = 0;
 
-		for (p = sup_versions; p->name != NULL; p++)
+		for (p = sup_versions; p->name != NULL; p++) {
+			if (!p->supported)
+				continue;
 			supported_protocols[i++] = p->id;
+		}
 		supported_protocols[i++] = 0;
 	}
 
diff --git a/lib/algorithms/sign.c b/lib/algorithms/sign.c
index fc5aa0a75e..19bea3f663 100644
--- a/lib/algorithms/sign.c
+++ b/lib/algorithms/sign.c
@@ -37,7 +37,8 @@
 # define SHA1_SECURE_VAL _INSECURE_FOR_CERTS
 #endif
 
-static const gnutls_sign_entry_st sign_algorithms[] = {
+static SYSTEM_CONFIG_OR_CONST
+gnutls_sign_entry_st sign_algorithms[] = {
 	 /* RSA-PKCS#1 1.5: must be before PSS,
 	  * so that gnutls_pk_to_sign() will return
 	  * these first for backwards compatibility. */
@@ -437,12 +438,33 @@ unsigned gnutls_sign_is_secure(gnutls_sign_algorithm_t algorithm)
 
 bool _gnutls_sign_is_secure2(const gnutls_sign_entry_st *se, unsigned int flags)
 {
+	if (se->hash != GNUTLS_DIG_UNKNOWN && _gnutls_digest_is_insecure(se->hash))
+		return gnutls_assert_val(0);
+
 	if (flags & GNUTLS_SIGN_FLAG_SECURE_FOR_CERTS)
 		return (se->slevel==_SECURE)?1:0;
 	else
 		return (se->slevel==_SECURE || se->slevel == _INSECURE_FOR_CERTS)?1:0;
 }
 
+int _gnutls_sign_mark_insecure(const char *name, hash_security_level_t level)
+{
+#ifndef DISABLE_SYSTEM_CONFIG
+	gnutls_sign_entry_st *p;
+
+	if (unlikely(level == _SECURE))
+		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+
+	for(p = sign_algorithms; p->name != NULL; p++) {
+		if (c_strcasecmp(p->name, name) == 0) {
+				p->slevel = level;
+			return 0;
+		}
+	}
+#endif
+	return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+}
+
 /**
  * gnutls_sign_is_secure2:
  * @algorithm: is a sign algorithm
diff --git a/lib/crypto-api.c b/lib/crypto-api.c
index 0b6be4eed2..8af3f3b7dc 100644
--- a/lib/crypto-api.c
+++ b/lib/crypto-api.c
@@ -464,7 +464,8 @@ unsigned gnutls_hmac_get_len(gnutls_mac_algorithm_t algorithm)
  * @digest: is the output value of the hash
  *
  * This convenience function will hash the given data and return output
- * on a single call.
+ * on a single call. Note, this call will not work for MAC algorithms
+ * that require nonce (like UMAC or GMAC).
  *
  * Returns: Zero or a negative error code on error.
  *
@@ -482,6 +483,38 @@ gnutls_hmac_fast(gnutls_mac_algorithm_t algorithm,
 				digest);
 }
 
+/**
+ * gnutls_hmac_copy:
+ * @handle: is a #gnutls_hmac_hd_t type
+ *
+ * This function will create a copy of MAC context, containing all its current
+ * state. Copying contexts for MACs registered using
+ * gnutls_crypto_register_mac() is not supported and will always result in an
+ * error.
+ *
+ * Returns: new MAC context or NULL in case of an error.
+ *
+ * Since: 3.6.9
+ */
+gnutls_hmac_hd_t gnutls_hmac_copy(gnutls_hmac_hd_t handle)
+{
+	gnutls_hmac_hd_t dig;
+
+	dig = gnutls_malloc(sizeof(mac_hd_st));
+	if (dig == NULL) {
+		gnutls_assert();
+		return NULL;
+	}
+
+	if (_gnutls_mac_copy((const mac_hd_st *) handle, (mac_hd_st *)dig) != GNUTLS_E_SUCCESS) {
+		gnutls_assert();
+		gnutls_free(dig);
+		return NULL;
+	}
+
+	return dig;
+}
+
 /* HASH */
 
 /**
@@ -605,6 +638,38 @@ gnutls_hash_fast(gnutls_digest_algorithm_t algorithm,
 }
 
 /**
+ * gnutls_hash_copy:
+ * @handle: is a #gnutls_hash_hd_t type
+ *
+ * This function will create a copy of Message Digest context, containing all
+ * its current state. Copying contexts for Message Digests registered using
+ * gnutls_crypto_register_digest() is not supported and will always result in
+ * an error.
+ *
+ * Returns: new Message Digest context or NULL in case of an error.
+ *
+ * Since: 3.6.9
+ */
+gnutls_hash_hd_t gnutls_hash_copy(gnutls_hash_hd_t handle)
+{
+	gnutls_hash_hd_t dig;
+
+	dig = gnutls_malloc(sizeof(digest_hd_st));
+	if (dig == NULL) {
+		gnutls_assert();
+		return NULL;
+	}
+
+	if (_gnutls_hash_copy((const digest_hd_st *) handle, (digest_hd_st *)dig) != GNUTLS_E_SUCCESS) {
+		gnutls_assert();
+		gnutls_free(dig);
+		return NULL;
+	}
+
+	return dig;
+}
+
+/**
  * gnutls_key_generate:
  * @key: is a pointer to a #gnutls_datum_t which will contain a newly
  * created key
diff --git a/lib/crypto-backend.h b/lib/crypto-backend.h
index f2fbba947d..43124abafb 100644
--- a/lib/crypto-backend.h
+++ b/lib/crypto-backend.h
@@ -55,6 +55,7 @@ typedef struct {
 	gnutls_mac_output_func output;
 	gnutls_mac_deinit_func deinit;
 	gnutls_mac_fast_func fast;
+	gnutls_mac_copy_func copy;
 
 	/* Not needed for registered on run-time. Only included
 	 * should define it. */
@@ -67,6 +68,7 @@ typedef struct {
 	gnutls_digest_output_func output;
 	gnutls_digest_deinit_func deinit;
 	gnutls_digest_fast_func fast;
+	gnutls_digest_copy_func copy;
 
 	/* Not needed for registered on run-time. Only included
 	 * should define it. */
diff --git a/lib/crypto-selftests.c b/lib/crypto-selftests.c
index 02e92849e9..821271f22b 100644
--- a/lib/crypto-selftests.c
+++ b/lib/crypto-selftests.c
@@ -1355,6 +1355,7 @@ static int test_digest(gnutls_digest_algorithm_t dig,
 	int ret;
 	size_t data_size;
 	gnutls_hash_hd_t hd;
+	gnutls_hash_hd_t copy;
 
 	if (_gnutls_digest_exists(dig) == 0)
 		return 0;
@@ -1371,6 +1372,12 @@ static int test_digest(gnutls_digest_algorithm_t dig,
 		if (ret < 0)
 			return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
+		copy = gnutls_hash_copy(hd);
+		/* Returning NULL is not an error here for the time being, but
+		 * it might become one later */
+		if (!copy && secure_getenv("GNUTLS_TEST_SUITE_RUN"))
+			return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+
 		ret = gnutls_hash(hd,
 				  &vectors[i].plaintext[1],
 				  vectors[i].plaintext_size - 1);
@@ -1390,6 +1397,24 @@ static int test_digest(gnutls_digest_algorithm_t dig,
 					  gnutls_digest_get_name(dig), i);
 			return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 		}
+
+		if (copy != NULL) {
+			ret = gnutls_hash(copy,
+					  &vectors[i].plaintext[1],
+					  vectors[i].plaintext_size - 1);
+			if (ret < 0)
+				return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+
+			memset(data, 0xaa, data_size);
+			gnutls_hash_deinit(copy, data);
+
+			if (memcmp(data, vectors[i].output,
+			    vectors[i].output_size) != 0) {
+				_gnutls_debug_log("%s copy test vector %d failed!\n",
+						  gnutls_digest_get_name(dig), i);
+				return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+			}
+		}
 	}
 
 	_gnutls_debug_log("%s self check succeeded\n",
@@ -1402,6 +1427,8 @@ static int test_digest(gnutls_digest_algorithm_t dig,
 struct mac_vectors_st {
 	const uint8_t *key;
 	unsigned int key_size;
+	const uint8_t *nonce;
+	unsigned int nonce_size;
 	const uint8_t *plaintext;
 	unsigned int plaintext_size;
 	const uint8_t *output;
@@ -1535,6 +1562,47 @@ const struct mac_vectors_st aes_cmac_256_vectors[] = { /* NIST SP800-38A */
 	 },
 };
 
+const struct mac_vectors_st aes_gmac_128_vectors[] = { /* NIST test vectors */
+	{
+	 STR(key, key_size,
+	     "\x23\x70\xe3\x20\xd4\x34\x42\x08\xe0\xff\x56\x83\xf2\x43\xb2\x13"),
+	 STR(nonce, nonce_size,
+	     "\x04\xdb\xb8\x2f\x04\x4d\x30\x83\x1c\x44\x12\x28"),
+	 STR(plaintext, plaintext_size,
+	     "\xd4\x3a\x8e\x50\x89\xee\xa0\xd0\x26\xc0\x3a\x85\x17\x8b\x27\xda"),
+	 STR(output, output_size,
+	     "\x2a\x04\x9c\x04\x9d\x25\xaa\x95\x96\x9b\x45\x1d\x93\xc3\x1c\x6e"),
+	},
+};
+
+const struct mac_vectors_st aes_gmac_192_vectors[] = { /* NIST test vectors */
+	{
+	 STR(key, key_size,
+	     "\xaa\x92\x1c\xb5\xa2\x43\xab\x08\x91\x1f\x32\x89\x26\x6b\x39\xda"
+	     "\xb1\x33\xf5\xc4\x20\xa6\xc5\xcd"),
+	 STR(nonce, nonce_size,
+	     "\x8f\x73\xdb\x68\xda\xee\xed\x2d\x15\x5f\xb1\xa0"),
+	 STR(plaintext, plaintext_size,
+	     "\x48\x74\x43\xc7\xc1\x4c\xe4\x74\xcb\x3d\x29\x1f\x25\x70\x70\xa2"),
+	 STR(output, output_size,
+	     "\xb1\x26\x74\xfb\xea\xc6\x88\x9a\x24\x94\x8f\x27\x92\xe3\x0a\x50"),
+	},
+};
+
+const struct mac_vectors_st aes_gmac_256_vectors[] = { /* NIST test vectors */
+	{
+	 STR(key, key_size,
+	     "\x6d\xfd\xaf\xd6\x70\x3c\x28\x5c\x01\xf1\x4f\xd1\x0a\x60\x12\x86"
+	     "\x2b\x2a\xf9\x50\xd4\x73\x3a\xbb\x40\x3b\x2e\x74\x5b\x26\x94\x5d"),
+	 STR(nonce, nonce_size,
+	     "\x37\x49\xd0\xb3\xd5\xba\xcb\x71\xbe\x06\xad\xe6"),
+	 STR(plaintext, plaintext_size,
+	     "\xc0\xd2\x49\x87\x19\x92\xe7\x03\x02\xae\x00\x81\x93\xd1\xe8\x9f"),
+	 STR(output, output_size,
+	     "\x4a\xa4\xcc\x69\xf8\x4e\xe6\xac\x16\xd9\xbf\xb4\xe0\x5d\xe5\x00"),
+	},
+};
+
 static int test_mac(gnutls_mac_algorithm_t mac,
 		    const struct mac_vectors_st *vectors,
 		    size_t vectors_size, unsigned flags)
@@ -1544,6 +1612,7 @@ static int test_mac(gnutls_mac_algorithm_t mac,
 	int ret;
 	size_t data_size;
 	gnutls_hmac_hd_t hd;
+	gnutls_hmac_hd_t copy;
 
 	for (i = 0; i < vectors_size; i++) {
 		ret = gnutls_hmac_init(&hd,
@@ -1556,10 +1625,21 @@ static int test_mac(gnutls_mac_algorithm_t mac,
 			return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 		}
 
+		if (vectors[i].nonce_size)
+			gnutls_hmac_set_nonce(hd,
+					      vectors[i].nonce,
+					      vectors[i].nonce_size);
+
 		ret = gnutls_hmac(hd, vectors[i].plaintext, 1);
 		if (ret < 0)
 			return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
+		copy = gnutls_hmac_copy(hd);
+		/* Returning NULL is not an error here for the time being, but
+		 * it might become one later */
+		if (!copy && secure_getenv("GNUTLS_TEST_SUITE_RUN"))
+			return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+
 		ret = gnutls_hmac(hd,
 				  &vectors[i].plaintext[1],
 				  vectors[i].plaintext_size - 1);
@@ -1582,6 +1662,25 @@ static int test_mac(gnutls_mac_algorithm_t mac,
 
 			return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 		}
+
+		if (copy != NULL) {
+			ret = gnutls_hmac(copy,
+					  &vectors[i].plaintext[1],
+					  vectors[i].plaintext_size - 1);
+			if (ret < 0)
+				return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+
+			memset(data, 0xaa, data_size);
+			gnutls_hmac_deinit(copy, data);
+
+			if (memcmp(data, vectors[i].output,
+			    vectors[i].output_size) != 0) {
+				_gnutls_debug_log
+					("MAC-%s copy test vector %d failed!\n",
+					 gnutls_mac_get_name(mac), i);
+				return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+			}
+		}
 	}
 
 	_gnutls_debug_log
@@ -1743,6 +1842,12 @@ int gnutls_mac_self_test(unsigned flags, gnutls_mac_algorithm_t mac)
 		CASE(GNUTLS_MAC_AES_CMAC_128, test_mac, aes_cmac_128_vectors);
 		FALLTHROUGH;
 		CASE(GNUTLS_MAC_AES_CMAC_256, test_mac, aes_cmac_256_vectors);
+		FALLTHROUGH;
+		CASE(GNUTLS_MAC_AES_GMAC_128, test_mac, aes_gmac_128_vectors);
+		FALLTHROUGH;
+		CASE(GNUTLS_MAC_AES_GMAC_192, test_mac, aes_gmac_192_vectors);
+		FALLTHROUGH;
+		CASE(GNUTLS_MAC_AES_GMAC_256, test_mac, aes_gmac_256_vectors);
 
 		break;
 	default:
diff --git a/lib/fips.h b/lib/fips.h
index 7385a95de0..1464c9595b 100644
--- a/lib/fips.h
+++ b/lib/fips.h
@@ -107,6 +107,9 @@ static unsigned is_mac_algo_forbidden(gnutls_mac_algorithm_t algo)
 			case GNUTLS_MAC_SHA3_512:
                         case GNUTLS_MAC_AES_CMAC_128:
                         case GNUTLS_MAC_AES_CMAC_256:
+                        case GNUTLS_MAC_AES_GMAC_128:
+                        case GNUTLS_MAC_AES_GMAC_192:
+                        case GNUTLS_MAC_AES_GMAC_256:
 				return 0;
 			default:
 				if (mode == GNUTLS_FIPS140_LAX)
diff --git a/lib/hash_int.c b/lib/hash_int.c
index fbc56b4333..d326960e80 100644
--- a/lib/hash_int.c
+++ b/lib/hash_int.c
@@ -54,6 +54,7 @@ int _gnutls_hash_init(digest_hd_st * dig, const mac_entry_st * e)
 		dig->hash = cc->hash;
 		dig->output = cc->output;
 		dig->deinit = cc->deinit;
+		dig->copy = cc->copy;
 
 		return 0;
 	}
@@ -67,6 +68,7 @@ int _gnutls_hash_init(digest_hd_st * dig, const mac_entry_st * e)
 	dig->hash = _gnutls_digest_ops.hash;
 	dig->output = _gnutls_digest_ops.output;
 	dig->deinit = _gnutls_digest_ops.deinit;
+	dig->copy = _gnutls_digest_ops.copy;
 
 	return 0;
 }
@@ -88,6 +90,20 @@ int _gnutls_digest_exists(gnutls_digest_algorithm_t algo)
 	return _gnutls_digest_ops.exists(algo);
 }
 
+int _gnutls_hash_copy(const digest_hd_st * handle, digest_hd_st * dst)
+{
+	if (handle->copy == NULL)
+		return gnutls_assert_val(GNUTLS_E_HASH_FAILED);
+
+	*dst = *handle; /* copy data */
+	dst->handle = handle->copy(handle->handle);
+
+	if (dst->handle == NULL)
+		return GNUTLS_E_HASH_FAILED;
+
+	return 0;
+}
+
 void _gnutls_hash_deinit(digest_hd_st * handle, void *digest)
 {
 	if (handle->handle == NULL) {
@@ -225,6 +241,7 @@ _gnutls_mac_init(mac_hd_st * mac, const mac_entry_st * e,
 		mac->setnonce = cc->setnonce;
 		mac->output = cc->output;
 		mac->deinit = cc->deinit;
+		mac->copy = cc->copy;
 
 		return 0;
 	}
@@ -239,6 +256,7 @@ _gnutls_mac_init(mac_hd_st * mac, const mac_entry_st * e,
 	mac->setnonce = _gnutls_mac_ops.setnonce;
 	mac->output = _gnutls_mac_ops.output;
 	mac->deinit = _gnutls_mac_ops.deinit;
+	mac->copy = _gnutls_mac_ops.copy;
 
 	if (_gnutls_mac_ops.setkey(mac->handle, key, keylen) < 0) {
 		gnutls_assert();
@@ -249,6 +267,20 @@ _gnutls_mac_init(mac_hd_st * mac, const mac_entry_st * e,
 	return 0;
 }
 
+int _gnutls_mac_copy(const mac_hd_st * handle, mac_hd_st * dst)
+{
+	if (handle->copy == NULL)
+		return gnutls_assert_val(GNUTLS_E_HASH_FAILED);
+
+	*dst = *handle; /* copy data */
+	dst->handle = handle->copy(handle->handle);
+
+	if (dst->handle == NULL)
+		return GNUTLS_E_HASH_FAILED;
+
+	return 0;
+}
+
 void _gnutls_mac_deinit(mac_hd_st * handle, void *digest)
 {
 	if (handle->handle == NULL) {
diff --git a/lib/hash_int.h b/lib/hash_int.h
index 52fb2b01f0..9f6059da33 100644
--- a/lib/hash_int.h
+++ b/lib/hash_int.h
@@ -41,12 +41,14 @@ typedef int (*nonce_func) (void *handle, const void *text, size_t size);
 typedef int (*output_func) (void *src_ctx, void *digest,
 			    size_t digestsize);
 typedef void (*hash_deinit_func) (void *handle);
+typedef void *(*copy_func) (const void *handle);
 
 typedef struct {
 	const mac_entry_st *e;
 	hash_func hash;
 	output_func output;
 	hash_deinit_func deinit;
+	copy_func copy;
 
 	const void *key;	/* esoteric use by SSL3 MAC functions */
 	int keysize;
@@ -62,6 +64,7 @@ typedef struct {
 	nonce_func setnonce;
 	output_func output;
 	hash_deinit_func deinit;
+	copy_func copy;
 
 	void *handle;
 } mac_hd_st;
@@ -73,6 +76,8 @@ int _gnutls_mac_exists(gnutls_mac_algorithm_t algorithm);
 int _gnutls_mac_init(mac_hd_st *, const mac_entry_st * e,
 		     const void *key, int keylen);
 
+int _gnutls_mac_copy(const mac_hd_st * handle, mac_hd_st * dst);
+
 int _gnutls_mac_fast(gnutls_mac_algorithm_t algorithm, const void *key,
 		     int keylen, const void *text, size_t textlen,
 		     void *digest);
@@ -122,6 +127,8 @@ _gnutls_hash(digest_hd_st * handle, const void *text, size_t textlen)
 
 void _gnutls_hash_deinit(digest_hd_st * handle, void *digest);
 
+int _gnutls_hash_copy(const digest_hd_st * handle, digest_hd_st * dst);
+
 int
 _gnutls_hash_fast(gnutls_digest_algorithm_t algorithm,
 		  const void *text, size_t textlen, void *digest);
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 4f70b4a568..d2b8cae8f4 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -112,6 +112,7 @@ unsigned gnutls_hmac_get_len(gnutls_mac_algorithm_t algorithm) __GNUTLS_CONST__;
 int gnutls_hmac_fast(gnutls_mac_algorithm_t algorithm,
 		     const void *key, size_t keylen,
 		     const void *text, size_t textlen, void *digest);
+gnutls_hmac_hd_t gnutls_hmac_copy(gnutls_hmac_hd_t handle);
 
 int gnutls_hash_init(gnutls_hash_hd_t * dig,
 		     gnutls_digest_algorithm_t algorithm);
@@ -121,6 +122,7 @@ void gnutls_hash_deinit(gnutls_hash_hd_t handle, void *digest);
 unsigned gnutls_hash_get_len(gnutls_digest_algorithm_t algorithm) __GNUTLS_CONST__;
 int gnutls_hash_fast(gnutls_digest_algorithm_t algorithm,
 		     const void *text, size_t textlen, void *digest);
+gnutls_hash_hd_t gnutls_hash_copy(gnutls_hash_hd_t handle);
 
 /* register ciphers */
 
@@ -186,7 +188,8 @@ gnutls_crypto_register_cipher(gnutls_cipher_algorithm_t algorithm,
 			      gnutls_cipher_setiv_func setiv,
 			      gnutls_cipher_encrypt_func encrypt,
 			      gnutls_cipher_decrypt_func decrypt,
-			      gnutls_cipher_deinit_func deinit);
+			      gnutls_cipher_deinit_func deinit)
+			      _GNUTLS_GCC_ATTR_DEPRECATED;
 
 int
 gnutls_crypto_register_aead_cipher(gnutls_cipher_algorithm_t algorithm,
@@ -195,7 +198,8 @@ gnutls_crypto_register_aead_cipher(gnutls_cipher_algorithm_t algorithm,
 			      gnutls_cipher_setkey_func setkey,
 			      gnutls_cipher_aead_encrypt_func aead_encrypt,
 			      gnutls_cipher_aead_decrypt_func aead_decrypt,
-			      gnutls_cipher_deinit_func deinit);
+			      gnutls_cipher_deinit_func deinit)
+			      _GNUTLS_GCC_ATTR_DEPRECATED;
 
 typedef int (*gnutls_mac_init_func) (gnutls_mac_algorithm_t, void **ctx);
 typedef int (*gnutls_mac_setkey_func) (void *ctx, const void *key, size_t keysize);
@@ -206,6 +210,7 @@ typedef void (*gnutls_mac_deinit_func) (void *ctx);
 typedef int (*gnutls_mac_fast_func) (gnutls_mac_algorithm_t, const void *nonce,
 		     size_t nonce_size, const void *key, size_t keysize,
 		     const void *text, size_t textsize, void *digest);
+typedef void *(*gnutls_mac_copy_func) (const void *ctx);
 
 int
 gnutls_crypto_register_mac(gnutls_mac_algorithm_t mac,
@@ -216,7 +221,8 @@ gnutls_crypto_register_mac(gnutls_mac_algorithm_t mac,
 			   gnutls_mac_hash_func hash,
 			   gnutls_mac_output_func output,
 			   gnutls_mac_deinit_func deinit,
-			   gnutls_mac_fast_func hash_fast);
+			   gnutls_mac_fast_func hash_fast)
+			   _GNUTLS_GCC_ATTR_DEPRECATED;
 
 typedef int (*gnutls_digest_init_func) (gnutls_digest_algorithm_t, void **ctx);
 typedef int (*gnutls_digest_hash_func) (void *ctx, const void *text, size_t textsize);
@@ -224,6 +230,7 @@ typedef int (*gnutls_digest_output_func) (void *src_ctx, void *digest, size_t di
 typedef void (*gnutls_digest_deinit_func) (void *ctx);
 typedef int (*gnutls_digest_fast_func) (gnutls_digest_algorithm_t,
 		     const void *text, size_t textsize, void *digest);
+typedef void *(*gnutls_digest_copy_func) (const void *ctx);
 
 int
 gnutls_crypto_register_digest(gnutls_digest_algorithm_t digest,
@@ -232,7 +239,8 @@ gnutls_crypto_register_digest(gnutls_digest_algorithm_t digest,
 			   gnutls_digest_hash_func hash,
 			   gnutls_digest_output_func output,
 			   gnutls_digest_deinit_func deinit,
-			   gnutls_digest_fast_func hash_fast);
+			   gnutls_digest_fast_func hash_fast)
+			   _GNUTLS_GCC_ATTR_DEPRECATED;
 
 /* RSA-PKCS#1 1.5 helper functions */
 int
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 1555ab3338..11652a8c2b 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -278,10 +278,13 @@ typedef enum {
  * @GNUTLS_MAC_STREEBOG_256: HMAC GOST R 34.11-2001 (Streebog) algorithm, 256 bit.
  * @GNUTLS_MAC_STREEBOG_512: HMAC GOST R 34.11-2001 (Streebog) algorithm, 512 bit.
  * @GNUTLS_MAC_AEAD: MAC implicit through AEAD cipher.
- * @GNUTLS_MAC_UMAC_96: The UMAC-96 MAC algorithm.
- * @GNUTLS_MAC_UMAC_128: The UMAC-128 MAC algorithm.
+ * @GNUTLS_MAC_UMAC_96: The UMAC-96 MAC algorithm (requires nonce).
+ * @GNUTLS_MAC_UMAC_128: The UMAC-128 MAC algorithm (requires nonce).
  * @GNUTLS_MAC_AES_CMAC_128: The AES-CMAC-128 MAC algorithm.
  * @GNUTLS_MAC_AES_CMAC_256: The AES-CMAC-256 MAC algorithm.
+ * @GNUTLS_MAC_AES_GMAC_128: The AES-GMAC-128 MAC algorithm (requires nonce).
+ * @GNUTLS_MAC_AES_GMAC_192: The AES-GMAC-192 MAC algorithm (requires nonce).
+ * @GNUTLS_MAC_AES_GMAC_256: The AES-GMAC-256 MAC algorithm (requires nonce).
  * @GNUTLS_MAC_SHA3_224: Reserved; unimplemented.
  * @GNUTLS_MAC_SHA3_256: Reserved; unimplemented.
  * @GNUTLS_MAC_SHA3_384: Reserved; unimplemented.
@@ -316,6 +319,9 @@ typedef enum {
 	GNUTLS_MAC_UMAC_128 = 202,
 	GNUTLS_MAC_AES_CMAC_128 = 203,
 	GNUTLS_MAC_AES_CMAC_256 = 204,
+	GNUTLS_MAC_AES_GMAC_128 = 205,
+	GNUTLS_MAC_AES_GMAC_192 = 206,
+	GNUTLS_MAC_AES_GMAC_256 = 207,
 } gnutls_mac_algorithm_t;
 
 /**
@@ -1684,6 +1690,8 @@ int gnutls_priority_cipher_list(gnutls_priority_t pcache,
 int gnutls_priority_mac_list(gnutls_priority_t pcache,
 			     const unsigned int **list);
 
+const char *gnutls_get_system_config_file(void);
+
 int gnutls_set_default_priority(gnutls_session_t session);
 int gnutls_set_default_priority_append(gnutls_session_t session,
 				       const char *add_prio,
diff --git a/lib/inih/LICENSE.txt b/lib/inih/LICENSE.txt
new file mode 100644
index 0000000000..cb7ee2d017
--- /dev/null
+++ b/lib/inih/LICENSE.txt
@@ -0,0 +1,27 @@
+
+The "inih" library is distributed under the New BSD license:
+
+Copyright (c) 2009, Ben Hoyt
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Ben Hoyt nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY BEN HOYT ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL BEN HOYT BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/inih/ini.c b/lib/inih/ini.c
new file mode 100644
index 0000000000..81df6a037f
--- /dev/null
+++ b/lib/inih/ini.c
@@ -0,0 +1,269 @@
+/* inih -- simple .INI file parser
+
+inih is released under the New BSD license (see LICENSE.txt). Go to the project
+home page for more info:
+
+https://github.com/benhoyt/inih
+
+*/
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "ini.h"
+
+#if !INI_USE_STACK
+#include <stdlib.h>
+#endif
+
+#define MAX_SECTION 50
+#define MAX_NAME 50
+
+/* Used by ini_parse_string() to keep track of string parsing state. */
+typedef struct {
+    const char* ptr;
+    size_t num_left;
+} ini_parse_string_ctx;
+
+/* Strip whitespace chars off end of given string, in place. Return s. */
+static char* rstrip(char* s)
+{
+    char* p = s + strlen(s);
+    while (p > s && isspace((unsigned char)(*--p)))
+        *p = '\0';
+    return s;
+}
+
+/* Return pointer to first non-whitespace char in given string. */
+static char* lskip(const char* s)
+{
+    while (*s && isspace((unsigned char)(*s)))
+        s++;
+    return (char*)s;
+}
+
+/* Return pointer to first char (of chars) or inline comment in given string,
+   or pointer to null at end of string if neither found. Inline comment must
+   be prefixed by a whitespace character to register as a comment. */
+static char* find_chars_or_comment(const char* s, const char* chars)
+{
+#if INI_ALLOW_INLINE_COMMENTS
+    int was_space = 0;
+    while (*s && (!chars || !strchr(chars, *s)) &&
+           !(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) {
+        was_space = isspace((unsigned char)(*s));
+        s++;
+    }
+#else
+    while (*s && (!chars || !strchr(chars, *s))) {
+        s++;
+    }
+#endif
+    return (char*)s;
+}
+
+/* Version of strncpy that ensures dest (size bytes) is null-terminated. */
+static char* strncpy0(char* dest, const char* src, size_t size)
+{
+    strncpy(dest, src, size - 1);
+    dest[size - 1] = '\0';
+    return dest;
+}
+
+/* See documentation in header file. */
+int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
+                     void* user)
+{
+    /* Uses a fair bit of stack (use heap instead if you need to) */
+#if INI_USE_STACK
+    char line[INI_MAX_LINE];
+    int max_line = INI_MAX_LINE;
+#else
+    char* line;
+    int max_line = INI_INITIAL_ALLOC;
+#endif
+#if INI_ALLOW_REALLOC && !INI_USE_STACK
+    char* new_line;
+    int offset;
+#endif
+    char section[MAX_SECTION] = "";
+    char prev_name[MAX_NAME] = "";
+
+    char* start;
+    char* end;
+    char* name;
+    char* value;
+    int lineno = 0;
+    int error = 0;
+
+#if !INI_USE_STACK
+    line = (char*)malloc(INI_INITIAL_ALLOC);
+    if (!line) {
+        return -2;
+    }
+#endif
+
+#if INI_HANDLER_LINENO
+#define HANDLER(u, s, n, v) handler(u, s, n, v, lineno)
+#else
+#define HANDLER(u, s, n, v) handler(u, s, n, v)
+#endif
+
+    /* Scan through stream line by line */
+    while (reader(line, max_line, stream) != NULL) {
+#if INI_ALLOW_REALLOC && !INI_USE_STACK
+        offset = strlen(line);
+        while (offset == max_line - 1 && line[offset - 1] != '\n') {
+            max_line *= 2;
+            if (max_line > INI_MAX_LINE)
+                max_line = INI_MAX_LINE;
+            new_line = realloc(line, max_line);
+            if (!new_line) {
+                free(line);
+                return -2;
+            }
+            line = new_line;
+            if (reader(line + offset, max_line - offset, stream) == NULL)
+                break;
+            if (max_line >= INI_MAX_LINE)
+                break;
+            offset += strlen(line + offset);
+        }
+#endif
+
+        lineno++;
+
+        start = line;
+#if INI_ALLOW_BOM
+        if (lineno == 1 && (unsigned char)start[0] == 0xEF &&
+                           (unsigned char)start[1] == 0xBB &&
+                           (unsigned char)start[2] == 0xBF) {
+            start += 3;
+        }
+#endif
+        start = lskip(rstrip(start));
+
+        if (strchr(INI_START_COMMENT_PREFIXES, *start)) {
+            /* Start-of-line comment */
+        }
+#if INI_ALLOW_MULTILINE
+        else if (*prev_name && *start && start > line) {
+            /* Non-blank line with leading whitespace, treat as continuation
+               of previous name's value (as per Python configparser). */
+            if (!HANDLER(user, section, prev_name, start) && !error)
+                error = lineno;
+        }
+#endif
+        else if (*start == '[') {
+            /* A "[section]" line */
+            end = find_chars_or_comment(start + 1, "]");
+            if (*end == ']') {
+                *end = '\0';
+                strncpy0(section, start + 1, sizeof(section));
+                *prev_name = '\0';
+            }
+            else if (!error) {
+                /* No ']' found on section line */
+                error = lineno;
+            }
+        }
+        else if (*start) {
+            /* Not a comment, must be a name[=:]value pair */
+            end = find_chars_or_comment(start, "=:");
+            if (*end == '=' || *end == ':') {
+                *end = '\0';
+                name = rstrip(start);
+                value = end + 1;
+#if INI_ALLOW_INLINE_COMMENTS
+                end = find_chars_or_comment(value, NULL);
+                if (*end)
+                    *end = '\0';
+#endif
+                value = lskip(value);
+                rstrip(value);
+
+                /* Valid name[=:]value pair found, call handler */
+                strncpy0(prev_name, name, sizeof(prev_name));
+                if (!HANDLER(user, section, name, value) && !error)
+                    error = lineno;
+            }
+            else if (!error) {
+                /* No '=' or ':' found on name[=:]value line */
+                error = lineno;
+            }
+        }
+
+#if INI_STOP_ON_FIRST_ERROR
+        if (error)
+            break;
+#endif
+    }
+
+#if !INI_USE_STACK
+    free(line);
+#endif
+
+    return error;
+}
+
+/* See documentation in header file. */
+int ini_parse_file(FILE* file, ini_handler handler, void* user)
+{
+    return ini_parse_stream((ini_reader)fgets, file, handler, user);
+}
+
+/* See documentation in header file. */
+int ini_parse(const char* filename, ini_handler handler, void* user)
+{
+    FILE* file;
+    int error;
+
+    file = fopen(filename, "r");
+    if (!file)
+        return -1;
+    error = ini_parse_file(file, handler, user);
+    fclose(file);
+    return error;
+}
+
+/* An ini_reader function to read the next line from a string buffer. This
+   is the fgets() equivalent used by ini_parse_string(). */
+static char* ini_reader_string(char* str, int num, void* stream) {
+    ini_parse_string_ctx* ctx = (ini_parse_string_ctx*)stream;
+    const char* ctx_ptr = ctx->ptr;
+    size_t ctx_num_left = ctx->num_left;
+    char* strp = str;
+    char c;
+
+    if (ctx_num_left == 0 || num < 2)
+        return NULL;
+
+    while (num > 1 && ctx_num_left != 0) {
+        c = *ctx_ptr++;
+        ctx_num_left--;
+        *strp++ = c;
+        if (c == '\n')
+            break;
+        num--;
+    }
+
+    *strp = '\0';
+    ctx->ptr = ctx_ptr;
+    ctx->num_left = ctx_num_left;
+    return str;
+}
+
+/* See documentation in header file. */
+int ini_parse_string(const char* string, ini_handler handler, void* user) {
+    ini_parse_string_ctx ctx;
+
+    ctx.ptr = string;
+    ctx.num_left = strlen(string);
+    return ini_parse_stream((ini_reader)ini_reader_string, &ctx, handler,
+                            user);
+}
diff --git a/lib/inih/ini.h b/lib/inih/ini.h
new file mode 100644
index 0000000000..6c3d664d2e
--- /dev/null
+++ b/lib/inih/ini.h
@@ -0,0 +1,131 @@
+/* inih -- simple .INI file parser
+
+inih is released under the New BSD license (see LICENSE.txt). Go to the project
+home page for more info:
+
+https://github.com/benhoyt/inih
+
+*/
+
+#ifndef __INI_H__
+#define __INI_H__
+
+/* Make this header file easier to include in C++ code */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <config.h>
+
+/* Nonzero if ini_handler callback should accept lineno parameter. */
+#ifndef INI_HANDLER_LINENO
+#define INI_HANDLER_LINENO 0
+#endif
+
+/* Typedef for prototype of handler function. */
+#if INI_HANDLER_LINENO
+typedef int (*ini_handler)(void* user, const char* section,
+                           const char* name, const char* value,
+                           int lineno);
+#else
+typedef int (*ini_handler)(void* user, const char* section,
+                           const char* name, const char* value);
+#endif
+
+/* Typedef for prototype of fgets-style reader function. */
+typedef char* (*ini_reader)(char* str, int num, void* stream);
+
+/* Parse given INI-style file. May have [section]s, name=value pairs
+   (whitespace stripped), and comments starting with ';' (semicolon). Section
+   is "" if name=value pair parsed before any section heading. name:value
+   pairs are also supported as a concession to Python's configparser.
+
+   For each name=value pair parsed, call handler function with given user
+   pointer as well as section, name, and value (data only valid for duration
+   of handler call). Handler should return nonzero on success, zero on error.
+
+   Returns 0 on success, line number of first error on parse error (doesn't
+   stop on first error), -1 on file open error, or -2 on memory allocation
+   error (only when INI_USE_STACK is zero).
+*/
+int ini_parse(const char* filename, ini_handler handler, void* user);
+
+/* Same as ini_parse(), but takes a FILE* instead of filename. This doesn't
+   close the file when it's finished -- the caller must do that. */
+int ini_parse_file(FILE* file, ini_handler handler, void* user);
+
+/* Same as ini_parse(), but takes an ini_reader function pointer instead of
+   filename. Used for implementing custom or string-based I/O (see also
+   ini_parse_string). */
+int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
+                     void* user);
+
+/* Same as ini_parse(), but takes a zero-terminated string with the INI data
+instead of a file. Useful for parsing INI data from a network socket or
+already in memory. */
+int ini_parse_string(const char* string, ini_handler handler, void* user);
+
+/* Nonzero to allow multi-line value parsing, in the style of Python's
+   configparser. If allowed, ini_parse() will call the handler with the same
+   name for each subsequent line parsed. */
+#ifndef INI_ALLOW_MULTILINE
+#define INI_ALLOW_MULTILINE 1
+#endif
+
+/* Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of
+   the file. See https://github.com/benhoyt/inih/issues/21 */
+#ifndef INI_ALLOW_BOM
+#define INI_ALLOW_BOM 1
+#endif
+
+/* Chars that begin a start-of-line comment. Per Python configparser, allow
+   both ; and # comments at the start of a line by default. */
+#ifndef INI_START_COMMENT_PREFIXES
+#define INI_START_COMMENT_PREFIXES ";#"
+#endif
+
+/* Nonzero to allow inline comments (with valid inline comment characters
+   specified by INI_INLINE_COMMENT_PREFIXES). Set to 0 to turn off and match
+   Python 3.2+ configparser behaviour. */
+#ifndef INI_ALLOW_INLINE_COMMENTS
+#define INI_ALLOW_INLINE_COMMENTS 1
+#endif
+#ifndef INI_INLINE_COMMENT_PREFIXES
+#define INI_INLINE_COMMENT_PREFIXES ";"
+#endif
+
+/* Nonzero to use stack for line buffer, zero to use heap (malloc/free). */
+#ifndef INI_USE_STACK
+#define INI_USE_STACK 1
+#endif
+
+/* Maximum line length for any line in INI file (stack or heap). Note that
+   this must be 3 more than the longest line (due to '\r', '\n', and '\0'). */
+#ifndef INI_MAX_LINE
+#define INI_MAX_LINE 200
+#endif
+
+/* Nonzero to allow heap line buffer to grow via realloc(), zero for a
+   fixed-size buffer of INI_MAX_LINE bytes. Only applies if INI_USE_STACK is
+   zero. */
+#ifndef INI_ALLOW_REALLOC
+#define INI_ALLOW_REALLOC 0
+#endif
+
+/* Initial size in bytes for heap line buffer. Only applies if INI_USE_STACK
+   is zero. */
+#ifndef INI_INITIAL_ALLOC
+#define INI_INITIAL_ALLOC 200
+#endif
+
+/* Stop parsing on first error (default is to keep parsing). */
+#ifndef INI_STOP_ON_FIRST_ERROR
+#define INI_STOP_ON_FIRST_ERROR 0
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __INI_H__ */
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 836e75eb87..0f31f4aef4 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -1286,6 +1286,14 @@ GNUTLS_3_6_8
 	gnutls_ffdhe_8192_group_q;
 } GNUTLS_3_6_6;
 
+GNUTLS_3_6_9
+{
+ global:
+	gnutls_get_system_config_file;
+	gnutls_hmac_copy;
+	gnutls_hash_copy;
+} GNUTLS_3_6_8;
+
 GNUTLS_FIPS140_3_4 {
   global:
 	gnutls_cipher_self_test;
@@ -1374,4 +1382,6 @@ GNUTLS_PRIVATE_3_4 {
 	_gnutls_global_set_gettime_function;
 	# Internal symbols needed by tests/tls13/anti_replay.c
 	_gnutls_anti_replay_check;
+	# needed by gnutls-strcodes.c
+	_gnutls_ecc_curve_is_supported;
 } GNUTLS_3_4;
diff --git a/lib/name_val_array.h b/lib/name_val_array.h
new file mode 100644
index 0000000000..e4b3754df1
--- /dev/null
+++ b/lib/name_val_array.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2011-2019 Free Software Foundation, Inc.
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * The GnuTLS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef GNUTLS_NAME_VAL_ARRAY_H
+#define GNUTLS_NAME_VAL_ARRAY_H
+
+#include "gnutls_int.h"
+#include "errors.h"
+
+/* Functionality to allow an array of strings. Strings
+ * are allowed to be added to the list and matched against it.
+ */
+
+typedef struct name_val_array_st {
+	char *name;
+	unsigned name_size;
+	char *val;
+	struct name_val_array_st *next;
+} *name_val_array_t;
+
+inline static void _name_val_array_init(name_val_array_t * head)
+{
+	*head = NULL;
+}
+
+inline static void _name_val_array_clear(name_val_array_t * head)
+{
+	name_val_array_t prev, array = *head;
+
+	while (array != NULL) {
+		prev = array;
+		array = prev->next;
+		gnutls_free(prev);
+	}
+	*head = NULL;
+}
+
+inline static const char *_name_val_array_value(name_val_array_t head,
+					        const char *name, unsigned name_size)
+{
+	name_val_array_t array = head;
+
+	while (array != NULL) {
+		if (array->name_size == name_size &&
+		    memcmp(array->name, name, name_size) == 0) {
+			return array->val;
+		}
+		array = array->next;
+	}
+
+	return NULL;
+}
+
+inline static void append(name_val_array_t array, const char *name,
+			  unsigned name_len, const char *val,
+			  unsigned val_len)
+{
+	array->name = ((char *) array) + sizeof(struct name_val_array_st);
+	memcpy(array->name, name, name_len);
+	array->name[name_len] = 0;
+	array->name_size = name_len;
+
+	array->val = ((char *) array) + name_len + 1 + sizeof(struct name_val_array_st);
+	if (val)
+		memcpy(array->val, val, val_len);
+	array->val[val_len] = 0;
+
+	array->next = NULL;
+}
+
+inline static int _name_val_array_append(name_val_array_t * head,
+					 const char *name,
+					 const char *val)
+{
+	name_val_array_t prev, array;
+	unsigned name_len = strlen(name);
+	unsigned val_len = (val==NULL)?0:strlen(val);
+
+	if (*head == NULL) {
+		*head =
+		    gnutls_malloc(val_len + name_len + 2 +
+				  sizeof(struct name_val_array_st));
+		if (*head == NULL)
+			return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
+
+		array = *head;
+		append(array, name, name_len, val, val_len);
+	} else {
+		array = *head;
+		prev = array;
+
+		while (array != NULL) {
+			prev = array;
+			array = prev->next;
+		}
+		prev->next =
+		    gnutls_malloc(name_len + val_len + 2 +
+				  sizeof(struct name_val_array_st));
+		array = prev->next;
+
+		if (array == NULL)
+			return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
+
+		append(array, name, name_len, val, val_len);
+	}
+
+	return 0;
+}
+
+#endif
diff --git a/lib/nettle/mac.c b/lib/nettle/mac.c
index 249ff2e2d7..5e8bcec0a7 100644
--- a/lib/nettle/mac.c
+++ b/lib/nettle/mac.c
@@ -42,6 +42,7 @@
 #else
 #include "cmac.h"
 #endif /* HAVE_NETTLE_CMAC128_UPDATE */
+#include <nettle/gcm.h>
 
 typedef void (*update_func) (void *, size_t, const uint8_t *);
 typedef void (*digest_func) (void *, size_t, uint8_t *);
@@ -56,6 +57,19 @@ struct md5_sha1_ctx {
 	struct sha1_ctx sha1;
 };
 
+struct gmac_ctx {
+	unsigned int pos;
+	uint8_t buffer[GCM_BLOCK_SIZE];
+	struct gcm_key key;
+	struct gcm_ctx ctx;
+	nettle_cipher_func *encrypt;
+	union {
+		struct aes128_ctx aes128;
+		struct aes192_ctx aes192;
+		struct aes256_ctx aes256;
+	} cipher;
+};
+
 struct nettle_hash_ctx {
 	union {
 		struct md5_ctx md5;
@@ -100,6 +114,7 @@ struct nettle_mac_ctx {
 		struct umac128_ctx umac128;
                 struct cmac_aes128_ctx cmac128;
                 struct cmac_aes256_ctx cmac256;
+		struct gmac_ctx gmac;
 	} ctx;
 
 	void *ctx_ptr;
@@ -143,6 +158,88 @@ _wrap_cmac256_set_key(void *ctx, size_t len, const uint8_t * key)
 	cmac_aes256_set_key(ctx, key);
 }
 
+static void
+_wrap_gmac_aes128_set_key(void *_ctx, size_t len, const uint8_t * key)
+{
+	struct gmac_ctx *ctx = _ctx;
+
+	if (unlikely(len != 16))
+		abort();
+	aes128_set_encrypt_key(&ctx->cipher.aes128, key);
+	gcm_set_key(&ctx->key, &ctx->cipher, ctx->encrypt);
+	ctx->pos = 0;
+}
+
+static void
+_wrap_gmac_aes192_set_key(void *_ctx, size_t len, const uint8_t * key)
+{
+	struct gmac_ctx *ctx = _ctx;
+
+	if (unlikely(len != 24))
+		abort();
+	aes192_set_encrypt_key(&ctx->cipher.aes192, key);
+	gcm_set_key(&ctx->key, &ctx->cipher, ctx->encrypt);
+	ctx->pos = 0;
+}
+
+static void
+_wrap_gmac_aes256_set_key(void *_ctx, size_t len, const uint8_t * key)
+{
+	struct gmac_ctx *ctx = _ctx;
+
+	if (unlikely(len != 32))
+		abort();
+	aes256_set_encrypt_key(&ctx->cipher.aes256, key);
+	gcm_set_key(&ctx->key, &ctx->cipher, ctx->encrypt);
+	ctx->pos = 0;
+}
+
+static void _wrap_gmac_set_nonce(void *_ctx, size_t nonce_length, const uint8_t *nonce)
+{
+	struct gmac_ctx *ctx = _ctx;
+
+	gcm_set_iv(&ctx->ctx, &ctx->key, nonce_length, nonce);
+}
+
+static void _wrap_gmac_update(void *_ctx, size_t length, const uint8_t *data)
+{
+	struct gmac_ctx *ctx = _ctx;
+
+	if (ctx->pos + length < GCM_BLOCK_SIZE) {
+		memcpy(&ctx->buffer[ctx->pos], data, length);
+		ctx->pos += length;
+		return;
+	}
+
+	if (ctx->pos) {
+		memcpy(&ctx->buffer[ctx->pos], data, GCM_BLOCK_SIZE - ctx->pos);
+		gcm_update(&ctx->ctx, &ctx->key, GCM_BLOCK_SIZE, ctx->buffer);
+		data += GCM_BLOCK_SIZE - ctx->pos;
+		length -= GCM_BLOCK_SIZE - ctx->pos;
+	}
+
+	if (length >= GCM_BLOCK_SIZE) {
+		gcm_update(&ctx->ctx, &ctx->key,
+			   length / GCM_BLOCK_SIZE * GCM_BLOCK_SIZE,
+			   data);
+		data += length / GCM_BLOCK_SIZE * GCM_BLOCK_SIZE;
+		length %= GCM_BLOCK_SIZE;
+	}
+
+	memcpy(ctx->buffer, data, length);
+	ctx->pos = length;
+}
+
+static void _wrap_gmac_digest(void *_ctx, size_t length, uint8_t *digest)
+{
+	struct gmac_ctx *ctx = _ctx;
+
+	if (ctx->pos)
+		gcm_update(&ctx->ctx, &ctx->key, ctx->pos, ctx->buffer);
+	gcm_digest(&ctx->ctx, &ctx->key, &ctx->cipher, ctx->encrypt, length, digest);
+	ctx->pos = 0;
+}
+
 static int _mac_ctx_init(gnutls_mac_algorithm_t algo,
 			 struct nettle_mac_ctx *ctx)
 {
@@ -246,6 +343,33 @@ static int _mac_ctx_init(gnutls_mac_algorithm_t algo,
 		ctx->ctx_ptr = &ctx->ctx.cmac256;
 		ctx->length = CMAC128_DIGEST_SIZE;
 		break;
+	case GNUTLS_MAC_AES_GMAC_128:
+		ctx->set_key = _wrap_gmac_aes128_set_key;
+		ctx->set_nonce = _wrap_gmac_set_nonce;
+		ctx->update = _wrap_gmac_update;
+		ctx->digest = _wrap_gmac_digest;
+		ctx->ctx_ptr = &ctx->ctx.gmac;
+		ctx->length = GCM_DIGEST_SIZE;
+		ctx->ctx.gmac.encrypt = (nettle_cipher_func *)aes128_encrypt;
+		break;
+	case GNUTLS_MAC_AES_GMAC_192:
+		ctx->set_key = _wrap_gmac_aes192_set_key;
+		ctx->set_nonce = _wrap_gmac_set_nonce;
+		ctx->update = _wrap_gmac_update;
+		ctx->digest = _wrap_gmac_digest;
+		ctx->ctx_ptr = &ctx->ctx.gmac;
+		ctx->length = GCM_DIGEST_SIZE;
+		ctx->ctx.gmac.encrypt = (nettle_cipher_func *)aes192_encrypt;
+		break;
+	case GNUTLS_MAC_AES_GMAC_256:
+		ctx->set_key = _wrap_gmac_aes256_set_key;
+		ctx->set_nonce = _wrap_gmac_set_nonce;
+		ctx->update = _wrap_gmac_update;
+		ctx->digest = _wrap_gmac_digest;
+		ctx->ctx_ptr = &ctx->ctx.gmac;
+		ctx->length = GCM_DIGEST_SIZE;
+		ctx->ctx.gmac.encrypt = (nettle_cipher_func *)aes256_encrypt;
+		break;
 	default:
 		gnutls_assert();
 		return GNUTLS_E_INVALID_REQUEST;
@@ -267,9 +391,13 @@ static int wrap_nettle_mac_fast(gnutls_mac_algorithm_t algo,
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
-	if (ctx.set_nonce)
-		ctx.set_nonce(&ctx, nonce_size, nonce);
 	ctx.set_key(&ctx, key_size, key);
+	if (ctx.set_nonce) {
+		if (nonce == NULL || nonce_size == 0)
+			return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+
+		ctx.set_nonce(&ctx, nonce_size, nonce);
+	}
 	ctx.update(&ctx, text_size, text);
 	ctx.digest(&ctx, ctx.length, digest);
 	
@@ -289,6 +417,11 @@ static int wrap_nettle_mac_exists(gnutls_mac_algorithm_t algo)
 	case GNUTLS_MAC_SHA512:
 	case GNUTLS_MAC_UMAC_96:
 	case GNUTLS_MAC_UMAC_128:
+	case GNUTLS_MAC_AES_CMAC_128:
+	case GNUTLS_MAC_AES_CMAC_256:
+	case GNUTLS_MAC_AES_GMAC_128:
+	case GNUTLS_MAC_AES_GMAC_192:
+	case GNUTLS_MAC_AES_GMAC_256:
 #if ENABLE_GOST
 	case GNUTLS_MAC_GOSTR_94:
 	case GNUTLS_MAC_STREEBOG_256:
@@ -324,6 +457,22 @@ static int wrap_nettle_mac_init(gnutls_mac_algorithm_t algo, void **_ctx)
 	return 0;
 }
 
+static void *wrap_nettle_mac_copy(const void *_ctx)
+{
+	const struct nettle_mac_ctx *ctx = _ctx;
+	struct nettle_mac_ctx *new_ctx;
+	ptrdiff_t off = (uint8_t *)ctx->ctx_ptr - (uint8_t *)(&ctx->ctx);
+
+	new_ctx = gnutls_calloc(1, sizeof(struct nettle_mac_ctx));
+	if (new_ctx == NULL)
+		return NULL;
+
+	memcpy(new_ctx, ctx, sizeof(*ctx));
+	new_ctx->ctx_ptr = (uint8_t *)&new_ctx->ctx + off;
+
+	return new_ctx;
+}
+
 static int
 wrap_nettle_mac_set_key(void *_ctx, const void *key, size_t keylen)
 {
@@ -339,7 +488,10 @@ wrap_nettle_mac_set_nonce(void *_ctx, const void *nonce, size_t noncelen)
 	struct nettle_mac_ctx *ctx = _ctx;
 
 	if (ctx->set_nonce == NULL)
-		return GNUTLS_E_INVALID_REQUEST;
+		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+
+	if (nonce == NULL || noncelen == 0)
+		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
 
 	ctx->set_nonce(ctx->ctx_ptr, noncelen, nonce);
 
@@ -616,6 +768,22 @@ wrap_nettle_hash_init(gnutls_digest_algorithm_t algo, void **_ctx)
 	return 0;
 }
 
+static void *wrap_nettle_hash_copy(const void *_ctx)
+{
+	const struct nettle_hash_ctx *ctx = _ctx;
+	struct nettle_hash_ctx *new_ctx;
+	ptrdiff_t off = (uint8_t *)ctx->ctx_ptr - (uint8_t *)(&ctx->ctx);
+
+	new_ctx = gnutls_calloc(1, sizeof(struct nettle_hash_ctx));
+	if (new_ctx == NULL)
+		return NULL;
+
+	memcpy(new_ctx, ctx, sizeof(*ctx));
+	new_ctx->ctx_ptr = (uint8_t *)&new_ctx->ctx + off;
+
+	return new_ctx;
+}
+
 static int
 wrap_nettle_hash_output(void *src_ctx, void *digest, size_t digestsize)
 {
@@ -641,6 +809,7 @@ gnutls_crypto_mac_st _gnutls_mac_ops = {
 	.deinit = wrap_nettle_mac_deinit,
 	.fast = wrap_nettle_mac_fast,
 	.exists = wrap_nettle_mac_exists,
+	.copy = wrap_nettle_mac_copy,
 };
 
 gnutls_crypto_digest_st _gnutls_digest_ops = {
@@ -650,4 +819,5 @@ gnutls_crypto_digest_st _gnutls_digest_ops = {
 	.deinit = wrap_nettle_hash_deinit,
 	.fast = wrap_nettle_hash_fast,
 	.exists = wrap_nettle_hash_exists,
+	.copy = wrap_nettle_hash_copy,
 };
diff --git a/lib/nettle/rnd-fips.c b/lib/nettle/rnd-fips.c
index ee68cf68d5..ccb92d25a2 100644
--- a/lib/nettle/rnd-fips.c
+++ b/lib/nettle/rnd-fips.c
@@ -27,12 +27,13 @@
 
 #include "gnutls_int.h"
 #include "errors.h"
-#include <nettle/aes.h>
-#include <nettle/memxor.h>
-#include <locks.h>
+#include <nettle/sha2.h>
 #include <atfork.h>
 #include <rnd-common.h>
 
+/* The block size is chosen arbitrarily */
+#define ENTROPY_BLOCK_SIZE SHA256_DIGEST_SIZE
+
 /* This provides a random generator for gnutls. It uses
  * two instances of the DRBG-AES-CTR generator, one for
  * nonce level and another for the other levels of randomness.
@@ -41,11 +42,13 @@ struct fips_ctx {
 	struct drbg_aes_ctx nonce_context;
 	struct drbg_aes_ctx normal_context;
 	unsigned int forkid;
+	uint8_t entropy_hash[SHA256_DIGEST_SIZE];
 };
 
 static int _rngfips_ctx_reinit(struct fips_ctx *fctx);
 static int _rngfips_ctx_init(struct fips_ctx *fctx);
-static int drbg_reseed(struct drbg_aes_ctx *ctx);
+static int drbg_reseed(struct fips_ctx *fctx, struct drbg_aes_ctx *ctx);
+static int get_entropy(struct fips_ctx *fctx, uint8_t *buffer, size_t length);
 
 static int get_random(struct drbg_aes_ctx *ctx, struct fips_ctx *fctx,
 		      void *buffer, size_t length)
@@ -59,7 +62,7 @@ static int get_random(struct drbg_aes_ctx *ctx, struct fips_ctx *fctx,
 	}
 
 	if (ctx->reseed_counter > DRBG_AES_RESEED_TIME) {
-		ret = drbg_reseed(ctx);
+		ret = drbg_reseed(fctx, ctx);
 		if (ret < 0)
 			return gnutls_assert_val(ret);
 	}
@@ -71,54 +74,111 @@ static int get_random(struct drbg_aes_ctx *ctx, struct fips_ctx *fctx,
 	return 0;
 }
 
+static int get_entropy(struct fips_ctx *fctx, uint8_t *buffer, size_t length)
+{
+	int ret;
+	uint8_t block[ENTROPY_BLOCK_SIZE];
+	uint8_t hash[SHA256_DIGEST_SIZE];
+	struct sha256_ctx ctx;
+	size_t total = 0;
+
+	/* For FIPS 140-2 4.9.2 continuous random number generator
+	 * test, iteratively fetch fixed sized block from the system
+	 * RNG and compare consecutive blocks.
+	 *
+	 * Note that we store the hash of the entropy block rather
+	 * than the block itself for backward secrecy.
+	 */
+	while (total < length) {
+		ret = _rnd_get_system_entropy(block, ENTROPY_BLOCK_SIZE);
+		if (ret < 0)
+			return gnutls_assert_val(ret);
+
+		sha256_init(&ctx);
+		sha256_update(&ctx, sizeof(block), block);
+		sha256_digest(&ctx, sizeof(hash), hash);
+
+		if (memcmp(hash, fctx->entropy_hash, sizeof(hash)) == 0) {
+			_gnutls_switch_lib_state(LIB_STATE_ERROR);
+			return gnutls_assert_val(GNUTLS_E_RANDOM_FAILED);
+		}
+		memcpy(fctx->entropy_hash, hash, sizeof(hash));
+
+		memcpy(buffer, block, MIN(length - total, sizeof(block)));
+		total += sizeof(block);
+		buffer += sizeof(block);
+	}
+	zeroize_key(block, sizeof(block));
+
+	return 0;
+}
+
 #define PSTRING "gnutls-rng"
 #define PSTRING_SIZE (sizeof(PSTRING)-1)
-static int drbg_init(struct drbg_aes_ctx *ctx)
+static int drbg_init(struct fips_ctx *fctx, struct drbg_aes_ctx *ctx)
 {
 	uint8_t buffer[DRBG_AES_SEED_SIZE];
 	int ret;
 
-	/* Get a key from the standard RNG or from the entropy source.  */
-	ret = _rnd_get_system_entropy(buffer, sizeof(buffer));
+	ret = get_entropy(fctx, buffer, sizeof(buffer));
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
-	ret = drbg_aes_init(ctx, sizeof(buffer), buffer, PSTRING_SIZE, (void*)PSTRING);
+	ret = drbg_aes_init(ctx, sizeof(buffer), buffer,
+			    PSTRING_SIZE, (void*)PSTRING);
+	zeroize_key(buffer, sizeof(buffer));
 	if (ret == 0)
 		return gnutls_assert_val(GNUTLS_E_RANDOM_FAILED);
 
-	zeroize_key(buffer, sizeof(buffer));
-
-	return 0;
+	return GNUTLS_E_SUCCESS;
 }
 
 /* Reseed a generator. */
-static int drbg_reseed(struct drbg_aes_ctx *ctx)
+static int drbg_reseed(struct fips_ctx *fctx, struct drbg_aes_ctx *ctx)
 {
 	uint8_t buffer[DRBG_AES_SEED_SIZE];
 	int ret;
 
-	/* The other two generators are seeded from /dev/random.  */
-	ret = _rnd_get_system_entropy(buffer, sizeof(buffer));
+	ret = get_entropy(fctx, buffer, sizeof(buffer));
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
-	drbg_aes_reseed(ctx, sizeof(buffer), buffer, 0, NULL);
+	ret = drbg_aes_reseed(ctx, sizeof(buffer), buffer, 0, NULL);
+	zeroize_key(buffer, sizeof(buffer));
+	if (ret == 0)
+		return gnutls_assert_val(GNUTLS_E_RANDOM_FAILED);
 
-	return 0;
+	return GNUTLS_E_SUCCESS;
 }
 
 static int _rngfips_ctx_init(struct fips_ctx *fctx)
 {
+	uint8_t block[ENTROPY_BLOCK_SIZE];
+	struct sha256_ctx ctx;
 	int ret;
 
+	/* For FIPS 140-2 4.9.2 continuous random number generator
+	 * test, get the initial entropy from the system RNG and keep
+	 * it for comparison.
+	 *
+	 * Note that we store the hash of the entropy block rather
+	 * than the block itself for backward secrecy.
+	 */
+	ret = _rnd_get_system_entropy(block, sizeof(block));
+	if (ret < 0)
+		return gnutls_assert_val(ret);
+	sha256_init(&ctx);
+	sha256_update(&ctx, sizeof(block), block);
+	zeroize_key(block, sizeof(block));
+	sha256_digest(&ctx, sizeof(fctx->entropy_hash), fctx->entropy_hash);
+
 	/* normal */
-	ret = drbg_init(&fctx->normal_context);
+	ret = drbg_init(fctx, &fctx->normal_context);
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
 	/* nonce */
-	ret = drbg_init(&fctx->nonce_context);
+	ret = drbg_init(fctx, &fctx->nonce_context);
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
@@ -132,12 +192,12 @@ static int _rngfips_ctx_reinit(struct fips_ctx *fctx)
 	int ret;
 
 	/* normal */
-	ret = drbg_reseed(&fctx->normal_context);
+	ret = drbg_reseed(fctx, &fctx->normal_context);
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
 	/* nonce */
-	ret = drbg_reseed(&fctx->nonce_context);
+	ret = drbg_reseed(fctx, &fctx->nonce_context);
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
diff --git a/lib/pk.c b/lib/pk.c
index 1887063eb0..debcc2ac09 100644
--- a/lib/pk.c
+++ b/lib/pk.c
@@ -598,6 +598,10 @@ encode_ber_digest_info(const mac_entry_st * e,
 	uint8_t *tmp_output;
 	int tmp_output_size;
 
+	/* prevent asn1_write_value() treating input as string */
+	if (digest->size == 0)
+		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+
 	algo = _gnutls_x509_mac_to_oid(e);
 	if (algo == NULL) {
 		gnutls_assert();
diff --git a/lib/priority.c b/lib/priority.c
index 746eae05a4..de9dd4264c 100644
--- a/lib/priority.c
+++ b/lib/priority.c
@@ -38,6 +38,9 @@
 #include <gnutls/gnutls.h>
 #include "profiles.h"
 #include "c-strcase.h"
+#include "inih/ini.h"
+#include "profiles.h"
+#include "name_val_array.h"
 
 #define MAX_ELEMENTS 64
 
@@ -944,91 +947,314 @@ static void dummy_func(gnutls_priority_t c)
 
 #include <priority_options.h>
 
-static char *check_str(char *line, size_t line_size, const char *needle, size_t needle_size)
+static gnutls_certificate_verification_profiles_t system_wide_verification_profile = GNUTLS_PROFILE_UNKNOWN;
+static name_val_array_t system_wide_priority_strings = NULL;
+static unsigned system_wide_priority_strings_init = 0;
+static unsigned fail_on_invalid_config = 0;
+static unsigned system_wide_disabled_ciphers[MAX_ALGOS+1] = {0};
+static unsigned system_wide_disabled_macs[MAX_ALGOS+1] = {0};
+static unsigned system_wide_disabled_groups[MAX_ALGOS+1] = {0};
+static unsigned system_wide_disabled_kxs[MAX_ALGOS+1] = {0};
+
+static const char *system_priority_file = SYSTEM_PRIORITY_FILE;
+static time_t system_priority_last_mod = 0;
+
+#define CUSTOM_PRIORITY_SECTION "priorities"
+#define OVERRIDES_SECTION "overrides"
+#define MAX_ALGO_NAME 128
+
+/* removes spaces */
+static char *clear_spaces(const char *str, char out[MAX_ALGO_NAME])
 {
-	char *p;
-	unsigned n;
+	const char *p = str;
+	unsigned i = 0;
 
-	while (c_isspace(*line)) {
-		line++;
-		line_size--;
+	while (c_isspace(*p))
+		p++;
+
+	while (!c_isspace(*p) && *p != 0) {
+		out[i++] = *p;
+		p++;
+
+		if (i >= MAX_ALGO_NAME-1)
+			break;
 	}
+	out[i] = 0;
+	return out;
+}
 
-	if (line[0] == '#' || needle_size >= line_size)
-		return NULL;
+/* This function parses a gnutls configuration file and updates internal
+ * settings accordingly.
+ */
+static int cfg_ini_handler(void *_ctx, const char *section, const char *name, const char *value)
+{
+	char *p;
+	int ret, type;
+	unsigned i;
+	char str[MAX_ALGO_NAME];
 
-	if (memcmp(line, needle, needle_size) == 0) {
-		p = &line[needle_size];
-		while (c_isspace(*p)) {
-			p++;
-		}
-		if (*p != '=') {
-			return NULL;
-		} else
-			p++;
+	/* Note that we intentionally overwrite the value above; inih does
+	 * not use that value after we handle it. */
 
-		while (c_isspace(*p)) {
-			p++;
+	/* Parse sections */
+	if (section == NULL || section[0] == 0 || c_strcasecmp(section, CUSTOM_PRIORITY_SECTION)==0) {
+		if (system_wide_priority_strings_init == 0) {
+			_name_val_array_init(&system_wide_priority_strings);
+			system_wide_priority_strings_init = 1;
 		}
 
-		n = strlen(p);
+		_gnutls_debug_log("cfg: adding priority: %s -> %s\n", name, value);
 
-		if (n > 1 && p[n-1] == '\n') {
-			n--;
-			p[n] = 0;
-		}
+		ret = _name_val_array_append(&system_wide_priority_strings, name, value);
+		if (ret < 0)
+			return 0;
+	} else if (c_strcasecmp(section, OVERRIDES_SECTION)==0) {
+		if (c_strcasecmp(name, "insecure-hash")==0) {
+			p = clear_spaces(value, str);
+
+			_gnutls_debug_log("cfg: marking hash %s as insecure\n",
+					  p);
+
+			ret = _gnutls_digest_mark_insecure(p);
+			if (ret < 0) {
+				_gnutls_debug_log("cfg: found unknown hash %s in %s\n",
+						  p, name);
+				if (fail_on_invalid_config)
+					return 0;
+			}
+		} else if (c_strcasecmp(name, "insecure-sig")==0 || c_strcasecmp(name, "insecure-sig-for-cert")==0) {
+			p = clear_spaces(value, str);
+
+			if (c_strcasecmp(name, "insecure-sig")==0) {
+				type = _INSECURE;
+				_gnutls_debug_log("cfg: marking signature %s as insecure\n",
+						  p);
+			} else {
+				_gnutls_debug_log("cfg: marking signature %s as insecure for certs\n",
+						  p);
+				type = _INSECURE_FOR_CERTS;
+			}
+
+			ret = _gnutls_sign_mark_insecure(p, type);
+			if (ret < 0) {
+				_gnutls_debug_log("cfg: found unknown signature algorithm %s in %s\n",
+						  p, name);
+				if (fail_on_invalid_config)
+					return 0;
+			}
+		} else if (c_strcasecmp(name, "disabled-version")==0) {
+			p = clear_spaces(value, str);
+
+			_gnutls_debug_log("cfg: disabling version %s\n",
+					  p);
+
+			ret = _gnutls_version_mark_disabled(p);
+			if (ret < 0) {
+				_gnutls_debug_log("cfg: found unknown version %s in %s\n",
+						  p, name);
+				if (fail_on_invalid_config)
+					return 0;
+			}
+		} else if (c_strcasecmp(name, "disabled-curve")==0) {
+			p = clear_spaces(value, str);
+
+			_gnutls_debug_log("cfg: disabling curve %s\n",
+					  p);
+
+			ret = _gnutls_ecc_curve_mark_disabled(p);
+			if (ret < 0) {
+				_gnutls_debug_log("cfg: found unknown curve %s in %s\n",
+						  p, name);
+				if (fail_on_invalid_config)
+					return 0;
+			}
+		} else if (c_strcasecmp(name, "min-verification-profile")==0) {
+			gnutls_certificate_verification_profiles_t profile;
+			profile = _gnutls_profile_get_id(value);
+
+			if (profile == GNUTLS_PROFILE_UNKNOWN) {
+				_gnutls_debug_log("cfg: found unknown profile %s in %s\n",
+						  value, name);
+				if (fail_on_invalid_config)
+					return 0;
+			}
+
+			system_wide_verification_profile = profile;
+		} else if (c_strcasecmp(name, "tls-disabled-cipher")==0) {
+			unsigned algo;
+
+			p = clear_spaces(value, str);
+
+			_gnutls_debug_log("cfg: disabling cipher %s for TLS\n",
+					  p);
+
+
+			algo = gnutls_cipher_get_id(p);
+			if (algo == 0) {
+				_gnutls_debug_log("cfg: unknown algorithm %s listed at %s\n",
+						  p, name);
+				if (fail_on_invalid_config)
+					return 0;
+			}
+
+			i = 0;
+			while (system_wide_disabled_ciphers[i] != 0)
+				i++;
+
+			if (i > MAX_ALGOS-1) {
+				_gnutls_debug_log("cfg: too many (%d) disabled ciphers from %s\n",
+						  i, name);
+				if (fail_on_invalid_config)
+					return 0;
+				goto exit;
+			}
+			system_wide_disabled_ciphers[i] = algo;
+			system_wide_disabled_ciphers[i+1] = 0;
+
+		} else if (c_strcasecmp(name, "tls-disabled-mac")==0) {
+			unsigned algo;
+
+			p = clear_spaces(value, str);
+
+			_gnutls_debug_log("cfg: disabling MAC %s for TLS\n",
+					  p);
+
+			algo = gnutls_mac_get_id(p);
+			if (algo == 0) {
+				_gnutls_debug_log("cfg: unknown algorithm %s listed at %s\n",
+						  p, name);
+				if (fail_on_invalid_config)
+					return 0;
+				goto exit;
+			}
+
+			i = 0;
+			while (system_wide_disabled_macs[i] != 0)
+				i++;
+
+			if (i > MAX_ALGOS-1) {
+				_gnutls_debug_log("cfg: too many (%d) disabled MACs from %s\n",
+						  i, name);
+				if (fail_on_invalid_config)
+					return 0;
+				goto exit;
+			}
+			system_wide_disabled_macs[i] = algo;
+			system_wide_disabled_macs[i+1] = 0;
+		} else if (c_strcasecmp(name, "tls-disabled-group")==0) {
+			unsigned algo;
+
+			p = clear_spaces(value, str);
+
+			if (strlen(p) > 6)
+				p += 6; // skip GROUP-
+
+			_gnutls_debug_log("cfg: disabling group %s for TLS\n",
+					  p);
+
+			algo = gnutls_group_get_id(p);
+			if (algo == 0) {
+				_gnutls_debug_log("cfg: unknown group %s listed at %s\n",
+						  p, name);
+				if (fail_on_invalid_config)
+					return 0;
+				goto exit;
+			}
+
+			i = 0;
+			while (system_wide_disabled_groups[i] != 0)
+				i++;
+
+			if (i > MAX_ALGOS-1) {
+				_gnutls_debug_log("cfg: too many (%d) disabled groups from %s\n",
+						  i, name);
+				if (fail_on_invalid_config)
+					return 0;
+				goto exit;
+			}
+			system_wide_disabled_groups[i] = algo;
+			system_wide_disabled_groups[i+1] = 0;
+		} else if (c_strcasecmp(name, "tls-disabled-kx")==0) {
+			unsigned algo;
+
+			p = clear_spaces(value, str);
+
+			_gnutls_debug_log("cfg: disabling key exchange %s for TLS\n",
+					  p);
+
+			algo = gnutls_kx_get_id(p);
+			if (algo == 0) {
+				_gnutls_debug_log("cfg: unknown key exchange %s listed at %s\n",
+						  p, name);
+				if (fail_on_invalid_config)
+					return 0;
+				goto exit;
+			}
 
-		if (n > 1 && p[n-1] == '\r') {
-			n--;
-			p[n] = 0;
+			i = 0;
+			while (system_wide_disabled_kxs[i] != 0)
+				i++;
+
+			if (i > MAX_ALGOS-1) {
+				_gnutls_debug_log("cfg: too many (%d) disabled key exchanges from %s\n",
+						  i, name);
+				if (fail_on_invalid_config)
+					return 0;
+				goto exit;
+			}
+			system_wide_disabled_kxs[i] = algo;
+			system_wide_disabled_kxs[i+1] = 0;
+		} else {
+			_gnutls_debug_log("unknown parameter %s\n", name);
+			if (fail_on_invalid_config)
+				return 0;
 		}
-		return p;
+	} else {
+		_gnutls_debug_log("cfg: unknown section %s\n",
+				  section);
+		if (fail_on_invalid_config)
+			return 0;
 	}
 
-	return NULL;
+ exit:
+	return 1;
 }
 
-static const char *system_priority_file = SYSTEM_PRIORITY_FILE;
-static char *system_priority_buf = NULL;
-static size_t system_priority_buf_size = 0;
-static time_t system_priority_last_mod = 0;
-
-
 static void _gnutls_update_system_priorities(void)
 {
-#ifdef HAVE_FMEMOPEN
-	gnutls_datum_t data;
 	int ret;
 	struct stat sb;
 
 	if (stat(system_priority_file, &sb) < 0) {
-		_gnutls_debug_log("unable to access: %s: %d\n",
+		_gnutls_debug_log("cfg: unable to access: %s: %d\n",
 				  system_priority_file, errno);
 		return;
 	}
 
-	if (system_priority_buf != NULL &&
+	if (system_wide_priority_strings_init != 0 &&
 	    sb.st_mtime == system_priority_last_mod) {
-		_gnutls_debug_log("system priority %s has not changed\n",
+		_gnutls_debug_log("cfg: system priority %s has not changed\n",
 				  system_priority_file);
 		return;
 	}
 
-	ret = gnutls_load_file(system_priority_file, &data);
-	if (ret < 0) {
-		_gnutls_debug_log("unable to load: %s: %d\n",
+	if (system_wide_priority_strings_init != 0)
+		_name_val_array_clear(&system_wide_priority_strings);
+
+	ret = ini_parse(system_priority_file, cfg_ini_handler, NULL);
+	if (ret != 0) {
+		_gnutls_debug_log("cfg: unable to parse: %s: %d\n",
 				  system_priority_file, ret);
+		if (fail_on_invalid_config)
+			exit(1);
 		return;
 	}
 
-	_gnutls_debug_log("cached system priority %s mtime %lld\n",
+	_gnutls_debug_log("cfg: loaded system priority %s mtime %lld\n",
 			  system_priority_file,
 			  (unsigned long long)sb.st_mtime);
-	gnutls_free(system_priority_buf);
-	system_priority_buf = (char*)data.data;
-	system_priority_buf_size = data.size;
+
 	system_priority_last_mod = sb.st_mtime;
-#endif
 }
 
 void _gnutls_load_system_priorities(void)
@@ -1039,19 +1265,38 @@ void _gnutls_load_system_priorities(void)
 	if (p != NULL)
 		system_priority_file = p;
 
+	p = secure_getenv("GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID");
+	if (p != NULL && p[0] == '1' && p[1] == 0)
+		fail_on_invalid_config = 1;
+
 	_gnutls_update_system_priorities();
 }
 
 void _gnutls_unload_system_priorities(void)
 {
-#ifdef HAVE_FMEMOPEN
-	gnutls_free(system_priority_buf);
-#endif
-	system_priority_buf = NULL;
-	system_priority_buf_size = 0;
+	_name_val_array_clear(&system_wide_priority_strings);
 	system_priority_last_mod = 0;
 }
 
+/**
+ * gnutls_get_system_config_file:
+ *
+ * Returns the filename of the system wide configuration
+ * file loaded by the library. The returned pointer is valid
+ * until the library is unloaded.
+ *
+ * Returns: a constant pointer to the config file loaded, or %NULL if none
+ *
+ * Since: 3.6.9
+ **/
+const char *gnutls_get_system_config_file(void)
+{
+	if (system_wide_priority_strings_init)
+		return system_priority_file;
+	else
+		return NULL;
+}
+
 #define S(str) ((str!=NULL)?str:"")
 
 /* Returns the new priorities if a priority string prefixed
@@ -1063,14 +1308,12 @@ void _gnutls_unload_system_priorities(void)
  */
 char *_gnutls_resolve_priorities(const char* priorities)
 {
-char *p = (char*)priorities;
-char *additional = NULL;
-char *ret = NULL;
-char *ss, *ss_next, *line = NULL;
-unsigned ss_len, ss_next_len;
-int l;
-FILE* fp = NULL;
-size_t n, n2 = 0, line_size;
+	const char *p = priorities;
+	char *additional = NULL;
+	char *ret = NULL;
+	const char *ss, *ss_next;
+	unsigned ss_len, ss_next_len;
+	size_t n, n2 = 0;
 
 	while (c_isspace(*p))
 		p++;
@@ -1102,35 +1345,17 @@ size_t n, n2 = 0, line_size;
 				ss_next_len = 0;
 			}
 
-#ifdef HAVE_FMEMOPEN
 			/* Always try to refresh the cached data, to
 			 * allow it to be updated without restarting
 			 * all applications
 			 */
 			_gnutls_update_system_priorities();
-			fp = fmemopen(system_priority_buf, system_priority_buf_size, "r");
-#else
-			fp = fopen(system_priority_file, "r");
-#endif
-			if (fp == NULL) {/* fail */
-				ret = NULL;
-				goto finish;
-			}
 
-			do {
-				l = getline(&line, &line_size, fp);
-				if (l > 0) {
-					p = check_str(line, line_size, ss, ss_len);
-					if (p != NULL)
-						break;
-				}
-			} while (l>0);
+			p = _name_val_array_value(system_wide_priority_strings, ss, ss_len);
 
 			_gnutls_debug_log("resolved '%.*s' to '%s', next '%.*s'\n",
 					  ss_len, ss, S(p), ss_next_len, S(ss_next));
 			ss = ss_next;
-			fclose(fp);
-			fp = NULL;
 		} while (ss && p == NULL);
 
 		if (p == NULL) {
@@ -1164,9 +1389,6 @@ finish:
 	if (ret != NULL) {
 		_gnutls_debug_log("selected priority string: %s\n", ret);
 	}
-	free(line);
-	if (fp != NULL)
-		fclose(fp);
 
 	return ret;
 }
@@ -1204,6 +1426,10 @@ static void add_dh(gnutls_priority_t priority_cache)
 	}
 }
 
+/* This function was originally precalculating ciphersuite-specific items, however
+ * it has now extended to much more than that. It provides a consistency check to
+ * set parameters, and in cases it applies policy specific items.
+ */
 static int set_ciphersuite_list(gnutls_priority_t priority_cache)
 {
 	unsigned i, j, z;
@@ -1228,6 +1454,50 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache)
 	priority_cache->groups.size = 0;
 	priority_cache->groups.have_ffdhe = 0;
 
+	/* disable key exchanges which are globally disabled */
+	z = 0;
+	while (system_wide_disabled_kxs[z] != 0) {
+		for (i = j = 0; i < priority_cache->_supported_ecc.num_priorities; i++) {
+			if (priority_cache->_kx.priorities[i] != system_wide_disabled_kxs[z])
+				priority_cache->_kx.priorities[j++] = priority_cache->_kx.priorities[i];
+		}
+		priority_cache->_kx.num_priorities = j;
+		z++;
+	}
+
+	/* disable groups which are globally disabled */
+	z = 0;
+	while (system_wide_disabled_groups[z] != 0) {
+		for (i = j = 0; i < priority_cache->_supported_ecc.num_priorities; i++) {
+			if (priority_cache->_supported_ecc.priorities[i] != system_wide_disabled_groups[z])
+				priority_cache->_supported_ecc.priorities[j++] = priority_cache->_supported_ecc.priorities[i];
+		}
+		priority_cache->_supported_ecc.num_priorities = j;
+		z++;
+	}
+
+	/* disable ciphers which are globally disabled */
+	z = 0;
+	while (system_wide_disabled_ciphers[z] != 0) {
+		for (i = j = 0; i < priority_cache->_cipher.num_priorities; i++) {
+			if (priority_cache->_cipher.priorities[i] != system_wide_disabled_ciphers[z])
+				priority_cache->_cipher.priorities[j++] = priority_cache->_cipher.priorities[i];
+		}
+		priority_cache->_cipher.num_priorities = j;
+		z++;
+	}
+
+	/* disable MACs which are globally disabled */
+	z = 0;
+	while (system_wide_disabled_macs[z] != 0) {
+		for (i = j = 0; i < priority_cache->_mac.num_priorities; i++) {
+			if (priority_cache->_mac.priorities[i] != system_wide_disabled_macs[z])
+				priority_cache->_mac.priorities[j++] = priority_cache->_mac.priorities[i];
+		}
+		priority_cache->_mac.num_priorities = j;
+		z++;
+	}
+
 	for (j=0;j<priority_cache->_cipher.num_priorities;j++) {
 		if (priority_cache->_cipher.priorities[j] == GNUTLS_CIPHER_NULL) {
 			have_null = 1;
@@ -1246,6 +1516,15 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache)
 		}
 	}
 
+	/* disable TLS versions which are added but are unsupported */
+	for (i = j = 0; i < priority_cache->protocol.num_priorities; i++) {
+		vers = version_to_entry(priority_cache->protocol.priorities[i]);
+		if (!vers || vers->supported)
+			priority_cache->protocol.priorities[j++] = priority_cache->protocol.priorities[i];
+	}
+	priority_cache->protocol.num_priorities = j;
+
+
 	/* if we have NULL ciphersuites, SRP, or RSA-PSK enabled remove TLS1.3+
 	 * protocol versions; they cannot be negotiated under TLS1.3. */
 	if (have_null || have_srp || have_rsa_psk || priority_cache->no_extensions) {
@@ -1417,6 +1696,16 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache)
 		priority_cache->protocol.num_priorities = j;
 	}
 
+	/* ensure that the verification profile is not lower from the configured */
+	if (system_wide_verification_profile) {
+		gnutls_sec_param_t level = priority_cache->level;
+		gnutls_sec_param_t system_wide_level = _gnutls_profile_to_sec_level(system_wide_verification_profile);
+
+		if (level < system_wide_level) {
+			ENABLE_PROFILE(priority_cache, system_wide_verification_profile);
+		}
+	}
+
 	return 0;
 }
 
@@ -1720,10 +2009,10 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
 					if ((algo =
 					     gnutls_protocol_get_id
 					     (&broken_list[i][6])) !=
-					    GNUTLS_VERSION_UNKNOWN)
+					    GNUTLS_VERSION_UNKNOWN) {
 						fn(&(*priority_cache)->
 						   protocol, algo);
-					else
+					} else
 						goto error;
 
 				}
diff --git a/lib/session.c b/lib/session.c
index 68d1cebe5c..6deda99c07 100644
--- a/lib/session.c
+++ b/lib/session.c
@@ -413,16 +413,16 @@ char *gnutls_session_get_desc(gnutls_session_t session)
 			return NULL;
 		}
 
-		if (kx == GNUTLS_KX_ECDHE_ECDSA || kx == GNUTLS_KX_ECDHE_RSA || 
-		    kx == GNUTLS_KX_ECDHE_PSK) {
+		if ((kx == GNUTLS_KX_ECDHE_ECDSA || kx == GNUTLS_KX_ECDHE_RSA ||
+		    kx == GNUTLS_KX_ECDHE_PSK) && group_name) {
 			if (sign_str)
 				snprintf(kx_name, sizeof(kx_name), "(ECDHE-%s)-(%s)",
 					 group_name, sign_str);
 			else
 				snprintf(kx_name, sizeof(kx_name), "(ECDHE-%s)",
 					 group_name);
-		} else if (kx == GNUTLS_KX_DHE_DSS || kx == GNUTLS_KX_DHE_RSA || 
-		    kx == GNUTLS_KX_DHE_PSK) {
+		} else if ((kx == GNUTLS_KX_DHE_DSS || kx == GNUTLS_KX_DHE_RSA ||
+		    kx == GNUTLS_KX_DHE_PSK) && group_name) {
 			if (sign_str)
 				snprintf(kx_name, sizeof(kx_name), "(DHE-%s)-(%s)", group_name, sign_str);
 			else
diff --git a/lib/x509/name_constraints.c b/lib/x509/name_constraints.c
index d5ce52ee70..dba2fd4b9f 100644
--- a/lib/x509/name_constraints.c
+++ b/lib/x509/name_constraints.c
@@ -116,7 +116,7 @@ int _gnutls_extract_name_constraints(ASN1_TYPE c2, const char *vstr,
 {
 	int ret;
 	char tmpstr[128];
-	unsigned indx = 0;
+	unsigned indx;
 	gnutls_datum_t tmp = { NULL, 0 };
 	unsigned int type;
 	struct name_constraints_node_st *nc, *prev;
@@ -127,8 +127,7 @@ int _gnutls_extract_name_constraints(ASN1_TYPE c2, const char *vstr,
 			prev = prev->next;
 	}
 
-	do {
-		indx++;
+	for (indx=1;;indx++) {
 		snprintf(tmpstr, sizeof(tmpstr), "%s.?%u.base", vstr, indx);
 
 		ret =
@@ -164,7 +163,7 @@ int _gnutls_extract_name_constraints(ASN1_TYPE c2, const char *vstr,
 		}
 
 		tmp.data = NULL;
-	} while (ret >= 0);
+	}
 
 	if (ret < 0 && ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) {
 		gnutls_assert();
@@ -1071,13 +1070,12 @@ static unsigned check_unsupported_constraint2(gnutls_x509_crt_t cert,
 	unsigned san_type;
 	int ret;
 
-	idx = 0;
 	found_one = 0;
 
-	do {
+	for (idx=0;;idx++) {
 		name_size = sizeof(name);
 		ret = gnutls_x509_crt_get_subject_alt_name2(cert,
-			idx++, name, &name_size, &san_type, NULL);
+			idx, name, &name_size, &san_type, NULL);
 		if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
 			break;
 		else if (ret < 0)
@@ -1088,7 +1086,7 @@ static unsigned check_unsupported_constraint2(gnutls_x509_crt_t cert,
 
 		found_one = 1;
 		break;
-	} while(ret >= 0);
+	}
 
 	if (found_one != 0)
 		return check_unsupported_constraint(nc, type);
@@ -1129,11 +1127,11 @@ unsigned found_one;
 		return 1; /* shortcut; no constraints to check */
 
 	if (type == GNUTLS_SAN_RFC822NAME) {
-		idx = found_one = 0;
-		do {
+		found_one = 0;
+		for (idx=0;;idx++) {
 			name_size = sizeof(name);
 			ret = gnutls_x509_crt_get_subject_alt_name2(cert,
-				idx++, name, &name_size, &san_type, NULL);
+				idx, name, &name_size, &san_type, NULL);
 			if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
 				break;
 			else if (ret < 0)
@@ -1149,7 +1147,7 @@ unsigned found_one;
 				&n);
 			if (t == 0)
 				return gnutls_assert_val(t);
-		} while(ret >= 0);
+		}
 
 		/* there is at least a single e-mail. That means that the EMAIL field will
 		 * not be used for verifying the identity of the holder. */
@@ -1190,11 +1188,11 @@ unsigned found_one;
 			return gnutls_assert_val(1);
 		}
 	} else if (type == GNUTLS_SAN_DNSNAME) {
-		idx = found_one = 0;
-		do {
+		found_one = 0;
+		for (idx=0;;idx++) {
 			name_size = sizeof(name);
 			ret = gnutls_x509_crt_get_subject_alt_name2(cert,
-				idx++, name, &name_size, &san_type, NULL);
+				idx, name, &name_size, &san_type, NULL);
 			if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
 				break;
 			else if (ret < 0)
@@ -1210,7 +1208,7 @@ unsigned found_one;
 				&n);
 			if (t == 0)
 				return gnutls_assert_val(t);
-		} while(ret >= 0);
+		}
 
 		/* there is at least a single DNS name. That means that the CN will
 		 * not be used for verifying the identity of the holder. */
@@ -1256,11 +1254,11 @@ unsigned found_one;
 			return gnutls_assert_val(1);
 		}
 	} else if (type == GNUTLS_SAN_IPADDRESS) {
-			idx = found_one = 0;
-			do {
+			found_one = 0;
+			for (idx=0;;idx++) {
 				name_size = sizeof(name);
 				ret = gnutls_x509_crt_get_subject_alt_name2(cert,
-					idx++, name, &name_size, &san_type, NULL);
+					idx, name, &name_size, &san_type, NULL);
 				if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
 					break;
 				else if (ret < 0)
@@ -1275,7 +1273,7 @@ unsigned found_one;
 				t = gnutls_x509_name_constraints_check(nc, GNUTLS_SAN_IPADDRESS, &n);
 				if (t == 0)
 					return gnutls_assert_val(t);
-			} while(ret >= 0);
+			}
 
 			/* there is at least a single IP address. */
 
diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index e6577cad03..8234702755 100644
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -566,7 +566,6 @@ static unsigned is_level_acceptable(
 			break;
 		case GNUTLS_PROFILE_UNKNOWN: /* already checked; avoid compiler warnings */
 			_gnutls_debug_log("An unknown profile (%d) was encountered\n", (int)profile);
-			return gnutls_assert_val(0);
 		}
 	}
 
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 44418cb45f..26055e08a3 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -3644,7 +3644,7 @@ gnutls_x509_crt_get_pk_dsa_raw(gnutls_x509_crt_t crt,
  * To deinitialize @certs, you need to deinitialize each crt structure
  * independently, and use gnutls_free() at @certs.
  *
- * Returns: the number of certificates read or a negative error value.
+ * Returns: %GNUTLS_E_SUCCESS on success, otherwise a negative error code.
  *
  * Since: 3.0
  **/
diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c
index aa09ef85f1..6aeb159dba 100644
--- a/lib/x509/x509_ext.c
+++ b/lib/x509/x509_ext.c
@@ -236,8 +236,7 @@ int gnutls_x509_ext_import_subject_alt_names(const gnutls_datum_t * ext,
 		goto cleanup;
 	}
 
-	i = 0;
-	do {
+	for (i=0;;i++) {
 		san.data = NULL;
 		san.size = 0;
 		othername_oid.data = NULL;
@@ -264,9 +263,7 @@ int gnutls_x509_ext_import_subject_alt_names(const gnutls_datum_t * ext,
 					    (char *)othername_oid.data, 1);
 		if (ret < 0)
 			break;
-
-		i++;
-	} while (ret >= 0);
+	}
 
 	sans->size = i;
 	if (ret < 0 && ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) {
@@ -916,8 +913,7 @@ int gnutls_x509_ext_import_authority_key_id(const gnutls_datum_t * ext,
 	}
 
 	/* Read authorityCertIssuer */
-	i = 0;
-	do {
+	for (i=0;;i++) {
 		san.data = NULL;
 		san.size = 0;
 		othername_oid.data = NULL;
@@ -944,9 +940,7 @@ int gnutls_x509_ext_import_authority_key_id(const gnutls_datum_t * ext,
 					    (char *)othername_oid.data, 1);
 		if (ret < 0)
 			break;
-
-		i++;
-	} while (ret >= 0);
+	}
 
 	aki->cert_issuer.size = i;
 	if (ret < 0 && ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE
@@ -2444,8 +2438,7 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext,
 		snprintf(name, sizeof(name),
 			 "?%u.distributionPoint.fullName", (unsigned)i + 1);
 
-		j = 0;
-		do {
+		for (j=0;;j++) {
 			san.data = NULL;
 			san.size = 0;
 
@@ -2464,9 +2457,7 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext,
 			if (ret < 0)
 				break;
 			san.data = NULL; /* it is now in cdp */
-
-			j++;
-		} while (ret >= 0);
+		}
 
 		i++;
 	} while (ret >= 0);
diff --git a/src/cli-debug.c b/src/cli-debug.c
index 8308b9b48f..cd06d08ae0 100644
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -83,6 +83,10 @@ typedef struct {
 } TLS_TEST;
 
 static const TLS_TEST tls_tests[] = {
+	{"whether the server accepts default record size (512 bytes)",
+	 test_send_record, "yes", "no", "dunno"},
+	{"whether %ALLOW_SMALL_RECORDS is required",
+	 test_send_record_with_allow_small_records, "yes", "no", "dunno"},
 #ifdef ENABLE_SSL3
 	{"for SSL 3.0 (RFC6101) support", test_ssl3, "yes", "no", "dunno"},
 	/* The following tests will disable TLS 1.x if the server is
@@ -94,9 +98,9 @@ static const TLS_TEST tls_tests[] = {
 	 "yes", "dunno"},
 	{"whether we need to disable TLS 1.0", test_tls_disable0, "no",
 	 "yes", "dunno"},
-	{"whether \%NO_EXTENSIONS is required", test_no_extensions, "no", "yes",
+	{"whether %NO_EXTENSIONS is required", test_no_extensions, "no", "yes",
 	 "dunno"},
-	{"whether \%COMPAT is required", test_record_padding, "no", "yes",
+	{"whether %COMPAT is required", test_record_padding, "no", "yes",
 	 "dunno"},
 	{"for TLS 1.0 (RFC2246) support", test_tls1, "yes", "no", "dunno"},
 	{"for TLS 1.0 (RFC2246) support with TLS 1.0 record version", test_tls1_nossl3, "yes", "no", "dunno"},
@@ -145,6 +149,9 @@ static const TLS_TEST tls_tests[] = {
 	{"anonymous Diffie-Hellman group info", test_dhe_group, NULL, "N/A",
 	 "N/A"},
 #endif
+	{"for RSA key exchange support", test_rsa, "yes",
+	 "no",
+	 "dunno"},
 	{"for ephemeral Diffie-Hellman support", test_dhe, "yes", "no",
 	 "dunno"},
 	{"for RFC7919 Diffie-Hellman support", test_rfc7919, "yes", "no",
diff --git a/src/serv-args.def b/src/serv-args.def
index 4be3d9f298..a2e9d1c6f8 100644
--- a/src/serv-args.def
+++ b/src/serv-args.def
@@ -332,6 +332,22 @@ flag = {
     doc      = "";
 };
 
+flag = {
+    name      = recordsize;
+    arg-type  = number;
+    arg-range = "0->16384";
+    descrip   = "The maximum record size to advertise";
+    doc      = "";
+};
+
+flag = {
+    name      = httpdata;
+    arg-type  = file;
+    file-exists = yes;
+    descrip   = "The data used as HTTP response";
+    doc      = "";
+};
+
 doc-section = {
   ds-type   = 'SEE ALSO'; // or anything else
   ds-format = 'texi';      // or texi or mdoc format
diff --git a/src/serv.c b/src/serv.c
index 6043fed7fe..cc68abb509 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -88,6 +88,8 @@ unsigned alpn_protos_size = 0;
 
 gnutls_datum_t session_ticket_key;
 gnutls_anti_replay_t anti_replay;
+int record_max_size;
+const char *http_data_file = NULL;
 static void tcp_server(const char *name, int port);
 
 /* end of globals */
@@ -477,6 +479,17 @@ gnutls_session_t initialize_session(int dtls)
 							      GNUTLS_CERT_REQUEST);
 	}
 
+	/* use the record size limit extension */
+	if (record_max_size > 0) {
+		if (gnutls_record_set_max_recv_size(session, record_max_size) <
+		    0) {
+			fprintf(stderr,
+				"Cannot set the maximum record receive size to %d.\n",
+				record_max_size);
+			exit(1);
+		}
+	}
+
 	if (HAVE_OPT(HEARTBEAT))
 		gnutls_heartbeat_enable(session,
 					GNUTLS_HB_PEER_ALLOWED_TO_SEND);
@@ -738,6 +751,45 @@ static char *peer_print_info(gnutls_session_t session, int *ret_length,
 	return http_buffer;
 }
 
+static char *peer_print_data(gnutls_session_t session, int *ret_length)
+{
+	gnutls_datum_t data;
+	char *http_buffer;
+	size_t len;
+	int ret;
+
+	ret = gnutls_load_file(http_data_file, &data);
+	if (ret < 0) {
+		ret = asprintf(&http_buffer,
+			       "HTTP/1.0 404 Not Found\r\n"
+			       "Content-type: text/html\r\n"
+			       "\r\n"
+			       "<HTML><HEAD><TITLE>404 Not Found</TITLE></HEAD>\n"
+			       "<BODY><H1>Couldn't read %s</H1></BODY></HTML>\n\n",
+			       http_data_file);
+		if (ret < 0)
+			return NULL;
+
+		*ret_length = strlen(http_buffer);
+		return http_buffer;
+	}
+
+	ret = asprintf(&http_buffer,
+		       "HTTP/1.0 200 OK\r\n"
+		       "Content-Type: application/octet-stream\r\n"
+		       "Content-Length: %u\r\n"
+		       "\r\n",
+		       data.size);
+	if (ret < 0)
+		return NULL;
+	len = ret;
+	http_buffer = realloc(http_buffer, len + data.size);
+	memcpy(&http_buffer[len], data.data, data.size);
+	gnutls_free(data.data);
+	*ret_length = len + data.size;
+	return http_buffer;
+}
+
 const char *human_addr(const struct sockaddr *sa, socklen_t salen,
 		       char *buf, size_t buflen)
 {
@@ -979,7 +1031,10 @@ get_response(gnutls_session_t session, char *request,
 	}
 /*    *response = peer_print_info(session, request+4, h, response_length); */
 	if (http != 0) {
-		*response = peer_print_info(session, response_length, h);
+		if (http_data_file == NULL)
+			*response = peer_print_info(session, response_length, h);
+		else
+			*response = peer_print_data(session, response_length);
 	} else {
 		int ret;
 		strip(request);
@@ -1723,6 +1778,8 @@ static void cmd_parser(int argc, char **argv)
 	else
 		http = 1;
 
+	record_max_size = OPT_VALUE_RECORDSIZE;
+
 	if (HAVE_OPT(X509FMTDER))
 		x509ctype = GNUTLS_X509_FMT_DER;
 	else
@@ -1777,6 +1834,9 @@ static void cmd_parser(int argc, char **argv)
 	if (HAVE_OPT(SNI_HOSTNAME_FATAL))
 		sni_hostname_fatal = 1;
 
+	if (HAVE_OPT(HTTPDATA))
+		http_data_file = OPT_ARG(HTTPDATA);
+
 }
 
 /* session resuming support */
diff --git a/src/tests.c b/src/tests.c
index 3073beae56..20438f4d6e 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -57,6 +57,7 @@ int ssl3_ok = 0;
 int tls1_1_ok = 0;
 int tls1_2_ok = 0;
 int tls1_3_ok = 0;
+int send_record_ok = 0;
 
 /* keep session info */
 static char *session_data = NULL;
@@ -248,6 +249,29 @@ test_code_t test_ecdhe(gnutls_session_t session)
 	return ret;
 }
 
+test_code_t test_rsa(gnutls_session_t session)
+{
+	int ret;
+
+	if (tls_ext_ok == 0)
+		return TEST_IGNORE;
+
+	sprintf(prio_str, INIT_STR
+		ALL_CIPHERS ":" ALL_COMP ":%s:" ALL_MACS
+		":+RSA:%s", protocol_all_str,
+		rest);
+	_gnutls_priority_set_direct(session, prio_str);
+
+	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+
+	ret = test_do_handshake(session);
+
+	if (ret < 0)
+		return TEST_FAILED;
+
+	return ret;
+}
+
 static
 test_code_t test_ecdhe_curve(gnutls_session_t session, const char *curve, unsigned id)
 {
@@ -1518,3 +1542,63 @@ test_code_t test_server_cas(gnutls_session_t session)
 		ext_text = "none";
 	return TEST_SUCCEED;
 }
+
+static test_code_t
+test_do_handshake_and_send_record(gnutls_session_t session)
+{
+	int ret;
+	/* This will be padded to 512 bytes. */
+	const char snd_buf[] = "GET / HTTP/1.0\r\n\r\n";
+	static char buf[5 * 1024];
+
+	ret = test_do_handshake(session);
+	if (ret != TEST_SUCCEED)
+		return ret;
+
+	gnutls_record_send(session, snd_buf, sizeof(snd_buf) - 1);
+	ret = gnutls_record_recv(session, buf, sizeof(buf) - 1);
+	if (ret < 0)
+		return TEST_FAILED;
+
+	return TEST_SUCCEED;
+}
+
+/* These tests shall be sent in this order to check if the server
+ * advertises smaller limits than our default 512. and we can work it
+ * around with %ALLOW_SMALL_RECORDS. */
+test_code_t test_send_record(gnutls_session_t session)
+{
+	int ret;
+
+	sprintf(prio_str,
+		INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
+		ALL_MACS ":" ALL_KX ":%s", protocol_str, rest);
+	_gnutls_priority_set_direct(session, prio_str);
+	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+
+	ret = test_do_handshake_and_send_record(session);
+	if (ret == TEST_SUCCEED)
+		send_record_ok = 1;
+	return ret;
+}
+
+test_code_t test_send_record_with_allow_small_records(gnutls_session_t session)
+{
+	int ret;
+
+	/* If test_send_record succeeded, we don't need to check. */
+	if (send_record_ok)
+		return TEST_FAILED;
+
+	sprintf(prio_str,
+		INIT_STR ALL_CIPHERS ":" ALL_COMP ":%s:"
+		ALL_MACS ":" ALL_KX ":%%ALLOW_SMALL_RECORDS:%s",
+		protocol_str, rest);
+	_gnutls_priority_set_direct(session, prio_str);
+	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+
+	ret = test_do_handshake_and_send_record(session);
+	if (ret == TEST_SUCCEED)
+		strcat(rest, ":%ALLOW_SMALL_RECORDS");
+	return ret;
+}
diff --git a/src/tests.h b/src/tests.h
index 098c441a8d..c391d97bfb 100644
--- a/src/tests.h
+++ b/src/tests.h
@@ -70,9 +70,12 @@ test_code_t test_server_cas(gnutls_session_t state);
 test_code_t test_session_resume2(gnutls_session_t state);
 test_code_t test_rsa_pms_version_check(gnutls_session_t session);
 test_code_t test_version_oob(gnutls_session_t session);
+test_code_t test_send_record(gnutls_session_t session);
+test_code_t test_send_record_with_allow_small_records(gnutls_session_t session);
 int _test_srp_username_callback(gnutls_session_t session,
 				char **username, char **password);
 
+test_code_t test_rsa(gnutls_session_t session);
 test_code_t test_ecdhe_x25519(gnutls_session_t session);
 test_code_t test_ecdhe_secp521r1(gnutls_session_t session);
 test_code_t test_ecdhe_secp384r1(gnutls_session_t session);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7fe954f632..34e3c5a970 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -63,7 +63,8 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \
 	ocsp-tests/certs/server_bad.template ocsp-tests/certs/ocsp-staple-unrelated.der ocsp-tests/suppressions.valgrind \
 	data/listings-DTLS1.0 data/listings-SSL3.0 data/listings-TLS1.0 data/listings-TLS1.1 \
 	data/listings-legacy1 data/listings-legacy2 data/listings-legacy3 data/listings-legacy4 \
-	data/listings-SSL3.0-TLS1.1 p11-kit-trust-data/Example_Root_CA.p11-kit server-kx-neg-common.c \
+	data/listings-old-SSL3.0-TLS1.1 data/listings-SSL3.0-TLS1.1 \
+	p11-kit-trust-data/Example_Root_CA.p11-kit server-kx-neg-common.c \
 	p11-kit-trust-data/Example_Root_CA.pem data/test1.cat data/test2.cat \
 	data/test1.cat.data data/test2.cat.data data/test1.cat.out data/test2.cat.out \
 	data/pkcs7-cat-ca.pem data/long.crl data/long.pem data/large-cert.pem \
@@ -104,7 +105,8 @@ noinst_LTLIBRARIES = libutils.la
 libutils_la_SOURCES = utils.h utils.c seccomp.c utils-adv.c
 libutils_la_LIBADD = ../lib/libgnutls.la
 
-indirect_tests = tls13/prf-early
+indirect_tests = tls13/prf-early system-override-hash system-override-sig
+
 ctests = tls13/supported_versions tls13/tls12-no-tls13-exts \
 	tls13/post-handshake-with-cert tls13/post-handshake-without-cert \
 	tls13/cookie tls13/key_share tls13/prf tls13/post-handshake-with-cert-ticket \
@@ -159,7 +161,7 @@ ctests += mini-record-2 simple gnutls_hmac_fast set_pkcs12_cred cert certuniquei
 	 cert-status fips-mode-pthread rsa-psk global-init sec-params sign-verify-data \
 	 fips-test fips-override-test mini-global-load name-constraints x509-extensions \
 	 long-session-id mini-x509-callbacks-intr mini-dtls-lowmtu set_x509_key_file-late \
-	 crlverify mini-dtls-discard init_fds mini-record-failure \
+	 crlverify mini-dtls-discard init_fds mini-record-failure openconnect-dtls12 \
 	 tls12-rehandshake-cert-2 custom-urls set_x509_key_mem set_x509_key_file \
 	 tls12-rehandshake-cert-auto tls12-rehandshake-set-prio \
 	 mini-chain-unsorted x509-verify-with-crl mini-dtls-mtu privkey-verify-broken \
@@ -173,8 +175,8 @@ ctests += mini-record-2 simple gnutls_hmac_fast set_pkcs12_cred cert certuniquei
 	 server-sign-md5-rep privkey-keygen mini-tls-nonblock no-signal pkcs7-gen dtls-etm \
 	 x509sign-verify-rsa x509sign-verify-ecdsa x509sign-verify-gost \
 	 mini-alignment oids atfork prf psk-file priority-init2 post-client-hello-change-prio \
-	 status-request status-request-ok status-request-missing sign-verify-ext \
-	 fallback-scsv pkcs8-key-decode urls dtls-rehandshake-cert \
+	 status-request status-request-ok rfc7633-missing sign-verify-ext \
+	 fallback-scsv pkcs8-key-decode urls dtls-rehandshake-cert rfc7633-ok \
 	 key-usage-rsa key-usage-ecdhe-rsa mini-session-verify-function auto-verify \
 	 record-timeouts mini-dtls-hello-verify-48 set-default-prio \
 	 tls12-anon-upgrade global-init-override tlsext-decoding rsa-psk-cb \
@@ -183,7 +185,7 @@ ctests += mini-record-2 simple gnutls_hmac_fast set_pkcs12_cred cert certuniquei
 	 dtls-max-record tls12-max-record alpn-server-prec ocsp-filename-memleak \
 	 dh-params rehandshake-ext-secret pcert-list session-export-funcs \
 	 handshake-false-start version-checks key-material-dtls key-material-set-dtls \
-	 system-prio-file name-constraints-merge crl-basic crq-basic \
+	 name-constraints-merge crl-basic crq-basic \
 	 send-client-cert custom-urls-override hex rehandshake-switch-psk-id \
 	 rehandshake-switch-srp-id base64 srpbase64 pkcs1-digest-info set_x509_key \
 	 set_x509_key_file_der set_x509_pkcs12_key crt_apis tls12-cert-key-exchange \
@@ -218,6 +220,10 @@ if HAVE_SECCOMP_TESTS
 ctests += dtls-with-seccomp tls-with-seccomp dtls-client-with-seccomp tls-client-with-seccomp
 endif
 
+if !DISABLE_SYSTEM_CONFIG
+ctests += system-prio-file
+endif
+
 if HAVE_CMOCKA
 CMOCKA_LDADD = $(COMMON_LDADD) $(CMOCKA_LIBS)
 ctests += dtls-sliding-window ip-utils name-constraints-ip conv-utf8 str-unicode str-idna \
@@ -488,6 +494,12 @@ dist_check_SCRIPTS += fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh start
 	sni-resume.sh ocsp-tests/ocsptool cert-reencoding.sh pkcs7-cat.sh long-crl.sh \
 	serv-udp.sh logfile-option.sh gnutls-cli-resume.sh profile-tests.sh
 
+if !DISABLE_SYSTEM_CONFIG
+dist_check_SCRIPTS += system-override-sig-hash.sh system-override-versions.sh system-override-invalid.sh \
+	system-override-curves.sh system-override-profiles.sh system-override-tls.sh \
+	system-override-kx.sh
+endif
+
 dist_check_SCRIPTS += gnutls-cli-self-signed.sh gnutls-cli-invalid-crl.sh
 
 if ENABLE_PKCS11
@@ -559,6 +571,7 @@ TESTS_ENVIRONMENT +=						\
 	PSK_FILE=$(srcdir)/psk.passwd				\
 	OPENSSL_ia32cap=0x00000000				\
 	EXEEXT=$(EXEEXT)					\
+	GNUTLS_TEST_SUITE_RUN=1					\
 	builddir="$(builddir)"					\
 	top_builddir="$(top_builddir)"				\
 	libdir="$(libdir)"					\
diff --git a/tests/cert-common.h b/tests/cert-common.h
index 5ccae43ccc..0fd02f7e7c 100644
--- a/tests/cert-common.h
+++ b/tests/cert-common.h
@@ -41,6 +41,7 @@
  * IPv4 server (GOST R 34.10-2001, SAN: localhost): server_ca3_gost01_cert, server_ca3_gost01_key
  * IPv4 server (GOST R 34.10-2012-256, SAN: localhost): server_ca3_gost12-256_cert, server_ca3_gost12-256_key
  * IPv4 server (GOST R 34.10-2012-512, SAN: localhost): server_ca3_gost12-512_cert, server_ca3_gost12-512_key
+ * IPv6 server: server_ca3_tlsfeat_cert, server_ca3_key
  * IPv6 server: server_ca3_localhost6_cert, server_ca3_key
  * IPv4 server: server_ca3_localhost_cert, server_ca3_key
  * IPv4 server: server_ca3_localhost_ecc_cert, server_ca3_ecc_key
@@ -1489,6 +1490,34 @@ static char server_localhost_ca3_cert_pem[] =
 	"6TXY44pCGHMFO6Kr\n"
 	"-----END CERTIFICATE-----\n";
 
+/* shares server_ca3 key with tlsfeature=5 */
+static char server_ca3_tlsfeat_cert_pem[] =
+	"-----BEGIN CERTIFICATE-----"
+	"MIIEOjCCAqKgAwIBAgIUYBRfAcvgBUU4jCb8W89sQcPLqswwDQYJKoZIhvcNAQEL"
+	"BQAwDzENMAsGA1UEAxMEQ0EtMzAgFw0xOTA2MDcyMTA4NDFaGA85OTk5MTIzMTIz"
+	"NTk1OVowIjEgMB4GA1UEAxMXR251VExTIHRlc3QgY2VydGlmaWNhdGUwggGiMA0G"
+	"CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDZPXiZqiz3wLuz+B4ZnJuCphLEX7k1"
+	"5NcpamL3+9ea4gXyfeFSHbSaihPauBUcDMVbL/wfkhxYiJRCX7wqHIkJK4En5aEz"
+	"SDDa6pI/CI5lSbiXdNDGbFLh5b8Guvhfzyy8lDjFNNy3abkfU270tnzFY5mkYwYg"
+	"juN/RgPqh0b8McT+xUeN9x4PuSXXmMC1r3v7y4JuMxE8ZzGDhW2aQK5Is6QYv0WE"
+	"LS5hVvB8GdP5XQwTJw4HH5i/YES7TENV2RByzRY8hFQ9SbK5YHHGoszVJIlIuxm5"
+	"v8N2Ig1cW6t7t3HnuZbDYRDCERMiEigBz8vEZZyFsMLg5Z7JiNKSG/f+ER9CzDJX"
+	"HgxBctV9EEc2KmRT1P9JeI/xZUOl9lKljc+t8m0Um3Asx5duWm4tcZm7FecnaJiT"
+	"XD/tEG64qTKWtDuoI7+X9MjHe5lvf2gIJT3CoKW24Rn6O1fc9oCCnVAi0V6FLM4X"
+	"aG50X9NC666RVEFkXih8THA1gC9m9NJMrD0CAwEAAaN5MHcwEQYIKwYBBQUHARgE"
+	"BTADAgEFMAwGA1UdEwEB/wQCMAAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MB0GA1Ud"
+	"DgQWBBQzneEn04vV/OsF/LXHgWlPXjvZ1jAfBgNVHSMEGDAWgBT5qIYZY7akFBNg"
+	"dg8BmjU27/G0rzANBgkqhkiG9w0BAQsFAAOCAYEASMVR+C1x3pBRSRaaIYbFTC0X"
+	"VXc66iQWDfpTSokLIEN/UVZzLsQw5p1PntPqnRRudDnXS77rNQSZcc4NTFYrzSqW"
+	"WwdhIXtl3igLg5HMxU80dsr3LfGkzJ1iDS1RR0EGSvFjOE9ZUK0IBdsUvINqpj+l"
+	"6qxL36yfxamuELIxvgmecIMvLzbe7tUjRXneNvLGsLAJcq5QQmNMCWiyywtHbFa0"
+	"zbpxKMJmHMk0SbgZHUuFaASlAqVez19rJdzqQcJiw/YrMbbj/b2me1duLQ64dqGL"
+	"5gKTyDMhk5td53R5uPnr7F6+1u8zRzqA6mBvTfEk4wJ6YmvqdBfC47xT+Ksba6dX"
+	"Ugz+So2iu0rQxaLEBTZJ/gTXJEUafxUN4wF1ZOnUyltoqLJymhQoceoSwjYobOal"
+	"FUZEJgFNA7j8tR7J3MtFUaJqFosuPtxhF8/CCPukKV7bRokqh7zK+F21iaQOYvJn"
+	"AfuOg2g0ZMurGyS/yg8mVsGjh4bho9zPOlhPtFNM"
+	"-----END CERTIFICATE-----";
+
 /* Marked as decrypt-only */
 static char server_localhost_ca3_rsa_decrypt_cert_pem[] =
 	"-----BEGIN CERTIFICATE-----\n"
@@ -1607,6 +1636,9 @@ const gnutls_datum_t server_ca3_localhost_rsa_decrypt_cert = { (unsigned char*)s
 const gnutls_datum_t server_ca3_localhost_rsa_sign_cert = { (unsigned char*)server_localhost_ca3_rsa_sign_cert_pem,
 	sizeof(server_localhost_ca3_rsa_sign_cert_pem)-1};
 
+const gnutls_datum_t server_ca3_tlsfeat_cert = { (unsigned char*)server_ca3_tlsfeat_cert_pem,
+	sizeof(server_ca3_tlsfeat_cert_pem)-1};
+
 const gnutls_datum_t server_ca3_localhost_cert_chain = {
 	(unsigned char*)server_localhost_ca3_cert_chain_pem,
 	sizeof(server_localhost_ca3_cert_chain_pem)-1
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 06bdf42950..c34b69c40a 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -146,6 +146,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	top_builddir="$(top_builddir)"		\
 	ac_cv_sizeof_time_t="$(ac_cv_sizeof_time_t)" \
 	ASAN_OPTIONS="detect_leaks=0:exitcode=6" \
+	GNUTLS_TEST_SUITE_RUN=1			\
 	srcdir="$(srcdir)"
 
 if ENABLE_FIPS140
diff --git a/tests/certs/ca-cert-ecc.pem b/tests/certs/ca-cert-ecc.pem
index ad8a34b552..2e95c957dd 100644
--- a/tests/certs/ca-cert-ecc.pem
+++ b/tests/certs/ca-cert-ecc.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICLDCCAdKgAwIBAgIBADAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJCRTEPMA0G
+MIICLTCCAdKgAwIBAgIBADAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJCRTEPMA0G
 A1UEChMGR251VExTMSUwIwYDVQQLExxHbnVUTFMgY2VydGlmaWNhdGUgYXV0aG9y
 aXR5MQ8wDQYDVQQIEwZMZXV2ZW4xJTAjBgNVBAMTHEdudVRMUyBjZXJ0aWZpY2F0
-ZSBhdXRob3JpdHkwHhcNMTEwNTIzMjAzODIxWhcNMTIxMjIyMDc0MTUxWjB9MQsw
+ZSBhdXRob3JpdHkwHhcNMTEwNTIzMTgzODIxWhcNMzEwNTI0MTIyOTEyWjB9MQsw
 CQYDVQQGEwJCRTEPMA0GA1UEChMGR251VExTMSUwIwYDVQQLExxHbnVUTFMgY2Vy
 dGlmaWNhdGUgYXV0aG9yaXR5MQ8wDQYDVQQIEwZMZXV2ZW4xJTAjBgNVBAMTHEdu
 dVRMUyBjZXJ0aWZpY2F0ZSBhdXRob3JpdHkwWTATBgcqhkjOPQIBBggqhkjOPQMB
 BwNCAARS2I0jiuNn14Y2sSALCX3IybqiIJUvxUpj+oNfzngvj/Niyv2394BWnW4X
 uQ4RTEiywK87WRcWMGgJB5kX/t2no0MwQTAPBgNVHRMBAf8EBTADAQH/MA8GA1Ud
 DwEB/wQFAwMHBgAwHQYDVR0OBBYEFPC0gf6YEr+1KLlkQAPLzB9mTigDMAoGCCqG
-SM49BAMCA0gAMEUCIDGuwD1KPyG+hRf88MeyMQcqOFZD0TbVleF+UsAGQ4enAiEA
-l4wOuDwKQa+upc8GftXE2C//4mKANBC6It01gUaTIpo=
+SM49BAMCA0kAMEYCIQCoTZHO4jSkIKq5UVMnPFzv2MtJHd62KxMPq4Ad5c9RwwIh
+AMyj06hO1DGrV3bOPBRJrfWTEzkgA4p1wntYRoPfCTdF
 -----END CERTIFICATE-----
diff --git a/tests/cipher-listings.sh b/tests/cipher-listings.sh
index ae20529ef2..f11b01babb 100755
--- a/tests/cipher-listings.sh
+++ b/tests/cipher-listings.sh
@@ -75,11 +75,15 @@ fi
 # This is a unit test for gnutls_priority_get_cipher_suite_index
 
 if test "${ENABLE_SSL3}" = "1";then
+echo "Running with SSL3.0 enabled"
 check SSL3.0 "NORMAL:-VERS-ALL:+VERS-SSL3.0:+ARCFOUR-128"
+check old-SSL3.0-TLS1.1 "NORMAL:-VERS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:+VERS-TLS1.1"
+else
+echo "Running without support for SSL3.0"
+check SSL3.0-TLS1.1 "NORMAL:-VERS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:+VERS-TLS1.1"
 fi
 check TLS1.0 "NORMAL:-VERS-ALL:+VERS-TLS1.0"
 check TLS1.1 "NORMAL:-VERS-ALL:+VERS-TLS1.1"
-check SSL3.0-TLS1.1 "NORMAL:-VERS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:+VERS-TLS1.1"
 check DTLS1.0 "NORMAL:-VERS-ALL:+VERS-DTLS1.0"
 # Priority strings prior to 3.6.x did not require the +GROUP option; here we
 # test whether these work as expected.
diff --git a/tests/crq_apis.c b/tests/crq_apis.c
index fdc7ece1c2..16d32a2103 100644
--- a/tests/crq_apis.c
+++ b/tests/crq_apis.c
@@ -40,18 +40,19 @@ static void tls_log_func(int level, const char *str)
 
 static unsigned char saved_crq_pem[] =
 	"-----BEGIN NEW CERTIFICATE REQUEST-----\n"
-	"MIICHTCCAYYCAQAwKzEOMAwGA1UEAxMFbmlrb3MxGTAXBgNVBAoTEG5vbmUgdG8s\n"
+	"MIICSjCCAbMCAQAwKzEOMAwGA1UEAxMFbmlrb3MxGTAXBgNVBAoTEG5vbmUgdG8s\n"
 	"IG1lbnRpb24wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALtmQ/Xyxde2jMzF\n"
 	"3/WIO7HJS2oOoa0gUEAIgKFPXKPQ+GzP5jz37AR2ExeLZIkiW8DdU3w77XwEu4C5\n"
 	"KL6Om8aOoKUSy/VXHqLnu7czSZ/ju0quak1o/8kR4jKNzj2AC41179gAgY8oBAOg\n"
-	"Io1hBAf6tjd9IQdJ0glhaZiQo1ipAgMBAAGggbEwEgYJKoZIhvcNAQkHMQUTA2Zv\n"
-	"bzCBmgYJKoZIhvcNAQkOMYGMMIGJMA8GA1UdEwEB/wQFMAMCAQAwDwYDVR0PAQH/\n"
+	"Io1hBAf6tjd9IQdJ0glhaZiQo1ipAgMBAAGggd4wEgYJKoZIhvcNAQkHMQUTA2Zv\n"
+	"bzCBxwYJKoZIhvcNAQkOMYG5MIG2MA8GA1UdEwEB/wQFMAMCAQAwDwYDVR0PAQH/\n"
 	"BAUDAwcAADAjBgNVHREEHDAaggNhcGGCA2Zvb4IOeG4tLWt4YXdoay5jb20wHQYD\n"
 	"VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAsGBCoDBAUEA8r+/zAUBggtA4KI\n"
-	"9LkXBQEB/wQFyv7/+v4wDQYJKoZIhvcNAQELBQADgYEAlspSTGu5KPL7iEQObEvs\n"
-	"+FMZpXnPDXyeJyiJFEfDaTDCpeHfZfMXUpPQEAxLjk5t8gPUxepQCjOizOuMD70k\n"
-	"jg8x97E8crA2mZ9Bk/eRhxvdXGN1hBdNzY6BGuPWifN/8dfE6O8wQkZDIZFcYxyr\n"
-	"V1VQd3moq0ge+tR9+xpPVWg=\n"
+	"9LkXBQEB/wQFyv7/+v4wKwYDVR0QBCQwIoAPMjAxOTA3MDkwNDI4MjZagQ8yMDE5\n"
+	"MDcwOTA3MTUwNlowDQYJKoZIhvcNAQELBQADgYEAE7r9ujv9pIO7SnYRg69eQsyo\n"
+	"3cnBi1efkH2OguYe6JT+a+1DA/0tO4GlT9PjAOX2yD2OicIHLVXWYzV8eX6exQma\n"
+	"skdRMZurcSSMZm2VgdQmHU0Rv7o7mQSKGfcOD2fRiDMwNB35ZSY7tkPAe7ARp+zr\n"
+	"lPY8cDpo1i570jttSQ4=\n"
 	"-----END NEW CERTIFICATE REQUEST-----\n";
 
 const gnutls_datum_t saved_crq = { saved_crq_pem, sizeof(saved_crq_pem)-1 };
@@ -84,6 +85,11 @@ static time_t mytime(time_t * t)
 	return then;
 }
 
+#define TIME1 1562646506
+#define TIME2 1562656506
+#define CPASS "foo"
+#define CPASS_OID "1.2.840.113549.1.9.7"
+
 static gnutls_x509_crq_t generate_crq(void)
 {
 	gnutls_x509_crq_t crq;
@@ -138,7 +144,7 @@ static gnutls_x509_crq_t generate_crq(void)
 		fail("gnutls_x509_crq_set_dn: %s, %s\n", gnutls_strerror(ret), err);
 	}
 
-	ret = gnutls_x509_crq_set_challenge_password(crq, "foo");
+	ret = gnutls_x509_crq_set_challenge_password(crq, CPASS);
 	if (ret != 0)
 		fail("gnutls_x509_crq_set_challenge_password %d\n", ret);
 
@@ -163,22 +169,22 @@ static gnutls_x509_crq_t generate_crq(void)
 		fail("gnutls_x509_crq_get_extension_data\n");
 
 	ret = gnutls_x509_crq_set_subject_alt_name(crq, GNUTLS_SAN_DNSNAME,
-						   "foo", 3, 1);
+						   "foo", 3, GNUTLS_FSAN_APPEND);
 	if (ret != 0)
 		fail("gnutls_x509_crq_set_subject_alt_name\n");
 
 	ret = gnutls_x509_crq_set_subject_alt_name(crq, GNUTLS_SAN_DNSNAME,
-						   "bar", 3, 1);
+						   "bar", 3, GNUTLS_FSAN_APPEND);
 	if (ret != 0)
 		fail("gnutls_x509_crq_set_subject_alt_name\n");
 
 	ret = gnutls_x509_crq_set_subject_alt_name(crq, GNUTLS_SAN_DNSNAME,
-						   "apa", 3, 0);
+						   "apa", 3, GNUTLS_FSAN_SET);
 	if (ret != 0)
 		fail("gnutls_x509_crq_set_subject_alt_name\n");
 
 	ret = gnutls_x509_crq_set_subject_alt_name(crq, GNUTLS_SAN_DNSNAME,
-						   "foo", 3, 1);
+						   "foo", 3, GNUTLS_FSAN_APPEND);
 	if (ret != 0)
 		fail("gnutls_x509_crq_set_subject_alt_name\n");
 
@@ -231,6 +237,10 @@ static gnutls_x509_crq_t generate_crq(void)
 	if (ret != 0)
 		fail("gnutls_x509_crq_set_extension_by_oid %s\n", gnutls_strerror(ret));
 
+	ret = gnutls_x509_crq_set_private_key_usage_period(crq, TIME1, TIME2);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_private_key_usage_period\n");
+
 	ret = gnutls_x509_crq_print(crq, GNUTLS_CRT_PRINT_FULL, &out);
 	if (ret != 0)
 		fail("gnutls_x509_crq_print\n");
@@ -275,6 +285,80 @@ static gnutls_x509_crq_t generate_crq(void)
 	return crq;
 }
 
+/* Tests parameters from the generated CRQ */
+static void test_crq(gnutls_x509_crq_t crq)
+{
+	int ret, pathlen;
+	size_t s = 0;
+	char buf[64];
+	gnutls_datum_t out;
+	time_t t1, t2;
+	unsigned crit, ca, type;
+
+	ret = gnutls_x509_crq_get_dn2(crq, &out);
+	assert(ret == 0);
+	assert(out.size == 28);
+	assert(memcmp(out.data, "CN=nikos,O=none to\\, mention", out.size)==0);
+
+	gnutls_free(out.data);
+
+	ret = gnutls_x509_crq_get_dn3(crq, &out, GNUTLS_X509_DN_FLAG_COMPAT);
+	assert(ret == 0);
+	assert(out.size == 28);
+	assert(memcmp(out.data, "CN=nikos,O=none to\\, mention", out.size)==0);
+
+	gnutls_free(out.data);
+
+	ret = gnutls_x509_crq_get_dn3(crq, &out, 0);
+	assert(ret == 0);
+	assert(out.size == 28);
+	assert(memcmp(out.data, "O=none to\\, mention,CN=nikos", out.size)==0);
+
+	gnutls_free(out.data);
+
+	ret = gnutls_x509_crq_get_basic_constraints(crq, &crit, &ca, &pathlen);
+	assert(ret == 0);
+	assert(ca == 0);
+	assert(pathlen == 0);
+
+	s = sizeof(buf);
+	ret = gnutls_x509_crq_get_subject_alt_name(crq, 0, buf, &s, &type, &crit);
+	assert(ret >= 0);
+	assert(s == 3);
+	assert(memcmp(buf, "apa", s) == 0);
+	assert(type == GNUTLS_SAN_DNSNAME);
+	assert(crit == 0);
+
+	s = sizeof(buf);
+	ret = gnutls_x509_crq_get_subject_alt_name(crq, 1, buf, &s, &type, &crit);
+	assert(ret >= 0);
+	assert(s == 3);
+	assert(memcmp(buf, "foo", s) == 0);
+	assert(type == GNUTLS_SAN_DNSNAME);
+	assert(crit == 0);
+
+	ret = gnutls_x509_crq_get_private_key_usage_period(crq, &t1, &t2, &crit);
+	if (ret < 0)
+		fail("gnutls_x509_crq_get_private_key_usage_period: %s\n", gnutls_strerror(ret));
+	assert(t1 == TIME1);
+	assert(t2 == TIME2);
+	assert(crit == 0);
+
+	/* check the challenge password using the attribute APIs */
+	s = sizeof(buf);
+	ret = gnutls_x509_crq_get_attribute_info(crq, 1, buf, &s);
+	assert(ret >= 0);
+	assert(s == sizeof(CPASS_OID));
+	assert(memcmp(buf, CPASS_OID, s) == 0);
+
+	/* check the contents */
+	s = sizeof(buf);
+	ret = gnutls_x509_crq_get_attribute_data(crq, 1, buf, &s);
+	assert(ret >= 0);
+	assert(s == sizeof(CPASS)-1+2);
+	assert(memcmp(buf, "\x13\x03"CPASS, s) == 0);
+}
+
 static void run_set_extensions(gnutls_x509_crq_t crq)
 {
 	gnutls_x509_crt_t crt;
@@ -448,6 +532,8 @@ void doit(void)
 
 	crq = generate_crq();
 
+	test_crq(crq);
+
 	run_set_extensions(crq);
 	run_set_extension_by_oid(crq);
 
diff --git a/tests/data/listings-SSL3.0-TLS1.1 b/tests/data/listings-SSL3.0-TLS1.1
index b83b9e6f40..9c9621dfc8 100644
--- a/tests/data/listings-SSL3.0-TLS1.1
+++ b/tests/data/listings-SSL3.0-TLS1.1
@@ -8,4 +8,4 @@ TLS_RSA_AES_128_CBC_SHA1                          	0x00, 0x2f	SSL3.0
 TLS_DHE_RSA_AES_256_CBC_SHA1                      	0x00, 0x39	SSL3.0
 TLS_DHE_RSA_AES_128_CBC_SHA1                      	0x00, 0x33	SSL3.0
 
-Protocols: VERS-TLS1.0, VERS-SSL3.0, VERS-TLS1.1
+Protocols: VERS-TLS1.0, VERS-TLS1.1
diff --git a/tests/data/listings-old-SSL3.0-TLS1.1 b/tests/data/listings-old-SSL3.0-TLS1.1
new file mode 100644
index 0000000000..b83b9e6f40
--- /dev/null
+++ b/tests/data/listings-old-SSL3.0-TLS1.1
@@ -0,0 +1,11 @@
+Cipher suites for NORMAL:-VERS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:+VERS-TLS1.1
+TLS_ECDHE_ECDSA_AES_256_CBC_SHA1                  	0xc0, 0x0a	SSL3.0
+TLS_ECDHE_ECDSA_AES_128_CBC_SHA1                  	0xc0, 0x09	SSL3.0
+TLS_ECDHE_RSA_AES_256_CBC_SHA1                    	0xc0, 0x14	SSL3.0
+TLS_ECDHE_RSA_AES_128_CBC_SHA1                    	0xc0, 0x13	SSL3.0
+TLS_RSA_AES_256_CBC_SHA1                          	0x00, 0x35	SSL3.0
+TLS_RSA_AES_128_CBC_SHA1                          	0x00, 0x2f	SSL3.0
+TLS_DHE_RSA_AES_256_CBC_SHA1                      	0x00, 0x39	SSL3.0
+TLS_DHE_RSA_AES_128_CBC_SHA1                      	0x00, 0x33	SSL3.0
+
+Protocols: VERS-TLS1.0, VERS-SSL3.0, VERS-TLS1.1
diff --git a/tests/gnutls-cli-debug.sh b/tests/gnutls-cli-debug.sh
index 191096ce6c..1f047e870c 100755
--- a/tests/gnutls-cli-debug.sh
+++ b/tests/gnutls-cli-debug.sh
@@ -92,6 +92,7 @@ check_text "for safe renegotiation (RFC5746) support... yes"
 check_text "for encrypt-then-MAC (RFC7366) support... yes"
 check_text "for ext master secret (RFC7627) support... yes"
 check_text "for RFC7919 Diffie-Hellman support... yes"
+check_text "for RSA key exchange support... yes"
 check_text "for curve SECP256r1 (RFC4492)... yes"
 check_text "for AES-GCM cipher (RFC5288) support... yes"
 check_text "for SHA1 MAC support... yes"
@@ -132,7 +133,11 @@ check_text "for ext master secret (RFC7627) support... yes"
 check_text "for RFC7919 Diffie-Hellman support... yes"
 check_text "for curve SECP256r1 (RFC4492)... yes"
 check_text "for AES-GCM cipher (RFC5288) support... yes"
+check_text "for RSA key exchange support... yes"
 check_text "for SHA1 MAC support... yes"
+check_text "whether the server accepts default record size (512 bytes)... yes"
+check_text "whether %ALLOW_SMALL_RECORDS is required... no"
+
 if test "${GNUTLS_FORCE_FIPS_MODE}" != 1; then
 	#these tests are not run in FIPS mode
 	check_text "for MD5 MAC support... no"
@@ -142,4 +147,26 @@ fi
 
 rm -f ${OUTFILE}
 
+# Small records test
+echo ""
+echo "Checking output of gnutls-cli-debug for small records and no RSA"
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:-RSA:%ALLOW_SMALL_RECORDS" --x509keyfile ${KEY1} --x509certfile ${CERT1} \
+	--x509keyfile ${KEY2} --x509certfile ${CERT2} --x509keyfile ${KEY3} --x509certfile ${CERT3} --recordsize=64 >/dev/null 2>&1
+PID=$!
+wait_server ${PID}
+
+timeout 1800 datefudge "2017-08-9" \
+"${DCLI}" -p "${PORT}" localhost >$OUTFILE 2>&1 || fail ${PID} "gnutls-cli-debug run should have succeeded!"
+
+kill ${PID}
+wait
+
+check_text "whether the server accepts default record size (512 bytes)... no"
+check_text "whether %ALLOW_SMALL_RECORDS is required... yes"
+check_text "for RSA key exchange support... no"
+
+rm -f ${OUTFILE}
+
 exit 0
diff --git a/tests/gnutls-strcodes.c b/tests/gnutls-strcodes.c
index 5b3aa39c63..294fcac203 100644
--- a/tests/gnutls-strcodes.c
+++ b/tests/gnutls-strcodes.c
@@ -32,6 +32,8 @@
 
 #include "utils.h"
 
+unsigned _gnutls_ecc_curve_is_supported(gnutls_ecc_curve_t);
+
 /* Check whether the string functions will return a non-repeated and
  * non null value.
  */
@@ -114,6 +116,9 @@ void doit(void)
 	}
 
 	for (i=GNUTLS_ECC_CURVE_INVALID+1;i<=GNUTLS_ECC_CURVE_MAX;i++) {
+		if (_gnutls_ecc_curve_is_supported(i) == 0)
+			continue;
+
 		check_unique_non_null(gnutls_ecc_curve_get_name(i));
 		if (i == GNUTLS_ECC_CURVE_X25519)
 			continue; /* no oid yet */
diff --git a/tests/gnutls_hmac_fast.c b/tests/gnutls_hmac_fast.c
index 604ffcd396..67b10d6283 100644
--- a/tests/gnutls_hmac_fast.c
+++ b/tests/gnutls_hmac_fast.c
@@ -81,6 +81,57 @@ void doit(void)
 		}
 	}
 
+	err =
+	    gnutls_hmac_fast(GNUTLS_MAC_AES_GMAC_128, "keykeykeykeykeyk", 16, "abcdefghabc", 8,
+			     digest);
+	if (err >= 0)
+		fail("gnutls_hmac_fast(GMAC-128) succeeded unexpectedly: %d\n", err);
+	else if (err != GNUTLS_E_INVALID_REQUEST)
+		fail("gnutls_hmac_fast(GMAC-128) failure: %d\n", err);
+	else if (debug)
+		success("gnutls_hmac_fast(GMAC-128) OK\n");
+
+	err =
+	    gnutls_hmac_fast(GNUTLS_MAC_AES_GMAC_192, "keykeykeykeykeykeykeykey", 24,
+			     "abcdefghabc", 8,
+			     digest);
+	if (err >= 0)
+		fail("gnutls_hmac_fast(GMAC-192) succeeded unexpectedly: %d\n", err);
+	else if (err != GNUTLS_E_INVALID_REQUEST)
+		fail("gnutls_hmac_fast(GMAC-192) failure: %d\n", err);
+	else if (debug)
+		success("gnutls_hmac_fast(GMAC-192) OK\n");
+
+	err =
+	    gnutls_hmac_fast(GNUTLS_MAC_AES_GMAC_256, "keykeykeykeykeykeykeykeykeykeyke", 32,
+			     "abcdefghabc", 8,
+			     digest);
+	if (err >= 0)
+		fail("gnutls_hmac_fast(GMAC-256) succeeded unexpectedly: %d\n", err);
+	else if (err != GNUTLS_E_INVALID_REQUEST)
+		fail("gnutls_hmac_fast(GMAC-256) failure: %d\n", err);
+	else if (debug)
+		success("gnutls_hmac_fast(GMAC-256) OK\n");
+
+	err =
+	    gnutls_hmac_fast(GNUTLS_MAC_UMAC_96, "keykeykeykeykeyk", 16, "abcdefghabc", 8,
+			     digest);
+	if (err >= 0)
+		fail("gnutls_hmac_fast(UMAC-96) succeeded unexpectedly: %d\n", err);
+	else if (err != GNUTLS_E_INVALID_REQUEST)
+		fail("gnutls_hmac_fast(UMAC-96) failure: %d\n", err);
+	else if (debug)
+		success("gnutls_hmac_fast(UMAC-96) OK\n");
+
+	err =
+	    gnutls_hmac_fast(GNUTLS_MAC_UMAC_128, "keykeykeykeykeyk", 16, "abcdefghabc", 8,
+			     digest);
+	if (err >= 0)
+		fail("gnutls_hmac_fast(UMAC-128) succeeded unexpectedly: %d\n", err);
+	else if (err != GNUTLS_E_INVALID_REQUEST)
+		fail("gnutls_hmac_fast(UMAC-128) failure: %d\n", err);
+	else if (debug)
+		success("gnutls_hmac_fast(UMAC-128) OK\n");
 
 	gnutls_global_deinit();
 }
diff --git a/tests/gnutls_x509_crt_list_import.c b/tests/gnutls_x509_crt_list_import.c
index a8cad7fbf2..51fdfcb9f4 100644
--- a/tests/gnutls_x509_crt_list_import.c
+++ b/tests/gnutls_x509_crt_list_import.c
@@ -80,6 +80,9 @@ static void load_list(const char *name, const gnutls_datum_t *txt,
 	if (max != ncerts)
 		testfail("imported number (%d) doesn't match expected (%d)\n", max, ncerts);
 
+	if (ret != (int)ncerts)
+		testfail("imported number (%d) doesn't match return value (%d)\n", ncerts, ret);
+
 	return;
 }
 
diff --git a/tests/openconnect-dtls12.c b/tests/openconnect-dtls12.c
new file mode 100644
index 0000000000..21d1b2a1fb
--- /dev/null
+++ b/tests/openconnect-dtls12.c
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2019 Nikos Mavrogiannopoulos
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#if defined(_WIN32)
+
+int main()
+{
+	exit(77);
+}
+
+#else
+
+#include <string.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <signal.h>
+#include <assert.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/dtls.h>
+
+#include "utils.h"
+
+static void server_log_func(int level, const char *str)
+{
+	fprintf(stderr, "server|<%d>| %s", level, str);
+}
+
+static void client_log_func(int level, const char *str)
+{
+	fprintf(stderr, "client|<%d>| %s", level, str);
+}
+
+/* A DTLS client handling DTLS 1.2 resumption under AnyConnect protocol which sets premaster secret.
+ */
+
+#define MAX_BUF 1024
+
+static ssize_t
+push(gnutls_transport_ptr_t tr, const void *data, size_t len)
+{
+	int fd = (long int) tr;
+
+	return send(fd, data, len, 0);
+}
+
+static gnutls_datum_t master =
+    { (void*)"\x44\x66\x44\xa9\xb6\x29\xed\x6e\xd6\x93\x15\xdb\xf0\x7d\x4b\x2e\x18\xb1\x9d\xed\xff\x6a\x86\x76\xc9\x0e\x16\xab\xc2\x10\xbb\x17\x99\x24\xb1\xd9\xb9\x95\xe7\xea\xea\xea\xea\xea\xff\xaa\xac", 48};
+static gnutls_datum_t sess_id =
+    { (void*)"\xd9\xb9\x95\xe7\xea", 5};
+
+static void client(int fd, const char *prio, int proto, int cipher, int kx, int mac, const char *exp_desc)
+{
+	int ret;
+	char buffer[MAX_BUF + 1];
+	char *desc;
+	gnutls_certificate_credentials_t xcred;
+	gnutls_session_t session;
+
+	global_init();
+
+	if (debug) {
+		gnutls_global_set_log_function(client_log_func);
+		gnutls_global_set_log_level(4711);
+	}
+
+	gnutls_certificate_allocate_credentials(&xcred);
+
+	gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
+	gnutls_dtls_set_mtu(session, 1500);
+	gnutls_handshake_set_timeout(session, 20 * 1000);
+
+	assert(gnutls_priority_set_direct(session,
+					  prio,
+					  NULL) >= 0);
+
+	ret = gnutls_session_set_premaster(session, GNUTLS_CLIENT,
+		proto, kx, cipher, mac,
+		GNUTLS_COMP_NULL, &master, &sess_id);
+	if (ret < 0) {
+		fail("client: gnutls_session_set_premaster failed: %s\n", gnutls_strerror(ret));
+		exit(1);
+	}
+
+	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+
+	gnutls_transport_set_int(session, fd);
+	gnutls_transport_set_push_function(session, push);
+
+	/* Perform the TLS handshake
+	 */
+	do {
+		ret = gnutls_handshake(session);
+	}
+	while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+
+	if (ret < 0) {
+		fail("client: Handshake failed\n");
+		gnutls_perror(ret);
+		exit(1);
+	} else {
+		if (debug)
+			success("client: Handshake was completed\n");
+	}
+
+	desc = gnutls_session_get_desc(session);
+	if (desc == NULL)
+		fail("client: gnutls_session_get_desc: NULL\n");
+
+	if (strcmp(desc, exp_desc) != 0)
+		fail("client: gnutls_session_get_desc: found null str: %s\n", desc);
+
+	success(" - connected with: %s\n", desc);
+	gnutls_free(desc);
+
+	if (debug)
+		success("client: TLS version is: %s\n",
+			gnutls_protocol_get_name
+			(gnutls_protocol_get_version(session)));
+
+	do {
+		ret = gnutls_record_recv(session, buffer, sizeof(buffer)-1);
+	} while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
+
+	if (ret == 0) {
+		if (debug)
+			success
+			    ("client: Peer has closed the TLS connection\n");
+		goto end;
+	} else if (ret < 0) {
+		fail("client: Error: %s\n", gnutls_strerror(ret));
+		exit(1);
+	}
+
+	gnutls_bye(session, GNUTLS_SHUT_WR);
+
+      end:
+
+	close(fd);
+
+	gnutls_deinit(session);
+
+	gnutls_certificate_free_credentials(xcred);
+
+	gnutls_global_deinit();
+}
+
+
+static void server(int fd, const char *prio, int proto, int cipher, int kx, int mac)
+{
+	int ret;
+	gnutls_certificate_credentials_t xcred;
+	char buffer[MAX_BUF + 1];
+	gnutls_session_t session;
+
+	/* this must be called once in the program
+	 */
+	global_init();
+
+	if (debug) {
+		gnutls_global_set_log_function(server_log_func);
+		gnutls_global_set_log_level(4711);
+	}
+
+	gnutls_certificate_allocate_credentials(&xcred);
+
+	gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
+	gnutls_handshake_set_timeout(session, 20 * 1000);
+	gnutls_dtls_set_mtu(session, 1500);
+
+	/* avoid calling all the priority functions, since the defaults
+	 * are adequate.
+	 */
+	assert(gnutls_priority_set_direct(session,
+					  prio,
+					  NULL) >= 0);
+
+	ret = gnutls_session_set_premaster(session, GNUTLS_SERVER,
+		proto, kx, cipher, mac,
+		GNUTLS_COMP_NULL, &master, &sess_id);
+	if (ret < 0) {
+		fail("server: gnutls_session_set_premaster failed: %s\n", gnutls_strerror(ret));
+		exit(1);
+	}
+
+	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+
+	gnutls_transport_set_int(session, fd);
+	gnutls_transport_set_push_function(session, push);
+
+	do {
+		ret = gnutls_handshake(session);
+	}
+	while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+	if (ret < 0) {
+		close(fd);
+		gnutls_deinit(session);
+		fail("server: Handshake has failed (%s)\n\n",
+		     gnutls_strerror(ret));
+	}
+	if (debug)
+		success("server: Handshake was completed\n");
+
+	if (debug)
+		success("server: TLS version is: %s\n",
+			gnutls_protocol_get_name
+			(gnutls_protocol_get_version(session)));
+
+	/* see the Getting peer's information example */
+	/* print_info(session); */
+
+	memset(buffer, 1, sizeof(buffer));
+	do {
+		ret = gnutls_record_send(session, buffer, sizeof(buffer)-1);
+	} while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
+
+	if (ret < 0) {
+		close(fd);
+		gnutls_deinit(session);
+		fail("server: data sending has failed (%s)\n\n",
+		     gnutls_strerror(ret));
+	}
+
+
+	/* do not wait for the peer to close the connection.
+	 */
+	gnutls_bye(session, GNUTLS_SHUT_WR);
+
+	close(fd);
+	gnutls_deinit(session);
+
+	gnutls_certificate_free_credentials(xcred);
+
+	gnutls_global_deinit();
+
+	if (debug)
+		success("server: finished\n");
+}
+
+static void run(const char *name, const char *prio, int proto, int cipher, int kx, int mac, const char *exp_desc)
+{
+	int fd[2];
+	int ret;
+	pid_t child;
+
+	success("Testing %s\n", name);
+
+	ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
+	if (ret < 0) {
+		perror("socketpair");
+		exit(1);
+	}
+
+	child = fork();
+	if (child < 0) {
+		perror("fork");
+		fail("fork");
+		exit(1);
+	}
+
+	if (child) {
+		int status;
+		/* parent */
+
+		close(fd[1]);
+		server(fd[0], prio, proto, cipher, kx, mac);
+		wait(&status);
+		check_wait_status(status);
+		close(fd[0]);
+	} else {
+		close(fd[0]);
+		client(fd[1], prio, proto, cipher, kx, mac, exp_desc);
+		close(fd[1]);
+		exit(0);
+	}
+}
+
+void doit(void)
+{
+	signal(SIGPIPE, SIG_IGN);
+
+	run("dtls1.2-aes128-ecdhe", "NONE:+VERS-DTLS1.2:+COMP-NULL:+AES-128-GCM:+AEAD:+ECDHE-RSA:+SIGN-ALL:%COMPAT",
+	    GNUTLS_DTLS1_2, GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_AEAD, "(DTLS1.2)-(ECDHE-RSA)-(AES-128-GCM)");
+	run("dtls1.2-aes256-ecdhe", "NONE:+VERS-DTLS1.2:+COMP-NULL:+AES-256-GCM:+AEAD:+ECDHE-RSA:+SIGN-ALL:%COMPAT",
+	    GNUTLS_DTLS1_2, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_AEAD, "(DTLS1.2)-(ECDHE-RSA)-(AES-256-GCM)");
+	run("dtls1.2-aes128-rsa", "NONE:+VERS-DTLS1.2:+COMP-NULL:+AES-128-GCM:+AEAD:+RSA:+SIGN-ALL:%COMPAT",
+	    GNUTLS_DTLS1_2, GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_RSA, GNUTLS_MAC_AEAD, "(DTLS1.2)-(RSA)-(AES-128-GCM)");
+	run("dtls1.2-aes256-rsa", "NONE:+VERS-DTLS1.2:+COMP-NULL:+AES-256-GCM:+AEAD:+RSA:+SIGN-ALL:%COMPAT",
+	    GNUTLS_DTLS1_2, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_RSA, GNUTLS_MAC_AEAD, "(DTLS1.2)-(RSA)-(AES-256-GCM)");
+}
+
+#endif				/* _WIN32 */
diff --git a/tests/status-request-missing.c b/tests/rfc7633-missing.c
index f55f3ac469..0101c17bc8 100644
--- a/tests/status-request-missing.c
+++ b/tests/rfc7633-missing.c
@@ -50,8 +50,6 @@ int main()
 
 #include "utils.h"
 
-static void terminate(void);
-
 /* This program tests that handshakes fail if the server does not include the
  * requested certificate status with the server certificate having
  * TLS feature 5 (status request).
@@ -133,7 +131,7 @@ static int handshake_callback(gnutls_session_t session, unsigned int htype,
 
 #define MAX_BUF 1024
 
-static void client(int fd)
+static void client(int fd, const char *prio)
 {
 	int ret;
 	unsigned int status;
@@ -156,7 +154,7 @@ static void client(int fd)
 	gnutls_init(&session, GNUTLS_CLIENT);
 
 	/* Use default priorities */
-	gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ECDHE-RSA", NULL);
+	gnutls_priority_set_direct(session, prio, NULL);
 
 	gnutls_handshake_set_hook_function(session, GNUTLS_HANDSHAKE_CERTIFICATE_STATUS,
 					   GNUTLS_HOOK_POST,
@@ -182,7 +180,6 @@ static void client(int fd)
 
 	if (ret < 0) {
 		fail("client: Handshake failed: %s\n", gnutls_strerror(ret));
-		terminate();
 	} else {
 		if (debug)
 			success("client: Handshake was completed\n");
@@ -195,13 +192,11 @@ static void client(int fd)
 
 	if (received == 1) {
 		fail("client: received certificate status when we shouldn't.\n");
-		terminate();
 	}
 
 	ret = gnutls_certificate_verify_peers2(session, &status);
 	if (ret != GNUTLS_E_SUCCESS) {
 		fail("client: Peer certificate validation failed: %s\n", gnutls_strerror(ret));
-		terminate();
 	}
 	else {
 		if (status & GNUTLS_CERT_MISSING_OCSP_STATUS) {
@@ -209,7 +204,6 @@ static void client(int fd)
 		}
 		else {
 			fail("client: Validation status does not include GNUTLS_CERT_MISSING_OCSP_STATUS. Status is %d\n", status);
-			terminate();
 		}
 	}
 
@@ -227,16 +221,7 @@ static void client(int fd)
 }
 
 
-/* These are global */
-pid_t child;
-
-static void terminate(void)
-{
-	kill(child, SIGTERM);
-	exit(1);
-}
-
-static void server(int fd)
+static void server(int fd, const char *prio)
 {
 	int ret;
 	char buffer[MAX_BUF + 1];
@@ -263,7 +248,7 @@ static void server(int fd)
 	/* avoid calling all the priority functions, since the defaults
 	 * are adequate.
 	 */
-	gnutls_priority_set_direct(session, "NORMAL", NULL);
+	gnutls_priority_set_direct(session, prio, NULL);
 
 	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
@@ -307,14 +292,18 @@ static void ch_handler(int sig)
 	return;
 }
 
-void doit(void)
+static void start(const char *name, const char *prio)
 {
+	pid_t child;
 	int fd[2];
 	int ret, status = 0;
 
 	signal(SIGCHLD, ch_handler);
 	signal(SIGPIPE, SIG_IGN);
 
+	received = 0;
+	success("running: %s\n", name);
+
 	ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
 	if (ret < 0) {
 		perror("socketpair");
@@ -331,16 +320,23 @@ void doit(void)
 	if (child) {
 		/* parent */
 		close(fd[1]);
-		client(fd[0]);
+		client(fd[0], prio);
 		waitpid(child, &status, 0);
 		check_wait_status(status);
 	} else {
 		close(fd[0]);
-		server(fd[1]);
+		server(fd[1], prio);
 		exit(0);
 	}
 
 	return;
 }
 
+void doit(void)
+{
+	start("tls1.2", "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2");
+	start("tls1.3", "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.3");
+	start("default", "NORMAL");
+}
+
 #endif				/* _WIN32 */
diff --git a/tests/rfc7633-ok.c b/tests/rfc7633-ok.c
new file mode 100644
index 0000000000..5959065cf3
--- /dev/null
+++ b/tests/rfc7633-ok.c
@@ -0,0 +1,347 @@
+/*
+ * Copyright (C) 2016-2019 Tim Kosse
+ * Copyright (C) 2019 Nikos Mavrogiannopoulos
+ *
+ * Author: Tim Kosse, Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#if defined(_WIN32)
+
+int main()
+{
+	exit(77);
+}
+
+#else
+
+#include <string.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <time.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/dtls.h>
+#include <signal.h>
+
+#include "utils.h"
+#include "cert-common.h"
+
+/* This program tests that handshakes succeed if the server includes the
+ * requested certificate status with the server certificate having
+ * TLS feature 5 (status request).
+ *
+ * See RFC 7633
+ */
+
+static time_t mytime(time_t * t)
+{
+	time_t then = 1559941819;
+	if (t)
+		*t = then;
+
+	return then;
+}
+
+static void server_log_func(int level, const char *str)
+{
+	fprintf(stderr, "server|<%d>| %s", level, str);
+}
+
+static void client_log_func(int level, const char *str)
+{
+	fprintf(stderr, "client|<%d>| %s", level, str);
+}
+
+const unsigned char ocsp_resp[] = {
+  0x30, 0x82, 0x02, 0x3f, 0x0a, 0x01, 0x00, 0xa0, 0x82, 0x02, 0x38, 0x30,
+  0x82, 0x02, 0x34, 0x06, 0x09, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30,
+  0x01, 0x01, 0x04, 0x82, 0x02, 0x25, 0x30, 0x82, 0x02, 0x21, 0x30, 0x81,
+  0x8a, 0xa1, 0x11, 0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55,
+  0x04, 0x03, 0x13, 0x04, 0x43, 0x41, 0x2d, 0x33, 0x18, 0x0f, 0x32, 0x30,
+  0x31, 0x39, 0x30, 0x36, 0x30, 0x37, 0x32, 0x31, 0x31, 0x35, 0x32, 0x32,
+  0x5a, 0x30, 0x64, 0x30, 0x62, 0x30, 0x4d, 0x30, 0x09, 0x06, 0x05, 0x2b,
+  0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0xb7, 0xca, 0x0f, 0xab,
+  0xdc, 0x6f, 0xb8, 0xb0, 0x96, 0x7a, 0x15, 0xac, 0x98, 0x0a, 0x0f, 0x19,
+  0xfe, 0xa4, 0x12, 0xde, 0x04, 0x14, 0x1e, 0x85, 0xed, 0x7f, 0x9e, 0x71,
+  0xfa, 0x08, 0x9d, 0x37, 0x48, 0x43, 0xa0, 0x12, 0xef, 0xe5, 0xaa, 0xe1,
+  0xe3, 0x8a, 0x02, 0x14, 0x60, 0x14, 0x5f, 0x01, 0xcb, 0xe0, 0x05, 0x45,
+  0x38, 0x8c, 0x26, 0xfc, 0x5b, 0xcf, 0x6c, 0x41, 0xc3, 0xcb, 0xaa, 0xcc,
+  0x80, 0x00, 0x18, 0x0f, 0x32, 0x30, 0x31, 0x39, 0x30, 0x36, 0x30, 0x37,
+  0x32, 0x31, 0x31, 0x35, 0x32, 0x32, 0x5a, 0x30, 0x0d, 0x06, 0x09, 0x2a,
+  0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82,
+  0x01, 0x81, 0x00, 0x44, 0xc4, 0x59, 0xab, 0x7b, 0x6e, 0x35, 0x4e, 0x18,
+  0x83, 0x02, 0xbd, 0x94, 0x26, 0x50, 0x01, 0xe2, 0xb1, 0x50, 0xdd, 0xca,
+  0x61, 0x30, 0xb0, 0x93, 0x18, 0x56, 0xfe, 0x8d, 0x4f, 0xcc, 0x33, 0xc8,
+  0x01, 0x1e, 0xac, 0xa1, 0x8e, 0xb0, 0x76, 0x0f, 0x41, 0x38, 0x7d, 0x06,
+  0x9b, 0xfe, 0x09, 0x50, 0x6d, 0x86, 0x07, 0x2a, 0x48, 0x6e, 0x6a, 0xb1,
+  0x13, 0xf4, 0xc0, 0x0f, 0x7c, 0x7d, 0x89, 0xb9, 0x69, 0xe7, 0x04, 0x2e,
+  0xa4, 0x3d, 0xf6, 0xbd, 0x51, 0xbf, 0x52, 0x7d, 0xfb, 0x38, 0x7a, 0xbf,
+  0xe6, 0xd7, 0x32, 0x57, 0x36, 0x87, 0xec, 0x91, 0x07, 0x0c, 0xac, 0xb9,
+  0x79, 0xe7, 0x79, 0x4e, 0x49, 0x72, 0x1d, 0x16, 0xb6, 0x94, 0xbf, 0xc4,
+  0x9f, 0x4e, 0x8b, 0x51, 0x54, 0x73, 0xb4, 0x4d, 0xe7, 0x01, 0x91, 0xcd,
+  0x7c, 0xb2, 0x91, 0x4a, 0xc3, 0x4d, 0xc4, 0x4f, 0xa3, 0x42, 0xf1, 0x89,
+  0xc7, 0xab, 0x36, 0x11, 0xf0, 0x7c, 0xc6, 0x8f, 0x03, 0x53, 0x85, 0x0c,
+  0xfb, 0x30, 0x6b, 0xdd, 0x9e, 0x72, 0xd7, 0x77, 0xe5, 0xea, 0xd3, 0x39,
+  0xb5, 0xb8, 0xdd, 0x61, 0xb9, 0xe7, 0x24, 0x9c, 0x85, 0x42, 0xd7, 0x2b,
+  0x2e, 0x99, 0xdf, 0xe5, 0x8b, 0x79, 0xe3, 0x6e, 0x56, 0x6e, 0xd6, 0xed,
+  0x5f, 0x9b, 0x5f, 0x40, 0x89, 0x17, 0x1a, 0x76, 0xbb, 0x3c, 0x9f, 0x33,
+  0x71, 0xc1, 0xc5, 0x2f, 0xf4, 0x69, 0xe5, 0x5f, 0x83, 0xd4, 0x3a, 0x3d,
+  0xd7, 0x44, 0xaa, 0xc0, 0x9d, 0xd9, 0xd9, 0x99, 0xec, 0x80, 0x4c, 0x46,
+  0x5f, 0x91, 0xf4, 0x09, 0x06, 0xef, 0x37, 0x7c, 0x32, 0x64, 0x67, 0x85,
+  0x99, 0xde, 0x9c, 0xce, 0x3e, 0x58, 0x1a, 0x6c, 0x59, 0xc9, 0x60, 0x26,
+  0x02, 0xeb, 0x95, 0x52, 0x3e, 0x4f, 0xdd, 0x5f, 0x6c, 0x2d, 0x37, 0xc2,
+  0x3b, 0x72, 0x70, 0xab, 0x1d, 0xf5, 0x2a, 0xbe, 0x8c, 0x70, 0x8e, 0xf0,
+  0x25, 0x18, 0x68, 0xe5, 0xe9, 0xd1, 0xcf, 0xd8, 0x1f, 0x6c, 0x8e, 0xcf,
+  0x18, 0x46, 0x51, 0xb4, 0x69, 0xbb, 0x6f, 0x4f, 0x1e, 0x2a, 0x61, 0x3f,
+  0x64, 0x8b, 0x07, 0x7f, 0xc5, 0x80, 0xb9, 0x06, 0xd6, 0xb1, 0x8d, 0x47,
+  0x4a, 0x61, 0xd2, 0x3e, 0xb4, 0xa6, 0xab, 0x12, 0xc6, 0x5c, 0x90, 0x9e,
+  0x2e, 0x16, 0x2e, 0xd4, 0xfc, 0x4b, 0x08, 0x41, 0x94, 0xaf, 0x1d, 0x6e,
+  0x6c, 0x11, 0x5c, 0x88, 0x3d, 0xd9, 0x30, 0x9d, 0x69, 0xf7, 0x45, 0xbe,
+  0x5d, 0x1e, 0xd5, 0xe2, 0xf6, 0x38, 0xfa, 0xe1, 0xbf, 0xae, 0x9f, 0x2f,
+  0xc6, 0x7b, 0x7b, 0x98, 0x89, 0x05, 0x8d, 0x4c, 0x01, 0xad, 0x61, 0x14,
+  0x00, 0xca, 0xa3, 0xed, 0xd0, 0x2c, 0xfe, 0x1b, 0x7e, 0x1d, 0x70, 0x5b,
+  0x2e, 0xc2, 0x54, 0xcf, 0x4c, 0x0a, 0xb3, 0x21, 0x58, 0xed, 0x51, 0xe7,
+  0xeb, 0x8d, 0xb7 };
+
+static int received = 0;
+
+static int handshake_callback(gnutls_session_t session, unsigned int htype,
+			      unsigned post, unsigned int incoming,
+			      const gnutls_datum_t * msg)
+{
+	received = 1;
+	return 0;
+}
+
+#define MAX_BUF 1024
+
+static void client(int fd, const char *prio)
+{
+	int ret;
+	unsigned int status;
+	gnutls_certificate_credentials_t x509_cred;
+	gnutls_session_t session;
+
+	gnutls_global_set_time_function(mytime);
+	global_init();
+
+	if (debug) {
+		gnutls_global_set_log_function(client_log_func);
+		gnutls_global_set_log_level(7);
+	}
+
+	assert(gnutls_certificate_allocate_credentials(&x509_cred) >= 0);
+	assert(gnutls_certificate_set_x509_trust_mem(x509_cred, &ca3_cert, GNUTLS_X509_FMT_PEM)>=0);
+
+	assert(gnutls_init(&session, GNUTLS_CLIENT) >= 0);
+
+	assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
+
+	gnutls_handshake_set_hook_function(session,
+					   GNUTLS_HANDSHAKE_CERTIFICATE_STATUS,
+					   GNUTLS_HOOK_POST,
+					   handshake_callback);
+
+	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
+
+	gnutls_transport_set_int(session, fd);
+
+	do {
+		ret = gnutls_handshake(session);
+	}
+	while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+	if (ret < 0) {
+		fail("client: Handshake failed: %s\n", gnutls_strerror(ret));
+	} else {
+		if (debug)
+			success("client: Handshake was completed\n");
+	}
+
+	if (debug)
+		success("client: TLS version is: %s\n",
+			gnutls_protocol_get_name
+			(gnutls_protocol_get_version(session)));
+
+	if (received == 0
+	    && gnutls_protocol_get_version(session) == GNUTLS_TLS1_2) {
+		fail("client: did not receive certificate status when we should.\n");
+	}
+
+	ret = gnutls_certificate_verify_peers2(session, &status);
+	if (ret != GNUTLS_E_SUCCESS) {
+		fail("client: Peer certificate validation failed: %s\n",
+		     gnutls_strerror(ret));
+	} else {
+		if (status) {
+			gnutls_datum_t tmp;
+			assert(gnutls_certificate_verification_status_print(status, GNUTLS_CRT_X509, &tmp, 0)>=0);
+			fail("client: Validation status is not success (%x: %s)\n",
+			     status, (char*)tmp.data);
+		}
+	}
+
+	gnutls_bye(session, GNUTLS_SHUT_WR);
+
+	close(fd);
+
+	gnutls_deinit(session);
+
+	gnutls_certificate_free_credentials(x509_cred);
+
+	gnutls_global_deinit();
+}
+
+static int status_func(gnutls_session_t session, void *ptr, gnutls_datum_t *resp)
+{
+	resp->data = gnutls_malloc(sizeof(ocsp_resp));
+	if (resp->data == NULL)
+		return -1;
+
+	memcpy(resp->data, ocsp_resp, sizeof(ocsp_resp));
+	resp->size = sizeof(ocsp_resp);
+	return 0;
+}
+
+static void server(int fd, const char *prio)
+{
+	int ret;
+	char buffer[MAX_BUF + 1];
+	gnutls_session_t session;
+	gnutls_certificate_credentials_t x509_cred;
+
+	/* this must be called once in the program
+	 */
+	global_init();
+	memset(buffer, 0, sizeof(buffer));
+
+	if (debug) {
+		gnutls_global_set_log_function(server_log_func);
+		gnutls_global_set_log_level(4711);
+	}
+
+	assert(gnutls_certificate_allocate_credentials(&x509_cred)>=0);
+	assert(gnutls_certificate_set_x509_key_mem(x509_cred, &server_ca3_tlsfeat_cert,
+					    &server_ca3_key, GNUTLS_X509_FMT_PEM)>=0);
+
+	assert(gnutls_init(&session, GNUTLS_SERVER) >= 0);
+
+	assert(gnutls_priority_set_direct(session, prio, NULL) >= 0);
+
+	gnutls_certificate_set_ocsp_status_request_function(x509_cred, status_func, NULL);
+
+	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
+
+	gnutls_transport_set_int(session, fd);
+
+	do {
+		ret = gnutls_handshake(session);
+	} while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+
+	if (ret < 0) {
+		fail("server: Handshake failed: %s\n", gnutls_strerror(ret));
+	}
+
+	if (debug) {
+		success("server: Handshake was completed\n");
+	}
+
+	if (debug)
+		success("server: TLS version is: %s\n",
+			gnutls_protocol_get_name
+			(gnutls_protocol_get_version(session)));
+
+	/* do not wait for the peer to close the connection.
+	 */
+	gnutls_bye(session, GNUTLS_SHUT_WR);
+
+	close(fd);
+	gnutls_deinit(session);
+
+	gnutls_certificate_free_credentials(x509_cred);
+
+	gnutls_global_deinit();
+
+	if (debug)
+		success("server: finished\n");
+}
+
+static void ch_handler(int sig)
+{
+	return;
+}
+
+static void start(const char *name, const char *prio)
+{
+	pid_t child;
+	int fd[2];
+	int ret, status = 0;
+
+	signal(SIGCHLD, ch_handler);
+	signal(SIGPIPE, SIG_IGN);
+
+	received = 0;
+	success("running: %s\n", name);
+
+	ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
+	if (ret < 0) {
+		perror("socketpair");
+		exit(1);
+	}
+
+	child = fork();
+	if (child < 0) {
+		perror("fork");
+		fail("fork");
+		exit(1);
+	}
+
+	if (child) {
+		/* parent */
+		close(fd[1]);
+		client(fd[0], prio);
+		waitpid(child, &status, 0);
+		check_wait_status(status);
+	} else {
+		close(fd[0]);
+		server(fd[1], prio);
+		exit(0);
+	}
+
+	return;
+}
+
+void doit(void)
+{
+	start("tls1.2", "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2");
+	start("tls1.3", "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.3");
+	start("default", "NORMAL");
+}
+
+#endif				/* _WIN32 */
diff --git a/tests/slow/Makefile.am b/tests/slow/Makefile.am
index 7e8e4650ca..b4c43c6aa3 100644
--- a/tests/slow/Makefile.am
+++ b/tests/slow/Makefile.am
@@ -65,6 +65,7 @@ EXTRA_DIST = README gnutls-asan.supp
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	LC_ALL="C"						\
 	LSAN_OPTIONS=suppressions=gnutls-asan.supp		\
+	GNUTLS_TEST_SUITE_RUN=1					\
 	OPENSSL_ia32cap=0x00000000				\
 	top_builddir="$(top_builddir)"				\
 	srcdir="$(srcdir)"
diff --git a/tests/slow/override-ciphers b/tests/slow/override-ciphers
index 2a87b7655f..3c00e5be3e 100755
--- a/tests/slow/override-ciphers
+++ b/tests/slow/override-ciphers
@@ -26,6 +26,11 @@ if ! test -z "${VALGRIND}"; then
 fi
 PROG=./cipher-override${EXEEXT}
 
+# we are explicitly unsetting this variable, because we want
+# the "production" checks to be triggered, not the ones in the
+# test suite.
+
+unset GNUTLS_TEST_SUITE_RUN
 GNUTLS_NO_EXPLICIT_INIT=1 ${VALGRIND} ${PROG}
 ret=$?
 if test $ret != 0; then
diff --git a/tests/slow/test-ciphers-common.sh b/tests/slow/test-ciphers-common.sh
index 52d9d50ea9..1a76b48ce0 100644
--- a/tests/slow/test-ciphers-common.sh
+++ b/tests/slow/test-ciphers-common.sh
@@ -73,6 +73,17 @@ if test $ret != 0; then
 	exit $ret
 fi
 
+#SHANI
+$(which lscpu)|grep Flags|grep sha_ni >/dev/null
+if test $? = 0;then
+	GNUTLS_CPUID_OVERRIDE=0x20 ${PROG}
+	ret=$?
+	if test $ret != 0; then
+		echo "SHANI cipher tests failed"
+		exit $ret
+	fi
+fi
+
 GNUTLS_CPUID_OVERRIDE=0x100000 ${PROG}
 ret=$?
 if test $ret != 0; then
diff --git a/tests/slow/test-hash-large.sh b/tests/slow/test-hash-large.sh
index 944eaa5d8d..754232ec2c 100755
--- a/tests/slow/test-hash-large.sh
+++ b/tests/slow/test-hash-large.sh
@@ -39,21 +39,28 @@ run_test() {
 	fi
 }
 
+#0x20: SHA_NI
 #0x4: SSSE3
 #0x1: no optimizations
 #"": default optimizations
 
 SSSE3FLAG=""
+SHANIFLAG=""
 which lscpu >/dev/null 2>&1
 if test $? = 0;then
         $(which lscpu)|grep Architecture|grep x86 >/dev/null
         if test $? = 0;then
                 SSSE3FLAG="0x4"
         fi
+
+        $(which lscpu)|grep Flags|grep sha_ni >/dev/null
+        if test $? = 0;then
+                SHANIFLAG="0x20"
+        fi
 fi
 
 WAITPID=""
-for flags in "" "0x1" ${SSSE3FLAG};do
+for flags in "" "0x1" ${SSSE3FLAG} ${SHANIFLAG};do
 	run_test ${flags} &
 	WAITPID="${WAITPID} $!"
 done
diff --git a/tests/status-request-ext.c b/tests/status-request-ext.c
index e893c5c528..495e08a197 100644
--- a/tests/status-request-ext.c
+++ b/tests/status-request-ext.c
@@ -49,8 +49,6 @@ int main()
 #include "cert-common.h"
 #include "utils.h"
 
-static void terminate(void);
-
 /* This program tests that the server does not send the
  * status request extension if no status response exists. That
  * is to provide compatibility with gnutls 3.3.x which requires
@@ -157,7 +155,7 @@ static int handshake_callback(gnutls_session_t session, unsigned int htype,
 
 #define MAX_BUF 1024
 
-static void client(int fd)
+static void client(int fd, const char *prio)
 {
 	int ret;
 	gnutls_certificate_credentials_t x509_cred;
@@ -178,7 +176,7 @@ static void client(int fd)
 	gnutls_init(&session, GNUTLS_CLIENT);
 
 	/* Use default priorities */
-	gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ECDHE-RSA", NULL);
+	gnutls_priority_set_direct(session, prio, NULL);
 
 	/* put the anonymous credentials to the current session
 	 */
@@ -200,7 +198,6 @@ static void client(int fd)
 
 	if (ret < 0) {
 		fail("client: Handshake failed: %s\n", gnutls_strerror(ret));
-		terminate();
 	} else {
 		if (debug)
 			success("client: Handshake was completed\n");
@@ -225,16 +222,7 @@ static void client(int fd)
 }
 
 
-/* These are global */
-pid_t child;
-
-static void terminate(void)
-{
-	kill(child, SIGTERM);
-	exit(1);
-}
-
-static void server(int fd)
+static void server(int fd, const char *prio)
 {
 	int ret;
 	char buffer[MAX_BUF + 1];
@@ -265,7 +253,7 @@ static void server(int fd)
 	/* avoid calling all the priority functions, since the defaults
 	 * are adequate.
 	 */
-	gnutls_priority_set_direct(session, "NORMAL", NULL);
+	gnutls_priority_set_direct(session, prio, NULL);
 
 	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
@@ -309,14 +297,17 @@ static void ch_handler(int sig)
 	return;
 }
 
-void doit(void)
+static void start(const char *name, const char *prio)
 {
+	pid_t child;
 	int fd[2];
 	int ret, status = 0;
 
 	signal(SIGCHLD, ch_handler);
 	signal(SIGPIPE, SIG_IGN);
 
+	success("running: %s\n", name);
+
 	ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
 	if (ret < 0) {
 		perror("socketpair");
@@ -333,14 +324,21 @@ void doit(void)
 	if (child) {
 		/* parent */
 		close(fd[1]);
-		server(fd[0]);
+		server(fd[0], prio);
 		waitpid(child, &status, 0);
 		check_wait_status(status);
 	} else {
 		close(fd[0]);
-		client(fd[1]);
+		client(fd[1], prio);
 		exit(0);
 	}
 }
 
+void doit(void)
+{
+	start("tls1.2", "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2");
+	start("tls1.3", "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.3");
+	start("default", "NORMAL");
+}
+
 #endif				/* _WIN32 */
diff --git a/tests/status-request-ok.c b/tests/status-request-ok.c
index 5dda6faf4f..fe1818eeee 100644
--- a/tests/status-request-ok.c
+++ b/tests/status-request-ok.c
@@ -49,8 +49,6 @@ int main()
 
 #include "utils.h"
 
-static void terminate(void);
-
 /* This program tests the status request extension and that receiving the
  * certificate status works.
  */
@@ -181,7 +179,6 @@ static void client(int fd)
 
 	if (ret < 0) {
 		fail("client: Handshake failed: %s\n", gnutls_strerror(ret));
-		terminate();
 	} else {
 		if (debug)
 			success("client: Handshake was completed\n");
@@ -194,7 +191,6 @@ static void client(int fd)
 
 	if (received == 0) {
 		fail("client: didn't receive status request\n");
-		terminate();
 	}
 
 	gnutls_bye(session, GNUTLS_SHUT_WR);
@@ -211,15 +207,6 @@ static void client(int fd)
 }
 
 
-/* These are global */
-pid_t child;
-
-static void terminate(void)
-{
-	kill(child, SIGTERM);
-	exit(1);
-}
-
 static void server(int fd)
 {
 	int ret;
@@ -300,6 +287,7 @@ static void ch_handler(int sig)
 
 void doit(void)
 {
+	pid_t child;
 	int fd[2];
 	int ret, status = 0;
 
diff --git a/tests/status-request.c b/tests/status-request.c
index 2ab57727cd..0e62969ba9 100644
--- a/tests/status-request.c
+++ b/tests/status-request.c
@@ -51,8 +51,6 @@ int main()
 #include "cert-common.h"
 #include "utils.h"
 
-static void terminate(void);
-
 /* This program tests that the client does not send the
  * status request extension if GNUTLS_NO_EXTENSIONS is set.
  */
@@ -133,7 +131,6 @@ static void client(int fd, const char *prio)
 
 	if (ret < 0) {
 		fail("client: Handshake failed: %s\n", gnutls_strerror(ret));
-		terminate();
 	} else {
 		if (debug)
 			success("client: Handshake was completed\n");
@@ -158,7 +155,6 @@ static void client(int fd, const char *prio)
 		goto end;
 	} else if (ret < 0) {
 		fail("client: Error: %s\n", gnutls_strerror(ret));
-		terminate();
 	}
 
 	gnutls_bye(session, GNUTLS_SHUT_WR);
@@ -175,15 +171,6 @@ static void client(int fd, const char *prio)
 }
 
 
-/* These are global */
-pid_t child;
-
-static void terminate(void)
-{
-	kill(child, SIGTERM);
-	exit(1);
-}
-
 static void server(int fd, const char *prio)
 {
 	int ret;
@@ -261,6 +248,7 @@ static void ch_handler(int sig)
 static
 void start(const char *prio)
 {
+	pid_t child;
 	int fd[2];
 	int ret, status = 0;
 
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 8dccbc5726..b4da01a375 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -93,6 +93,7 @@ scripts_to_test = chain.sh \
 	testrandom.sh tls-fuzzer/tls-fuzzer-nocert.sh \
 	tls-fuzzer/tls-fuzzer-cert.sh tls-fuzzer/tls-fuzzer-alpn.sh \
 	tls-fuzzer/tls-fuzzer-nocert-tls13.sh tls-fuzzer/tls-fuzzer-psk.sh \
+	tls-fuzzer/tls-fuzzer-nolimit.sh tls-fuzzer/tls-fuzzer-nolimit-tls13.sh \
 	multi-ticket-reception.sh
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
@@ -101,6 +102,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	top_builddir="$(top_builddir)"	\
 	srcdir="$(srcdir)"		\
 	ASAN_OPTIONS="detect_leaks=0"	\
+	GNUTLS_TEST_SUITE_RUN=1		\
 	OPENSSL_ia32cap=0x00000000
 
 if ENABLE_NON_SUITEB_CURVES
diff --git a/tests/suite/testcompat-main-openssl b/tests/suite/testcompat-main-openssl
index d2708bfa8c..197243086a 100755
--- a/tests/suite/testcompat-main-openssl
+++ b/tests/suite/testcompat-main-openssl
@@ -481,6 +481,43 @@ run_client_suite() {
 		kill ${PID}
 		wait
 	fi
+
+	eval "${GETPORT}"
+	launch_bare_server $$ s_server -cipher ALL -quiet -accept "${PORT}" -keyform pem -certform pem -dtls1_2 -timeout ${OPENSSL_DH_PARAMS_OPT} -key "${RSA_KEY}" -cert "${RSA_CERT}" ${DSA_PARAMS} -Verify 1 -CAfile "${CA_CERT}" >/dev/null
+	PID=$!
+	wait_udp_server ${PID}
+
+	echo "${PREFIX}Checking DTLS 1.2 with AES-CBC..."
+	${VALGRIND} "${CLI}" ${DEBUG} -p "${PORT}" 127.0.0.1 --priority "NONE:+AES-128-CBC:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.2:+RSA${ADD}" --udp --insecure --x509certfile "${CLI_CERT}" --x509keyfile "${CLI_KEY}" </dev/null >/dev/null || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	eval "${GETPORT}"
+	launch_bare_server $$ s_server -cipher ALL -quiet -accept "${PORT}" -keyform pem -certform pem -dtls1_2 -timeout ${OPENSSL_DH_PARAMS_OPT} -key "${RSA_KEY}" -cert "${RSA_CERT}" ${DSA_PARAMS} -Verify 1 -CAfile "${CA_CERT}" >/dev/null
+	PID=$!
+	wait_udp_server ${PID}
+
+	# Test DTLS 1.2 with RSA ciphersuite
+	echo "${PREFIX}Checking DTLS 1.2 with RSA..."
+	${VALGRIND} "${CLI}" ${DEBUG} -p "${PORT}" 127.0.0.1 --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.2:+RSA${ADD}" --udp --insecure --x509certfile "${CLI_CERT}" --x509keyfile "${CLI_KEY}" </dev/null >/dev/null || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	eval "${GETPORT}"
+	launch_bare_server $$ s_server -cipher ALL -quiet -accept "${PORT}" -keyform pem -certform pem -dtls1_2 -timeout ${OPENSSL_DH_PARAMS_OPT} -key "${RSA_KEY}" -cert "${RSA_CERT}" ${DSA_PARAMS} -Verify 1 -CAfile "${CA_CERT}" >/dev/null
+	PID=$!
+	wait_udp_server ${PID}
+
+	echo "${PREFIX}Checking DTLS 1.2 with ECDHE-RSA..."
+	${VALGRIND} "${CLI}" ${DEBUG} -p "${PORT}" 127.0.0.1 --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+GROUP-ALL:+MAC-ALL:+VERS-DTLS1.2:+ECDHE-RSA${ADD}" --udp --insecure --x509certfile "${CLI_CERT}" --x509keyfile "${CLI_KEY}" </dev/null >/dev/null || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
 }
 
 WAITPID=""
@@ -838,7 +875,6 @@ run_server_suite() {
 	PID=$!
 	wait_udp_server ${PID}
 
-
 	${OPENSSL_CLI} s_client -host localhost -port "${PORT}" -dtls1 -cert "${CLI_CERT}" -key "${CLI_KEY}" -CAfile "${CA_CERT}" </dev/null 2>&1 | grep "\:error\:" && \
 		fail ${PID} "Failed"
 
@@ -859,7 +895,6 @@ run_server_suite() {
 	kill ${PID}
 	wait
 
-
 	if test "${NO_DSS}" = 0; then
 		echo "${PREFIX}Check DTLS 1.0 with DHE-DSS ciphersuite"
 		eval "${GETPORT}"
@@ -874,6 +909,58 @@ run_server_suite() {
 		kill ${PID}
 		wait
 	fi
+
+	echo "${PREFIX}Check DTLS 1.2 with AES-CBC"
+	eval "${GETPORT}"
+	launch_server $$ --priority "NONE:+AES-128-CBC:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.2:+RSA${ADD}" --udp --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${DH_PARAMS}"
+	PID=$!
+	wait_udp_server ${PID}
+
+	${OPENSSL_CLI} s_client -host localhost -port "${PORT}" -dtls1_2 -cert "${CLI_CERT}" -key "${CLI_KEY}" -CAfile "${CA_CERT}" </dev/null 2>&1 | grep "\:error\:" && \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "${PREFIX}Check DTLS 1.2 with RSA ciphersuite"
+	eval "${GETPORT}"
+	launch_server $$ --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.2:+RSA${ADD}" --udp --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${DH_PARAMS}"
+	PID=$!
+	wait_udp_server ${PID}
+
+	${OPENSSL_CLI} s_client -host localhost -port "${PORT}" -dtls1_2 -cert "${CLI_CERT}" -key "${CLI_KEY}" -CAfile "${CA_CERT}" </dev/null 2>&1 | grep "\:error\:" && \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+
+	echo "${PREFIX}Check DTLS 1.2 with DHE-RSA ciphersuite"
+	eval "${GETPORT}"
+	launch_server $$ --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.2:+DHE-RSA${ADD}" --udp --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${DH_PARAMS}"
+	PID=$!
+	wait_udp_server ${PID}
+
+
+	${OPENSSL_CLI} s_client -cipher DHE -host localhost -port "${PORT}" -dtls1_2 -cert "${CLI_CERT}" -key "${CLI_KEY}" -CAfile "${CA_CERT}" </dev/null 2>&1 | grep "\:error\:" && \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "${PREFIX}Check DTLS 1.2 with ECDHE-RSA"
+	eval "${GETPORT}"
+	launch_server $$ --priority "NONE:+GROUP-ALL:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-DTLS1.2:+ECDHE-RSA${ADD}" --udp --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}"
+	PID=$!
+	wait_udp_server ${PID}
+
+
+	${OPENSSL_CLI} s_client -cipher ECDHE -host localhost -port "${PORT}" -dtls1_2 -cert "${CLI_CERT}" -key "${CLI_KEY}" -CAfile "${CA_CERT}" </dev/null 2>&1 | grep "\:error\:" && \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
 }
 
 WAITPID=""
diff --git a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
index 806cc17b16..073c143833 100644
--- a/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert-tls13.json
@@ -7,6 +7,7 @@
                  "--x509keyfile", "../../../certs/ecc256.pem",
                  "--x509certfile", "../../../certs/cert-ecc256.pem",
                  "--debug=3",
+                 "--httpdata=../http.dat",
                  "--priority=@PRIORITY@",
                  "--disable-client-cert", "--port=@PORT@"],
      "server_hostname": "localhost",
@@ -14,9 +15,9 @@
      "tests" : [
          {"name" : "test-record-size-limit.py",
           "comment" : "changed extension after HRR is not supported #617",
-          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "685",
+          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "1024",
+                         "--minimal-size", "512",
                          "-e", "change size in TLS 1.2 resumption",
-                         "-e", "change size in TLS 1.3 session resumption",
                          "-e", "check if server accepts maximum size in TLS 1.0",
                          "-e", "check if server accepts maximum size in TLS 1.1",
                          "-e", "check if server accepts maximum size in TLS 1.2",
@@ -29,7 +30,6 @@
                          "-e", "check server sent size in TLS 1.1",
                          "-e", "check server sent size in TLS 1.2",
                          "-e", "drop extension in TLS 1.2 resumption",
-                         "-e", "drop extension in TLS 1.3 session resumption",
                          "-e", "modified extension in 2nd CH in HRR handshake",
                          "-e", "renegotiation with changed limit",
                          "-e", "renegotiation with dropped extension",
@@ -38,10 +38,6 @@
                          "-e", "check server sent size in TLS 1.1 with max_fragment_length",
                          "-e", "check server sent size in TLS 1.2 with max_fragment_length",
                          "-e", "removed extension in 2nd CH in HRR handshake"] },
-         {"name" : "test-record-size-limit.py",
-          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "672",
-                         "change size in TLS 1.3 session resumption",
-                         "drop extension in TLS 1.3 session resumption"] },
 	 {"name" : "test-tls13-0rtt-garbage.py",
 	  "arguments": ["-p", "@PORT@"]},
 	 {"name" : "test-tls13-ccs.py",
diff --git a/tests/suite/tls-fuzzer/gnutls-nocert.json b/tests/suite/tls-fuzzer/gnutls-nocert.json
index e610108715..b56ea40163 100644
--- a/tests/suite/tls-fuzzer/gnutls-nocert.json
+++ b/tests/suite/tls-fuzzer/gnutls-nocert.json
@@ -6,6 +6,7 @@
                  "--x509certfile", "../../../certs/cert-ecc256.pem",
                  "--debug=3",
                  "--noticket",
+                 "--httpdata=../http.dat",
                  "--priority=@PRIORITY@",
                  "--disable-client-cert", "--port=@PORT@"],
      "server_hostname": "localhost",
@@ -233,15 +234,14 @@
                          "-e", "medium, maximum fragmentation: 1 fragment - 1024B extension"]},
          {"name" : "test-record-size-limit.py",
 	  "comment" : "TLS 1.3 tests are done separately; 1/n-1 splitting is not supported in TLS 1.0",
-          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "821",
+          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "1024",
+                         "--minimal-size", "512",
                          "-e", "check if server accepts maximum size in TLS 1.0",
                          "-e", "check if server accepts maximum size in TLS 1.3",
                          "-e", "check if server accepts minimal size in TLS 1.0",
                          "-e", "check if server accepts minimal size in TLS 1.3",
                          "-e", "check if server omits extension for unrecognized size 64 in TLS 1.3",
                          "-e", "check if server omits extension for unrecognized size 511 in TLS 1.3",
-                         "-e", "check interaction with sha256 prf",
-                         "-e", "check interaction with sha384 prf",
                          "-e", "check server sent size in TLS 1.0",
                          "-e", "check server sent size in TLS 1.3",
                          "-e", "HRR sanity",
@@ -253,16 +253,6 @@
                          "-e", "check server sent size in TLS 1.0 with max_fragment_length",
                          "-e", "check server sent size in TLS 1.3 with max_fragment_length",
                          "-e", "removed extension in 2nd CH in HRR handshake"] },
-         {"name" : "test-record-size-limit.py",
-          "comment" : "The reply includes PRF algorithm and affects the AD size",
-          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "827",
-                         "--minimal-size", "512",
-                         "check interaction with sha256 prf"] },
-         {"name" : "test-record-size-limit.py",
-          "comment" : "The reply includes PRF algorithm and affects the AD size",
-          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "816",
-                         "--minimal-size", "512",
-                         "check interaction with sha384 prf"] },
          {"name" : "test-sessionID-resumption.py",
           "arguments" : ["-p", "@PORT@"] },
          {"name" : "test-serverhello-random.py",
diff --git a/tests/suite/tls-fuzzer/gnutls-nolimit-tls13.json b/tests/suite/tls-fuzzer/gnutls-nolimit-tls13.json
new file mode 100644
index 0000000000..9139c78667
--- /dev/null
+++ b/tests/suite/tls-fuzzer/gnutls-nolimit-tls13.json
@@ -0,0 +1,42 @@
+[
+    {"server_command": ["@SERVER@", "--http",
+                 "--x509keyfile", "tests/serverX509Key.pem",
+                 "--x509certfile", "tests/serverX509Cert.pem",
+                 "--x509keyfile", "tests/serverRSAPSSKey.pem",
+                 "--x509certfile", "tests/serverRSAPSSCert.pem",
+                 "--x509keyfile", "../../../certs/ecc256.pem",
+                 "--x509certfile", "../../../certs/cert-ecc256.pem",
+                 "--debug=3",
+                 "--httpdata=../http.dat",
+                 "--priority=@PRIORITY@",
+                 "--disable-client-cert", "--port=@PORT@"],
+     "server_hostname": "localhost",
+     "server_port": @PORT@,
+     "tests" : [
+         {"name" : "test-record-size-limit.py",
+          "comment" : "changed extension after HRR is not supported #617",
+          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "1024",
+                         "-e", "change size in TLS 1.2 resumption",
+                         "-e", "check if server accepts maximum size in TLS 1.0",
+                         "-e", "check if server accepts maximum size in TLS 1.1",
+                         "-e", "check if server accepts maximum size in TLS 1.2",
+                         "-e", "check if server accepts minimal size in TLS 1.0",
+                         "-e", "check if server accepts minimal size in TLS 1.1",
+                         "-e", "check if server accepts minimal size in TLS 1.2",
+                         "-e", "check interaction with sha256 prf",
+                         "-e", "check interaction with sha384 prf",
+                         "-e", "check server sent size in TLS 1.0",
+                         "-e", "check server sent size in TLS 1.1",
+                         "-e", "check server sent size in TLS 1.2",
+                         "-e", "drop extension in TLS 1.2 resumption",
+                         "-e", "modified extension in 2nd CH in HRR handshake",
+                         "-e", "renegotiation with changed limit",
+                         "-e", "renegotiation with dropped extension",
+                         "-e", "added extension in 2nd CH in HRR handshake",
+                         "-e", "check server sent size in TLS 1.0 with max_fragment_length",
+                         "-e", "check server sent size in TLS 1.1 with max_fragment_length",
+                         "-e", "check server sent size in TLS 1.2 with max_fragment_length",
+                         "-e", "removed extension in 2nd CH in HRR handshake"] }
+     ]
+    }
+]
diff --git a/tests/suite/tls-fuzzer/gnutls-nolimit.json b/tests/suite/tls-fuzzer/gnutls-nolimit.json
new file mode 100644
index 0000000000..2383a786c8
--- /dev/null
+++ b/tests/suite/tls-fuzzer/gnutls-nolimit.json
@@ -0,0 +1,37 @@
+[
+    {"server_command": ["@SERVER@", "--http",
+                 "--x509keyfile", "tests/serverX509Key.pem",
+                 "--x509certfile", "tests/serverX509Cert.pem",
+                 "--x509keyfile", "../../../certs/ecc256.pem",
+                 "--x509certfile", "../../../certs/cert-ecc256.pem",
+                 "--debug=3",
+                 "--httpdata=../http.dat",
+                 "--noticket",
+                 "--priority=@PRIORITY@",
+                 "--disable-client-cert", "--port=@PORT@"],
+     "server_hostname": "localhost",
+     "server_port": @PORT@,
+     "tests" : [
+         {"name" : "test-record-size-limit.py",
+	  "comment" : "TLS 1.3 tests are done separately; 1/n-1 splitting is not supported in TLS 1.0",
+          "arguments" : ["-p", "@PORT@", "--reply-AD-size", "1024",
+                         "-e", "check if server accepts maximum size in TLS 1.0",
+                         "-e", "check if server accepts maximum size in TLS 1.3",
+                         "-e", "check if server accepts minimal size in TLS 1.0",
+                         "-e", "check if server accepts minimal size in TLS 1.3",
+                         "-e", "check if server omits extension for unrecognized size 64 in TLS 1.3",
+                         "-e", "check if server omits extension for unrecognized size 511 in TLS 1.3",
+                         "-e", "check server sent size in TLS 1.0",
+                         "-e", "check server sent size in TLS 1.3",
+                         "-e", "HRR sanity",
+                         "-e", "too large record payload in TLS 1.3",
+                         "-e", "change size in TLS 1.3 session resumption",
+                         "-e", "drop extension in TLS 1.3 session resumption",
+                         "-e", "modified extension in 2nd CH in HRR handshake",
+                         "-e", "added extension in 2nd CH in HRR handshake",
+                         "-e", "check server sent size in TLS 1.0 with max_fragment_length",
+                         "-e", "check server sent size in TLS 1.3 with max_fragment_length",
+                         "-e", "removed extension in 2nd CH in HRR handshake"] }
+     ]
+    }
+]
diff --git a/tests/suite/tls-fuzzer/http.dat b/tests/suite/tls-fuzzer/http.dat
new file mode 100644
index 0000000000..12dda9467f
--- /dev/null
+++ b/tests/suite/tls-fuzzer/http.dat
@@ -0,0 +1,23 @@
+7 bottles of beer on the wall, 7 bottles of beer.
+Take one down and pass it around, 6 bottles of beer on the wall.
+
+6 bottles of beer on the wall, 6 bottles of beer.
+Take one down and pass it around, 5 bottles of beer on the wall.
+
+5 bottles of beer on the wall, 5 bottles of beer.
+Take one down and pass it around, 4 bottles of beer on the wall.
+
+4 bottles of beer on the wall, 4 bottles of beer.
+Take one down and pass it around, 3 bottles of beer on the wall.
+
+3 bottles of beer on the wall, 3 bottles of beer.
+Take one down and pass it around, 2 bottles of beer on the wall.
+
+2 bottles of beer on the wall, 2 bottles of beer.
+Take one down and pass it around, 1 bottle of beer on the wall.
+
+1 bottle of beer on the wall, 1 bottle of beer.
+Take one down and pass it around, no more bottles of beer on the wall.
+
+No more bottles of beer on the wall, no more bottles of beer.
+Go to the store and buy some more, 99 bottles of beer on the wall.
diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh
index d1fe2ed100..1b9b0f1765 100755
--- a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh
+++ b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh
@@ -21,7 +21,7 @@
 srcdir="${srcdir:-.}"
 
 tls_fuzzer_prepare() {
-PRIORITY="NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:%ALLOW_SMALL_RECORDS"
+PRIORITY="NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1"
 
 sed -e "s|@SERVER@|$SERV|g" -e "s/@PORT@/$PORT/g" -e "s/@PRIORITY@/$PRIORITY/g" ../gnutls-nocert-tls13.json >${TMPFILE}
 }
diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nocert.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nocert.sh
index 1d23e98c61..77a1d050cd 100755
--- a/tests/suite/tls-fuzzer/tls-fuzzer-nocert.sh
+++ b/tests/suite/tls-fuzzer/tls-fuzzer-nocert.sh
@@ -22,10 +22,10 @@ srcdir="${srcdir:-.}"
 
 tls_fuzzer_prepare() {
 VERSIONS="-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0"
-PRIORITY="NORMAL:%VERIFY_ALLOW_SIGN_WITH_SHA1:+ARCFOUR-128:+3DES-CBC:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1:-CURVE-SECP192R1:${VERSIONS}:+SHA256:%ALLOW_SMALL_RECORDS"
+PRIORITY="NORMAL:%VERIFY_ALLOW_SIGN_WITH_SHA1:+ARCFOUR-128:+3DES-CBC:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1:-CURVE-SECP192R1:${VERSIONS}:+SHA256"
 ${CLI} --list --priority "${PRIORITY}" >/dev/null 2>&1
 if test $? != 0;then
-	PRIORITY="NORMAL:%VERIFY_ALLOW_SIGN_WITH_SHA1:+ARCFOUR-128:+3DES-CBC:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1:${VERSIONS}:+SHA256:%ALLOW_SMALL_RECORDS"
+	PRIORITY="NORMAL:%VERIFY_ALLOW_SIGN_WITH_SHA1:+ARCFOUR-128:+3DES-CBC:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1:${VERSIONS}:+SHA256"
 fi
 
 sed -e "s|@SERVER@|$SERV|g" -e "s/@PORT@/$PORT/g" -e "s/@PRIORITY@/$PRIORITY/g" ../gnutls-nocert.json >${TMPFILE}
diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nolimit-tls13.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nolimit-tls13.sh
new file mode 100755
index 0000000000..4b0e0fa087
--- /dev/null
+++ b/tests/suite/tls-fuzzer/tls-fuzzer-nolimit-tls13.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Copyright (C) 2016-2017 Red Hat, Inc.
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GnuTLS; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+srcdir="${srcdir:-.}"
+
+tls_fuzzer_prepare() {
+PRIORITY="NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:%ALLOW_SMALL_RECORDS"
+
+sed -e "s|@SERVER@|$SERV|g" -e "s/@PORT@/$PORT/g" -e "s/@PRIORITY@/$PRIORITY/g" ../gnutls-nolimit-tls13.json >${TMPFILE}
+}
+
+. "${srcdir}/tls-fuzzer/tls-fuzzer-common.sh"
diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nolimit.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nolimit.sh
new file mode 100755
index 0000000000..df1ae6bcc2
--- /dev/null
+++ b/tests/suite/tls-fuzzer/tls-fuzzer-nolimit.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Copyright (C) 2016-2017 Red Hat, Inc.
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GnuTLS; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+srcdir="${srcdir:-.}"
+
+tls_fuzzer_prepare() {
+VERSIONS="-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0"
+PRIORITY="NORMAL:%VERIFY_ALLOW_SIGN_WITH_SHA1:+ARCFOUR-128:+3DES-CBC:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1:-CURVE-SECP192R1:${VERSIONS}:+SHA256:%ALLOW_SMALL_RECORDS"
+${CLI} --list --priority "${PRIORITY}" >/dev/null 2>&1
+if test $? != 0;then
+	PRIORITY="NORMAL:%VERIFY_ALLOW_SIGN_WITH_SHA1:+ARCFOUR-128:+3DES-CBC:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1:${VERSIONS}:+SHA256:%ALLOW_SMALL_RECORDS"
+fi
+
+sed -e "s|@SERVER@|$SERV|g" -e "s/@PORT@/$PORT/g" -e "s/@PRIORITY@/$PRIORITY/g" ../gnutls-nolimit.json >${TMPFILE}
+}
+
+. "${srcdir}/tls-fuzzer/tls-fuzzer-common.sh"
diff --git a/tests/system-override-curves.sh b/tests/system-override-curves.sh
new file mode 100755
index 0000000000..84d581bc8f
--- /dev/null
+++ b/tests/system-override-curves.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>
+
+srcdir="${srcdir:-.}"
+SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
+CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
+TMPFILE=config.$$.tmp
+TMPFILE2=log.$$.tmp
+export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
+
+if ! test -x "${SERV}"; then
+	exit 77
+fi
+
+if ! test -x "${CLI}"; then
+	exit 77
+fi
+
+if test "${WINDIR}" != ""; then
+	exit 77
+fi
+
+. "${srcdir}/scripts/common.sh"
+
+# This test doesn't work in FIPS mode
+if test -n "${GNUTLS_FORCE_FIPS_MODE}" && test "${GNUTLS_FORCE_FIPS_MODE}" != 0; then
+	exit 77
+fi
+
+# We intentionally add stray spaces and tabs to check our parser
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+disabled-curve =  	  secp256r1 	  
+disabled-curve = secp521r1   	
+_EOF_
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+export GNUTLS_DEBUG_LEVEL=3
+
+"${CLI}" --list|grep ^Groups >${TMPFILE2}
+cat ${TMPFILE2}
+if grep -i "SECP256R1" ${TMPFILE2} || grep -i "SECP521R1" ${TMPFILE2};then
+	echo "Found disabled curve with --list"
+	exit 1
+fi
+
+if ! grep -i "SECP384R1" ${TMPFILE2};then
+	echo "Could not found secp384r1"
+	exit 1
+fi
+
+# Try whether a client connection with a disabled curve will succeed.
+
+KEY1=${srcdir}/../doc/credentials/x509/key-rsa.pem
+CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem
+
+unset GNUTLS_SYSTEM_PRIORITY_FILE
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3" --x509keyfile ${KEY1} --x509certfile ${CERT1}
+PID=$!
+wait_server ${PID}
+
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-CURVE-ALL:+CURVE-SECP256R1:+CURVE-SECP521R1 --insecure --logfile ${TMPFILE2} </dev/null >/dev/null ||
+	fail "expected connection to succeed (1)"
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-CURVE-ALL:+CURVE-SECP256R1:+CURVE-SECP521R1 --insecure --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to fail (2)"
+
+kill ${PID}
+wait
+
+# Try whether a server connection with a disabled curve will succeed.
+
+KEY1=${srcdir}/../doc/credentials/x509/key-rsa.pem
+CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL" --x509keyfile ${KEY1} --x509certfile ${CERT1}
+PID=$!
+wait_server ${PID}
+
+unset GNUTLS_SYSTEM_PRIORITY_FILE
+
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority "NORMAL:-CURVE-ALL:+CURVE-SECP256R1:+CURVE-SECP521R1" --insecure --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to fail (2)"
+
+kill ${PID}
+wait
+
+exit 0
diff --git a/tests/system-override-hash.c b/tests/system-override-hash.c
new file mode 100644
index 0000000000..e96481918d
--- /dev/null
+++ b/tests/system-override-hash.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GnuTLS; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gnutls/gnutls.h>
+
+#include "utils.h"
+#include <assert.h>
+
+/* This test verifies whether a system-wide configuration which disables SHA256
+ * and SHA512 is seen from the library side.
+ */
+
+void doit(void)
+{
+	/* sanity */
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_PSS_SHA384) != 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_MD5) == 0);
+
+	/* check whether the values set by the calling script are the expected */
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_DSA_SHA256) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_SHA256) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_SHA512) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_ECDSA_SHA256) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_ECDSA_SHA512) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_PSS_SHA256) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_PSS_SHA512) == 0);
+}
diff --git a/tests/system-override-invalid.sh b/tests/system-override-invalid.sh
new file mode 100755
index 0000000000..9bd1e91f93
--- /dev/null
+++ b/tests/system-override-invalid.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# Copyright (C) 2019 Nikos Mavrogiannopoulos
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GnuTLS; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+srcdir="${srcdir:-.}"
+CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
+TMPFILE=c.$$.tmp
+export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
+
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+insecure-something = md5
+insecure-hash = sha256
+insecure-hash= sha512
+_EOF_
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+${CLI} --list -d 4 >/dev/null 2>&1
+if test $? = 0;then
+	echo "unknown option was not caught"
+	exit 1
+fi
+
+
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+insecure-sig-for-cert = rsa-sha256
+insecure-sig = rsa-sha512
+insecure-sig = rsa-sha1
+
+[unknown-section]
+insecure-sig = rsa-sha512
+insecure-sig = rsa-sha1
+_EOF_
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+
+${CLI} --list >/dev/null 2>&1
+if test $? = 0;then
+	echo "unknown section was not caught"
+	exit 1
+fi
+
+exit 0
diff --git a/tests/system-override-kx.sh b/tests/system-override-kx.sh
new file mode 100755
index 0000000000..cd318a1650
--- /dev/null
+++ b/tests/system-override-kx.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>
+
+srcdir="${srcdir:-.}"
+SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
+CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
+TMPFILE=config.$$.tmp
+TMPFILE2=log.$$.tmp
+export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
+
+if ! test -x "${SERV}"; then
+	exit 77
+fi
+
+if ! test -x "${CLI}"; then
+	exit 77
+fi
+
+if test "${WINDIR}" != ""; then
+	exit 77
+fi
+
+. "${srcdir}/scripts/common.sh"
+
+# We intentionally add stray spaces and tabs to check our parser
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+tls-disabled-kx = dhe-dss
+tls-disabled-kx = dhe-rsa
+tls-disabled-kx = unknown
+_EOF_
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+export GNUTLS_DEBUG_LEVEL=3
+
+# Try whether a client connection with a disabled KX algorithm will succeed.
+
+KEY1=${srcdir}/../doc/credentials/x509/key-rsa.pem
+CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem
+
+unset GNUTLS_SYSTEM_PRIORITY_FILE
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.2" --x509keyfile ${KEY1} --x509certfile ${CERT1}
+PID=$!
+wait_server ${PID}
+
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-KX-ALL:+DHE-RSA --insecure --logfile ${TMPFILE2} </dev/null >/dev/null ||
+	fail "expected connection to succeed (1)"
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-KX-ALL:+DHE-RSA --insecure --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to fail (2)"
+
+# test whether the unknown KX will be caught
+GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
+export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL --insecure --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to succeed (3)"
+
+unset GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID
+
+kill ${PID}
+wait
+
+# Try whether a server connection with a disabled KX will succeed.
+
+KEY1=${srcdir}/../doc/credentials/x509/key-rsa.pem
+CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.2" --x509keyfile ${KEY1} --x509certfile ${CERT1}
+PID=$!
+wait_server ${PID}
+
+unset GNUTLS_SYSTEM_PRIORITY_FILE
+
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority "NORMAL:-KX-ALL:+DHE-RSA" --insecure --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to fail (2)"
+
+kill ${PID}
+wait
+
+exit 0
diff --git a/tests/system-override-profiles.sh b/tests/system-override-profiles.sh
new file mode 100755
index 0000000000..88ec631798
--- /dev/null
+++ b/tests/system-override-profiles.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>
+#
+
+srcdir="${srcdir:-.}"
+SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
+CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
+TMPFILE=config.$$.tmp
+TMPFILE2=log.$$.tmp
+export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
+
+if ! test -x "${SERV}"; then
+	exit 77
+fi
+
+if ! test -x "${CLI}"; then
+	exit 77
+fi
+
+if test "${WINDIR}" != ""; then
+	exit 77
+fi
+
+. "${srcdir}/scripts/common.sh"
+
+check_for_datefudge
+
+CERT="${srcdir}/certs/cert-ecc256.pem"
+KEY="${srcdir}/certs/ecc256.pem"
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL" --x509keyfile ${KEY} --x509certfile ${CERT}
+PID=$!
+wait_server ${PID}
+
+# successful case, 224 bit min-profile, 256 bit key
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+# 224 bits
+min-verification-profile=medium
+_EOF_
+
+export GNUTLS_DEBUG_LEVEL=3
+unset GNUTLS_SYSTEM_PRIORITY_FILE
+
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" --logfile ${TMPFILE2} </dev/null >/dev/null ||
+	fail "expected connection to succeed (1)"
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:%PROFILE_LOW --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" --logfile ${TMPFILE2} </dev/null >/dev/null ||
+	fail "expected connection to succeed (2)"
+
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:%PROFILE_MEDIUM --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" --logfile ${TMPFILE2} </dev/null >/dev/null ||
+	fail "expected connection to succeed (3)"
+
+# failure case, 384 bit min-profile, 256 bit key
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+min-verification-profile=ultra
+_EOF_
+
+unset GNUTLS_SYSTEM_PRIORITY_FILE
+
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" --logfile ${TMPFILE2} </dev/null >/dev/null ||
+	fail "expected connection to succeed (1)"
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:%PROFILE_LOW --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to fail (1)"
+
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:%PROFILE_MEDIUM --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to fail (2)"
+
+kill ${PID}
+wait
+
+exit 0
diff --git a/tests/system-override-sig-hash.sh b/tests/system-override-sig-hash.sh
new file mode 100755
index 0000000000..37980ec584
--- /dev/null
+++ b/tests/system-override-sig-hash.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2019 Nikos Mavrogiannopoulos
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GnuTLS; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+srcdir="${srcdir:-.}"
+TMPFILE=c.$$.tmp
+export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
+
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+insecure-hash = sha256
+insecure-hash = sha512
+_EOF_
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+
+${builddir}/system-override-hash
+
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+insecure-sig-for-cert = rsa-sha256
+insecure-sig = rsa-sha512
+insecure-sig = rsa-sha1
+_EOF_
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+
+${builddir}/system-override-sig
+if test $? != 0;then
+	echo "Could not parse config file"
+	exit 1
+fi
+
+exit 0
diff --git a/tests/system-override-sig.c b/tests/system-override-sig.c
new file mode 100644
index 0000000000..9e6171c446
--- /dev/null
+++ b/tests/system-override-sig.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GnuTLS; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gnutls/gnutls.h>
+
+#include "utils.h"
+#include <assert.h>
+
+/* This test verifies whether a system-wide configuration which disables RSA-SHA256,
+ * RSA-SHA1 and RSA-SHA512 is seen from the library side.
+ */
+
+void doit(void)
+{
+	/* sanity */
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_PSS_SHA384) != 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_MD5) == 0);
+
+	/* check whether the values set by the calling script are the expected */
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_SHA256) != 0);
+	assert(gnutls_sign_is_secure2(GNUTLS_SIGN_RSA_SHA256, GNUTLS_SIGN_FLAG_SECURE_FOR_CERTS) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_SHA1) == 0);
+	assert(gnutls_sign_is_secure2(GNUTLS_SIGN_RSA_SHA1, GNUTLS_SIGN_FLAG_SECURE_FOR_CERTS) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_SHA512) == 0);
+	assert(gnutls_sign_is_secure2(GNUTLS_SIGN_RSA_SHA512, GNUTLS_SIGN_FLAG_SECURE_FOR_CERTS) == 0);
+	assert(gnutls_sign_is_secure(GNUTLS_SIGN_RSA_MD5) == 0);
+}
diff --git a/tests/system-override-tls.sh b/tests/system-override-tls.sh
new file mode 100755
index 0000000000..6114d76282
--- /dev/null
+++ b/tests/system-override-tls.sh
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>
+#
+
+srcdir="${srcdir:-.}"
+SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
+CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
+TMPFILE=config.$$.tmp
+export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
+
+if ! test -x "${SERV}"; then
+	exit 77
+fi
+
+if ! test -x "${CLI}"; then
+	exit 77
+fi
+
+if test "${WINDIR}" != ""; then
+	exit 77
+fi
+
+. "${srcdir}/scripts/common.sh"
+
+check_for_datefudge
+
+CERT="${srcdir}/certs/cert-ecc256.pem"
+KEY="${srcdir}/certs/ecc256.pem"
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL:+SHA256" --x509keyfile ${KEY} --x509certfile ${CERT}
+PID=$!
+wait_server ${PID}
+
+#successful case, test whether the ciphers we disable below work
+echo "Sanity testing"
+
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-CIPHER-ALL:+AES-128-GCM:-GROUP-ALL:+GROUP-FFDHE2048 --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null ||
+	fail ${PID} "stage1: expected connection to succeed (1)"
+
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-CBC:+AES-256-CBC:-MAC-ALL:+SHA1 --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null ||
+	fail ${PID} "stage1: expected connection to succeed (2)"
+
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+tls-disabled-cipher = aes-128-gcm
+tls-disabled-cipher = aes-128-cbc
+tls-disabled-mac = sha1
+tls-disabled-group = group-ffdhe2048
+_EOF_
+
+GNUTLS_SYSTEM_PRIORITY_FILE=${TMPFILE}
+export GNUTLS_DEBUG_LEVEL=3
+export GNUTLS_SYSTEM_PRIORITY_FILE
+
+echo "Testing TLS1.3"
+echo " * sanity"
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null ||
+	fail ${PID} "stage2: expected connection to succeed (1)"
+
+echo " * fallback to good options"
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-CIPHER-ALL:+AES-128-GCM:+AES-256-GCM:-GROUP-ALL:+GROUP-FFDHE2048:+GROUP-FFDHE3072 --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null ||
+	fail ${PID} "stage2: expected connection to succeed (2)"
+
+echo " * disabled cipher"
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-CIPHER-ALL:+AES-128-GCM --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null && #>/dev/null &&
+	fail ${PID} "stage2: expected connection to fail (1)"
+
+echo " * disabled group"
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-GROUP-ALL:+GROUP-FFDHE2048 --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null &&
+	fail ${PID} "stage2: expected connection to fail (2)"
+
+echo "Testing TLS1.2"
+echo " * sanity"
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-VERS-ALL:+VERS-TLS1.2 --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null ||
+	fail ${PID} "stage3: expected connection to succeed (1)"
+
+echo " * fallback to good options"
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-CBC:+AES-256-CBC:+AES-256-GCM:-MAC-ALL:+SHA1:+AEAD --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null ||
+	fail ${PID} "stage3: expected connection to succeed (2)"
+
+echo " * disabled cipher"
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-CBC --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null &&
+	fail ${PID} "stage3: expected connection to fail (1)"
+
+echo " * disabled MAC"
+datefudge "2017-11-22" \
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA1 --verify-hostname localhost --x509cafile "${srcdir}/certs/ca-cert-ecc.pem" </dev/null >/dev/null &&
+	fail ${PID} "stage3: expected connection to fail (2)"
+
+
+kill ${PID}
+wait
+
+rm -f ${TMPFILE}
+
+exit 0
diff --git a/tests/system-override-versions.sh b/tests/system-override-versions.sh
new file mode 100755
index 0000000000..e5191e2aeb
--- /dev/null
+++ b/tests/system-override-versions.sh
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GnuTLS.
+#
+# GnuTLS is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GnuTLS is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GnuTLS; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+srcdir="${srcdir:-.}"
+SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
+CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
+TMPFILE=config.$$.tmp
+TMPFILE2=log.$$.tmp
+export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
+
+if ! test -x "${SERV}"; then
+	exit 77
+fi
+
+if ! test -x "${CLI}"; then
+	exit 77
+fi
+
+if test "${WINDIR}" != ""; then
+	exit 77
+fi
+
+. "${srcdir}/scripts/common.sh"
+
+cat <<_EOF_ > ${TMPFILE}
+[overrides]
+
+disabled-version = tls1.2
+disabled-version = tls1.3
+_EOF_
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+export GNUTLS_DEBUG_LEVEL=3
+
+"${CLI}" --list|grep Protocols >${TMPFILE2}
+cat ${TMPFILE2}
+if grep "VERS-TLS1.2" ${TMPFILE2} || grep "VERS-TLS1.3" ${TMPFILE2};then
+	echo "Found disabled protocol with --list"
+	exit 1
+fi
+
+"${CLI}" --priority NORMAL --list|grep Protocols >${TMPFILE2}
+cat ${TMPFILE2}
+if grep "VERS-TLS1.2" ${TMPFILE2} || grep "VERS-TLS1.3" ${TMPFILE2};then
+	echo "Found disabled protocol with --list --priority NORMAL"
+	exit 1
+fi
+
+# Try whether a client connection with these protocols will succeed.
+
+KEY1=${srcdir}/../doc/credentials/x509/key-rsa.pem
+CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem
+
+unset GNUTLS_SYSTEM_PRIORITY_FILE
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3" --x509keyfile ${KEY1} --x509certfile ${CERT1}
+PID=$!
+wait_server ${PID}
+
+export GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}"
+
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority NORMAL --insecure --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to fail (1)"
+
+kill ${PID}
+wait
+
+# Try whether a server connection with these protocols will succeed.
+
+KEY1=${srcdir}/../doc/credentials/x509/key-rsa.pem
+CERT1=${srcdir}/../doc/credentials/x509/cert-rsa.pem
+
+eval "${GETPORT}"
+launch_server $$ --echo --priority "NORMAL" --x509keyfile ${KEY1} --x509certfile ${CERT1}
+PID=$!
+wait_server ${PID}
+
+unset GNUTLS_SYSTEM_PRIORITY_FILE
+
+"${CLI}" -p "${PORT}" 127.0.0.1 --priority "NORMAL:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3" --insecure --logfile ${TMPFILE2} </dev/null >/dev/null &&
+	fail "expected connection to fail (2)"
+
+kill ${PID}
+wait
+
+exit 0
diff --git a/tests/system-prio-file.c b/tests/system-prio-file.c
index 4368bd0018..fbe7d0af80 100644
--- a/tests/system-prio-file.c
+++ b/tests/system-prio-file.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gnutls/gnutls.h>
+#include <assert.h>
 
 #include "utils.h"
 
@@ -51,6 +52,8 @@ try_prio(const char *prio, const char *expected_str)
 	if (p == NULL && expected_str == NULL)
 		goto ok;
 
+	assert(strstr(gnutls_get_system_config_file(), "system.prio") != NULL);
+
 	if (p == NULL || expected_str == NULL || strcmp(p, expected_str) != 0) {
 		fail("test: %s: error; got: %s, expected: %s\n", prio, p, expected_str);
 		exit(1);
diff --git a/tests/windows/Makefile.am b/tests/windows/Makefile.am
index 86de084bb7..5a81043772 100644
--- a/tests/windows/Makefile.am
+++ b/tests/windows/Makefile.am
@@ -69,6 +69,7 @@ TESTS = $(ctests) $(dist_check_SCRIPTS)
 TESTS_ENVIRONMENT =						\
 	WINEDLLOVERRIDES="crypt32=n,ncrypt=n"			\
 	LC_ALL="C"						\
+	GNUTLS_TEST_SUITE_RUN=1			\
 	EXEEXT=$(EXEEXT)					\
 	top_builddir="$(top_builddir)"				\
 	srcdir="$(srcdir)"