From 40c736e322bba43bd8c281967ac0752c519acdf6 Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:13:29 +0200
Subject: [PATCH 01/10] rm src-cryptopp

---
 src-cryptopp/Doxyfile                      | 2375 ------
 src-cryptopp/GNUmakefile                   |  793 --
 src-cryptopp/License.txt                   |   51 -
 src-cryptopp/Readme.txt                    |  569 --
 src-cryptopp/TestVectors/Readme.txt        |   85 -
 src-cryptopp/TestVectors/aes.txt           |  241 -
 src-cryptopp/TestVectors/all.txt           |   39 -
 src-cryptopp/TestVectors/blake2.txt        |    4 -
 src-cryptopp/TestVectors/blake2b.txt       |  439 -
 src-cryptopp/TestVectors/blake2s.txt       |  223 -
 src-cryptopp/TestVectors/camellia.txt      | 8646 --------------------
 src-cryptopp/TestVectors/ccm.txt           |  240 -
 src-cryptopp/TestVectors/chacha.txt        |  120 -
 src-cryptopp/TestVectors/cmac.txt          |   38 -
 src-cryptopp/TestVectors/dlies.txt         |  542 --
 src-cryptopp/TestVectors/dsa.txt           |  397 -
 src-cryptopp/TestVectors/dsa_1363.txt      |  553 --
 src-cryptopp/TestVectors/eax.txt           |   75 -
 src-cryptopp/TestVectors/esign.txt         |   93 -
 src-cryptopp/TestVectors/gcm.txt           |  168 -
 src-cryptopp/TestVectors/hmac.txt          |  281 -
 src-cryptopp/TestVectors/mars.txt          |   66 -
 src-cryptopp/TestVectors/nr.txt            |  615 --
 src-cryptopp/TestVectors/panama.txt        |   76 -
 src-cryptopp/TestVectors/rsa_oaep.txt      | 1765 ----
 src-cryptopp/TestVectors/rsa_pkcs1_1_5.txt |   89 -
 src-cryptopp/TestVectors/rsa_pss.txt       | 2083 -----
 src-cryptopp/TestVectors/rw.txt            |  166 -
 src-cryptopp/TestVectors/salsa.txt         |  463 --
 src-cryptopp/TestVectors/seal.txt          |  137 -
 src-cryptopp/TestVectors/seed.txt          |   19 -
 src-cryptopp/TestVectors/sha.txt           |   59 -
 src-cryptopp/TestVectors/shacal2.txt       | 5123 ------------
 src-cryptopp/TestVectors/sosemanuk.txt     |   25 -
 src-cryptopp/TestVectors/tea.txt           |  711 --
 src-cryptopp/TestVectors/ttmac.txt         |   40 -
 src-cryptopp/TestVectors/vmac.txt          |   77 -
 src-cryptopp/TestVectors/whrlpool.txt      |   39 -
 src-cryptopp/adhoc.cpp.proto               |   42 -
 src-cryptopp/aes.h                         |   23 -
 src-cryptopp/algebra.cpp                   |  341 -
 src-cryptopp/algebra.h                     |  453 -
 src-cryptopp/algparam.cpp                  |   77 -
 src-cryptopp/algparam.h                    |  580 --
 src-cryptopp/argnames.h                    |   94 -
 src-cryptopp/asn.cpp                       |  606 --
 src-cryptopp/asn.h                         |  546 --
 src-cryptopp/authenc.h                     |   66 -
 src-cryptopp/basecode.cpp                  |  247 -
 src-cryptopp/basecode.h                    |  142 -
 src-cryptopp/blake2.cpp                    | 5074 ------------
 src-cryptopp/blake2.h                      |  314 -
 src-cryptopp/cbcmac.h                      |   56 -
 src-cryptopp/ccm.h                         |  122 -
 src-cryptopp/chacha.cpp                    |  153 -
 src-cryptopp/chacha.h                      |   91 -
 src-cryptopp/channels.h                    |  134 -
 src-cryptopp/cmac.h                        |   67 -
 src-cryptopp/config.h                      |  947 ---
 src-cryptopp/cpu.cpp                       |  758 --
 src-cryptopp/cpu.h                         |  597 --
 src-cryptopp/cryptest.sln                  |   89 -
 src-cryptopp/cryptlib.cpp                  |  941 ---
 src-cryptopp/cryptlib.h                    | 3010 -------
 src-cryptopp/cryptopp.rc                   |  104 -
 src-cryptopp/des.cpp                       |  463 --
 src-cryptopp/des.h                         |  167 -
 src-cryptopp/dessp.cpp                     |   95 -
 src-cryptopp/dh.h                          |  176 -
 src-cryptopp/dll.cpp                       |  164 -
 src-cryptopp/dll.h                         |   77 -
 src-cryptopp/dsa.cpp                       |   66 -
 src-cryptopp/dsa.h                         |   41 -
 src-cryptopp/ec2n.cpp                      |  294 -
 src-cryptopp/ec2n.h                        |  135 -
 src-cryptopp/eccrypto.cpp                  |  719 --
 src-cryptopp/eccrypto.h                    |  376 -
 src-cryptopp/ecp.cpp                       |  476 --
 src-cryptopp/ecp.h                         |  146 -
 src-cryptopp/emsa2.h                       |   88 -
 src-cryptopp/eprecomp.cpp                  |  114 -
 src-cryptopp/eprecomp.h                    |   93 -
 src-cryptopp/fhmqv.h                       |  304 -
 src-cryptopp/files.h                       |  113 -
 src-cryptopp/filters.cpp                   | 1169 ---
 src-cryptopp/filters.h                     | 1301 ---
 src-cryptopp/fips140.cpp                   |   88 -
 src-cryptopp/fips140.h                     |  113 -
 src-cryptopp/fltrimpl.h                    |   85 -
 src-cryptopp/gcm.h                         |  132 -
 src-cryptopp/gf2n.cpp                      |  909 --
 src-cryptopp/gf2n.h                        |  370 -
 src-cryptopp/gfpcrypt.cpp                  |  306 -
 src-cryptopp/gfpcrypt.h                    |  636 --
 src-cryptopp/hex.cpp                       |   47 -
 src-cryptopp/hex.h                         |   52 -
 src-cryptopp/hmac.cpp                      |   86 -
 src-cryptopp/hmac.h                        |   75 -
 src-cryptopp/hmqv.h                        |  312 -
 src-cryptopp/hrtimer.cpp                   |  174 -
 src-cryptopp/hrtimer.h                     |   67 -
 src-cryptopp/integer.cpp                   | 4606 -----------
 src-cryptopp/integer.h                     |  614 --
 src-cryptopp/iterhash.cpp                  |  162 -
 src-cryptopp/iterhash.h                    |  187 -
 src-cryptopp/misc.cpp                      |  268 -
 src-cryptopp/misc.h                        | 2402 ------
 src-cryptopp/modarith.h                    |  321 -
 src-cryptopp/modes.cpp                     |  280 -
 src-cryptopp/modes.h                       |  485 --
 src-cryptopp/modexppc.h                    |   37 -
 src-cryptopp/mqueue.cpp                    |  174 -
 src-cryptopp/mqueue.h                      |  105 -
 src-cryptopp/mqv.h                         |  221 -
 src-cryptopp/nbtheory.cpp                  | 1125 ---
 src-cryptopp/nbtheory.h                    |  173 -
 src-cryptopp/oaep.cpp                      |   98 -
 src-cryptopp/oaep.h                        |   43 -
 src-cryptopp/oids.h                        |  135 -
 src-cryptopp/osrng.cpp                     |  272 -
 src-cryptopp/osrng.h                       |  267 -
 src-cryptopp/pch.h                         |   30 -
 src-cryptopp/pkcspad.cpp                   |  154 -
 src-cryptopp/pkcspad.h                     |  106 -
 src-cryptopp/pssr.cpp                      |  161 -
 src-cryptopp/pssr.h                        |  100 -
 src-cryptopp/pubkey.cpp                    |  170 -
 src-cryptopp/pubkey.h                      | 2255 -----
 src-cryptopp/queue.cpp                     |  574 --
 src-cryptopp/queue.h                       |  161 -
 src-cryptopp/randpool.cpp                  |   74 -
 src-cryptopp/randpool.h                    |   71 -
 src-cryptopp/rdtables.cpp                  |  172 -
 src-cryptopp/rijndael.cpp                  | 1363 ---
 src-cryptopp/rijndael.h                    |   87 -
 src-cryptopp/rng.cpp                       |  163 -
 src-cryptopp/rng.h                         |  111 -
 src-cryptopp/rsa.cpp                       |  308 -
 src-cryptopp/rsa.h                         |  250 -
 src-cryptopp/rw.h                          |  128 -
 src-cryptopp/salsa.cpp                     |  626 --
 src-cryptopp/salsa.h                       |   88 -
 src-cryptopp/secblock.h                    |  813 --
 src-cryptopp/seckey.h                      |  466 --
 src-cryptopp/serpent.cpp                   |  125 -
 src-cryptopp/serpent.h                     |   57 -
 src-cryptopp/serpentp.h                    |  434 -
 src-cryptopp/sha.cpp                       |  941 ---
 src-cryptopp/sha.h                         |   76 -
 src-cryptopp/simple.h                      |  306 -
 src-cryptopp/skipjack.h                    |   72 -
 src-cryptopp/smartptr.h                    |  321 -
 src-cryptopp/sosemanuk.cpp                 |  717 --
 src-cryptopp/sosemanuk.h                   |   52 -
 src-cryptopp/stdcpp.h                      |   80 -
 src-cryptopp/strciphr.cpp                  |  252 -
 src-cryptopp/strciphr.h                    |  633 --
 src-cryptopp/tiger.cpp                     |  283 -
 src-cryptopp/tiger.h                       |   30 -
 src-cryptopp/tigertab.cpp                  |  525 --
 src-cryptopp/trap.h                        |  146 -
 src-cryptopp/trdlocal.h                    |   44 -
 src-cryptopp/words.h                       |  108 -
 src-cryptopp/x64dll.asm                    | 1968 -----
 src-cryptopp/x64masm.asm                   | 1565 ----
 165 files changed, 82369 deletions(-)
 delete mode 100644 src-cryptopp/Doxyfile
 delete mode 100755 src-cryptopp/GNUmakefile
 delete mode 100644 src-cryptopp/License.txt
 delete mode 100644 src-cryptopp/Readme.txt
 delete mode 100644 src-cryptopp/TestVectors/Readme.txt
 delete mode 100644 src-cryptopp/TestVectors/aes.txt
 delete mode 100644 src-cryptopp/TestVectors/all.txt
 delete mode 100644 src-cryptopp/TestVectors/blake2.txt
 delete mode 100644 src-cryptopp/TestVectors/blake2b.txt
 delete mode 100644 src-cryptopp/TestVectors/blake2s.txt
 delete mode 100644 src-cryptopp/TestVectors/camellia.txt
 delete mode 100644 src-cryptopp/TestVectors/ccm.txt
 delete mode 100644 src-cryptopp/TestVectors/chacha.txt
 delete mode 100644 src-cryptopp/TestVectors/cmac.txt
 delete mode 100644 src-cryptopp/TestVectors/dlies.txt
 delete mode 100644 src-cryptopp/TestVectors/dsa.txt
 delete mode 100644 src-cryptopp/TestVectors/dsa_1363.txt
 delete mode 100644 src-cryptopp/TestVectors/eax.txt
 delete mode 100644 src-cryptopp/TestVectors/esign.txt
 delete mode 100644 src-cryptopp/TestVectors/gcm.txt
 delete mode 100644 src-cryptopp/TestVectors/hmac.txt
 delete mode 100644 src-cryptopp/TestVectors/mars.txt
 delete mode 100644 src-cryptopp/TestVectors/nr.txt
 delete mode 100644 src-cryptopp/TestVectors/panama.txt
 delete mode 100644 src-cryptopp/TestVectors/rsa_oaep.txt
 delete mode 100644 src-cryptopp/TestVectors/rsa_pkcs1_1_5.txt
 delete mode 100644 src-cryptopp/TestVectors/rsa_pss.txt
 delete mode 100644 src-cryptopp/TestVectors/rw.txt
 delete mode 100644 src-cryptopp/TestVectors/salsa.txt
 delete mode 100644 src-cryptopp/TestVectors/seal.txt
 delete mode 100644 src-cryptopp/TestVectors/seed.txt
 delete mode 100644 src-cryptopp/TestVectors/sha.txt
 delete mode 100644 src-cryptopp/TestVectors/shacal2.txt
 delete mode 100644 src-cryptopp/TestVectors/sosemanuk.txt
 delete mode 100644 src-cryptopp/TestVectors/tea.txt
 delete mode 100644 src-cryptopp/TestVectors/ttmac.txt
 delete mode 100644 src-cryptopp/TestVectors/vmac.txt
 delete mode 100644 src-cryptopp/TestVectors/whrlpool.txt
 delete mode 100644 src-cryptopp/adhoc.cpp.proto
 delete mode 100644 src-cryptopp/aes.h
 delete mode 100644 src-cryptopp/algebra.cpp
 delete mode 100644 src-cryptopp/algebra.h
 delete mode 100644 src-cryptopp/algparam.cpp
 delete mode 100644 src-cryptopp/algparam.h
 delete mode 100644 src-cryptopp/argnames.h
 delete mode 100644 src-cryptopp/asn.cpp
 delete mode 100644 src-cryptopp/asn.h
 delete mode 100644 src-cryptopp/authenc.h
 delete mode 100644 src-cryptopp/basecode.cpp
 delete mode 100644 src-cryptopp/basecode.h
 delete mode 100644 src-cryptopp/blake2.cpp
 delete mode 100644 src-cryptopp/blake2.h
 delete mode 100644 src-cryptopp/cbcmac.h
 delete mode 100644 src-cryptopp/ccm.h
 delete mode 100644 src-cryptopp/chacha.cpp
 delete mode 100644 src-cryptopp/chacha.h
 delete mode 100644 src-cryptopp/channels.h
 delete mode 100644 src-cryptopp/cmac.h
 delete mode 100644 src-cryptopp/config.h
 delete mode 100644 src-cryptopp/cpu.cpp
 delete mode 100644 src-cryptopp/cpu.h
 delete mode 100644 src-cryptopp/cryptest.sln
 delete mode 100644 src-cryptopp/cryptlib.cpp
 delete mode 100644 src-cryptopp/cryptlib.h
 delete mode 100644 src-cryptopp/cryptopp.rc
 delete mode 100644 src-cryptopp/des.cpp
 delete mode 100644 src-cryptopp/des.h
 delete mode 100644 src-cryptopp/dessp.cpp
 delete mode 100644 src-cryptopp/dh.h
 delete mode 100644 src-cryptopp/dll.cpp
 delete mode 100644 src-cryptopp/dll.h
 delete mode 100644 src-cryptopp/dsa.cpp
 delete mode 100644 src-cryptopp/dsa.h
 delete mode 100644 src-cryptopp/ec2n.cpp
 delete mode 100644 src-cryptopp/ec2n.h
 delete mode 100644 src-cryptopp/eccrypto.cpp
 delete mode 100644 src-cryptopp/eccrypto.h
 delete mode 100644 src-cryptopp/ecp.cpp
 delete mode 100644 src-cryptopp/ecp.h
 delete mode 100644 src-cryptopp/emsa2.h
 delete mode 100644 src-cryptopp/eprecomp.cpp
 delete mode 100644 src-cryptopp/eprecomp.h
 delete mode 100644 src-cryptopp/fhmqv.h
 delete mode 100644 src-cryptopp/files.h
 delete mode 100644 src-cryptopp/filters.cpp
 delete mode 100644 src-cryptopp/filters.h
 delete mode 100644 src-cryptopp/fips140.cpp
 delete mode 100644 src-cryptopp/fips140.h
 delete mode 100644 src-cryptopp/fltrimpl.h
 delete mode 100644 src-cryptopp/gcm.h
 delete mode 100644 src-cryptopp/gf2n.cpp
 delete mode 100644 src-cryptopp/gf2n.h
 delete mode 100644 src-cryptopp/gfpcrypt.cpp
 delete mode 100644 src-cryptopp/gfpcrypt.h
 delete mode 100644 src-cryptopp/hex.cpp
 delete mode 100644 src-cryptopp/hex.h
 delete mode 100644 src-cryptopp/hmac.cpp
 delete mode 100644 src-cryptopp/hmac.h
 delete mode 100644 src-cryptopp/hmqv.h
 delete mode 100644 src-cryptopp/hrtimer.cpp
 delete mode 100644 src-cryptopp/hrtimer.h
 delete mode 100644 src-cryptopp/integer.cpp
 delete mode 100644 src-cryptopp/integer.h
 delete mode 100644 src-cryptopp/iterhash.cpp
 delete mode 100644 src-cryptopp/iterhash.h
 delete mode 100644 src-cryptopp/misc.cpp
 delete mode 100644 src-cryptopp/misc.h
 delete mode 100644 src-cryptopp/modarith.h
 delete mode 100644 src-cryptopp/modes.cpp
 delete mode 100644 src-cryptopp/modes.h
 delete mode 100644 src-cryptopp/modexppc.h
 delete mode 100644 src-cryptopp/mqueue.cpp
 delete mode 100644 src-cryptopp/mqueue.h
 delete mode 100644 src-cryptopp/mqv.h
 delete mode 100644 src-cryptopp/nbtheory.cpp
 delete mode 100644 src-cryptopp/nbtheory.h
 delete mode 100644 src-cryptopp/oaep.cpp
 delete mode 100644 src-cryptopp/oaep.h
 delete mode 100644 src-cryptopp/oids.h
 delete mode 100644 src-cryptopp/osrng.cpp
 delete mode 100644 src-cryptopp/osrng.h
 delete mode 100644 src-cryptopp/pch.h
 delete mode 100644 src-cryptopp/pkcspad.cpp
 delete mode 100644 src-cryptopp/pkcspad.h
 delete mode 100644 src-cryptopp/pssr.cpp
 delete mode 100644 src-cryptopp/pssr.h
 delete mode 100644 src-cryptopp/pubkey.cpp
 delete mode 100644 src-cryptopp/pubkey.h
 delete mode 100644 src-cryptopp/queue.cpp
 delete mode 100644 src-cryptopp/queue.h
 delete mode 100644 src-cryptopp/randpool.cpp
 delete mode 100644 src-cryptopp/randpool.h
 delete mode 100644 src-cryptopp/rdtables.cpp
 delete mode 100644 src-cryptopp/rijndael.cpp
 delete mode 100644 src-cryptopp/rijndael.h
 delete mode 100644 src-cryptopp/rng.cpp
 delete mode 100644 src-cryptopp/rng.h
 delete mode 100644 src-cryptopp/rsa.cpp
 delete mode 100644 src-cryptopp/rsa.h
 delete mode 100644 src-cryptopp/rw.h
 delete mode 100644 src-cryptopp/salsa.cpp
 delete mode 100644 src-cryptopp/salsa.h
 delete mode 100644 src-cryptopp/secblock.h
 delete mode 100644 src-cryptopp/seckey.h
 delete mode 100644 src-cryptopp/serpent.cpp
 delete mode 100644 src-cryptopp/serpent.h
 delete mode 100644 src-cryptopp/serpentp.h
 delete mode 100644 src-cryptopp/sha.cpp
 delete mode 100644 src-cryptopp/sha.h
 delete mode 100644 src-cryptopp/simple.h
 delete mode 100644 src-cryptopp/skipjack.h
 delete mode 100644 src-cryptopp/smartptr.h
 delete mode 100644 src-cryptopp/sosemanuk.cpp
 delete mode 100644 src-cryptopp/sosemanuk.h
 delete mode 100644 src-cryptopp/stdcpp.h
 delete mode 100644 src-cryptopp/strciphr.cpp
 delete mode 100644 src-cryptopp/strciphr.h
 delete mode 100644 src-cryptopp/tiger.cpp
 delete mode 100644 src-cryptopp/tiger.h
 delete mode 100644 src-cryptopp/tigertab.cpp
 delete mode 100644 src-cryptopp/trap.h
 delete mode 100644 src-cryptopp/trdlocal.h
 delete mode 100644 src-cryptopp/words.h
 delete mode 100644 src-cryptopp/x64dll.asm
 delete mode 100644 src-cryptopp/x64masm.asm

diff --git a/src-cryptopp/Doxyfile b/src-cryptopp/Doxyfile
deleted file mode 100644
index 97f728c..0000000
--- a/src-cryptopp/Doxyfile
+++ /dev/null
@@ -1,2375 +0,0 @@
-# Doxyfile 1.8.9
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-#
-# The file can be upgraded to the latest version of Doxygen with `doxygen -u <file`
-#
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = Crypto++
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = 5.6.5
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-# Without the HTML escape characters, Doxygen concatenates the string below...
-PROJECT_BRIEF          = Free&nbsp;C&#43;&#43;&nbsp;class&nbsp;library&nbsp;of&nbsp;cryptographic&nbsp;schemes
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-# The logo looks really bad here. Don't use it.
-# PROJECT_LOGO           = Logo-Steel.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = html-docs
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = NO
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = NO
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = NO
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = NO
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       = NO
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = NO
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = NO
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = . \
-                         GNUmakefile \
-                         GNUmakefile-cross \
-                         rdrand.asm \
-                         rdrand.S
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.h \
-                         *.cpp
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = adhoc.cpp cryptlib_bds.cpp
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =  *test* *validat*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           = .
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 3
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = .
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = YES
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = com.cryptopp.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = com.cryptopp.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Crypto++
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = YES
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = YES
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           =
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             =
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           = .
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             = _WIN32 \
-                         _WINDOWS \
-                         __FreeBSD__ \
-                         CRYPTOPP_DOXYGEN_PROCESSING
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-# DOT_FONTNAME           = FreeSans.ttf
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 11
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = YES
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/src-cryptopp/GNUmakefile b/src-cryptopp/GNUmakefile
deleted file mode 100755
index 2a0ff4c..0000000
--- a/src-cryptopp/GNUmakefile
+++ /dev/null
@@ -1,793 +0,0 @@
-###########################################################
-#####        System Attributes and Programs           #####
-###########################################################
-
-AR ?= ar
-ARFLAGS ?= -cr # ar needs the dash on OpenBSD
-RANLIB ?= ranlib
-
-CP ?= cp
-MV ?= mv
-EGREP ?= egrep
-CHMOD ?= chmod
-MKDIR ?= mkdir
-LN ?= ln -sf
-LDCONF ?= /sbin/ldconfig -n
-UNAME := $(shell uname)
-
-IS_X86 := $(shell uname -m | $(EGREP) -v "x86_64" | $(EGREP) -i -c "i.86|x86|i86")
-IS_X32 ?= 0
-IS_X64 := $(shell uname -m | $(EGREP) -i -c "(_64|d64)")
-IS_PPC := $(shell uname -m | $(EGREP) -i -c "ppc|power")
-IS_ARM32 := $(shell uname -m | $(EGREP) -i -c "arm")
-IS_ARM64 := $(shell uname -m | $(EGREP) -i -c "aarch64")
-
-IS_SUN := $(shell uname | $(EGREP) -i -c "SunOS")
-IS_LINUX := $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "Linux")
-IS_MINGW := $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "MinGW")
-IS_CYGWIN := $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "Cygwin")
-IS_DARWIN := $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "Darwin")
-IS_NETBSD := $(shell $(CXX) -dumpmachine 2>&1 | $(EGREP) -i -c "NetBSD")
-
-SUN_COMPILER := $(shell $(CXX) -V 2>&1 | $(EGREP) -i -c "CC: (Sun|Studio)")
-GCC_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -i -v "clang" | $(EGREP) -i -c "(gcc|g\+\+)")
-CLANG_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "clang")
-INTEL_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "\(icc\)")
-MACPORTS_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "macports")
-
-# Sun Studio 12.0 provides SunCC 0x0510; and Sun Studio 12.3 provides SunCC 0x0512
-SUNCC_510_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[0-9]|5\.[2-9]|6\.)")
-SUNCC_511_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[1-9]|5\.[2-9]|6\.)")
-SUNCC_512_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[2-9]|5\.[2-9]|6\.)")
-SUNCC_513_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[3-9]|5\.[2-9]|6\.)")
-
-HAS_SOLIB_VERSION := $(IS_LINUX)
-
-# Fixup SunOS
-ifeq ($(IS_SUN),1)
-IS_X86 := $(shell isainfo -k 2>/dev/null | grep -i -c "i386")
-IS_X64 := $(shell isainfo -k 2>/dev/null | grep -i -c "amd64")
-endif
-
-###########################################################
-#####                General Variables                #####
-###########################################################
-
-# Base CXXFLAGS used if the user did not specify them
-ifeq ($(SUN_COMPILER),1)
-  ifeq ($(SUNCC_512_OR_LATER),1)
-    CXXFLAGS ?= -DNDEBUG -g3 -xO2
-  else
-    CXXFLAGS ?= -DNDEBUG -g -xO2
-  endif
-else
-  CXXFLAGS ?= -DNDEBUG -g2 -O2
-endif
-
-# Default prefix for make install
-ifeq ($(PREFIX),)
-PREFIX = /usr/local
-endif
-
-# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-ifeq ($(DATADIR),)
-DATADIR := $(PREFIX)/share
-endif
-ifeq ($(LIBDIR),)
-LIBDIR := $(PREFIX)/lib
-endif
-ifeq ($(BINDIR),)
-BINDIR := $(PREFIX)/bin
-endif
-ifeq ($(INCLUDEDIR),)
-INCLUDEDIR := $(PREFIX)/include
-endif
-
-# Fix CXX on Cygwin 1.1.4
-ifeq ($(CXX),gcc)
-CXX := g++
-endif
-
-# We honor ARFLAGS, but the "v" option used by default causes a noisy make
-ifeq ($(ARFLAGS),rv)
-ARFLAGS = r
-endif
-
-###########################################################
-#####               X86/X32/X64 Options               #####
-###########################################################
-
-ifneq ($(IS_X86)$(IS_X32)$(IS_X64),000)
-
-# Fixup. Clang integrated assembler will be used (-Wa,-q)
-ifneq ($(MACPORTS_COMPILER),1)
-  IS_GAS := $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler")
-endif
-
-ifneq ($(GCC_COMPILER),0)
-  IS_GCC_29 := $(shell $(CXX) -v 2>&1 | $(EGREP) -i -c gcc-9[0-9][0-9])
-  GCC42_OR_LATER := $(shell $(CXX) -v 2>&1 | $(EGREP) -i -c "gcc version (4\.[2-9]|[5-9]\.)")
-  GCC46_OR_LATER := $(shell $(CXX) -v 2>&1 | $(EGREP) -i -c "gcc version (4\.[6-9]|[5-9]\.)")
-endif
-
-ifneq ($(IS_GAS),0)
-  GAS210_OR_LATER := $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])")
-  GAS217_OR_LATER := $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])")
-  GAS219_OR_LATER := $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])")
-endif
-
-ICC111_OR_LATER := $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])")
-
-# Add -fPIC for targets *except* X86, X32, Cygwin or MinGW
-ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS_MINGW)$(SUN_COMPILER),00000)
- ifeq ($(findstring -fPIC,$(CXXFLAGS)),)
-   CXXFLAGS += -fPIC
- endif
-endif
-
-# Guard use of -march=native
-ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
-   CXXFLAGS += -march=native
-else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
-   CXXFLAGS += -march=native
-else
-  # GCC 3.3 and "unknown option -march="
-  # Ubuntu GCC 4.1 compiler crash with -march=native
-  # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
-  # Sun compiler is handled below
-  ifeq ($(SUN_COMPILER)$(IS_X64),01)
-    CXXFLAGS += -m64
-  else ifeq ($(SUN_COMPILER)$(IS_X86),01)
-    CXXFLAGS += -m32
-  endif # X86/X32/X64
-endif
-
-# Aligned access required for -O3 and above due to vectorization
-UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
-ifneq ($(UNALIGNED_ACCESS),0)
-ifeq ($(findstring -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS,$(CXXFLAGS)),)
-ifeq ($(findstring -O3,$(CXXFLAGS)),-O3)
-CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # -O3
-ifeq ($(findstring -O5,$(CXXFLAGS)),-O5)
-CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # -O5
-ifeq ($(findstring -Ofast,$(CXXFLAGS)),-Ofast)
-CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # -Ofast
-endif # CRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # UNALIGNED_ACCESS
-
-ifneq ($(INTEL_COMPILER),0)
-CXXFLAGS += -wd68 -wd186 -wd279 -wd327 -wd161 -wd3180
-ifeq ($(ICC111_OR_LATER),0)
-# "internal error: backend signals" occurs on some x86 inline assembly with ICC 9 and some x64 inline assembly with ICC 11.0
-# if you want to use Crypto++'s assembly code with ICC, try enabling it on individual files
-CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
-endif
-endif
-
-# .intel_syntax wasn't supported until GNU assembler 2.10
-ifeq ($(GCC_COMPILER)$(MACPORTS_COMPILER)$(GAS210_OR_LATER),100)
-CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
-else
-ifeq ($(GCC_COMPILER)$(MACPORTS_COMPILER)$(GAS217_OR_LATER),100)
-CXXFLAGS += -DCRYPTOPP_DISABLE_SSSE3
-else
-ifeq ($(GCC_COMPILER)$(MACPORTS_COMPILER)$(GAS219_OR_LATER),100)
-CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI
-endif
-endif
-endif
-
-# Tell MacPorts GCC to use Clang integrated assembler
-#   http://github.com/weidai11/cryptopp/issues/190
-ifeq ($(GCC_COMPILER)$(MACPORTS_COMPILER),11)
-ifneq ($(findstring -Wa,-q,$(CXXFLAGS)),-Wa,-q)
-CXXFLAGS += -Wa,-q
-endif
-ifneq ($(findstring -Wa,-q,$(CXXFLAGS)),-DCRYPTOPP_CLANG_INTEGRATED_ASSEMBLER)
-CXXFLAGS += -DCRYPTOPP_CLANG_INTEGRATED_ASSEMBLER=1
-endif
-endif
-
-# GCC on Solaris needs -m64. Otherwise, i386 is default
-#   http://github.com/weidai11/cryptopp/issues/230
-ifeq ($(IS_SUN)$(GCC_COMPILER)$(IS_X64),111)
-CXXFLAGS += -m64
-endif
-
-# Allow use of "/" operator for GNU Assembler.
-#   http://sourceware.org/bugzilla/show_bug.cgi?id=4572
-ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),)
-ifeq ($(IS_SUN)$(GCC_COMPILER),11)
-CXXFLAGS += -Wa,--divide
-endif
-endif
-
-ifeq ($(UNAME),)	# for DJGPP, where uname doesn't exist
-CXXFLAGS += -mbnu210
-else ifneq ($(findstring -save-temps,$(CXXFLAGS)),-save-temps)
-ifeq ($(SUN_COMPILER),0)
-CXXFLAGS += -pipe
-endif
-endif
-
-else
-
-###########################################################
-#####                 Not X86/X32/X64                 #####
-###########################################################
-
-# Add PIC
-ifeq ($(findstring -fPIC,$(CXXFLAGS)),)
-  CXXFLAGS += -fPIC
-endif
-
-# Add -pipe for everything except ARM (allow ARM-64 because they seems to have > 1 GB of memory)
-ifeq ($(IS_ARM32),0)
-ifeq ($(findstring -save-temps,$(CXXFLAGS)),)
-CXXFLAGS += -pipe
-endif
-endif
-
-# Aligned access required for -O3 and above due to vectorization
-UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
-ifneq ($(UNALIGNED_ACCESS),0)
-ifeq ($(findstring -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS,$(CXXFLAGS)),)
-ifeq ($(findstring -O3,$(CXXFLAGS)),-O3)
-CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # -O3
-ifeq ($(findstring -O5,$(CXXFLAGS)),-O5)
-CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # -O5
-ifeq ($(findstring -Ofast,$(CXXFLAGS)),-Ofast)
-CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # -Ofast
-endif # CRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # UNALIGNED_ACCESS
-
-endif	# IS_X86
-
-###########################################################
-#####                      Common                     #####
-###########################################################
-
-ifneq ($(IS_MINGW),0)
-LDLIBS += -lws2_32
-endif
-
-ifneq ($(IS_SUN),0)
-LDLIBS += -lnsl -lsocket
-endif
-
-ifeq ($(IS_LINUX),1)
-LDFLAGS += -pthread
-ifeq ($(findstring -fopenmp,$(CXXFLAGS)),-fopenmp)
-ifeq ($(findstring -lgomp,$(LDLIBS)),)
-LDLIBS += -lgomp
-endif # LDLIBS
-endif # OpenMP
-endif # IS_LINUX
-
-ifneq ($(IS_DARWIN),0)
-AR = libtool
-ARFLAGS = -static -o
-CXX ?= c++
-ifeq ($(IS_GCC_29),1)
-CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables
-LDLIBS += -lstdc++
-LDFLAGS += -flat_namespace -undefined suppress -m
-endif
-endif
-
-# Add -errtags=yes to get the name for a warning suppression
-ifneq ($(SUN_COMPILER),0)	# override flags for CC Sun C++ compiler
-IS_64 := $(shell isainfo -b 2>/dev/null | grep -i -c "64")
-ifeq ($(IS_64),1)
-CXXFLAGS += -m64
-else ifeq ($(IS_64),0)
-CXXFLAGS += -m32
-endif
-ifneq ($(SUNCC_513_OR_LATER),0)
-CXXFLAGS += -native
-endif
-# Add for non-i386
-ifneq ($(IS_X86),1)
-CXXFLAGS += -KPIC
-endif
-# Add to all Solaris
-CXXFLAGS += -template=no%extdef
-SUN_CC10_BUGGY := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun .* 5\.10 .* (2009|2010/0[1-4])")
-ifneq ($(SUN_CC10_BUGGY),0)
-# -DCRYPTOPP_INCLUDE_VECTOR_CC is needed for Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 and was fixed in May 2010
-# remove it if you get "already had a body defined" errors in vector.cc
-CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC
-endif
-#ifneq ($SUNCC_512_OR_LATER),0)
-#CXXFLAGS += -xarch=aes -D__AES__=1 -xarch=no%sse4_1 -xarch=no%sse4_2
-#endif
-AR = $(CXX)
-ARFLAGS = -xar -o
-RANLIB = true
-endif
-
-# Undefined Behavior Sanitizer (UBsan) testing. There's no sense in
-#   allowing unaligned data access. There will too many findings.
-ifeq ($(findstring ubsan,$(MAKECMDGOALS)),ubsan)
-ifeq ($(findstring -fsanitize=undefined,$(CXXFLAGS)),)
-CXXFLAGS += -fsanitize=undefined
-endif # CXXFLAGS
-ifeq ($(findstring -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS,$(CXXFLAGS)),)
-CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # CXXFLAGS
-endif # UBsan
-
-# Address Sanitizer (Asan) testing. Issue 'make asan'.
-ifeq ($(findstring asan,$(MAKECMDGOALS)),asan)
-ifeq ($(findstring -fsanitize=address,$(CXXFLAGS)),)
-CXXFLAGS += -fsanitize=address
-endif # CXXFLAGS
-ifeq ($(findstring -fno-omit-frame-pointer,$(CXXFLAGS)),)
-CXXFLAGS += -fno-omit-frame-pointer
-endif # CXXFLAGS
-endif # Asan
-
-# LD gold linker testing. Triggered by 'LD=ld.gold'.
-ifeq ($(findstring ld.gold,$(LD)),ld.gold)
-ifeq ($(findstring -fuse-ld=gold,$(CXXFLAGS)),)
-ELF_FORMAT := $(shell file `which ld.gold` 2>&1 | cut -d":" -f 2 | $(EGREP) -i -c "elf")
-ifneq ($(ELF_FORMAT),0)
-LDFLAGS += -fuse-ld=gold
-endif # ELF/ELF64
-endif # CXXFLAGS
-endif # Gold
-
-# Aligned access testing. Issue 'make aligned'.
-ifneq ($(filter align aligned,$(MAKECMDGOALS)),)
-ifeq ($(findstring -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS,$(CXXFLAGS)),)
-CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-endif # CXXFLAGS
-endif # Aligned access
-
-# GCC code coverage. Issue 'make coverage'.
-ifneq ($(filter coverage,$(MAKECMDGOALS)),)
-ifeq ($(findstring -coverage,$(CXXFLAGS)),)
-CXXFLAGS += -coverage
-endif # -coverage
-endif # GCC code coverage
-
-# Debug testing on GNU systems. Triggered by -DDEBUG.
-#   Newlib test due to http://sourceware.org/bugzilla/show_bug.cgi?id=20268
-ifneq ($(filter -DDEBUG -DDEBUG=1,$(CXXFLAGS)),)
-USING_GLIBCXX := $(shell $(CXX) -x c++ $(CXXFLAGS) -E adhoc.cpp.proto 2>&1 | $(EGREP) -i -c "__GLIBCXX__")
-ifneq ($(USING_GLIBCXX),0)
-HAS_NEWLIB := $(shell $(CXX) -x c++ $(CXXFLAGS) -E adhoc.cpp.proto 2>&1 | $(EGREP) -i -c "__NEWLIB__")
-ifeq ($(HAS_NEWLIB),0)
-ifeq ($(findstring -D_GLIBCXX_DEBUG,$(CXXFLAGS)),)
-CXXFLAGS += -D_GLIBCXX_DEBUG
-endif # CXXFLAGS
-endif # NAS_NEWLIB
-endif # USING_GLIBCXX
-endif # GNU Debug build
-
-# Dead code stripping. Issue 'make lean'.
-ifeq ($(findstring lean,$(MAKECMDGOALS)),lean)
-ifeq ($(findstring -ffunction-sections,$(CXXFLAGS)),)
-CXXFLAGS += -ffunction-sections
-endif # CXXFLAGS
-ifeq ($(findstring -fdata-sections,$(CXXFLAGS)),)
-CXXFLAGS += -fdata-sections
-endif # CXXFLAGS
-ifneq ($(IS_DARWIN),0)
-ifeq ($(findstring -Wl,-dead_strip,$(LDFLAGS)),)
-LDFLAGS += -Wl,-dead_strip
-endif # CXXFLAGS
-else # BSD, Linux and Unix
-ifeq ($(findstring -Wl,--gc-sections,$(LDFLAGS)),)
-LDFLAGS += -Wl,--gc-sections
-endif # LDFLAGS
-endif # MAKECMDGOALS
-endif # Dead code stripping
-
-# For Shared Objects, Diff, Dist/Zip rules
-LIB_VER := $(shell $(EGREP) "define CRYPTOPP_VERSION" config.h | cut -d" " -f 3)
-LIB_MAJOR := $(shell echo $(LIB_VER) | cut -c 1)
-LIB_MINOR := $(shell echo $(LIB_VER) | cut -c 2)
-LIB_PATCH := $(shell echo $(LIB_VER) | cut -c 3)
-
-ifeq ($(strip $(LIB_PATCH)),)
-LIB_PATCH := 0
-endif
-
-ifeq ($(HAS_SOLIB_VERSION),1)
-# Full version suffix for shared library
-SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)
-# Different patchlevels are compatible, minor versions are not
-SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR)
-SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
-endif # HAS_SOLIB_VERSION
-
-###########################################################
-#####              Source and object files            #####
-###########################################################
-
-# List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems.
-SRCS := cryptlib.cpp cpu.cpp integer.cpp $(filter-out cryptlib.cpp cpu.cpp integer.cpp pch.cpp simple.cpp winpipes.cpp cryptlib_bds.cpp,$(wildcard *.cpp))
-
-# Need CPU for X86/X64/X32 and ARM
-ifeq ($(IS_X86)$(IS_X64)$(IS_ARM32)$(IS_ARM64),0000)
-  SRCS := $(filter-out cpu.cpp, $(SRCS))
-endif
-# Need RDRAND for X86/X64/X32
-ifeq ($(IS_X86)$(IS_X64),00)
-  SRCS := $(filter-out rdrand.cpp, $(SRCS))
-endif
-
-ifneq ($(IS_MINGW),0)
-SRCS += winpipes.cpp
-endif
-
-# List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems.
-OBJS := $(SRCS:.cpp=.o)
-
-# List test.cpp first to tame C++ static initialization problems.
-TESTSRCS := test.cpp bench1.cpp bench2.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp
-TESTOBJS := $(TESTSRCS:.cpp=.o)
-LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
-
-# List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems.
-DLLSRCS := cryptlib.cpp cpu.cpp integer.cpp shacal2.cpp md5.cpp shark.cpp zinflate.cpp gf2n.cpp salsa.cpp xtr.cpp oaep.cpp polynomi.cpp rc2.cpp default.cpp wait.cpp wake.cpp twofish.cpp iterhash.cpp adler32.cpp elgamal.cpp marss.cpp blowfish.cpp ecp.cpp filters.cpp strciphr.cpp camellia.cpp ida.cpp zlib.cpp des.cpp crc.cpp algparam.cpp dessp.cpp tea.cpp eax.cpp network.cpp emsa2.cpp pkcspad.cpp squaretb.cpp idea.cpp authenc.cpp hmac.cpp zdeflate.cpp xtrcrypt.cpp queue.cpp mars.cpp rc5.cpp blake2.cpp hrtimer.cpp eprecomp.cpp hex.cpp dsa.cpp sha.cpp fips140.cpp gzip.cpp seal.cpp files.cpp base32.cpp vmac.cpp tigertab.cpp sharkbox.cpp safer.cpp randpool.cpp esign.cpp arc4.cpp osrng.cpp skipjack.cpp seed.cpp sha3.cpp sosemanuk.cpp bfinit.cpp rabin.cpp 3way.cpp rw.cpp rdrand.cpp rsa.cpp rdtables.cpp gost.cpp socketft.cpp tftables.cpp nbtheory.cpp panama.cpp modes.cpp rijndael.cpp casts.cpp chacha.cpp gfpcrypt.cpp poly1305.cpp dll.cpp ec2n.cpp blumshub.cpp algebra.cpp basecode.cpp base64.cpp cbcmac.cpp rc6.cpp dh2.cpp gf256.cpp mqueue.cpp misc.cpp pssr.cpp channels.cpp tiger.cpp cast.cpp rng.cpp square.cpp asn.cpp whrlpool.cpp md4.cpp dh.cpp ccm.cpp md2.cpp mqv.cpp gf2_32.cpp ttmac.cpp luc.cpp trdlocal.cpp pubkey.cpp gcm.cpp ripemd.cpp eccrypto.cpp serpent.cpp cmac.cpp
-DLLOBJS := $(DLLSRCS:.cpp=.export.o)
-
-# Import lib testing
-LIBIMPORTOBJS := $(LIBOBJS:.o=.import.o)
-TESTIMPORTOBJS := $(TESTOBJS:.o=.import.o)
-DLLTESTOBJS := dlltest.dllonly.o
-
-###########################################################
-#####                Targets and Recipes              #####
-###########################################################
-
-.PHONY: all
-all: cryptest.exe
-
-ifneq ($(IS_DARWIN),0)
-static: libcryptopp.a
-shared dynamic dylib: libcryptopp.dylib
-else
-static: libcryptopp.a
-shared dynamic: libcryptopp.so$(SOLIB_VERSION_SUFFIX)
-endif
-
-.PHONY: deps
-deps GNUmakefile.deps:
-	$(CXX) $(CXXFLAGS) -MM *.cpp > GNUmakefile.deps
-
-# CXXFLAGS are tuned earlier.
-.PHONY: asan ubsan align aligned
-asan ubsan align aligned: libcryptopp.a cryptest.exe
-
-# CXXFLAGS are tuned earlier. Applications must use linker flags
-#  -Wl,--gc-sections (Linux and Unix) or -Wl,-dead_strip (OS X)
-.PHONY: lean
-lean: static dynamic cryptest.exe
-
-# May want to export CXXFLAGS="-g3 -O1"
-.PHONY: coverage
-coverage: libcryptopp.a cryptest.exe
-	lcov --base-directory . --directory . --zerocounters -q
-	./cryptest.exe v
-	./cryptest.exe tv all
-	lcov --base-directory . --directory . -c -o cryptest.info
-	lcov --remove cryptest.info "*test.*" "bench*.cpp" "validat*.*" "/usr/*" -o cryptest.info
-	rm -rf ./TestCoverage/
-	genhtml -o ./TestCoverage/ -t "cryptest.exe test coverage" --num-spaces 4 cryptest.info
-
-.PHONY: test check
-test check: cryptest.exe
-	./cryptest.exe v
-
-# Used to generate list of source files for Autotools, CMakeList, Android.mk, etc
-.PHONY: sources
-sources:
-	$(info Library sources: $(filter-out fipstest.cpp $(TESTSRCS),$(SRCS)))
-	$(info )
-	$(info Test sources: $(TESTSRCS))
-
-# Directory we want (can't specify on Doygen command line)
-DOCUMENT_DIRECTORY := ref$(LIB_VER)
-# Directory Doxygen uses (specified in Doygen config file)
-ifeq ($(wildcard Doxyfile),Doxyfile)
-DOXYGEN_DIRECTORY := $(strip $(shell $(EGREP) "OUTPUT_DIRECTORY" Doxyfile | grep -v "\#" | cut -d "=" -f 2))
-endif
-# Default directory (in case its missing in the config file)
-ifeq ($(strip $(DOXYGEN_DIRECTORY)),)
-DOXYGEN_DIRECTORY := html-docs
-endif
-
-# Builds the documentation. Directory name is ref563, ref570, etc.
-.PHONY: docs html
-docs html:
-	-$(RM) -r $(DOXYGEN_DIRECTORY)/ $(DOCUMENT_DIRECTORY)/ html-docs/
-	doxygen Doxyfile -d CRYPTOPP_DOXYGEN_PROCESSING
-	$(MV) $(DOXYGEN_DIRECTORY)/ $(DOCUMENT_DIRECTORY)/
-	-$(RM) CryptoPPRef.zip
-	zip -9 CryptoPPRef.zip -x ".*" -x "*/.*" -r $(DOCUMENT_DIRECTORY)/
-
-.PHONY: clean
-clean:
-	-$(RM) libcryptopp.a libcryptopp.so$(SOLIB_VERSION_SUFFIX) libcryptopp.dylib cryptopp.dll libcryptopp.dll.a libcryptopp.import.a
-ifeq ($(HAS_SOLIB_VERSION),1)
-	-$(RM) libcryptopp.so libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
-endif
-	-$(RM) adhoc.cpp.o adhoc.cpp.proto.o $(LIBOBJS) $(TESTOBJS) $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
-	-$(RM) cryptest.exe dlltest.exe cryptest.import.exe cryptest.info ct rdrand-???.o
-	-$(RM) *.gcno *.gcda *.stackdump core-*
-	-$(RM) /tmp/adhoc.exe
-ifneq ($(wildcard /tmp/cryptopp_test/),)
-	-$(RM) -r /tmp/cryptopp_test/
-endif
-ifneq ($(wildcard *.exe.dSYM),)
-	-$(RM) -r *.exe.dSYM/
-endif
-ifneq ($(wildcard *.dylib.dSYM),)
-	-$(RM) -r *.dylib.dSYM/
-endif
-ifneq ($(wildcard cov-int/),)
-	-$(RM) -r cov-int/
-endif
-
-.PHONY: distclean
-distclean: clean
-	-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt cryptest-*.txt
-	-$(RM) CMakeCache.txt Makefile CTestTestfile.cmake cmake_install.cmake cryptopp-config-version.cmake
-	-$(RM) cryptopp.tgz *.o *.bc *.ii *.s *~
-ifneq ($(wildcard CMakeFiles/),)
-	-$(RM) -r CMakeFiles/
-endif
-ifneq ($(wildcard $(DOCUMENT_DIRECTORY)/),)
-	-$(RM) -r $(DOCUMENT_DIRECTORY)/
-endif
-ifneq ($(wildcard TestCoverage/),)
-	-$(RM) -r TestCoverage/
-endif
-ifneq ($(wildcard cryptopp$(LIB_VER)\.*),)
-	-$(RM) cryptopp$(LIB_VER)\.*
-endif
-ifneq ($(wildcard $(DOC_DIRECTORY)),)
-	-$(RM) -r $(DOC_DIRECTORY)
-endif
-ifneq ($(wildcard CryptoPPRef.zip),)
-	-$(RM) CryptoPPRef.zip
-endif
-
-.PHONY: install
-install:
-	$(MKDIR) -p $(DESTDIR)$(INCLUDEDIR)/cryptopp
-	$(CP) *.h $(DESTDIR)$(INCLUDEDIR)/cryptopp
-	-$(CHMOD) 0755 $(DESTDIR)$(INCLUDEDIR)/cryptopp
-	-$(CHMOD) 0644 $(DESTDIR)$(INCLUDEDIR)/cryptopp/*.h
-ifneq ($(wildcard libcryptopp.a),)
-	$(MKDIR) -p $(DESTDIR)$(LIBDIR)
-	$(CP) libcryptopp.a $(DESTDIR)$(LIBDIR)
-	-$(CHMOD) 0644 $(DESTDIR)$(LIBDIR)/libcryptopp.a
-endif
-ifneq ($(wildcard cryptest.exe),)
-	$(MKDIR) -p $(DESTDIR)$(BINDIR)
-	$(CP) cryptest.exe $(DESTDIR)$(BINDIR)
-	-$(CHMOD) 0755 $(DESTDIR)$(BINDIR)/cryptest.exe
-	$(MKDIR) -p $(DESTDIR)$(DATADIR)/cryptopp
-	$(CP) -r TestData $(DESTDIR)$(DATADIR)/cryptopp
-	$(CP) -r TestVectors $(DESTDIR)$(DATADIR)/cryptopp
-	-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp
-	-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp/TestData
-	-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp/TestVectors
-	-$(CHMOD) 0644 $(DESTDIR)$(DATADIR)/cryptopp/TestData/*.dat
-	-$(CHMOD) 0644 $(DESTDIR)$(DATADIR)/cryptopp/TestVectors/*.txt
-endif
-ifneq ($(wildcard libcryptopp.dylib),)
-	$(MKDIR) -p $(DESTDIR)$(LIBDIR)
-	$(CP) libcryptopp.dylib $(DESTDIR)$(LIBDIR)
-	-install_name_tool -id $(DESTDIR)$(LIBDIR)/libcryptopp.dylib $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
-	-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
-endif
-ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),)
-	$(MKDIR) -p $(DESTDIR)$(LIBDIR)
-	$(CP) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)
-	-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
-ifeq ($(HAS_SOLIB_VERSION),1)
-	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
-	$(LDCONF) $(DESTDIR)$(LIBDIR)
-endif
-endif
-
-.PHONY: remove uninstall
-remove uninstall:
-	-$(RM) -r $(DESTDIR)$(INCLUDEDIR)/cryptopp
-	-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.a
-	-$(RM) $(DESTDIR)$(BINDIR)/cryptest.exe
-	-$(RM) -r $(DESTDIR)$(DATADIR)/cryptopp
-ifneq ($(IS_DARWIN),0)
-	-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
-else
-	-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
-ifeq ($(HAS_SOLIB_VERSION),1)
-	-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
-	-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.so
-	$(LDCONF) $(DESTDIR)$(LIBDIR)
-endif
-endif
-
-libcryptopp.a: $(LIBOBJS)
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
-ifeq ($(IS_SUN),0)
-	$(RANLIB) $@
-endif
-
-ifeq ($(HAS_SOLIB_VERSION),1)
-.PHONY: libcryptopp.so
-libcryptopp.so: libcryptopp.so$(SOLIB_VERSION_SUFFIX) | so_warning
-endif
-
-libcryptopp.so$(SOLIB_VERSION_SUFFIX): $(LIBOBJS)
-	$(CXX) -shared $(SOLIB_FLAGS) -o $@ $(CXXFLAGS) $(LDFLAGS) $(LIBOBJS) $(LDLIBS)
-ifeq ($(HAS_SOLIB_VERSION),1)
-	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) libcryptopp.so
-	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
-endif
-
-libcryptopp.dylib: $(LIBOBJS)
-	$(CXX) -dynamiclib -o $@ $(CXXFLAGS) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" -headerpad_max_install_names $(LDFLAGS) $(LIBOBJS)
-
-cryptest.exe: libcryptopp.a $(TESTOBJS)
-	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS)
-
-# Makes it faster to test changes
-nolib: $(OBJS)
-	$(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
-
-dll: cryptest.import.exe dlltest.exe
-
-cryptopp.dll: $(DLLOBJS)
-	$(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a
-
-libcryptopp.import.a: $(LIBIMPORTOBJS)
-	$(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS)
-ifeq ($(IS_SUN),0)
-	$(RANLIB) $@
-endif
-
-cryptest.import.exe: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS)
-	$(CXX) -o $@ $(CXXFLAGS) $(TESTIMPORTOBJS) -L. -lcryptopp.dll -lcryptopp.import $(LDFLAGS) $(LDLIBS)
-
-dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
-	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
-
-# This recipe prepares the distro files
-TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.compat Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcxproj *.filters cryptopp.rc TestVectors/*.txt TestData/*.dat TestScripts/*.sh TestScripts/*.pl TestScripts/*.cmd
-EXEC_FILES := GNUmakefile GNUmakefile-cross TestData/ TestVectors/ TestScripts/
-
-ifeq ($(wildcard Filelist.txt),Filelist.txt)
-DIST_FILES := $(shell cat Filelist.txt)
-endif
-
-.PHONY: trim
-trim:
-ifneq ($(IS_DARWIN),0)
-	sed -i '' -e's/[[:space:]]*$$//' *.compat *.sh *.h *.cpp *.sln *.vcxproj GNUmakefile GNUmakefile-cross
-	make convert
-else
-	sed -i -e's/[[:space:]]*$$//' *.compat *.sh *.h *.cpp *.sln *.vcxproj GNUmakefile GNUmakefile-cross
-	make convert
-endif
-
-.PHONY: convert
-convert:
-	-$(CHMOD) 0700 TestVectors/ TestData/ TestScripts/
-	-$(CHMOD) 0600 $(TEXT_FILES) *.asm *.S *.zip *.cmake TestVectors/*.txt TestData/*.dat
-	-$(CHMOD) 0700 $(EXEC_FILES) *.sh *.cmd TestScripts/*.sh TestScripts/*.pl TestScripts/*.cmd
-	-$(CHMOD) 0700 *.cmd *.sh GNUmakefile GNUmakefile-cross TestScripts/*.sh TestScripts/*.pl
-	-unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake TestScripts/*.pl TestScripts/*.cmd
-	-dos2unix --keepdate --quiet GNUmakefile GNUmakefile-cross *.S *.sh TestScripts/*.sh
-ifneq ($(IS_DARWIN),0)
-	-xattr -c *
-endif
-
-# Build the ZIP file with source files. No documentation.
-.PHONY: zip dist
-zip dist: | distclean convert
-	zip -q -9 cryptopp$(LIB_VER).zip $(DIST_FILES)
-
-# Build the ISO to transfer the ZIP to old distros via CDROM
-.PHONY: iso
-iso: | zip
-ifneq ($(IS_DARWIN),0)
-	$(MKDIR) -p $(PWD)/cryptopp$(LIB_VER)
-	$(CP) cryptopp$(LIB_VER).zip $(PWD)/cryptopp$(LIB_VER)
-	hdiutil makehybrid -iso -joliet -o cryptopp$(LIB_VER).iso $(PWD)/cryptopp$(LIB_VER)
-	-$(RM) -r $(PWD)/cryptopp$(LIB_VER)
-else ifneq ($(IS_LINUX),0)
-	$(MKDIR) -p $(PWD)/cryptopp$(LIB_VER)
-	$(CP) cryptopp$(LIB_VER).zip $(PWD)/cryptopp$(LIB_VER)
-	genisoimage -q -o cryptopp$(LIB_VER).iso $(PWD)/cryptopp$(LIB_VER)
-	-$(RM) -r $(PWD)/cryptopp$(LIB_VER)
-endif
-
-# CRYPTOPP_CPU_SPEED in GHz
-CRYPTOPP_CPU_SPEED ?= 2.4
-.PHONY: bench benchmark benchmarks
-bench benchmark benchmarks: cryptest.exe
-	rm -f benchmarks.html
-	echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">" >> benchmarks.html
-	echo "<HTML>" >> benchmarks.html
-	echo "<HEAD>" >> benchmarks.html
-	echo "<TITLE>Speed Comparison of Popular Crypto Algorithms</TITLE>" >> benchmarks.html
-	echo "</HEAD>" >> benchmarks.html
-	echo "<BODY>" >> benchmarks.html
-	echo "<H1><a href=\"http://www.cryptopp.com\">Crypto++</a>" $(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) "Benchmarks</H1>" >> benchmarks.html
-	echo "<P>Here are speed benchmarks for some commonly used cryptographic algorithms.</P>"  >> benchmarks.html
-	./cryptest.exe b 3 $(CRYPTOPP_CPU_SPEED) >> benchmarks.html
-	echo "</BODY>" >> benchmarks.html
-	echo "</HTML>" >> benchmarks.html
-
-adhoc.cpp: adhoc.cpp.proto
-ifeq ($(wildcard adhoc.cpp),)
-	cp adhoc.cpp.proto adhoc.cpp
-else
-	touch adhoc.cpp
-endif
-
-# Include dependencies, if present. You must issue `make deps` to create them.
-ifeq ($(wildcard GNUmakefile.deps),GNUmakefile.deps)
--include GNUmakefile.deps
-endif # Dependencies
-
-# MacPorts/GCC issue with init_priority. Apple/GCC and Fink/GCC are fine; limit to MacPorts.
-#   Also see http://lists.macosforge.org/pipermail/macports-users/2015-September/039223.html
-ifeq ($(GCC_COMPILER)$(MACPORTS_COMPILER),11)
-ifeq ($(findstring -DMACPORTS_GCC_COMPILER,$(CXXFLAGS)),)
-cryptlib.o:
-	$(CXX) $(CXXFLAGS) -DMACPORTS_GCC_COMPILER=1 -c cryptlib.cpp
-cpu.o:
-	$(CXX) $(CXXFLAGS) -DMACPORTS_GCC_COMPILER=1 -c cpu.cpp
-endif
-endif
-
-# Only use CRYPTOPP_DATA_DIR if its not set in CXXFLAGS
-ifeq ($(findstring -DCRYPTOPP_DATA_DIR,$(CXXFLAGS)),)
-ifneq ($(strip $(CRYPTOPP_DATA_DIR)),)
-validat%.o : validat%.cpp
-	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
-bench%.o : bench%.cpp
-	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
-datatest.o : datatest.cpp
-	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
-test.o : test.cpp
-	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
-endif
-endif
-
-%.dllonly.o : %.cpp
-	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@
-
-%.import.o : %.cpp
-	$(CXX) $(CXXFLAGS) -DCRYPTOPP_IMPORTS -c $< -o $@
-
-%.export.o : %.cpp
-	$(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@
-
-%.bc : %.cpp
-	$(CXX) $(CXXFLAGS) -c $<
-
-%.o : %.cpp
-	$(CXX) $(CXXFLAGS) -c $<
-
-.PHONY: so_warning
-so_warning:
-ifeq ($(HAS_SOLIB_VERSION),1)
-	$(info WARNING: Only the symlinks to the shared-object library have been updated.)
-	$(info WARNING: If the library is installed in a system directory you will need)
-	$(info WARNING: to run 'ldconfig' to update the shared-object library cache.)
-	$(info )
-endif
diff --git a/src-cryptopp/License.txt b/src-cryptopp/License.txt
deleted file mode 100644
index aacf619..0000000
--- a/src-cryptopp/License.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Compilation Copyright (c) 1995-2016 by Wei Dai.  All rights reserved.
-This copyright applies only to this software distribution package
-as a compilation, and does not imply a copyright on any particular
-file in the package.
-
-All individual files in this compilation are placed in the public domain by
-Wei Dai and other contributors.
-
-I would like to thank the following authors for placing their works into
-the public domain:
-
-Joan Daemen - 3way.cpp
-Leonard Janke - cast.cpp, seal.cpp
-Steve Reid - cast.cpp
-Phil Karn - des.cpp
-Andrew M. Kuchling - md2.cpp, md4.cpp
-Colin Plumb - md5.cpp
-Seal Woods - rc6.cpp
-Chris Morgan - rijndael.cpp
-Paulo Baretto - rijndael.cpp, skipjack.cpp, square.cpp
-Richard De Moliner - safer.cpp
-Matthew Skala - twofish.cpp
-Kevin Springle - camellia.cpp, shacal2.cpp, ttmac.cpp, whrlpool.cpp, ripemd.cpp
-Ronny Van Keer - sha3.cpp
-
-The Crypto++ Library (as a compilation) is currently licensed under the Boost
-Software License 1.0 (http://www.boost.org/users/license.html).
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/src-cryptopp/Readme.txt b/src-cryptopp/Readme.txt
deleted file mode 100644
index 2bcd12b..0000000
--- a/src-cryptopp/Readme.txt
+++ /dev/null
@@ -1,569 +0,0 @@
-Crypto++: a C++ Class Library of Cryptographic Schemes
-Version 5.6.4 - SEPT/11/2016
-
-Crypto++ Library is a free C++ class library of cryptographic schemes.
-Currently the library contains the following algorithms:
-
-                   algorithm type  name
-
- authenticated encryption schemes  GCM, CCM, EAX
-
-        high speed stream ciphers  ChaCha (ChaCha8/12/20), Panama, Sosemanuk,
-                                   Salsa20, XSalsa20
-
-           AES and AES candidates  AES (Rijndael), RC6, MARS, Twofish, Serpent,
-                                   CAST-256
-
-                                   IDEA, Triple-DES (DES-EDE2 and DES-EDE3),
-              other block ciphers  Camellia, SEED, RC5, Blowfish, TEA, XTEA,
-                                   Skipjack, SHACAL-2
-
-  block cipher modes of operation  ECB, CBC, CBC ciphertext stealing (CTS),
-                                   CFB, OFB, counter mode (CTR)
-
-     message authentication codes  VMAC, HMAC, GMAC, CMAC, CBC-MAC, DMAC,
-                                   Two-Track-MAC
-
-                                   BLAKE2 (BLAKE2b, BLAKE2s), SHA-1, SHA-2 (SHA-224,
-                   hash functions  SHA-256, SHA-384, and SHA-512), SHA-3, Tiger,
-                                   WHIRLPOOL, RIPEMD-128, RIPEMD-256, RIPEMD-160,
-                                   RIPEMD-320
-
-                                   RSA, DSA, ElGamal, Nyberg-Rueppel (NR),
-          public-key cryptography  Rabin-Williams (RW), LUC, LUCELG,
-                                   DLIES (variants of DHAES), ESIGN
-
-   padding schemes for public-key  PKCS#1 v2.0, OAEP, PSS, PSSR, IEEE P1363
-                          systems  EMSA2 and EMSA5
-
-                                   Diffie-Hellman (DH), Unified Diffie-Hellman
-            key agreement schemes  (DH2), Menezes-Qu-Vanstone (MQV), Hashed MQV (HMQV),
-                                   Fully Hashed MQV (FHMQV), LUCDIF, XTR-DH
-
-      elliptic curve cryptography  ECDSA, ECNR, ECIES, ECDH, ECMQV
-
-          insecure or obsolescent  MD2, MD4, MD5, Panama Hash, DES, ARC4, SEAL
-algorithms retained for backwards  3.0, WAKE-OFB, DESX (DES-XEX3), RC2,
-     compatibility and historical  SAFER, 3-WAY, GOST, SHARK, CAST-128, Square
-                            value
-
-Other features include:
-
-  * pseudo random number generators (PRNG): ANSI X9.17 appendix C, RandomPool
-  * password based key derivation functions: PBKDF1 and PBKDF2 from PKCS #5,
-    PBKDF from PKCS #12 appendix B, HKDF from RFC 5869
-  * Shamir's secret sharing scheme and Rabin's information dispersal algorithm
-    (IDA)
-  * fast multi-precision integer (bignum) and polynomial operations
-  * finite field arithmetics, including GF(p) and GF(2^n)
-  * prime number generation and verification
-  * useful non-cryptographic algorithms
-      + DEFLATE (RFC 1951) compression/decompression with gzip (RFC 1952) and
-        zlib (RFC 1950) format support
-      + hex, base-32, and base-64 coding/decoding
-      + 32-bit CRC, CRC-C and Adler32 checksum
-  * class wrappers for these platform and operating system features (optional):
-      + high resolution timers on Windows, Unix, and Mac OS
-      + Berkeley and Windows style sockets
-      + Windows named pipes
-      + /dev/random, /dev/urandom, /dev/srandom
-      + Microsoft's CryptGenRandom on Windows
-      + VIA Padlock, Amd64 RDRAND and RDSEED
-  * A high level interface for most of the above, using a filter/pipeline
-    metaphor
-  * benchmarks and validation testing
-  * x86, x86_64, MMX, SSE2, SSE4 assembly code for the most commonly used
-    algorithms, with run-time CPU feature detection and code selection.
-    Limited ARM NEON and ARMv8 ASIMD, CRC and Crypto extension support
-  * some versions are available in FIPS 140-2 validated form
-
-You are welcome to use it for any purpose without paying me, but see
-License.txt for the fine print.
-
-The following compilers are supported for this release. Please visit
-http://www.cryptopp.com the most up to date build instructions and porting notes.
-
-  * MSVC 6.0 - 2015
-  * GCC 3.3 - 7.0
-  * Clang 2.9 - 4.0
-  * C++Builder 2010
-  * Intel C++ Compiler 9 - 16.0
-  * Sun Studio 12u1 - 12.5
-
-*** Important Usage Notes ***
-
-1. If a constructor for A takes a pointer to an object B (except primitive
-types such as int and char), then A owns B and will delete B at A's
-destruction.  If a constructor for A takes a reference to an object B,
-then the caller retains ownership of B and should not destroy it until
-A no longer needs it.
-
-2. Crypto++ is thread safe at the class level. This means you can use
-Crypto++ safely in a multithreaded application, but you must provide
-synchronization when multiple threads access a common Crypto++ object.
-
-*** MSVC-Specific Information ***
-
-On Windows, Crypto++ can be compiled into 3 forms: a static library
-including all algorithms, a DLL with only FIPS Approved algorithms, and
-a static library with only algorithms not in the DLL.
-(FIPS Approved means Approved according to the FIPS 140-2 standard.)
-The DLL may be used by itself, or it may be used together with the second
-form of the static library. MSVC project files are included to build
-all three forms, and sample applications using each of the three forms
-are also included.
-
-To compile Crypto++ with MSVC, open  "cryptest.sln" (for MSVC 2005 - 2015)
-or "cryptest.dsw" (for MSVC 6 - MSVC .NET 2003) workspace file and build
-one or more of the following projects:
-
-cryptdll - This builds the DLL. Please note that if you wish to use Crypto++
-  as a FIPS validated module, you must use a pre-built DLL that has undergone
-  the FIPS validation process instead of building your own.
-dlltest - This builds a sample application that only uses the DLL.
-cryptest Non-DLL-Import Configuration - This builds the full static library
-  along with a full test driver.
-cryptest DLL-Import Configuration - This builds a static library containing
-  only algorithms not in the DLL, along with a full test driver that uses
-  both the DLL and the static library.
-
-To use the Crypto++ DLL in your application, #include "dll.h" before including
-any other Crypto++ header files, and place the DLL in the same directory as
-your .exe file. dll.h includes the line #pragma comment(lib, "cryptopp")
-so you don't have to explicitly list the import library in your project
-settings. To use a static library form of Crypto++, make the "cryptlib"
-project a dependency of your application project, or specify it as
-an additional library to link with in your project settings.
-In either case you should check the compiler options to
-make sure that the library and your application are using the same C++
-run-time libraries and calling conventions.
-
-*** DLL Memory Management ***
-
-Because it's possible for the Crypto++ DLL to delete objects allocated
-by the calling application, they must use the same C++ memory heap. Three
-methods are provided to achieve this.
-1.  The calling application can tell Crypto++ what heap to use. This method
-    is required when the calling application uses a non-standard heap.
-2.  Crypto++ can tell the calling application what heap to use. This method
-    is required when the calling application uses a statically linked C++ Run
-    Time Library. (Method 1 does not work in this case because the Crypto++ DLL
-    is initialized before the calling application's heap is initialized.)
-3.  Crypto++ can automatically use the heap provided by the calling application's
-    dynamically linked C++ Run Time Library. The calling application must
-    make sure that the dynamically linked C++ Run Time Library is initialized
-    before Crypto++ is loaded. (At this time it is not clear if it is possible
-    to control the order in which DLLs are initialized on Windows 9x machines,
-    so it might be best to avoid using this method.)
-
-When Crypto++ attaches to a new process, it searches all modules loaded
-into the process space for exported functions "GetNewAndDeleteForCryptoPP"
-and "SetNewAndDeleteFromCryptoPP". If one of these functions is found,
-Crypto++ uses methods 1 or 2, respectively, by calling the function.
-Otherwise, method 3 is used.
-
-*** Linux and Unix-like Specific Information ***
-
-A makefile is included for you to compile Crypto++ with GCC and compatibles.
-Make sure you are using GNU Make and GNU ld. The make process will produce
-two files, libcryptopp.a and cryptest.exe. Run "cryptest.exe v" for the
-validation suite and "cryptest.exe tv all" for additional test vectors.
-
-The makefile uses '-DNDEBUG -g2 -O2' CXXFLAGS by default. If you use an
-alternate build system, like Autotools or CMake, then ensure the build system
-includes '-DNDEBUG' for production or release builds. The Crypto++ library uses
-asserts for debugging and diagnostics during development; it does not
-rely on them to crash a program at runtime.
-
-If an assert triggers in production software, then unprotected sensitive
-information could be egressed from the program to the filesystem or the
-platform's error reporting program, like Apport on Ubuntu or CrashReporter
-on Apple.
-
-The makefile orders object files to help remediate problems associated with
-C++ static initialization order. The library does not use custom linker scripts.
-If you use an alternate build system, like Autotools or CMake, and collect source
-files into a list, then ensure these three are at the head of the list: 'cryptlib.cpp
-cpu.cpp integer.cpp <other sources>'. They should be linked in the same order:
-'cryptlib.o cpu.o integer.o <other objects>'.
-
-If your linker supports initialization attributes, like init_priority, then you can
-define CRYPTOPP_INIT_PRIORITY to control object initialization order. Set it to a
-value like 250. User programs can use CRYPTOPP_USER_PRIORITY to avoid conflicts with
-library values. Initialization attributes are more reliable than object file ordering,
-but its not ubiquitously supported by linkers.
-
-The makefile links to the static version of the Crypto++ library to avoid binary
-planting and other LD_PRELOAD tricks. You should use the static version of the
-library in your programs to help avoid unwanted redirections.
-
-*** Documentation and Support ***
-
-Crypto++ is documented through inline comments in header files, which are
-processed through Doxygen to produce an HTML reference manual. You can find
-a link to the manual from http://www.cryptopp.com. Also at that site is
-the Crypto++ FAQ, which you should browse through before attempting to
-use this library, because it will likely answer many of questions that
-may come up. Finally, the site provide the wiki which has many topics
-and code examples.
-
-If you run into any problems, please try the Crypto++ mailing list.
-The subscription information and the list archive are available on
-http://www.cryptopp.com. You can also email me directly by visiting
-http://www.weidai.com, but you will probably get a faster response through
-the mailing list.
-
-*** History ***
-
-1.0 - First public release.  Withdrawn at the request of RSA DSI.
-    - included Blowfish, BBS, DES, DH, Diamond, DSA, ElGamal, IDEA,
-      MD5, RC4, RC5, RSA, SHA, WAKE, secret sharing, DEFLATE compression
-    - had a serious bug in the RSA key generation code.
-
-1.1 - Removed RSA, RC4, RC5
-    - Disabled calls to RSAREF's non-public functions
-    - Minor bugs fixed
-
-2.0 - a completely new, faster multiprecision integer class
-    - added MD5-MAC, HAVAL, 3-WAY, TEA, SAFER, LUC, Rabin, BlumGoldwasser,
-      elliptic curve algorithms
-    - added the Lucas strong probable primality test
-    - ElGamal encryption and signature schemes modified to avoid weaknesses
-    - Diamond changed to Diamond2 because of key schedule weakness
-    - fixed bug in WAKE key setup
-    - SHS class renamed to SHA
-    - lots of miscellaneous optimizations
-
-2.1 - added Tiger, HMAC, GOST, RIPE-MD160, LUCELG, LUCDIF, XOR-MAC,
-      OAEP, PSSR, SHARK
-    - added precomputation to DH, ElGamal, DSA, and elliptic curve algorithms
-    - added back RC5 and a new RSA
-    - optimizations in elliptic curves over GF(p)
-    - changed Rabin to use OAEP and PSSR
-    - changed many classes to allow copy constructors to work correctly
-    - improved exception generation and handling
-
-2.2 - added SEAL, CAST-128, Square
-    - fixed bug in HAVAL (padding problem)
-    - fixed bug in triple-DES (decryption order was reversed)
-    - fixed bug in RC5 (couldn't handle key length not a multiple of 4)
-    - changed HMAC to conform to RFC-2104 (which is not compatible
-      with the original HMAC)
-    - changed secret sharing and information dispersal to use GF(2^32)
-      instead of GF(65521)
-    - removed zero knowledge prover/verifier for graph isomorphism
-    - removed several utility classes in favor of the C++ standard library
-
-2.3 - ported to EGCS
-    - fixed incomplete workaround of min/max conflict in MSVC
-
-3.0 - placed all names into the "CryptoPP" namespace
-    - added MD2, RC2, RC6, MARS, RW, DH2, MQV, ECDHC, CBC-CTS
-    - added abstract base classes PK_SimpleKeyAgreementDomain and
-      PK_AuthenticatedKeyAgreementDomain
-    - changed DH and LUCDIF to implement the PK_SimpleKeyAgreementDomain
-      interface and to perform domain parameter and key validation
-    - changed interfaces of PK_Signer and PK_Verifier to sign and verify
-      messages instead of message digests
-    - changed OAEP to conform to PKCS#1 v2.0
-    - changed benchmark code to produce HTML tables as output
-    - changed PSSR to track IEEE P1363a
-    - renamed ElGamalSignature to NR and changed it to track IEEE P1363
-    - renamed ECKEP to ECMQVC and changed it to track IEEE P1363
-    - renamed several other classes for clarity
-    - removed support for calling RSAREF
-    - removed option to compile old SHA (SHA-0)
-    - removed option not to throw exceptions
-
-3.1 - added ARC4, Rijndael, Twofish, Serpent, CBC-MAC, DMAC
-    - added interface for querying supported key lengths of symmetric ciphers
-      and MACs
-    - added sample code for RSA signature and verification
-    - changed CBC-CTS to be compatible with RFC 2040
-    - updated SEAL to version 3.0 of the cipher specification
-    - optimized multiprecision squaring and elliptic curves over GF(p)
-    - fixed bug in MARS key setup
-    - fixed bug with attaching objects to Deflator
-
-3.2 - added DES-XEX3, ECDSA, DefaultEncryptorWithMAC
-    - renamed DES-EDE to DES-EDE2 and TripleDES to DES-EDE3
-    - optimized ARC4
-    - generalized DSA to allow keys longer than 1024 bits
-    - fixed bugs in GF2N and ModularArithmetic that can cause calculation errors
-    - fixed crashing bug in Inflator when given invalid inputs
-    - fixed endian bug in Serpent
-    - fixed padding bug in Tiger
-
-4.0 - added Skipjack, CAST-256, Panama, SHA-2 (SHA-256, SHA-384, and SHA-512),
-      and XTR-DH
-    - added a faster variant of Rabin's Information Dispersal Algorithm (IDA)
-    - added class wrappers for these operating system features:
-      - high resolution timers on Windows, Unix, and MacOS
-      - Berkeley and Windows style sockets
-      - Windows named pipes
-      - /dev/random and /dev/urandom on Linux and FreeBSD
-      - Microsoft's CryptGenRandom on Windows
-    - added support for SEC 1 elliptic curve key format and compressed points
-    - added support for X.509 public key format (subjectPublicKeyInfo) for
-      RSA, DSA, and elliptic curve schemes
-    - added support for DER and OpenPGP signature format for DSA
-    - added support for ZLIB compressed data format (RFC 1950)
-    - changed elliptic curve encryption to use ECIES (as defined in SEC 1)
-    - changed MARS key schedule to reflect the latest specification
-    - changed BufferedTransformation interface to support multiple channels
-      and messages
-    - changed CAST and SHA-1 implementations to use public domain source code
-    - fixed bug in StringSource
-    - optmized multi-precision integer code for better performance
-
-4.1 - added more support for the recommended elliptic curve parameters in SEC 2
-    - added Panama MAC, MARC4
-    - added IV stealing feature to CTS mode
-    - added support for PKCS #8 private key format for RSA, DSA, and elliptic
-      curve schemes
-    - changed Deflate, MD5, Rijndael, and Twofish to use public domain code
-    - fixed a bug with flushing compressed streams
-    - fixed a bug with decompressing stored blocks
-    - fixed a bug with EC point decompression using non-trinomial basis
-    - fixed a bug in NetworkSource::GeneralPump()
-    - fixed a performance issue with EC over GF(p) decryption
-    - fixed syntax to allow GCC to compile without -fpermissive
-    - relaxed some restrictions in the license
-
-4.2 - added support for longer HMAC keys
-    - added MD4 (which is not secure so use for compatibility purposes only)
-    - added compatibility fixes/workarounds for STLport 4.5, GCC 3.0.2,
-      and MSVC 7.0
-    - changed MD2 to use public domain code
-    - fixed a bug with decompressing multiple messages with the same object
-    - fixed a bug in CBC-MAC with MACing multiple messages with the same object
-    - fixed a bug in RC5 and RC6 with zero-length keys
-    - fixed a bug in Adler32 where incorrect checksum may be generated
-
-5.0 - added ESIGN, DLIES, WAKE-OFB, PBKDF1 and PBKDF2 from PKCS #5
-    - added key validation for encryption and signature public/private keys
-    - renamed StreamCipher interface to SymmetricCipher, which is now implemented
-      by both stream ciphers and block cipher modes including ECB and CBC
-    - added keying interfaces to support resetting of keys and IVs without
-      having to destroy and recreate objects
-    - changed filter interface to support non-blocking input/output
-    - changed SocketSource and SocketSink to use overlapped I/O on Microsoft Windows
-    - grouped related classes inside structs to help templates, for example
-      AESEncryption and AESDecryption are now AES::Encryption and AES::Decryption
-    - where possible, typedefs have been added to improve backwards
-      compatibility when the CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY macro is defined
-    - changed Serpent, HAVAL and IDEA to use public domain code
-    - implemented SSE2 optimizations for Integer operations
-    - fixed a bug in HMAC::TruncatedFinal()
-    - fixed SKIPJACK byte ordering following NIST clarification dated 5/9/02
-
-5.01 - added known answer test for X9.17 RNG in FIPS 140 power-up self test
-     - submitted to NIST/CSE, but not publicly released
-
-5.02 - changed EDC test to MAC integrity check using HMAC/SHA1
-     - improved performance of integrity check
-     - added blinding to defend against RSA timing attack
-
-5.03 - created DLL version of Crypto++ for FIPS 140-2 validation
-     - fixed vulnerabilities in GetNextIV for CTR and OFB modes
-
-5.0.4 - Removed DES, SHA-256, SHA-384, SHA-512 from DLL
-
-5.1 - added PSS padding and changed PSSR to track IEEE P1363a draft standard
-    - added blinding for RSA and Rabin to defend against timing attacks
-      on decryption operations
-    - changed signing and decryption APIs to support the above
-    - changed WaitObjectContainer to allow waiting for more than 64
-      objects at a time on Win32 platforms
-    - fixed a bug in CBC and ECB modes with processing non-aligned data
-    - fixed standard conformance bugs in DLIES (DHAES mode) and RW/EMSA2
-      signature scheme (these fixes are not backwards compatible)
-    - fixed a number of compiler warnings, minor bugs, and portability problems
-    - removed Sapphire
-
-5.2 - merged in changes for 5.01 - 5.0.4
-    - added support for using encoding parameters and key derivation parameters
-      with public key encryption (implemented by OAEP and DL/ECIES)
-    - added Camellia, SHACAL-2, Two-Track-MAC, Whirlpool, RIPEMD-320,
-      RIPEMD-128, RIPEMD-256, Base-32 coding, FIPS variant of CFB mode
-    - added ThreadUserTimer for timing thread CPU usage
-    - added option for password-based key derivation functions
-      to iterate until a mimimum elapsed thread CPU time is reached
-    - added option (on by default) for DEFLATE compression to detect
-      uncompressible files and process them more quickly
-    - improved compatibility and performance on 64-bit platforms,
-      including Alpha, IA-64, x86-64, PPC64, Sparc64, and MIPS64
-    - fixed ONE_AND_ZEROS_PADDING to use 0x80 instead 0x01 as padding.
-    - fixed encoding/decoding of PKCS #8 privateKeyInfo to properly
-      handle optional attributes
-
-5.2.1 - fixed bug in the "dlltest" DLL testing program
-      - fixed compiling with STLport using VC .NET
-      - fixed compiling with -fPIC using GCC
-      - fixed compiling with -msse2 on systems without memalign()
-      - fixed inability to instantiate PanamaMAC
-      - fixed problems with inline documentation
-
-5.2.2 - added SHA-224
-      - put SHA-256, SHA-384, SHA-512, RSASSA-PSS into DLL
-
-5.2.3 - fixed issues with FIPS algorithm test vectors
-      - put RSASSA-ISO into DLL
-
-5.3 - ported to MSVC 2005 with support for x86-64
-    - added defense against AES timing attacks, and more AES test vectors
-    - changed StaticAlgorithmName() of Rijndael to "AES", CTR to "CTR"
-
-5.4 - added Salsa20
-    - updated Whirlpool to version 3.0
-    - ported to GCC 4.1, Sun C++ 5.8, and Borland C++Builder 2006
-
-5.5 - added VMAC and Sosemanuk (with x86-64 and SSE2 assembly)
-    - improved speed of integer arithmetic, AES, SHA-512, Tiger, Salsa20,
-      Whirlpool, and PANAMA cipher using assembly (x86-64, MMX, SSE2)
-    - optimized Camellia and added defense against timing attacks
-    - updated benchmarks code to show cycles per byte and to time key/IV setup
-    - started using OpenMP for increased multi-core speed
-    - enabled GCC optimization flags by default in GNUmakefile
-    - added blinding and computational error checking for RW signing
-    - changed RandomPool, X917RNG, GetNextIV, DSA/NR/ECDSA/ECNR to reduce
-      the risk of reusing random numbers and IVs after virtual machine state
-      rollback
-    - changed default FIPS mode RNG from AutoSeededX917RNG<DES_EDE3> to
-      AutoSeededX917RNG<AES>
-    - fixed PANAMA cipher interface to accept 256-bit key and 256-bit IV
-    - moved MD2, MD4, MD5, PanamaHash, ARC4, WAKE_CFB into the namespace "Weak"
-    - removed HAVAL, MD5-MAC, XMAC
-
-5.5.1 - fixed VMAC validation failure on 32-bit big-endian machines
-
-5.5.2 - ported x64 assembly language code for AES, Salsa20, Sosemanuk, and Panama
-        to MSVC 2005 (using MASM since MSVC doesn't support inline assembly on x64)
-      - fixed Salsa20 initialization crash on non-SSE2 machines
-      - fixed Whirlpool crash on Pentium 2 machines
-      - fixed possible branch prediction analysis (BPA) vulnerability in
-        MontgomeryReduce(), which may affect security of RSA, RW, LUC
-      - fixed link error with MSVC 2003 when using "debug DLL" form of runtime library
-      - fixed crash in SSE2_Add on P4 machines when compiled with
-        MSVC 6.0 SP5 with Processor Pack
-      - ported to MSVC 2008, GCC 4.2, Sun CC 5.9, Intel C++ Compiler 10.0,
-        and Borland C++Builder 2007
-
-5.6.0 - added AuthenticatedSymmetricCipher interface class and Filter wrappers
-      - added CCM, GCM (with SSE2 assembly), EAX, CMAC, XSalsa20, and SEED
-      - added support for variable length IVs
-      - added OIDs for Brainpool elliptic curve parameters
-      - improved AES and SHA-256 speed on x86 and x64
-      - changed BlockTransformation interface to no longer assume data alignment
-      - fixed incorrect VMAC computation on message lengths
-        that are >64 mod 128 (x86 assembly version is not affected)
-      - fixed compiler error in vmac.cpp on x86 with GCC -fPIC
-      - fixed run-time validation error on x86-64 with GCC 4.3.2 -O2
-      - fixed HashFilter bug when putMessage=true
-      - fixed AES-CTR data alignment bug that causes incorrect encryption on ARM
-      - removed WORD64_AVAILABLE; compiler support for 64-bit int is now required
-      - ported to GCC 4.3, C++Builder 2009, Sun CC 5.10, Intel C++ Compiler 11
-
-5.6.1 - added support for AES-NI and CLMUL instruction sets in AES and GMAC/GCM
-      - removed WAKE-CFB
-      - fixed several bugs in the SHA-256 x86/x64 assembly code:
-          * incorrect hash on non-SSE2 x86 machines on non-aligned input
-          * incorrect hash on x86 machines when input crosses 0x80000000
-          * incorrect hash on x64 when compiled with GCC with optimizations enabled
-      - fixed bugs in AES x86 and x64 assembly causing crashes in some MSVC build configurations
-      - switched to a public domain implementation of MARS
-      - ported to MSVC 2010, GCC 4.5.1, Sun Studio 12u1, C++Builder 2010, Intel C++ Compiler 11.1
-      - renamed the MSVC DLL project to "cryptopp" for compatibility with MSVC 2010
-
-5.6.2 - changed license to Boost Software License 1.0
-      - added SHA-3 (Keccak)
-      - updated DSA to FIPS 186-3 (see DSA2 class)
-      - fixed Blowfish minimum keylength to be 4 bytes (32 bits)
-      - fixed Salsa validation failure when compiling with GCC 4.6
-      - fixed infinite recursion when on x64, assembly disabled, and no AESNI
-      - ported to MSVC 2012, GCC 4.7, Clang 3.2, Solaris Studio 12.3, Intel C++ Compiler 13.0
-
-5.6.3 - maintenance release, honored API/ABI/Versioning requirements
-      - expanded processes to include community and its input
-          * 12 unique contributors for this release
-      - fixed CVE-2015-2141
-      - cleared most Undefined Behavior Sanitizer (UBsan) findings
-      - cleared all Address Sanitizer (Asan) findings
-      - cleared all Valgrind findings
-      - cleared all Coverity findings
-      - cleared all Enterprise Analysis (/analyze) findings
-      - cleared most GCC warnings with -Wall
-      - cleared most Clang warnings with -Wall
-      - cleared most MSVC warnings with /W4
-      - added -fPIC 64-bit builds. Off by default for i386
-      - added HKDF class from RFC 5868
-      - switched to member_ptr due to C++ 11 warnings for auto_ptr
-      - initialization of C++ static objects, off by default
-          * GCC and init_priotirty/constructor attributes
-          * MSVC and init_seg(lib)
-          * CRYPTOPP_INIT_PRIORITY disabled by default, but available
-      - improved OS X support
-      - improved GNUmakefile support for Testing and QA
-      - added self tests for additional Testing and QA
-      - added cryptest.sh for systematic Testing and QA
-      - added GNU Gold linker support
-      - added Visual Studio 2010 solution and project files in vs2010.zip
-      - added Clang integrated assembler support
-      - unconditionally define CRYPTOPP_NO_UNALIGNED_DATA_ACCESS for Makefile
-        target 'ubsan' and at -O3 due to GCC vectorization on x86 and x86_64
-      - workaround ARMEL/GCC 5.2 bug and failed self test
-      - fixed crash in MQV due to GCC 4.9+ and inlining
-      - fixed hang in SHA due to GCC 4.9+ and inlining
-      - fixed missing rdtables::Te under VS with ALIGNED_DATA_ACCESS
-      - fixed S/390 and big endian feature detection
-      - fixed S/390 and int128_t/uint128_t detection
-      - fixed X32 (ILP32) feature detection
-      - removed  _CRT_SECURE_NO_DEPRECATE for Microsoft platforms
-      - utilized bound checking interfaces from ISO/IEC TR 24772 when available
-      - improved ARM, ARM64, MIPS, MIPS64, S/390 and X32 (ILP32) support
-      - introduced CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-      - added additional Doxygen-based documentation
-      - ported to MSVC 2015, Xcode 7.2, GCC 5.2, Clang 3.7, Intel C++ 16.00
-
-5.6.4 - maintenance release, honored API/ABI/Versioning requirements
-      - expanded community input and support
-          * 22 unique contributors for this release
-      - fixed CVE-2016-3995
-      - changed SHA3 to FIPS 202 (F1600, XOF d=0x06)
-      - added Keccak (F1600, XOF d=0x01)
-      - added ChaCha (ChaCha8/12/20)
-      - added HMQV and FHMQV
-          * Hashed and Fully Hashed MQV
-      - added BLAKE2 (BLAKE2s and BLAKE2b)
-          * C++, SSE2, SSE4, ARM NEON and ARMv8 ASIMD
-      - added CRC32-C
-          * C/C++, Amd64 CRC, and ARMv8 CRC
-      - improved Rabin-William signatures
-          * Tweaked roots <em>e</em> and <em>f</em>
-      - improved C++11 support
-          * atomics, threads and fences
-          * alginof, alignas
-          * constexpr
-          * noexcept
-      - improved GCM mode
-          * ARM NEON and ARMv8 ASIMD
-          * ARMv8 carry-less multiply
-      - improved Windows 8 and 10 support
-          * Windows Phone, Universal Windows Platform, Windows Store
-      - improved MIPS, ARMv7 and ARMv8 support
-          * added scripts setenv-{android|embedded|ios}.sh for GNUmakefile-cross
-          * aggressive use of -march=<arch> and -mfpu=<fpu> in cryptest.sh
-      - improved build systems
-          * Visual Studio 2010 default
-          * added CMake support (lacks FindCryptopp.cmake)
-          * archived VC++ 5/0/6.0 project files (vc60.zip)
-          * archived VS2005 project files (vs2005.zip)
-          * archived Borland project files (bds10.zip)
-      - improved Testing and QA
-          * expanded platforms and compilers
-          * added code generation tests based on CPU features
-          * added C++03, C++11, C++14, C++17 testing
-          * added -O3, -O5, -Ofast and -Os testing
-      - ported to MSVC 2015 SP3, Xcode 9.0, Sun Studio 12.5, GCC 7.0, MacPorts GCC 7.0, Clang 3.8, Intel C++ 17.00
-
-Written by Wei Dai and the Crypto++ Project
diff --git a/src-cryptopp/TestVectors/Readme.txt b/src-cryptopp/TestVectors/Readme.txt
deleted file mode 100644
index 281055f..0000000
--- a/src-cryptopp/TestVectors/Readme.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-Test Data Format
-================
-
-A test data file is an ASCII text file composed of sections separated by
-blank lines. Each section is stand-alone and independent of other
-sections that may be in the same file, and contains one or more tests.
-
-A section is composed of a sequence of fields. Each field is one or more
-lines composed of a field name, followed by a colon (":"), followed by a
-field body. All but the last line of a field must end with a backslash
-("\"). If any line contains a hash mark ("#"), the hash mark and
-everything after it on the same line is not considered part of the field
-body.
-
-Each section must contain fields named AlgorithmType, Name, Source, and
-Test. The presence and semantics of other fields depend on the algorithm
-being tested and the tests to be run.
-
-Each section may contain more than one test and therefore more than one
-field named Test. In that case the order of the fields is significant. A
-test should always use the last field with any given name that occurs
-before the Test field.
-
-Data Types
-==========
-
-int - small integer (less than 2^32) in decimal representation
-string - human readable string
-encoded string - can be one of the following
-	- quoted string: "message" means "message" without the quotes
-	  or terminating '\0'
-	- hex encoded string: 0x74657374 or 74657374 means "test"
-	- repeated string: r100 "message" to repeat "message" 100 times, or
-	  r256 0x0011 to repeat 0x0011 256 times
-
-Field Types
-===========
-
-AlgorithmType - string, for example "Signature", "AsymmetricCipher",
-    "SymmetricCipher", "MAC", "MessageDigest", or "KeyFactory"
-Name - string, an algorithm name from SCAN
-Test - string, identifies the test to run
-Source - string, text explaining where the test data came from
-Comment - string, other comments about the test data
-KeyFormat - string, specifies the key format. "Component" here means
-    each component of the key or key pair is specified separately as a name,
-    value pair, with the names depending on the algorithm being tested.
-    Otherwise the value names "Key", or "PublicKey" and "PrivateKey" are
-    used.
-Key - encoded string
-PublicKey - encoded string
-PrivateKey - encoded string
-Modulus - the modulus when KeyFormat=Component
-SubgroupOrder - the subgroup order when KeyFormat=Component
-SubgroupGenerator - the subgroup generator when KeyFormat=Component
-PublicElement - the public element when KeyFormat=Component
-PrivateExponent - the private exponent when KeyFormat=Component
-Message - encoded string, message to be signed or verified
-Signature - encoded string, signature to be verified or compared with
-Plaintext - encoded string
-Ciphertext - encoded string
-Header - encoded string
-Footer - encoded string
-DerivedKey - encoded string
-DerivedLength - encoded string
-Digest - encoded string
-TruncatedSize - int, size of truncated digest in bytes
-Seek - int, seek location for random access ciphers
-(more to come here)
-
-Possible Tests
-==============
-
-KeyPairValidAndConsistent - public and private keys are both valid and
-consistent with each other
-PublicKeyInvalid - public key validation should not pass
-PrivateKeyInvalid - private key validation should not pass
-Verify - signature/digest/MAC verification should pass
-VerifyTruncated - truncated digest/MAC verification should pass
-NotVerify - signature/digest/MAC verification should not pass
-DeterministicSign - sign message using given seed, and the resulting
-    signature should be equal to the given signature
-DecryptMatch - ciphertext decrypts to plaintext
-
-(more to come here)
diff --git a/src-cryptopp/TestVectors/aes.txt b/src-cryptopp/TestVectors/aes.txt
deleted file mode 100644
index f037c3f..0000000
--- a/src-cryptopp/TestVectors/aes.txt
+++ /dev/null
@@ -1,241 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: AES/ECB
-Source: NIST Special Publication 800-38A
-Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710
-Comment: F.1.1 ECB-AES128.Encrypt
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: 3ad77bb40d7a3660a89ecaf32466ef97 f5d3d58503b9699de785895a96fdbaaf 43b1cd7f598ece23881b00e3ed030688 7b0c785e27e8ad3f8223207104725dd4
-Test: Encrypt
-Comment: F.1.3 ECB-AES192.Encrypt
-Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b
-Ciphertext: bd334f1d6e45f25ff712a214571fa5cc 974104846d0ad3ad7734ecb3ecee4eef ef7afd2270e2e60adce0ba2face6444e 9a4b41ba738d6c72fb16691603c18e0e
-Test: Encrypt
-Comment: F.1.5 ECB-AES256.Encrypt
-Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4
-Ciphertext: f3eed1bdb5d2a03c064b5a7e3db181f8 591ccb10d410ed26dc5ba74a31362870 b6ed21b99ca6f4f9f153e7b1beafed1d 23304b7a39f9f3ff067d8d8f9e24ecc7
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: AES/ECB
-Source: Generated by Crypto++ 5.6.1
-Comment: long test vector
-Plaintext: r8 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c371000
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: 84C6CBDC2B5A39985774B23BAB066A6AF8CB66C08E4F058E5D3E7C351EA845CEC7B209210EE7EFD38269628687F21CB9BCEA349DC0418ADBA2BF2364DF4DB1A11AD84CF6A422CE95C37B2CF81196245CD857D0B954B83985C1888230F3C301847AAF714253EF768C17E89E4F5513DBD5BEE1266A2B2D7063CE3D0BA8716252C5BCBB9922CD46F374B52FDFF1FEBF155FF4AFEE18788999BC74234A3FFBA7B2858BB2552F172E56EC47456878440ABB5ADAE49941C1E43616AC5D6E31A011611B829F6A77BE1F50754F81F35D24ED89FDE804B17363F9A81C3F12AE067FDD41A2984912CAE1926C5FB3AC18E541FA4AD1E171888E61428F2A8F2E981AE16D0D4E41D33E5E675F446DAE0F454FC4CA056F41F3CC4744A9E948428B2280F96663B7230C09692503C95B3E34F8DE8DF23157F45BDF689B258D994D9E6CE5D4DD6BDB96763CCC41DBBE57A4778D5A9E90226D614C335E44CA8AB41EFEA898BC170C65412F77194A43A1305EF23AC70B059E6E047796EF518D7696BC3DAD5E2634F92DD1C90D206A2B6D3A7CE88668BEAD64614E9000ACFBA79EB3601606214E21E08F14CE77E36BB66FE4A0FCD2A21BCAA2391A9C2016AC3BC7CDF1438EB6DD26696644583E2B0A0C68629D736F6723DF66859CF80B4E5B5C5BF03F334D65C48DB3B2660E2CE33B510FD60C912B85D16AEE7CDBFDF6285B0A77BAE07D987F9CE172A548E6BF0A30CF099AA82BE0A25E0E8919
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: AES/CBC
-Source: NIST Special Publication 800-38A
-IV: 000102030405060708090a0b0c0d0e0f
-Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710
-Comment: F.2.1 CBC-AES128.Encrypt
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: 7649abac8119b246cee98e9b12e9197d 5086cb9b507219ee95db113a917678b2 73bed6b8e3c1743b7116e69e22229516 3ff1caa1681fac09120eca307586e1a7
-Test: Encrypt
-Comment: F.2.3 CBC-AES192.Encrypt
-Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b
-Ciphertext: 4f021db243bc633d7178183a9fa071e8 b4d9ada9ad7dedf4e5e738763f69145a 571b242012fb7ae07fa9baac3df102e0 08b0e27988598881d920a9e64f5615cd
-Test: Encrypt
-Comment: F.2.5 CBC-AES256.Encrypt
-Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4
-Ciphertext: f58c4c04d6e5f1ba779eabfb5f7bfbd6 9cfc4e967edb808d679f777bc6702c7d 39f23369a9d9bacfa530e26304231461 b2eb05e2c39be9fcda6c19078c6a9d1b
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: AES/CBC
-Source: RFC 3602
-Comment: Case 1: Encrypting 16 bytes (1 block) using AES-CBC with 128-bit key
-Key       : 0x06a9214036b8a15b512e03d534120006
-IV        : 0x3dafba429d9eb430b422da802c9fac41
-Plaintext : "Single block msg"
-Ciphertext: 0xe353779c1079aeb82708942dbe77181a
-Test: Encrypt
-Comment: Case 2: Encrypting 32 bytes (2 blocks) using AES-CBC with 128-bit key
-Key       : 0xc286696d887c9aa0611bbb3e2025a45a
-IV        : 0x562e17996d093d28ddb3ba695a2e6f58
-Plaintext : 0x000102030405060708090a0b0c0d0e0f              101112131415161718191a1b1c1d1e1f
-Ciphertext: 0xd296cd94c2cccf8a3a863028b5e1dc0a              7586602d253cfff91b8266bea6d61ab1
-Test: Encrypt
-Comment: Case 3: Encrypting 48 bytes (3 blocks) using AES-CBC with 128-bit key
-Key       : 0x6c3ea0477630ce21a2ce334aa746c2cd
-IV        : 0xc782dc4c098c66cbd9cd27d825682c81
-Plaintext : "This is a 48-byte message (exactly 3 AES blocks)"
-Ciphertext: 0xd0a02b3836451753d493665d33f0e886              2dea54cdb293abc7506939276772f8d5              021c19216bad525c8579695d83ba2684
-Test: Encrypt
-Comment: Case 4: Encrypting 64 bytes (4 blocks) using AES-CBC with 128-bit key
-Key       : 0x56e47a38c5598974bc46903dba290349
-IV        : 0x8ce82eefbea0da3c44699ed7db51b7d9
-Plaintext : 0xa0a1a2a3a4a5a6a7a8a9aaabacadaeaf              b0b1b2b3b4b5b6b7b8b9babbbcbdbebf              c0c1c2c3c4c5c6c7c8c9cacbcccdcecf              d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
-Ciphertext: 0xc30e32ffedc0774e6aff6af0869f71aa              0f3af07a9a31a9c684db207eb0ef8e4e              35907aa632c3ffdf868bb7b29d3d46ad              83ce9f9a102ee99d49a53e87f4c3da55
-Test: Encrypt
-
-
-AlgorithmType: SymmetricCipher
-Name: AES/CBC
-Source: Generated by Crypto++ 5.6.1
-Comment: long test vector
-IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Plaintext: r8 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c371000
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: 6544CCA076C4D67C1A69DD7E504C6586FBD22912505E187D8628E19FA067D6C339D078E3032B8596DA74BB0E23434F83E153D5ACD5DEF7D264F58EC685317BF50C93430791718D6E09CCC4804FFE4EEB5C6AD8E9B5DFD456EDE81081627A97FC2FAE9F1955377D7774E68EAB541B20CE3C915185BCA208EE08428C400043F2DC90B0390756762C9271946FCE214B9576F74399E466DAC48C6DD10B420F302941DCC27D55CF1FB59D71954950CAD893FFFA70970D128C77BFA34F3C84B0B64A01194A086ACDD9847D6B91B7F870D0E7591CA07F0B407005F1473C37A648F6E18044336F30418BA43FD7AA5B5BAE01A0E33B1EDA4487730F043E202DE44CB901BD3AED13D790D05F325C414831EB601BD918678C1B8E116877CE1167F87204B49619D323713F95C04CA9621FDCF44BD21C5E36A299C486C8FC0D3043EDFF424B9A7AA5500DC3BD7BF6FAB256E6B45B458058DC933F1FF8C5E841BFC7F405761E14B12B48C1C108F33BF8D65BB8DBB9ED7E92398E779333730F4C68922AA76409E842E76B649B981B8269186220ACFF9DFA198D62CBF4CFA0FE05C1427CE63A345A61FE460D14EF25D7A89E2E228B415757B4E4110B6AFA7D85D48C3BCF184FDD7366F06D9E3D29896B0D3C0D83FCFA881E6EC5F29B0294628EDFF284E58B7BE19D37A6B28D70DC0F165A4B60CE5536D76D1A71849C36B0837E4E5082A05208CEEB320C57F0F5B86DC3CAAC8A32DEA9552D
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: AES/CFB
-Source: NIST Special Publication 800-38A
-IV: 000102030405060708090a0b0c0d0e0f
-Plaintext: 6bc1bee22e409f96e93d7e117393172aae2d8
-FeedbackSize: 1
-Comment: F.3.7 CFB8-AES128.Encrypt
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: 3b79424c9c0dd436bace9e0ed4586a4f32b9
-Test: Encrypt
-Comment: F.3.9 CFB8-AES192.Encrypt
-Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b
-Ciphertext: cda2521ef0a905ca44cd057cbf0d47a0678a
-Test: Encrypt
-Comment: F.3.11 CFB8-AES256.Encrypt
-Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4
-Ciphertext: dc1f1a8520a64db55fcc8ac554844e889700
-Test: Encrypt
-Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710
-FeedbackSize: 16
-Comment: F.3.13 CFB128-AES128.Encrypt
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: 3b3fd92eb72dad20333449f8e83cfb4a c8a64537a0b3a93fcde3cdad9f1ce58b 26751f67a3cbb140b1808cf187a4f4df c04b05357c5d1c0eeac4c66f9ff7f2e6
-Test: Encrypt
-Comment: F.3.15 CFB128-AES192.Encrypt
-Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b
-Ciphertext: cdc80d6fddf18cab34c25909c99a4174 67ce7f7f81173621961a2b70171d3d7a 2e1e8a1dd59b88b1c8e60fed1efac4c9 c05f9f9ca9834fa042ae8fba584b09ff
-Test: Encrypt
-Comment: F.3.17 CFB128-AES256.Encrypt
-Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4
-Ciphertext: dc7e84bfda79164b7ecd8486985d3860 39ffed143b28b1c832113c6331e5407b df10132415e54b92a13ed0a8267ae2f9 75a385741ab9cef82031623d55b1e471
-Test: Encrypt
-
-
-AlgorithmType: SymmetricCipher
-Name: AES/CFB
-Source: Generated by Crypto++ 5.6.1
-Comment: long test vector with odd length
-IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Plaintext: r11 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: ECE71ECD7A4E3C2F643B2B0BFBED32F365C96D626048D13C65962ED08445B5EE74B11203E24C0ACCD3CC13F39963632D8F4B8F8BB16B7901373C32FFD27472957A8448E414A26BB10CAE9BCFBF332BA677D59C0CCD4CCE5B34298E2B1F3250092CF602B5476922D9FA13D4AE9F54841D889FE71D67A79315A621BDAECB2FD3F1ECDAB0DC9FBDFB85AE1633038A44E15DEF1B6DDBC4AB47BB128E1C2DE8A17FD1107D8587CE96088709E17DA23DE6993973A43DFB59801A9691B7EBF5565C4FF842F5132E99288FA4CE3E6CE9333DEE052212E71EF08C5E2E385A787F1567C0CD05A4D11BF40CA19B8D49A231AA55CDE1B8C531C9FCD3B9C70AABD65372E582FCE7528B6BD8F89AA6489B1F085AE024D5A964CAEC4F3F5726CBACDB5D8429F6741FE102BC27E10724C30A64A7D3ED11F6FF41908920A1326793C7C7EDDDD2F79D8A3CE804AE53E59E43B2E0E69AF69A79D7A97A12C0A1AC7331369FCE4072879AA998CD1DC6296CB02D4B97803F1F3713F922796148E2263AFA6A72CF30C3C00297ABF2AD2D559AC4D0011A839FAAA261BB17966E80FF243B65B6209C2732F294F33936A3B8FE7C9BEBE50686BBE7F0FDCF9E24281242B10844037D9AB8A342B954B69E6456243CC13959E1B014A1389BA69B9C4E1C0869C7FE3292ED72FCF183B216F7F5EB5A7CD0A2493BCA160AE6142F4CF03110CA4782CA6C8ED558CA8AF4B14ADC4C368FF0C0CD014F7E117F56D797EF45294C8D3BCED9D5D4E3FA60592031E2925ABA72DFE5AC1D88081DB6CF68DCB256A822CE891AD12F5BB34F39CE974F7D23C0B7AB3BF12D854DA60617EB5E479A9740E00A1DCA267A3D1D212F25A06B83106CBD624CC745ACB31E0EA774F6E0D765D6134F74A3AF5B3846649C14539B7C01B484C54F71B2C5016C2EA57B16472145511130D79E23271151F370DB8A626DB218F73FF0ABFE066E2782696F6984923AA074AEA9E059AEC18F50D4E03F4B17BAD856E6C962604A02
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: AES/OFB
-Source: NIST Special Publication 800-38A
-IV: 000102030405060708090a0b0c0d0e0f
-Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710
-Comment: F.4.1 OFB-AES128.Encrypt
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: 3b3fd92eb72dad20333449f8e83cfb4a 7789508d16918f03f53c52dac54ed825 9740051e9c5fecf64344f7a82260edcc 304c6528f659c77866a510d9c1d6ae5e
-Test: Encrypt
-Comment: F.4.3 OFB-AES192.Encrypt
-Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b
-Ciphertext: cdc80d6fddf18cab34c25909c99a4174 fcc28b8d4c63837c09e81700c1100401 8d9a9aeac0f6596f559c6d4daf59a5f2 6d9f200857ca6c3e9cac524bd9acc92a
-Test: Encrypt
-Comment: F.4.5 OFB-AES256.Encrypt
-Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4
-Ciphertext: dc7e84bfda79164b7ecd8486985d3860 4febdc6740d20b3ac88f6ad82a4fb08d 71ab47a086e86eedf39d1c5bba97c408 0126141d67f37be8538f5a8be740e484
-Test: Encrypt
-
-
-AlgorithmType: SymmetricCipher
-Name: AES/OFB
-Source: Generated by Crypto++ 5.6.1
-Comment: long test vector with odd length
-IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Plaintext: r11 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: ECE71ECD7A4E3C2F643B2B0BFBED32F3B3D63D91F8B99D5EA9D0AA2D977A8675EDD972802EB60B3D8FA629EF94358D46861CF60D9F89F481632F937182C78E49D53D132260CFC3A80943E0FD169C6091FF4BBBBDEC35F4A31DDB61AFA087750D6CFCF86DAB13330125D60A2732E43A2AF3E47ABE4824C5B17DD747F267149A321ADA13409D51D4FC685ADA6789D5785FCA5EF199FD96A03879B4147C4936CC32DE864520C98DD55408CA8ED4AF1BE1F133ED53CA9FF58E6862D3E900AE66EEF75272B547BBC8919CE5503981684FEBA088F5E73BF272C820656CC9627FB4E4FC3A92A6B815CAC558B3257614AA9BB2CF2409D3633B6570EEF67A9343502D2B528078E561782917D977E6F76B13CD6526512D3D4C803BBB58E54EED5B4057EAF85DE83A7EC53FACBCA7E03EB7E027910C8DA25B75BE33B41C0C594DF6D781E821193963C9F658D380A460561B2F0C9C3D7639A4E4EE2DA87653DA86FAD6D5280857CEC28CC40D082C81C672D9B36CD169A6803ACA4C8DAAD77953B296FBAF480FA146F8B41DCBD487A368851A207C90228DBF7BAEEB38F23F98520E52145D809DB530D3E690C2A91B8367B815C4FFC0AE7171582169D6A7FD073A1F9DE1182FC98D1D5B3E39B44E054218B80091333D5B751C0530BADF4361C5A95CB26634AE788F7B6D2CCA543FDE48172A24E4D991F9262CFB8ED09FFE4E1506DA6478EF879847F8CE44569A9AC66E124CEE5944D2DC87742CA1B598B3C7D54662F8A5783A0C6689C949C54E148C2C88DFBA4F10F0234BA62E4DDEA30F5AD3D209829CCB73C22141D56050FB75E0E7D1B822F6FFC6AB92E8DB12A5C6B62064B692F8B118CC38F0436433B5370CE5A79D09A7081703EEA59F64B7361AA50476DD2F7074CA37C51935DCBC78A806F92C1186033070D5C3FABACAAE39CB7FBA0654D13413E94F6E9FDDB7D2D4EC1985CCF2E2011C186BD0C16AA95A0C7FDDF1B36490780EB646EEB7B0B377E970FD7D2E9A06
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: AES/CTR
-Source: NIST Special Publication 800-38A
-IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Plaintext: 6bc1bee22e409f96e93d7e117393172a ae2d8a571e03ac9c9eb76fac45af8e51 30c81c46a35ce411e5fbc1191a0a52ef f69f2445df4f9b17ad2b417be66c3710
-Comment: F.5.1 CTR-AES128.Encrypt
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: 874d6191b620e3261bef6864990db6ce 9806f66b7970fdff8617187bb9fffdff 5ae4df3edbd5d35e5b4f09020db03eab 1e031dda2fbe03d1792170a0f3009cee
-Test: Encrypt
-Comment: F.5.3 CTR-AES192.Encrypt
-Key: 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b
-Ciphertext: 1abc932417521ca24f2b0459fe7e6e0b 090339ec0aa6faefd5ccc2c6f4ce8e94 1e36b26bd1ebc670d1bd1d665620abf7 4f78a7f6d29809585a97daec58c6b050
-Test: Encrypt
-Comment: F.5.5 CTR-AES256.Encrypt
-Key: 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4
-Ciphertext: 601ec313775789a5b7a7f504bbf3d228 f443e3ca4d62b59aca84e990cacaf5c5 2b0930daa23de94ce87017ba2d84988d dfc9c58db67aada613c2dd08457941a6
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: AES/CTR
-Source: RFC 3686
-#Test Vector #1: Encrypting 16 octets using AES-CTR with 128-bit key
-Key          : AE 68 52 F8 12 10 67 CC 4B F7 A5 76 55 77 F3 9E
-Plaintext        : 53 69 6E 67 6C 65 20 62 6C 6F 63 6B 20 6D 73 67
-IV: 00 00 00 30 00 00 00 00 00 00 00 00 00 00 00 01
-Ciphertext       : E4 09 5D 4F B7 A7 B3 79 2D 61 75 A3 26 13 11 B8
-Test: Encrypt
-#Test Vector #2: Encrypting 32 octets using AES-CTR with 128-bit key
-Key          : 7E 24 06 78 17 FA E0 D7 43 D6 CE 1F 32 53 91 63
-Plaintext        : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
-IV: 00 6C B6 DB C0 54 3B 59 DA 48 D9 0B 00 00 00 01
-Ciphertext       : 51 04 A1 06 16 8A 72 D9 79 0D 41 EE 8E DA D3 88 EB 2E 1E FC 46 DA 57 C8 FC E6 30 DF 91 41 BE 28
-Test: Encrypt
-#Test Vector #3: Encrypting 36 octets using AES-CTR with 128-bit key
-Key          : 76 91 BE 03 5E 50 20 A8 AC 6E 61 85 29 F9 A0 DC
-Plaintext        : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23
-IV: 00 E0 01 7B 27 77 7F 3F 4A 17 86 F0 00 00 00 01
-Ciphertext       : C1 CF 48 A8 9F 2F FD D9 CF 46 52 E9 EF DB 72 D7 45 40 A4 2B DE 6D 78 36 D5 9A 5C EA AE F3 10 53 25 B2 07 2F
-Test: Encrypt
-#Test Vector #4: Encrypting 16 octets using AES-CTR with 192-bit key
-Key          : 16 AF 5B 14 5F C9 F5 79 C1 75 F9 3E 3B FB 0E ED 86 3D 06 CC FD B7 85 15
-Plaintext        : 53 69 6E 67 6C 65 20 62 6C 6F 63 6B 20 6D 73 67
-IV: 00 00 00 48 36 73 3C 14 7D 6D 93 CB 00 00 00 01
-Ciphertext       : 4B 55 38 4F E2 59 C9 C8 4E 79 35 A0 03 CB E9 28
-Test: Encrypt
-#Test Vector #5: Encrypting 32 octets using AES-CTR with 192-bit key
-Key          : 7C 5C B2 40 1B 3D C3 3C 19 E7 34 08 19 E0 F6 9C 67 8C 3D B8 E6 F6 A9 1A
-Plaintext        : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
-IV: 00 96 B0 3B 02 0C 6E AD C2 CB 50 0D 00 00 00 01
-Ciphertext       : 45 32 43 FC 60 9B 23 32 7E DF AA FA 71 31 CD 9F 84 90 70 1C 5A D4 A7 9C FC 1F E0 FF 42 F4 FB 00
-Test: Encrypt
-#Test Vector #6: Encrypting 36 octets using AES-CTR with 192-bit key
-Key          : 02 BF 39 1E E8 EC B1 59 B9 59 61 7B 09 65 27 9B F5 9B 60 A7 86 D3 E0 FE
-Plaintext        : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23
-IV: 00 07 BD FD 5C BD 60 27 8D CC 09 12 00 00 00 01
-Ciphertext       : 96 89 3F C5 5E 5C 72 2F 54 0B 7D D1 DD F7 E7 58 D2 88 BC 95 C6 91 65 88 45 36 C8 11 66 2F 21 88 AB EE 09 35
-Test: Encrypt
-#Test Vector #7: Encrypting 16 octets using AES-CTR with 256-bit key
-Key          : 77 6B EF F2 85 1D B0 6F 4C 8A 05 42 C8 69 6F 6C 6A 81 AF 1E EC 96 B4 D3 7F C1 D6 89 E6 C1 C1 04
-Plaintext        : 53 69 6E 67 6C 65 20 62 6C 6F 63 6B 20 6D 73 67
-IV: 00 00 00 60 DB 56 72 C9 7A A8 F0 B2 00 00 00 01
-Ciphertext       : 14 5A D0 1D BF 82 4E C7 56 08 63 DC 71 E3 E0 C0
-Test: Encrypt
-#Test Vector #8: Encrypting 32 octets using AES-CTR with 256-bit key
-Key          : F6 D6 6D 6B D5 2D 59 BB 07 96 36 58 79 EF F8 86 C6 6D D5 1A 5B 6A 99 74 4B 50 59 0C 87 A2 38 84
-Plaintext        : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
-IV: 00 FA AC 24 C1 58 5E F1 5A 43 D8 75 00 00 00 01
-Ciphertext       : F0 5E 23 1B 38 94 61 2C 49 EE 00 0B 80 4E B2 A9 B8 30 6B 50 8F 83 9D 6A 55 30 83 1D 93 44 AF 1C
-Test: Encrypt
-#Test Vector #9: Encrypting 36 octets using AES-CTR with 256-bit key
-Key          : FF 7A 61 7C E6 91 48 E4 F1 72 6E 2F 43 58 1D E2 AA 62 D9 F8 05 53 2E DF F1 EE D6 87 FB 54 15 3D
-Plaintext        : 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23
-IV: 00 1C C5 B7 51 A5 1D 70 A1 C1 11 48 00 00 00 01
-Ciphertext       : EB 6C 52 82 1D 0B BB F7 CE 75 94 46 2A CA 4F AA B4 07 DF 86 65 69 FD 07 F4 8C C0 B5 83 D6 07 1F 1E C0 E6 B8
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: AES/CTR
-Source: Generated by Crypto++ 5.6.1
-Comment: long test vector with odd length
-IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Plaintext: r11 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: ECE71ECD7A4E3C2F643B2B0BFBED32F31C8551B6306D52CF843EC0B85015DC203B1C0B643E2A6BABAF5133DA0EA06616076AA6BBB52ED75DC3A71A9A6E8AC7C9A00D2C39AA68BF4E6FFED9AAEE5AD6914FB3EA77C7B61FF6BF564F2F1225ACB4B5889CB1559888A5817849C382E168482F75381F63868C468E4D1583B1FE71DD808CB94D8150AAB9D530A0FC17CDE748E95545D8A033B2F61F1954D0C0226168022E1CD7E031C57D048AC560F152960F47705E174D956D4BB53AE80BFFCD1BD569ED8EFFA223C00558B702405F33E6E0EDB2D9B0C148A1441CC80D6ABBCE785AA1B9DAB7CB8832F1B12D2EE60EE2DFCA37942CA1724E5602B7B70525AC9662028A22DB234676615DB474538CBC8D197F38C88BCC4F9E8D207538CA18DE5F095420A2E4D5868CEBB8B34A9377DC52D119790B65210F1B346F5E00D9BD00A8847048913D80726B9B745D565E6284B986DBAEA997FFC5A0DE5051527D44B2C1266DBC9130A6EB15F37A0F00B6286D6678CA651C07743BD37F2E8F6A94F5ED8C63428AE4883A9695183807E104BC335C64FEAAC40A605913DF98FF44E0801B31A968CCE5DCAFADE1E017FA711E05FF5A54BFA1999C2C463F97A3A66B30211BD306C8911C98F8EE5EF47A54746A4D16B7C7424A6954B4FC3BCF1A41BDE8A19CE1027AE86A320D0E5E7D3C7E50CFD0C4665B811D86C313F09ADE5B4DBE017231859881E5873E9EDB2011CF5920D2F7277C4DE1AC430A1849F0B870A69ABE701B6D0B5123E5FF53395409177CF84BF41EC33C5E4BCC2CF29258DC7C260471AABDA49FDE62915758EE4E578D0F7698E6456BC144573739D5D508CC76B389359D2A0ECB5B7EE5FCB4C3151D5AF7C71819EA3DD5F36C7B27E551FD2373D07FFDC76A13FC4B10A6F29A83D6F465ACB6960671EACF21A3E1CB4411C4DAA0C2A87DAED28AEE60B7EC0258A9AF125F2DDC80B9877EFE0F372D9B832C786770A84EA1A07CB6E1A9907D651BBD0EFDEF2AFFC3
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/all.txt b/src-cryptopp/TestVectors/all.txt
deleted file mode 100644
index c30368e..0000000
--- a/src-cryptopp/TestVectors/all.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-AlgorithmType: FileList
-Name: all.txt collection
-Test: TestVectors/tea.txt
-Test: TestVectors/wake.txt
-Test: TestVectors/camellia.txt
-Test: TestVectors/shacal2.txt
-Test: TestVectors/ttmac.txt
-Test: TestVectors/whrlpool.txt
-Test: TestVectors/dlies.txt
-Test: TestVectors/dsa.txt
-Test: TestVectors/dsa_1363.txt
-Test: TestVectors/dsa_rfc6979.txt
-#Test: TestVectors/ecdsa_rfc6979.txt
-Test: TestVectors/esign.txt
-Test: TestVectors/hmac.txt
-Test: TestVectors/nr.txt
-Test: TestVectors/rsa_oaep.txt
-Test: TestVectors/rsa_pkcs1_1_5.txt
-Test: TestVectors/rsa_pss.txt
-Test: TestVectors/rw.txt
-Test: TestVectors/seal.txt
-Test: TestVectors/sha.txt
-Test: TestVectors/keccak.txt
-Test: TestVectors/sha3_fips_202.txt
-Test: TestVectors/panama.txt
-Test: TestVectors/aes.txt
-Test: TestVectors/salsa.txt
-Test: TestVectors/chacha.txt
-#Test: TestVectors/tls_chacha.txt
-Test: TestVectors/vmac.txt
-Test: TestVectors/sosemanuk.txt
-Test: TestVectors/ccm.txt
-Test: TestVectors/gcm.txt
-Test: TestVectors/cmac.txt
-Test: TestVectors/eax.txt
-Test: TestVectors/mars.txt
-Test: TestVectors/blake2s.txt
-Test: TestVectors/blake2b.txt
-Test: TestVectors/hkdf.txt
diff --git a/src-cryptopp/TestVectors/blake2.txt b/src-cryptopp/TestVectors/blake2.txt
deleted file mode 100644
index e98eddd..0000000
--- a/src-cryptopp/TestVectors/blake2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-AlgorithmType: FileList
-Name: blake2.txt collection
-Test: TestVectors/blake2s.txt
-Test: TestVectors/blake2b.txt
diff --git a/src-cryptopp/TestVectors/blake2b.txt b/src-cryptopp/TestVectors/blake2b.txt
deleted file mode 100644
index ec5167c..0000000
--- a/src-cryptopp/TestVectors/blake2b.txt
+++ /dev/null
@@ -1,439 +0,0 @@
-AlgorithmType: MessageDigest
-Name: BLAKE2b
-Source: blake2b-ref.c reference implementation
-Message: ""
-Digest: 786A02F742015903C6C6FD852552D272912F4740E15847618A86E217F71F5419D25E1031AFEE585313896444934EB04B903A685B1448B755D56F701AFE9BE2CE
-Test: Verify
-Message: "a"
-Digest: 333FCB4EE1AA7C115355EC66CEAC917C8BFD815BF7587D325AEC1864EDD24E34D5ABE2C6B1B5EE3FACE62FED78DBEF802F2A85CB91D455A8F5249D330853CB3C
-Test: Verify
-Message: "ab"
-Digest: B32C0573D242B3A987D8F66BD43266B7925CEFAB3A854950641A81EF6A3F4B97928443850545770F64ABAC2A75F18475653FA3D9A52C66A840DA3B8617AE9607
-Test: Verify
-Message: "abc"
-Digest: BA80A53F981C4D0D6A2797B69F12F6E94C212F14685AC4B74B12BB6FDBFFA2D17D87C5392AAB792DC252D5DE4533CC9518D38AA8DBF1925AB92386EDD4009923
-Test: Verify
-Message: "abcd"
-Digest: 26BC14024D5D6818AD7C4DEE519353C290E38B6535F16F62B6CE5C6FF346C354542496F89B84EACFFA1DA51F0AC5E643F965637CC24E0B3F819BDAE05F3932B0
-Test: Verify
-Message: "abcde"
-Digest: F3E89A60EC4B0B1854744984E421D22B82F181BD4601FB9B1726B2662DA61C29DFF09E75814ACB2639FD79E56616E55FC135F8476F0302B3DC8D44E082EB83A8
-Test: Verify
-Message: "abcdef"
-Digest: DDE410524E3569B303E494AA82A3AFB3E426F9DF24C1398E9FF87AAFBC2F5B7B3C1A4C9400409DE3B45D37A00E5EAE2A93CC9C4A108B00F05217D41A424D2B8A
-Test: Verify
-Message: "abcdefg"
-Digest: 81E659403D5BFD8AA7F8EF2BEAB97C4B866A27B0D1079D1D97E6915F65D6E947F4B2EFEA807C4568FA6E201DD79C4A82D6988C71B7CC4A9673575CB3A1CB2202
-Test: Verify
-Message: "abcdefgh"
-Digest: 38C0459C34120A885AE5EF9352AEF704E5372999BBE5606745018B15E7EE2B6C0FDE8C7DE2146E2AC59FA6CB678C2115AC8ED9EF495D88BB7E2A00595015F505
-Test: Verify
-Message: "abcdefghi"
-Digest: FBB24D21E0FCB6223CB5F9DDE56080A5C737EC0DF3A8A2FC70CCDD64BAC5807C736B378CA0EAB12605BC982B25692F03023379ED9BC6F7294138257239F3105D
-Test: Verify
-Message: "abcdefghij"
-Digest: 37EAD488933178900E12358D2B46A083C2E559DBCE6B13FD77B0F56A0BA46C44BB75884D0D723D3249817FBAB17618C7C8894F3BFA77BF66C3D5EBA1CB9C5B84
-Test: Verify
-Message: "abcdefghijk"
-Digest: CCB6EEDBB75795BB7634F8698414577E0735BE8793664597630DABCBB67EE8E16519A7C62F57E5D023D3F013813ED8087807D5AA9FA485214B39611401910CEB
-Test: Verify
-Message: "abcdefghijkl"
-Digest: 14EC8A81A970A583109B2056B4459BDCD7159EEB609F507383E818FF317817A311C41F5C2138F44D19C1777B7AFDFAA48F598D44D7B19D270A5E5AB6879381FC
-Test: Verify
-Message: "abcdefghijklm"
-Digest: C56890954FA3EE20DFE17E21537619BA39D6F2E6F60D40791D0FD8F09EAD7BBB47C97EE9196C5D6F660FFA3172A8FDDF088E481DFB359B291E09EEDE98E9D37F
-Test: Verify
-Message: "abcdefghijklmn"
-Digest: 8E5015F3488ABDE0AAEC69D7A549BCA3BEDC82E7244911225CB7B774EBCB43AA35233D79A4BE18FD047DEEDD727ABDFB369017CA1CF502B0C347F14FE10DD330
-Test: Verify
-Message: "abcdefghijklmno"
-Digest: A3642E93DCF251FB21E6E889631317A65CB5A21A444D2C0438B5022E3C8E755FDB4CD94D1B7490AD88C460A6E4B86502EE23C2AC045BDDBAD5BDC603C7ACC85F
-Test: Verify
-Message: "abcdefghijklmnop"
-Digest: 4A79717B74A9DB90C258DEDC77767072243F08C841F58CFB310BB881EE2481578CA56F20D9810E3F3833EF3A8AC26C7F31D17EFDFEAB5737BEEA6C8AC253C10B
-Test: Verify
-Message: "abcdefghijklmnopq"
-Digest: DBE8C0C6CF9C54CA6DB23BE0EA639D1E7551FB6F24F46ACD77ACDBA2D7AAFF29959C02150AF6118D1FCAECF1CFA947B0FE0AB2F84363CC770B5E6EA3B87BECCD
-Test: Verify
-Message: "abcdefghijklmnopqr"
-Digest: 5B6468313FC3878000C617E6CB25BB7008654E854E0C7159BE90EECA6AB2D6D008845BBF902CA626ECF37AA9ED8CCB99E1C6BE4F0DD719798A52886ED63D4965
-Test: Verify
-Message: "abcdefghijklmnopqrs"
-Digest: F5D82AC07F8BB7364295036A91A3AC81B8C4C7640C05BA2374D8C7B6EB6D3BA2E76197B3E6496695A2C41A4C70B0C204210F7D7C98D41C6928C8D4E51C4546A7
-Test: Verify
-Message: "abcdefghijklmnopqrst"
-Digest: 2917FDC9570F09EBFD58455D293606D7DEB9580E364DA63FE6F42F701B768842C4CFCDAFE830FF08C40BF1C016B250329C41F40CE84B675B21D15C4C1E6339E2
-Test: Verify
-Message: "abcdefghijklmnopqrstu"
-Digest: F64C187D18BE654A8E747C2AA5A6C6ABB2118E122AED919A3F6DC9543438CD5780263BE63DF897D30AADA99D06DD1B7A9F7FD55DDD720A586F1577A2B47EB6CF
-Test: Verify
-Message: "abcdefghijklmnopqrstuv"
-Digest: C40A1C781C90A7C398BD875876C5FF41CE9932C63E1AB170902146A3C238E7624E5AC9917CA6032D924CC2CFB67D6F1C7838B8A30F26E649E0D9F44B14921583
-Test: Verify
-Message: "abcdefghijklmnopqrstuvw"
-Digest: ADCF991AADC33D407AA1CE56C502C8A94D52A1B2D8E009352793586EF929E7CB3525198EF615F5C577EA209BFA412FFB935EEB5396540FE3F92789E0F1CD18A9
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwx"
-Digest: 4038868236514AAAF248E8E1B4514A5CC455AC564EB8A2ADFAC374165BC21B5A3B858B82F19265E4D4DEF9DDDE8CDE73125CC2275140FF422FFEB202FAB673A6
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxy"
-Digest: 2A9375011C21ED2D135710042879D7F98CDD8B4BABEEB4DE240002BEA2D60B3AE12F5AAD85961EBBA1C08E6DF8AAEFDAB4682B335217F1F495BB0207FE5795A2
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz"
-Digest: C68EDE143E416EB7B4AAAE0D8E48E55DD529EAFED10B1DF1A61416953A2B0A5666C761E7D412E6709E31FFE221B7A7A73908CB95A4D120B8B090A87D1FBEDB4C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0"
-Digest: 42402C0D13BC383B0F98F6BC56AAE9E06CA24FE23B17F3A2A0402655CCA23BD9A021AE5F10A60824112F991D5D437D8F561A6E3DC038DC7385C702D508AE4186
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz01"
-Digest: 593DFF41661E381FB6B810ADED308F709FFA3CABB57BCB71CFA1CB266FCF650F559CC72700DBCD0C25CD819F6459EED914DE3373C2A109B0E1D2CCC237036D9B
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz012"
-Digest: C5ED16003CB947DE5AA7B8BEF9053E7EC7BD8673A794C404D05D0B3606247E71EEB19AB2DC8149A4DB8012FB8DCAED5E3BF00D66AAA4344BB24D836F7C74E564
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123"
-Digest: FC5519D304D019DA455184E4A95C515C464F5504BC0972EBAD3404CB2DE8EA03C06127D4D6A829AB3E7651E5980D615BF0261846CD3EB0849F8AC2C1B5DF17A0
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz01234"
-Digest: 0F89D344530BF74C7BD94F8B80855D7AC96757BFC242243F84ED749618239C2CA95E8A5EF3AC6124DB03767960F8BCA848BE9197BF485314AF298ABDB3878B95
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz012345"
-Digest: 06772ACBA1C9273B84569D2544BAA0F5DB8B70C4DB82FC8B32D848F73F5813C25A8FE579F71D0C336E58947466BF2050C794A4394084B5D703047FC9E5EC8D33
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456"
-Digest: 21023A54D7EF221EFAFABE5E2896C4B5F39AFB04D257133831BCE5F28EB6F13613E0332B5CB8EF2719E7FB68A0A12637A1F9EB8396F156736E31FB5453B3119D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz01234567"
-Digest: 9EB0B80E475625EF7E887655AB7180EFCD4FCF29F5CEFD68886DF4BAD52C535454BF2A1B2D83AB2C17446E4D8A16107553EC1B09AF02179B0AAD26DD1416A89C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz012345678"
-Digest: 050EF9C5107E4608C961D0E2DCB58743163C83BE2B9A74FF6AB9AE878BC392538F2F813CB7C82C682D2BA1D2E4C566D6D2F5F2D4B4732A4B10EDB5345DF6F3FA
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789"
-Digest: 79F266FD703648FF1CFED83C4D90D2D2D9E1A3588508ED79AC85C392C38116A904A4F14EBBDAFC86812305A14FFDEC2F52766839E804099D7FA8417987D6DC25
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789a"
-Digest: 39A781F638261F51FC526181DA3CD15D1C1A412C5786DC1F935DEA2EA9408011DAC52EDFF5E2A7C6225460A291174B2679AE11933ECA208E4C621FFA1A33281C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789ab"
-Digest: BD0CA0469633B20ADF20B572A0B5BE41CF187839A78288FEA4CF497BCCA035C9A2620198C6894106445B7E029C5BBAB2C5C4D6C930FF903476E9E1838A272766
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abc"
-Digest: 24F1DEDA7B41F6CCE05A39EC50A1625596D7CD0CCCAAD2CE14A7497BADDFA133A23E9EF4347986B75BBFA60CC4C90E734FFE1022FD0B94673117D48B0DD2E3C8
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcd"
-Digest: 72434DA63784E80B16C88102D29D07C699A8CCEF62730F1432B97961C80A56EB372E3E1CCFC09F1CD6813BB3D9844367757F13A7669A563527CA050A62D9E670
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcde"
-Digest: D2D1FF188978F7D2A34113AA3D8AFA0CA0609CF0CB0B3DCF1C2F615131444B0AF8719BC5C2321F98F331CD84E88A7D4B2A68B4FD978E64073540A4700B0B2D9D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdef"
-Digest: 1532EF45EB0AE7BD3F988B70BC12A1F9EFF29A0FFD0A2AF4BEDAFA21A285A8F79EE6EA6388E7E6A18EA9895470DA59C9889EBE29C1D3D1BF0F7F171F693FCCDD
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefg"
-Digest: 2D52687CBAB0D1CCB657D5538CC5881298F21DA1AA2F138FE5CBD3EDAC8FE2EDB498B0EC36707F25DD594C97CA6BDA436F366DC93454363BE0905F7522565248
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefgh"
-Digest: E8C085BC7755296CD80E9B463C5D063A9D339E314062EDCC1C74E2D39CC6410A8B00E39CFCA476233A3DBD53C385810475B7AC0E6F1A28629D73A3215B7A6E4F
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghi"
-Digest: 912904613781F9F0609AA9772B8D9F717CFE69248CA32C4D900B284BC0972C55D41468836F5C75CAD28766DA931175D877F7D2EFEF41854879F2489EA6775E70
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghij"
-Digest: 1BD34DD552071451831B9006C8181846EB6E530C5E316E0FCBB476439D41934A2A863DB59ACD29799A66A50662A7CB00DB41E3A64F1FCF79F84D9DECB92B50B8
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijk"
-Digest: EA3D8A5D28D1336C85FE46BECBAEE1D28FFF2932AFB694C7ED08F21C31D0AEBA182DE0A26953F76756D81AB45C77CD658EB95581E8B9737F0AFF36311E43786D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijkl"
-Digest: 91CBB398DD520BA68A735BCDB47E65E3A992706C9766AE2AA09740F44C09B53AC27C482FE7E0D454FF94B3AA392BA11DF6E8A28EB3A5E46E73D8ED99464813AC
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklm"
-Digest: 3B6A66E761DE5A29FEDA3D69E425F3CF9E2FBECC1DB3BB2F44B8BD2DD15A958C9AAE673ED82D993A0146C6AA83D900DB8E3929AE2AEAC247B7FE58D9D4EDA7C1
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmn"
-Digest: 8A5FF4679EC01E08C666AFF35716009DD21769A0C5185F428E52C2BF0D11E1F05FD1ED5E3A541A10DAED05D34E406C8D0F45F5F79C84C2BB8D3F998A66B40F77
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmno"
-Digest: 44514745D4360AC227A23F666C00C6554D5B556676752061D4CA6A28A6AEDB4EA83C4BBE48980FA359D7271491E185C50F1FBEFA4EFFE51C33B45CD254880543
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnop"
-Digest: AA0767179F065722816431456A438045E4B0975B0235C86D53F66F04CC521548CC44898055824E6C1CD17BA080AC693FAAED746D2FC8A89D5F38EB4EAE687ECB
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopq"
-Digest: B3C95BB063162F047356C431ABC675B0332D6C1A5C28D4304C2DFD4E10B712E3D28B5F1A0FA005E93AEF8892BA4B1EC21E8E4DB990444392DA24B08E09D958B2
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqr"
-Digest: A97E356EDEB533232E85143162BF539125845B7D39E088DC7D2FCFFDCA256F683D52AE8F403AB030725A820638F17DC1B960BFF389401A07A21FF991E43D4F25
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrs"
-Digest: A30E60A2A4B37430656682F97C6BDCE5A6DBCDD5D0312000A8B6F9437D394F1AA58F0936700220EEC370A0322DB934223E088F8DF05597EA4E0575D61B13C094
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrst"
-Digest: C7E8EC8F350E9296FA6F3650042C432D4F72D73CAAA7C6765F81D73F8580DEB7C7010828FDC0382480B0111C6429E953B26C5FAA66EC9EB13E47B960F37038FB
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstu"
-Digest: 891D5B36BDC496FFEE1CFF284804F883F9CE24D0BC208E70DECFD7F8B7DA2894450AA7CC16FB17A305FDA9B12E41DECE95BC33EE383DAF896A03023CEEDF3477
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuv"
-Digest: 0207452CE26960B4984C9B962BC68498734AAA832A1B3BC7A70064040A6E4C08FE951C3FFCBA5FE8AFDB32B875B5970C0465BC05A8C7F94AA1DE061E4688A45C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvw"
-Digest: DC92B92580A8EB8452B6CFA693D0424580BA3CEB631C8ADD390495ACF6AF4AF5E7F7FD7215B7FD1E26C8BB0EABA09A0E9DDE964927EC458B34B89D7E554F890E
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwx"
-Digest: A7F21EBDAE7CD6A8905A3A2AC39B86657A74B211FC0A056AA54457654CECBCBB50CB56293C48BA09AAED41BCC9AE3FA1710D17B976BD021C90E3162A125AAD98
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxy"
-Digest: C5F0B0A3D2CC1783E4FFB98D88B75D5E0E7292A042C0105FD48F59EB72E8A022671048238292037584E1DBD5EB2CBCEA631829E5B2B0CCEB3D576E2CDCCA6C1C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz"
-Digest: 719CB49641189CE476322171431A61037955FF180057806A4D536CBAC0E4922B1990B8FD22D26894A61298AB6DF59518B872F97752EC83285C1783577EBDADB1
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0"
-Digest: 1E9A5678DE8721EA74DFB4CA41CDDB8F2DD8C0DBA308C434B7709CEE6D789F4D43C516250AB85BDA9A1C04939D7B55B2407129CA340DA070CEBD04C5B2C7F869
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01"
-Digest: B3EC90EF034F75DC6494ABA71B2147F5A00DCDAAEECAAEEC382B6B43FD3FE1AAF9DFAD265CCB33F3CCBC9D9F1DC1176BAC14CA4C97B1A9D8426AD3AF19157F31
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012"
-Digest: B66FAAD26B6EB6D67AD84F82D39AFFED49777599501C628D45EFD07075A16922097C4FB4ED3ED60EBA3933F7BB414D63C0907F3A055858B323E59678605C8221
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123"
-Digest: 041C69DCCCC228BBEB9D6BD2DA388A3467B80DD5DA41050F68D900065FCDD238A768BB30E2ECBF1DF6CF79F4F67482942F16E66894A7AA21D652F418D91C0AC0
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01234"
-Digest: 023947F7ED12586F20DB3AF3E9EEC296081A578C838AA92C0290012D3F2A23D2910F27A150BA79935315CCD3D2E4F76835741ED0DE88700CEFB3071E6DDE5E55
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012345"
-Digest: C9A15E010026F792408297D959CA7B66BCF209D639BA3890366B561F1FABAD6CF60A109B0322560BB0D3E9C841782FF7708D5B0CAE6D6E3EDADCBD7CEC54C72D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456"
-Digest: AD14E33C9F46ADC33DB5AC711B3566A0B9D68FC0051A938FF5C55AE61BE3CD507726BEDC71A4F9159826F3C4171F8CC25C36CCD887F4D4EA7CA75E0923FD403E
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01234567"
-Digest: 0D2B6DC78385A72681953C17635D10AA7DA55660EEF4F033354CF605D69407DEDCA665FB91A25A5015AF2AD19C6F0B7B47991465365C57D7D4ACB505CBC38E6D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012345678"
-Digest: 37EB568A932947E9D8B908134F6D36D5E8A07D3C29FD7EAEB68D922ACE110B4EBDFA8BC7698D966CDDFC15262A21FD97F7871F35E52E1ED6E4D4C26A9423EFE1
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789"
-Digest: 2729344A595C4CEBCB523568CADEBF7D8743A0B419F216A61F2119A3379DFCCC39BC4652E9CBBD70A1BF499CC909313F12D6C3EADB0DFD8FCE3BED94EBA2B4F8
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789a"
-Digest: 3F04ED5D49C17820E66995065FA2C9289DD3F6DA105A188C7DBAC7BBB84D839B3A53E1F50DFA32BD3E3904A28482757FBEBFD192C74E055508047413EB1D637E
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab"
-Digest: AF436523CDF2205B20D2A07CA9F5BD5BAC76325C8008B2D7B18FB140F56FBB104178534768A75BEE7845E1036ABA5DB2556BB6B8A7933CB98F73E4F167B23DCA
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abc"
-Digest: FEF284632004F6C0AB83DCB83F98D573BF61F04349F3C5CCEA4A8B52923CF308CA404BEEB0F0847D1CF4F62AF01EECD6648E2FDEDCD6C927250CED1394F5EE99
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcd"
-Digest: 1111417618B661B97630D55333AE65AFB6B5DEADF13FE357D313D2D9AFC92BD0F8183C14DDAA262959613F85A57A379A76093B617ECB72A3842BF8D17FDB691C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcde"
-Digest: 97CB1FFEB0D3336427EEF440B2494FB2D0A92CE1B86E86D721C0B96B865E3D7832DCE3328223907ED0675475E135D087D2E494234BA679E71C2F2A74CBC5A2F7
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdef"
-Digest: 4EE9CC4B52C1AD8B7E190C5ACE1A5975B3A8F6C9661519DC9B3029BDBA6EA4294A6E71174273811688C9A4F3647DA83742D4FCBF041820184473CEFE51E94CE1
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefg"
-Digest: D5B08BF6F0AC497BCD9CA4F8B638352B9431F79AD4A26E85587D286CD5BB4D915B3287F81F025905540D584A868D199F7DB1F1CA75B6BC3D475BDF042E611CF6
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefgh"
-Digest: 81A6475811D2E17A1C2F2500D0D1EFB3481C5FFEF635568D4B0D7F538DB48B3BBD976BD21646A5DA3A4AFC2508EA7A46A73F64DBAF7472FC80094673DA89FA5B
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghi"
-Digest: 92FFA9D0DD341A1A29535BF3B775EFDFFFF36B31CC14E5DE74A93AA12F2C89ACE38E0DC8516E0F7245E410BC8B8C903B0109F57AF5FA01D941354ADC7E0CC2B1
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghij"
-Digest: 2F9A94362D7E83E81C84AB2311F43D0ECCD46D8805EF5ADB2D639A1EF68268B39069D5FB174F5978E5416F0A183BA9F5E0C431890CC689D6F9CFB1B2B6DF535D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijk"
-Digest: E4F10AEE15613631FBE2A10C812A7D1AF3D0988A555BF7AF282F0E6A1AB9E1EC98C594D600E54430898A5E625A9265B92D67B7B515F58585546E3C33A87EAFBD
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijkl"
-Digest: F185EE402517BE76540B735618B5F02E0ACC4A484E2CA785442B3DBC228711A8ABF1A18C1216B32928A0D0384012D22BDA09EE62EA4B4BF9233D6271E043ACEF
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklm"
-Digest: EDBB843A233F6FA3D591137FCCD44E92043FF03A82D26C9C0431CB2B63DD27AA2D6A7826C42F58B4D2DBF1EA2243B8357187DF72C9ABEF0F5A154AE4D64EEC86
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmn"
-Digest: C6165A33D4D0C32FCC01F7004BA28EB084EA9B99DF22B44DE26F9EE9AA07D2A37DC5295AC0B4257BBEEE67D3DD42009A52ABF0DEABC4C807658A64B817299047
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmno"
-Digest: 3D342D9E50D81170573804F5635298082AD0734CC58BCA2D12723DE5A41EC057D69B0D44F8C2346CA5B56C10E4A5D0C68C3BD7D1A9A1C4C3F99CC37562AD4DA0
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnop"
-Digest: 787FD5E609BAB1E86B4AFD86A66C10DE238E066D19E56C7F759E134F14F8A9143F472D9A9EC91378B3654334A703292F8E2C55B41963D408EFA9DC876D0C64EC
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopq"
-Digest: D438DA0C3BC39CE1A331029EF6EF1C30B8CD31BF18359F89E5E0D2217CBA202C2F51C911B96B7AF400B3CD34FBAD40C0EA325F8DE5ADC699C4A46D2BABC0551D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqr"
-Digest: 1304AB08A91B92A5E059B6531D21F67F8395EB6573D18EDD6D5A083AB8575319219900E22999D0B8631C2416A9311A9A509C80D43C20ED8982F92B0AC7550007
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrs"
-Digest: 5D343971F3A9EE13E36269C02227938C9CAC9224456F97F931D53AA174B9740980E056F8FAA06E7F236814CC6FB8B6611D95576CB37E2C82C81740DC763053A8
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrst"
-Digest: 5DCFC07EE8E414EC397C5042284CB8C43F03DCF538E1C9528E91E1DCD5E4ADB131003A8340A20E41DBB02E549C594B2DCAE44DD7F6B6C541EF5EF1011E7A6826
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstu"
-Digest: A006A585C5338C926AE7739C5CE71BEA8F3ABF79B845C3049C9F5970E83017CB71948632B357B9DE26B56D1B1B4441B9FA7F248C48C2DBDD3FD19F3F9F958B72
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuv"
-Digest: FAB0AB0D082C627BF1759138B8DA4B1D7B0979C7FDC7287F6E197804AA47DC4C8B67E6CCBBBE3CD6D2E9ED4093C1A78008FFB922A383ECF7F1157194856C54A7
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvw"
-Digest: 23925BF38898621E46C53A98B0896F7BF81F203B45EA1A5420C916D9FB0CE916BD43AF2369C1FEF0D90B211318E0A4C33D58FC7A93DD0B99C0333324A99B482A
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwx"
-Digest: 6554E96DE27376C7C26BED61BF88F49D062ECF099D56F60626434F71F044232001B878A7EDFE286BC656640CDD845B8CB9AB48CB111D1BB8343192B1350498DC
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxy"
-Digest: 4F6FBFE42D2A472356DE34621C2182A455BAE3C0D1F518439CE8882E193ECB829CB7BD3E49C7D248F6AFE8B92E4E61A6AC70F24E43EEB6B128290532C87B99B2
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz"
-Digest: 486E93B4FDFEB93209469CB39FFFC8BBC71CC0024BDF54C61660BCACE500D52D5EDA1766424551AE64299638DB8981C654FD296188176023CADBD4B886CBBE45
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0"
-Digest: 85E359B3E52A18D7FC3C2CB7B4CB22577CB25360C4F49F70FB26F321EE23A9F5DDEFBA305B15AF8F9A0B9C24E5E27AE22CEF216DE09F5B54D85B9711B898456A
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01"
-Digest: 875C4BE266D800847A5A014F2842B70FB816DA7B8CE77D2438D0F4B8767FFF1853432161DC19C20F7B553461F1BFDB20B272F37137B5633C79E5662BE101D474
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012"
-Digest: 4645876AEBB575C56B601D1C6C986AF7EA7362536BFC676F360FB7DAA1B336B1309D87FB0446B2CA925EE40D66AB6EF15389FA2EA844983B8FA0B3B7B8BF5F6A
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123"
-Digest: AC9A9B49FAF6B4C2063ADDD05B5661EECE2345B33C2FFEEF3EDBDA60CE9675FE1C36410625EB0B64863C0D87D1E27670D0FE0C9708D7B0693A14CE75EF3DD9D6
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01234"
-Digest: 7CCF6B53555E615303CE92DF668E501C69B922E680BFF26896087883A6E58E016734F0581968215AA13F19806AD3359254EBBCCAD21A93EA0B75871A4035EBE8
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012345"
-Digest: D323DC3CD03C1F229C69B67E5FC87125525D8A815089E8F455C17AD8417173167D69D25B840D877255599469704DDD2B2F34DD1D888C9F85AEC2A69C7EF63A5B
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456"
-Digest: 7246CF8442726FC1A2B0ED8EB9DAE1CBDF8413F08B559C04FD176C1B63A70F31ACF91574AACF48C07CFCE7BE8799CD6DBA0238EB09373802251D26AFD49B80A8
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01234567"
-Digest: ABCAF5BDDA52EE677A995298E3E723D909F9C0EDBB977E71160DF2EA6EE2A49D438BF8A9EB8EAEAEA6483D5CAE35BEDB987CE83DDBFEE225BF60867510A0D9A7
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012345678"
-Digest: 46A0BA436534FFF482791732C21334262C238F5268FB16E93D266735463A435294AE08561F8637167945181095647BE73A545C9A53A4DF840202C1CAEC2E2982
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789"
-Digest: 8AEE4B3C7A179BDC818083479F5D24DD3B8FEE8954569A5DDC75FFD2ACC16EF1EE82CE99A03EC0761332183674E02928FD9534E2D5EAAA5704732BEB5883328F
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789a"
-Digest: 6A4666B9B672CAA3E5C18E7DC5394F39836946C46F3CD2703B826E93E4C93257D7756BDEB574A46AF37339F6E641D5AD6B629D69D4DCF7FC2FB0DDADD1687462
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789ab"
-Digest: C6EA4D9CA7F7A837F1909ED2E57833559E0AAABA45343089B127363521CFBBB87BFEC5C1FEB6E0A89961C2B87D0D215AF9C462D272F3C29B9803484E15C17FB2
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abc"
-Digest: 05C1C2B330F46120C30252742D44FB987669D16E9960FFBC401CDC83B17C888C8FEE52C63BC8A5E9BAB74FA79AC2002C149D6423604171805527112780F8D72F
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcd"
-Digest: 58A19F64D5064E0B6C652E7958BE1341F5A1329BA0893AB874EF7DAD12547E2BB6BE5D4CA88CD09331CE1A5DC26264651DA17E72804D84C2EC554E9AB0C2740F
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcde"
-Digest: CE22689FFE93D2D915BD2649AF7B86B021E28C400703DDC64B5E6328E61D3092D76AA6650145CEABF690C8A9FE06F548B87C805DD27CE008774D729B2EB3642E
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdef"
-Digest: 9A4DCE0DA5D980C240CA656B7BC56BB9FDB1F129301F651BB1CDC8DF52D796A262E895E5F7AD94F0F0FD669037B905A548EB455259890793BEB9257376FDE721
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefg"
-Digest: 14A9584DC68604492B2CB36BC64E8EC979DAD79C2984A79671650A56E94CEBB1E62E011F156C1C8E3227A4112F60835481AC9FDD3DA1FF2BCCE44DF0BA9077AD
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefgh"
-Digest: 5E2E899E96F5F7C6552962814F8CCBF3212BBE26D53460EB8F45070057E2591DC423B06ED1E310050B87AA67CFE6F08C1467A5B6DE0C657FF192BD2C42F7F693
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghi"
-Digest: 71D7D9EC215E8CF315586A09C27C74C4F9F181C463C85D6322C81B94DD3BD99DD4B56DBF704E06A18DCD10F746DE11026561C62AD78B06DD75B2FC133E05434F
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghij"
-Digest: D48D8D027EBAF467F1699436E499C8BFFB7A4CC226BDB32B160E7805EC0CC7C40679082724CB415CDFE1E69476447AF713C7A76D27F84CAE883FF013F30BB662
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijk"
-Digest: 3C173D59129EA8D95E2B2B930A7BEA1C6FF70485670DBDC96C1C3CB3C80F30012A7445BA50500AE19D33B1FED36AB6B09DD51BE0E49D7C24CE33617936F29FB6
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijkl"
-Digest: E3F25835007FF59A7E00062437C0D8AE8E552ED7F0AB997CB3B408DE2DB07F2C4B45FE90B809BAFADF83EF238E4660D552E0B2D75388A5ED6AF66779FEE8A565
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklm"
-Digest: C2DB6F8A9C5EA27BFAD7E83B8AC8F9BA64EB483C2D77557CAC3D33768B6E94CEEDC6B2827B9A7ABA97103053B5F06BA6785E0E47C4FD6BC158C3A3ECF1A3DADF
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmn"
-Digest: 64514B485B3E350CA33DF1F790E98C7484A89DF3C15D2B8E4811C266066172953545A03E4C26B091D9D79F2183F0973FACF006B04C8613A3DE272931E643F3AA
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmno"
-Digest: 57736713856887FD4575CD20D960B204E36B59163CC9EC896590A1D6A12BE406F1312A7489C21E4E42EBE1B035F192B740583E651803390C1540BC4012F3FF11
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnop"
-Digest: 2FFFB2751A94EB2B2B2B488EED9C12658B92FA679B72304C08B81C96A815D2A0A0258CE7D027CFDD8A2DFD58B15184F4F5EFC7090139E785AE63BB7F583DA02C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopq"
-Digest: 7161516AD571229F966AD78CFEF7A134495CADC77DC2112836D8A0CE6408DF5338E92923F30418473537125BE78211E36F4078F5493463F12285FB5FC0ECB3AE
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqr"
-Digest: E430F674D54D07665BF0EF2B1B4D65500C5E289785801D4F23247ADA7EA8836956B287A691BB76838E3CADC286CF04D7F56E4049623589DB84C5ED9C85A2978E
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrs"
-Digest: E22319E5E2C94D7D837FC59F175586ED11628AEEDF2F1B66F26AB7CCCE6382CC7706EAF8147D502286FC3E9E178883DD5A84123F8885AF65D628311DC25255C9
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrst"
-Digest: 72CDE85B5599CE143069E14C30B2DBA31394747331AB4226B012E09431073DB953794DF50E26F43E4AB4B6BF351AC37BCEFA8CAAE142CAAFAC1EA516D2C4D7AC
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstu"
-Digest: C4B9BD6D28B107484C8F90B14497B2D906512747785525D7C3433345E263B913784FFA5C53C9E97174400296077AC8E22AC51B4921E1F0DD2C14A96F0BF41568
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuv"
-Digest: 7C1C18EA68298994E67E9AD3F57FCB56B1BBB47CE95D4EA7D52D3B54E5B0754A97A0C482FA61AC979E34F130C29C46431BEF479B8D1B07714A4BEAC63D3E9BDF
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvw"
-Digest: 99E78C57E98E8253683F4883A4E3837E89DF87DE5FFC45BAB612F51DBFA311E8CABEF43E546227B65F50B5E36CFB9C02611776EE4C6FC67CEB12817DFB166B8D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwx"
-Digest: 16546C58150F45302E1F8DA602A4DD08DE5DA8B92141F21236A8182BBE4FE0CE44A701589CD9F9830010C74C49E32C954C6E09FE5B8830E240D511E1B7FF7406
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxy"
-Digest: EDB0D348F2BE67BA09BC69D947B03A5B370550200A303801D88946E9DF2B31E874EF96E4926B7A13BF67148F78B8030575997999EBAA1F506382613A4FDD6E39
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz"
-Digest: 29180A1CA2537C9BC4CC0D35968184D1E3404F73D309972D44CDC01F99BC394998479FDD134FD894D675599F8B676AC4F3AC54710537ECE351D1A18E59DB9377
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0"
-Digest: 20C8A452A9C03D942E063C7C9AFD13992D8272BA505F67FAEEF38526B9FAB07FD1D5BCDDAE29F284C5E7FD8FF0442DE70DF1B9381C2C7E2DD080D6163B4C51F9
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01"
-Digest: 45854F7D639522DBE213FA85A270DD4F222F3CFD86DC9FD856ED5BBD9FE4DE6A8F7039CE10196098532BA94D11DD2A8B9A637DD4F6C87F26F95F2204EDA232C3
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012"
-Digest: FC5675E464D2306720D2AACB7C6E303DB3BD9FBCCAC340F28E16F319DD716040EAA56C063AEFF60A5E22AD08ACE5CD9B1564716701E54EE6E8508EA68BE1B7D3
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123"
-Digest: 06BB967C6EB7C906D47AC24696ADF4010929B6E81D867FF16AD15470DDF5C94E230B62E7DC2F9CCA0C9D24662488EBEC8E1224FB4C6B2AF776790F26CADCCBBD
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01234"
-Digest: 8FC8E13C60129A89FB2671EAF34CE7118AB1C4FE6B143F9EA7C9322C8F25DE82AE8B8C366CBFFC6F7E65F41984DB2195E4FBD2D26AD4D4E764DFE3D10342BDC8
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012345"
-Digest: 3B731F6A35A9893CDEACF4B566F7F3754D8121C6FBCEC3265DA5F05BDA996B9BF926ABC5C82B975EEA0E6214BC6F6524F2AD957F0BB6A22E57E9FC34626B714B
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456"
-Digest: A8A3A00854DF5FE036D27354042649F9D5ED4B01FBD7E77B37A4FFB7CCB0297555E01B109FE2E52ABA557523AC3D6821D8212C84DB987DA60A44EFFF6BD575C4
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01234567"
-Digest: 77E04F3DCE600C16C3EF85C6674DBCB32F4DD340AD7705384E2AD909899BE2649106661769265750B5556CCF685C2C9E257189C7477E70D0E94157129E0E1C9B
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012345678"
-Digest: 9068DA2BA75655FC6818E2CB565B9E3688FFC6C22DD83FDEDA60012FD78C899B0063A57C8D948F3D5EA442441EF92AE5D3A0E7B71B04C6B0683C758ABBA5C514
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789"
-Digest: FFD4A61F80D55FFA83BA8D2BD62DCFC33148ADE507A8F7F85A5AF2C619E126FF11E9284F12BF3EE6A2B5CBC711FA84C37DA343AB7D29BCDF722DF0171E41297A
-Test: Verify
-
diff --git a/src-cryptopp/TestVectors/blake2s.txt b/src-cryptopp/TestVectors/blake2s.txt
deleted file mode 100644
index 241ca06..0000000
--- a/src-cryptopp/TestVectors/blake2s.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-AlgorithmType: MessageDigest
-Name: BLAKE2s
-Source: blake2s-ref.c reference implementation
-Message: ""
-Digest: 69217A3079908094E11121D042354A7C1F55B6482CA1A51E1B250DFD1ED0EEF9
-Test: Verify
-Message: "a"
-Digest: 4A0D129873403037C2CD9B9048203687F6233FB6738956E0349BD4320FEC3E90
-Test: Verify
-Message: "ab"
-Digest: 19C3EBEED2EE90063CB5A8A4DD700ED7E5852DFC6108C84FAC85888682A18F0E
-Test: Verify
-Message: "abc"
-Digest: 508C5E8C327C14E2E1A72BA34EEB452F37458B209ED63A294D999B4C86675982
-Test: Verify
-Message: "abcd"
-Digest: 716748CCE97A0ABC942E1D491BC25102F5B6FF71EE62A86ABD605A6C40120169
-Test: Verify
-Message: "abcde"
-Digest: 4BD7246C13721CC5B96F045BE71D49D5C82535332C6903771AFE9EF7B772136F
-Test: Verify
-Message: "abcdef"
-Digest: 267E4443FC1A38879FEB1090AF1E788956DFD93204CDDCBA818D6E32EE57F335
-Test: Verify
-Message: "abcdefg"
-Digest: 4468A2B5329224C54C243D4FAE24CDF050A27A563480F4AF5FEDD4446D8C4A04
-Test: Verify
-Message: "abcdefgh"
-Digest: DA651C965D6B93CA7611C9E996FB8C15A250B35206D13763FF3D53851EEF55F9
-Test: Verify
-Message: "abcdefghi"
-Digest: 7EA377E88982E90724AA8E2CB5C9B086713C89161D5CF6178F31E43AF4EB3504
-Test: Verify
-Message: "abcdefghij"
-Digest: CF49AE6DAC01A20AC87F5044F9EB26D760DFC1670454F6A52FF9E46DF691D556
-Test: Verify
-Message: "abcdefghijk"
-Digest: E03E2542DEDF659C147D7507E9FA77F1ACBB1A17AF7476608648DE2152AE26F8
-Test: Verify
-Message: "abcdefghijkl"
-Digest: 401251AD137811C941DB66BA4B3D2EC1A16D21D9B861D111CFD133CB3DFB0048
-Test: Verify
-Message: "abcdefghijklm"
-Digest: B709A02DD0FFEE06078F1D6D10EC626CE913C6508FEE29D91B4CB52F9AE44DB9
-Test: Verify
-Message: "abcdefghijklmn"
-Digest: 81EFCCF8F3A0633144BDBE1127E871ED6057B91F6670AEF7A1D4F5C00AF3D6E3
-Test: Verify
-Message: "abcdefghijklmno"
-Digest: F987BDE38FD64779F7E9C38C98AFD4E256B158DC7B183C638C13E2B3D196F6A5
-Test: Verify
-Message: "abcdefghijklmnop"
-Digest: B6775FD68A7B03F177426A0EF1ACEF97AC070AE0D330BB462EBB529316A61CF7
-Test: Verify
-Message: "abcdefghijklmnopq"
-Digest: 132CB571FBADF705507F019C2031EE66E7C312F2378F08932A3F24C247A49DC5
-Test: Verify
-Message: "abcdefghijklmnopqr"
-Digest: 020293AEC430765B1F204AB38DC88B287516C8A9E6E20AB62BC7E51DF933C623
-Test: Verify
-Message: "abcdefghijklmnopqrs"
-Digest: BD045D76AFC2B1687B0BCA64EA18F76BEB8085CB89CA27D06DF17A9A49FE18BC
-Test: Verify
-Message: "abcdefghijklmnopqrst"
-Digest: 6396FC1AF8C37D41109C77829808DE8561E46CB3EF5A3056CADCA05E668BDDE6
-Test: Verify
-Message: "abcdefghijklmnopqrstu"
-Digest: 25B954495BD753DA179901E4BFD8138CA986891457F58FF16D1F7DA7DD394D86
-Test: Verify
-Message: "abcdefghijklmnopqrstuv"
-Digest: CBC0CA9D4062C10C403CC0611D2FA868095C7EFE022C84475CBF8B3F6B98D68D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvw"
-Digest: 5A51B79FF266AFE916A75D8737FCE58F602C9DD7099F5A8BB6121B3A49EE2DC6
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwx"
-Digest: 9C04324FD5D4B09887B0FE711CC5AD85A7EDC712F7DA09011A970A11352C04CA
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxy"
-Digest: A516D0912FDB3E4A1E76B503D4F0B9B86208FDFC31C1FCA800BDFF4EF0E995A2
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz"
-Digest: BDF88EB1F86A0CDF0E840BA88FA118508369DF186C7355B4B16CF79FA2710A12
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0"
-Digest: D9FCBA8D138E331B17B9E19FABF9E6F7DAB867E95801C7E55E33289A527E0A5E
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz01"
-Digest: 3C2103028D1641AC7C590304B077E6DFA437C9A351DEDA25E1481C9975CE56F8
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz012"
-Digest: 7E9DA933B32D3ADB54CD280AED0E1A5ECF6CD6322B13EFCFCF66CDD5A0493768
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123"
-Digest: 868F75CE0A86F5D0786E4459D1285DACE0EF6D7B1E48568585C0598DAAFE3796
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz01234"
-Digest: 75B7A1494A29C6A4439EA7B495CAD63E7BDA7BC708C0A40D5382F660CD701268
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz012345"
-Digest: C0B82A4981AD7BCCAD873635400A257C7473A80526F3ABA9E131EE4872343C70
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456"
-Digest: 8A5A17993027DFD9BB52D77E99780327E30BFB5658E60AB7273EDE0E97703020
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz01234567"
-Digest: 2D447F3656CB42C9580808902EEC3A428F9D5EB2C9E66D604FAA3A19D1ABE901
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz012345678"
-Digest: 075EEE56AD752714525BBC273A5E859AC592AFDAE4F68048412943CAB1724788
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789"
-Digest: 8A77ACF4D3ACBF623D106A3220B137497CAA95E4CD3E58D53C51CDBF8C874059
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789a"
-Digest: 452D83737FB3DC327D6198E2B45AA0E99F95140AAB94ED94E554F384C52E4BF2
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789ab"
-Digest: E6D1C45FC95895F8169E71EA4457A637BE89E9F8C05160696DA7474205C7A4A6
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abc"
-Digest: 170D8823EDBD0CABD93E7FD109A694FFC196674741B539C2909F34284557B658
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcd"
-Digest: 69C2255B75432B458C73B3F08D357E7A816D0D5FF2E341DF6F49E488DD544D5C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcde"
-Digest: 7C5C8D25E7C6DB899239F985131E7D72CCBD4F6687151F2F1BD9D7E056E68D4D
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdef"
-Digest: AF5C76CF3768283D407B5980473D93F7E2F43960CD8A50181267A6380019E087
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefg"
-Digest: F75B7F994A3394538D2E08F54E7AD097242B7333EE8448413813010AC8066111
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefgh"
-Digest: FE1EB837B35D144ABDFDE8DF3C3C96AF6E1827DEEF8156077F1C3190F29C36C5
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghi"
-Digest: 058AE502EAF6E8D38665D849197BB7E653A4C6C7842D77385FF9AEA5CA02C4DA
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghij"
-Digest: 0DBA2CD05F9A5DBEA5F93C8B3A899F7E91E1530AD2CB57B3914309EAC5F8701F
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijk"
-Digest: 4565481196B3B1FD39CF2C1A7D74AE1DA7F7D3BBE9252BF0454B5C98C912FF22
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijkl"
-Digest: 57CFAD8CD1C48C2E4C5559AB5EDECCF6FEC0BD7197AF6424B923296F4031D5BE
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklm"
-Digest: 2A6125E4032218AF7B5CB424DC8C7CD3D1896DCD3469CD9EEC66A314B4D08D2C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmn"
-Digest: 53602BF85609888BB9ACA687749EA867EAC99056FFC38F757645AE7C4DB9E86C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmno"
-Digest: 80ADF98092759DE4943EAF28292D895E447D539AC7540FC67932AA23F5E1FA4F
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnop"
-Digest: 44ECBEF584B20453776BDC9C7F416945BC63B89227BFEA06B8777B659F1B49A0
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopq"
-Digest: 97BD1043A184D0D5BE699D3D0A896FBB6F7684574FF3DE148BE1BCFF10F787F0
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqr"
-Digest: 7D5096C5AA9623883548776A08D8DC92A84A6F62B06D824A57E72B90ADB80397
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrs"
-Digest: 190509A4B4723A767E1F13839035991239F8240187BA08B7E995BB1E4525385C
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrst"
-Digest: AF01C1821681377BF4DFB4A4FB65A94FD7374B9DB491CB943F937B34C7F4E6A0
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstu"
-Digest: B803E3FD5409527AB57384D73B92077DA338547CBFA7D0833269A03D7D6D637E
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuv"
-Digest: 82957A282BCF5A098E2707B5C1A6292DFB9A4A215C195FD874B74E99BE18F432
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvw"
-Digest: A8DF28F6C9F90D86ABC76E343C1FBB50F376569EB31419230E4FAD2DD5CE9172
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwx"
-Digest: D06D0B49C49BAF6E95EF6A88E22CD6963FE4A1A0694DE77B340AA85356BBC4C7
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxy"
-Digest: 71EF3312C64058ECB59919E27D68CA525973698ACA2A5316AC8B3DBC0C2E8273
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz"
-Digest: 4710F86DA62B70813FE3C2DFFAB8EF81E097C7B10FD674B362F0C90EA2CED4ED
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0"
-Digest: 59FFCE58B7CC67EC4BA651860A758847272E4B77B8D5A17553F0EECAF71CCC5F
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01"
-Digest: 727615786E11B42CEF150BD72C6F07080AA67FBE16FD6716B84AD355E82E73F5
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012"
-Digest: E820C057653AAD4CC63E3F86B197B008731AF0FB79BCB687DD53D25C8BD93212
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123"
-Digest: D4B25D15AA53087A4597BCDC5553D653BB6DF80CC46E176BB3CA965E0D36F9D1
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01234"
-Digest: 8F192D38F7CB9052157FAECA289FAEA7E3EF027A61507CF76945DC7CF7C54A50
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012345"
-Digest: C5360F6744C7D9235B3E58E7E8C5F7E567ED145AD25B8D26B9E84C14443C2CBB
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456"
-Digest: 999EF1410CF942250B5837A4EF0A5961D873C60C899BEDAACE45728E347B52F0
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01234567"
-Digest: CEB19A9C697C122E4DEFAD4ABC34092B3E8248E5A638AACC84B9529B47F03E73
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz012345678"
-Digest: F82A15491EA937D60D74A0CEA7F9D10535B0B850871CC77D97948C607662BD43
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789"
-Digest: 44DDDB39BDB2AF80C147894C1D756ADA3D1C2AC2B100541E04FE87B4A59E1243
-Test: Verify
-
diff --git a/src-cryptopp/TestVectors/camellia.txt b/src-cryptopp/TestVectors/camellia.txt
deleted file mode 100644
index bc6aa20..0000000
--- a/src-cryptopp/TestVectors/camellia.txt
+++ /dev/null
@@ -1,8646 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: Camellia/ECB
-Source: NESSIE submission
-Comment: Tests with 128-bit keys
-Comment:    Set 1, vector 0
-Key:        80000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6C227F749319A3AA7DA235A9BBA05A2C
-Test: Encrypt
-Comment:    Set 1, vector 1
-Key:        40000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F04D51E45E70FB6DEE0D16A204FBBA16
-Test: Encrypt
-Comment:    Set 1, vector 2
-Key:        20000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: ED44242E619F8C32EAA2D3641DA47EA4
-Test: Encrypt
-Comment:    Set 1, vector 3
-Key:        10000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AC640BBBF84CD3B8E8258BF66C210AE2
-Test: Encrypt
-Comment:    Set 1, vector 4
-Key:        08000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8A42BDA76C84B8960B23530100AFB748
-Test: Encrypt
-Comment:    Set 1, vector 5
-Key:        04000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1D20D15F3EE21EE6051803ADF83E31D7
-Test: Encrypt
-Comment:    Set 1, vector 6
-Key:        02000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6896B2FB85D26A243BB5697F6A764307
-Test: Encrypt
-Comment:    Set 1, vector 7
-Key:        01000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 43A865A61E1117008372932EA9CE8BB2
-Test: Encrypt
-Comment:    Set 1, vector 8
-Key:        00800000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CB5ECC200DDE8E9076A8AEA2250F49E4
-Test: Encrypt
-Comment:    Set 1, vector 9
-Key:        00400000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0B2A489718DC0B0E11F11C1D3913F4A8
-Test: Encrypt
-Comment:    Set 1, vector 10
-Key:        00200000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1D28A0A70B3C72ADC5B77487AD442873
-Test: Encrypt
-Comment:    Set 1, vector 11
-Key:        00100000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 26D344959095765A3DD6986B656F353D
-Test: Encrypt
-Comment:    Set 1, vector 12
-Key:        00080000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 048248D32A74DB80DAF5642417F7832A
-Test: Encrypt
-Comment:    Set 1, vector 13
-Key:        00040000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 44D400F8752F16B20DB95A959917B650
-Test: Encrypt
-Comment:    Set 1, vector 14
-Key:        00020000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E885DD9B2794459B2133BC84B59C2DED
-Test: Encrypt
-Comment:    Set 1, vector 15
-Key:        00010000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 89D6E4182FD0DD7E4038710F597DD242
-Test: Encrypt
-Comment:    Set 1, vector 16
-Key:        00008000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7FE5BA5FF1D0EB81132A3DA0CD8E829D
-Test: Encrypt
-Comment:    Set 1, vector 17
-Key:        00004000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 470FEDAAA6FFFCBC48AF8B3859B1E45F
-Test: Encrypt
-Comment:    Set 1, vector 18
-Key:        00002000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B6FA2D9F41110E6914890AF888C36091
-Test: Encrypt
-Comment:    Set 1, vector 19
-Key:        00001000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 46D2C0FD0C3A4D2B5CA6BA5E14382DCA
-Test: Encrypt
-Comment:    Set 1, vector 20
-Key:        00000800000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 730D700DCC5AB632DD9D92C6D1C18E5A
-Test: Encrypt
-Comment:    Set 1, vector 21
-Key:        00000400000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 067D56D80AF5D2F24D84F518B8FC7920
-Test: Encrypt
-Comment:    Set 1, vector 22
-Key:        00000200000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 027F6EE9F54534E4C21F9263B68BAEA0
-Test: Encrypt
-Comment:    Set 1, vector 23
-Key:        00000100000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D115CB2324E8FDA3576DEE57E49CC315
-Test: Encrypt
-Comment:    Set 1, vector 24
-Key:        00000080000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0976DB57B27E4136743E58BCECFBC056
-Test: Encrypt
-Comment:    Set 1, vector 25
-Key:        00000040000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0C889DF89972EB42DB2BD2AAC335CCC8
-Test: Encrypt
-Comment:    Set 1, vector 26
-Key:        00000020000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CB6B80177047A3B2AC290A41B94174EF
-Test: Encrypt
-Comment:    Set 1, vector 27
-Key:        00000010000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F816631F8FBC54ECDC1AB5323FF8424E
-Test: Encrypt
-Comment:    Set 1, vector 28
-Key:        00000008000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 40CB64DF57D2A6BBCBD82DFCC749707D
-Test: Encrypt
-Comment:    Set 1, vector 29
-Key:        00000004000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 885BD3C2DD560765B11F5A2D238E9F9A
-Test: Encrypt
-Comment:    Set 1, vector 30
-Key:        00000002000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 877AAEF064555DE89C99B7C5A1326C62
-Test: Encrypt
-Comment:    Set 1, vector 31
-Key:        00000001000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AA4FBBE7A02020F5D81030E0EF7A460D
-Test: Encrypt
-Comment:    Set 1, vector 32
-Key:        00000000800000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AA2759BC215E49F26008206F6F65B7AC
-Test: Encrypt
-Comment:    Set 1, vector 33
-Key:        00000000400000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 419A8069C3D531475FF7F29AE049D57C
-Test: Encrypt
-Comment:    Set 1, vector 34
-Key:        00000000200000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 455588067DB9088130C861F5BE9E15BF
-Test: Encrypt
-Comment:    Set 1, vector 35
-Key:        00000000100000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FDD6967ADA65ED3E20718C451AE5AE34
-Test: Encrypt
-Comment:    Set 1, vector 36
-Key:        00000000080000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1C74228D2A82248CD29800B64BEFF97A
-Test: Encrypt
-Comment:    Set 1, vector 37
-Key:        00000000040000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4B88B7FFB32B05840BE7B497377AFDAA
-Test: Encrypt
-Comment:    Set 1, vector 38
-Key:        00000000020000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4D4EC4C728524DA2F366FC272AB2666A
-Test: Encrypt
-Comment:    Set 1, vector 39
-Key:        00000000010000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4FA8A27ED16BF36FA296D8AB2B423C77
-Test: Encrypt
-Comment:    Set 1, vector 40
-Key:        00000000008000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 943B9D570D371A3D823B680BBDA9477D
-Test: Encrypt
-Comment:    Set 1, vector 41
-Key:        00000000004000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DCC390F5E1CAADBE061D02929473D084
-Test: Encrypt
-Comment:    Set 1, vector 42
-Key:        00000000002000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9655F00C4A5C40DF401A3FF806575834
-Test: Encrypt
-Comment:    Set 1, vector 43
-Key:        00000000001000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FCC9F6B36DE6DD6AA578AD0B59DF5996
-Test: Encrypt
-Comment:    Set 1, vector 44
-Key:        00000000000800000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F573FF52ACAA16609E5B3C3C7353DA75
-Test: Encrypt
-Comment:    Set 1, vector 45
-Key:        00000000000400000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 203EF49006A7FC856FF7A7A3B953D999
-Test: Encrypt
-Comment:    Set 1, vector 46
-Key:        00000000000200000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 16659E823D942E99C83926C4055D896D
-Test: Encrypt
-Comment:    Set 1, vector 47
-Key:        00000000000100000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 139D5DB9EF0119F4E5D11256C5ECB8B0
-Test: Encrypt
-Comment:    Set 1, vector 48
-Key:        00000000000080000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 63FB244962CCE915425EF1B31DE6AAE2
-Test: Encrypt
-Comment:    Set 1, vector 49
-Key:        00000000000040000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6F771C2DC848A106E907A990DABA0272
-Test: Encrypt
-Comment:    Set 1, vector 50
-Key:        00000000000020000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CFA1F114CF0D9C7DAD301B833962ABF2
-Test: Encrypt
-Comment:    Set 1, vector 51
-Key:        00000000000010000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 58A3BE61DA53D0AA8F33DE95E6F38A3F
-Test: Encrypt
-Comment:    Set 1, vector 52
-Key:        00000000000008000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2FE96FCB3D845B568AE804B217F3498F
-Test: Encrypt
-Comment:    Set 1, vector 53
-Key:        00000000000004000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FD74EB6621127D58FA44BA3E6EE7835D
-Test: Encrypt
-Comment:    Set 1, vector 54
-Key:        00000000000002000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 834C0C5D8D88EE63C989AA1E66F4E18C
-Test: Encrypt
-Comment:    Set 1, vector 55
-Key:        00000000000001000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FEF8E0097B9EB5CE6DE710F5742F7E4F
-Test: Encrypt
-Comment:    Set 1, vector 56
-Key:        00000000000000800000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 75FCC55F284311B81D967618C2D35700
-Test: Encrypt
-Comment:    Set 1, vector 57
-Key:        00000000000000400000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 91AE4E35623A7F10383BF7448F1F74AD
-Test: Encrypt
-Comment:    Set 1, vector 58
-Key:        00000000000000200000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8928B2B6967BA1B4230AA1EBA49D1A08
-Test: Encrypt
-Comment:    Set 1, vector 59
-Key:        00000000000000100000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 707EA08174ED5C0AD0A74363B403F02D
-Test: Encrypt
-Comment:    Set 1, vector 60
-Key:        00000000000000080000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7C0C13410DDE30C0AD3565FFAA33E8AD
-Test: Encrypt
-Comment:    Set 1, vector 61
-Key:        00000000000000040000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 56DA72C545C490A749C66BCC5D90AACD
-Test: Encrypt
-Comment:    Set 1, vector 62
-Key:        00000000000000020000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2CC0CF6E2AAA7916AF636B1546BA1179
-Test: Encrypt
-Comment:    Set 1, vector 63
-Key:        00000000000000010000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A19FE617883D409B1F78882E0D5EF39C
-Test: Encrypt
-Comment:    Set 1, vector 64
-Key:        00000000000000008000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2B8586BBB979CFFAC5A76C25D77C1E2C
-Test: Encrypt
-Comment:    Set 1, vector 65
-Key:        00000000000000004000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5A08C9B5A2940E3ACD1086867E3E4733
-Test: Encrypt
-Comment:    Set 1, vector 66
-Key:        00000000000000002000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7443F1072833BFC8AA38CBF6963CF880
-Test: Encrypt
-Comment:    Set 1, vector 67
-Key:        00000000000000001000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6809A1F2D2B5367D5E8442E7972BD1D4
-Test: Encrypt
-Comment:    Set 1, vector 68
-Key:        00000000000000000800000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A61D4FE41D5DBB7A6BCE5984502CD767
-Test: Encrypt
-Comment:    Set 1, vector 69
-Key:        00000000000000000400000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 30D86F43B81F4D2098A4D43AB2637549
-Test: Encrypt
-Comment:    Set 1, vector 70
-Key:        00000000000000000200000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5B16E9033FA40BF141D3EE73FF7E2564
-Test: Encrypt
-Comment:    Set 1, vector 71
-Key:        00000000000000000100000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 15574EF70C880682DBFBD93FAE8023F6
-Test: Encrypt
-Comment:    Set 1, vector 72
-Key:        00000000000000000080000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0D8D220DB69B15FFE2001B3F42E910EA
-Test: Encrypt
-Comment:    Set 1, vector 73
-Key:        00000000000000000040000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 030AB24DA9E4ADD4E350E692077A948C
-Test: Encrypt
-Comment:    Set 1, vector 74
-Key:        00000000000000000020000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7F6509A9FD8525126BFB69AFE8624A96
-Test: Encrypt
-Comment:    Set 1, vector 75
-Key:        00000000000000000010000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9600EB0B7E38A5ABEBBDADD3DFC70298
-Test: Encrypt
-Comment:    Set 1, vector 76
-Key:        00000000000000000008000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3CF0F71B4687AAABEB9FA8CDE00B17D7
-Test: Encrypt
-Comment:    Set 1, vector 77
-Key:        00000000000000000004000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8B1C549A655C0041D866B7875A2736CB
-Test: Encrypt
-Comment:    Set 1, vector 78
-Key:        00000000000000000002000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8F507233FBC9E1DBF716FB4C828DBF06
-Test: Encrypt
-Comment:    Set 1, vector 79
-Key:        00000000000000000001000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 14A45A121DC8996020C29A040FE8E52D
-Test: Encrypt
-Comment:    Set 1, vector 80
-Key:        00000000000000000000800000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 32390FB6FC15BB4B37D1CD8817BAEB09
-Test: Encrypt
-Comment:    Set 1, vector 81
-Key:        00000000000000000000400000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9E61986F3F4C31132D436CCFCF751043
-Test: Encrypt
-Comment:    Set 1, vector 82
-Key:        00000000000000000000200000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 24E63FAD370974C60330F7C3071938F1
-Test: Encrypt
-Comment:    Set 1, vector 83
-Key:        00000000000000000000100000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3CE71D4E9F2F7EF9A6F9F2548C5489CC
-Test: Encrypt
-Comment:    Set 1, vector 84
-Key:        00000000000000000000080000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E42436B8E076A00600DFD67B8C427DB1
-Test: Encrypt
-Comment:    Set 1, vector 85
-Key:        00000000000000000000040000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5C2577FA8104DCC58ACE852B4D11FE24
-Test: Encrypt
-Comment:    Set 1, vector 86
-Key:        00000000000000000000020000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 12FC9DD7132B3BB346C53FD193531638
-Test: Encrypt
-Comment:    Set 1, vector 87
-Key:        00000000000000000000010000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5D91F775E26599F26B21F9FB1F67DA38
-Test: Encrypt
-Comment:    Set 1, vector 88
-Key:        00000000000000000000008000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D4B3683AA62D2EF0331A960A0BF01A29
-Test: Encrypt
-Comment:    Set 1, vector 89
-Key:        00000000000000000000004000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EE32582D35DDF3A82142ED18FEE38014
-Test: Encrypt
-Comment:    Set 1, vector 90
-Key:        00000000000000000000002000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 148632AE69514D5776DA4AF38E1AE4FD
-Test: Encrypt
-Comment:    Set 1, vector 91
-Key:        00000000000000000000001000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 30A3EE1AA1CA17B128DAAF06AF9025BD
-Test: Encrypt
-Comment:    Set 1, vector 92
-Key:        00000000000000000000000800000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 88D82D9E508CBFB392E47E524BB33019
-Test: Encrypt
-Comment:    Set 1, vector 93
-Key:        00000000000000000000000400000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0C20870A9FC751F6E41F92305B7C4D92
-Test: Encrypt
-Comment:    Set 1, vector 94
-Key:        00000000000000000000000200000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6A4EDE5FD13F3676C1BCF8B73AB273CB
-Test: Encrypt
-Comment:    Set 1, vector 95
-Key:        00000000000000000000000100000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5A62CE50EA837CA4FD0F7304D1572D22
-Test: Encrypt
-Comment:    Set 1, vector 96
-Key:        00000000000000000000000080000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 84DB8599B48ED4F39E872F13F7FCDF0B
-Test: Encrypt
-Comment:    Set 1, vector 97
-Key:        00000000000000000000000040000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CDD25F8276411E892035C9703C7588EE
-Test: Encrypt
-Comment:    Set 1, vector 98
-Key:        00000000000000000000000020000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 73BCFB16436B5C52CD4BC9629F75C5C8
-Test: Encrypt
-Comment:    Set 1, vector 99
-Key:        00000000000000000000000010000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 03752D935029B09699C29CA5C6E79553
-Test: Encrypt
-Comment:    Set 1, vector 100
-Key:        00000000000000000000000008000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EF439A1B86698409E91D992BDB3F54E5
-Test: Encrypt
-Comment:    Set 1, vector 101
-Key:        00000000000000000000000004000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2A34BDE7EC74221BFF58B251E54F089F
-Test: Encrypt
-Comment:    Set 1, vector 102
-Key:        00000000000000000000000002000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 35FBB78716B78FB57F96BC8A5D869B72
-Test: Encrypt
-Comment:    Set 1, vector 103
-Key:        00000000000000000000000001000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AC3A7363DFB6C3F06CCCA1A46F44A5F8
-Test: Encrypt
-Comment:    Set 1, vector 104
-Key:        00000000000000000000000000800000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4895E1B7E54CA168CE42E3994D564B62
-Test: Encrypt
-Comment:    Set 1, vector 105
-Key:        00000000000000000000000000400000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E98956EFC457FE8AA103DB303A3B1DF1
-Test: Encrypt
-Comment:    Set 1, vector 106
-Key:        00000000000000000000000000200000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 276646992D6E752A649183DB05073422
-Test: Encrypt
-Comment:    Set 1, vector 107
-Key:        00000000000000000000000000100000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 82F36DE401E21D01A476A163A92F4B16
-Test: Encrypt
-Comment:    Set 1, vector 108
-Key:        00000000000000000000000000080000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E54DD90800B92153C314F8B1590B17E5
-Test: Encrypt
-Comment:    Set 1, vector 109
-Key:        00000000000000000000000000040000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F4A146DFB33405EC6B8F37AEB10F5198
-Test: Encrypt
-Comment:    Set 1, vector 110
-Key:        00000000000000000000000000020000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C332ADBC2D44FA1A1A4F7C8EAE2CED29
-Test: Encrypt
-Comment:    Set 1, vector 111
-Key:        00000000000000000000000000010000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 21AA542624DA9F2363404CE42BC2BAEF
-Test: Encrypt
-Comment:    Set 1, vector 112
-Key:        00000000000000000000000000008000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E101DBEF627038AE819441D133AEE068
-Test: Encrypt
-Comment:    Set 1, vector 113
-Key:        00000000000000000000000000004000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7A9B635E6AA5D273DE697747FE6BB08E
-Test: Encrypt
-Comment:    Set 1, vector 114
-Key:        00000000000000000000000000002000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0541AA347D36F03D9177FC91398874DB
-Test: Encrypt
-Comment:    Set 1, vector 115
-Key:        00000000000000000000000000001000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BE27D6FE099AB98BF07A74A1ABF5C945
-Test: Encrypt
-Comment:    Set 1, vector 116
-Key:        00000000000000000000000000000800
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 472ACD81A6626822E220F431C4491704
-Test: Encrypt
-Comment:    Set 1, vector 117
-Key:        00000000000000000000000000000400
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2D5152F19E29AD7D5823CDCA188E0CD8
-Test: Encrypt
-Comment:    Set 1, vector 118
-Key:        00000000000000000000000000000200
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 875C90B3669DF8F4867B6769689656E7
-Test: Encrypt
-Comment:    Set 1, vector 119
-Key:        00000000000000000000000000000100
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 59641CA52EEBC2C229930CE42529277F
-Test: Encrypt
-Comment:    Set 1, vector 120
-Key:        00000000000000000000000000000080
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A3B4D666AC56C284D40DC27FDB0F787C
-Test: Encrypt
-Comment:    Set 1, vector 121
-Key:        00000000000000000000000000000040
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0511D526FC5F255F51F1914B4B12AD84
-Test: Encrypt
-Comment:    Set 1, vector 122
-Key:        00000000000000000000000000000020
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2D14332989F629DA4720ECC916B4DAF0
-Test: Encrypt
-Comment:    Set 1, vector 123
-Key:        00000000000000000000000000000010
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C44EAC8457E2F17E9BC86EB4C436E8DB
-Test: Encrypt
-Comment:    Set 1, vector 124
-Key:        00000000000000000000000000000008
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 022F3EB45AAA39F785FF80B6A3006BF6
-Test: Encrypt
-Comment:    Set 1, vector 125
-Key:        00000000000000000000000000000004
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B8A714C8F8427767B384B0E2F6BAF619
-Test: Encrypt
-Comment:    Set 1, vector 126
-Key:        00000000000000000000000000000002
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 01F745A7C09FECD3497F087BD52A9A0F
-Test: Encrypt
-Comment:    Set 1, vector 127
-Key:        00000000000000000000000000000001
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 41E0E6DC2DDEC65D8B8120E60977B82D
-Test: Encrypt
-Comment:    Set 2, vector 0
-Key:        00000000000000000000000000000000
-Plaintext:  80000000000000000000000000000000
-Ciphertext: 07923A39EB0A817D1C4D87BDB82D1F1C
-Test: Encrypt
-Comment:    Set 2, vector 1
-Key:        00000000000000000000000000000000
-Plaintext:  40000000000000000000000000000000
-Ciphertext: 48CD6419809672D2349260D89A08D3D3
-Test: Encrypt
-Comment:    Set 2, vector 2
-Key:        00000000000000000000000000000000
-Plaintext:  20000000000000000000000000000000
-Ciphertext: D07493CCB2E95CE0B4945A05ACC97D82
-Test: Encrypt
-Comment:    Set 2, vector 3
-Key:        00000000000000000000000000000000
-Plaintext:  10000000000000000000000000000000
-Ciphertext: 5DBE1EAC9F7080A88DBED7F6DA101448
-Test: Encrypt
-Comment:    Set 2, vector 4
-Key:        00000000000000000000000000000000
-Plaintext:  08000000000000000000000000000000
-Ciphertext: F01EE477D199DF2701027034B229622F
-Test: Encrypt
-Comment:    Set 2, vector 5
-Key:        00000000000000000000000000000000
-Plaintext:  04000000000000000000000000000000
-Ciphertext: C841587ABD9A912E563774CB569D051E
-Test: Encrypt
-Comment:    Set 2, vector 6
-Key:        00000000000000000000000000000000
-Plaintext:  02000000000000000000000000000000
-Ciphertext: 1D9BC0C04546F0915C8CCD11391A455C
-Test: Encrypt
-Comment:    Set 2, vector 7
-Key:        00000000000000000000000000000000
-Plaintext:  01000000000000000000000000000000
-Ciphertext: 05E6EBB4BA167F5C479CEFF3152F943B
-Test: Encrypt
-Comment:    Set 2, vector 8
-Key:        00000000000000000000000000000000
-Plaintext:  00800000000000000000000000000000
-Ciphertext: 93211E0F788845B9FC0E4551FFE92AC9
-Test: Encrypt
-Comment:    Set 2, vector 9
-Key:        00000000000000000000000000000000
-Plaintext:  00400000000000000000000000000000
-Ciphertext: B6D35701CD8FADDE383BBE8E6B70BAF7
-Test: Encrypt
-Comment:    Set 2, vector 10
-Key:        00000000000000000000000000000000
-Plaintext:  00200000000000000000000000000000
-Ciphertext: 8358F9F4EBCFEE348CB30551ACB151A0
-Test: Encrypt
-Comment:    Set 2, vector 11
-Key:        00000000000000000000000000000000
-Plaintext:  00100000000000000000000000000000
-Ciphertext: D57516EB5AD93C523E40521BF447AFCE
-Test: Encrypt
-Comment:    Set 2, vector 12
-Key:        00000000000000000000000000000000
-Plaintext:  00080000000000000000000000000000
-Ciphertext: 66B2534C279C439133F52E5AD8B439A9
-Test: Encrypt
-Comment:    Set 2, vector 13
-Key:        00000000000000000000000000000000
-Plaintext:  00040000000000000000000000000000
-Ciphertext: A71C69184A9F63C2992A5F18F77C1FE9
-Test: Encrypt
-Comment:    Set 2, vector 14
-Key:        00000000000000000000000000000000
-Plaintext:  00020000000000000000000000000000
-Ciphertext: 1ADCBE49AEACB9ECEBBD492B10E82C7B
-Test: Encrypt
-Comment:    Set 2, vector 15
-Key:        00000000000000000000000000000000
-Plaintext:  00010000000000000000000000000000
-Ciphertext: 27E3BCFB227C5561DB6CF7FC30387036
-Test: Encrypt
-Comment:    Set 2, vector 16
-Key:        00000000000000000000000000000000
-Plaintext:  00008000000000000000000000000000
-Ciphertext: F4AE20365CC9D06B0CAE6B695ED2CEC1
-Test: Encrypt
-Comment:    Set 2, vector 17
-Key:        00000000000000000000000000000000
-Plaintext:  00004000000000000000000000000000
-Ciphertext: 3DD682F0B641ED32AD3D43EA2A0456E4
-Test: Encrypt
-Comment:    Set 2, vector 18
-Key:        00000000000000000000000000000000
-Plaintext:  00002000000000000000000000000000
-Ciphertext: 6E5D14A95ECC290B509EA6B673652E3A
-Test: Encrypt
-Comment:    Set 2, vector 19
-Key:        00000000000000000000000000000000
-Plaintext:  00001000000000000000000000000000
-Ciphertext: F1CDF0F8D7B3FFD95422D7CC0CF40B7B
-Test: Encrypt
-Comment:    Set 2, vector 20
-Key:        00000000000000000000000000000000
-Plaintext:  00000800000000000000000000000000
-Ciphertext: A9253D459A34C385A1F1B2CFFA3935C5
-Test: Encrypt
-Comment:    Set 2, vector 21
-Key:        00000000000000000000000000000000
-Plaintext:  00000400000000000000000000000000
-Ciphertext: 291024D99FF09A47A1DEE45BA700AE52
-Test: Encrypt
-Comment:    Set 2, vector 22
-Key:        00000000000000000000000000000000
-Plaintext:  00000200000000000000000000000000
-Ciphertext: 49241D9459B277187BB10081C60361C0
-Test: Encrypt
-Comment:    Set 2, vector 23
-Key:        00000000000000000000000000000000
-Plaintext:  00000100000000000000000000000000
-Ciphertext: AD9BA365CC4DD5553D2D9FE303841D88
-Test: Encrypt
-Comment:    Set 2, vector 24
-Key:        00000000000000000000000000000000
-Plaintext:  00000080000000000000000000000000
-Ciphertext: C2ECA616664A249DC622CC11196B4AE1
-Test: Encrypt
-Comment:    Set 2, vector 25
-Key:        00000000000000000000000000000000
-Plaintext:  00000040000000000000000000000000
-Ciphertext: 6E1A2D4794BB0DC08777A0BC7523E70E
-Test: Encrypt
-Comment:    Set 2, vector 26
-Key:        00000000000000000000000000000000
-Plaintext:  00000020000000000000000000000000
-Ciphertext: 6DB1F0CF59656BDD235E82B8CEF0BE8E
-Test: Encrypt
-Comment:    Set 2, vector 27
-Key:        00000000000000000000000000000000
-Plaintext:  00000010000000000000000000000000
-Ciphertext: 52F239C5EAF401EBDC54D2F011FF4B6A
-Test: Encrypt
-Comment:    Set 2, vector 28
-Key:        00000000000000000000000000000000
-Plaintext:  00000008000000000000000000000000
-Ciphertext: 6B58A08F648414B67FD6847D2AA51CBF
-Test: Encrypt
-Comment:    Set 2, vector 29
-Key:        00000000000000000000000000000000
-Plaintext:  00000004000000000000000000000000
-Ciphertext: 2959DD5367885A75EB48053CF3251A36
-Test: Encrypt
-Comment:    Set 2, vector 30
-Key:        00000000000000000000000000000000
-Plaintext:  00000002000000000000000000000000
-Ciphertext: 630B292E3B88EF641CDFD531E206605E
-Test: Encrypt
-Comment:    Set 2, vector 31
-Key:        00000000000000000000000000000000
-Plaintext:  00000001000000000000000000000000
-Ciphertext: 4BBB88EF82B70593FCC56AFD91540FDB
-Test: Encrypt
-Comment:    Set 2, vector 32
-Key:        00000000000000000000000000000000
-Plaintext:  00000000800000000000000000000000
-Ciphertext: 0A13055B118A45C606999257BD191426
-Test: Encrypt
-Comment:    Set 2, vector 33
-Key:        00000000000000000000000000000000
-Plaintext:  00000000400000000000000000000000
-Ciphertext: 5CF8E5C9F15D7E4F865020224853EB77
-Test: Encrypt
-Comment:    Set 2, vector 34
-Key:        00000000000000000000000000000000
-Plaintext:  00000000200000000000000000000000
-Ciphertext: 3898805042C7A4315C5EE51AF2DE47E2
-Test: Encrypt
-Comment:    Set 2, vector 35
-Key:        00000000000000000000000000000000
-Plaintext:  00000000100000000000000000000000
-Ciphertext: 8D3F96372E87CBB0B375425B3A10B9E7
-Test: Encrypt
-Comment:    Set 2, vector 36
-Key:        00000000000000000000000000000000
-Plaintext:  00000000080000000000000000000000
-Ciphertext: 4D9510A378BD784A70A66BCC75B7D3C8
-Test: Encrypt
-Comment:    Set 2, vector 37
-Key:        00000000000000000000000000000000
-Plaintext:  00000000040000000000000000000000
-Ciphertext: 70DB1902D37CFBDFB98F7C516F79D416
-Test: Encrypt
-Comment:    Set 2, vector 38
-Key:        00000000000000000000000000000000
-Plaintext:  00000000020000000000000000000000
-Ciphertext: 383C6C2AABEF7FDE25CD470BF774A331
-Test: Encrypt
-Comment:    Set 2, vector 39
-Key:        00000000000000000000000000000000
-Plaintext:  00000000010000000000000000000000
-Ciphertext: 47CBCB5288349B1A15DC9F81FBEE6B8F
-Test: Encrypt
-Comment:    Set 2, vector 40
-Key:        00000000000000000000000000000000
-Plaintext:  00000000008000000000000000000000
-Ciphertext: 21DA34D4468EEB13AED95DAE0FF48310
-Test: Encrypt
-Comment:    Set 2, vector 41
-Key:        00000000000000000000000000000000
-Plaintext:  00000000004000000000000000000000
-Ciphertext: 021C9A8E6BD36FBD036411E5D852A80F
-Test: Encrypt
-Comment:    Set 2, vector 42
-Key:        00000000000000000000000000000000
-Plaintext:  00000000002000000000000000000000
-Ciphertext: 6A459E2F839AF60ACDE83774D0BB5574
-Test: Encrypt
-Comment:    Set 2, vector 43
-Key:        00000000000000000000000000000000
-Plaintext:  00000000001000000000000000000000
-Ciphertext: C19255121F1B933CAE09E58AEC0E9977
-Test: Encrypt
-Comment:    Set 2, vector 44
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000800000000000000000000
-Ciphertext: 7BA949E27B2BE148A6B801F9305F43D5
-Test: Encrypt
-Comment:    Set 2, vector 45
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000400000000000000000000
-Ciphertext: E8CEB1026BCF7BCEA32E8A380EA76DB7
-Test: Encrypt
-Comment:    Set 2, vector 46
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000200000000000000000000
-Ciphertext: 63F97747ED56A8F521B20CC65F6F9465
-Test: Encrypt
-Comment:    Set 2, vector 47
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000100000000000000000000
-Ciphertext: 2091CFDC629819106188424AC694F75B
-Test: Encrypt
-Comment:    Set 2, vector 48
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000080000000000000000000
-Ciphertext: A91BDF8E8B88407942423CCE000527C4
-Test: Encrypt
-Comment:    Set 2, vector 49
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000040000000000000000000
-Ciphertext: 73F9B44B9635A3FD683DBF8D49E9825B
-Test: Encrypt
-Comment:    Set 2, vector 50
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000020000000000000000000
-Ciphertext: 9DC64B2133FAD5069FD9A7CC2FFFD1CC
-Test: Encrypt
-Comment:    Set 2, vector 51
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000010000000000000000000
-Ciphertext: 28240F81FEC36B71E13F1FEA7A7641E3
-Test: Encrypt
-Comment:    Set 2, vector 52
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000008000000000000000000
-Ciphertext: 20DD39FEE96CD2EFF972872A692B28FD
-Test: Encrypt
-Comment:    Set 2, vector 53
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000004000000000000000000
-Ciphertext: 47A9E40483EC1925B635E47E964E8E93
-Test: Encrypt
-Comment:    Set 2, vector 54
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000002000000000000000000
-Ciphertext: 9C0EBD822C49FB3D853DF5B315A87BA0
-Test: Encrypt
-Comment:    Set 2, vector 55
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000001000000000000000000
-Ciphertext: C18D813FDB45A594C6DC24E5A1F6CE32
-Test: Encrypt
-Comment:    Set 2, vector 56
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000800000000000000000
-Ciphertext: 7E5467FF245ECF80CB55C2D8E91F0711
-Test: Encrypt
-Comment:    Set 2, vector 57
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000400000000000000000
-Ciphertext: 394D4365B77954FDEA4145FCF7A7A041
-Test: Encrypt
-Comment:    Set 2, vector 58
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000200000000000000000
-Ciphertext: B1D8311A492ED11F11E57B29221610C4
-Test: Encrypt
-Comment:    Set 2, vector 59
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000100000000000000000
-Ciphertext: E5FBB947A63AEA90163AF04AD6951EF8
-Test: Encrypt
-Comment:    Set 2, vector 60
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000080000000000000000
-Ciphertext: CA0627DDF580F0E7D59562825C9D0492
-Test: Encrypt
-Comment:    Set 2, vector 61
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000040000000000000000
-Ciphertext: EF98FFD1AED295AAE1860F0274C8F555
-Test: Encrypt
-Comment:    Set 2, vector 62
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000020000000000000000
-Ciphertext: 8C698E5CFFF08FACE10C2DC5FF1E2A81
-Test: Encrypt
-Comment:    Set 2, vector 63
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000010000000000000000
-Ciphertext: 35A7767E02032C35B5CE1A6F49C57C28
-Test: Encrypt
-Comment:    Set 2, vector 64
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000008000000000000000
-Ciphertext: AB36F8734E76EBA306CF00D6763D90B0
-Test: Encrypt
-Comment:    Set 2, vector 65
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000004000000000000000
-Ciphertext: E854EB66D4EC66889B5E6CD4F44A5806
-Test: Encrypt
-Comment:    Set 2, vector 66
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000002000000000000000
-Ciphertext: 15B66DF1455ACD640B8716BCF5DB2D69
-Test: Encrypt
-Comment:    Set 2, vector 67
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000001000000000000000
-Ciphertext: 4C57AB5333E5C2D4B7E30A007E449F48
-Test: Encrypt
-Comment:    Set 2, vector 68
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000800000000000000
-Ciphertext: BA3E7FF28EB38EA09D8DB1440A9A3552
-Test: Encrypt
-Comment:    Set 2, vector 69
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000400000000000000
-Ciphertext: 64E60227AFD80C40C70186CC94804C1A
-Test: Encrypt
-Comment:    Set 2, vector 70
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000200000000000000
-Ciphertext: CEB4423C20B4C91C2551F6FC227C9514
-Test: Encrypt
-Comment:    Set 2, vector 71
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000100000000000000
-Ciphertext: F736894B843EF32DA28576DE500D448C
-Test: Encrypt
-Comment:    Set 2, vector 72
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000080000000000000
-Ciphertext: 58FDA98B678D15053D4B6C060368108C
-Test: Encrypt
-Comment:    Set 2, vector 73
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000040000000000000
-Ciphertext: E28CAE384E578F47657755EBCD97996C
-Test: Encrypt
-Comment:    Set 2, vector 74
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000020000000000000
-Ciphertext: 0A64617BD4B5B166668240D105B7B6A2
-Test: Encrypt
-Comment:    Set 2, vector 75
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000010000000000000
-Ciphertext: 4BD090C7E3D365B5EA80F19B4798881E
-Test: Encrypt
-Comment:    Set 2, vector 76
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000008000000000000
-Ciphertext: BC7B6CB9BFF4F72973BB2CD20A512C06
-Test: Encrypt
-Comment:    Set 2, vector 77
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000004000000000000
-Ciphertext: 4C7ADDC5C867594E9EE75F0AA6AB9C23
-Test: Encrypt
-Comment:    Set 2, vector 78
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000002000000000000
-Ciphertext: 1FBD05C71A36691AC6566A5298101D53
-Test: Encrypt
-Comment:    Set 2, vector 79
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000001000000000000
-Ciphertext: 42D7D6B1F499D412F8793972BD968DA2
-Test: Encrypt
-Comment:    Set 2, vector 80
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000800000000000
-Ciphertext: 260EC86E2786FC68824576B934F32814
-Test: Encrypt
-Comment:    Set 2, vector 81
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000400000000000
-Ciphertext: 576C26DFD7046F9357F34BEA7DFB26A0
-Test: Encrypt
-Comment:    Set 2, vector 82
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000200000000000
-Ciphertext: 6D55E54BFB6F927174A02294C95E0F8F
-Test: Encrypt
-Comment:    Set 2, vector 83
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000100000000000
-Ciphertext: 1A6CE91DD458229C7675A34950D10E23
-Test: Encrypt
-Comment:    Set 2, vector 84
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000080000000000
-Ciphertext: DAD0D5E7E000652825AA34D228EA8D8F
-Test: Encrypt
-Comment:    Set 2, vector 85
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000040000000000
-Ciphertext: E68013F48D75EAD2BBC0B0BDA5E690BF
-Test: Encrypt
-Comment:    Set 2, vector 86
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000020000000000
-Ciphertext: A07D92312FBAE37BFE8A834210AE4F9C
-Test: Encrypt
-Comment:    Set 2, vector 87
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000010000000000
-Ciphertext: 6EEE5F8544CD7D456366EB448813989A
-Test: Encrypt
-Comment:    Set 2, vector 88
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000008000000000
-Ciphertext: F8E5C7FF4B79D7ABE8BFA2DD148820A8
-Test: Encrypt
-Comment:    Set 2, vector 89
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000004000000000
-Ciphertext: C6349D75C7472BBD66F95B3A07C79C91
-Test: Encrypt
-Comment:    Set 2, vector 90
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000002000000000
-Ciphertext: B85713C12D8658951CD1AD21C74D2CD2
-Test: Encrypt
-Comment:    Set 2, vector 91
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000001000000000
-Ciphertext: 907AA00B9F7D47A97623FB55BA911F29
-Test: Encrypt
-Comment:    Set 2, vector 92
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000800000000
-Ciphertext: DC3CD0ED23D11776FAB43A2A6A8F3557
-Test: Encrypt
-Comment:    Set 2, vector 93
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000400000000
-Ciphertext: 4BFE58A8FD69179C14765B09AB70B705
-Test: Encrypt
-Comment:    Set 2, vector 94
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000200000000
-Ciphertext: A23996E0EA67EC280356E5F77130A551
-Test: Encrypt
-Comment:    Set 2, vector 95
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000100000000
-Ciphertext: CDEADE859B3AACD273CCA85A3E2E45F2
-Test: Encrypt
-Comment:    Set 2, vector 96
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000080000000
-Ciphertext: E0FC78489857D84DA03F40CE97147174
-Test: Encrypt
-Comment:    Set 2, vector 97
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000040000000
-Ciphertext: 7615EA6351F6BB12855E8579C6995D8E
-Test: Encrypt
-Comment:    Set 2, vector 98
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000020000000
-Ciphertext: 13E184344FE28C2E70ED0E4D0A8037F9
-Test: Encrypt
-Comment:    Set 2, vector 99
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000010000000
-Ciphertext: A5FE395F568482B87BC3EB208C81C942
-Test: Encrypt
-Comment:    Set 2, vector 100
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000008000000
-Ciphertext: B3103E11AF06C85565823F8CAA3159F6
-Test: Encrypt
-Comment:    Set 2, vector 101
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000004000000
-Ciphertext: 7EBC2234D271B89C519C396985300030
-Test: Encrypt
-Comment:    Set 2, vector 102
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000002000000
-Ciphertext: 0661D338F2E0C939BA1687820A768467
-Test: Encrypt
-Comment:    Set 2, vector 103
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000001000000
-Ciphertext: EC2B42667C0195A90715499617884DA5
-Test: Encrypt
-Comment:    Set 2, vector 104
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000800000
-Ciphertext: AE077BA19D24E7188DDD3682FF196892
-Test: Encrypt
-Comment:    Set 2, vector 105
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000400000
-Ciphertext: 98823C24B9C65A66073C7952DC2B4B5E
-Test: Encrypt
-Comment:    Set 2, vector 106
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000200000
-Ciphertext: 6AB58432CBB3C2F503DA2D16796CC297
-Test: Encrypt
-Comment:    Set 2, vector 107
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000100000
-Ciphertext: EEB5EBB3A53E4196C2F22BC1A4DDF5E8
-Test: Encrypt
-Comment:    Set 2, vector 108
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000080000
-Ciphertext: 33DC40AC5FDC126D38878416AF6C0FA6
-Test: Encrypt
-Comment:    Set 2, vector 109
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000040000
-Ciphertext: 38EDDC08E18B4AD982CEA921D2765A9A
-Test: Encrypt
-Comment:    Set 2, vector 110
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000020000
-Ciphertext: 7D6BEA038E9347C642E18631660A9558
-Test: Encrypt
-Comment:    Set 2, vector 111
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000010000
-Ciphertext: FDA57921A473B5EE3700AD5ADF035019
-Test: Encrypt
-Comment:    Set 2, vector 112
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000008000
-Ciphertext: 699B4812E200337E9C1D2C397F0DFE4E
-Test: Encrypt
-Comment:    Set 2, vector 113
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000004000
-Ciphertext: 7A1EADF68B0807145D6C414852DECFC8
-Test: Encrypt
-Comment:    Set 2, vector 114
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000002000
-Ciphertext: 1645FFAA8AD76689C01DA8C40882781F
-Test: Encrypt
-Comment:    Set 2, vector 115
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000001000
-Ciphertext: BA0C053BE702FA62FC66D8FEB12FC97E
-Test: Encrypt
-Comment:    Set 2, vector 116
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000800
-Ciphertext: 841FD8AF69CF2C31F7D4D7B6959662B5
-Test: Encrypt
-Comment:    Set 2, vector 117
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000400
-Ciphertext: F675D59BDB33231861268F539829DA0B
-Test: Encrypt
-Comment:    Set 2, vector 118
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000200
-Ciphertext: A4967F45ABB4E8C7DC5E3806680F35E0
-Test: Encrypt
-Comment:    Set 2, vector 119
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000100
-Ciphertext: 4D7E08081CC82F92ABA7C58C99F8343F
-Test: Encrypt
-Comment:    Set 2, vector 120
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000080
-Ciphertext: 9AEFDB287C119B82353612B60ECCBFD8
-Test: Encrypt
-Comment:    Set 2, vector 121
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000040
-Ciphertext: 979BB6A1553A17592A86E78DF144A699
-Test: Encrypt
-Comment:    Set 2, vector 122
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000020
-Ciphertext: A6FA8CAB06FD2E5BF3A858983C01757A
-Test: Encrypt
-Comment:    Set 2, vector 123
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000010
-Ciphertext: BE8511254C31E25420B91D6FEF1710ED
-Test: Encrypt
-Comment:    Set 2, vector 124
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000008
-Ciphertext: F589A908D18A21894971C0433581E1A5
-Test: Encrypt
-Comment:    Set 2, vector 125
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000004
-Ciphertext: 4237585130E7C9F715235EB1D8C94DE7
-Test: Encrypt
-Comment:    Set 2, vector 126
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000002
-Ciphertext: DEFE3E0B5C54C94B4F2A0F5A46F6210D
-Test: Encrypt
-Comment:    Set 2, vector 127
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000001
-Ciphertext: F5574ACC3148DFCB9015200631024DF9
-Test: Encrypt
-Comment:    Set 3, vector 0
-Key:        00000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3D028025B156327C17F762C1F2CBCA71
-Test: Encrypt
-Comment:    Set 3, vector 1
-Key:        01010101010101010101010101010101
-Plaintext:  01010101010101010101010101010101
-Ciphertext: 637084CB1120D6F25DB618893040AA27
-Test: Encrypt
-Comment:    Set 3, vector 2
-Key:        02020202020202020202020202020202
-Plaintext:  02020202020202020202020202020202
-Ciphertext: 612834AAC9EF906BAEAA076E1C75179D
-Test: Encrypt
-Comment:    Set 3, vector 3
-Key:        03030303030303030303030303030303
-Plaintext:  03030303030303030303030303030303
-Ciphertext: AECEE4C59E91366360923654C17140A9
-Test: Encrypt
-Comment:    Set 3, vector 4
-Key:        04040404040404040404040404040404
-Plaintext:  04040404040404040404040404040404
-Ciphertext: B24FAF8A579E4EFE986571FB2F68B5B4
-Test: Encrypt
-Comment:    Set 3, vector 5
-Key:        05050505050505050505050505050505
-Plaintext:  05050505050505050505050505050505
-Ciphertext: C102E40B5E584CF6AA16108D93DA26E3
-Test: Encrypt
-Comment:    Set 3, vector 6
-Key:        06060606060606060606060606060606
-Plaintext:  06060606060606060606060606060606
-Ciphertext: 962F98098E6CEA968FA568C5A32ADA50
-Test: Encrypt
-Comment:    Set 3, vector 7
-Key:        07070707070707070707070707070707
-Plaintext:  07070707070707070707070707070707
-Ciphertext: 27E9AB0117A37D228B77B29B38B3836F
-Test: Encrypt
-Comment:    Set 3, vector 8
-Key:        08080808080808080808080808080808
-Plaintext:  08080808080808080808080808080808
-Ciphertext: 3E5CAFBB70545AABB1109293A1C44C14
-Test: Encrypt
-Comment:    Set 3, vector 9
-Key:        09090909090909090909090909090909
-Plaintext:  09090909090909090909090909090909
-Ciphertext: E4AC7417ECB8B2871B0EF12CECD20F46
-Test: Encrypt
-Comment:    Set 3, vector 10
-Key:        0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-Plaintext:  0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-Ciphertext: B29D18DD34C1CC00257838F1B8BD43DB
-Test: Encrypt
-Comment:    Set 3, vector 11
-Key:        0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-Plaintext:  0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-Ciphertext: FC1094A0A2850499D874B6DDC1EBA0B7
-Test: Encrypt
-Comment:    Set 3, vector 12
-Key:        0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-Plaintext:  0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-Ciphertext: AD062A5D53BB0478F17DA5528839F9FF
-Test: Encrypt
-Comment:    Set 3, vector 13
-Key:        0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-Plaintext:  0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-Ciphertext: 2C9DFEC27363BD0E651CC91FC05FDADF
-Test: Encrypt
-Comment:    Set 3, vector 14
-Key:        0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-Plaintext:  0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-Ciphertext: 487C72BD251D4566AE6119A70A95B79F
-Test: Encrypt
-Comment:    Set 3, vector 15
-Key:        0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-Plaintext:  0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-Ciphertext: 18CE9F8E752F787051CB8E407EB16C12
-Test: Encrypt
-Comment:    Set 3, vector 16
-Key:        10101010101010101010101010101010
-Plaintext:  10101010101010101010101010101010
-Ciphertext: E1FA5FD3F40B766BBE3DF469AF41B420
-Test: Encrypt
-Comment:    Set 3, vector 17
-Key:        11111111111111111111111111111111
-Plaintext:  11111111111111111111111111111111
-Ciphertext: 09628EDC6CD69F4F85483DC37633F732
-Test: Encrypt
-Comment:    Set 3, vector 18
-Key:        12121212121212121212121212121212
-Plaintext:  12121212121212121212121212121212
-Ciphertext: 2E6C94A96F6744C4E8D4146B4ECCD815
-Test: Encrypt
-Comment:    Set 3, vector 19
-Key:        13131313131313131313131313131313
-Plaintext:  13131313131313131313131313131313
-Ciphertext: 800996B5B363ACAB3FB8982F9BBE767F
-Test: Encrypt
-Comment:    Set 3, vector 20
-Key:        14141414141414141414141414141414
-Plaintext:  14141414141414141414141414141414
-Ciphertext: C254C27642167B8FF363EAAD41A165A8
-Test: Encrypt
-Comment:    Set 3, vector 21
-Key:        15151515151515151515151515151515
-Plaintext:  15151515151515151515151515151515
-Ciphertext: 0B43A548CFFE916BAD7AB58B5F51B1E2
-Test: Encrypt
-Comment:    Set 3, vector 22
-Key:        16161616161616161616161616161616
-Plaintext:  16161616161616161616161616161616
-Ciphertext: 6C753853277756B8E0578FDC371A8738
-Test: Encrypt
-Comment:    Set 3, vector 23
-Key:        17171717171717171717171717171717
-Plaintext:  17171717171717171717171717171717
-Ciphertext: A278A500B02D8B2C7E829F1816872B1A
-Test: Encrypt
-Comment:    Set 3, vector 24
-Key:        18181818181818181818181818181818
-Plaintext:  18181818181818181818181818181818
-Ciphertext: 67DD5353E13CDD51FC52716BC6BAB258
-Test: Encrypt
-Comment:    Set 3, vector 25
-Key:        19191919191919191919191919191919
-Plaintext:  19191919191919191919191919191919
-Ciphertext: 1B2DF65083662590F49719D7721D7C61
-Test: Encrypt
-Comment:    Set 3, vector 26
-Key:        1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-Plaintext:  1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-Ciphertext: B12E384030DE7B77866E758FB251CCFF
-Test: Encrypt
-Comment:    Set 3, vector 27
-Key:        1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-Plaintext:  1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-Ciphertext: C37B3145C36FE5B95AC1392BEB81C9D8
-Test: Encrypt
-Comment:    Set 3, vector 28
-Key:        1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-Plaintext:  1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-Ciphertext: 5C25502EF79A5792DEE9359EDF7BA8BC
-Test: Encrypt
-Comment:    Set 3, vector 29
-Key:        1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-Plaintext:  1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-Ciphertext: F0D899AEF42F226605E6A61A650F00A1
-Test: Encrypt
-Comment:    Set 3, vector 30
-Key:        1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-Plaintext:  1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-Ciphertext: 12096937A3474FE4D87C77581C09380B
-Test: Encrypt
-Comment:    Set 3, vector 31
-Key:        1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-Plaintext:  1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-Ciphertext: CFC3A30819A45111983ABBF16CC61E9A
-Test: Encrypt
-Comment:    Set 3, vector 32
-Key:        20202020202020202020202020202020
-Plaintext:  20202020202020202020202020202020
-Ciphertext: 7E724027BB2F591C63254D936FCC4B43
-Test: Encrypt
-Comment:    Set 3, vector 33
-Key:        21212121212121212121212121212121
-Plaintext:  21212121212121212121212121212121
-Ciphertext: FC9893DACCE806419957685270D5BF13
-Test: Encrypt
-Comment:    Set 3, vector 34
-Key:        22222222222222222222222222222222
-Plaintext:  22222222222222222222222222222222
-Ciphertext: F6C372A2AE2C03D7A9E0597DBEDFE961
-Test: Encrypt
-Comment:    Set 3, vector 35
-Key:        23232323232323232323232323232323
-Plaintext:  23232323232323232323232323232323
-Ciphertext: 4EE3CD585BD7A498DE93DDE42FDCBE73
-Test: Encrypt
-Comment:    Set 3, vector 36
-Key:        24242424242424242424242424242424
-Plaintext:  24242424242424242424242424242424
-Ciphertext: 71D0FFA714D70B5A3CDCE26BC91D93EE
-Test: Encrypt
-Comment:    Set 3, vector 37
-Key:        25252525252525252525252525252525
-Plaintext:  25252525252525252525252525252525
-Ciphertext: 918EB6A7FA54EE795DE68EB5C0011BFD
-Test: Encrypt
-Comment:    Set 3, vector 38
-Key:        26262626262626262626262626262626
-Plaintext:  26262626262626262626262626262626
-Ciphertext: 3A3DBFD37FB057816485BA948034E25E
-Test: Encrypt
-Comment:    Set 3, vector 39
-Key:        27272727272727272727272727272727
-Plaintext:  27272727272727272727272727272727
-Ciphertext: 1FAD9F63890CF5475F3557B83924427C
-Test: Encrypt
-Comment:    Set 3, vector 40
-Key:        28282828282828282828282828282828
-Plaintext:  28282828282828282828282828282828
-Ciphertext: 63F70DD87B9D63FC79628DECC6F34605
-Test: Encrypt
-Comment:    Set 3, vector 41
-Key:        29292929292929292929292929292929
-Plaintext:  29292929292929292929292929292929
-Ciphertext: D8FE7DF75B51024B69BDAB4844233CBB
-Test: Encrypt
-Comment:    Set 3, vector 42
-Key:        2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A
-Plaintext:  2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A
-Ciphertext: D927B8DB454BEECFEE2F89ACD2D26F1A
-Test: Encrypt
-Comment:    Set 3, vector 43
-Key:        2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
-Plaintext:  2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
-Ciphertext: 958B7CFABED67123D21541083FA90EB8
-Test: Encrypt
-Comment:    Set 3, vector 44
-Key:        2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-Plaintext:  2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-Ciphertext: 2F220AA3BB400736F3D0295E3C6D9052
-Test: Encrypt
-Comment:    Set 3, vector 45
-Key:        2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
-Plaintext:  2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
-Ciphertext: A14F57CE4D9EA4C5E282108DF8FDE00E
-Test: Encrypt
-Comment:    Set 3, vector 46
-Key:        2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-Plaintext:  2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-Ciphertext: 23E437F93E0BE22B4C54BC187D70BCC1
-Test: Encrypt
-Comment:    Set 3, vector 47
-Key:        2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F
-Plaintext:  2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F
-Ciphertext: 615B6706E39E4A55EA8BFA4EFB8EBAEA
-Test: Encrypt
-Comment:    Set 3, vector 48
-Key:        30303030303030303030303030303030
-Plaintext:  30303030303030303030303030303030
-Ciphertext: 5354CC9F7CAA08298C9A8AD471B39235
-Test: Encrypt
-Comment:    Set 3, vector 49
-Key:        31313131313131313131313131313131
-Plaintext:  31313131313131313131313131313131
-Ciphertext: DA2512B115E748580B7D198BFF01A537
-Test: Encrypt
-Comment:    Set 3, vector 50
-Key:        32323232323232323232323232323232
-Plaintext:  32323232323232323232323232323232
-Ciphertext: AEF890FCDEC04BFB0C4724558688810B
-Test: Encrypt
-Comment:    Set 3, vector 51
-Key:        33333333333333333333333333333333
-Plaintext:  33333333333333333333333333333333
-Ciphertext: AEC153899584F8B9FC9836B86A40BA4A
-Test: Encrypt
-Comment:    Set 3, vector 52
-Key:        34343434343434343434343434343434
-Plaintext:  34343434343434343434343434343434
-Ciphertext: E86D0DBEBD69030C0654656E0D348A8E
-Test: Encrypt
-Comment:    Set 3, vector 53
-Key:        35353535353535353535353535353535
-Plaintext:  35353535353535353535353535353535
-Ciphertext: 3EFFEE758220F7138D31564D5CDA82EF
-Test: Encrypt
-Comment:    Set 3, vector 54
-Key:        36363636363636363636363636363636
-Plaintext:  36363636363636363636363636363636
-Ciphertext: A0A57A825008700B246CEE9821803321
-Test: Encrypt
-Comment:    Set 3, vector 55
-Key:        37373737373737373737373737373737
-Plaintext:  37373737373737373737373737373737
-Ciphertext: 318692397CD421D958D142299AE24E5E
-Test: Encrypt
-Comment:    Set 3, vector 56
-Key:        38383838383838383838383838383838
-Plaintext:  38383838383838383838383838383838
-Ciphertext: 1B949505033DB5554BBBBBB9488970DE
-Test: Encrypt
-Comment:    Set 3, vector 57
-Key:        39393939393939393939393939393939
-Plaintext:  39393939393939393939393939393939
-Ciphertext: 20600DB3471001F93837F8EB50F7EB2B
-Test: Encrypt
-Comment:    Set 3, vector 58
-Key:        3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
-Plaintext:  3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
-Ciphertext: 004C126190B7D20ADCA7331EA26AC487
-Test: Encrypt
-Comment:    Set 3, vector 59
-Key:        3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
-Plaintext:  3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
-Ciphertext: 7F535656FE3113A61D21BE216365D9FD
-Test: Encrypt
-Comment:    Set 3, vector 60
-Key:        3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
-Plaintext:  3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
-Ciphertext: A7DA48E8AD71B1DC583A895A8CC85FF2
-Test: Encrypt
-Comment:    Set 3, vector 61
-Key:        3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
-Plaintext:  3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
-Ciphertext: 02E8CB85E9DDEDFAB4D9DB7106C6C38F
-Test: Encrypt
-Comment:    Set 3, vector 62
-Key:        3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
-Plaintext:  3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
-Ciphertext: 44ACE8B20DF2DBA70C0287362D51ED5C
-Test: Encrypt
-Comment:    Set 3, vector 63
-Key:        3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
-Plaintext:  3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
-Ciphertext: 8ABDD80D977FAF208FDFC69AA70E9810
-Test: Encrypt
-Comment:    Set 3, vector 64
-Key:        40404040404040404040404040404040
-Plaintext:  40404040404040404040404040404040
-Ciphertext: 538ADCBE104A3483B3C2A3D8CE72FBD6
-Test: Encrypt
-Comment:    Set 3, vector 65
-Key:        41414141414141414141414141414141
-Plaintext:  41414141414141414141414141414141
-Ciphertext: 7F757894F1A04645BCB523E925A937C7
-Test: Encrypt
-Comment:    Set 3, vector 66
-Key:        42424242424242424242424242424242
-Plaintext:  42424242424242424242424242424242
-Ciphertext: FA4304C7D16E164E000461B2550207B1
-Test: Encrypt
-Comment:    Set 3, vector 67
-Key:        43434343434343434343434343434343
-Plaintext:  43434343434343434343434343434343
-Ciphertext: 5B8E43BF0CACBCB80933B4061F9702B2
-Test: Encrypt
-Comment:    Set 3, vector 68
-Key:        44444444444444444444444444444444
-Plaintext:  44444444444444444444444444444444
-Ciphertext: 4DB11630D8CD9390797EE30EE9A25CB3
-Test: Encrypt
-Comment:    Set 3, vector 69
-Key:        45454545454545454545454545454545
-Plaintext:  45454545454545454545454545454545
-Ciphertext: 61150375D22621E9DD7AB45227E4ADC1
-Test: Encrypt
-Comment:    Set 3, vector 70
-Key:        46464646464646464646464646464646
-Plaintext:  46464646464646464646464646464646
-Ciphertext: 825AA0A2275496EA00BE2C75982EC24E
-Test: Encrypt
-Comment:    Set 3, vector 71
-Key:        47474747474747474747474747474747
-Plaintext:  47474747474747474747474747474747
-Ciphertext: 1EA3F70E26F079CE37801787B5F3655C
-Test: Encrypt
-Comment:    Set 3, vector 72
-Key:        48484848484848484848484848484848
-Plaintext:  48484848484848484848484848484848
-Ciphertext: F46E712267A6CA8DA8AC044A4E3ADC69
-Test: Encrypt
-Comment:    Set 3, vector 73
-Key:        49494949494949494949494949494949
-Plaintext:  49494949494949494949494949494949
-Ciphertext: 00FCF96BD11DB90E045B948C2658FC07
-Test: Encrypt
-Comment:    Set 3, vector 74
-Key:        4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A
-Plaintext:  4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A
-Ciphertext: 08E264CCDA07442DD6FB5BC8AF05A9C1
-Test: Encrypt
-Comment:    Set 3, vector 75
-Key:        4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B
-Plaintext:  4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B
-Ciphertext: 35C189E86440D125B0CAF6C62CA0E4F9
-Test: Encrypt
-Comment:    Set 3, vector 76
-Key:        4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C
-Plaintext:  4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C
-Ciphertext: 7FC2F545C0DE78664218F4F635CC8D10
-Test: Encrypt
-Comment:    Set 3, vector 77
-Key:        4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
-Plaintext:  4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
-Ciphertext: 9DC067581AD80555C6E46C6594A626F5
-Test: Encrypt
-Comment:    Set 3, vector 78
-Key:        4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E
-Plaintext:  4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E
-Ciphertext: D33A3E8035B42D76A483BE06B62054A6
-Test: Encrypt
-Comment:    Set 3, vector 79
-Key:        4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F
-Plaintext:  4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F
-Ciphertext: 7CA26FD5D6DB7EAA785FCCA1E2854910
-Test: Encrypt
-Comment:    Set 3, vector 80
-Key:        50505050505050505050505050505050
-Plaintext:  50505050505050505050505050505050
-Ciphertext: E9A672BD5401539C1C8F2AB21A83B26B
-Test: Encrypt
-Comment:    Set 3, vector 81
-Key:        51515151515151515151515151515151
-Plaintext:  51515151515151515151515151515151
-Ciphertext: 2948CB8989780E74BA525CC2FDDC42CF
-Test: Encrypt
-Comment:    Set 3, vector 82
-Key:        52525252525252525252525252525252
-Plaintext:  52525252525252525252525252525252
-Ciphertext: A3A8308145C318D42F4E8310DF6D97E0
-Test: Encrypt
-Comment:    Set 3, vector 83
-Key:        53535353535353535353535353535353
-Plaintext:  53535353535353535353535353535353
-Ciphertext: 1757125D19851062D7782A2200A813E9
-Test: Encrypt
-Comment:    Set 3, vector 84
-Key:        54545454545454545454545454545454
-Plaintext:  54545454545454545454545454545454
-Ciphertext: 9BC4FC94FF7A09F9D4C23A3BDEAF498E
-Test: Encrypt
-Comment:    Set 3, vector 85
-Key:        55555555555555555555555555555555
-Plaintext:  55555555555555555555555555555555
-Ciphertext: B36C8A8DC251A4D08B38160011498AB2
-Test: Encrypt
-Comment:    Set 3, vector 86
-Key:        56565656565656565656565656565656
-Plaintext:  56565656565656565656565656565656
-Ciphertext: 6C6058C8D5F2A32E31988239C4A657F1
-Test: Encrypt
-Comment:    Set 3, vector 87
-Key:        57575757575757575757575757575757
-Plaintext:  57575757575757575757575757575757
-Ciphertext: B8B914785FD465FB0F83FE4A676C3A6B
-Test: Encrypt
-Comment:    Set 3, vector 88
-Key:        58585858585858585858585858585858
-Plaintext:  58585858585858585858585858585858
-Ciphertext: 00BBEEC24412F8A2C4291B5F1F32E662
-Test: Encrypt
-Comment:    Set 3, vector 89
-Key:        59595959595959595959595959595959
-Plaintext:  59595959595959595959595959595959
-Ciphertext: AF8353C84504526068884176D45CC8A0
-Test: Encrypt
-Comment:    Set 3, vector 90
-Key:        5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A
-Plaintext:  5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A
-Ciphertext: F84DF1519736174F6F23B4CC3FC939F1
-Test: Encrypt
-Comment:    Set 3, vector 91
-Key:        5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-Plaintext:  5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-Ciphertext: 320326E1024C9156B0E4C483065F0D94
-Test: Encrypt
-Comment:    Set 3, vector 92
-Key:        5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C
-Plaintext:  5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C
-Ciphertext: 80AFE13AEC30894E8B772E73F367A148
-Test: Encrypt
-Comment:    Set 3, vector 93
-Key:        5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D
-Plaintext:  5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D
-Ciphertext: 5F0D8BE9294D27DB7E6CD4D4F8A08D48
-Test: Encrypt
-Comment:    Set 3, vector 94
-Key:        5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E
-Plaintext:  5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E
-Ciphertext: B6D8E7EF37171F6271AC274411E26867
-Test: Encrypt
-Comment:    Set 3, vector 95
-Key:        5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F
-Plaintext:  5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F
-Ciphertext: 23DEBDDF60703AE0F8E9337C73C6FDC3
-Test: Encrypt
-Comment:    Set 3, vector 96
-Key:        60606060606060606060606060606060
-Plaintext:  60606060606060606060606060606060
-Ciphertext: D03B4696B0DCC56C37F7038747BEF222
-Test: Encrypt
-Comment:    Set 3, vector 97
-Key:        61616161616161616161616161616161
-Plaintext:  61616161616161616161616161616161
-Ciphertext: 201E6A1FA7898892DA1D3148766F7939
-Test: Encrypt
-Comment:    Set 3, vector 98
-Key:        62626262626262626262626262626262
-Plaintext:  62626262626262626262626262626262
-Ciphertext: D9643DBC3C373D300DB5AC3E699F7DDE
-Test: Encrypt
-Comment:    Set 3, vector 99
-Key:        63636363636363636363636363636363
-Plaintext:  63636363636363636363636363636363
-Ciphertext: 1B04DAF08A764C09DFFE140403F4EC5D
-Test: Encrypt
-Comment:    Set 3, vector 100
-Key:        64646464646464646464646464646464
-Plaintext:  64646464646464646464646464646464
-Ciphertext: 0510AA045E35862885AEEB1752328032
-Test: Encrypt
-Comment:    Set 3, vector 101
-Key:        65656565656565656565656565656565
-Plaintext:  65656565656565656565656565656565
-Ciphertext: 894E5FE4164A0B9CC2C50D95F18329E6
-Test: Encrypt
-Comment:    Set 3, vector 102
-Key:        66666666666666666666666666666666
-Plaintext:  66666666666666666666666666666666
-Ciphertext: 99D16D251893E474CD8A18C10798D418
-Test: Encrypt
-Comment:    Set 3, vector 103
-Key:        67676767676767676767676767676767
-Plaintext:  67676767676767676767676767676767
-Ciphertext: B41A0DEEA15FCB419E00318752503FA8
-Test: Encrypt
-Comment:    Set 3, vector 104
-Key:        68686868686868686868686868686868
-Plaintext:  68686868686868686868686868686868
-Ciphertext: 8BDDFBD29844F3EED1E02FB76628E877
-Test: Encrypt
-Comment:    Set 3, vector 105
-Key:        69696969696969696969696969696969
-Plaintext:  69696969696969696969696969696969
-Ciphertext: E71C41B95412E2ED6BC6B5693BC445E5
-Test: Encrypt
-Comment:    Set 3, vector 106
-Key:        6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A
-Plaintext:  6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A
-Ciphertext: 566E5667E9BDDCE13F3B6DE0DEF06305
-Test: Encrypt
-Comment:    Set 3, vector 107
-Key:        6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B
-Plaintext:  6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B
-Ciphertext: 49372FDCE8DC81E45A9E6FBFB8952F76
-Test: Encrypt
-Comment:    Set 3, vector 108
-Key:        6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C
-Plaintext:  6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C
-Ciphertext: 034EAB9E0E881ABF0C4F9B7933E7F1B2
-Test: Encrypt
-Comment:    Set 3, vector 109
-Key:        6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D
-Plaintext:  6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D
-Ciphertext: 56FFE171E45816C5808380530F3F9F23
-Test: Encrypt
-Comment:    Set 3, vector 110
-Key:        6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E
-Plaintext:  6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E
-Ciphertext: 5FE59EE65A0321F3B09A1748CF18CC02
-Test: Encrypt
-Comment:    Set 3, vector 111
-Key:        6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F
-Plaintext:  6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F
-Ciphertext: 8C13790203280B652614D224178C4289
-Test: Encrypt
-Comment:    Set 3, vector 112
-Key:        70707070707070707070707070707070
-Plaintext:  70707070707070707070707070707070
-Ciphertext: 52D7C5111B52E5356C8EF2B629BA6166
-Test: Encrypt
-Comment:    Set 3, vector 113
-Key:        71717171717171717171717171717171
-Plaintext:  71717171717171717171717171717171
-Ciphertext: 4FB997235548FB5C202A1514FF408068
-Test: Encrypt
-Comment:    Set 3, vector 114
-Key:        72727272727272727272727272727272
-Plaintext:  72727272727272727272727272727272
-Ciphertext: 8DDE9345FEDAB8D8D2DE5E2577756F16
-Test: Encrypt
-Comment:    Set 3, vector 115
-Key:        73737373737373737373737373737373
-Plaintext:  73737373737373737373737373737373
-Ciphertext: C1B39136F69B2044C30E38023EB6E7D2
-Test: Encrypt
-Comment:    Set 3, vector 116
-Key:        74747474747474747474747474747474
-Plaintext:  74747474747474747474747474747474
-Ciphertext: 6032D1B3844BEA4ACE81142A013C42BC
-Test: Encrypt
-Comment:    Set 3, vector 117
-Key:        75757575757575757575757575757575
-Plaintext:  75757575757575757575757575757575
-Ciphertext: 985A9D8DDE048107368028AA24F5D70B
-Test: Encrypt
-Comment:    Set 3, vector 118
-Key:        76767676767676767676767676767676
-Plaintext:  76767676767676767676767676767676
-Ciphertext: 5343E03D587A538475BB92F23E96FDF8
-Test: Encrypt
-Comment:    Set 3, vector 119
-Key:        77777777777777777777777777777777
-Plaintext:  77777777777777777777777777777777
-Ciphertext: 98253AF78B8DA7E5AE98E7B4E9FA74F9
-Test: Encrypt
-Comment:    Set 3, vector 120
-Key:        78787878787878787878787878787878
-Plaintext:  78787878787878787878787878787878
-Ciphertext: 8404DDA01CC702790B8B31408205E128
-Test: Encrypt
-Comment:    Set 3, vector 121
-Key:        79797979797979797979797979797979
-Plaintext:  79797979797979797979797979797979
-Ciphertext: C782C96911F30723AB90E3A0BA59B808
-Test: Encrypt
-Comment:    Set 3, vector 122
-Key:        7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A
-Plaintext:  7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A
-Ciphertext: 471270191B1BB659804CEAE818793167
-Test: Encrypt
-Comment:    Set 3, vector 123
-Key:        7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B
-Plaintext:  7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B
-Ciphertext: 2B27BBF7E47DA05F72EED52D038A3241
-Test: Encrypt
-Comment:    Set 3, vector 124
-Key:        7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C
-Plaintext:  7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C
-Ciphertext: 0BD3B3F3F6F404B6B7C6D436605640B7
-Test: Encrypt
-Comment:    Set 3, vector 125
-Key:        7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D
-Plaintext:  7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D
-Ciphertext: 74578268B9D9AD5D9819E51CA288F81D
-Test: Encrypt
-Comment:    Set 3, vector 126
-Key:        7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E
-Plaintext:  7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E
-Ciphertext: A77A67CC08111CE41B817176859675B5
-Test: Encrypt
-Comment:    Set 3, vector 127
-Key:        7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
-Plaintext:  7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
-Ciphertext: 9BE99EFDAF9CCCB4D879173EA2197FEF
-Test: Encrypt
-Comment:    Set 3, vector 128
-Key:        80808080808080808080808080808080
-Plaintext:  80808080808080808080808080808080
-Ciphertext: AA7627F70F6B54C217C3EF232D362459
-Test: Encrypt
-Comment:    Set 3, vector 129
-Key:        81818181818181818181818181818181
-Plaintext:  81818181818181818181818181818181
-Ciphertext: EE41F8DC661C2A8B95667CB1F908367A
-Test: Encrypt
-Comment:    Set 3, vector 130
-Key:        82828282828282828282828282828282
-Plaintext:  82828282828282828282828282828282
-Ciphertext: AF2D71AC4D7E482E8134A65F2841101A
-Test: Encrypt
-Comment:    Set 3, vector 131
-Key:        83838383838383838383838383838383
-Plaintext:  83838383838383838383838383838383
-Ciphertext: 98CFCAA37D3B1825C55FA94825BBC91A
-Test: Encrypt
-Comment:    Set 3, vector 132
-Key:        84848484848484848484848484848484
-Plaintext:  84848484848484848484848484848484
-Ciphertext: 2ACFCBC772417EBD445F8B272857578C
-Test: Encrypt
-Comment:    Set 3, vector 133
-Key:        85858585858585858585858585858585
-Plaintext:  85858585858585858585858585858585
-Ciphertext: 424DE49A69767A539E26581A19CD4F17
-Test: Encrypt
-Comment:    Set 3, vector 134
-Key:        86868686868686868686868686868686
-Plaintext:  86868686868686868686868686868686
-Ciphertext: F25ED7239B234E58AE40F7612E3CE6BA
-Test: Encrypt
-Comment:    Set 3, vector 135
-Key:        87878787878787878787878787878787
-Plaintext:  87878787878787878787878787878787
-Ciphertext: 4BF44DBA1E6E80DE3554F7EEF0621EBF
-Test: Encrypt
-Comment:    Set 3, vector 136
-Key:        88888888888888888888888888888888
-Plaintext:  88888888888888888888888888888888
-Ciphertext: 6B87409975816BC8480985D079B08594
-Test: Encrypt
-Comment:    Set 3, vector 137
-Key:        89898989898989898989898989898989
-Plaintext:  89898989898989898989898989898989
-Ciphertext: D026A866DD55C02EE77DF1E93405A751
-Test: Encrypt
-Comment:    Set 3, vector 138
-Key:        8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A
-Plaintext:  8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A
-Ciphertext: A45F7212DD04352DEF319D58922C44CE
-Test: Encrypt
-Comment:    Set 3, vector 139
-Key:        8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B
-Plaintext:  8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B
-Ciphertext: 4600AD219EE97A7BFF629D8F6E337C79
-Test: Encrypt
-Comment:    Set 3, vector 140
-Key:        8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-Plaintext:  8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-Ciphertext: A26CEFEC7612A89E8543503A678D921F
-Test: Encrypt
-Comment:    Set 3, vector 141
-Key:        8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D
-Plaintext:  8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D
-Ciphertext: 5CA126B9342723816C82AC1D41F97EFB
-Test: Encrypt
-Comment:    Set 3, vector 142
-Key:        8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E
-Plaintext:  8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E
-Ciphertext: 76DC82C091F5691C35E8735EB901B788
-Test: Encrypt
-Comment:    Set 3, vector 143
-Key:        8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F
-Plaintext:  8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F
-Ciphertext: 2F8AA5E8D7D90B3E7FCC20128F462AAD
-Test: Encrypt
-Comment:    Set 3, vector 144
-Key:        90909090909090909090909090909090
-Plaintext:  90909090909090909090909090909090
-Ciphertext: 67B8B189FCD886FD2160005C93D9F3B2
-Test: Encrypt
-Comment:    Set 3, vector 145
-Key:        91919191919191919191919191919191
-Plaintext:  91919191919191919191919191919191
-Ciphertext: 8DFBD0B7D8B614E15B56571A6A5B443D
-Test: Encrypt
-Comment:    Set 3, vector 146
-Key:        92929292929292929292929292929292
-Plaintext:  92929292929292929292929292929292
-Ciphertext: F10DA9ABD28359461A3BB271C2037D1A
-Test: Encrypt
-Comment:    Set 3, vector 147
-Key:        93939393939393939393939393939393
-Plaintext:  93939393939393939393939393939393
-Ciphertext: 5A53C6ADF38E807BC03CC53193133CDE
-Test: Encrypt
-Comment:    Set 3, vector 148
-Key:        94949494949494949494949494949494
-Plaintext:  94949494949494949494949494949494
-Ciphertext: 298AF9909A89241F34DB6BF6ACC6A909
-Test: Encrypt
-Comment:    Set 3, vector 149
-Key:        95959595959595959595959595959595
-Plaintext:  95959595959595959595959595959595
-Ciphertext: DAA5C134BDD34A775DEC219F6DE219BE
-Test: Encrypt
-Comment:    Set 3, vector 150
-Key:        96969696969696969696969696969696
-Plaintext:  96969696969696969696969696969696
-Ciphertext: 2514903F8ABA0F65CA22C8AD82FF2574
-Test: Encrypt
-Comment:    Set 3, vector 151
-Key:        97979797979797979797979797979797
-Plaintext:  97979797979797979797979797979797
-Ciphertext: 11696CB06D2F97B1A2CB380E2887AB7E
-Test: Encrypt
-Comment:    Set 3, vector 152
-Key:        98989898989898989898989898989898
-Plaintext:  98989898989898989898989898989898
-Ciphertext: E70BAE913D953A66AC35DE9CAA6D205D
-Test: Encrypt
-Comment:    Set 3, vector 153
-Key:        99999999999999999999999999999999
-Plaintext:  99999999999999999999999999999999
-Ciphertext: 20BC3C8F4E81EEA320189E6063017706
-Test: Encrypt
-Comment:    Set 3, vector 154
-Key:        9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A
-Plaintext:  9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A
-Ciphertext: 53A956A32B4B532F5E9BE8C94278EC57
-Test: Encrypt
-Comment:    Set 3, vector 155
-Key:        9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B
-Plaintext:  9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B
-Ciphertext: 2562236E541426B29A4232E592237CAD
-Test: Encrypt
-Comment:    Set 3, vector 156
-Key:        9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C
-Plaintext:  9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C
-Ciphertext: 0F8A9DEDA85B0A1CF7487C6ED823B869
-Test: Encrypt
-Comment:    Set 3, vector 157
-Key:        9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D
-Plaintext:  9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D
-Ciphertext: 8917CF4F1A25A500440CF0665BB517A0
-Test: Encrypt
-Comment:    Set 3, vector 158
-Key:        9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E
-Plaintext:  9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E
-Ciphertext: F5C065F3821FA664724BF6AFF1039430
-Test: Encrypt
-Comment:    Set 3, vector 159
-Key:        9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
-Plaintext:  9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
-Ciphertext: F5D5131F0D2F4859EC38F8999A93E74D
-Test: Encrypt
-Comment:    Set 3, vector 160
-Key:        A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0
-Plaintext:  A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0
-Ciphertext: 9A02DF44F2194E94B7E34F1DCC234685
-Test: Encrypt
-Comment:    Set 3, vector 161
-Key:        A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1
-Plaintext:  A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1
-Ciphertext: 59491E467432E6147EAFE37BCD93DA01
-Test: Encrypt
-Comment:    Set 3, vector 162
-Key:        A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2
-Plaintext:  A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2
-Ciphertext: 4D0B317CE4AE577CF87B225C53DDF352
-Test: Encrypt
-Comment:    Set 3, vector 163
-Key:        A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3
-Plaintext:  A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3
-Ciphertext: 73E082DC996995BDDD1F5544326D56D6
-Test: Encrypt
-Comment:    Set 3, vector 164
-Key:        A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4
-Plaintext:  A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4
-Ciphertext: 46C5C6E23A72C9DF410EF979F93CF266
-Test: Encrypt
-Comment:    Set 3, vector 165
-Key:        A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5
-Plaintext:  A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5
-Ciphertext: 1F55093C234648C5C9C781E8C9FD42C4
-Test: Encrypt
-Comment:    Set 3, vector 166
-Key:        A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6
-Plaintext:  A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6
-Ciphertext: BFA2702CF3DAE25705D1DE1CCDBDC49E
-Test: Encrypt
-Comment:    Set 3, vector 167
-Key:        A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7
-Plaintext:  A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7
-Ciphertext: 3223365425C1ADE87FF766AB048D9ADB
-Test: Encrypt
-Comment:    Set 3, vector 168
-Key:        A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
-Plaintext:  A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
-Ciphertext: 5449889254C565DF3ADDFB7A86A93DA9
-Test: Encrypt
-Comment:    Set 3, vector 169
-Key:        A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9
-Plaintext:  A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9
-Ciphertext: 7D21880CCA919B0CE3917A8C598025FA
-Test: Encrypt
-Comment:    Set 3, vector 170
-Key:        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Plaintext:  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Ciphertext: 5EE203A6739E822A54D9678B604EFD4F
-Test: Encrypt
-Comment:    Set 3, vector 171
-Key:        ABABABABABABABABABABABABABABABAB
-Plaintext:  ABABABABABABABABABABABABABABABAB
-Ciphertext: 07038EFBEFDE2228F79A6B526306483A
-Test: Encrypt
-Comment:    Set 3, vector 172
-Key:        ACACACACACACACACACACACACACACACAC
-Plaintext:  ACACACACACACACACACACACACACACACAC
-Ciphertext: 78447EBF959FFBD120283CE319FF6005
-Test: Encrypt
-Comment:    Set 3, vector 173
-Key:        ADADADADADADADADADADADADADADADAD
-Plaintext:  ADADADADADADADADADADADADADADADAD
-Ciphertext: 76769D40A286F0FD1C1C6F8895000DE8
-Test: Encrypt
-Comment:    Set 3, vector 174
-Key:        AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE
-Plaintext:  AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE
-Ciphertext: 7E163343CA44FADFAFDE5386CC111437
-Test: Encrypt
-Comment:    Set 3, vector 175
-Key:        AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF
-Plaintext:  AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF
-Ciphertext: 4B1E7FE684222BF783142B5DC396F61D
-Test: Encrypt
-Comment:    Set 3, vector 176
-Key:        B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0
-Plaintext:  B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0
-Ciphertext: 4ECF97472658AC941EC99B255CF95535
-Test: Encrypt
-Comment:    Set 3, vector 177
-Key:        B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1
-Plaintext:  B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1
-Ciphertext: 23EE9DF24C8DC126A04586EFF27DBEAC
-Test: Encrypt
-Comment:    Set 3, vector 178
-Key:        B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2
-Plaintext:  B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2
-Ciphertext: 4B06EE28B7769C4318D509F91D691F39
-Test: Encrypt
-Comment:    Set 3, vector 179
-Key:        B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3
-Plaintext:  B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3
-Ciphertext: 51994EF8283D1D29711F602A7ACDA3CA
-Test: Encrypt
-Comment:    Set 3, vector 180
-Key:        B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4
-Plaintext:  B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4
-Ciphertext: DCBFBE6BE3234BBB61EA68218C89D098
-Test: Encrypt
-Comment:    Set 3, vector 181
-Key:        B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5
-Plaintext:  B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5
-Ciphertext: B84BFA0883546D912BD14807253F8892
-Test: Encrypt
-Comment:    Set 3, vector 182
-Key:        B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6
-Plaintext:  B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6
-Ciphertext: 90C1745C0DB97E70BA362CF2C1D376DF
-Test: Encrypt
-Comment:    Set 3, vector 183
-Key:        B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7
-Plaintext:  B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7
-Ciphertext: 064743C2E8293C1B7619F6E6DEC13B04
-Test: Encrypt
-Comment:    Set 3, vector 184
-Key:        B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8
-Plaintext:  B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8
-Ciphertext: 38D913C68ABEE287368CBA38D8FE9F0D
-Test: Encrypt
-Comment:    Set 3, vector 185
-Key:        B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9
-Plaintext:  B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9
-Ciphertext: B2279D520B33258B7DB221ECDD3C4EBB
-Test: Encrypt
-Comment:    Set 3, vector 186
-Key:        BABABABABABABABABABABABABABABABA
-Plaintext:  BABABABABABABABABABABABABABABABA
-Ciphertext: 8AD710DDAE51BE6D4BE7ABC5443B7F9B
-Test: Encrypt
-Comment:    Set 3, vector 187
-Key:        BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-Plaintext:  BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-Ciphertext: 246BA7624BBF83702764CC1B214A0691
-Test: Encrypt
-Comment:    Set 3, vector 188
-Key:        BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC
-Plaintext:  BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC
-Ciphertext: 80E0360B03FA048A892CD47BD7FE948A
-Test: Encrypt
-Comment:    Set 3, vector 189
-Key:        BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD
-Plaintext:  BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD
-Ciphertext: 09D5D35BB6DBAE0CC9982D6955EAA01C
-Test: Encrypt
-Comment:    Set 3, vector 190
-Key:        BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE
-Plaintext:  BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE
-Ciphertext: EEBDCE2BDE1F25A40184B9C57DD4E49D
-Test: Encrypt
-Comment:    Set 3, vector 191
-Key:        BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF
-Plaintext:  BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF
-Ciphertext: 22706CFCCD2B0BB15ED30E373FA4E945
-Test: Encrypt
-Comment:    Set 3, vector 192
-Key:        C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
-Plaintext:  C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
-Ciphertext: D2A4EEACB5F41D12908DD1E069EC14DC
-Test: Encrypt
-Comment:    Set 3, vector 193
-Key:        C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1
-Plaintext:  C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1
-Ciphertext: E78F614BC7F53C9298098DFEE8ADFB09
-Test: Encrypt
-Comment:    Set 3, vector 194
-Key:        C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2
-Plaintext:  C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2
-Ciphertext: B53E3865A8B28A36EF3A505102A6329D
-Test: Encrypt
-Comment:    Set 3, vector 195
-Key:        C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3
-Plaintext:  C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3
-Ciphertext: 9B32AA8673DFFC47CF8C9B35DDE08DD3
-Test: Encrypt
-Comment:    Set 3, vector 196
-Key:        C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4
-Plaintext:  C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4
-Ciphertext: CE70E7257E6C8686C7407E22ACB3E94B
-Test: Encrypt
-Comment:    Set 3, vector 197
-Key:        C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5
-Plaintext:  C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5
-Ciphertext: 677DB939CA272D717DB4B03EFB70F988
-Test: Encrypt
-Comment:    Set 3, vector 198
-Key:        C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6
-Plaintext:  C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6
-Ciphertext: 6582B069058FA86898A3B12B617C27FD
-Test: Encrypt
-Comment:    Set 3, vector 199
-Key:        C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7
-Plaintext:  C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7
-Ciphertext: 4DFB68486ECF9833FCE74BD663E20768
-Test: Encrypt
-Comment:    Set 3, vector 200
-Key:        C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8
-Plaintext:  C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8
-Ciphertext: 6A3840D2780BABD68A73FAC89C4E8D91
-Test: Encrypt
-Comment:    Set 3, vector 201
-Key:        C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9
-Plaintext:  C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9
-Ciphertext: 44C79926D7EAB9DE5A2B95472A79A7BC
-Test: Encrypt
-Comment:    Set 3, vector 202
-Key:        CACACACACACACACACACACACACACACACA
-Plaintext:  CACACACACACACACACACACACACACACACA
-Ciphertext: 3813E774EE9EFA8FDB2646E607B2A434
-Test: Encrypt
-Comment:    Set 3, vector 203
-Key:        CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB
-Plaintext:  CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB
-Ciphertext: FCA748E6AE5678A047E806F8FF103A65
-Test: Encrypt
-Comment:    Set 3, vector 204
-Key:        CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-Plaintext:  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-Ciphertext: 3E3CC9CBE6952AB968FBBEE0C08BF667
-Test: Encrypt
-Comment:    Set 3, vector 205
-Key:        CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD
-Plaintext:  CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD
-Ciphertext: 4FFF3EDC7BCB70E7846DCC4688F9CB3A
-Test: Encrypt
-Comment:    Set 3, vector 206
-Key:        CECECECECECECECECECECECECECECECE
-Plaintext:  CECECECECECECECECECECECECECECECE
-Ciphertext: 5728481E82E0DC1631EC611F63B9DD3C
-Test: Encrypt
-Comment:    Set 3, vector 207
-Key:        CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF
-Plaintext:  CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF
-Ciphertext: 182BB0D3C52E56248FDA1D343844891D
-Test: Encrypt
-Comment:    Set 3, vector 208
-Key:        D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0
-Plaintext:  D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0
-Ciphertext: 6B984FC45D0352F3336E7895ECB6DE0E
-Test: Encrypt
-Comment:    Set 3, vector 209
-Key:        D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1
-Plaintext:  D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1
-Ciphertext: 8DD24A1B23D845E7A6C6D416C7C5B595
-Test: Encrypt
-Comment:    Set 3, vector 210
-Key:        D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2
-Plaintext:  D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2
-Ciphertext: 4F4D69B4563373962007945C3197806C
-Test: Encrypt
-Comment:    Set 3, vector 211
-Key:        D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3
-Plaintext:  D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3
-Ciphertext: DD333390213EB632A51EAE0334A5AEA2
-Test: Encrypt
-Comment:    Set 3, vector 212
-Key:        D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4
-Plaintext:  D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4
-Ciphertext: D352ACE83BF6A3BC39EA10D751853009
-Test: Encrypt
-Comment:    Set 3, vector 213
-Key:        D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5
-Plaintext:  D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5
-Ciphertext: F2E118276BFCCF6DCDD47E1EAB919BDC
-Test: Encrypt
-Comment:    Set 3, vector 214
-Key:        D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6
-Plaintext:  D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6
-Ciphertext: 688E877D8B69050F2736D0768571E9A0
-Test: Encrypt
-Comment:    Set 3, vector 215
-Key:        D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
-Plaintext:  D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
-Ciphertext: DE6F098E56985B7DCFEC52C897F2E735
-Test: Encrypt
-Comment:    Set 3, vector 216
-Key:        D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8
-Plaintext:  D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8
-Ciphertext: 398FA1FE47E3971DA3F9DFD479C9B1AA
-Test: Encrypt
-Comment:    Set 3, vector 217
-Key:        D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9
-Plaintext:  D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9
-Ciphertext: 6F17B7D7C899B48DAEAD1E90F22AB180
-Test: Encrypt
-Comment:    Set 3, vector 218
-Key:        DADADADADADADADADADADADADADADADA
-Plaintext:  DADADADADADADADADADADADADADADADA
-Ciphertext: D39EBBA5B742F15FCB75D6E656BBF2DA
-Test: Encrypt
-Comment:    Set 3, vector 219
-Key:        DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB
-Plaintext:  DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB
-Ciphertext: 1C6D82247D0BAB18B52CA5293A2C1050
-Test: Encrypt
-Comment:    Set 3, vector 220
-Key:        DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
-Plaintext:  DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
-Ciphertext: B54F248DF57060E40A6A2FA4688C7082
-Test: Encrypt
-Comment:    Set 3, vector 221
-Key:        DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-Plaintext:  DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-Ciphertext: 1BB5EB8732CBAB2E3FC334FAAB8BBFBC
-Test: Encrypt
-Comment:    Set 3, vector 222
-Key:        DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE
-Plaintext:  DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE
-Ciphertext: 3734B4B21B50C4740B90FD863EF8627B
-Test: Encrypt
-Comment:    Set 3, vector 223
-Key:        DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF
-Plaintext:  DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF
-Ciphertext: E22E22E60F981D64B7CB341F12F2B362
-Test: Encrypt
-Comment:    Set 3, vector 224
-Key:        E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0
-Plaintext:  E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0
-Ciphertext: A2A40EB448D87E39B20460E8CB07515A
-Test: Encrypt
-Comment:    Set 3, vector 225
-Key:        E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1
-Plaintext:  E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1
-Ciphertext: 88E6AC929D4D7858015B35D509882C5C
-Test: Encrypt
-Comment:    Set 3, vector 226
-Key:        E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
-Plaintext:  E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
-Ciphertext: FFE4B3B5D0E8229F5428FA2945DBD5EE
-Test: Encrypt
-Comment:    Set 3, vector 227
-Key:        E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3
-Plaintext:  E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3
-Ciphertext: FCD5F897398A7796A0DAA1809CA7D870
-Test: Encrypt
-Comment:    Set 3, vector 228
-Key:        E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4
-Plaintext:  E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4
-Ciphertext: 7F3556B18EC8F04D953DCD27549AF1FC
-Test: Encrypt
-Comment:    Set 3, vector 229
-Key:        E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
-Plaintext:  E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
-Ciphertext: 4433546A8E63AE841CD78B074ED0B91F
-Test: Encrypt
-Comment:    Set 3, vector 230
-Key:        E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6
-Plaintext:  E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6
-Ciphertext: 2E04671C718BD6C3D115DB2D827A6669
-Test: Encrypt
-Comment:    Set 3, vector 231
-Key:        E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7
-Plaintext:  E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7
-Ciphertext: AAE7DA4B977F5EED28F9AF01F8FD47B4
-Test: Encrypt
-Comment:    Set 3, vector 232
-Key:        E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8
-Plaintext:  E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8
-Ciphertext: 84AD8F52D51BD3D8E4D8318AF6DB9786
-Test: Encrypt
-Comment:    Set 3, vector 233
-Key:        E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9
-Plaintext:  E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9
-Ciphertext: 95EFA65090BD603A1F65A21A43104F79
-Test: Encrypt
-Comment:    Set 3, vector 234
-Key:        EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA
-Plaintext:  EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA
-Ciphertext: 1B83F51E157BBA004CC5BD05986017C8
-Test: Encrypt
-Comment:    Set 3, vector 235
-Key:        EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB
-Plaintext:  EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB
-Ciphertext: A0C37A641126D5801C4259DFD38E8E8A
-Test: Encrypt
-Comment:    Set 3, vector 236
-Key:        ECECECECECECECECECECECECECECECEC
-Plaintext:  ECECECECECECECECECECECECECECECEC
-Ciphertext: 3153A212C2E4727C1032223134342B31
-Test: Encrypt
-Comment:    Set 3, vector 237
-Key:        EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED
-Plaintext:  EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED
-Ciphertext: C680D98CAF4409CF31BABCF67352E1D5
-Test: Encrypt
-Comment:    Set 3, vector 238
-Key:        EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-Plaintext:  EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-Ciphertext: A7FC85C8459274B836B6F0CBED80AF49
-Test: Encrypt
-Comment:    Set 3, vector 239
-Key:        EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF
-Plaintext:  EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF
-Ciphertext: 5CA8B8A4B8AF15A6184259831B18BBB5
-Test: Encrypt
-Comment:    Set 3, vector 240
-Key:        F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
-Plaintext:  F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
-Ciphertext: F118089963B9AB37776B10B0D4CCEBA4
-Test: Encrypt
-Comment:    Set 3, vector 241
-Key:        F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-Plaintext:  F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-Ciphertext: C233B864E78E9EC272112A34FF7AADBA
-Test: Encrypt
-Comment:    Set 3, vector 242
-Key:        F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
-Plaintext:  F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
-Ciphertext: 2B1C503E7F755A47CC4C57BEB4135B46
-Test: Encrypt
-Comment:    Set 3, vector 243
-Key:        F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
-Plaintext:  F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
-Ciphertext: 60D8177BE1044FC5F46DA2B3CAA33102
-Test: Encrypt
-Comment:    Set 3, vector 244
-Key:        F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
-Plaintext:  F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
-Ciphertext: BA1CBC06977ECE57C5CBC12D99324E00
-Test: Encrypt
-Comment:    Set 3, vector 245
-Key:        F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5
-Plaintext:  F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5
-Ciphertext: 01C8561E24A32F53FBAF8864AEE803E3
-Test: Encrypt
-Comment:    Set 3, vector 246
-Key:        F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6
-Plaintext:  F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6
-Ciphertext: 797ECFA429014F26B9E62D58B4C1B84E
-Test: Encrypt
-Comment:    Set 3, vector 247
-Key:        F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7
-Plaintext:  F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7
-Ciphertext: 6AD7FA698A7F3EA8AE13B1DF537BF6EA
-Test: Encrypt
-Comment:    Set 3, vector 248
-Key:        F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8
-Plaintext:  F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8
-Ciphertext: 49157343BE8B8ED4E59C1AEC3CAB1B94
-Test: Encrypt
-Comment:    Set 3, vector 249
-Key:        F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9
-Plaintext:  F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9
-Ciphertext: D33C742DEA4A2C64983766E3068EC200
-Test: Encrypt
-Comment:    Set 3, vector 250
-Key:        FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA
-Plaintext:  FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA
-Ciphertext: 66AE1EAFB45091982E40000BADE002C9
-Test: Encrypt
-Comment:    Set 3, vector 251
-Key:        FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB
-Plaintext:  FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB
-Ciphertext: B6614B0FF5924D0C1EB2C461560BFC01
-Test: Encrypt
-Comment:    Set 3, vector 252
-Key:        FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
-Plaintext:  FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
-Ciphertext: 5B4DFBE2BB7666425A858C4769D8DAD0
-Test: Encrypt
-Comment:    Set 3, vector 253
-Key:        FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
-Plaintext:  FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
-Ciphertext: 2F142B9044DEC39915ED9347E7B0ED1E
-Test: Encrypt
-Comment:    Set 3, vector 254
-Key:        FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
-Plaintext:  FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
-Ciphertext: 17E02528D6655CEA7BE6B8548FC2DA65
-Test: Encrypt
-Comment:    Set 3, vector 255
-Key:        FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-Plaintext:  FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-Ciphertext: 25DD9EB9DD67FBC6E8431F56F4FBE651
-Test: Encrypt
-Comment: Tests with 192-bit keys
-Comment:    Set 1, vector 0
-Key:        800000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1B6220D365C2176C1D41A5826520FCA1
-Test: Encrypt
-Comment:    Set 1, vector 1
-Key:        400000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0F6DAEEA95CFC8925F23AFA932DF489B
-Test: Encrypt
-Comment:    Set 1, vector 2
-Key:        200000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7330199225AD384F8DD39582D61389BB
-Test: Encrypt
-Comment:    Set 1, vector 3
-Key:        100000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2CC5A47D5C62F70634E27BA332D37D53
-Test: Encrypt
-Comment:    Set 1, vector 4
-Key:        080000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CDF1D23AB15E20AE8E9A2FE380920897
-Test: Encrypt
-Comment:    Set 1, vector 5
-Key:        040000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CE995A8AF1FD7E0F5FA07ED654841EEE
-Test: Encrypt
-Comment:    Set 1, vector 6
-Key:        020000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0678BA4335E44354363005F278AF83A4
-Test: Encrypt
-Comment:    Set 1, vector 7
-Key:        010000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6162ED593434D738B44D642254066FB4
-Test: Encrypt
-Comment:    Set 1, vector 8
-Key:        008000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F7F146E61396EC9AB9F7D04BFA6D37F5
-Test: Encrypt
-Comment:    Set 1, vector 9
-Key:        004000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8BF96FE41906AF2CC702726B963E56A6
-Test: Encrypt
-Comment:    Set 1, vector 10
-Key:        002000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B164168F7D6BADBCCBE19B2BCF4EAA91
-Test: Encrypt
-Comment:    Set 1, vector 11
-Key:        001000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5A81508260797F7BCFD4E0DB62F5E3A7
-Test: Encrypt
-Comment:    Set 1, vector 12
-Key:        000800000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 36641169D53E61CB32B97B98C37DF262
-Test: Encrypt
-Comment:    Set 1, vector 13
-Key:        000400000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EFFEC137ECEE5D439F8B21ACE1D863F8
-Test: Encrypt
-Comment:    Set 1, vector 14
-Key:        000200000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7462DEB8C153EECB6C78CE690E764B53
-Test: Encrypt
-Comment:    Set 1, vector 15
-Key:        000100000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 34F873BD3D6FF62B18C3778B123B15C5
-Test: Encrypt
-Comment:    Set 1, vector 16
-Key:        000080000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9850C8E08F952EE1D173B1A4A78686F5
-Test: Encrypt
-Comment:    Set 1, vector 17
-Key:        000040000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3285534795E8547B68580343DC5BF330
-Test: Encrypt
-Comment:    Set 1, vector 18
-Key:        000020000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E0495AA72CB3C27233850F3192254232
-Test: Encrypt
-Comment:    Set 1, vector 19
-Key:        000010000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 33ED350E83B7FE34E74C22A883EC6728
-Test: Encrypt
-Comment:    Set 1, vector 20
-Key:        000008000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 912D73428CBA7F631AE577854C111C91
-Test: Encrypt
-Comment:    Set 1, vector 21
-Key:        000004000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 76E747DC49B25D8E6EBE5DE83980AB57
-Test: Encrypt
-Comment:    Set 1, vector 22
-Key:        000002000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 82A2ED3BE0371C98C176AA7E7DF9FF8D
-Test: Encrypt
-Comment:    Set 1, vector 23
-Key:        000001000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 96282A04DD3405294F9714B396D5219A
-Test: Encrypt
-Comment:    Set 1, vector 24
-Key:        000000800000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 86ECD349003006A6DE29D4AAC1ACE296
-Test: Encrypt
-Comment:    Set 1, vector 25
-Key:        000000400000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7A9A9F2BBEA203ECE7C9F531B6D41B6A
-Test: Encrypt
-Comment:    Set 1, vector 26
-Key:        000000200000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BA5FE8CD976DEA118728C2950D325042
-Test: Encrypt
-Comment:    Set 1, vector 27
-Key:        000000100000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 46F29ADE35C839AE69454CB0C9EEBF71
-Test: Encrypt
-Comment:    Set 1, vector 28
-Key:        000000080000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E5B83E23535FC32DD8153C46EC894FAD
-Test: Encrypt
-Comment:    Set 1, vector 29
-Key:        000000040000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 877CC6280A8E7740F710AEA535DADFD4
-Test: Encrypt
-Comment:    Set 1, vector 30
-Key:        000000020000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 284D6EEC89721D40BDCFD260AF4FF052
-Test: Encrypt
-Comment:    Set 1, vector 31
-Key:        000000010000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6482ED6C71B60F1ED92B9913B5EAF6B3
-Test: Encrypt
-Comment:    Set 1, vector 32
-Key:        000000008000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 30135C97C9C23C8C64612D6BB813AD61
-Test: Encrypt
-Comment:    Set 1, vector 33
-Key:        000000004000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 336F70CF867920BBC00699CA8DBDF6DA
-Test: Encrypt
-Comment:    Set 1, vector 34
-Key:        000000002000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3F4003C9600469670DE0B1B20ED5F33D
-Test: Encrypt
-Comment:    Set 1, vector 35
-Key:        000000001000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9D5FFEDF7166F74DCAF2D643E2934ABE
-Test: Encrypt
-Comment:    Set 1, vector 36
-Key:        000000000800000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9BFAC0EEB78A21F006DB6847CC7D7929
-Test: Encrypt
-Comment:    Set 1, vector 37
-Key:        000000000400000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B64332DC813BE982897C1E14DA808F5D
-Test: Encrypt
-Comment:    Set 1, vector 38
-Key:        000000000200000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AB8FCEB76C37E5FE5737DA4382F14347
-Test: Encrypt
-Comment:    Set 1, vector 39
-Key:        000000000100000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C9C121859975147145AF6CAE313BA00D
-Test: Encrypt
-Comment:    Set 1, vector 40
-Key:        000000000080000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9B1307BF36B6FF5BA4AD9C6574B63955
-Test: Encrypt
-Comment:    Set 1, vector 41
-Key:        000000000040000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8842C3EBB26C1863440D52DC3B26414B
-Test: Encrypt
-Comment:    Set 1, vector 42
-Key:        000000000020000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: ADEADD3E035D591B2197D5B9C9B06ADA
-Test: Encrypt
-Comment:    Set 1, vector 43
-Key:        000000000010000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4F36AD57F9BA5FB6624E504D0FC2DC93
-Test: Encrypt
-Comment:    Set 1, vector 44
-Key:        000000000008000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 92A364EEB2D964949210C7FF14BAE7B5
-Test: Encrypt
-Comment:    Set 1, vector 45
-Key:        000000000004000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EA027B9653456B8A41910FE19A90FD50
-Test: Encrypt
-Comment:    Set 1, vector 46
-Key:        000000000002000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 254A41CA04427C9E87F65BB52A0ACF74
-Test: Encrypt
-Comment:    Set 1, vector 47
-Key:        000000000001000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F935FD318C08AC6CD57A028384FA447B
-Test: Encrypt
-Comment:    Set 1, vector 48
-Key:        000000000000800000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E5BA10850CBCFF8F42FEC0E658685096
-Test: Encrypt
-Comment:    Set 1, vector 49
-Key:        000000000000400000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6F145C7015923CE515D78CEF0157CCC6
-Test: Encrypt
-Comment:    Set 1, vector 50
-Key:        000000000000200000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3A6FCA03EA6DBF6996FD2CE99EC17C31
-Test: Encrypt
-Comment:    Set 1, vector 51
-Key:        000000000000100000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 21E2ED82498B110EAEAD90F1BBEA03A6
-Test: Encrypt
-Comment:    Set 1, vector 52
-Key:        000000000000080000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6B16ED3CBADC3151323891C373C43DFB
-Test: Encrypt
-Comment:    Set 1, vector 53
-Key:        000000000000040000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B621A20E0CA41620C2A483154DB6102C
-Test: Encrypt
-Comment:    Set 1, vector 54
-Key:        000000000000020000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8C754011BD3B87AA1EB3607B98E6CE86
-Test: Encrypt
-Comment:    Set 1, vector 55
-Key:        000000000000010000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FEEE2DFBA1DD3DBF4017B13833117816
-Test: Encrypt
-Comment:    Set 1, vector 56
-Key:        000000000000008000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 62A9C6CC76519FCF8FAD9EED0552CEB3
-Test: Encrypt
-Comment:    Set 1, vector 57
-Key:        000000000000004000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FF822FAFB79035AB813246BA5234D675
-Test: Encrypt
-Comment:    Set 1, vector 58
-Key:        000000000000002000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F3E17F2406DF31E7074DF97B062396B9
-Test: Encrypt
-Comment:    Set 1, vector 59
-Key:        000000000000001000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3F4F81B3573B6756ADD3005087EDE501
-Test: Encrypt
-Comment:    Set 1, vector 60
-Key:        000000000000000800000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 65A03A1A1C44191B73D576B7C75B5C32
-Test: Encrypt
-Comment:    Set 1, vector 61
-Key:        000000000000000400000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B08EBB2097DA76C34E2D8A869DCD3D7D
-Test: Encrypt
-Comment:    Set 1, vector 62
-Key:        000000000000000200000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BA7B88E1B1FCFA03C3DBB2EDE047F5DC
-Test: Encrypt
-Comment:    Set 1, vector 63
-Key:        000000000000000100000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1B3CB3884C12691CC66202EDB0838106
-Test: Encrypt
-Comment:    Set 1, vector 64
-Key:        000000000000000080000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4A85BE25546958B1E91801A35C7386E2
-Test: Encrypt
-Comment:    Set 1, vector 65
-Key:        000000000000000040000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F14CAACDD919872396DBCDCBEF9A384C
-Test: Encrypt
-Comment:    Set 1, vector 66
-Key:        000000000000000020000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 23B0D4FC870309DFEF7AFC04C46AF26A
-Test: Encrypt
-Comment:    Set 1, vector 67
-Key:        000000000000000010000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C93604723C3DBBC66AFF87AB1864C76C
-Test: Encrypt
-Comment:    Set 1, vector 68
-Key:        000000000000000008000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6C14E822857BA0983AAC42995D973092
-Test: Encrypt
-Comment:    Set 1, vector 69
-Key:        000000000000000004000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 700AFEA175DBEAE688F90B8D32990560
-Test: Encrypt
-Comment:    Set 1, vector 70
-Key:        000000000000000002000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 54AE9EFA09FC70A852212752B83AF1F2
-Test: Encrypt
-Comment:    Set 1, vector 71
-Key:        000000000000000001000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2474EF8E660333FC9763E137DDB1AA1F
-Test: Encrypt
-Comment:    Set 1, vector 72
-Key:        000000000000000000800000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E52ECE1281186644B6A2228A89BD2304
-Test: Encrypt
-Comment:    Set 1, vector 73
-Key:        000000000000000000400000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 610A02ECEC1B5BA0C6EC7CE8D6197722
-Test: Encrypt
-Comment:    Set 1, vector 74
-Key:        000000000000000000200000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8A8AB3DA5CE37E1D68B496F110E4F941
-Test: Encrypt
-Comment:    Set 1, vector 75
-Key:        000000000000000000100000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6961F3A7E6550753C55E4C03FA7869E9
-Test: Encrypt
-Comment:    Set 1, vector 76
-Key:        000000000000000000080000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D8F149C207FAD4480BA2FC609BEB4471
-Test: Encrypt
-Comment:    Set 1, vector 77
-Key:        000000000000000000040000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DE9DC95336F2088935881DD57C0A4B98
-Test: Encrypt
-Comment:    Set 1, vector 78
-Key:        000000000000000000020000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DC4EA3B0F76439DB8847FE61C1A64F7A
-Test: Encrypt
-Comment:    Set 1, vector 79
-Key:        000000000000000000010000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 21D4802EB72232AD2B0B46C50C98445B
-Test: Encrypt
-Comment:    Set 1, vector 80
-Key:        000000000000000000008000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D6C32522B546BAC316E5F3A07F83FFE6
-Test: Encrypt
-Comment:    Set 1, vector 81
-Key:        000000000000000000004000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4B07B02C86B579A0C68D916DF8A1EB76
-Test: Encrypt
-Comment:    Set 1, vector 82
-Key:        000000000000000000002000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 060B15735C978DF9F4F3ED503B95D6C3
-Test: Encrypt
-Comment:    Set 1, vector 83
-Key:        000000000000000000001000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3040B3C9C560C968FE14664E3496D5D1
-Test: Encrypt
-Comment:    Set 1, vector 84
-Key:        000000000000000000000800000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8971CFB236598BBD46E47E172B0690F7
-Test: Encrypt
-Comment:    Set 1, vector 85
-Key:        000000000000000000000400000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8D7FAB4985A0BAC4CAEE341972D49CF4
-Test: Encrypt
-Comment:    Set 1, vector 86
-Key:        000000000000000000000200000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: ED29003D83CB7D7747C17A8691323021
-Test: Encrypt
-Comment:    Set 1, vector 87
-Key:        000000000000000000000100000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 98EBFDA32C99438F0A549B7BFAAC0635
-Test: Encrypt
-Comment:    Set 1, vector 88
-Key:        000000000000000000000080000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A59AB8EAF03BCDFD7CB0A9650E59F27B
-Test: Encrypt
-Comment:    Set 1, vector 89
-Key:        000000000000000000000040000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 71422297CE93952D46FFC27530D6255D
-Test: Encrypt
-Comment:    Set 1, vector 90
-Key:        000000000000000000000020000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 519E2607543C3AFE49190EBCA12ADBBC
-Test: Encrypt
-Comment:    Set 1, vector 91
-Key:        000000000000000000000010000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8989C908C50E008E70EA5B897DC3544C
-Test: Encrypt
-Comment:    Set 1, vector 92
-Key:        000000000000000000000008000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 981C174277F29F8DD06E1D4C97D9816F
-Test: Encrypt
-Comment:    Set 1, vector 93
-Key:        000000000000000000000004000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0279DEC16A532E160AA5B4FF7682F696
-Test: Encrypt
-Comment:    Set 1, vector 94
-Key:        000000000000000000000002000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C3BFFB31FCB0A61188DE9AA606CB286C
-Test: Encrypt
-Comment:    Set 1, vector 95
-Key:        000000000000000000000001000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5C1C4966B387A41D52F83BBF322D25DF
-Test: Encrypt
-Comment:    Set 1, vector 96
-Key:        000000000000000000000000800000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6602ECC6AF62EF1EB4D17E2487A64F7A
-Test: Encrypt
-Comment:    Set 1, vector 97
-Key:        000000000000000000000000400000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2DA725366BD7774BA235183CC9B273B4
-Test: Encrypt
-Comment:    Set 1, vector 98
-Key:        000000000000000000000000200000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 71B29CF87C313F0B89B75251EFC4FF7F
-Test: Encrypt
-Comment:    Set 1, vector 99
-Key:        000000000000000000000000100000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4D9BDBCBA04C54AEAA7F48470428ECA2
-Test: Encrypt
-Comment:    Set 1, vector 100
-Key:        000000000000000000000000080000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C6BC53A3C6D6C8A6F12B97B151BFBB3F
-Test: Encrypt
-Comment:    Set 1, vector 101
-Key:        000000000000000000000000040000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FD3E8D6732BBC2AA13F03F9AB0BCEC14
-Test: Encrypt
-Comment:    Set 1, vector 102
-Key:        000000000000000000000000020000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7D5ED8FEF289FF7F8953278E0A0297A1
-Test: Encrypt
-Comment:    Set 1, vector 103
-Key:        000000000000000000000000010000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 84A20023EF5E31771802E8A2FFBA485B
-Test: Encrypt
-Comment:    Set 1, vector 104
-Key:        000000000000000000000000008000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7BD6E573AE79F0FA9FE38ECF6011D756
-Test: Encrypt
-Comment:    Set 1, vector 105
-Key:        000000000000000000000000004000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EB58EA6B6DE1282A7BB9EA1A2254A542
-Test: Encrypt
-Comment:    Set 1, vector 106
-Key:        000000000000000000000000002000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 30A697E325C4D3BEC8E69A2DAD2AE5BB
-Test: Encrypt
-Comment:    Set 1, vector 107
-Key:        000000000000000000000000001000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3205F6FEAA38500AC74BE66FEDF3231E
-Test: Encrypt
-Comment:    Set 1, vector 108
-Key:        000000000000000000000000000800000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 83C007676041E81B836886ABED807A71
-Test: Encrypt
-Comment:    Set 1, vector 109
-Key:        000000000000000000000000000400000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 24B33B3138855437CC11D3792A1FD00F
-Test: Encrypt
-Comment:    Set 1, vector 110
-Key:        000000000000000000000000000200000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 26324D7E2C055366910464699D73608A
-Test: Encrypt
-Comment:    Set 1, vector 111
-Key:        000000000000000000000000000100000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F9A94A959AE7CD2A9D5FB7274703906B
-Test: Encrypt
-Comment:    Set 1, vector 112
-Key:        000000000000000000000000000080000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AD13D85E47EFC76B67ED25791E119A5C
-Test: Encrypt
-Comment:    Set 1, vector 113
-Key:        000000000000000000000000000040000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5FB689176B296F2E579FC69A18FA07EB
-Test: Encrypt
-Comment:    Set 1, vector 114
-Key:        000000000000000000000000000020000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 936DFBA0A052A299C195F34A66C0CEDF
-Test: Encrypt
-Comment:    Set 1, vector 115
-Key:        000000000000000000000000000010000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 486C03278BB30F26D25AE0D6348C9491
-Test: Encrypt
-Comment:    Set 1, vector 116
-Key:        000000000000000000000000000008000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FCE14E6CE2073B5E8D1572A1EC1BD502
-Test: Encrypt
-Comment:    Set 1, vector 117
-Key:        000000000000000000000000000004000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5F15B8A64EDBF0E55C3B8BB67BC9B2E1
-Test: Encrypt
-Comment:    Set 1, vector 118
-Key:        000000000000000000000000000002000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7BDC738A342891C7BE06E87E12F71418
-Test: Encrypt
-Comment:    Set 1, vector 119
-Key:        000000000000000000000000000001000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 31C6FEDABBC8C8AD64C27505F02BC7CC
-Test: Encrypt
-Comment:    Set 1, vector 120
-Key:        000000000000000000000000000000800000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 33CCD97EB8C3C06B7BCD16659E1F9837
-Test: Encrypt
-Comment:    Set 1, vector 121
-Key:        000000000000000000000000000000400000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 12C3089895D4A1C1D03DB0071F88AB1B
-Test: Encrypt
-Comment:    Set 1, vector 122
-Key:        000000000000000000000000000000200000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8EB4796C7F7C3B0858750EBE3BAA335C
-Test: Encrypt
-Comment:    Set 1, vector 123
-Key:        000000000000000000000000000000100000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 67169AF324151E92C6B7C31687B83783
-Test: Encrypt
-Comment:    Set 1, vector 124
-Key:        000000000000000000000000000000080000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AB0E10564D41594B55CE3D5B088D93B4
-Test: Encrypt
-Comment:    Set 1, vector 125
-Key:        000000000000000000000000000000040000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 45228986B08E63728239ADC9C249E475
-Test: Encrypt
-Comment:    Set 1, vector 126
-Key:        000000000000000000000000000000020000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CA7E48D5A4CD15984CA9EF99EC789EFD
-Test: Encrypt
-Comment:    Set 1, vector 127
-Key:        000000000000000000000000000000010000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B4DD56FF85F7ABBEB9E0F5AE6B0E491D
-Test: Encrypt
-Comment:    Set 1, vector 128
-Key:        000000000000000000000000000000008000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 044BE36D2F5A3D0FEA74443538F55393
-Test: Encrypt
-Comment:    Set 1, vector 129
-Key:        000000000000000000000000000000004000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 531EC401FB7C3BFADF64BB08E0DD9992
-Test: Encrypt
-Comment:    Set 1, vector 130
-Key:        000000000000000000000000000000002000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EA8D6B6963EC2267050F8CF5D1D1D939
-Test: Encrypt
-Comment:    Set 1, vector 131
-Key:        000000000000000000000000000000001000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CF5D7F27462FF7415D4E5ECBAEE0797C
-Test: Encrypt
-Comment:    Set 1, vector 132
-Key:        000000000000000000000000000000000800000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DF28B8322D4B8606FF3EFF09D39697B0
-Test: Encrypt
-Comment:    Set 1, vector 133
-Key:        000000000000000000000000000000000400000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 956EF889AAB218E21FAF8E9CC2AE41F9
-Test: Encrypt
-Comment:    Set 1, vector 134
-Key:        000000000000000000000000000000000200000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AD0CF3C46F420E96B876DD55515B4B80
-Test: Encrypt
-Comment:    Set 1, vector 135
-Key:        000000000000000000000000000000000100000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EC8620D3B9B456633AD174573CF82ABD
-Test: Encrypt
-Comment:    Set 1, vector 136
-Key:        000000000000000000000000000000000080000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A7CC6C810C1433B8D130594A48A36F69
-Test: Encrypt
-Comment:    Set 1, vector 137
-Key:        000000000000000000000000000000000040000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B02C5AF13D523A2A62E9F3829F9E3364
-Test: Encrypt
-Comment:    Set 1, vector 138
-Key:        000000000000000000000000000000000020000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5AC8368EC6150F08CC2C44DBA8A9D84F
-Test: Encrypt
-Comment:    Set 1, vector 139
-Key:        000000000000000000000000000000000010000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3BD51735D6087217EEF17B40750D701F
-Test: Encrypt
-Comment:    Set 1, vector 140
-Key:        000000000000000000000000000000000008000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 330CC76A5529364B08F722C6206214E7
-Test: Encrypt
-Comment:    Set 1, vector 141
-Key:        000000000000000000000000000000000004000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 13CA2152CB81267D8429670A8D983592
-Test: Encrypt
-Comment:    Set 1, vector 142
-Key:        000000000000000000000000000000000002000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3943D67CE79CB8519EB9A5D1021988ED
-Test: Encrypt
-Comment:    Set 1, vector 143
-Key:        000000000000000000000000000000000001000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 642858D825E8640718ABE6174BD04A32
-Test: Encrypt
-Comment:    Set 1, vector 144
-Key:        000000000000000000000000000000000000800000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F22616DE88A4CCBF97CF2DB709237EC7
-Test: Encrypt
-Comment:    Set 1, vector 145
-Key:        000000000000000000000000000000000000400000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B90D7F6BF0D9FC11A01F2B33194806DB
-Test: Encrypt
-Comment:    Set 1, vector 146
-Key:        000000000000000000000000000000000000200000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C161D350DC897B210D0D0CE8CE78F4B4
-Test: Encrypt
-Comment:    Set 1, vector 147
-Key:        000000000000000000000000000000000000100000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 66E46482150E7CF9BCBE60AF7BCA6892
-Test: Encrypt
-Comment:    Set 1, vector 148
-Key:        000000000000000000000000000000000000080000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B17C912E085D8854F220555EB0FA89BD
-Test: Encrypt
-Comment:    Set 1, vector 149
-Key:        000000000000000000000000000000000000040000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6FD6A99633FBD3A6D238CADF37824AD2
-Test: Encrypt
-Comment:    Set 1, vector 150
-Key:        000000000000000000000000000000000000020000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9DE6D76D9A7E4AAB7A58EECE0E153D73
-Test: Encrypt
-Comment:    Set 1, vector 151
-Key:        000000000000000000000000000000000000010000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B4716A7DB10E3B8D1475C7EFB929F93A
-Test: Encrypt
-Comment:    Set 1, vector 152
-Key:        000000000000000000000000000000000000008000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3D0F65F16AD143FB2FABDF4DFE621398
-Test: Encrypt
-Comment:    Set 1, vector 153
-Key:        000000000000000000000000000000000000004000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 249F1415D963DE146F4141C200B81D1D
-Test: Encrypt
-Comment:    Set 1, vector 154
-Key:        000000000000000000000000000000000000002000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 454CD7040ED3851C3894F6259CE0D3FE
-Test: Encrypt
-Comment:    Set 1, vector 155
-Key:        000000000000000000000000000000000000001000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4D613EE6FA78A573ECBE989A64193E0C
-Test: Encrypt
-Comment:    Set 1, vector 156
-Key:        000000000000000000000000000000000000000800000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B39384E429291B9C22005BC9B3FF2DEF
-Test: Encrypt
-Comment:    Set 1, vector 157
-Key:        000000000000000000000000000000000000000400000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 957D0B27740C952E45DB97C8814F49C0
-Test: Encrypt
-Comment:    Set 1, vector 158
-Key:        000000000000000000000000000000000000000200000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2879F58F238865D877D8C276CA9E9102
-Test: Encrypt
-Comment:    Set 1, vector 159
-Key:        000000000000000000000000000000000000000100000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EA5B920037608FC9D51F39488D4666F7
-Test: Encrypt
-Comment:    Set 1, vector 160
-Key:        000000000000000000000000000000000000000080000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7659A705ABCA25205078541E713088BC
-Test: Encrypt
-Comment:    Set 1, vector 161
-Key:        000000000000000000000000000000000000000040000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 47E340BB8BF2E8E1015BEFB68C7B1100
-Test: Encrypt
-Comment:    Set 1, vector 162
-Key:        000000000000000000000000000000000000000020000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 777E3E572CA33076B2CB34226CC70158
-Test: Encrypt
-Comment:    Set 1, vector 163
-Key:        000000000000000000000000000000000000000010000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1FEC7C6719C7CA2E9A981851C5CEE204
-Test: Encrypt
-Comment:    Set 1, vector 164
-Key:        000000000000000000000000000000000000000008000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9AF07DABE083EFDA75708A36AEB74CAF
-Test: Encrypt
-Comment:    Set 1, vector 165
-Key:        000000000000000000000000000000000000000004000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5D1482F8EF9CB18911BB7F78BC3B89FC
-Test: Encrypt
-Comment:    Set 1, vector 166
-Key:        000000000000000000000000000000000000000002000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5242753E01D470DD8C2B73A986BA009F
-Test: Encrypt
-Comment:    Set 1, vector 167
-Key:        000000000000000000000000000000000000000001000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 83AE5BC112B73AB7978D13DD534B770B
-Test: Encrypt
-Comment:    Set 1, vector 168
-Key:        000000000000000000000000000000000000000000800000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 848EB7330A82B91D36FBEFF6E6CE1347
-Test: Encrypt
-Comment:    Set 1, vector 169
-Key:        000000000000000000000000000000000000000000400000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F1B14465EFFD3E14DD1BAC6E0FA4E5BD
-Test: Encrypt
-Comment:    Set 1, vector 170
-Key:        000000000000000000000000000000000000000000200000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5ACD25AA05AFD21F43F6A51709FD0B6A
-Test: Encrypt
-Comment:    Set 1, vector 171
-Key:        000000000000000000000000000000000000000000100000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 12321AEFA53F1503E3A473F729388CBD
-Test: Encrypt
-Comment:    Set 1, vector 172
-Key:        000000000000000000000000000000000000000000080000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1602DBA20E2ACFDDCC78390B473B322B
-Test: Encrypt
-Comment:    Set 1, vector 173
-Key:        000000000000000000000000000000000000000000040000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 14C1853C3CF3CDFCE3799D5C130138EC
-Test: Encrypt
-Comment:    Set 1, vector 174
-Key:        000000000000000000000000000000000000000000020000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DC17F9E8236350BDC285F9B2F88F670F
-Test: Encrypt
-Comment:    Set 1, vector 175
-Key:        000000000000000000000000000000000000000000010000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: ABA03FEE8133DD4ED9B8194B643E20CE
-Test: Encrypt
-Comment:    Set 1, vector 176
-Key:        000000000000000000000000000000000000000000008000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5822E80530C7CECCE4F56CF1691B386F
-Test: Encrypt
-Comment:    Set 1, vector 177
-Key:        000000000000000000000000000000000000000000004000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 25CFA6F1B9BE5E14DFAF87A44B3B2E3D
-Test: Encrypt
-Comment:    Set 1, vector 178
-Key:        000000000000000000000000000000000000000000002000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5ED866CBC298B4DEE46C1A02F958F1F5
-Test: Encrypt
-Comment:    Set 1, vector 179
-Key:        000000000000000000000000000000000000000000001000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BD2B63C026EB0E58D26ED16D2ED64A3E
-Test: Encrypt
-Comment:    Set 1, vector 180
-Key:        000000000000000000000000000000000000000000000800
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9FFCFF9CF9E1483BC7971888246AF9FE
-Test: Encrypt
-Comment:    Set 1, vector 181
-Key:        000000000000000000000000000000000000000000000400
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 367C409AEE218E02DEAC8751698BA1B8
-Test: Encrypt
-Comment:    Set 1, vector 182
-Key:        000000000000000000000000000000000000000000000200
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 248E3A3C0360B44C512A9AC3CAAEC21B
-Test: Encrypt
-Comment:    Set 1, vector 183
-Key:        000000000000000000000000000000000000000000000100
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 49B47C542CA396260B53A34372985612
-Test: Encrypt
-Comment:    Set 1, vector 184
-Key:        000000000000000000000000000000000000000000000080
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CE35FDBDBE086EA8A501A4571925A95F
-Test: Encrypt
-Comment:    Set 1, vector 185
-Key:        000000000000000000000000000000000000000000000040
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 873442FAE891B0767220742B84A32A4E
-Test: Encrypt
-Comment:    Set 1, vector 186
-Key:        000000000000000000000000000000000000000000000020
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2C90E17AD13E4E84686BC5B369F0FA8F
-Test: Encrypt
-Comment:    Set 1, vector 187
-Key:        000000000000000000000000000000000000000000000010
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0E7AAAA67D8593A9DFC55083B48B381A
-Test: Encrypt
-Comment:    Set 1, vector 188
-Key:        000000000000000000000000000000000000000000000008
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1D8B58EE529AB17B10AC15D0E6E7ECB2
-Test: Encrypt
-Comment:    Set 1, vector 189
-Key:        000000000000000000000000000000000000000000000004
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1C10FAC725B905AD93B6F4B2430A8D18
-Test: Encrypt
-Comment:    Set 1, vector 190
-Key:        000000000000000000000000000000000000000000000002
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D36CF625EE94AB029CD23253C77C0E15
-Test: Encrypt
-Comment:    Set 1, vector 191
-Key:        000000000000000000000000000000000000000000000001
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E37577F71E0E643C4D3F55219ABA1394
-Test: Encrypt
-Comment:    Set 2, vector 0
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  80000000000000000000000000000000
-Ciphertext: 3EB6CC5618EFC98455B5992050D474E7
-Test: Encrypt
-Comment:    Set 2, vector 1
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  40000000000000000000000000000000
-Ciphertext: A2C645044CBC74DE5A4A161C6B2E98B9
-Test: Encrypt
-Comment:    Set 2, vector 2
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  20000000000000000000000000000000
-Ciphertext: 36A9A8C164BD90D4972AB1BE56C96A0B
-Test: Encrypt
-Comment:    Set 2, vector 3
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  10000000000000000000000000000000
-Ciphertext: 38965592D728F9B765140C0A36A1BCCD
-Test: Encrypt
-Comment:    Set 2, vector 4
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  08000000000000000000000000000000
-Ciphertext: 94CDECA78E10827914A49B5AE7F15643
-Test: Encrypt
-Comment:    Set 2, vector 5
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  04000000000000000000000000000000
-Ciphertext: 11C0DF672B45CDCD311EB86A7560EDA1
-Test: Encrypt
-Comment:    Set 2, vector 6
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  02000000000000000000000000000000
-Ciphertext: 030CAA9B8DE6F8AB88882F9596D9B1B4
-Test: Encrypt
-Comment:    Set 2, vector 7
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  01000000000000000000000000000000
-Ciphertext: FA02C8D1CDDD08B1FE3650DBD8E43C4F
-Test: Encrypt
-Comment:    Set 2, vector 8
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00800000000000000000000000000000
-Ciphertext: 10ACEC25736340600D712338357C7FD4
-Test: Encrypt
-Comment:    Set 2, vector 9
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00400000000000000000000000000000
-Ciphertext: BBEF172E9E18679C6546EA2D9357BDD1
-Test: Encrypt
-Comment:    Set 2, vector 10
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00200000000000000000000000000000
-Ciphertext: 707CF6F582F5921765DBC6E1C79C45B6
-Test: Encrypt
-Comment:    Set 2, vector 11
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00100000000000000000000000000000
-Ciphertext: 3E9206A85F9FE99CD5538FA196E58147
-Test: Encrypt
-Comment:    Set 2, vector 12
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00080000000000000000000000000000
-Ciphertext: 6758B118659E9BB40BB7DC8C3D15ECEC
-Test: Encrypt
-Comment:    Set 2, vector 13
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00040000000000000000000000000000
-Ciphertext: 9BCA6C88B928C1B0F57F99866583A9BC
-Test: Encrypt
-Comment:    Set 2, vector 14
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00020000000000000000000000000000
-Ciphertext: 53D60CF8CA0B41B3991EF892917FA26F
-Test: Encrypt
-Comment:    Set 2, vector 15
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00010000000000000000000000000000
-Ciphertext: 49E438685E189FB95791C655FBF40B3B
-Test: Encrypt
-Comment:    Set 2, vector 16
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00008000000000000000000000000000
-Ciphertext: 6BFE6661C074077EF95DC499CA30A6B9
-Test: Encrypt
-Comment:    Set 2, vector 17
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00004000000000000000000000000000
-Ciphertext: FE82A6754DD56ACBD1895F8257597B74
-Test: Encrypt
-Comment:    Set 2, vector 18
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00002000000000000000000000000000
-Ciphertext: AF4551CFCEAEF2AEE1933C4AB5F036F5
-Test: Encrypt
-Comment:    Set 2, vector 19
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00001000000000000000000000000000
-Ciphertext: 5175E53EA4CA77E085363B2948B77B17
-Test: Encrypt
-Comment:    Set 2, vector 20
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000800000000000000000000000000
-Ciphertext: 19F544B2B2AAE4AF00DE2853F83349A5
-Test: Encrypt
-Comment:    Set 2, vector 21
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000400000000000000000000000000
-Ciphertext: 45A4379AC855738F6FEE3AFFBB2D839F
-Test: Encrypt
-Comment:    Set 2, vector 22
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000200000000000000000000000000
-Ciphertext: 73A390407DD07D4ABEB299A5051A8DD1
-Test: Encrypt
-Comment:    Set 2, vector 23
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000100000000000000000000000000
-Ciphertext: 923B1E3525217E5C7A41CE3BCAE7C083
-Test: Encrypt
-Comment:    Set 2, vector 24
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000080000000000000000000000000
-Ciphertext: F58098D6E68E975C922B05354C0E2094
-Test: Encrypt
-Comment:    Set 2, vector 25
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000040000000000000000000000000
-Ciphertext: 371631601CE2BED9B7706FA4254BBAE5
-Test: Encrypt
-Comment:    Set 2, vector 26
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000020000000000000000000000000
-Ciphertext: 794F34CD64B44095BAB5C470B36E60BE
-Test: Encrypt
-Comment:    Set 2, vector 27
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000010000000000000000000000000
-Ciphertext: 1A4CE8CBFEDB4F64B1A64D926B9BE3A1
-Test: Encrypt
-Comment:    Set 2, vector 28
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000008000000000000000000000000
-Ciphertext: 11C391C85F8FCF72EB03E1C4CC40B529
-Test: Encrypt
-Comment:    Set 2, vector 29
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000004000000000000000000000000
-Ciphertext: 9D8ADDC48EC36BB449234C7C06BEDC0F
-Test: Encrypt
-Comment:    Set 2, vector 30
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000002000000000000000000000000
-Ciphertext: 952A1FAD7FAEA148FA31B50C244CF5C4
-Test: Encrypt
-Comment:    Set 2, vector 31
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000001000000000000000000000000
-Ciphertext: 613E5E9BBBF1B9943B3B5CBD3E69C98F
-Test: Encrypt
-Comment:    Set 2, vector 32
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000800000000000000000000000
-Ciphertext: 5ABF9CB600BB50DB64211DE2DEAEEDBA
-Test: Encrypt
-Comment:    Set 2, vector 33
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000400000000000000000000000
-Ciphertext: 14697658FDA5B1F14C3303F5951CAE70
-Test: Encrypt
-Comment:    Set 2, vector 34
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000200000000000000000000000
-Ciphertext: 2A29179C05F2F5F5909A34130B92BB25
-Test: Encrypt
-Comment:    Set 2, vector 35
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000100000000000000000000000
-Ciphertext: 60A9DAB8068CC085F3B9853D0C1FCF07
-Test: Encrypt
-Comment:    Set 2, vector 36
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000080000000000000000000000
-Ciphertext: D625356ACCE7B9F874754AE52FD1C7BF
-Test: Encrypt
-Comment:    Set 2, vector 37
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000040000000000000000000000
-Ciphertext: 31196A29DAA0A41E982819C26AF0567A
-Test: Encrypt
-Comment:    Set 2, vector 38
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000020000000000000000000000
-Ciphertext: D1763FC019D77CC930BFF2A56F7C9364
-Test: Encrypt
-Comment:    Set 2, vector 39
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000010000000000000000000000
-Ciphertext: BBC9D3C96666B01D0C33CC067ADDA228
-Test: Encrypt
-Comment:    Set 2, vector 40
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000008000000000000000000000
-Ciphertext: 4FC9284574F433DD6C5ADEAB6DC64A06
-Test: Encrypt
-Comment:    Set 2, vector 41
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000004000000000000000000000
-Ciphertext: 7176B9E3628380ADDCF02493DB254B01
-Test: Encrypt
-Comment:    Set 2, vector 42
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000002000000000000000000000
-Ciphertext: C6B124A17B3AB55A983DC2B6E8253FF1
-Test: Encrypt
-Comment:    Set 2, vector 43
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000001000000000000000000000
-Ciphertext: 5853A6B6AB0FC47DEBA33526B628DF6E
-Test: Encrypt
-Comment:    Set 2, vector 44
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000800000000000000000000
-Ciphertext: 416945C1D1902238C42955CFF166D705
-Test: Encrypt
-Comment:    Set 2, vector 45
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000400000000000000000000
-Ciphertext: 2478F40DC7B7FA98E59DA21F1D2140F9
-Test: Encrypt
-Comment:    Set 2, vector 46
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000200000000000000000000
-Ciphertext: 6A912316499FBECA17D1683EAF79FDC9
-Test: Encrypt
-Comment:    Set 2, vector 47
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000100000000000000000000
-Ciphertext: 8A41DB2271FD345BC1DDE61A427E4E3E
-Test: Encrypt
-Comment:    Set 2, vector 48
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000080000000000000000000
-Ciphertext: B6C62C6A14D2276C8FE8D1062C1E8080
-Test: Encrypt
-Comment:    Set 2, vector 49
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000040000000000000000000
-Ciphertext: D23F90169810210A45BD9B8681B24C34
-Test: Encrypt
-Comment:    Set 2, vector 50
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000020000000000000000000
-Ciphertext: EDB2A77815A074B50D88C6C2B15AF814
-Test: Encrypt
-Comment:    Set 2, vector 51
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000010000000000000000000
-Ciphertext: 2D6D81C8FDD2C7D5B98317488846969D
-Test: Encrypt
-Comment:    Set 2, vector 52
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000008000000000000000000
-Ciphertext: 92F2805613A82EE25568B32ED7550DCC
-Test: Encrypt
-Comment:    Set 2, vector 53
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000004000000000000000000
-Ciphertext: E321480A1DE5F36040F1FD170F24802B
-Test: Encrypt
-Comment:    Set 2, vector 54
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000002000000000000000000
-Ciphertext: 3188FFADE35652067E6E2228130762D6
-Test: Encrypt
-Comment:    Set 2, vector 55
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000001000000000000000000
-Ciphertext: B3A3A43D68A82EC54B5D437346375584
-Test: Encrypt
-Comment:    Set 2, vector 56
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000800000000000000000
-Ciphertext: 023ECF3BD9FEB4891366ABE45EC1728B
-Test: Encrypt
-Comment:    Set 2, vector 57
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000400000000000000000
-Ciphertext: 50D8160676748E1718A030F4F512C1C2
-Test: Encrypt
-Comment:    Set 2, vector 58
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000200000000000000000
-Ciphertext: 30DF20541978D9C96D43D609DEF39C00
-Test: Encrypt
-Comment:    Set 2, vector 59
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000100000000000000000
-Ciphertext: BA1AA1682750C0CEB2A87E1A46A7CE0E
-Test: Encrypt
-Comment:    Set 2, vector 60
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000080000000000000000
-Ciphertext: 03AC8261D8F98C90B9CE9C9E47A39AA5
-Test: Encrypt
-Comment:    Set 2, vector 61
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000040000000000000000
-Ciphertext: 4C6C2FDC2693F2A43EAEB180AD8190F8
-Test: Encrypt
-Comment:    Set 2, vector 62
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000020000000000000000
-Ciphertext: B65D2C8CEE12BB4FA127356632CB0ECA
-Test: Encrypt
-Comment:    Set 2, vector 63
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000010000000000000000
-Ciphertext: 6D785867F379BCE03580ED9DE83C0EFD
-Test: Encrypt
-Comment:    Set 2, vector 64
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000008000000000000000
-Ciphertext: D2B25B3EECB454DCE070D11C408D73B2
-Test: Encrypt
-Comment:    Set 2, vector 65
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000004000000000000000
-Ciphertext: 8035FF5E625955D6328F570D53188C0C
-Test: Encrypt
-Comment:    Set 2, vector 66
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000002000000000000000
-Ciphertext: A8BECF868B0D964E04012BE5F8121A9C
-Test: Encrypt
-Comment:    Set 2, vector 67
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000001000000000000000
-Ciphertext: AA76DF2E83C0D31ECFE66A62E16A91D3
-Test: Encrypt
-Comment:    Set 2, vector 68
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000800000000000000
-Ciphertext: BAA324177EA5AF61ADBD27F594297278
-Test: Encrypt
-Comment:    Set 2, vector 69
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000400000000000000
-Ciphertext: 40BBEB33938AFA9BD566991B53B0FDA7
-Test: Encrypt
-Comment:    Set 2, vector 70
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000200000000000000
-Ciphertext: 6F58204780BEA9102506C477CBB3C8FE
-Test: Encrypt
-Comment:    Set 2, vector 71
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000100000000000000
-Ciphertext: D296BCA9261A3410E47FA289BD70B955
-Test: Encrypt
-Comment:    Set 2, vector 72
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000080000000000000
-Ciphertext: 4C57FB4234A64462C6D441A782723777
-Test: Encrypt
-Comment:    Set 2, vector 73
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000040000000000000
-Ciphertext: 33478DE51DBDA949E17CB82373DAF866
-Test: Encrypt
-Comment:    Set 2, vector 74
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000020000000000000
-Ciphertext: 7CC11B9A6A9E2CE13D3596686C624AF0
-Test: Encrypt
-Comment:    Set 2, vector 75
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000010000000000000
-Ciphertext: 0C55ACA2BDA80E8F84A3879FF077802A
-Test: Encrypt
-Comment:    Set 2, vector 76
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000008000000000000
-Ciphertext: 885B84843BADC6501CBDCBEA4386AB7F
-Test: Encrypt
-Comment:    Set 2, vector 77
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000004000000000000
-Ciphertext: DCF23815FEF1697B0618E205B637648A
-Test: Encrypt
-Comment:    Set 2, vector 78
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000002000000000000
-Ciphertext: BF5EBE09157E65743AAD033473B0DFED
-Test: Encrypt
-Comment:    Set 2, vector 79
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000001000000000000
-Ciphertext: 1E9E5E1032307B75915E9BD48205FEB8
-Test: Encrypt
-Comment:    Set 2, vector 80
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000800000000000
-Ciphertext: 0EB8AC09A10303A7CE9762C1B029F0E0
-Test: Encrypt
-Comment:    Set 2, vector 81
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000400000000000
-Ciphertext: 2A42627713BFC603A88AD1D66292B80C
-Test: Encrypt
-Comment:    Set 2, vector 82
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000200000000000
-Ciphertext: D7E9512485B9E5E409FB51E26D269795
-Test: Encrypt
-Comment:    Set 2, vector 83
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000100000000000
-Ciphertext: 57CC59F8B92D73E1B38EEE405A8EC12F
-Test: Encrypt
-Comment:    Set 2, vector 84
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000080000000000
-Ciphertext: 161783F5FFC9A383E36B80A2032A71F1
-Test: Encrypt
-Comment:    Set 2, vector 85
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000040000000000
-Ciphertext: F5B24CE20FFD8702AC63F9C844BC5730
-Test: Encrypt
-Comment:    Set 2, vector 86
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000020000000000
-Ciphertext: 440930601D4013076587D882A1958280
-Test: Encrypt
-Comment:    Set 2, vector 87
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000010000000000
-Ciphertext: AEA4C3F9E520651C5FE38B915423843F
-Test: Encrypt
-Comment:    Set 2, vector 88
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000008000000000
-Ciphertext: E300D7417C4F547DBCD5FC84E3833A7B
-Test: Encrypt
-Comment:    Set 2, vector 89
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000004000000000
-Ciphertext: 5543860CE9247B38E8D0E7B216C0B5A5
-Test: Encrypt
-Comment:    Set 2, vector 90
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000002000000000
-Ciphertext: C20449053BF90C899899EE02794DB3C5
-Test: Encrypt
-Comment:    Set 2, vector 91
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000001000000000
-Ciphertext: AC0CB3B34AC32244CF196AE49E94D380
-Test: Encrypt
-Comment:    Set 2, vector 92
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000800000000
-Ciphertext: 0CDF3F25852287E3BAFAF490DE18D125
-Test: Encrypt
-Comment:    Set 2, vector 93
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000400000000
-Ciphertext: 583BB44512CE75268F72E6BC6682901B
-Test: Encrypt
-Comment:    Set 2, vector 94
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000200000000
-Ciphertext: 217140522F0C505FDAC4BFDE6E9D9A81
-Test: Encrypt
-Comment:    Set 2, vector 95
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000100000000
-Ciphertext: CFA59EB13DDD780A2EAEF89E83737C9A
-Test: Encrypt
-Comment:    Set 2, vector 96
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000080000000
-Ciphertext: 75E473CCD4D116426753B44900D919A6
-Test: Encrypt
-Comment:    Set 2, vector 97
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000040000000
-Ciphertext: E15E4627F7F8A3F09424D3D5CAC1C777
-Test: Encrypt
-Comment:    Set 2, vector 98
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000020000000
-Ciphertext: B83E20A23802D8755A2E850242B64EEF
-Test: Encrypt
-Comment:    Set 2, vector 99
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000010000000
-Ciphertext: E6790AF3911360F28FD17886DD311F88
-Test: Encrypt
-Comment:    Set 2, vector 100
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000008000000
-Ciphertext: 0A6304DF33E409C8A21E1C19187183FF
-Test: Encrypt
-Comment:    Set 2, vector 101
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000004000000
-Ciphertext: 51966561DA7ED5F30130B55CD108B5BE
-Test: Encrypt
-Comment:    Set 2, vector 102
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000002000000
-Ciphertext: 0ECA40693BF4CB41FDD15BCFD8C9D9B9
-Test: Encrypt
-Comment:    Set 2, vector 103
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000001000000
-Ciphertext: 8731B42742ADBA2D89C9BA90EBD4E42A
-Test: Encrypt
-Comment:    Set 2, vector 104
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000800000
-Ciphertext: BE4C6C18AA231E9BB13909242CC92EE3
-Test: Encrypt
-Comment:    Set 2, vector 105
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000400000
-Ciphertext: 39AC45537E9AFDC6C8BDD4204039A218
-Test: Encrypt
-Comment:    Set 2, vector 106
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000200000
-Ciphertext: AEA354F16E1E8EECEB5A98D88418B1A0
-Test: Encrypt
-Comment:    Set 2, vector 107
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000100000
-Ciphertext: 4F5D37D7D0DC7714E62BE4A0331DB07B
-Test: Encrypt
-Comment:    Set 2, vector 108
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000080000
-Ciphertext: 9603F03C3CAA8C2F0ECFBA1374891007
-Test: Encrypt
-Comment:    Set 2, vector 109
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000040000
-Ciphertext: C58768944996884B46A8FFDDB9AB87EF
-Test: Encrypt
-Comment:    Set 2, vector 110
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000020000
-Ciphertext: 3BCCF2396A97FC1C0CFFFB6ED41716DB
-Test: Encrypt
-Comment:    Set 2, vector 111
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000010000
-Ciphertext: DC299278DCA45AC1B6B08ED4B62D9BC9
-Test: Encrypt
-Comment:    Set 2, vector 112
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000008000
-Ciphertext: E195AECA31E10241BD0EC4AC5418A25D
-Test: Encrypt
-Comment:    Set 2, vector 113
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000004000
-Ciphertext: B397A4983ED647A0EB806ACDFE7BCB34
-Test: Encrypt
-Comment:    Set 2, vector 114
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000002000
-Ciphertext: BC8F7224B0447E8A1CF0F5506A060F3C
-Test: Encrypt
-Comment:    Set 2, vector 115
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000001000
-Ciphertext: FFD3ED02E7F64A5D6B37A9DC5E531646
-Test: Encrypt
-Comment:    Set 2, vector 116
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000800
-Ciphertext: BC6019EB208B7AF8EFA6AE7B4CA0556B
-Test: Encrypt
-Comment:    Set 2, vector 117
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000400
-Ciphertext: D2915AE2779F8F70E17CE953C6C1A380
-Test: Encrypt
-Comment:    Set 2, vector 118
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000200
-Ciphertext: B2AA4B1ED2285C9DA4088B6E9681C690
-Test: Encrypt
-Comment:    Set 2, vector 119
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000100
-Ciphertext: BE0D64EA88A3FF27C8DFCE13F13A4E1F
-Test: Encrypt
-Comment:    Set 2, vector 120
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000080
-Ciphertext: D7629F1DD395A985AF9497F6ACB4EDA1
-Test: Encrypt
-Comment:    Set 2, vector 121
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000040
-Ciphertext: 33FDF72DA1D8815DE2DBE81D97DDC6F8
-Test: Encrypt
-Comment:    Set 2, vector 122
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000020
-Ciphertext: D35742045F3DF8D184D6CC58EB9DE323
-Test: Encrypt
-Comment:    Set 2, vector 123
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000010
-Ciphertext: DE6469D10C044ED53CFEB523C8DF34A2
-Test: Encrypt
-Comment:    Set 2, vector 124
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000008
-Ciphertext: 2FAEAC3A41CCEABA8140BDA9C7AC7740
-Test: Encrypt
-Comment:    Set 2, vector 125
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000004
-Ciphertext: 7BA6691787BF0C526F3697E2ED659B0D
-Test: Encrypt
-Comment:    Set 2, vector 126
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000002
-Ciphertext: 8F9C0AA2549714C88BB2665E8AF86D41
-Test: Encrypt
-Comment:    Set 2, vector 127
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000001
-Ciphertext: BA9AE89FDDCE4B51131E17C4D65CE587
-Test: Encrypt
-Comment:    Set 3, vector 0
-Key:        000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 56E1E129CA5C02C7F9AC6AFDEF86ADC3
-Test: Encrypt
-Comment:    Set 3, vector 1
-Key:        010101010101010101010101010101010101010101010101
-Plaintext:  01010101010101010101010101010101
-Ciphertext: 8F764397C10BE84BA876CEEFA4225BFF
-Test: Encrypt
-Comment:    Set 3, vector 2
-Key:        020202020202020202020202020202020202020202020202
-Plaintext:  02020202020202020202020202020202
-Ciphertext: 60B00674BFD444D07B5A19851E6151CD
-Test: Encrypt
-Comment:    Set 3, vector 3
-Key:        030303030303030303030303030303030303030303030303
-Plaintext:  03030303030303030303030303030303
-Ciphertext: CF431D70E25D5450B9979C52E4ECF590
-Test: Encrypt
-Comment:    Set 3, vector 4
-Key:        040404040404040404040404040404040404040404040404
-Plaintext:  04040404040404040404040404040404
-Ciphertext: 81B26FF4F6B4377CC555873504B3A38B
-Test: Encrypt
-Comment:    Set 3, vector 5
-Key:        050505050505050505050505050505050505050505050505
-Plaintext:  05050505050505050505050505050505
-Ciphertext: 8C864C445E6B9312E6F3843C53BF7870
-Test: Encrypt
-Comment:    Set 3, vector 6
-Key:        060606060606060606060606060606060606060606060606
-Plaintext:  06060606060606060606060606060606
-Ciphertext: 28C1EABB23C2A04E7A37BB0EF42D45A2
-Test: Encrypt
-Comment:    Set 3, vector 7
-Key:        070707070707070707070707070707070707070707070707
-Plaintext:  07070707070707070707070707070707
-Ciphertext: 0068C08827CBD904A3C0AF89A35CD8E6
-Test: Encrypt
-Comment:    Set 3, vector 8
-Key:        080808080808080808080808080808080808080808080808
-Plaintext:  08080808080808080808080808080808
-Ciphertext: A2AA1C6693DC2B70D75C9B39B9B214D0
-Test: Encrypt
-Comment:    Set 3, vector 9
-Key:        090909090909090909090909090909090909090909090909
-Plaintext:  09090909090909090909090909090909
-Ciphertext: 0423A756A133734C66944536033B978C
-Test: Encrypt
-Comment:    Set 3, vector 10
-Key:        0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-Plaintext:  0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-Ciphertext: 279B7FA09352F4194B2C33089267BD2E
-Test: Encrypt
-Comment:    Set 3, vector 11
-Key:        0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-Plaintext:  0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-Ciphertext: 7788EEE46AC2927434A93D3B5D295DF3
-Test: Encrypt
-Comment:    Set 3, vector 12
-Key:        0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-Plaintext:  0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-Ciphertext: 3A2D0C1F30AE1E50A61102D2DF5BEAE5
-Test: Encrypt
-Comment:    Set 3, vector 13
-Key:        0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-Plaintext:  0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-Ciphertext: 320FB708B47319484538CD73F8773526
-Test: Encrypt
-Comment:    Set 3, vector 14
-Key:        0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-Plaintext:  0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-Ciphertext: 6213EB688C8CDA5152A65BFC007BCAEA
-Test: Encrypt
-Comment:    Set 3, vector 15
-Key:        0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-Plaintext:  0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-Ciphertext: D1904ACDB021DDCCCBE436CA7B5A4264
-Test: Encrypt
-Comment:    Set 3, vector 16
-Key:        101010101010101010101010101010101010101010101010
-Plaintext:  10101010101010101010101010101010
-Ciphertext: A907BFDAEEF8C81D05855235E8D3BE08
-Test: Encrypt
-Comment:    Set 3, vector 17
-Key:        111111111111111111111111111111111111111111111111
-Plaintext:  11111111111111111111111111111111
-Ciphertext: DB23D9326A998A4CB06AE04A8C592217
-Test: Encrypt
-Comment:    Set 3, vector 18
-Key:        121212121212121212121212121212121212121212121212
-Plaintext:  12121212121212121212121212121212
-Ciphertext: 472427C234EAE3082E84F493C9559792
-Test: Encrypt
-Comment:    Set 3, vector 19
-Key:        131313131313131313131313131313131313131313131313
-Plaintext:  13131313131313131313131313131313
-Ciphertext: EE4E318D27820F691BD3BDA9617561A0
-Test: Encrypt
-Comment:    Set 3, vector 20
-Key:        141414141414141414141414141414141414141414141414
-Plaintext:  14141414141414141414141414141414
-Ciphertext: 221E909D7B259C098480DBDE71BCF9BF
-Test: Encrypt
-Comment:    Set 3, vector 21
-Key:        151515151515151515151515151515151515151515151515
-Plaintext:  15151515151515151515151515151515
-Ciphertext: 8702C6A150F2DD2E1736F09518C1A267
-Test: Encrypt
-Comment:    Set 3, vector 22
-Key:        161616161616161616161616161616161616161616161616
-Plaintext:  16161616161616161616161616161616
-Ciphertext: 7E8DAEBBA15C7B9705B501998F61CC6E
-Test: Encrypt
-Comment:    Set 3, vector 23
-Key:        171717171717171717171717171717171717171717171717
-Plaintext:  17171717171717171717171717171717
-Ciphertext: 3DD555C7277FA156330D05CD621394D5
-Test: Encrypt
-Comment:    Set 3, vector 24
-Key:        181818181818181818181818181818181818181818181818
-Plaintext:  18181818181818181818181818181818
-Ciphertext: E5575CDC315F1C244441E6D1DE25ED20
-Test: Encrypt
-Comment:    Set 3, vector 25
-Key:        191919191919191919191919191919191919191919191919
-Plaintext:  19191919191919191919191919191919
-Ciphertext: 434859EB42087F83B9849DC23ABB7C1D
-Test: Encrypt
-Comment:    Set 3, vector 26
-Key:        1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-Plaintext:  1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-Ciphertext: 1EA1A5CC662DCA0B56B2BBF560A1B032
-Test: Encrypt
-Comment:    Set 3, vector 27
-Key:        1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-Plaintext:  1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-Ciphertext: A3AC0CD9342242A72005F8E6DBF50DE8
-Test: Encrypt
-Comment:    Set 3, vector 28
-Key:        1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-Plaintext:  1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-Ciphertext: AF6251A285EBEA9408315822F2072D86
-Test: Encrypt
-Comment:    Set 3, vector 29
-Key:        1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-Plaintext:  1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-Ciphertext: FA084220DB82A88E6D7B6E7849550183
-Test: Encrypt
-Comment:    Set 3, vector 30
-Key:        1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-Plaintext:  1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-Ciphertext: E7AABEAA3F669E0D963A19C3BDE43676
-Test: Encrypt
-Comment:    Set 3, vector 31
-Key:        1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-Plaintext:  1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-Ciphertext: ED7C11A689A72FF834A777013DBEC50A
-Test: Encrypt
-Comment:    Set 3, vector 32
-Key:        202020202020202020202020202020202020202020202020
-Plaintext:  20202020202020202020202020202020
-Ciphertext: 87F8EA30332036F17CEAC0097CE33BC1
-Test: Encrypt
-Comment:    Set 3, vector 33
-Key:        212121212121212121212121212121212121212121212121
-Plaintext:  21212121212121212121212121212121
-Ciphertext: E83CC178B21703D1BDFA0A1350A587F3
-Test: Encrypt
-Comment:    Set 3, vector 34
-Key:        222222222222222222222222222222222222222222222222
-Plaintext:  22222222222222222222222222222222
-Ciphertext: 581CF260A93B67E27BBA6D6D68C645B6
-Test: Encrypt
-Comment:    Set 3, vector 35
-Key:        232323232323232323232323232323232323232323232323
-Plaintext:  23232323232323232323232323232323
-Ciphertext: D7155FD4BABA5DAA1E0576BAF4BB3BDE
-Test: Encrypt
-Comment:    Set 3, vector 36
-Key:        242424242424242424242424242424242424242424242424
-Plaintext:  24242424242424242424242424242424
-Ciphertext: 0C2382377892DC0CA4B1C7753CDB2753
-Test: Encrypt
-Comment:    Set 3, vector 37
-Key:        252525252525252525252525252525252525252525252525
-Plaintext:  25252525252525252525252525252525
-Ciphertext: 9E568ACFE44E1926BE207D25107EBD90
-Test: Encrypt
-Comment:    Set 3, vector 38
-Key:        262626262626262626262626262626262626262626262626
-Plaintext:  26262626262626262626262626262626
-Ciphertext: 1F9C7FEF0BA7D4C38555B957FA9FDAC8
-Test: Encrypt
-Comment:    Set 3, vector 39
-Key:        272727272727272727272727272727272727272727272727
-Plaintext:  27272727272727272727272727272727
-Ciphertext: 2C00730AAB18247D4F79C8BA0107E759
-Test: Encrypt
-Comment:    Set 3, vector 40
-Key:        282828282828282828282828282828282828282828282828
-Plaintext:  28282828282828282828282828282828
-Ciphertext: 26150BB68C5529903D3624CB8F36D717
-Test: Encrypt
-Comment:    Set 3, vector 41
-Key:        292929292929292929292929292929292929292929292929
-Plaintext:  29292929292929292929292929292929
-Ciphertext: C6F9CD75F9DC3DF5C945E028038660AB
-Test: Encrypt
-Comment:    Set 3, vector 42
-Key:        2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A
-Plaintext:  2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A
-Ciphertext: 9D90F692A1149E3E7F19BE419038F42F
-Test: Encrypt
-Comment:    Set 3, vector 43
-Key:        2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
-Plaintext:  2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
-Ciphertext: 9981F6F8C071F4CAF3E25884B8749FD3
-Test: Encrypt
-Comment:    Set 3, vector 44
-Key:        2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-Plaintext:  2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-Ciphertext: 62957FC449C78B7EABA9C41B335F731E
-Test: Encrypt
-Comment:    Set 3, vector 45
-Key:        2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
-Plaintext:  2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
-Ciphertext: 265E17BD08B2E34BC879D5BC801D1217
-Test: Encrypt
-Comment:    Set 3, vector 46
-Key:        2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-Plaintext:  2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-Ciphertext: 55BBE8CE99907AC77D4F009EABA6B8D9
-Test: Encrypt
-Comment:    Set 3, vector 47
-Key:        2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F
-Plaintext:  2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F
-Ciphertext: EECB495C2F81243857D0A1A8919F9C7E
-Test: Encrypt
-Comment:    Set 3, vector 48
-Key:        303030303030303030303030303030303030303030303030
-Plaintext:  30303030303030303030303030303030
-Ciphertext: E3BA996DF81895C86E30500CE9F7ED01
-Test: Encrypt
-Comment:    Set 3, vector 49
-Key:        313131313131313131313131313131313131313131313131
-Plaintext:  31313131313131313131313131313131
-Ciphertext: E507914B7CDDB2A3A915EB5663CE43CE
-Test: Encrypt
-Comment:    Set 3, vector 50
-Key:        323232323232323232323232323232323232323232323232
-Plaintext:  32323232323232323232323232323232
-Ciphertext: AA2E53FC2D073DE62554691F507B23FF
-Test: Encrypt
-Comment:    Set 3, vector 51
-Key:        333333333333333333333333333333333333333333333333
-Plaintext:  33333333333333333333333333333333
-Ciphertext: 875707D7E4FA8028D878DFB8338160FF
-Test: Encrypt
-Comment:    Set 3, vector 52
-Key:        343434343434343434343434343434343434343434343434
-Plaintext:  34343434343434343434343434343434
-Ciphertext: 1158285A6787F8B6500E9FB046D88FB7
-Test: Encrypt
-Comment:    Set 3, vector 53
-Key:        353535353535353535353535353535353535353535353535
-Plaintext:  35353535353535353535353535353535
-Ciphertext: 6BFF4FB554ADD3F4321E6BA6029CD48A
-Test: Encrypt
-Comment:    Set 3, vector 54
-Key:        363636363636363636363636363636363636363636363636
-Plaintext:  36363636363636363636363636363636
-Ciphertext: 8F2077CE672419A3AE15CA8800D5ACF8
-Test: Encrypt
-Comment:    Set 3, vector 55
-Key:        373737373737373737373737373737373737373737373737
-Plaintext:  37373737373737373737373737373737
-Ciphertext: 80ECE69E3EEBD391FCAEA8B3B38578D9
-Test: Encrypt
-Comment:    Set 3, vector 56
-Key:        383838383838383838383838383838383838383838383838
-Plaintext:  38383838383838383838383838383838
-Ciphertext: A23A2ADDE21BDB44EF99072331FA8EAB
-Test: Encrypt
-Comment:    Set 3, vector 57
-Key:        393939393939393939393939393939393939393939393939
-Plaintext:  39393939393939393939393939393939
-Ciphertext: 8E41065415264354D4DC276F6ED582B9
-Test: Encrypt
-Comment:    Set 3, vector 58
-Key:        3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
-Plaintext:  3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
-Ciphertext: D591D51BA578836C7D3945991FD0184A
-Test: Encrypt
-Comment:    Set 3, vector 59
-Key:        3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
-Plaintext:  3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
-Ciphertext: B88105C11F9FFCA9037E1F90FAE1C61E
-Test: Encrypt
-Comment:    Set 3, vector 60
-Key:        3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
-Plaintext:  3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
-Ciphertext: F8A1A047994B4363028BC1B3B6339954
-Test: Encrypt
-Comment:    Set 3, vector 61
-Key:        3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
-Plaintext:  3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
-Ciphertext: EFB57CEA359E1F9F68729B156BEBDCB8
-Test: Encrypt
-Comment:    Set 3, vector 62
-Key:        3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
-Plaintext:  3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
-Ciphertext: 2323D15570873D4E5616CDDC466B1D34
-Test: Encrypt
-Comment:    Set 3, vector 63
-Key:        3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
-Plaintext:  3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
-Ciphertext: 842C7B6C67BB38B508558058531B37FE
-Test: Encrypt
-Comment:    Set 3, vector 64
-Key:        404040404040404040404040404040404040404040404040
-Plaintext:  40404040404040404040404040404040
-Ciphertext: A2C32EA499E41A248565253BACC11E3B
-Test: Encrypt
-Comment:    Set 3, vector 65
-Key:        414141414141414141414141414141414141414141414141
-Plaintext:  41414141414141414141414141414141
-Ciphertext: CF72033A0BA3E03A8B1E336F85100489
-Test: Encrypt
-Comment:    Set 3, vector 66
-Key:        424242424242424242424242424242424242424242424242
-Plaintext:  42424242424242424242424242424242
-Ciphertext: 0A194208C1B722A5719C14231EE4C532
-Test: Encrypt
-Comment:    Set 3, vector 67
-Key:        434343434343434343434343434343434343434343434343
-Plaintext:  43434343434343434343434343434343
-Ciphertext: 7365018F7A2564165EC162F948C4824A
-Test: Encrypt
-Comment:    Set 3, vector 68
-Key:        444444444444444444444444444444444444444444444444
-Plaintext:  44444444444444444444444444444444
-Ciphertext: 20AC87CE21C47D99D6D2202B0C62E52D
-Test: Encrypt
-Comment:    Set 3, vector 69
-Key:        454545454545454545454545454545454545454545454545
-Plaintext:  45454545454545454545454545454545
-Ciphertext: 72D32F7C4D03529C7DBF6865E36E7C84
-Test: Encrypt
-Comment:    Set 3, vector 70
-Key:        464646464646464646464646464646464646464646464646
-Plaintext:  46464646464646464646464646464646
-Ciphertext: 18E88EF941A7D1793B8D545323CCBD7E
-Test: Encrypt
-Comment:    Set 3, vector 71
-Key:        474747474747474747474747474747474747474747474747
-Plaintext:  47474747474747474747474747474747
-Ciphertext: C87B12CD28646842FCE0C8658EA8A6C9
-Test: Encrypt
-Comment:    Set 3, vector 72
-Key:        484848484848484848484848484848484848484848484848
-Plaintext:  48484848484848484848484848484848
-Ciphertext: 03347AC4B4D0AE9C208B1B12802E6562
-Test: Encrypt
-Comment:    Set 3, vector 73
-Key:        494949494949494949494949494949494949494949494949
-Plaintext:  49494949494949494949494949494949
-Ciphertext: A5F9E726E53A74C9CF59E7CBBCE507D1
-Test: Encrypt
-Comment:    Set 3, vector 74
-Key:        4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A
-Plaintext:  4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A
-Ciphertext: 228C852461BBB0BB12B3F9192311DFDD
-Test: Encrypt
-Comment:    Set 3, vector 75
-Key:        4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B
-Plaintext:  4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B
-Ciphertext: DFD5B30B1401FBE49EA0C725E64B91A3
-Test: Encrypt
-Comment:    Set 3, vector 76
-Key:        4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C
-Plaintext:  4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C
-Ciphertext: 38D59DD18C98488451070B28F91A15C0
-Test: Encrypt
-Comment:    Set 3, vector 77
-Key:        4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
-Plaintext:  4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
-Ciphertext: E6A73709A37C7B00484BD54EED3A6128
-Test: Encrypt
-Comment:    Set 3, vector 78
-Key:        4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E
-Plaintext:  4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E
-Ciphertext: 12A6AD3ED9A3BA4FBA285B64D4823706
-Test: Encrypt
-Comment:    Set 3, vector 79
-Key:        4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F
-Plaintext:  4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F
-Ciphertext: CCB3FFAD253207DFB312A8B4FE0F390D
-Test: Encrypt
-Comment:    Set 3, vector 80
-Key:        505050505050505050505050505050505050505050505050
-Plaintext:  50505050505050505050505050505050
-Ciphertext: A1C7DFA83502CE5558242F83CC12BF82
-Test: Encrypt
-Comment:    Set 3, vector 81
-Key:        515151515151515151515151515151515151515151515151
-Plaintext:  51515151515151515151515151515151
-Ciphertext: C9C8FCD1E4E482AF47555FEA823DE62A
-Test: Encrypt
-Comment:    Set 3, vector 82
-Key:        525252525252525252525252525252525252525252525252
-Plaintext:  52525252525252525252525252525252
-Ciphertext: 5F9DD3265B6B043BF4CE8E11A3DAE4E1
-Test: Encrypt
-Comment:    Set 3, vector 83
-Key:        535353535353535353535353535353535353535353535353
-Plaintext:  53535353535353535353535353535353
-Ciphertext: 79D02BFAD35C67C8586694A068662F1D
-Test: Encrypt
-Comment:    Set 3, vector 84
-Key:        545454545454545454545454545454545454545454545454
-Plaintext:  54545454545454545454545454545454
-Ciphertext: 361AC03A4827F590A5DDE28A5FFF723A
-Test: Encrypt
-Comment:    Set 3, vector 85
-Key:        555555555555555555555555555555555555555555555555
-Plaintext:  55555555555555555555555555555555
-Ciphertext: 1758AC2E8DDE2126621AEB5759FC93D0
-Test: Encrypt
-Comment:    Set 3, vector 86
-Key:        565656565656565656565656565656565656565656565656
-Plaintext:  56565656565656565656565656565656
-Ciphertext: 14422A052A86DC0033B70F77D46A7E3C
-Test: Encrypt
-Comment:    Set 3, vector 87
-Key:        575757575757575757575757575757575757575757575757
-Plaintext:  57575757575757575757575757575757
-Ciphertext: 154457A732BC11F0A4C43BEC607B9B91
-Test: Encrypt
-Comment:    Set 3, vector 88
-Key:        585858585858585858585858585858585858585858585858
-Plaintext:  58585858585858585858585858585858
-Ciphertext: 789BBC53CBE8A7D6119F61C8DC5DAEAB
-Test: Encrypt
-Comment:    Set 3, vector 89
-Key:        595959595959595959595959595959595959595959595959
-Plaintext:  59595959595959595959595959595959
-Ciphertext: 6F8CDA92BF849BE59858544689DA2ACE
-Test: Encrypt
-Comment:    Set 3, vector 90
-Key:        5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A
-Plaintext:  5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A
-Ciphertext: CCA696D494AF8877C0753106D5AD07A6
-Test: Encrypt
-Comment:    Set 3, vector 91
-Key:        5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-Plaintext:  5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-Ciphertext: E76884CA9F00DCF95BBB15C5FBB26D1C
-Test: Encrypt
-Comment:    Set 3, vector 92
-Key:        5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C
-Plaintext:  5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C
-Ciphertext: CD3FA7BC9EC9EC0B0CF4F5A82A98550E
-Test: Encrypt
-Comment:    Set 3, vector 93
-Key:        5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D
-Plaintext:  5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D
-Ciphertext: BC2FB535DC0D8C86682E32AC3761F299
-Test: Encrypt
-Comment:    Set 3, vector 94
-Key:        5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E
-Plaintext:  5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E
-Ciphertext: AB19152E1788D8B2878357484832BB27
-Test: Encrypt
-Comment:    Set 3, vector 95
-Key:        5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F
-Plaintext:  5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F
-Ciphertext: 87D1D7E297CED2C6606A171794FE1BB2
-Test: Encrypt
-Comment:    Set 3, vector 96
-Key:        606060606060606060606060606060606060606060606060
-Plaintext:  60606060606060606060606060606060
-Ciphertext: 6BF6F1728474F1050F712A0FF3F59319
-Test: Encrypt
-Comment:    Set 3, vector 97
-Key:        616161616161616161616161616161616161616161616161
-Plaintext:  61616161616161616161616161616161
-Ciphertext: 46646FF0ED8A8EDB395BA4B3DC97A35F
-Test: Encrypt
-Comment:    Set 3, vector 98
-Key:        626262626262626262626262626262626262626262626262
-Plaintext:  62626262626262626262626262626262
-Ciphertext: F558C5F67CDF59374F5426D5846A622E
-Test: Encrypt
-Comment:    Set 3, vector 99
-Key:        636363636363636363636363636363636363636363636363
-Plaintext:  63636363636363636363636363636363
-Ciphertext: E06CC0A3436C80F5F0271ACFC8F535D3
-Test: Encrypt
-Comment:    Set 3, vector 100
-Key:        646464646464646464646464646464646464646464646464
-Plaintext:  64646464646464646464646464646464
-Ciphertext: 903AA2EA9F99C3CCDD1EF1CD906FC800
-Test: Encrypt
-Comment:    Set 3, vector 101
-Key:        656565656565656565656565656565656565656565656565
-Plaintext:  65656565656565656565656565656565
-Ciphertext: EAE1010E86CF45476CEB180E78608841
-Test: Encrypt
-Comment:    Set 3, vector 102
-Key:        666666666666666666666666666666666666666666666666
-Plaintext:  66666666666666666666666666666666
-Ciphertext: 341F33B7FB7C5807BFB4C2C497565817
-Test: Encrypt
-Comment:    Set 3, vector 103
-Key:        676767676767676767676767676767676767676767676767
-Plaintext:  67676767676767676767676767676767
-Ciphertext: 4DA345AB1B3F7575F8D01BED5C17AF26
-Test: Encrypt
-Comment:    Set 3, vector 104
-Key:        686868686868686868686868686868686868686868686868
-Plaintext:  68686868686868686868686868686868
-Ciphertext: 1613C2DE21E7082312BF414C88310FAB
-Test: Encrypt
-Comment:    Set 3, vector 105
-Key:        696969696969696969696969696969696969696969696969
-Plaintext:  69696969696969696969696969696969
-Ciphertext: 474D73001BD4BF9A9B79CFF79198E2F3
-Test: Encrypt
-Comment:    Set 3, vector 106
-Key:        6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A
-Plaintext:  6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A
-Ciphertext: 9C487E0BFB6FE07C521C663D03F175CF
-Test: Encrypt
-Comment:    Set 3, vector 107
-Key:        6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B
-Plaintext:  6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B
-Ciphertext: 39F5672BEFCFCC072F292D47AD481DC7
-Test: Encrypt
-Comment:    Set 3, vector 108
-Key:        6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C
-Plaintext:  6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C
-Ciphertext: D9B86F02C3CB07CEF53834924A01DF14
-Test: Encrypt
-Comment:    Set 3, vector 109
-Key:        6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D
-Plaintext:  6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D
-Ciphertext: B42C9F4A33C5425FB20425889ECFFB9D
-Test: Encrypt
-Comment:    Set 3, vector 110
-Key:        6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E
-Plaintext:  6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E
-Ciphertext: 832D535E3B4C40113C82AE10A7E1B78A
-Test: Encrypt
-Comment:    Set 3, vector 111
-Key:        6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F
-Plaintext:  6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F
-Ciphertext: E9A8F63AAF1B1FFF05CFEB7E22E519DF
-Test: Encrypt
-Comment:    Set 3, vector 112
-Key:        707070707070707070707070707070707070707070707070
-Plaintext:  70707070707070707070707070707070
-Ciphertext: C61B4EF13F07576701B1018AC9F01863
-Test: Encrypt
-Comment:    Set 3, vector 113
-Key:        717171717171717171717171717171717171717171717171
-Plaintext:  71717171717171717171717171717171
-Ciphertext: B098DBE07C3528931F14D40AC9F99ACC
-Test: Encrypt
-Comment:    Set 3, vector 114
-Key:        727272727272727272727272727272727272727272727272
-Plaintext:  72727272727272727272727272727272
-Ciphertext: 3FCC0182E96BC01863EB161967D6482A
-Test: Encrypt
-Comment:    Set 3, vector 115
-Key:        737373737373737373737373737373737373737373737373
-Plaintext:  73737373737373737373737373737373
-Ciphertext: D8F20E80F4AC4666066B0E3F1966C8DA
-Test: Encrypt
-Comment:    Set 3, vector 116
-Key:        747474747474747474747474747474747474747474747474
-Plaintext:  74747474747474747474747474747474
-Ciphertext: 4E96D8CC1A34E3C38C37B5339CF26A5D
-Test: Encrypt
-Comment:    Set 3, vector 117
-Key:        757575757575757575757575757575757575757575757575
-Plaintext:  75757575757575757575757575757575
-Ciphertext: 266EDB14B89857636C0F8E8C7D2FACD8
-Test: Encrypt
-Comment:    Set 3, vector 118
-Key:        767676767676767676767676767676767676767676767676
-Plaintext:  76767676767676767676767676767676
-Ciphertext: 1D060BD61CFA82764CE4DF283FCB2278
-Test: Encrypt
-Comment:    Set 3, vector 119
-Key:        777777777777777777777777777777777777777777777777
-Plaintext:  77777777777777777777777777777777
-Ciphertext: 4734355A933BFC1F2918CDF1A4E2BAAE
-Test: Encrypt
-Comment:    Set 3, vector 120
-Key:        787878787878787878787878787878787878787878787878
-Plaintext:  78787878787878787878787878787878
-Ciphertext: DADBACBB42FEB35635A8DEBBFA93F5BA
-Test: Encrypt
-Comment:    Set 3, vector 121
-Key:        797979797979797979797979797979797979797979797979
-Plaintext:  79797979797979797979797979797979
-Ciphertext: 8BB5C2E0B44B986EF523870C41721B7D
-Test: Encrypt
-Comment:    Set 3, vector 122
-Key:        7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A
-Plaintext:  7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A
-Ciphertext: F66844E5DC500F43FF95E05965BAFD63
-Test: Encrypt
-Comment:    Set 3, vector 123
-Key:        7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B
-Plaintext:  7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B
-Ciphertext: ECC75A2BE7E27481907621A1796DC821
-Test: Encrypt
-Comment:    Set 3, vector 124
-Key:        7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C
-Plaintext:  7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C
-Ciphertext: D195666137F49B67F80EBC8C3ED824BF
-Test: Encrypt
-Comment:    Set 3, vector 125
-Key:        7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D
-Plaintext:  7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D
-Ciphertext: 2F1ACC482BE5DEFD3EC1AD1F3A064A60
-Test: Encrypt
-Comment:    Set 3, vector 126
-Key:        7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E
-Plaintext:  7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E
-Ciphertext: 5FDDFA05A7F72D294DC386260DC59009
-Test: Encrypt
-Comment:    Set 3, vector 127
-Key:        7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
-Plaintext:  7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
-Ciphertext: FE94D733BABEB5A5382C2816311E515E
-Test: Encrypt
-Comment:    Set 3, vector 128
-Key:        808080808080808080808080808080808080808080808080
-Plaintext:  80808080808080808080808080808080
-Ciphertext: F602BA7F515B082983B8F7A27F92408F
-Test: Encrypt
-Comment:    Set 3, vector 129
-Key:        818181818181818181818181818181818181818181818181
-Plaintext:  81818181818181818181818181818181
-Ciphertext: 48E95062B889D83CC72767E303329710
-Test: Encrypt
-Comment:    Set 3, vector 130
-Key:        828282828282828282828282828282828282828282828282
-Plaintext:  82828282828282828282828282828282
-Ciphertext: 0D98319B8ED1E612F063591AAFA95962
-Test: Encrypt
-Comment:    Set 3, vector 131
-Key:        838383838383838383838383838383838383838383838383
-Plaintext:  83838383838383838383838383838383
-Ciphertext: 6D987B21F8072C09514C711819BDF42D
-Test: Encrypt
-Comment:    Set 3, vector 132
-Key:        848484848484848484848484848484848484848484848484
-Plaintext:  84848484848484848484848484848484
-Ciphertext: 56C6CA23BC6A52C9967D70C6471A0788
-Test: Encrypt
-Comment:    Set 3, vector 133
-Key:        858585858585858585858585858585858585858585858585
-Plaintext:  85858585858585858585858585858585
-Ciphertext: 03C1004551B9B74D96CC3F9F7D11B04A
-Test: Encrypt
-Comment:    Set 3, vector 134
-Key:        868686868686868686868686868686868686868686868686
-Plaintext:  86868686868686868686868686868686
-Ciphertext: 6356481250E8D52A0D922985BB2BED27
-Test: Encrypt
-Comment:    Set 3, vector 135
-Key:        878787878787878787878787878787878787878787878787
-Plaintext:  87878787878787878787878787878787
-Ciphertext: BC51A66892A956F44BF75168E935720E
-Test: Encrypt
-Comment:    Set 3, vector 136
-Key:        888888888888888888888888888888888888888888888888
-Plaintext:  88888888888888888888888888888888
-Ciphertext: 73FAAAFB0517BD4D459A250E2CA4F017
-Test: Encrypt
-Comment:    Set 3, vector 137
-Key:        898989898989898989898989898989898989898989898989
-Plaintext:  89898989898989898989898989898989
-Ciphertext: 160C7D6510CCEB35318629FFFE1E8BA7
-Test: Encrypt
-Comment:    Set 3, vector 138
-Key:        8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A
-Plaintext:  8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A
-Ciphertext: 785ECC6F1A9415EBB05A4990786865A5
-Test: Encrypt
-Comment:    Set 3, vector 139
-Key:        8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B
-Plaintext:  8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B
-Ciphertext: 210498B4AC4D909CC7D6DAD6B8851C1A
-Test: Encrypt
-Comment:    Set 3, vector 140
-Key:        8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-Plaintext:  8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-Ciphertext: 7094C31A06ED2AA0B3B63C210DEB96E2
-Test: Encrypt
-Comment:    Set 3, vector 141
-Key:        8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D
-Plaintext:  8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D
-Ciphertext: F8426DAE3B7C3FF568456EB4D4EB623B
-Test: Encrypt
-Comment:    Set 3, vector 142
-Key:        8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E
-Plaintext:  8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E
-Ciphertext: 090487421369DED8EAC9812B544A29BE
-Test: Encrypt
-Comment:    Set 3, vector 143
-Key:        8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F
-Plaintext:  8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F
-Ciphertext: 1AFA1FC5ECA8EAD74F9FE9B67993CB6F
-Test: Encrypt
-Comment:    Set 3, vector 144
-Key:        909090909090909090909090909090909090909090909090
-Plaintext:  90909090909090909090909090909090
-Ciphertext: 38124FCE77189341DE7B225951CDE6E9
-Test: Encrypt
-Comment:    Set 3, vector 145
-Key:        919191919191919191919191919191919191919191919191
-Plaintext:  91919191919191919191919191919191
-Ciphertext: 059A775350A44BB880A750B32B19E179
-Test: Encrypt
-Comment:    Set 3, vector 146
-Key:        929292929292929292929292929292929292929292929292
-Plaintext:  92929292929292929292929292929292
-Ciphertext: 7CFA631E8BABF7DEE00DAB0754C385DD
-Test: Encrypt
-Comment:    Set 3, vector 147
-Key:        939393939393939393939393939393939393939393939393
-Plaintext:  93939393939393939393939393939393
-Ciphertext: 0632ED71BA440232DECE4F1B38F94323
-Test: Encrypt
-Comment:    Set 3, vector 148
-Key:        949494949494949494949494949494949494949494949494
-Plaintext:  94949494949494949494949494949494
-Ciphertext: D049FF03ACF47C866A4209E7588E0CFA
-Test: Encrypt
-Comment:    Set 3, vector 149
-Key:        959595959595959595959595959595959595959595959595
-Plaintext:  95959595959595959595959595959595
-Ciphertext: 910408E331C64A71D50A149DFD50C242
-Test: Encrypt
-Comment:    Set 3, vector 150
-Key:        969696969696969696969696969696969696969696969696
-Plaintext:  96969696969696969696969696969696
-Ciphertext: 0829C2DD4AF8F06C30978A0199A43C3C
-Test: Encrypt
-Comment:    Set 3, vector 151
-Key:        979797979797979797979797979797979797979797979797
-Plaintext:  97979797979797979797979797979797
-Ciphertext: C70D286C18D2A0EA5D16FEB97F35DE6F
-Test: Encrypt
-Comment:    Set 3, vector 152
-Key:        989898989898989898989898989898989898989898989898
-Plaintext:  98989898989898989898989898989898
-Ciphertext: A220CD3CD177BDD73D44B6D4A7A9ED0E
-Test: Encrypt
-Comment:    Set 3, vector 153
-Key:        999999999999999999999999999999999999999999999999
-Plaintext:  99999999999999999999999999999999
-Ciphertext: 74EC1A68010A0D5FA9688F1552E70EF5
-Test: Encrypt
-Comment:    Set 3, vector 154
-Key:        9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A
-Plaintext:  9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A
-Ciphertext: C1C0EE9EEA079CCE8544BA9940963720
-Test: Encrypt
-Comment:    Set 3, vector 155
-Key:        9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B
-Plaintext:  9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B
-Ciphertext: 500418F7142C273CCADBDAD8831619D2
-Test: Encrypt
-Comment:    Set 3, vector 156
-Key:        9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C
-Plaintext:  9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C
-Ciphertext: 703A0223D3ABA658C531F9BE03F6E842
-Test: Encrypt
-Comment:    Set 3, vector 157
-Key:        9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D
-Plaintext:  9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D
-Ciphertext: EBC65558CD43197D87CFF645FDBA1661
-Test: Encrypt
-Comment:    Set 3, vector 158
-Key:        9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E
-Plaintext:  9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E
-Ciphertext: 6F6E140E44934DA754F008EB5597BDA3
-Test: Encrypt
-Comment:    Set 3, vector 159
-Key:        9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
-Plaintext:  9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
-Ciphertext: 3D533A98B85CDD624541956E348ACBD3
-Test: Encrypt
-Comment:    Set 3, vector 160
-Key:        A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0
-Plaintext:  A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0
-Ciphertext: 13833D60F1D247019258C457E9F2292A
-Test: Encrypt
-Comment:    Set 3, vector 161
-Key:        A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1
-Plaintext:  A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1
-Ciphertext: FC13CECE4F5E2467427582595EDB6B87
-Test: Encrypt
-Comment:    Set 3, vector 162
-Key:        A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2
-Plaintext:  A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2
-Ciphertext: 2772A4E636F01514949D47B037825AF9
-Test: Encrypt
-Comment:    Set 3, vector 163
-Key:        A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3
-Plaintext:  A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3
-Ciphertext: F13DC1CCF105212AF8BC4F73F0AEF272
-Test: Encrypt
-Comment:    Set 3, vector 164
-Key:        A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4
-Plaintext:  A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4
-Ciphertext: A6EB0CABBBA03DB1B2425E6FC559B06A
-Test: Encrypt
-Comment:    Set 3, vector 165
-Key:        A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5
-Plaintext:  A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5
-Ciphertext: 32222D875D9E73DE72848EA88AC9B259
-Test: Encrypt
-Comment:    Set 3, vector 166
-Key:        A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6
-Plaintext:  A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6
-Ciphertext: 7DA6BC64D1E71FFE2D24C1A2FF7405BF
-Test: Encrypt
-Comment:    Set 3, vector 167
-Key:        A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7
-Plaintext:  A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7
-Ciphertext: AD5129092054880300AFCF09A2921DAF
-Test: Encrypt
-Comment:    Set 3, vector 168
-Key:        A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
-Plaintext:  A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
-Ciphertext: FCF2E0AA207754597C8C00A4615B5B5B
-Test: Encrypt
-Comment:    Set 3, vector 169
-Key:        A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9
-Plaintext:  A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9
-Ciphertext: 83D1475128C93C79BFE2AC9DA7E5D7BC
-Test: Encrypt
-Comment:    Set 3, vector 170
-Key:        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Plaintext:  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Ciphertext: 9BA09846E13568B746B7D6A43364915F
-Test: Encrypt
-Comment:    Set 3, vector 171
-Key:        ABABABABABABABABABABABABABABABABABABABABABABABAB
-Plaintext:  ABABABABABABABABABABABABABABABAB
-Ciphertext: 387BDB77D285F9E59CB88CD830CB31E2
-Test: Encrypt
-Comment:    Set 3, vector 172
-Key:        ACACACACACACACACACACACACACACACACACACACACACACACAC
-Plaintext:  ACACACACACACACACACACACACACACACAC
-Ciphertext: 82BFCC439310DD5DC411CCD4451E789B
-Test: Encrypt
-Comment:    Set 3, vector 173
-Key:        ADADADADADADADADADADADADADADADADADADADADADADADAD
-Plaintext:  ADADADADADADADADADADADADADADADAD
-Ciphertext: 34C4240853DA191DF1D63E83401CE0E2
-Test: Encrypt
-Comment:    Set 3, vector 174
-Key:        AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE
-Plaintext:  AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE
-Ciphertext: B3CE3C38C10A667F5FD67BC8B7037283
-Test: Encrypt
-Comment:    Set 3, vector 175
-Key:        AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF
-Plaintext:  AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF
-Ciphertext: BEF04E726DC1D5D1D4AB0A025CFDFD7D
-Test: Encrypt
-Comment:    Set 3, vector 176
-Key:        B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0
-Plaintext:  B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0
-Ciphertext: 725D70D564E78095739EA7980B481056
-Test: Encrypt
-Comment:    Set 3, vector 177
-Key:        B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1
-Plaintext:  B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1
-Ciphertext: CAB9293C9E3A82D40E85558F9DA488C1
-Test: Encrypt
-Comment:    Set 3, vector 178
-Key:        B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2
-Plaintext:  B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2
-Ciphertext: B433CACA5FF9F5AADB6BAFB7D4BE81FC
-Test: Encrypt
-Comment:    Set 3, vector 179
-Key:        B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3
-Plaintext:  B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3
-Ciphertext: 3910F153098B638696101E04022A7849
-Test: Encrypt
-Comment:    Set 3, vector 180
-Key:        B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4
-Plaintext:  B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4
-Ciphertext: 1D7FF785CFC6AF98C5C81CDA2ABC9816
-Test: Encrypt
-Comment:    Set 3, vector 181
-Key:        B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5
-Plaintext:  B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5
-Ciphertext: 4A30C5521BAC28E5942808CB536376C7
-Test: Encrypt
-Comment:    Set 3, vector 182
-Key:        B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6
-Plaintext:  B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6
-Ciphertext: 17B908EF18EB7703DDB667C7A8DBA777
-Test: Encrypt
-Comment:    Set 3, vector 183
-Key:        B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7
-Plaintext:  B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7
-Ciphertext: 3222E0228F29C9F27467CB7047838E39
-Test: Encrypt
-Comment:    Set 3, vector 184
-Key:        B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8
-Plaintext:  B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8
-Ciphertext: E422497D1FD54DF8F9CEE11548D77303
-Test: Encrypt
-Comment:    Set 3, vector 185
-Key:        B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9
-Plaintext:  B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9
-Ciphertext: B26A00606A375B1A64B7F0C333D81A50
-Test: Encrypt
-Comment:    Set 3, vector 186
-Key:        BABABABABABABABABABABABABABABABABABABABABABABABA
-Plaintext:  BABABABABABABABABABABABABABABABA
-Ciphertext: D5032B06E290F6B76327E47E519F8F6D
-Test: Encrypt
-Comment:    Set 3, vector 187
-Key:        BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-Plaintext:  BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-Ciphertext: 2CED7355B82DF3B88C4417149FFA1783
-Test: Encrypt
-Comment:    Set 3, vector 188
-Key:        BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC
-Plaintext:  BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC
-Ciphertext: FC7B4D95C62CA6D33862D56768EA9A1A
-Test: Encrypt
-Comment:    Set 3, vector 189
-Key:        BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD
-Plaintext:  BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD
-Ciphertext: 375A9C1E1FCFA6F2369306D966F82156
-Test: Encrypt
-Comment:    Set 3, vector 190
-Key:        BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE
-Plaintext:  BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE
-Ciphertext: BA4C218D8691D5D9CE15ECCC75C75D8B
-Test: Encrypt
-Comment:    Set 3, vector 191
-Key:        BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF
-Plaintext:  BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF
-Ciphertext: 4D5C53279B76A6F74195C65F09DF85D9
-Test: Encrypt
-Comment:    Set 3, vector 192
-Key:        C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
-Plaintext:  C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
-Ciphertext: 75CF5E6B3B0BFFF2290A5E58A85CF994
-Test: Encrypt
-Comment:    Set 3, vector 193
-Key:        C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1
-Plaintext:  C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1
-Ciphertext: 3482A5C83234E75CB443E09BA17EE3A0
-Test: Encrypt
-Comment:    Set 3, vector 194
-Key:        C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2
-Plaintext:  C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2
-Ciphertext: DA592D849C1BFBBEF5C3D0D8DA0F4B9A
-Test: Encrypt
-Comment:    Set 3, vector 195
-Key:        C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3
-Plaintext:  C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3
-Ciphertext: 6656047376A76ED53FFF8C5DE1B6F886
-Test: Encrypt
-Comment:    Set 3, vector 196
-Key:        C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4
-Plaintext:  C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4
-Ciphertext: F86FD06864804515B17B453F8A42A44D
-Test: Encrypt
-Comment:    Set 3, vector 197
-Key:        C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5
-Plaintext:  C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5
-Ciphertext: E57CD8E81BBF5B42446A7880B32A9A2F
-Test: Encrypt
-Comment:    Set 3, vector 198
-Key:        C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6
-Plaintext:  C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6
-Ciphertext: A17219F7DEFF2985BDFADD62A6854947
-Test: Encrypt
-Comment:    Set 3, vector 199
-Key:        C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7
-Plaintext:  C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7
-Ciphertext: FF288A92FB408DA875531D163CE0105A
-Test: Encrypt
-Comment:    Set 3, vector 200
-Key:        C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8
-Plaintext:  C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8
-Ciphertext: 11828CD066FD12620DFA16358CF1A705
-Test: Encrypt
-Comment:    Set 3, vector 201
-Key:        C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9
-Plaintext:  C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9
-Ciphertext: 6FA5DCBD14D2520E7F8147EDBEBBEAEE
-Test: Encrypt
-Comment:    Set 3, vector 202
-Key:        CACACACACACACACACACACACACACACACACACACACACACACACA
-Plaintext:  CACACACACACACACACACACACACACACACA
-Ciphertext: F365CE3849AFB23AF3B62D7CFF80B19B
-Test: Encrypt
-Comment:    Set 3, vector 203
-Key:        CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB
-Plaintext:  CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB
-Ciphertext: 74BE047CAAE10D095B3BDA14016EA262
-Test: Encrypt
-Comment:    Set 3, vector 204
-Key:        CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-Plaintext:  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-Ciphertext: DC7A7D66AD1ABF1C7AA28891BE685AB5
-Test: Encrypt
-Comment:    Set 3, vector 205
-Key:        CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD
-Plaintext:  CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD
-Ciphertext: 8BED9C5BAD5C4A4AFB41CDFD7E88BB97
-Test: Encrypt
-Comment:    Set 3, vector 206
-Key:        CECECECECECECECECECECECECECECECECECECECECECECECE
-Plaintext:  CECECECECECECECECECECECECECECECE
-Ciphertext: 915FF93DC6A3984F11AB60BD2AA3DC61
-Test: Encrypt
-Comment:    Set 3, vector 207
-Key:        CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF
-Plaintext:  CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF
-Ciphertext: 43DFEEBBFB3692763752E6EA8931A9B8
-Test: Encrypt
-Comment:    Set 3, vector 208
-Key:        D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0
-Plaintext:  D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0
-Ciphertext: 2BB966115263DF2296C5D23E02D9C335
-Test: Encrypt
-Comment:    Set 3, vector 209
-Key:        D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1
-Plaintext:  D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1
-Ciphertext: FCCA1E3616236F0D5A1A9D035A35049D
-Test: Encrypt
-Comment:    Set 3, vector 210
-Key:        D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2
-Plaintext:  D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2
-Ciphertext: 2E7246518C923B2AE23C61C99D7E6CE7
-Test: Encrypt
-Comment:    Set 3, vector 211
-Key:        D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3
-Plaintext:  D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3
-Ciphertext: 8D19232494905BAF83F4230395C8E09B
-Test: Encrypt
-Comment:    Set 3, vector 212
-Key:        D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4
-Plaintext:  D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4
-Ciphertext: 6BC0BBCC76A7F8DF2A03BAB1CDE47FB6
-Test: Encrypt
-Comment:    Set 3, vector 213
-Key:        D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5
-Plaintext:  D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5
-Ciphertext: BD3D30B62DC0B0FEED0CC760879DB806
-Test: Encrypt
-Comment:    Set 3, vector 214
-Key:        D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6
-Plaintext:  D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6
-Ciphertext: 647388D8E6A9C8D09828041F4E338D47
-Test: Encrypt
-Comment:    Set 3, vector 215
-Key:        D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
-Plaintext:  D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
-Ciphertext: 4861CFC3FDDC434F2742E45B97FBB270
-Test: Encrypt
-Comment:    Set 3, vector 216
-Key:        D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8
-Plaintext:  D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8
-Ciphertext: 4426BC1C3990A5DE10760D0C10A3BB9A
-Test: Encrypt
-Comment:    Set 3, vector 217
-Key:        D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9
-Plaintext:  D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9
-Ciphertext: 805211D0BD914F07AB1579EF9E3827EE
-Test: Encrypt
-Comment:    Set 3, vector 218
-Key:        DADADADADADADADADADADADADADADADADADADADADADADADA
-Plaintext:  DADADADADADADADADADADADADADADADA
-Ciphertext: 519DB5AA8DA219224EDA77F77B96C135
-Test: Encrypt
-Comment:    Set 3, vector 219
-Key:        DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB
-Plaintext:  DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB
-Ciphertext: 7A96F769BF260E6D91A070BA7766D3E3
-Test: Encrypt
-Comment:    Set 3, vector 220
-Key:        DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
-Plaintext:  DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
-Ciphertext: 902222F1779476A44CEEDACEDA72B3EC
-Test: Encrypt
-Comment:    Set 3, vector 221
-Key:        DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-Plaintext:  DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-Ciphertext: 99859E56FE0DAB67CDE755E4790ED51D
-Test: Encrypt
-Comment:    Set 3, vector 222
-Key:        DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE
-Plaintext:  DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE
-Ciphertext: C2F4EE121941873763F302ECE6D8DF9E
-Test: Encrypt
-Comment:    Set 3, vector 223
-Key:        DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF
-Plaintext:  DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF
-Ciphertext: FE1E93DBF071E2280130E169C9E5254A
-Test: Encrypt
-Comment:    Set 3, vector 224
-Key:        E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0
-Plaintext:  E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0
-Ciphertext: 58F45B5E30D9DE7038EC405B601521AB
-Test: Encrypt
-Comment:    Set 3, vector 225
-Key:        E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1
-Plaintext:  E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1
-Ciphertext: 8783BD662F65899EF61E113B7CC6505D
-Test: Encrypt
-Comment:    Set 3, vector 226
-Key:        E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
-Plaintext:  E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
-Ciphertext: A3F6BBB2C3403F433203E0E18DB3E4C0
-Test: Encrypt
-Comment:    Set 3, vector 227
-Key:        E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3
-Plaintext:  E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3
-Ciphertext: D3EE663795362A0D2E7A8DB784F95A33
-Test: Encrypt
-Comment:    Set 3, vector 228
-Key:        E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4
-Plaintext:  E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4
-Ciphertext: 1B75895E7FCEEEA5ECA62E14F77ECF6A
-Test: Encrypt
-Comment:    Set 3, vector 229
-Key:        E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
-Plaintext:  E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
-Ciphertext: 5040525E4F3B78D2036539C1C463A48B
-Test: Encrypt
-Comment:    Set 3, vector 230
-Key:        E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6
-Plaintext:  E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6
-Ciphertext: A48E63494241AEACB0EF7B18A431E50D
-Test: Encrypt
-Comment:    Set 3, vector 231
-Key:        E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7
-Plaintext:  E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7
-Ciphertext: 9DAF4DBBBC81465BC4270129C522ABCB
-Test: Encrypt
-Comment:    Set 3, vector 232
-Key:        E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8
-Plaintext:  E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8
-Ciphertext: 20B118C870AF1A85C683C60A31ED24E4
-Test: Encrypt
-Comment:    Set 3, vector 233
-Key:        E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9
-Plaintext:  E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9
-Ciphertext: 52FF30830000A72FA2CB030539550F06
-Test: Encrypt
-Comment:    Set 3, vector 234
-Key:        EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA
-Plaintext:  EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA
-Ciphertext: 797ED3DB1B9A4BF4122EA0FF667BC36D
-Test: Encrypt
-Comment:    Set 3, vector 235
-Key:        EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB
-Plaintext:  EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB
-Ciphertext: 708CE40FC810F5E84B6EE8FC2E0A46FA
-Test: Encrypt
-Comment:    Set 3, vector 236
-Key:        ECECECECECECECECECECECECECECECECECECECECECECECEC
-Plaintext:  ECECECECECECECECECECECECECECECEC
-Ciphertext: 0BA7446B1D3D803BB80CDE94E096E79C
-Test: Encrypt
-Comment:    Set 3, vector 237
-Key:        EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED
-Plaintext:  EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED
-Ciphertext: 6B0E95AED4DC9E923EDF3DDD5BAEEA0C
-Test: Encrypt
-Comment:    Set 3, vector 238
-Key:        EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-Plaintext:  EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-Ciphertext: DE45D435FD6F8A240AD8DCE5A4BD8CC3
-Test: Encrypt
-Comment:    Set 3, vector 239
-Key:        EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF
-Plaintext:  EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF
-Ciphertext: 8823002161D635ADA686D85B087F3022
-Test: Encrypt
-Comment:    Set 3, vector 240
-Key:        F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
-Plaintext:  F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
-Ciphertext: C00F367B98CC819F5F6ADADEA8513DD8
-Test: Encrypt
-Comment:    Set 3, vector 241
-Key:        F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-Plaintext:  F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-Ciphertext: 9C25269FB7FA889FBD9E55AAD4C92DE0
-Test: Encrypt
-Comment:    Set 3, vector 242
-Key:        F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
-Plaintext:  F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
-Ciphertext: 5DD1D60A62B551FFA18CFF8263C5FCE4
-Test: Encrypt
-Comment:    Set 3, vector 243
-Key:        F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
-Plaintext:  F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
-Ciphertext: D183A9113393C1EEC7170331C65D2547
-Test: Encrypt
-Comment:    Set 3, vector 244
-Key:        F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
-Plaintext:  F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
-Ciphertext: FADF9E4AF6C1D7A6965D5DBA03194F18
-Test: Encrypt
-Comment:    Set 3, vector 245
-Key:        F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5
-Plaintext:  F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5
-Ciphertext: F2E9E5BE04D7B47B93D2B81DBCDA8BF3
-Test: Encrypt
-Comment:    Set 3, vector 246
-Key:        F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6
-Plaintext:  F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6
-Ciphertext: 7A04D513A59636ECA8A8608F10F21910
-Test: Encrypt
-Comment:    Set 3, vector 247
-Key:        F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7
-Plaintext:  F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7
-Ciphertext: 659552FCEF0E90F77050CF3902A22475
-Test: Encrypt
-Comment:    Set 3, vector 248
-Key:        F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8
-Plaintext:  F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8
-Ciphertext: F81709C989061D4439BDD47E71DBB457
-Test: Encrypt
-Comment:    Set 3, vector 249
-Key:        F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9
-Plaintext:  F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9
-Ciphertext: E05425C950E298F31FC6751375B48B66
-Test: Encrypt
-Comment:    Set 3, vector 250
-Key:        FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA
-Plaintext:  FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA
-Ciphertext: 6E90B365BEBAFA5C49DC4D6AB1593F94
-Test: Encrypt
-Comment:    Set 3, vector 251
-Key:        FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB
-Plaintext:  FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB
-Ciphertext: B2469C08D0F878579E162E8ACC5EF802
-Test: Encrypt
-Comment:    Set 3, vector 252
-Key:        FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
-Plaintext:  FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
-Ciphertext: C1DCAB694C7FDBEC88C6FC2597EAC180
-Test: Encrypt
-Comment:    Set 3, vector 253
-Key:        FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
-Plaintext:  FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
-Ciphertext: 6651FFBD3C30A496D072493A519D44D9
-Test: Encrypt
-Comment:    Set 3, vector 254
-Key:        FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
-Plaintext:  FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
-Ciphertext: A2F5A98929658AF4A9700B9923DAF014
-Test: Encrypt
-Comment:    Set 3, vector 255
-Key:        FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-Plaintext:  FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-Ciphertext: 3F8D5676F51CE23DC3BDB627F8B3883E
-Test: Encrypt
-Comment: Tests with 256-bit keys
-Comment:    Set 1, vector 0
-Key:        8000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2136FABDA091DFB5171B94B8EFBB5D08
-Test: Encrypt
-Comment:    Set 1, vector 1
-Key:        4000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6EBC4F33B3EADA5DBF25130F3D02CD34
-Test: Encrypt
-Comment:    Set 1, vector 2
-Key:        2000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3A7BCDC53A1F02EF20C79CFCE107D38B
-Test: Encrypt
-Comment:    Set 1, vector 3
-Key:        1000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 88A96052B61C5A621EE9A6316A42ED4A
-Test: Encrypt
-Comment:    Set 1, vector 4
-Key:        0800000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CBD7A2D8354B2DA972A0950BDFFF2CBD
-Test: Encrypt
-Comment:    Set 1, vector 5
-Key:        0400000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 690BEB5FBEA12A4861E826F568E9F8F3
-Test: Encrypt
-Comment:    Set 1, vector 6
-Key:        0200000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 799A6FA3B78846E424F41370654ABD6F
-Test: Encrypt
-Comment:    Set 1, vector 7
-Key:        0100000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DD7E24E12F391C5FEDE40136F8DE3731
-Test: Encrypt
-Comment:    Set 1, vector 8
-Key:        0080000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F7412D526E9244574F9933F602595385
-Test: Encrypt
-Comment:    Set 1, vector 9
-Key:        0040000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FD9D0174A83BEC3E7E1C3372CB5E7C9B
-Test: Encrypt
-Comment:    Set 1, vector 10
-Key:        0020000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FCA62D360A7DFE54DB8D53819A407E71
-Test: Encrypt
-Comment:    Set 1, vector 11
-Key:        0010000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AC821C68913DCE3E74A20DB8E902CC4C
-Test: Encrypt
-Comment:    Set 1, vector 12
-Key:        0008000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 80633F6CB8F10863E0A7FDE4C35D50E9
-Test: Encrypt
-Comment:    Set 1, vector 13
-Key:        0004000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D417D1D94869EE2364FCE869C0C1114E
-Test: Encrypt
-Comment:    Set 1, vector 14
-Key:        0002000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0FA96DCEA2ACB849490CD5A1488A2FD9
-Test: Encrypt
-Comment:    Set 1, vector 15
-Key:        0001000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3E99BCB51CAEB9147DCF8643771D1C83
-Test: Encrypt
-Comment:    Set 1, vector 16
-Key:        0000800000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 25EA413BBC3C2579D3F7CBFD9E378091
-Test: Encrypt
-Comment:    Set 1, vector 17
-Key:        0000400000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C0433C1AD2E468FC679988CFBFCA5CD4
-Test: Encrypt
-Comment:    Set 1, vector 18
-Key:        0000200000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 05108B7D7C2871D9DE1F22232CF6966B
-Test: Encrypt
-Comment:    Set 1, vector 19
-Key:        0000100000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8ABE085B75333946450F2D1D162E8650
-Test: Encrypt
-Comment:    Set 1, vector 20
-Key:        0000080000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 487A9C50152B44F5B009D8682EA1FD22
-Test: Encrypt
-Comment:    Set 1, vector 21
-Key:        0000040000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 739207A812F142B545798BA85170AF25
-Test: Encrypt
-Comment:    Set 1, vector 22
-Key:        0000020000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E40B90A5840591FEC98A24B23E73892B
-Test: Encrypt
-Comment:    Set 1, vector 23
-Key:        0000010000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0258BFB0DC942F6A9139D3C00EBBEB35
-Test: Encrypt
-Comment:    Set 1, vector 24
-Key:        0000008000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 650CD6035752320B8252F44AEEBEC9E4
-Test: Encrypt
-Comment:    Set 1, vector 25
-Key:        0000004000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FABFFBB7028B53E0BB88E3E4462ACF0D
-Test: Encrypt
-Comment:    Set 1, vector 26
-Key:        0000002000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C48D3416904896E2F2307EA26FB8CF1C
-Test: Encrypt
-Comment:    Set 1, vector 27
-Key:        0000001000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2237452352F488F1DA3F1619FC6A7F85
-Test: Encrypt
-Comment:    Set 1, vector 28
-Key:        0000000800000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D3E6ECF4A3F70E672AABEE0C2ECA3960
-Test: Encrypt
-Comment:    Set 1, vector 29
-Key:        0000000400000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7A3EFC8AC6A82E8AEF377D8D96D8E830
-Test: Encrypt
-Comment:    Set 1, vector 30
-Key:        0000000200000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7278F0441F5AA34C0B7CDB076B453225
-Test: Encrypt
-Comment:    Set 1, vector 31
-Key:        0000000100000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 382E61EAC044E2151906F936CC9D33AE
-Test: Encrypt
-Comment:    Set 1, vector 32
-Key:        0000000080000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C51147F4AD33C35647DF7E856C2965D4
-Test: Encrypt
-Comment:    Set 1, vector 33
-Key:        0000000040000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DAFE261154ADF63EA3F75B1253A9F77C
-Test: Encrypt
-Comment:    Set 1, vector 34
-Key:        0000000020000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B1A0B0E765C1D0379CA538ED0EFB9649
-Test: Encrypt
-Comment:    Set 1, vector 35
-Key:        0000000010000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 78F7D01D7795ACA0846CCE835E71FBC2
-Test: Encrypt
-Comment:    Set 1, vector 36
-Key:        0000000008000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E001A545AC71F53D3AD99C84D7F5B062
-Test: Encrypt
-Comment:    Set 1, vector 37
-Key:        0000000004000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 58E3907C56BF5ADFDBAE61C172B8F488
-Test: Encrypt
-Comment:    Set 1, vector 38
-Key:        0000000002000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 16F77C9515B473167BD7ABA7C97B1CCA
-Test: Encrypt
-Comment:    Set 1, vector 39
-Key:        0000000001000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4BC9F687C7757CDF5A5E94D69E5EA173
-Test: Encrypt
-Comment:    Set 1, vector 40
-Key:        0000000000800000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 804261A34F26A87694F70C35F338989D
-Test: Encrypt
-Comment:    Set 1, vector 41
-Key:        0000000000400000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E8D8BF002738D7067CD06437C4459365
-Test: Encrypt
-Comment:    Set 1, vector 42
-Key:        0000000000200000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E131137F7EA2AEAB37F72AF3644FFCCE
-Test: Encrypt
-Comment:    Set 1, vector 43
-Key:        0000000000100000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 542A1FD5CB4BE8485FA83AA14FAAD4A8
-Test: Encrypt
-Comment:    Set 1, vector 44
-Key:        0000000000080000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BEC6C8C1A9E5E7982A990B8F9BA0ADE3
-Test: Encrypt
-Comment:    Set 1, vector 45
-Key:        0000000000040000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DE55BE1AA823A9F7474C65BD50D55095
-Test: Encrypt
-Comment:    Set 1, vector 46
-Key:        0000000000020000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D67CC199AF361A07A0DBD8F6700A4744
-Test: Encrypt
-Comment:    Set 1, vector 47
-Key:        0000000000010000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DBAD180017184EF80D398D8D22AAC4A1
-Test: Encrypt
-Comment:    Set 1, vector 48
-Key:        0000000000008000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 27E68691F10EEFD1B594682DC3EF65A5
-Test: Encrypt
-Comment:    Set 1, vector 49
-Key:        0000000000004000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6D4EF0587B948AD62B703D3D7CCEA229
-Test: Encrypt
-Comment:    Set 1, vector 50
-Key:        0000000000002000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C0F443758F239E3A3E31E6F93AD4766B
-Test: Encrypt
-Comment:    Set 1, vector 51
-Key:        0000000000001000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BEB5CB1D8EB3A9EA795A4B43CA1567A9
-Test: Encrypt
-Comment:    Set 1, vector 52
-Key:        0000000000000800000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D89A97957F1979C63459A385E21B4A84
-Test: Encrypt
-Comment:    Set 1, vector 53
-Key:        0000000000000400000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 39A6615147FF571F2FABAD5BE9800A10
-Test: Encrypt
-Comment:    Set 1, vector 54
-Key:        0000000000000200000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E18B0CB1980124504B46A46A6F4273F3
-Test: Encrypt
-Comment:    Set 1, vector 55
-Key:        0000000000000100000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1E13C8034ED53FD4E3F433E1CF4B5CE1
-Test: Encrypt
-Comment:    Set 1, vector 56
-Key:        0000000000000080000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 71FA53EAADBA0C9BCF86A3071408966D
-Test: Encrypt
-Comment:    Set 1, vector 57
-Key:        0000000000000040000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E50502EC84BB024C7466FE225C7FD8BA
-Test: Encrypt
-Comment:    Set 1, vector 58
-Key:        0000000000000020000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DEB33581D79C9D4294E315998377BCBF
-Test: Encrypt
-Comment:    Set 1, vector 59
-Key:        0000000000000010000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A713C2503CE44A04C9108FA160659945
-Test: Encrypt
-Comment:    Set 1, vector 60
-Key:        0000000000000008000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 520E9E8DB8A67601B02E369916FAB8CC
-Test: Encrypt
-Comment:    Set 1, vector 61
-Key:        0000000000000004000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8FDC11B74D17D79C6B2DFF2D6A561258
-Test: Encrypt
-Comment:    Set 1, vector 62
-Key:        0000000000000002000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3EA497AD2FC8F2587EFAA7D49121F26C
-Test: Encrypt
-Comment:    Set 1, vector 63
-Key:        0000000000000001000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3340905F7413C979E5AED11D71B9294E
-Test: Encrypt
-Comment:    Set 1, vector 64
-Key:        0000000000000000800000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 067FAC22E16205FF209B1760ABDE0565
-Test: Encrypt
-Comment:    Set 1, vector 65
-Key:        0000000000000000400000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BECA010BAB7BDD7E8A8084DA9853A0F4
-Test: Encrypt
-Comment:    Set 1, vector 66
-Key:        0000000000000000200000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 146F5A4A7B2880F5AF57333C7F129028
-Test: Encrypt
-Comment:    Set 1, vector 67
-Key:        0000000000000000100000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F773C1BD724955109A8B4EA3DA1C2197
-Test: Encrypt
-Comment:    Set 1, vector 68
-Key:        0000000000000000080000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B427EFAC8C656AB6F4DF7F420A177B8E
-Test: Encrypt
-Comment:    Set 1, vector 69
-Key:        0000000000000000040000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B3D1BDB29010DB5FC81B66E2F7189D54
-Test: Encrypt
-Comment:    Set 1, vector 70
-Key:        0000000000000000020000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 676EEA415693F303ACF5CD84C50816AB
-Test: Encrypt
-Comment:    Set 1, vector 71
-Key:        0000000000000000010000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BA21C564E52961DEB4B3A3CA9E0B70EF
-Test: Encrypt
-Comment:    Set 1, vector 72
-Key:        0000000000000000008000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A60FB5DBD17EA92E303492E3F54D0BF2
-Test: Encrypt
-Comment:    Set 1, vector 73
-Key:        0000000000000000004000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F4F5A0540107D66F32FB289B14EF4299
-Test: Encrypt
-Comment:    Set 1, vector 74
-Key:        0000000000000000002000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8D9B4A19F391175CF7DA42FEF313EDD8
-Test: Encrypt
-Comment:    Set 1, vector 75
-Key:        0000000000000000001000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B0AFAB0183A9FC69DA8BBE9B8FAF653A
-Test: Encrypt
-Comment:    Set 1, vector 76
-Key:        0000000000000000000800000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 68FFD91FD5AD1F1AC176D639694FEA29
-Test: Encrypt
-Comment:    Set 1, vector 77
-Key:        0000000000000000000400000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 97EC38070014494A2E97EFE354BA2865
-Test: Encrypt
-Comment:    Set 1, vector 78
-Key:        0000000000000000000200000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E3EC51F889C63AD2C708F22AFC42D18C
-Test: Encrypt
-Comment:    Set 1, vector 79
-Key:        0000000000000000000100000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8CC5BDB49037DC1D3D8DADFA0B8ECD96
-Test: Encrypt
-Comment:    Set 1, vector 80
-Key:        0000000000000000000080000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 14F5C3D75BA0397D7436E1479F78435B
-Test: Encrypt
-Comment:    Set 1, vector 81
-Key:        0000000000000000000040000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FF3B01851C8254967E4DFAA2A0F0C057
-Test: Encrypt
-Comment:    Set 1, vector 82
-Key:        0000000000000000000020000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B8C8E9AFF66FFEC9D0342FF297A543B1
-Test: Encrypt
-Comment:    Set 1, vector 83
-Key:        0000000000000000000010000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A95A113F088FFE17A79050C46377545E
-Test: Encrypt
-Comment:    Set 1, vector 84
-Key:        0000000000000000000008000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EA4C3AFA65016D057EC1DFDD0411ED06
-Test: Encrypt
-Comment:    Set 1, vector 85
-Key:        0000000000000000000004000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7D535C84DFAD692D0F89AB73C1F42F60
-Test: Encrypt
-Comment:    Set 1, vector 86
-Key:        0000000000000000000002000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E857DF0CEBAB1E03CB9AF73CBF9C19D1
-Test: Encrypt
-Comment:    Set 1, vector 87
-Key:        0000000000000000000001000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7A59BCF6FAC80379EB7E8E2EFAB147D4
-Test: Encrypt
-Comment:    Set 1, vector 88
-Key:        0000000000000000000000800000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 43EF17F87BAF7536DDE734F885C4CE85
-Test: Encrypt
-Comment:    Set 1, vector 89
-Key:        0000000000000000000000400000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2B71CE14089741A1EF1E99DC9E22E739
-Test: Encrypt
-Comment:    Set 1, vector 90
-Key:        0000000000000000000000200000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9283885622781998186B7DACBFF68ED2
-Test: Encrypt
-Comment:    Set 1, vector 91
-Key:        0000000000000000000000100000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 756A184F392D8C821479EFF930338C0A
-Test: Encrypt
-Comment:    Set 1, vector 92
-Key:        0000000000000000000000080000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CE848D49BB76CA30B607C9539793DA41
-Test: Encrypt
-Comment:    Set 1, vector 93
-Key:        0000000000000000000000040000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 50F2D5238991EEA9654C8895AFC0AC37
-Test: Encrypt
-Comment:    Set 1, vector 94
-Key:        0000000000000000000000020000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 561564103E13F4CBB58A9E096DB1958B
-Test: Encrypt
-Comment:    Set 1, vector 95
-Key:        0000000000000000000000010000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EF2BB05AC6868C15D66D956BD580D467
-Test: Encrypt
-Comment:    Set 1, vector 96
-Key:        0000000000000000000000008000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C7B1A5A3A201DF25FD97A47B1FC3569E
-Test: Encrypt
-Comment:    Set 1, vector 97
-Key:        0000000000000000000000004000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0A1873FF47B38095CF6A8BABF3901FF2
-Test: Encrypt
-Comment:    Set 1, vector 98
-Key:        0000000000000000000000002000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A96F8F977DC45ABF55518EA10C598E10
-Test: Encrypt
-Comment:    Set 1, vector 99
-Key:        0000000000000000000000001000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 778C644278689EC0577BDDB2154AE635
-Test: Encrypt
-Comment:    Set 1, vector 100
-Key:        0000000000000000000000000800000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DEF97DBCF02648E7BCE6A368F7F34C14
-Test: Encrypt
-Comment:    Set 1, vector 101
-Key:        0000000000000000000000000400000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 71B85362022D53AF03A17870D8F66614
-Test: Encrypt
-Comment:    Set 1, vector 102
-Key:        0000000000000000000000000200000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3593FC550A2950C2EF94F6E8F6E90BB3
-Test: Encrypt
-Comment:    Set 1, vector 103
-Key:        0000000000000000000000000100000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 29E64004DBF1E7833A7CD82EDACD932A
-Test: Encrypt
-Comment:    Set 1, vector 104
-Key:        0000000000000000000000000080000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 715E700DF74A8680F04A48B18AEDB99C
-Test: Encrypt
-Comment:    Set 1, vector 105
-Key:        0000000000000000000000000040000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 72E3288FFB02D1100F84FA605855D812
-Test: Encrypt
-Comment:    Set 1, vector 106
-Key:        0000000000000000000000000020000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9021082D3C4CB202936FD76F1392446B
-Test: Encrypt
-Comment:    Set 1, vector 107
-Key:        0000000000000000000000000010000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1552BD181EE0FB914558053F2662F9AE
-Test: Encrypt
-Comment:    Set 1, vector 108
-Key:        0000000000000000000000000008000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 599D87052322E19141057F0EF3C47508
-Test: Encrypt
-Comment:    Set 1, vector 109
-Key:        0000000000000000000000000004000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 505AC03CEB2ECA1C9D411B4A1CF2011C
-Test: Encrypt
-Comment:    Set 1, vector 110
-Key:        0000000000000000000000000002000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DD639574D8FFCD24EA68B2243C5AA7D6
-Test: Encrypt
-Comment:    Set 1, vector 111
-Key:        0000000000000000000000000001000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 45F5371B714D2652BA4AD083EDB65BEE
-Test: Encrypt
-Comment:    Set 1, vector 112
-Key:        0000000000000000000000000000800000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DEAB9C368B21FE41E709554340E87C0B
-Test: Encrypt
-Comment:    Set 1, vector 113
-Key:        0000000000000000000000000000400000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3A981045526766BD13943F11CE917AF9
-Test: Encrypt
-Comment:    Set 1, vector 114
-Key:        0000000000000000000000000000200000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 35CDF30A485CE21F0D005EE0C2BCF315
-Test: Encrypt
-Comment:    Set 1, vector 115
-Key:        0000000000000000000000000000100000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F561A8C91820252580317385F8336305
-Test: Encrypt
-Comment:    Set 1, vector 116
-Key:        0000000000000000000000000000080000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0789680D27735220798079572BF4ECF6
-Test: Encrypt
-Comment:    Set 1, vector 117
-Key:        0000000000000000000000000000040000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B4F16729D7AB16C9AE44FB61291920DE
-Test: Encrypt
-Comment:    Set 1, vector 118
-Key:        0000000000000000000000000000020000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FB83BF9B1D983CA7FB3718E22D9A2155
-Test: Encrypt
-Comment:    Set 1, vector 119
-Key:        0000000000000000000000000000010000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CEC5C5D13E59508D3DA431F1479730F3
-Test: Encrypt
-Comment:    Set 1, vector 120
-Key:        0000000000000000000000000000008000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 09BEA932E60A4AD34271FF11A2B2AA02
-Test: Encrypt
-Comment:    Set 1, vector 121
-Key:        0000000000000000000000000000004000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B102F72FD89452C0CD1C6897071F903E
-Test: Encrypt
-Comment:    Set 1, vector 122
-Key:        0000000000000000000000000000002000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A469F9411F0A3A6E1A8076416C6B55CB
-Test: Encrypt
-Comment:    Set 1, vector 123
-Key:        0000000000000000000000000000001000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6C3F88FCB538699547A1CF07A529993F
-Test: Encrypt
-Comment:    Set 1, vector 124
-Key:        0000000000000000000000000000000800000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 493E8CC2A63534632A6456ED47BF233C
-Test: Encrypt
-Comment:    Set 1, vector 125
-Key:        0000000000000000000000000000000400000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1FD81E905F7055C4B04DB1F9718A6861
-Test: Encrypt
-Comment:    Set 1, vector 126
-Key:        0000000000000000000000000000000200000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B22882E01D7A1BF2D7F0E3BFBFC87156
-Test: Encrypt
-Comment:    Set 1, vector 127
-Key:        0000000000000000000000000000000100000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 86C9822E849322FB00DF89233D33935D
-Test: Encrypt
-Comment:    Set 1, vector 128
-Key:        0000000000000000000000000000000080000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 12012E8E028D0D3D8DC00847130D424C
-Test: Encrypt
-Comment:    Set 1, vector 129
-Key:        0000000000000000000000000000000040000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 182A96CC3BF10035B9DB292D1399F993
-Test: Encrypt
-Comment:    Set 1, vector 130
-Key:        0000000000000000000000000000000020000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 91E0E6991989D1FC4CBD754E4E7D0590
-Test: Encrypt
-Comment:    Set 1, vector 131
-Key:        0000000000000000000000000000000010000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F3EFC4E6F207E370C8CAE39408C4BF1B
-Test: Encrypt
-Comment:    Set 1, vector 132
-Key:        0000000000000000000000000000000008000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AA767AB2EC6FA2FA183DAF9C0F3BAE5E
-Test: Encrypt
-Comment:    Set 1, vector 133
-Key:        0000000000000000000000000000000004000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: D1FF11F4D1AEEAAE01A115081AF886EF
-Test: Encrypt
-Comment:    Set 1, vector 134
-Key:        0000000000000000000000000000000002000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5390139711090B56B28338FEA98FCC82
-Test: Encrypt
-Comment:    Set 1, vector 135
-Key:        0000000000000000000000000000000001000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 13E693CCF6EBF0E6061B92B7ED0B95B6
-Test: Encrypt
-Comment:    Set 1, vector 136
-Key:        0000000000000000000000000000000000800000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 588FB2F95861D3C427669C68D04ADB25
-Test: Encrypt
-Comment:    Set 1, vector 137
-Key:        0000000000000000000000000000000000400000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F472ECDF8DEBC416313AAF7C8AAFB43E
-Test: Encrypt
-Comment:    Set 1, vector 138
-Key:        0000000000000000000000000000000000200000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EAA654BE38E857941A921C70AC7FC7CE
-Test: Encrypt
-Comment:    Set 1, vector 139
-Key:        0000000000000000000000000000000000100000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F2A4E47AE80CDF506B9513C510EA0954
-Test: Encrypt
-Comment:    Set 1, vector 140
-Key:        0000000000000000000000000000000000080000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F08EC7ED8FBB99F175A990C3E4DECB6B
-Test: Encrypt
-Comment:    Set 1, vector 141
-Key:        0000000000000000000000000000000000040000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5C767BC584CA3653EDE27CD8B209A0AD
-Test: Encrypt
-Comment:    Set 1, vector 142
-Key:        0000000000000000000000000000000000020000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AFF9A8BA92A40B2BF42FDB4089B1F9CC
-Test: Encrypt
-Comment:    Set 1, vector 143
-Key:        0000000000000000000000000000000000010000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BFC1E9198BBE22266712EB1ECB17D748
-Test: Encrypt
-Comment:    Set 1, vector 144
-Key:        0000000000000000000000000000000000008000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 235184136A29208BD041E60BCB9F7464
-Test: Encrypt
-Comment:    Set 1, vector 145
-Key:        0000000000000000000000000000000000004000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 83DC48F9177C5C94CBC22E83A2B76829
-Test: Encrypt
-Comment:    Set 1, vector 146
-Key:        0000000000000000000000000000000000002000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 72CD31ACB7A1A459E4D27C1F26039FA7
-Test: Encrypt
-Comment:    Set 1, vector 147
-Key:        0000000000000000000000000000000000001000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 139AC4734C3136FD9982FCC7A569B9D3
-Test: Encrypt
-Comment:    Set 1, vector 148
-Key:        0000000000000000000000000000000000000800000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 12FFA3EF4346F4C57A03A36F9938B251
-Test: Encrypt
-Comment:    Set 1, vector 149
-Key:        0000000000000000000000000000000000000400000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 43DDB100CE22E5553CF4DCF814BF3CAC
-Test: Encrypt
-Comment:    Set 1, vector 150
-Key:        0000000000000000000000000000000000000200000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: ABDADF4C948BB61C0A917885ADE4C7C5
-Test: Encrypt
-Comment:    Set 1, vector 151
-Key:        0000000000000000000000000000000000000100000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 197391E089DE173B522DDD8CBEEC3118
-Test: Encrypt
-Comment:    Set 1, vector 152
-Key:        0000000000000000000000000000000000000080000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 43FBE8BF2728C55C9368D01E40C1CF96
-Test: Encrypt
-Comment:    Set 1, vector 153
-Key:        0000000000000000000000000000000000000040000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0F5DE5F67EC84F2CB253A0BC48991C71
-Test: Encrypt
-Comment:    Set 1, vector 154
-Key:        0000000000000000000000000000000000000020000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 52BA4666B972EAE3D2E960D7372D3C48
-Test: Encrypt
-Comment:    Set 1, vector 155
-Key:        0000000000000000000000000000000000000010000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0735AE765BC079A93B451D873FA93702
-Test: Encrypt
-Comment:    Set 1, vector 156
-Key:        0000000000000000000000000000000000000008000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 89D988508A4569E2232F72412AE50B65
-Test: Encrypt
-Comment:    Set 1, vector 157
-Key:        0000000000000000000000000000000000000004000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BCF0EE2403BC9344030C0FF065B6FD88
-Test: Encrypt
-Comment:    Set 1, vector 158
-Key:        0000000000000000000000000000000000000002000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 25D76D36F3376D6FD835BA012C7DD2E5
-Test: Encrypt
-Comment:    Set 1, vector 159
-Key:        0000000000000000000000000000000000000001000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EF364A31E8551732D4B2098281D4E2C9
-Test: Encrypt
-Comment:    Set 1, vector 160
-Key:        0000000000000000000000000000000000000000800000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 64B1F927C0A7315EA60BC5F2A0DCCFE2
-Test: Encrypt
-Comment:    Set 1, vector 161
-Key:        0000000000000000000000000000000000000000400000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CA99E0EDFA0E121F27659346BCDCC443
-Test: Encrypt
-Comment:    Set 1, vector 162
-Key:        0000000000000000000000000000000000000000200000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1816D9D23D1069BC6DEC195F60994C05
-Test: Encrypt
-Comment:    Set 1, vector 163
-Key:        0000000000000000000000000000000000000000100000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9819575F6890E093091378AED0612051
-Test: Encrypt
-Comment:    Set 1, vector 164
-Key:        0000000000000000000000000000000000000000080000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 41903DE72A486B823842FBA2840E265C
-Test: Encrypt
-Comment:    Set 1, vector 165
-Key:        0000000000000000000000000000000000000000040000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 30651D416912A01EDEC4290D34B4A605
-Test: Encrypt
-Comment:    Set 1, vector 166
-Key:        0000000000000000000000000000000000000000020000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0949AD8AB2E85995686D6D495ABA1028
-Test: Encrypt
-Comment:    Set 1, vector 167
-Key:        0000000000000000000000000000000000000000010000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3789C2D08E122BE204662FE9A0FDF77A
-Test: Encrypt
-Comment:    Set 1, vector 168
-Key:        0000000000000000000000000000000000000000008000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A0C66EE031FF045123475E6F5FA64F57
-Test: Encrypt
-Comment:    Set 1, vector 169
-Key:        0000000000000000000000000000000000000000004000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1BACCDD314AF39124709013C94CAD1AC
-Test: Encrypt
-Comment:    Set 1, vector 170
-Key:        0000000000000000000000000000000000000000002000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2FB5DF5527A8E06AED03D683EDF14E9A
-Test: Encrypt
-Comment:    Set 1, vector 171
-Key:        0000000000000000000000000000000000000000001000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FF2C61AD63CDA6207605C18C888B383D
-Test: Encrypt
-Comment:    Set 1, vector 172
-Key:        0000000000000000000000000000000000000000000800000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 71CE4A5B48671AB9A6561B7109FB8345
-Test: Encrypt
-Comment:    Set 1, vector 173
-Key:        0000000000000000000000000000000000000000000400000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 37299C12377E9CB8DF5FE730DFFCB5CA
-Test: Encrypt
-Comment:    Set 1, vector 174
-Key:        0000000000000000000000000000000000000000000200000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C5454350A7CB0EC5CA3932A3948F48BC
-Test: Encrypt
-Comment:    Set 1, vector 175
-Key:        0000000000000000000000000000000000000000000100000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8AB40D09FFBD0C82E9091FC80D2A63C9
-Test: Encrypt
-Comment:    Set 1, vector 176
-Key:        0000000000000000000000000000000000000000000080000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9CB3FE43EAE3DC7AC4F97E609FDE9F10
-Test: Encrypt
-Comment:    Set 1, vector 177
-Key:        0000000000000000000000000000000000000000000040000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 51369DC689B25C3AC593B578BAEA046E
-Test: Encrypt
-Comment:    Set 1, vector 178
-Key:        0000000000000000000000000000000000000000000020000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 13D9D885A24AE8B859F239890DF438C9
-Test: Encrypt
-Comment:    Set 1, vector 179
-Key:        0000000000000000000000000000000000000000000010000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CEACAE376290D5C62D2DAE422CA6E5C0
-Test: Encrypt
-Comment:    Set 1, vector 180
-Key:        0000000000000000000000000000000000000000000008000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6AE17D621F97B62F4571AB165CE0A11F
-Test: Encrypt
-Comment:    Set 1, vector 181
-Key:        0000000000000000000000000000000000000000000004000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C91318F8FD17E9BC656E639A0D648B3A
-Test: Encrypt
-Comment:    Set 1, vector 182
-Key:        0000000000000000000000000000000000000000000002000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BFF1BC1C935E40FB0C20DED5985F1910
-Test: Encrypt
-Comment:    Set 1, vector 183
-Key:        0000000000000000000000000000000000000000000001000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 96F0B387F487BBDD5227B595A506F963
-Test: Encrypt
-Comment:    Set 1, vector 184
-Key:        0000000000000000000000000000000000000000000000800000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 62265B7EFB73A77205ECBBFD166B3EAE
-Test: Encrypt
-Comment:    Set 1, vector 185
-Key:        0000000000000000000000000000000000000000000000400000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 016E8F3087757E8F576B19A58D356FB6
-Test: Encrypt
-Comment:    Set 1, vector 186
-Key:        0000000000000000000000000000000000000000000000200000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 456FAF632EA07797CEC23DC6553988F9
-Test: Encrypt
-Comment:    Set 1, vector 187
-Key:        0000000000000000000000000000000000000000000000100000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 147694E2231FA00D6B62D3E51CC8201D
-Test: Encrypt
-Comment:    Set 1, vector 188
-Key:        0000000000000000000000000000000000000000000000080000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2299D31F3D747838C65FE7C6C0C59214
-Test: Encrypt
-Comment:    Set 1, vector 189
-Key:        0000000000000000000000000000000000000000000000040000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: C5A669612A23E4F7551D79650071E040
-Test: Encrypt
-Comment:    Set 1, vector 190
-Key:        0000000000000000000000000000000000000000000000020000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F0A32D722EDFD2BA628C781DACD5FC50
-Test: Encrypt
-Comment:    Set 1, vector 191
-Key:        0000000000000000000000000000000000000000000000010000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 422C8E2A0DFF095E40654CB2B7176A9B
-Test: Encrypt
-Comment:    Set 1, vector 192
-Key:        0000000000000000000000000000000000000000000000008000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 99DEF168961D4AB9E63157E60F76399C
-Test: Encrypt
-Comment:    Set 1, vector 193
-Key:        0000000000000000000000000000000000000000000000004000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 49C92ACC622A00BCFF7DFDCABF33CB4C
-Test: Encrypt
-Comment:    Set 1, vector 194
-Key:        0000000000000000000000000000000000000000000000002000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 517117A096B2EE66D4BEF2D1EE570CE7
-Test: Encrypt
-Comment:    Set 1, vector 195
-Key:        0000000000000000000000000000000000000000000000001000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9DAECC0E82559BC2CDB8A01AB30BA605
-Test: Encrypt
-Comment:    Set 1, vector 196
-Key:        0000000000000000000000000000000000000000000000000800000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 50B2882928DAB54488413ABA5743535E
-Test: Encrypt
-Comment:    Set 1, vector 197
-Key:        0000000000000000000000000000000000000000000000000400000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E6725F73ED920F473E1442ABEC7DB722
-Test: Encrypt
-Comment:    Set 1, vector 198
-Key:        0000000000000000000000000000000000000000000000000200000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CB4F06002C5864E40C80F97157452575
-Test: Encrypt
-Comment:    Set 1, vector 199
-Key:        0000000000000000000000000000000000000000000000000100000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8DF72D7C8AE547F2AA3E9AFAAD1D62F0
-Test: Encrypt
-Comment:    Set 1, vector 200
-Key:        0000000000000000000000000000000000000000000000000080000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0DA429E486F5ED9460B7C54460B0A699
-Test: Encrypt
-Comment:    Set 1, vector 201
-Key:        0000000000000000000000000000000000000000000000000040000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 24832DB462328D93306C6714E100ADAB
-Test: Encrypt
-Comment:    Set 1, vector 202
-Key:        0000000000000000000000000000000000000000000000000020000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 3170D82FEC3D2A58C7D2F28BAC4C7809
-Test: Encrypt
-Comment:    Set 1, vector 203
-Key:        0000000000000000000000000000000000000000000000000010000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 638A46425AEA9C808AC752EE69F56822
-Test: Encrypt
-Comment:    Set 1, vector 204
-Key:        0000000000000000000000000000000000000000000000000008000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F98954D90C5E3DB2EEC8A86078D70763
-Test: Encrypt
-Comment:    Set 1, vector 205
-Key:        0000000000000000000000000000000000000000000000000004000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8D5868451617FB145B8F7F91712A7AA0
-Test: Encrypt
-Comment:    Set 1, vector 206
-Key:        0000000000000000000000000000000000000000000000000002000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2292BA337A4F465E0DFB85DAAC266AE6
-Test: Encrypt
-Comment:    Set 1, vector 207
-Key:        0000000000000000000000000000000000000000000000000001000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F2560D5063A2F928D699005012A0C839
-Test: Encrypt
-Comment:    Set 1, vector 208
-Key:        0000000000000000000000000000000000000000000000000000800000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 44968AEABB2852075F83FB942E05099D
-Test: Encrypt
-Comment:    Set 1, vector 209
-Key:        0000000000000000000000000000000000000000000000000000400000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: EB339742AB40B5627A7CB60D4F54DD2E
-Test: Encrypt
-Comment:    Set 1, vector 210
-Key:        0000000000000000000000000000000000000000000000000000200000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9AAA6FC3BBDE523E9FCD9D5C0255F912
-Test: Encrypt
-Comment:    Set 1, vector 211
-Key:        0000000000000000000000000000000000000000000000000000100000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E6E25CBAFF57F4C6056706FD13E6A2E3
-Test: Encrypt
-Comment:    Set 1, vector 212
-Key:        0000000000000000000000000000000000000000000000000000080000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 8A9628166922E8EC6FC28F5E847B9C71
-Test: Encrypt
-Comment:    Set 1, vector 213
-Key:        0000000000000000000000000000000000000000000000000000040000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 97CF8FF5D1337DA8602F8AB6C0224AF7
-Test: Encrypt
-Comment:    Set 1, vector 214
-Key:        0000000000000000000000000000000000000000000000000000020000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DDBBE09A93364599E9233969ADBEBA63
-Test: Encrypt
-Comment:    Set 1, vector 215
-Key:        0000000000000000000000000000000000000000000000000000010000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: E772954B9DA3DA8A005582C4E9E5B6FA
-Test: Encrypt
-Comment:    Set 1, vector 216
-Key:        0000000000000000000000000000000000000000000000000000008000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 507DFD30F7EEF807F994B298D487FDE6
-Test: Encrypt
-Comment:    Set 1, vector 217
-Key:        0000000000000000000000000000000000000000000000000000004000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6FF09F69AED61F091F92503547A19B68
-Test: Encrypt
-Comment:    Set 1, vector 218
-Key:        0000000000000000000000000000000000000000000000000000002000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 1141E6BB725E09640DD6971F4EF1A886
-Test: Encrypt
-Comment:    Set 1, vector 219
-Key:        0000000000000000000000000000000000000000000000000000001000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9C0E8061BA0361B730D24675EF128705
-Test: Encrypt
-Comment:    Set 1, vector 220
-Key:        0000000000000000000000000000000000000000000000000000000800000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7D0137240D0D3D086198E83BC0CF22D0
-Test: Encrypt
-Comment:    Set 1, vector 221
-Key:        0000000000000000000000000000000000000000000000000000000400000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: BC4460FF55EBFAA1171B0CE249830281
-Test: Encrypt
-Comment:    Set 1, vector 222
-Key:        0000000000000000000000000000000000000000000000000000000200000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CDBE93ADCF1867B952FB82C42DF60CFD
-Test: Encrypt
-Comment:    Set 1, vector 223
-Key:        0000000000000000000000000000000000000000000000000000000100000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 007AA375E4402B8A5657C01259AF3D49
-Test: Encrypt
-Comment:    Set 1, vector 224
-Key:        0000000000000000000000000000000000000000000000000000000080000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: F5C2B13998E5687C773017C14EB01FE4
-Test: Encrypt
-Comment:    Set 1, vector 225
-Key:        0000000000000000000000000000000000000000000000000000000040000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0AE71BFDD72FBC4576305E4B0807E17C
-Test: Encrypt
-Comment:    Set 1, vector 226
-Key:        0000000000000000000000000000000000000000000000000000000020000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 35FB1CE6CB7449DF115D3AC6BA656439
-Test: Encrypt
-Comment:    Set 1, vector 227
-Key:        0000000000000000000000000000000000000000000000000000000010000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6D64CEC5D9D74BD40FBC0BE69C70B777
-Test: Encrypt
-Comment:    Set 1, vector 228
-Key:        0000000000000000000000000000000000000000000000000000000008000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7257851ACD3E3E3AE50048973C3A2AE8
-Test: Encrypt
-Comment:    Set 1, vector 229
-Key:        0000000000000000000000000000000000000000000000000000000004000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 50852661D5BD7960412B29A86F549619
-Test: Encrypt
-Comment:    Set 1, vector 230
-Key:        0000000000000000000000000000000000000000000000000000000002000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CDF3561D971D40521CD46BAE98F5867A
-Test: Encrypt
-Comment:    Set 1, vector 231
-Key:        0000000000000000000000000000000000000000000000000000000001000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FA3C84185B9ABF9887DD501B3B0F52D3
-Test: Encrypt
-Comment:    Set 1, vector 232
-Key:        0000000000000000000000000000000000000000000000000000000000800000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 40A5B434F81574733D00F25511109E08
-Test: Encrypt
-Comment:    Set 1, vector 233
-Key:        0000000000000000000000000000000000000000000000000000000000400000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DA0D248315C527572F1673BDE26A475E
-Test: Encrypt
-Comment:    Set 1, vector 234
-Key:        0000000000000000000000000000000000000000000000000000000000200000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0F8366D8EFB9AB63B0299F278C55CFB4
-Test: Encrypt
-Comment:    Set 1, vector 235
-Key:        0000000000000000000000000000000000000000000000000000000000100000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 25A089C523CD153EC094862B5923F492
-Test: Encrypt
-Comment:    Set 1, vector 236
-Key:        0000000000000000000000000000000000000000000000000000000000080000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7268A4628C6A0BE6A8391ABE70986176
-Test: Encrypt
-Comment:    Set 1, vector 237
-Key:        0000000000000000000000000000000000000000000000000000000000040000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7C11E6478CC688FE707454DF4AB5B666
-Test: Encrypt
-Comment:    Set 1, vector 238
-Key:        0000000000000000000000000000000000000000000000000000000000020000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 7601B6EBD5CE578973E949C21BFA8CAA
-Test: Encrypt
-Comment:    Set 1, vector 239
-Key:        0000000000000000000000000000000000000000000000000000000000010000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 0FCE9CCDF89F2EB139DBEB09B55375D5
-Test: Encrypt
-Comment:    Set 1, vector 240
-Key:        0000000000000000000000000000000000000000000000000000000000008000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AAABFDD9E28A3ADCA1212F3D7F53A269
-Test: Encrypt
-Comment:    Set 1, vector 241
-Key:        0000000000000000000000000000000000000000000000000000000000004000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: FC6B4304423917E41677768BD7A8D402
-Test: Encrypt
-Comment:    Set 1, vector 242
-Key:        0000000000000000000000000000000000000000000000000000000000002000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2AA3239D19ADBA9A4190E3653875C589
-Test: Encrypt
-Comment:    Set 1, vector 243
-Key:        0000000000000000000000000000000000000000000000000000000000001000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 4F4AB0DB2F3D3EA1E5FCBF99651485DC
-Test: Encrypt
-Comment:    Set 1, vector 244
-Key:        0000000000000000000000000000000000000000000000000000000000000800
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B542CEF08D13E300B282CE6A74C51C96
-Test: Encrypt
-Comment:    Set 1, vector 245
-Key:        0000000000000000000000000000000000000000000000000000000000000400
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 9955E16433B0D58BFC4B35EE9F44734C
-Test: Encrypt
-Comment:    Set 1, vector 246
-Key:        0000000000000000000000000000000000000000000000000000000000000200
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 5027A7DDC6F99A112E45D3090C7C3465
-Test: Encrypt
-Comment:    Set 1, vector 247
-Key:        0000000000000000000000000000000000000000000000000000000000000100
-Plaintext:  00000000000000000000000000000000
-Ciphertext: CB14EBD24FC63194495FACFFB5C3A07B
-Test: Encrypt
-Comment:    Set 1, vector 248
-Key:        0000000000000000000000000000000000000000000000000000000000000080
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 2BCBE64545A08F59178242452566B997
-Test: Encrypt
-Comment:    Set 1, vector 249
-Key:        0000000000000000000000000000000000000000000000000000000000000040
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DE428FF12360A0C8FAE73E9D8E6A0657
-Test: Encrypt
-Comment:    Set 1, vector 250
-Key:        0000000000000000000000000000000000000000000000000000000000000020
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 6425603FCB0F088D87D3AC7078C7014C
-Test: Encrypt
-Comment:    Set 1, vector 251
-Key:        0000000000000000000000000000000000000000000000000000000000000010
-Plaintext:  00000000000000000000000000000000
-Ciphertext: A837813C9436F4C48C45B6C85A4EAF84
-Test: Encrypt
-Comment:    Set 1, vector 252
-Key:        0000000000000000000000000000000000000000000000000000000000000008
-Plaintext:  00000000000000000000000000000000
-Ciphertext: B95F9010E694BA44B812D6A7A59E027A
-Test: Encrypt
-Comment:    Set 1, vector 253
-Key:        0000000000000000000000000000000000000000000000000000000000000004
-Plaintext:  00000000000000000000000000000000
-Ciphertext: DF2746A2D9ED707DCC686BB64B77C9DD
-Test: Encrypt
-Comment:    Set 1, vector 254
-Key:        0000000000000000000000000000000000000000000000000000000000000002
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 40DD304C3FC8FEF5D7D08FD467E018F6
-Test: Encrypt
-Comment:    Set 1, vector 255
-Key:        0000000000000000000000000000000000000000000000000000000000000001
-Plaintext:  00000000000000000000000000000000
-Ciphertext: AFCD38B195E0A736304E89B9AE3019D3
-Test: Encrypt
-Comment:    Set 2, vector 0
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  80000000000000000000000000000000
-Ciphertext: B0C6B88AEA518AB09E847248E91B1B9D
-Test: Encrypt
-Comment:    Set 2, vector 1
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  40000000000000000000000000000000
-Ciphertext: B8D7684E35FA1DB15BDCEE7A48659858
-Test: Encrypt
-Comment:    Set 2, vector 2
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  20000000000000000000000000000000
-Ciphertext: F0CAD59AF92FBB79F36951E697492750
-Test: Encrypt
-Comment:    Set 2, vector 3
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  10000000000000000000000000000000
-Ciphertext: 117100F6635389560DC4A2DA24EBA70F
-Test: Encrypt
-Comment:    Set 2, vector 4
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  08000000000000000000000000000000
-Ciphertext: DBDD62355553019ED84C35886421E532
-Test: Encrypt
-Comment:    Set 2, vector 5
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  04000000000000000000000000000000
-Ciphertext: 9CB8D04FA506F19848F7B9110518BFC8
-Test: Encrypt
-Comment:    Set 2, vector 6
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  02000000000000000000000000000000
-Ciphertext: E4308E253BC3444D293500701BA82C6A
-Test: Encrypt
-Comment:    Set 2, vector 7
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  01000000000000000000000000000000
-Ciphertext: EA2FAE53F7F30C0170A20E95A068503E
-Test: Encrypt
-Comment:    Set 2, vector 8
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00800000000000000000000000000000
-Ciphertext: 14B14839EA221880B2C64D1FE000B93D
-Test: Encrypt
-Comment:    Set 2, vector 9
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00400000000000000000000000000000
-Ciphertext: A5CFC075B342D5101AACC334E73058BB
-Test: Encrypt
-Comment:    Set 2, vector 10
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00200000000000000000000000000000
-Ciphertext: 477EA56B2EBAD0F8AC5E1936866560FF
-Test: Encrypt
-Comment:    Set 2, vector 11
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00100000000000000000000000000000
-Ciphertext: 107E8598418404196EC59F63E45B7F6D
-Test: Encrypt
-Comment:    Set 2, vector 12
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00080000000000000000000000000000
-Ciphertext: FF6A891E7C1C074A68FEC291928FDD8D
-Test: Encrypt
-Comment:    Set 2, vector 13
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00040000000000000000000000000000
-Ciphertext: F64C250A13F45D377ADB7545B2B157A9
-Test: Encrypt
-Comment:    Set 2, vector 14
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00020000000000000000000000000000
-Ciphertext: FAD0F252086F11C830C65B63197CBC38
-Test: Encrypt
-Comment:    Set 2, vector 15
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00010000000000000000000000000000
-Ciphertext: 9DCB89B209441F02AD0D25C6AB826629
-Test: Encrypt
-Comment:    Set 2, vector 16
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00008000000000000000000000000000
-Ciphertext: E62E4ED4E4F34EDC563710D960E09D4C
-Test: Encrypt
-Comment:    Set 2, vector 17
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00004000000000000000000000000000
-Ciphertext: 98A1B926BA06895C3F2E84CCBACBC356
-Test: Encrypt
-Comment:    Set 2, vector 18
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00002000000000000000000000000000
-Ciphertext: 29BE0BE4DB7F4D196718AEA38F3B0BFD
-Test: Encrypt
-Comment:    Set 2, vector 19
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00001000000000000000000000000000
-Ciphertext: F670C4EBECBA0B43E71F6D752BFD4854
-Test: Encrypt
-Comment:    Set 2, vector 20
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000800000000000000000000000000
-Ciphertext: 7D7666B4484CDB7E3605468E093A787C
-Test: Encrypt
-Comment:    Set 2, vector 21
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000400000000000000000000000000
-Ciphertext: 562D06B181C091DA6C43642AE99460C6
-Test: Encrypt
-Comment:    Set 2, vector 22
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000200000000000000000000000000
-Ciphertext: AB0EFB5975E6186B7D76BC9672453488
-Test: Encrypt
-Comment:    Set 2, vector 23
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000100000000000000000000000000
-Ciphertext: 10C0756538E7BFF88D19AE2B1F7B859A
-Test: Encrypt
-Comment:    Set 2, vector 24
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000080000000000000000000000000
-Ciphertext: AF7FCD5248F8C72F1695AA05DD1CADE0
-Test: Encrypt
-Comment:    Set 2, vector 25
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000040000000000000000000000000
-Ciphertext: 9841E555655609A75D7BE20B8A90EF1E
-Test: Encrypt
-Comment:    Set 2, vector 26
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000020000000000000000000000000
-Ciphertext: 27F9546E6A1B7464780000561783569C
-Test: Encrypt
-Comment:    Set 2, vector 27
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000010000000000000000000000000
-Ciphertext: 8671D935D7A8354EECB7288803D42D7A
-Test: Encrypt
-Comment:    Set 2, vector 28
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000008000000000000000000000000
-Ciphertext: 0DA44F508DEBC6F044394624FCEB8EBE
-Test: Encrypt
-Comment:    Set 2, vector 29
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000004000000000000000000000000
-Ciphertext: AB137369BE6D93FBB18006BDB236EC09
-Test: Encrypt
-Comment:    Set 2, vector 30
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000002000000000000000000000000
-Ciphertext: EB90C4E597A7E1779FFA260886E26F75
-Test: Encrypt
-Comment:    Set 2, vector 31
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000001000000000000000000000000
-Ciphertext: 618CF3588D5C128EAF252616230E08F7
-Test: Encrypt
-Comment:    Set 2, vector 32
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000800000000000000000000000
-Ciphertext: 98DC4DB49D197AB9152D12B9DE2D73CA
-Test: Encrypt
-Comment:    Set 2, vector 33
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000400000000000000000000000
-Ciphertext: 5BDDE24B15702A35E1F140C57D206443
-Test: Encrypt
-Comment:    Set 2, vector 34
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000200000000000000000000000
-Ciphertext: CF755809882BED8BA2F9F1A4ED296A2B
-Test: Encrypt
-Comment:    Set 2, vector 35
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000100000000000000000000000
-Ciphertext: F1A8DBB999538AE89D16F92A7F4D1DF1
-Test: Encrypt
-Comment:    Set 2, vector 36
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000080000000000000000000000
-Ciphertext: 775222FDDAAECB81CF675C4E0B98179E
-Test: Encrypt
-Comment:    Set 2, vector 37
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000040000000000000000000000
-Ciphertext: 12A648CADCD153C760A965826683119A
-Test: Encrypt
-Comment:    Set 2, vector 38
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000020000000000000000000000
-Ciphertext: 0503FB10AB241E7CF45D8CDEEE474335
-Test: Encrypt
-Comment:    Set 2, vector 39
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000010000000000000000000000
-Ciphertext: 3D299C0070CBBD831B802690B8E7CA24
-Test: Encrypt
-Comment:    Set 2, vector 40
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000008000000000000000000000
-Ciphertext: 33105BD4D11D66753DC34D128BEFE3F4
-Test: Encrypt
-Comment:    Set 2, vector 41
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000004000000000000000000000
-Ciphertext: 5EFCE2B4B987C0F77D27B44836881682
-Test: Encrypt
-Comment:    Set 2, vector 42
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000002000000000000000000000
-Ciphertext: 7835449454128035D7F0EA99E327577B
-Test: Encrypt
-Comment:    Set 2, vector 43
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000001000000000000000000000
-Ciphertext: 27BEDDA0601BE35122FB1D272D73AB3E
-Test: Encrypt
-Comment:    Set 2, vector 44
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000800000000000000000000
-Ciphertext: 54C3F99FF48E318CC515EDE75800C4B3
-Test: Encrypt
-Comment:    Set 2, vector 45
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000400000000000000000000
-Ciphertext: C627C329F8E48299F6FDB23B9DBEA0BB
-Test: Encrypt
-Comment:    Set 2, vector 46
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000200000000000000000000
-Ciphertext: 1B6578F9E23BD8C1845A02431C5F9AA3
-Test: Encrypt
-Comment:    Set 2, vector 47
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000100000000000000000000
-Ciphertext: 6DB2FB8C0B9344D0547C0FF1292020C6
-Test: Encrypt
-Comment:    Set 2, vector 48
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000080000000000000000000
-Ciphertext: 4FAD9B2C37C131493FBEF53581FA4F83
-Test: Encrypt
-Comment:    Set 2, vector 49
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000040000000000000000000
-Ciphertext: 47502A01E93D2C87BD5584F6AFD3D99D
-Test: Encrypt
-Comment:    Set 2, vector 50
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000020000000000000000000
-Ciphertext: 056E1C6F651BFE50271B3B7A18E76D84
-Test: Encrypt
-Comment:    Set 2, vector 51
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000010000000000000000000
-Ciphertext: 5632BAF6627B3D96AD4E06FA6A561F55
-Test: Encrypt
-Comment:    Set 2, vector 52
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000008000000000000000000
-Ciphertext: E29807CAACDFA2D41A7D9E91FA7FD8EB
-Test: Encrypt
-Comment:    Set 2, vector 53
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000004000000000000000000
-Ciphertext: 81DD44BB5D1822DEE605F9E6FF01D7B3
-Test: Encrypt
-Comment:    Set 2, vector 54
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000002000000000000000000
-Ciphertext: 5C3649925E47D7FF96482A8FBD9666FD
-Test: Encrypt
-Comment:    Set 2, vector 55
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000001000000000000000000
-Ciphertext: 695415A836E66E737887845EC08A1ADB
-Test: Encrypt
-Comment:    Set 2, vector 56
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000800000000000000000
-Ciphertext: F5416BCE292D9E2CEA5D1CC70BBAEED1
-Test: Encrypt
-Comment:    Set 2, vector 57
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000400000000000000000
-Ciphertext: 7AEC4F1388FC29C47F7FED74ADDE8485
-Test: Encrypt
-Comment:    Set 2, vector 58
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000200000000000000000
-Ciphertext: 82A9F1A6CE08BC4876E649D8A8EA7EB6
-Test: Encrypt
-Comment:    Set 2, vector 59
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000100000000000000000
-Ciphertext: B6296C88ADF1A792908B065EEB04BFC2
-Test: Encrypt
-Comment:    Set 2, vector 60
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000080000000000000000
-Ciphertext: E766A39AECCA40BDBFBE6FF3FA292913
-Test: Encrypt
-Comment:    Set 2, vector 61
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000040000000000000000
-Ciphertext: C6D081454EA00D83C23B5A62C84359E1
-Test: Encrypt
-Comment:    Set 2, vector 62
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000020000000000000000
-Ciphertext: 85D259A79CCA80484504D1603F7A8F53
-Test: Encrypt
-Comment:    Set 2, vector 63
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000010000000000000000
-Ciphertext: D8291FA1C6DC250078824B2D0A20883F
-Test: Encrypt
-Comment:    Set 2, vector 64
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000008000000000000000
-Ciphertext: 95387CB74C48FFBD1F8D64A6CC45E074
-Test: Encrypt
-Comment:    Set 2, vector 65
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000004000000000000000
-Ciphertext: A17F975F538F56CDF629B516011DE837
-Test: Encrypt
-Comment:    Set 2, vector 66
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000002000000000000000
-Ciphertext: B50B615A1654C6E1CB6AB33716C097FE
-Test: Encrypt
-Comment:    Set 2, vector 67
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000001000000000000000
-Ciphertext: 7BBB2CBB874DF6C8B821DA7FB0F9011B
-Test: Encrypt
-Comment:    Set 2, vector 68
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000800000000000000
-Ciphertext: E9EFE074D096A275E47CD2E6206DF6A1
-Test: Encrypt
-Comment:    Set 2, vector 69
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000400000000000000
-Ciphertext: 88F2F8D5A836406AE8BBB98C65BBDA55
-Test: Encrypt
-Comment:    Set 2, vector 70
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000200000000000000
-Ciphertext: F64620D8D87585A3EF038B9AD58F5EA0
-Test: Encrypt
-Comment:    Set 2, vector 71
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000100000000000000
-Ciphertext: 694438EC141C8ED5F2F898B4554A298F
-Test: Encrypt
-Comment:    Set 2, vector 72
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000080000000000000
-Ciphertext: 3E6226EC7726A1EE5F5FA9B18CCE8C44
-Test: Encrypt
-Comment:    Set 2, vector 73
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000040000000000000
-Ciphertext: 8AB6949E79911647800B9E87362AB97A
-Test: Encrypt
-Comment:    Set 2, vector 74
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000020000000000000
-Ciphertext: 093C5CF24EDAF7F9F1C8A80DE4FF50A9
-Test: Encrypt
-Comment:    Set 2, vector 75
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000010000000000000
-Ciphertext: 28A36E50061F19E240351ED0E378CBF4
-Test: Encrypt
-Comment:    Set 2, vector 76
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000008000000000000
-Ciphertext: B93BB36CB88BF26EA79198652AA51D3C
-Test: Encrypt
-Comment:    Set 2, vector 77
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000004000000000000
-Ciphertext: DE4948083D044FAC9BCA6DA8CD67B8A6
-Test: Encrypt
-Comment:    Set 2, vector 78
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000002000000000000
-Ciphertext: 6E778B5BDA6CA118117E47470D080D3C
-Test: Encrypt
-Comment:    Set 2, vector 79
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000001000000000000
-Ciphertext: 0A9107324DA32B4281D032A3487EF875
-Test: Encrypt
-Comment:    Set 2, vector 80
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000800000000000
-Ciphertext: 18ED5635312D71ABD123CCE779D4D68A
-Test: Encrypt
-Comment:    Set 2, vector 81
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000400000000000
-Ciphertext: 2E3C63F95C4BC1F944BAB06DEDC9AA8E
-Test: Encrypt
-Comment:    Set 2, vector 82
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000200000000000
-Ciphertext: ACCC869EF07004C8C3C709083BE7BA2F
-Test: Encrypt
-Comment:    Set 2, vector 83
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000100000000000
-Ciphertext: DF60B34FB1A59147CC1FB049C1578206
-Test: Encrypt
-Comment:    Set 2, vector 84
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000080000000000
-Ciphertext: 4228DC636C08E41021054AA0E1E2227A
-Test: Encrypt
-Comment:    Set 2, vector 85
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000040000000000
-Ciphertext: 7CE27F66EFD735FFD6B3E1738C50495B
-Test: Encrypt
-Comment:    Set 2, vector 86
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000020000000000
-Ciphertext: F8E74B33A9CDE351DA0BBC06D69093D7
-Test: Encrypt
-Comment:    Set 2, vector 87
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000010000000000
-Ciphertext: AE0D22A5B37B8DC5D81CC641EED334D0
-Test: Encrypt
-Comment:    Set 2, vector 88
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000008000000000
-Ciphertext: C181C6CA5E163743458B9167A0B6A16A
-Test: Encrypt
-Comment:    Set 2, vector 89
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000004000000000
-Ciphertext: 5171F4F6095E4B276CFBA1F07223FBE6
-Test: Encrypt
-Comment:    Set 2, vector 90
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000002000000000
-Ciphertext: 2732F4D3A8C9D1D8D493840D6E0B864F
-Test: Encrypt
-Comment:    Set 2, vector 91
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000001000000000
-Ciphertext: 3EF04E0059A061D973532CA5C1DFBE7B
-Test: Encrypt
-Comment:    Set 2, vector 92
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000800000000
-Ciphertext: 6D9A8F23579E4978EBAA87B5ADEB77E5
-Test: Encrypt
-Comment:    Set 2, vector 93
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000400000000
-Ciphertext: BBD08873CC44BA4253C0C41FEEB7F124
-Test: Encrypt
-Comment:    Set 2, vector 94
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000200000000
-Ciphertext: 72E4B2437CBD283F3809CE686F6A591E
-Test: Encrypt
-Comment:    Set 2, vector 95
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000100000000
-Ciphertext: 6E5580514B92512B1BF4B1B987B9AA1B
-Test: Encrypt
-Comment:    Set 2, vector 96
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000080000000
-Ciphertext: 5EF5D0C5BCBDCB604D3A083B68CE0FA3
-Test: Encrypt
-Comment:    Set 2, vector 97
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000040000000
-Ciphertext: 9D991FDD723AD2182777A15CA0E0F665
-Test: Encrypt
-Comment:    Set 2, vector 98
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000020000000
-Ciphertext: 24440626EFC8F86BEA7DE78085AB8A22
-Test: Encrypt
-Comment:    Set 2, vector 99
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000010000000
-Ciphertext: 17C3630D62D13C1E826C0FCCBD74A864
-Test: Encrypt
-Comment:    Set 2, vector 100
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000008000000
-Ciphertext: 4CF5AB86A56AB134A7FE46CCE3F9FCE9
-Test: Encrypt
-Comment:    Set 2, vector 101
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000004000000
-Ciphertext: 3E6B9C0388F6D9B8F458F30221907607
-Test: Encrypt
-Comment:    Set 2, vector 102
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000002000000
-Ciphertext: AD9C926B8A5CD98EEE88200617E59958
-Test: Encrypt
-Comment:    Set 2, vector 103
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000001000000
-Ciphertext: AFF8AED5E075E02AF720CA4BF0028B3B
-Test: Encrypt
-Comment:    Set 2, vector 104
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000800000
-Ciphertext: D90EAFF909202BB209BB3BB8C7F9A954
-Test: Encrypt
-Comment:    Set 2, vector 105
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000400000
-Ciphertext: 2C709B00E6A22F00F64A7D8EE341853F
-Test: Encrypt
-Comment:    Set 2, vector 106
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000200000
-Ciphertext: CCEC598F0D9F0BF201B2F487136D54A4
-Test: Encrypt
-Comment:    Set 2, vector 107
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000100000
-Ciphertext: 73B2883A0A166AAE1BF14E60A5195FA3
-Test: Encrypt
-Comment:    Set 2, vector 108
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000080000
-Ciphertext: E676867BD9AD5EF915143388496779D7
-Test: Encrypt
-Comment:    Set 2, vector 109
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000040000
-Ciphertext: CDCB73D1BFCFD4BE7F1DAA9B1C6A4055
-Test: Encrypt
-Comment:    Set 2, vector 110
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000020000
-Ciphertext: 02A3A5C89DAA24CD2C517F7A73286A89
-Test: Encrypt
-Comment:    Set 2, vector 111
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000010000
-Ciphertext: C0FA2AC9E92EE58C2DD12D6D43AB7035
-Test: Encrypt
-Comment:    Set 2, vector 112
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000008000
-Ciphertext: EDC2CB1F7291353BDBF2385519E6AE16
-Test: Encrypt
-Comment:    Set 2, vector 113
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000004000
-Ciphertext: B4B62D16D197A98CD3B978812B9D9884
-Test: Encrypt
-Comment:    Set 2, vector 114
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000002000
-Ciphertext: 5CDFC95A529A905101CEA26BC1B891ED
-Test: Encrypt
-Comment:    Set 2, vector 115
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000001000
-Ciphertext: CC7150CD3650B98363296C7C4ED368D1
-Test: Encrypt
-Comment:    Set 2, vector 116
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000800
-Ciphertext: CC57706B0C6526B8E25A5DBD32EACBDB
-Test: Encrypt
-Comment:    Set 2, vector 117
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000400
-Ciphertext: 30D30456AD98B182D64C649648F6AEC9
-Test: Encrypt
-Comment:    Set 2, vector 118
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000200
-Ciphertext: D7E9DA7F631938EB649A08AF82FBD75F
-Test: Encrypt
-Comment:    Set 2, vector 119
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000100
-Ciphertext: B8DA2AF6600B07895B5D0FFAF4991469
-Test: Encrypt
-Comment:    Set 2, vector 120
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000080
-Ciphertext: 0F6F64F930BA6C178943322B98114599
-Test: Encrypt
-Comment:    Set 2, vector 121
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000040
-Ciphertext: 8B1F247802E47C91BEE2AA34ECFD7A01
-Test: Encrypt
-Comment:    Set 2, vector 122
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000020
-Ciphertext: 7A6985778D3A66E97F23E01F0D0E45E7
-Test: Encrypt
-Comment:    Set 2, vector 123
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000010
-Ciphertext: BA664AC39855518DFDEE10D1B3111FAE
-Test: Encrypt
-Comment:    Set 2, vector 124
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000008
-Ciphertext: 7C92854D801A1648F65CA81813DDBF83
-Test: Encrypt
-Comment:    Set 2, vector 125
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000004
-Ciphertext: 6A3F25AAB7E92D9CF378E5D9C040F26B
-Test: Encrypt
-Comment:    Set 2, vector 126
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000002
-Ciphertext: 3D4B2CDE666761BA5DFB305178E667FB
-Test: Encrypt
-Comment:    Set 2, vector 127
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000001
-Ciphertext: 9CDB269B5D293BC5DB9C55B057D9B591
-Test: Encrypt
-Comment:    Set 3, vector 0
-Key:        0000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  00000000000000000000000000000000
-Ciphertext: 396154111ADEFC500CF6E5C99038BC17
-Test: Encrypt
-Comment:    Set 3, vector 1
-Key:        0101010101010101010101010101010101010101010101010101010101010101
-Plaintext:  01010101010101010101010101010101
-Ciphertext: 438D0C2E7E86869B56EBA23B66086A01
-Test: Encrypt
-Comment:    Set 3, vector 2
-Key:        0202020202020202020202020202020202020202020202020202020202020202
-Plaintext:  02020202020202020202020202020202
-Ciphertext: D4F553BFA794F55EF3B7A578629F6DEA
-Test: Encrypt
-Comment:    Set 3, vector 3
-Key:        0303030303030303030303030303030303030303030303030303030303030303
-Plaintext:  03030303030303030303030303030303
-Ciphertext: B1EB06630CF3E25AEF18FA34709232F7
-Test: Encrypt
-Comment:    Set 3, vector 4
-Key:        0404040404040404040404040404040404040404040404040404040404040404
-Plaintext:  04040404040404040404040404040404
-Ciphertext: 5E858730ABC9823A93CA4CAB67F0B423
-Test: Encrypt
-Comment:    Set 3, vector 5
-Key:        0505050505050505050505050505050505050505050505050505050505050505
-Plaintext:  05050505050505050505050505050505
-Ciphertext: 9FC988D43FE3712CF6D2DB552FE3C80F
-Test: Encrypt
-Comment:    Set 3, vector 6
-Key:        0606060606060606060606060606060606060606060606060606060606060606
-Plaintext:  06060606060606060606060606060606
-Ciphertext: 6109500D59414C9974D15818A2BA6DD0
-Test: Encrypt
-Comment:    Set 3, vector 7
-Key:        0707070707070707070707070707070707070707070707070707070707070707
-Plaintext:  07070707070707070707070707070707
-Ciphertext: 5F6BF9AC53A680EACAE7583A8933DA8E
-Test: Encrypt
-Comment:    Set 3, vector 8
-Key:        0808080808080808080808080808080808080808080808080808080808080808
-Plaintext:  08080808080808080808080808080808
-Ciphertext: F9A9C1540AE1B314DBEDF9A49054DC9D
-Test: Encrypt
-Comment:    Set 3, vector 9
-Key:        0909090909090909090909090909090909090909090909090909090909090909
-Plaintext:  09090909090909090909090909090909
-Ciphertext: 6D66755ACDB9D90BEC599A0BC0C7BF48
-Test: Encrypt
-Comment:    Set 3, vector 10
-Key:        0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-Plaintext:  0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-Ciphertext: 5527F328AF93C2D5CCC80AF7A3E8DF3D
-Test: Encrypt
-Comment:    Set 3, vector 11
-Key:        0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-Plaintext:  0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-Ciphertext: 27AA99F8E6EA08D8E8D5A528EE4774B6
-Test: Encrypt
-Comment:    Set 3, vector 12
-Key:        0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-Plaintext:  0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-Ciphertext: 46F7D660A22232F5E3664EF355098CE4
-Test: Encrypt
-Comment:    Set 3, vector 13
-Key:        0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-Plaintext:  0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-Ciphertext: BDC0AEC72B53B747AB5C7BD62062826A
-Test: Encrypt
-Comment:    Set 3, vector 14
-Key:        0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-Plaintext:  0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-Ciphertext: A0CAB391DC8BFF0281F3E1C70C1CE33B
-Test: Encrypt
-Comment:    Set 3, vector 15
-Key:        0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-Plaintext:  0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-Ciphertext: 5CBFB3E894AE1428549CCF777A9F0A73
-Test: Encrypt
-Comment:    Set 3, vector 16
-Key:        1010101010101010101010101010101010101010101010101010101010101010
-Plaintext:  10101010101010101010101010101010
-Ciphertext: 6693FC130669F194F81E8D175194DDA2
-Test: Encrypt
-Comment:    Set 3, vector 17
-Key:        1111111111111111111111111111111111111111111111111111111111111111
-Plaintext:  11111111111111111111111111111111
-Ciphertext: A6A72472F8C04329C0E2FB56982A33C7
-Test: Encrypt
-Comment:    Set 3, vector 18
-Key:        1212121212121212121212121212121212121212121212121212121212121212
-Plaintext:  12121212121212121212121212121212
-Ciphertext: 6321875C5F89CCE16C6FF5E85E759C9A
-Test: Encrypt
-Comment:    Set 3, vector 19
-Key:        1313131313131313131313131313131313131313131313131313131313131313
-Plaintext:  13131313131313131313131313131313
-Ciphertext: 8819C97D05C91A23062E9851F07EF6F7
-Test: Encrypt
-Comment:    Set 3, vector 20
-Key:        1414141414141414141414141414141414141414141414141414141414141414
-Plaintext:  14141414141414141414141414141414
-Ciphertext: F894FEB12164BB32AC846DD9530604CE
-Test: Encrypt
-Comment:    Set 3, vector 21
-Key:        1515151515151515151515151515151515151515151515151515151515151515
-Plaintext:  15151515151515151515151515151515
-Ciphertext: 61B02392CD3F571B35C862E703DB2053
-Test: Encrypt
-Comment:    Set 3, vector 22
-Key:        1616161616161616161616161616161616161616161616161616161616161616
-Plaintext:  16161616161616161616161616161616
-Ciphertext: 6269E137F8480D555D1B24F392162DBA
-Test: Encrypt
-Comment:    Set 3, vector 23
-Key:        1717171717171717171717171717171717171717171717171717171717171717
-Plaintext:  17171717171717171717171717171717
-Ciphertext: B6662F56AA3D23DE1DFDE165B2D63FA0
-Test: Encrypt
-Comment:    Set 3, vector 24
-Key:        1818181818181818181818181818181818181818181818181818181818181818
-Plaintext:  18181818181818181818181818181818
-Ciphertext: C8271ACE969013EE2C9EF1512FFABAE5
-Test: Encrypt
-Comment:    Set 3, vector 25
-Key:        1919191919191919191919191919191919191919191919191919191919191919
-Plaintext:  19191919191919191919191919191919
-Ciphertext: 6982E764E750CDF3E5F9C4E40A5DFE28
-Test: Encrypt
-Comment:    Set 3, vector 26
-Key:        1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-Plaintext:  1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-Ciphertext: 23172E86AF4A140A78CB1DC776270FFF
-Test: Encrypt
-Comment:    Set 3, vector 27
-Key:        1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-Plaintext:  1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-Ciphertext: BA0BD958FC1DE142EC40326B2C315AA5
-Test: Encrypt
-Comment:    Set 3, vector 28
-Key:        1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-Plaintext:  1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-Ciphertext: 7FB2B8A4B95CBFB74BFD5F7A5641261C
-Test: Encrypt
-Comment:    Set 3, vector 29
-Key:        1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-Plaintext:  1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-Ciphertext: 56B261D89F8978041E2602DF97386BF7
-Test: Encrypt
-Comment:    Set 3, vector 30
-Key:        1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-Plaintext:  1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-Ciphertext: A2D74F5148C84C1F990290E17DD3EDFA
-Test: Encrypt
-Comment:    Set 3, vector 31
-Key:        1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-Plaintext:  1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-Ciphertext: 7D8BC76F1D941FC3C7E4C6F17AC03FF4
-Test: Encrypt
-Comment:    Set 3, vector 32
-Key:        2020202020202020202020202020202020202020202020202020202020202020
-Plaintext:  20202020202020202020202020202020
-Ciphertext: F3E1FDA6B9C8314799F4654C29F1C690
-Test: Encrypt
-Comment:    Set 3, vector 33
-Key:        2121212121212121212121212121212121212121212121212121212121212121
-Plaintext:  21212121212121212121212121212121
-Ciphertext: 9BB8499B8631F6211D22DE555010E482
-Test: Encrypt
-Comment:    Set 3, vector 34
-Key:        2222222222222222222222222222222222222222222222222222222222222222
-Plaintext:  22222222222222222222222222222222
-Ciphertext: B098D857086ABC425B437BD63E8A53D2
-Test: Encrypt
-Comment:    Set 3, vector 35
-Key:        2323232323232323232323232323232323232323232323232323232323232323
-Plaintext:  23232323232323232323232323232323
-Ciphertext: F157E2B1298A205C7EF526F3E3196BF4
-Test: Encrypt
-Comment:    Set 3, vector 36
-Key:        2424242424242424242424242424242424242424242424242424242424242424
-Plaintext:  24242424242424242424242424242424
-Ciphertext: 91FE4F664ED2FE0097D8B95703694BBE
-Test: Encrypt
-Comment:    Set 3, vector 37
-Key:        2525252525252525252525252525252525252525252525252525252525252525
-Plaintext:  25252525252525252525252525252525
-Ciphertext: 742EF3C2DC4490F7D1BDB3031137B6C1
-Test: Encrypt
-Comment:    Set 3, vector 38
-Key:        2626262626262626262626262626262626262626262626262626262626262626
-Plaintext:  26262626262626262626262626262626
-Ciphertext: 79302D9C8DBBBDAD7B8D8B9E7A60E42D
-Test: Encrypt
-Comment:    Set 3, vector 39
-Key:        2727272727272727272727272727272727272727272727272727272727272727
-Plaintext:  27272727272727272727272727272727
-Ciphertext: 4F4DA48026B809452E7FFB1C3DAFBD99
-Test: Encrypt
-Comment:    Set 3, vector 40
-Key:        2828282828282828282828282828282828282828282828282828282828282828
-Plaintext:  28282828282828282828282828282828
-Ciphertext: 6D9DF175ED0DAFE550619CF8362B98E8
-Test: Encrypt
-Comment:    Set 3, vector 41
-Key:        2929292929292929292929292929292929292929292929292929292929292929
-Plaintext:  29292929292929292929292929292929
-Ciphertext: 5D4A406E3C89612AA89A9D38A80ECFEF
-Test: Encrypt
-Comment:    Set 3, vector 42
-Key:        2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A
-Plaintext:  2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A
-Ciphertext: 51CE933AD1EB3117A129788D3D0B815A
-Test: Encrypt
-Comment:    Set 3, vector 43
-Key:        2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
-Plaintext:  2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
-Ciphertext: DD39326230AC02767866ADE07AED1DAA
-Test: Encrypt
-Comment:    Set 3, vector 44
-Key:        2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-Plaintext:  2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-Ciphertext: DC493BAD40D435273B18026DE5412278
-Test: Encrypt
-Comment:    Set 3, vector 45
-Key:        2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
-Plaintext:  2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
-Ciphertext: 8A61E9750E1DAC58C92F5E243CA7465B
-Test: Encrypt
-Comment:    Set 3, vector 46
-Key:        2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-Plaintext:  2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-Ciphertext: 57A7641E6A7B61A86AFD7A23578DFBC5
-Test: Encrypt
-Comment:    Set 3, vector 47
-Key:        2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F
-Plaintext:  2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F
-Ciphertext: 019A8F9D38B4B92B077D08B025C15550
-Test: Encrypt
-Comment:    Set 3, vector 48
-Key:        3030303030303030303030303030303030303030303030303030303030303030
-Plaintext:  30303030303030303030303030303030
-Ciphertext: 9F6EEA9C215C273135C53A3F4208469E
-Test: Encrypt
-Comment:    Set 3, vector 49
-Key:        3131313131313131313131313131313131313131313131313131313131313131
-Plaintext:  31313131313131313131313131313131
-Ciphertext: 7BF3D63D790CAB57EA8354B10FEBDE18
-Test: Encrypt
-Comment:    Set 3, vector 50
-Key:        3232323232323232323232323232323232323232323232323232323232323232
-Plaintext:  32323232323232323232323232323232
-Ciphertext: AB30751ED4052A1D916E50C4073DFCB5
-Test: Encrypt
-Comment:    Set 3, vector 51
-Key:        3333333333333333333333333333333333333333333333333333333333333333
-Plaintext:  33333333333333333333333333333333
-Ciphertext: C39180F205BBA8BEE9832BF56FCC75C0
-Test: Encrypt
-Comment:    Set 3, vector 52
-Key:        3434343434343434343434343434343434343434343434343434343434343434
-Plaintext:  34343434343434343434343434343434
-Ciphertext: 3BEDE5E09CB9CCFC8BE38F8378D49AE9
-Test: Encrypt
-Comment:    Set 3, vector 53
-Key:        3535353535353535353535353535353535353535353535353535353535353535
-Plaintext:  35353535353535353535353535353535
-Ciphertext: 448AE4ADF7070A8B8C4AB0FE7277E8D7
-Test: Encrypt
-Comment:    Set 3, vector 54
-Key:        3636363636363636363636363636363636363636363636363636363636363636
-Plaintext:  36363636363636363636363636363636
-Ciphertext: 095A361F2243FC39F4ECD94A5AC0F94A
-Test: Encrypt
-Comment:    Set 3, vector 55
-Key:        3737373737373737373737373737373737373737373737373737373737373737
-Plaintext:  37373737373737373737373737373737
-Ciphertext: AD77D7D2A7F3AF5732CE5A51E83D7025
-Test: Encrypt
-Comment:    Set 3, vector 56
-Key:        3838383838383838383838383838383838383838383838383838383838383838
-Plaintext:  38383838383838383838383838383838
-Ciphertext: 930DA09C18DF5F6D072AA662CC8F7751
-Test: Encrypt
-Comment:    Set 3, vector 57
-Key:        3939393939393939393939393939393939393939393939393939393939393939
-Plaintext:  39393939393939393939393939393939
-Ciphertext: F3B3871B66FE8A1FA4AE2150EC8B7060
-Test: Encrypt
-Comment:    Set 3, vector 58
-Key:        3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
-Plaintext:  3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
-Ciphertext: 62DD93CFA7EFC223A822A6F754B6298D
-Test: Encrypt
-Comment:    Set 3, vector 59
-Key:        3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
-Plaintext:  3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
-Ciphertext: C86A0377B3C45C2B1896829D7B0610F3
-Test: Encrypt
-Comment:    Set 3, vector 60
-Key:        3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
-Plaintext:  3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
-Ciphertext: 8CCFC961EBAB55C0ECB1B10EDEDD9C61
-Test: Encrypt
-Comment:    Set 3, vector 61
-Key:        3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
-Plaintext:  3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
-Ciphertext: D828E857BDBD6192300764A2084E0680
-Test: Encrypt
-Comment:    Set 3, vector 62
-Key:        3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
-Plaintext:  3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
-Ciphertext: 24C0DC84D72EA678201534CE8DC22A45
-Test: Encrypt
-Comment:    Set 3, vector 63
-Key:        3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
-Plaintext:  3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
-Ciphertext: D65F340A25D35E5D0B08C63FA44F9898
-Test: Encrypt
-Comment:    Set 3, vector 64
-Key:        4040404040404040404040404040404040404040404040404040404040404040
-Plaintext:  40404040404040404040404040404040
-Ciphertext: 4A30476F1141FBF303ED63FCD3CB0536
-Test: Encrypt
-Comment:    Set 3, vector 65
-Key:        4141414141414141414141414141414141414141414141414141414141414141
-Plaintext:  41414141414141414141414141414141
-Ciphertext: 78246080B38B5283960E0253E2FF6A5E
-Test: Encrypt
-Comment:    Set 3, vector 66
-Key:        4242424242424242424242424242424242424242424242424242424242424242
-Plaintext:  42424242424242424242424242424242
-Ciphertext: 475E8388EE3D3EE111DD0E816B244DD2
-Test: Encrypt
-Comment:    Set 3, vector 67
-Key:        4343434343434343434343434343434343434343434343434343434343434343
-Plaintext:  43434343434343434343434343434343
-Ciphertext: D40D3FECE8B05875F2FCD23526CCD6B2
-Test: Encrypt
-Comment:    Set 3, vector 68
-Key:        4444444444444444444444444444444444444444444444444444444444444444
-Plaintext:  44444444444444444444444444444444
-Ciphertext: CD9846E1B120482E6B6D71C4F5D704FE
-Test: Encrypt
-Comment:    Set 3, vector 69
-Key:        4545454545454545454545454545454545454545454545454545454545454545
-Plaintext:  45454545454545454545454545454545
-Ciphertext: E707C35474257CE52617B5889ECB974B
-Test: Encrypt
-Comment:    Set 3, vector 70
-Key:        4646464646464646464646464646464646464646464646464646464646464646
-Plaintext:  46464646464646464646464646464646
-Ciphertext: 9A79D57FD89D938F4B4CACA52E8CB544
-Test: Encrypt
-Comment:    Set 3, vector 71
-Key:        4747474747474747474747474747474747474747474747474747474747474747
-Plaintext:  47474747474747474747474747474747
-Ciphertext: 34F9B98AC130F7E7B123ECBF8910735C
-Test: Encrypt
-Comment:    Set 3, vector 72
-Key:        4848484848484848484848484848484848484848484848484848484848484848
-Plaintext:  48484848484848484848484848484848
-Ciphertext: BF75CC83FE76E8A15981DA738E5A8513
-Test: Encrypt
-Comment:    Set 3, vector 73
-Key:        4949494949494949494949494949494949494949494949494949494949494949
-Plaintext:  49494949494949494949494949494949
-Ciphertext: 4A452EFBE634441444FB50641CB2EFC1
-Test: Encrypt
-Comment:    Set 3, vector 74
-Key:        4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A
-Plaintext:  4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A
-Ciphertext: 3D5ED11F0C81E81BAB97B7148D67BA55
-Test: Encrypt
-Comment:    Set 3, vector 75
-Key:        4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B
-Plaintext:  4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B
-Ciphertext: DBBAE78B177C27954DEDBAD5D98E7BEE
-Test: Encrypt
-Comment:    Set 3, vector 76
-Key:        4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C
-Plaintext:  4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C
-Ciphertext: F52D16EFC5DE991430F6E7D13983DEB8
-Test: Encrypt
-Comment:    Set 3, vector 77
-Key:        4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
-Plaintext:  4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
-Ciphertext: B6C98EBC320B3BDD927C2FE57F8180B5
-Test: Encrypt
-Comment:    Set 3, vector 78
-Key:        4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E
-Plaintext:  4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E
-Ciphertext: D510C35680C9B958C81599F3665FBEC1
-Test: Encrypt
-Comment:    Set 3, vector 79
-Key:        4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F
-Plaintext:  4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F
-Ciphertext: 72DAD08BF510CDFEEC76FEAB908829B4
-Test: Encrypt
-Comment:    Set 3, vector 80
-Key:        5050505050505050505050505050505050505050505050505050505050505050
-Plaintext:  50505050505050505050505050505050
-Ciphertext: AC7B447EDB38F935469309E766BCB1F6
-Test: Encrypt
-Comment:    Set 3, vector 81
-Key:        5151515151515151515151515151515151515151515151515151515151515151
-Plaintext:  51515151515151515151515151515151
-Ciphertext: 18B937F666BF580F9CDB60A935427459
-Test: Encrypt
-Comment:    Set 3, vector 82
-Key:        5252525252525252525252525252525252525252525252525252525252525252
-Plaintext:  52525252525252525252525252525252
-Ciphertext: 6A08B38202685E610CA9584725D6092A
-Test: Encrypt
-Comment:    Set 3, vector 83
-Key:        5353535353535353535353535353535353535353535353535353535353535353
-Plaintext:  53535353535353535353535353535353
-Ciphertext: 1CA09E9C14C2A833A7B7ACB1C9C12AC1
-Test: Encrypt
-Comment:    Set 3, vector 84
-Key:        5454545454545454545454545454545454545454545454545454545454545454
-Plaintext:  54545454545454545454545454545454
-Ciphertext: 8AB7ED64FE477B7D9A6B5B5056EA1E02
-Test: Encrypt
-Comment:    Set 3, vector 85
-Key:        5555555555555555555555555555555555555555555555555555555555555555
-Plaintext:  55555555555555555555555555555555
-Ciphertext: D610D6199D4FE03ED09AD568664F709A
-Test: Encrypt
-Comment:    Set 3, vector 86
-Key:        5656565656565656565656565656565656565656565656565656565656565656
-Plaintext:  56565656565656565656565656565656
-Ciphertext: D400C1E6109F04AE50C1C341BA4E3175
-Test: Encrypt
-Comment:    Set 3, vector 87
-Key:        5757575757575757575757575757575757575757575757575757575757575757
-Plaintext:  57575757575757575757575757575757
-Ciphertext: DF888CBB7DBD8DE3F0BE6C6EDC72060F
-Test: Encrypt
-Comment:    Set 3, vector 88
-Key:        5858585858585858585858585858585858585858585858585858585858585858
-Plaintext:  58585858585858585858585858585858
-Ciphertext: 9C3B100466C63AA93D420EDF54381BF4
-Test: Encrypt
-Comment:    Set 3, vector 89
-Key:        5959595959595959595959595959595959595959595959595959595959595959
-Plaintext:  59595959595959595959595959595959
-Ciphertext: 0BE794F0233BE9A7DB7C41A1CA4BA7E3
-Test: Encrypt
-Comment:    Set 3, vector 90
-Key:        5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A
-Plaintext:  5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A
-Ciphertext: 2C8D04D6B9DA81D07174729A07F25BB9
-Test: Encrypt
-Comment:    Set 3, vector 91
-Key:        5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-Plaintext:  5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-Ciphertext: FFCEB69835E2E5EF4C867CE28540F91F
-Test: Encrypt
-Comment:    Set 3, vector 92
-Key:        5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C
-Plaintext:  5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C
-Ciphertext: A7F7F8437918BEFF5DCFCFB366CDFABD
-Test: Encrypt
-Comment:    Set 3, vector 93
-Key:        5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D
-Plaintext:  5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D
-Ciphertext: 14C9736F407AE78D7D3ED18B875B940D
-Test: Encrypt
-Comment:    Set 3, vector 94
-Key:        5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E
-Plaintext:  5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E
-Ciphertext: 1668A0C6A5734B98D9D641E0B6FAD80C
-Test: Encrypt
-Comment:    Set 3, vector 95
-Key:        5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F
-Plaintext:  5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F
-Ciphertext: DA8775267C9722BA743A085F8591F06D
-Test: Encrypt
-Comment:    Set 3, vector 96
-Key:        6060606060606060606060606060606060606060606060606060606060606060
-Plaintext:  60606060606060606060606060606060
-Ciphertext: 5F8172C28603C80206C276E0979EA40E
-Test: Encrypt
-Comment:    Set 3, vector 97
-Key:        6161616161616161616161616161616161616161616161616161616161616161
-Plaintext:  61616161616161616161616161616161
-Ciphertext: E4938D0078D29E0247BF2EA0C1FCB85F
-Test: Encrypt
-Comment:    Set 3, vector 98
-Key:        6262626262626262626262626262626262626262626262626262626262626262
-Plaintext:  62626262626262626262626262626262
-Ciphertext: A48FEE4F9FA4597303C2CF92061304A1
-Test: Encrypt
-Comment:    Set 3, vector 99
-Key:        6363636363636363636363636363636363636363636363636363636363636363
-Plaintext:  63636363636363636363636363636363
-Ciphertext: 3C8F6CF66C73684DDB09D1AA57CD0950
-Test: Encrypt
-Comment:    Set 3, vector 100
-Key:        6464646464646464646464646464646464646464646464646464646464646464
-Plaintext:  64646464646464646464646464646464
-Ciphertext: B3D9EE0337253E9C4027FEA938AB399C
-Test: Encrypt
-Comment:    Set 3, vector 101
-Key:        6565656565656565656565656565656565656565656565656565656565656565
-Plaintext:  65656565656565656565656565656565
-Ciphertext: 3BE933A85E5997573077903CEB481AFA
-Test: Encrypt
-Comment:    Set 3, vector 102
-Key:        6666666666666666666666666666666666666666666666666666666666666666
-Plaintext:  66666666666666666666666666666666
-Ciphertext: 06AFED96C6E7130EB3311D81CCE69F9C
-Test: Encrypt
-Comment:    Set 3, vector 103
-Key:        6767676767676767676767676767676767676767676767676767676767676767
-Plaintext:  67676767676767676767676767676767
-Ciphertext: 183C3606139211F90F4849E93DB7DDEE
-Test: Encrypt
-Comment:    Set 3, vector 104
-Key:        6868686868686868686868686868686868686868686868686868686868686868
-Plaintext:  68686868686868686868686868686868
-Ciphertext: 217C34184950DE7B43E46EE4BE88A9BE
-Test: Encrypt
-Comment:    Set 3, vector 105
-Key:        6969696969696969696969696969696969696969696969696969696969696969
-Plaintext:  69696969696969696969696969696969
-Ciphertext: CA447ED204F2A4B2ED6B82E3926967B1
-Test: Encrypt
-Comment:    Set 3, vector 106
-Key:        6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A
-Plaintext:  6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A
-Ciphertext: B447F4BEBA7D88A5C62E5F9C316A4523
-Test: Encrypt
-Comment:    Set 3, vector 107
-Key:        6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B
-Plaintext:  6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B
-Ciphertext: DEDF599C54D0009795303013CD933B49
-Test: Encrypt
-Comment:    Set 3, vector 108
-Key:        6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C
-Plaintext:  6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C
-Ciphertext: B06280650C77C83AF3D71874AE00D3DA
-Test: Encrypt
-Comment:    Set 3, vector 109
-Key:        6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D
-Plaintext:  6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D
-Ciphertext: 1BB5B9E9C7DC8AD690F5FC217B7B53C1
-Test: Encrypt
-Comment:    Set 3, vector 110
-Key:        6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E
-Plaintext:  6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E
-Ciphertext: FEECFCF0C172C6152F33E4DEE206EBCF
-Test: Encrypt
-Comment:    Set 3, vector 111
-Key:        6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F
-Plaintext:  6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F
-Ciphertext: FA4C7EA42C425F37588CD273320940C9
-Test: Encrypt
-Comment:    Set 3, vector 112
-Key:        7070707070707070707070707070707070707070707070707070707070707070
-Plaintext:  70707070707070707070707070707070
-Ciphertext: 563AE5884FC374C4E45B96A6431E51E3
-Test: Encrypt
-Comment:    Set 3, vector 113
-Key:        7171717171717171717171717171717171717171717171717171717171717171
-Plaintext:  71717171717171717171717171717171
-Ciphertext: 0669E609578A33DBE637C5B86C7F425D
-Test: Encrypt
-Comment:    Set 3, vector 114
-Key:        7272727272727272727272727272727272727272727272727272727272727272
-Plaintext:  72727272727272727272727272727272
-Ciphertext: B2AD99D3941924DDD2A73C4725A08EC3
-Test: Encrypt
-Comment:    Set 3, vector 115
-Key:        7373737373737373737373737373737373737373737373737373737373737373
-Plaintext:  73737373737373737373737373737373
-Ciphertext: 72C8239B5F4E5319EE05B6E39C9BD336
-Test: Encrypt
-Comment:    Set 3, vector 116
-Key:        7474747474747474747474747474747474747474747474747474747474747474
-Plaintext:  74747474747474747474747474747474
-Ciphertext: BAD014C4B0A5734AA48E7E80A42E80AF
-Test: Encrypt
-Comment:    Set 3, vector 117
-Key:        7575757575757575757575757575757575757575757575757575757575757575
-Plaintext:  75757575757575757575757575757575
-Ciphertext: BBE294CDB3582B3C1F61ACD43A0E5DB5
-Test: Encrypt
-Comment:    Set 3, vector 118
-Key:        7676767676767676767676767676767676767676767676767676767676767676
-Plaintext:  76767676767676767676767676767676
-Ciphertext: C231DC35D38F5857BD3449D3E0A1EF1F
-Test: Encrypt
-Comment:    Set 3, vector 119
-Key:        7777777777777777777777777777777777777777777777777777777777777777
-Plaintext:  77777777777777777777777777777777
-Ciphertext: B19E0BACBF3EC295AA6F99B0817B99F3
-Test: Encrypt
-Comment:    Set 3, vector 120
-Key:        7878787878787878787878787878787878787878787878787878787878787878
-Plaintext:  78787878787878787878787878787878
-Ciphertext: 0E81D1133E74F1A9425237377890584C
-Test: Encrypt
-Comment:    Set 3, vector 121
-Key:        7979797979797979797979797979797979797979797979797979797979797979
-Plaintext:  79797979797979797979797979797979
-Ciphertext: E1149AA17A8B6499E0FA5C45F05D6582
-Test: Encrypt
-Comment:    Set 3, vector 122
-Key:        7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A
-Plaintext:  7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A
-Ciphertext: D9208954D8D28335E6F45FFB9D1B92D4
-Test: Encrypt
-Comment:    Set 3, vector 123
-Key:        7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B
-Plaintext:  7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B
-Ciphertext: DFABDB0594208A2902703E85C4A657FF
-Test: Encrypt
-Comment:    Set 3, vector 124
-Key:        7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C
-Plaintext:  7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C
-Ciphertext: E05B6C6E90E852229BF0EFDC4FEB851E
-Test: Encrypt
-Comment:    Set 3, vector 125
-Key:        7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D
-Plaintext:  7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D
-Ciphertext: 6834CCFDC940452CF40A0866009E58CC
-Test: Encrypt
-Comment:    Set 3, vector 126
-Key:        7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E
-Plaintext:  7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E
-Ciphertext: 91449066A1966246636D9085E02002B0
-Test: Encrypt
-Comment:    Set 3, vector 127
-Key:        7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
-Plaintext:  7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
-Ciphertext: 235C2D836B2025CCCDAE4B26264132E2
-Test: Encrypt
-Comment:    Set 3, vector 128
-Key:        8080808080808080808080808080808080808080808080808080808080808080
-Plaintext:  80808080808080808080808080808080
-Ciphertext: 0C765AA494E048FC8BB23139F2124CB6
-Test: Encrypt
-Comment:    Set 3, vector 129
-Key:        8181818181818181818181818181818181818181818181818181818181818181
-Plaintext:  81818181818181818181818181818181
-Ciphertext: ED970D660C84642D0EAFF188F55CC33C
-Test: Encrypt
-Comment:    Set 3, vector 130
-Key:        8282828282828282828282828282828282828282828282828282828282828282
-Plaintext:  82828282828282828282828282828282
-Ciphertext: E124EB4A8BE05CA633238DD69E81E057
-Test: Encrypt
-Comment:    Set 3, vector 131
-Key:        8383838383838383838383838383838383838383838383838383838383838383
-Plaintext:  83838383838383838383838383838383
-Ciphertext: 4653FBDD6CA7C13CE2DF31B1279B3D5A
-Test: Encrypt
-Comment:    Set 3, vector 132
-Key:        8484848484848484848484848484848484848484848484848484848484848484
-Plaintext:  84848484848484848484848484848484
-Ciphertext: 2D4D87CFB763C3974CEBF6AE1C6269D4
-Test: Encrypt
-Comment:    Set 3, vector 133
-Key:        8585858585858585858585858585858585858585858585858585858585858585
-Plaintext:  85858585858585858585858585858585
-Ciphertext: F153B13F57F1AE16186EF3B1E98549B8
-Test: Encrypt
-Comment:    Set 3, vector 134
-Key:        8686868686868686868686868686868686868686868686868686868686868686
-Plaintext:  86868686868686868686868686868686
-Ciphertext: 5451DB2B141B894B4892C7F12BE3F389
-Test: Encrypt
-Comment:    Set 3, vector 135
-Key:        8787878787878787878787878787878787878787878787878787878787878787
-Plaintext:  87878787878787878787878787878787
-Ciphertext: 61B2185653CFF14EE873DBD3CB663E79
-Test: Encrypt
-Comment:    Set 3, vector 136
-Key:        8888888888888888888888888888888888888888888888888888888888888888
-Plaintext:  88888888888888888888888888888888
-Ciphertext: C17ACB243808B86349D4176EECF602DF
-Test: Encrypt
-Comment:    Set 3, vector 137
-Key:        8989898989898989898989898989898989898989898989898989898989898989
-Plaintext:  89898989898989898989898989898989
-Ciphertext: 6FCE3ED2207D58A5976FE8B20B247275
-Test: Encrypt
-Comment:    Set 3, vector 138
-Key:        8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A
-Plaintext:  8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A
-Ciphertext: 403F73CC70C7F9A5E96CD77D61140961
-Test: Encrypt
-Comment:    Set 3, vector 139
-Key:        8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B
-Plaintext:  8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B
-Ciphertext: DE2B34DECB33550C97D6C074032F3333
-Test: Encrypt
-Comment:    Set 3, vector 140
-Key:        8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-Plaintext:  8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-Ciphertext: FB395AE4F537F8FB7C98BAD54BDB86A0
-Test: Encrypt
-Comment:    Set 3, vector 141
-Key:        8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D
-Plaintext:  8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D
-Ciphertext: 258E83BB639D0BEDE648F3AF96CC8E75
-Test: Encrypt
-Comment:    Set 3, vector 142
-Key:        8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E
-Plaintext:  8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E
-Ciphertext: A1B5E73720E43FA0871EAAE245B55A0E
-Test: Encrypt
-Comment:    Set 3, vector 143
-Key:        8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F
-Plaintext:  8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F
-Ciphertext: 774A9ABE1FAB9E3B85A91C0F86758B0E
-Test: Encrypt
-Comment:    Set 3, vector 144
-Key:        9090909090909090909090909090909090909090909090909090909090909090
-Plaintext:  90909090909090909090909090909090
-Ciphertext: 0A6EC1CF2056076933259AE6A337B185
-Test: Encrypt
-Comment:    Set 3, vector 145
-Key:        9191919191919191919191919191919191919191919191919191919191919191
-Plaintext:  91919191919191919191919191919191
-Ciphertext: C96729F87D62104F941DC21448756F95
-Test: Encrypt
-Comment:    Set 3, vector 146
-Key:        9292929292929292929292929292929292929292929292929292929292929292
-Plaintext:  92929292929292929292929292929292
-Ciphertext: 1CB85A610C2250A78143A31BB1C19094
-Test: Encrypt
-Comment:    Set 3, vector 147
-Key:        9393939393939393939393939393939393939393939393939393939393939393
-Plaintext:  93939393939393939393939393939393
-Ciphertext: 16194ABEDEA340C6D57E4C4F50640FBE
-Test: Encrypt
-Comment:    Set 3, vector 148
-Key:        9494949494949494949494949494949494949494949494949494949494949494
-Plaintext:  94949494949494949494949494949494
-Ciphertext: 379A5A54C198FB03178EE841D67F3502
-Test: Encrypt
-Comment:    Set 3, vector 149
-Key:        9595959595959595959595959595959595959595959595959595959595959595
-Plaintext:  95959595959595959595959595959595
-Ciphertext: A25119AD8A0F6654ECDB2696CF4F8225
-Test: Encrypt
-Comment:    Set 3, vector 150
-Key:        9696969696969696969696969696969696969696969696969696969696969696
-Plaintext:  96969696969696969696969696969696
-Ciphertext: 264B7FAAD26DEC203D0DE29CE4F0F45B
-Test: Encrypt
-Comment:    Set 3, vector 151
-Key:        9797979797979797979797979797979797979797979797979797979797979797
-Plaintext:  97979797979797979797979797979797
-Ciphertext: 2EBD2A2CD16284D206D81ACF18122E2E
-Test: Encrypt
-Comment:    Set 3, vector 152
-Key:        9898989898989898989898989898989898989898989898989898989898989898
-Plaintext:  98989898989898989898989898989898
-Ciphertext: 25FB2B75B6915C0543412DF9EBD20FC3
-Test: Encrypt
-Comment:    Set 3, vector 153
-Key:        9999999999999999999999999999999999999999999999999999999999999999
-Plaintext:  99999999999999999999999999999999
-Ciphertext: 21B89B53845A828E0A14F4AE45940284
-Test: Encrypt
-Comment:    Set 3, vector 154
-Key:        9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A
-Plaintext:  9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A
-Ciphertext: 4CE809A241E8E59E231F2D00BE0EA285
-Test: Encrypt
-Comment:    Set 3, vector 155
-Key:        9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B
-Plaintext:  9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B
-Ciphertext: F914E06D9F7889DC71974DFF104F94D4
-Test: Encrypt
-Comment:    Set 3, vector 156
-Key:        9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C
-Plaintext:  9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C
-Ciphertext: AF08BADB48FF961FD5EB663FA3766FC6
-Test: Encrypt
-Comment:    Set 3, vector 157
-Key:        9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D
-Plaintext:  9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D
-Ciphertext: 05DDDE95AE659D6BBBD2B4E394399B53
-Test: Encrypt
-Comment:    Set 3, vector 158
-Key:        9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E
-Plaintext:  9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E
-Ciphertext: 25E6FE1C89F811D827BDF8D4E977071C
-Test: Encrypt
-Comment:    Set 3, vector 159
-Key:        9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
-Plaintext:  9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
-Ciphertext: 3D00A9143A1829D05F787A904C48C75B
-Test: Encrypt
-Comment:    Set 3, vector 160
-Key:        A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0
-Plaintext:  A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0
-Ciphertext: 391DF944B0E0BCB84483AF5C4F34D754
-Test: Encrypt
-Comment:    Set 3, vector 161
-Key:        A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1
-Plaintext:  A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1
-Ciphertext: BB2D2E556210A7C0EBA3165F63A74967
-Test: Encrypt
-Comment:    Set 3, vector 162
-Key:        A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2
-Plaintext:  A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2
-Ciphertext: A1B0BB24291B259AC4A1CDE9A3B817C9
-Test: Encrypt
-Comment:    Set 3, vector 163
-Key:        A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3
-Plaintext:  A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3
-Ciphertext: 6F798763B6ED7F8BB234D2CA78D026DC
-Test: Encrypt
-Comment:    Set 3, vector 164
-Key:        A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4
-Plaintext:  A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4
-Ciphertext: 038443760056AB3D23BC70ECE6FB4397
-Test: Encrypt
-Comment:    Set 3, vector 165
-Key:        A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5
-Plaintext:  A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5
-Ciphertext: C75ECE40A7AE9BB38F604615C873EF02
-Test: Encrypt
-Comment:    Set 3, vector 166
-Key:        A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6
-Plaintext:  A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6
-Ciphertext: 2D308C2078842EDBBB35ABCA3F41E467
-Test: Encrypt
-Comment:    Set 3, vector 167
-Key:        A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7
-Plaintext:  A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7
-Ciphertext: 393C0E3350B3219DD8FD851C48E28C63
-Test: Encrypt
-Comment:    Set 3, vector 168
-Key:        A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
-Plaintext:  A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
-Ciphertext: 964BD4A28DB1434570E27FB3AD880398
-Test: Encrypt
-Comment:    Set 3, vector 169
-Key:        A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9
-Plaintext:  A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9
-Ciphertext: B668D17C027B550C0C22BDE151EB6EB1
-Test: Encrypt
-Comment:    Set 3, vector 170
-Key:        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Plaintext:  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Ciphertext: E14186F8205957B243CE522C16453621
-Test: Encrypt
-Comment:    Set 3, vector 171
-Key:        ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB
-Plaintext:  ABABABABABABABABABABABABABABABAB
-Ciphertext: 0E352BEB6B6BCAFDAE61BBE86F8F1D0E
-Test: Encrypt
-Comment:    Set 3, vector 172
-Key:        ACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACAC
-Plaintext:  ACACACACACACACACACACACACACACACAC
-Ciphertext: 4BCF038D9458EAAA3D279CCAC3F5D693
-Test: Encrypt
-Comment:    Set 3, vector 173
-Key:        ADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADAD
-Plaintext:  ADADADADADADADADADADADADADADADAD
-Ciphertext: D5EF17646A481C3B79AAB3C08B4F1611
-Test: Encrypt
-Comment:    Set 3, vector 174
-Key:        AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE
-Plaintext:  AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE
-Ciphertext: 37642DA589775C2FFA40A7274E9D56E2
-Test: Encrypt
-Comment:    Set 3, vector 175
-Key:        AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF
-Plaintext:  AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF
-Ciphertext: F829FA6B756F1B1D16B49CB7C8AFFA22
-Test: Encrypt
-Comment:    Set 3, vector 176
-Key:        B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0
-Plaintext:  B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0
-Ciphertext: 6FE1450D48D611031E81C70478DB5326
-Test: Encrypt
-Comment:    Set 3, vector 177
-Key:        B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1
-Plaintext:  B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1
-Ciphertext: 68C5ECE7F525F69DABF63288533C5C60
-Test: Encrypt
-Comment:    Set 3, vector 178
-Key:        B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2
-Plaintext:  B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2
-Ciphertext: 5DF627500627E59A5BAB5D30B6C93219
-Test: Encrypt
-Comment:    Set 3, vector 179
-Key:        B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3
-Plaintext:  B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3
-Ciphertext: AD3A4AC8F666C0FCA5D7995783D0986D
-Test: Encrypt
-Comment:    Set 3, vector 180
-Key:        B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4
-Plaintext:  B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4
-Ciphertext: A3AEE54D09357B187622109296534F88
-Test: Encrypt
-Comment:    Set 3, vector 181
-Key:        B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5
-Plaintext:  B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5
-Ciphertext: 7D1D9A73DB386A717862C4F5089970E1
-Test: Encrypt
-Comment:    Set 3, vector 182
-Key:        B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6
-Plaintext:  B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6
-Ciphertext: 916347935FBD0D868A0127D602B91BD5
-Test: Encrypt
-Comment:    Set 3, vector 183
-Key:        B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7
-Plaintext:  B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7
-Ciphertext: 4F167893651993D9150ED9E0B780BF82
-Test: Encrypt
-Comment:    Set 3, vector 184
-Key:        B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8
-Plaintext:  B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8
-Ciphertext: 488352470ACF9361F22FAC1B3ED67003
-Test: Encrypt
-Comment:    Set 3, vector 185
-Key:        B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9
-Plaintext:  B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9
-Ciphertext: 4BBD307FCDE0F89C9A663A0F9C9358C5
-Test: Encrypt
-Comment:    Set 3, vector 186
-Key:        BABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABA
-Plaintext:  BABABABABABABABABABABABABABABABA
-Ciphertext: E402E706D262078113D6626E7071589E
-Test: Encrypt
-Comment:    Set 3, vector 187
-Key:        BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-Plaintext:  BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-Ciphertext: 422D6FA4519F2E72420685CD4ED2CC8E
-Test: Encrypt
-Comment:    Set 3, vector 188
-Key:        BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC
-Plaintext:  BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC
-Ciphertext: 6D14CC5F618DF7E0B2210F6C5DD62C92
-Test: Encrypt
-Comment:    Set 3, vector 189
-Key:        BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD
-Plaintext:  BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD
-Ciphertext: 5CC4A5E81F7D7EC528C150437AC2B027
-Test: Encrypt
-Comment:    Set 3, vector 190
-Key:        BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE
-Plaintext:  BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE
-Ciphertext: B3BE0F996494323504946446EDE489FC
-Test: Encrypt
-Comment:    Set 3, vector 191
-Key:        BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF
-Plaintext:  BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF
-Ciphertext: ABC7DB10FE04BEE94F5887E539C1D235
-Test: Encrypt
-Comment:    Set 3, vector 192
-Key:        C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
-Plaintext:  C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
-Ciphertext: B18BE6FB1D04E76F21C0678A4333D255
-Test: Encrypt
-Comment:    Set 3, vector 193
-Key:        C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1
-Plaintext:  C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1
-Ciphertext: FC5802BAFEDC03088BBA0A5F22402968
-Test: Encrypt
-Comment:    Set 3, vector 194
-Key:        C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2
-Plaintext:  C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2
-Ciphertext: 8EA96801643AE7BF649EAC22812214D5
-Test: Encrypt
-Comment:    Set 3, vector 195
-Key:        C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3
-Plaintext:  C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3
-Ciphertext: F7683FCDDC2BB0BCFD1350F8E3D76602
-Test: Encrypt
-Comment:    Set 3, vector 196
-Key:        C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4
-Plaintext:  C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4
-Ciphertext: 08D0345431AE120CAD6C6D4275E00CA8
-Test: Encrypt
-Comment:    Set 3, vector 197
-Key:        C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5
-Plaintext:  C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5
-Ciphertext: 7CD50A623DA79EC84D61CD7FBDBA4153
-Test: Encrypt
-Comment:    Set 3, vector 198
-Key:        C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6
-Plaintext:  C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6
-Ciphertext: 42ACA2B048E5C58D8F004F0E8A2C6DEF
-Test: Encrypt
-Comment:    Set 3, vector 199
-Key:        C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7
-Plaintext:  C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7
-Ciphertext: E03AD353225F76121D130740C75B839B
-Test: Encrypt
-Comment:    Set 3, vector 200
-Key:        C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8
-Plaintext:  C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8
-Ciphertext: 26807D0A6D6330A77804B4B1AE84432B
-Test: Encrypt
-Comment:    Set 3, vector 201
-Key:        C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9
-Plaintext:  C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9
-Ciphertext: 864CE880AE89660474F64B93AF4CE043
-Test: Encrypt
-Comment:    Set 3, vector 202
-Key:        CACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACA
-Plaintext:  CACACACACACACACACACACACACACACACA
-Ciphertext: 82EAD2C033986CAC1F4C3EEEEA1D1892
-Test: Encrypt
-Comment:    Set 3, vector 203
-Key:        CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB
-Plaintext:  CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB
-Ciphertext: 53F1A5C39DD062DF8D133B3A0FB3DA02
-Test: Encrypt
-Comment:    Set 3, vector 204
-Key:        CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-Plaintext:  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-Ciphertext: E913208594B288125EEAE0EFEC764D39
-Test: Encrypt
-Comment:    Set 3, vector 205
-Key:        CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD
-Plaintext:  CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD
-Ciphertext: 7DAE4BD638A36A794A73E9B945BEF4D4
-Test: Encrypt
-Comment:    Set 3, vector 206
-Key:        CECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECE
-Plaintext:  CECECECECECECECECECECECECECECECE
-Ciphertext: 04E8155E3E81C261D3A9D4A800182A62
-Test: Encrypt
-Comment:    Set 3, vector 207
-Key:        CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF
-Plaintext:  CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF
-Ciphertext: F466172A8C4C7854F59388474098F441
-Test: Encrypt
-Comment:    Set 3, vector 208
-Key:        D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0
-Plaintext:  D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0
-Ciphertext: E95DBB0B366E77D7BC1BF206B95DAEBA
-Test: Encrypt
-Comment:    Set 3, vector 209
-Key:        D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1
-Plaintext:  D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1
-Ciphertext: 76490E6DD8380855E26BCACF8746978F
-Test: Encrypt
-Comment:    Set 3, vector 210
-Key:        D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2
-Plaintext:  D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2
-Ciphertext: 3C3B73C8FBDA8CAE5E0D7D0070735DA1
-Test: Encrypt
-Comment:    Set 3, vector 211
-Key:        D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3
-Plaintext:  D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3
-Ciphertext: B039EBC9C48828C3913A3BC346CAEAE3
-Test: Encrypt
-Comment:    Set 3, vector 212
-Key:        D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4
-Plaintext:  D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4
-Ciphertext: 0AFCC6A58BD3ADB2C0B2A1586C9FA8DE
-Test: Encrypt
-Comment:    Set 3, vector 213
-Key:        D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5
-Plaintext:  D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5
-Ciphertext: C2187D0E74CE2307BC4DF249EA6E57F1
-Test: Encrypt
-Comment:    Set 3, vector 214
-Key:        D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6
-Plaintext:  D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6
-Ciphertext: F3F4AEA2492106A45C12D0029F58ACE1
-Test: Encrypt
-Comment:    Set 3, vector 215
-Key:        D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
-Plaintext:  D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
-Ciphertext: 3FFADF96B37B67D62D71387C52C41AE9
-Test: Encrypt
-Comment:    Set 3, vector 216
-Key:        D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8
-Plaintext:  D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8
-Ciphertext: 4C1644AD69F7D0D3A1E2B4B0E7F0A592
-Test: Encrypt
-Comment:    Set 3, vector 217
-Key:        D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9
-Plaintext:  D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9
-Ciphertext: 68FD6F6592AE5BD9245FA959FE1CA849
-Test: Encrypt
-Comment:    Set 3, vector 218
-Key:        DADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADA
-Plaintext:  DADADADADADADADADADADADADADADADA
-Ciphertext: 7AB97B70C2CCC7D0D1AA7A6D8B7C48CA
-Test: Encrypt
-Comment:    Set 3, vector 219
-Key:        DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB
-Plaintext:  DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB
-Ciphertext: 961BF9E037E303B9B494C2EE063FC4CC
-Test: Encrypt
-Comment:    Set 3, vector 220
-Key:        DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
-Plaintext:  DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
-Ciphertext: 0FBF042B227603DB4A1CC8EE62E93DF3
-Test: Encrypt
-Comment:    Set 3, vector 221
-Key:        DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-Plaintext:  DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-Ciphertext: 71360ED44C9FAF8F1139D31252A35F49
-Test: Encrypt
-Comment:    Set 3, vector 222
-Key:        DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE
-Plaintext:  DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE
-Ciphertext: 5E806BD29351AE456549E73B8DDC0026
-Test: Encrypt
-Comment:    Set 3, vector 223
-Key:        DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF
-Plaintext:  DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF
-Ciphertext: C7908A288B86C1C4FCE5A8A59457EFD3
-Test: Encrypt
-Comment:    Set 3, vector 224
-Key:        E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0
-Plaintext:  E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0
-Ciphertext: AAC45B53F6292082B93F949BD77E5776
-Test: Encrypt
-Comment:    Set 3, vector 225
-Key:        E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1
-Plaintext:  E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1
-Ciphertext: 231150ED4D85B4217B3EFC3E71A522C6
-Test: Encrypt
-Comment:    Set 3, vector 226
-Key:        E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
-Plaintext:  E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
-Ciphertext: 639D9C5EEC8D9569C6DF24630CA8257D
-Test: Encrypt
-Comment:    Set 3, vector 227
-Key:        E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3
-Plaintext:  E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3
-Ciphertext: 0E7F8C538946D87A01AD49A8CC981B58
-Test: Encrypt
-Comment:    Set 3, vector 228
-Key:        E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4
-Plaintext:  E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4
-Ciphertext: 09A293907E499502D78569230D3F1A97
-Test: Encrypt
-Comment:    Set 3, vector 229
-Key:        E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
-Plaintext:  E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
-Ciphertext: ACF67CC086E386DA064EDBF97F7E889A
-Test: Encrypt
-Comment:    Set 3, vector 230
-Key:        E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6
-Plaintext:  E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6
-Ciphertext: E7C44DB1A9FCAC410253A7E2674C54F6
-Test: Encrypt
-Comment:    Set 3, vector 231
-Key:        E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7
-Plaintext:  E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7
-Ciphertext: B99BA33ECB86DA790FF0CC4F0D41A065
-Test: Encrypt
-Comment:    Set 3, vector 232
-Key:        E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8
-Plaintext:  E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8
-Ciphertext: 73405114FDBDB81B1A54C4EFED1BB3FE
-Test: Encrypt
-Comment:    Set 3, vector 233
-Key:        E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9
-Plaintext:  E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9
-Ciphertext: 80152E139834B3CC01EBF7E6417C5537
-Test: Encrypt
-Comment:    Set 3, vector 234
-Key:        EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA
-Plaintext:  EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA
-Ciphertext: 05CE579D4804FF3C7874571730D81CEC
-Test: Encrypt
-Comment:    Set 3, vector 235
-Key:        EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB
-Plaintext:  EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB
-Ciphertext: F984801E7A806A130325E152DF60012E
-Test: Encrypt
-Comment:    Set 3, vector 236
-Key:        ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC
-Plaintext:  ECECECECECECECECECECECECECECECEC
-Ciphertext: 92CBB121474A307505425B4DD1B7F803
-Test: Encrypt
-Comment:    Set 3, vector 237
-Key:        EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED
-Plaintext:  EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED
-Ciphertext: 2DEB2F282D60EFCDB300EADB15C798D8
-Test: Encrypt
-Comment:    Set 3, vector 238
-Key:        EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-Plaintext:  EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-Ciphertext: 0F4D7D59B535E29D315D2A5C7BFE4973
-Test: Encrypt
-Comment:    Set 3, vector 239
-Key:        EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF
-Plaintext:  EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF
-Ciphertext: 61E391F7C29B5AD705121CF9559E5C04
-Test: Encrypt
-Comment:    Set 3, vector 240
-Key:        F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
-Plaintext:  F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
-Ciphertext: 65BCBE179D19A5BCF12D141A21E0F7A8
-Test: Encrypt
-Comment:    Set 3, vector 241
-Key:        F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-Plaintext:  F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-Ciphertext: FDB75C659B72AE81E51204CFCB86E631
-Test: Encrypt
-Comment:    Set 3, vector 242
-Key:        F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
-Plaintext:  F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
-Ciphertext: 5643ED3A3679B9E33E21CD0F95580877
-Test: Encrypt
-Comment:    Set 3, vector 243
-Key:        F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
-Plaintext:  F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
-Ciphertext: 618EFEB4C6E4270B81FF7DE786E68420
-Test: Encrypt
-Comment:    Set 3, vector 244
-Key:        F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
-Plaintext:  F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
-Ciphertext: 75A2A9CC91F006059CA873E5D73C2CCC
-Test: Encrypt
-Comment:    Set 3, vector 245
-Key:        F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5
-Plaintext:  F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5
-Ciphertext: B55840B5001D1875C29A56EDFDE10E55
-Test: Encrypt
-Comment:    Set 3, vector 246
-Key:        F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6
-Plaintext:  F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6
-Ciphertext: 6DD9BDEA7EC0E622DE8B83460BDEA719
-Test: Encrypt
-Comment:    Set 3, vector 247
-Key:        F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7
-Plaintext:  F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7
-Ciphertext: D164075BD4CDC95288D896C7CC98285D
-Test: Encrypt
-Comment:    Set 3, vector 248
-Key:        F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8
-Plaintext:  F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8
-Ciphertext: 8420071C55241802D88FB7AF17EBE43F
-Test: Encrypt
-Comment:    Set 3, vector 249
-Key:        F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9
-Plaintext:  F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9
-Ciphertext: 03D1D5646E4B2B8A924AB242E485C5D1
-Test: Encrypt
-Comment:    Set 3, vector 250
-Key:        FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA
-Plaintext:  FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA
-Ciphertext: 29106DFB63F4CD6EF5D82CF07C0DBB3A
-Test: Encrypt
-Comment:    Set 3, vector 251
-Key:        FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB
-Plaintext:  FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB
-Ciphertext: E9DC1CDD5011E00E0C5699201E1EA002
-Test: Encrypt
-Comment:    Set 3, vector 252
-Key:        FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
-Plaintext:  FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
-Ciphertext: 8006C8BD5B210F2FC5B3538F66A6BE0B
-Test: Encrypt
-Comment:    Set 3, vector 253
-Key:        FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
-Plaintext:  FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
-Ciphertext: 2C6386229480E806D0CD21CDA0EA6B53
-Test: Encrypt
-Comment:    Set 3, vector 254
-Key:        FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
-Plaintext:  FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
-Ciphertext: ACDBB0F5A00E3CF63A89D9C09B44A058
-Test: Encrypt
-Comment:    Set 3, vector 255
-Key:        FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-Plaintext:  FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-Ciphertext: 4F05F28CA23EEAE205B67B1C95CD5280
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/ccm.txt b/src-cryptopp/TestVectors/ccm.txt
deleted file mode 100644
index 829dda5..0000000
--- a/src-cryptopp/TestVectors/ccm.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-AlgorithmType: AuthenticatedSymmetricCipher
-Name: AES/CCM
-Source: aes-modes-src-07-10-08/Testvals/ccm.1, Basic Tests for CCM (compiled by B. R. Gladman)
-Key: 404142434445464748494a4b4c4d4e4f
-IV: 10111213141516
-Header: 0001020304050607
-Plaintext: 20212223
-Ciphertext: 7162015b
-MAC: 4dac255d
-Test: Encrypt
-Key: 404142434445464748494a4b4c4d4e4f
-IV: 1011121314151617
-Header: 000102030405060708090a0b0c0d0e0f
-Plaintext: 202122232425262728292a2b2c2d2e2f
-Ciphertext: d2a1f0e051ea5f62081a7792073d593d
-MAC: 1fc64fbfaccd
-Test: Encrypt
-Key: 404142434445464748494a4b4c4d4e4f
-IV: 101112131415161718191a1b
-Header: 000102030405060708090a0b0c0d0e0f10111213
-Plaintext: 202122232425262728292a2b2c2d2e2f3031323334353637
-Ciphertext: e3b201a9f5b71a7a9b1ceaeccd97e70b6176aad9a4428aa5
-MAC: 484392fbc1b09951
-Test: Encrypt
-Key: 404142434445464748494a4b4c4d4e4f
-IV: 101112131415161718191a1b1c
-Header: r256 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Plaintext: 202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f
-Ciphertext: 69915dad1e84c6376a68c2967e4dab615ae0fd1faec44cc484828529463ccf72
-MAC: b4ac6bec93e8598e7f0dadbcea5b
-Test: Encrypt
-Key: c97c1f67ce371185514a8a19f2bdd52f
-IV: 005030f1844408b5039776e70c
-Header: 08400fd2e128a57c5030f1844408abaea5b8fcba0000
-Plaintext: f8ba1a55d02f85ae967bb62fb6cda8eb7e78a050
-Ciphertext: f3d0a2fe9a3dbf2342a643e43246e80c3c04d019
-MAC: 7845ce0b16f97623
-Test: Encrypt
-Key: 8f7a053fa577a5597529272097a603d5
-IV: 00eec1762c88de31f3cbba97ea
-Header: 08c0ea100c846850eec1762c88deaf2ee9f46a070000
-Plaintext: 83a0634b5ed7627eb9df225e05740342de194117
-Ciphertext: 814b6965d05bf2b2ed38d4beb069fe82714a610b
-MAC: 542fbf8da06aa4ae
-Test: Encrypt
-Key: 40cfb7a62e88013bd6d3affcc191041e
-IV: 00b6a88adf36912fdca0f3a5ae
-Header: 88c0d9577df763c8b6a88adf3691dc4a8bca94dd00000000
-Plaintext: 2c1bd036831c95496c5f4dbf3d559e72de802a18
-Ciphertext: 89d8580340b626a0b6d4d013bf18f291b89646c8
-MAC: fd1f1f61a9fb4bb3
-Test: Encrypt
-Key: 8c89a2ebc96c7602707fcf24b32d3833
-IV: 078ef822734701f670a55a0fe3
-Header: 88c2712a9ddf11db8ef82273470159140dd646a200000700
-Plaintext: 4fad2b1c290fa5ebd872fbc3f3a074898f8b2fbb
-Ciphertext: 9d59b15f371448c230f4d739052e13ab3b1a7b10
-MAC: 31fc88004f35ee3d
-Test: Encrypt
-Key: a574d5143bb25efddeff30122fdfd066
-IV: 0bf351946bc96ba7ffe03c0e37
-Header: 88c245dec69a7480f351946bc96be276fbe6c12700000b00
-Plaintext: 28969b954f263a8018a9ef70a8b051462481922e
-Ciphertext: eb4ae4956a801da9624b7e0c18b23e615ec03af6
-MAC: ce0c3be197d305eb
-Test: Encrypt
-Key: f71eea4e1f58804b9717230ad0614641
-IV: 0dbff943b9f9a66b81eca48989
-Header: 88425af28430fdabbff943b9f9a6ab1d98c7fe7300000d00
-Plaintext: abfda22d3a0bfc9cc1fc079363c2fca143e6eb1d
-Ciphertext: 9a709b60a39d40b1dfb612e18b5f114badb6cc86
-MAC: 309a8d5c466bbb71
-Test: Encrypt
-Key: 1bdb34980e038124a1db1a892bec366a
-IV: 00efec952016915eec4073e723
-Header: 08419b50f4fd56f6efec9520169183570c4ccdee0000
-Plaintext: 98beca86f4b38da20cfdf24724c58eb835665339
-Ciphertext: 12c537ebf3ab584ef1fef9a1f3547a8c13b3225a
-MAC: 2d0957ecfabe95b9
-Test: Encrypt
-Key: 6eac1bf54bd54edb2321754303024c71
-IV: 0aca3f3aae60c4cefd996eccdd
-Header: 88c1552d5f72bb70ca3f3aae60c48ba9b5f82c2f00000a00
-Plaintext: 57cb5c0e5fcd885e9a4239e9b9cad60d64375979
-Ciphertext: 4bf281ef8ec7739f91591b97a87dc14b3fa17462
-MAC: 6dba8ef7f08087dd
-Test: Encrypt
-Key: 494b501e194675971a48d08c5bc353cb
-IV: 0aa4ad6d319985ba82e93437b3
-Header: 88c19afb798b8a4ba4ad6d319985bc429e8f0afa00000a00
-Plaintext: 25a98f9c1bd9c93cf383ab9d98152d76cb4a32c6
-Ciphertext: 561a0d068eac2eadb0c57fe2d0a6cc7398b6ddbf
-MAC: cfe438cbea61fa9a
-Test: Encrypt
-Key: 489e49bc3cfe3fce3895820e872ee1a3
-IV: 0053f869fe279acf1d3e75fea9
-Header: 084340ec29fa759b53f869fe279af0f9f8a65416000052bfd2703d24
-Plaintext: 7f91f2472d7a121c9cdd4b6c9080675a1020aa00
-Ciphertext: 25df5173835e4fba23bc05a253885ebed3ac4871
-MAC: c868a725552c5565
-Test: Encrypt
-Key: 02be5c4545672a07e4e314d70f1f9e85
-IV: 0d347ceb9aabffd2d6596e55d4
-Header: 88c3298c0baa9190347ceb9aabffd83d4886e5c20000e29d524ae1960d00
-Plaintext: f9a812e4a28af7f3714d4bf6622e5932f2184509
-Ciphertext: 6315500f924295cd3eafbdc3e151b1df46465b71
-MAC: 681fdee8513c62dc
-Test: Encrypt
-Key: 77077ed79453e4a18d60438cc6484d6e
-IV: 00d8ac5a7ec44450b01e77fd8e
-Header: 0843aa288b8435bcd8ac5a7ec444e8b46250538b0000e81402c2ee11
-Plaintext: 431981a2336d02f8cb8448d5428916be95293537
-Ciphertext: cf71b2ccbd590b20800792f359ed1cfd74d800b4
-MAC: fd0f41f426bb8f30
-Test: Encrypt
-Source: aes-modes-src-07-10-08/Testvals/ccm.2, Vectors for IEEE P1619.1 CCM Mode
-Header:
-Key: 0000000000000000000000000000000000000000000000000000000000000000
-IV: 000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: c1944044c8e7aa95d2de9513c7f3dd8c
-MAC: 4b0a3e5e51f151eb0ffae7c43d010fdb
-Test: Encrypt
-Plaintext:
-Ciphertext:
-Key: 0000000000000000000000000000000000000000000000000000000000000000
-IV: 000000000000000000000000
-Header: 00000000000000000000000000000000
-MAC: 904704e89fb216443cb9d584911fc3c2
-Test: Encrypt
-Key: 0000000000000000000000000000000000000000000000000000000000000000
-IV: 000000000000000000000000
-Header: 00000000000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: c1944044c8e7aa95d2de9513c7f3dd8c
-MAC: 87314e9c1fa01abe6a6415943dc38521
-Test: Encrypt
-Header:
-Key: fb7615b23d80891dd470980bc79584c8b2fb64ce60978f4d17fce45a49e830b7
-IV: dbd1a3636024b7b402da7d6f
-Plaintext: a845348ec8c5b5f126f50e76fefd1b1e
-Ciphertext: cc881261c6a7fa72b96a1739176b277f
-MAC: 3472e1145f2c0cbe146349062cf0e423
-Test: Encrypt
-Key: 404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f
-IV: 101112131415161718191a1b
-Header: 000102030405060708090a0b0c0d0e0f10111213
-Plaintext: 202122232425262728292a2b2c2d2e2f3031323334353637
-Ciphertext: 04f883aeb3bd0730eaf50bb6de4fa2212034e4e41b0e75e5
-MAC: 9bba3f3a107f3239bd63902923f80371
-Test: Encrypt
-Key: 404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f
-IV: 101112131415161718191a1b
-Header: r256 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Plaintext: 202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f
-Ciphertext: 04f883aeb3bd0730eaf50bb6de4fa2212034e4e41b0e75e577f6bf2422c0f6d2
-MAC: 3376d2cf256ef613c56454cbb5265834
-Test: Encrypt
-Key: 404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f
-IV: 101112131415161718191a1b
-Header: 202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f
-Plaintext: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f 202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f 404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f 606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf e0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Ciphertext: 24d8a38e939d2710cad52b96fe6f82010014c4c43b2e55c557d69f0402e0d6f2 06c53d6cbd3f1c3c6de5dcdcad9fb74f25741dea741149fe4278a0cc24741e86 58cc0523b8d7838c60fb1de4b7c3941f5b26dea9322aa29656ec37ac18a9b108 a6f38b7917f5a9c398838b22afbd17252e96694a9e6237964a0eae21c0a6e152 15a0e82022926be97268249599e456e05029c3ebc07d78fc5b4a0862e04e68c2 9514c7bdafc4b52e04833bf30622e4eb42504a44a9dcbc774752de7bb82891ad 1eba9dc3281422a8aba8654268d3d9c81705f4c5a531ef856df5609a159af738 eb753423ed2001b8f20c23725f2bef18c409f7e52132341f27cb8f0e79894dd9
-MAC: ebb1fa9d28ccfe21bdfea7e6d91e0bab
-Test: Encrypt
-Key: fb7615b23d80891dd470980bc79584c8b2fb64ce6097878d17fce45a49e830b7
-IV: dbd1a3636024b7b402da7d6f
-Header: 36
-Plaintext: a9
-Ciphertext: 9d
-MAC: 3261b1cf931431e99a32806738ecbd2a
-Test: Encrypt
-Key: f8d476cfd646ea6c2384cb1c27d6195dfef1a9f37b9c8d21a79c21f8cb90d289
-IV: dbd1a3636024b7b402da7d6f
-Header: 7bd859a247961a21823b380e9fe8b65082ba61d3
-Plaintext: 90ae61cf7baebd4cade494c54a29ae70269aec71
-Ciphertext: 6c05313e45dc8ec10bea6c670bd94f31569386a6
-MAC: 8f3829e8e76ee23c04f566189e63c686
-Test: Encrypt
-Source: RFC 3610
-Key:		C0 C1 C2 C3  C4 C5 C6 C7  C8 C9 CA CB  CC CD CE CF
-IV:		00 00 00 03  02 01 00 A0  A1 A2 A3 A4  A5
-Header:		00 01 02 03  04 05 06 07
-Plaintext:	08 09 0A 0B  0C 0D 0E 0F\
-            10 11 12 13  14 15 16 17  18 19 1A 1B  1C 1D 1E
-Ciphertext:	58 8C 97 9A  61 C6 63 D2\
-            F0 66 D0 C2  C0 F9 89 80  6D 5F 6B 61  DA C3 84
-MAC:		17 E8 D1 2C FD  F9 26 E0
-Test: Encrypt
-MAC:		17 E8 D1 2C FD  F9 26 00
-Test: NotVerify
-Key:  C0 C1 C2 C3  C4 C5 C6 C7  C8 C9 CA CB  CC CD CE CF
-IV:    00 00 00 04  03 02 01 A0  A1 A2 A3 A4  A5
-Header: 00 01 02 03  04 05 06 07
-Plaintext: 08 09 0A 0B  0C 0D 0E 0F 10 11 12 13  14 15 16 17  18 19 1A 1B  1C 1D 1E 1F
-Ciphertext: 72 C9 1A 36  E1 35 F8 CF 29 1C A8 94  08 5C 87 E3  CC 15 C4 39  C9 E4 3A 3B
-MAC:  A0 91 D5 6E  10 40 09 16
-Test: Encrypt
-Key:  C0 C1 C2 C3  C4 C5 C6 C7  C8 C9 CA CB  CC CD CE CF
-IV:    00 00 00 05  04 03 02 A0  A1 A2 A3 A4  A5
-Header:              00 01 02 03  04 05 06 07
-Plaintext: 08 09 0A 0B  0C 0D 0E 0F              10 11 12 13  14 15 16 17  18 19 1A 1B  1C 1D 1E 1F              20
-Ciphertext:  51 B1 E5 F4  4A 19 7D 1D              A4 6B 0F 8E  2D 28 2A E8  71 E8 38 BB  64 DA 85 96              57
-MAC: 4A DA A7  6F BD 9F B0  C5
-Test: Encrypt
-Key:  C0 C1 C2 C3  C4 C5 C6 C7  C8 C9 CA CB  CC CD CE CF
-IV:    00 00 00 06  05 04 03 A0  A1 A2 A3 A4  A5
-Header:          00 01 02 03  04 05 06 07  08 09 0A 0B
-Plaintext: 0C 0D 0E 0F          10 11 12 13  14 15 16 17  18 19 1A 1B  1C 1D 1E
-Ciphertext: A2 8C 68 65          93 9A 9A 79  FA AA 5C 4C  2A 9D 4A 91  CD AC 8C
-MAC: 96          C8 61 B9 C9  E6 1E F1
-Test: Encrypt
-Key:  C0 C1 C2 C3  C4 C5 C6 C7  C8 C9 CA CB  CC CD CE CF
-IV:    00 00 00 07  06 05 04 A0  A1 A2 A3 A4  A5
-Header:          00 01 02 03  04 05 06 07  08 09 0A 0B
-Plaintext:          0C 0D 0E 0F          10 11 12 13  14 15 16 17  18 19 1A 1B  1C 1D 1E 1F
-Ciphertext:          DC F1 FB 7B          5D 9E 23 FB  9D 4E 13 12  53 65 8A D8  6E BD CA 3E
-MAC:          51 E8 3F 07  7D 9C 2D 93
-Test: Encrypt
-Key:  C0 C1 C2 C3  C4 C5 C6 C7  C8 C9 CA CB  CC CD CE CF
-IV:    00 00 00 08  07 06 05 A0  A1 A2 A3 A4  A5
-Header:          00 01 02 03  04 05 06 07  08 09 0A 0B
-Plaintext:          0C 0D 0E 0F          10 11 12 13  14 15 16 17  18 19 1A 1B  1C 1D 1E 1F          20
-Ciphertext:           6F C1 B0 11          F0 06 56 8B  51 71 A4 2D  95 3D 46 9B  25 70 A4 BD          87
-MAC:          40 5A 04  43 AC 91 CB  94
-Test: Encrypt
-Key:  C0 C1 C2 C3  C4 C5 C6 C7  C8 C9 CA CB  CC CD CE CF
-IV:    00 00 00 09  08 07 06 A0  A1 A2 A3 A4  A5
-Header:          00 01 02 03  04 05 06 07
-Plaintext:          08 09 0A 0B  0C 0D 0E 0F          10 11 12 13  14 15 16 17  18 19 1A 1B  1C 1D 1E
-Ciphertext:           01 35 D1 B2  C9 5F 41 D5          D1 D4 FE C1  85 D1 66 B8  09 4E 99 9D  FE D9 6C
-MAC:          04          8C 56 60 2C  97 AC BB 74  90
-Test: Encrypt
-Key:  C0 C1 C2 C3  C4 C5 C6 C7  C8 C9 CA CB  CC CD CE CF
-IV:    00 00 00 0A  09 08 07 A0  A1 A2 A3 A4  A5
-Header:         00 01 02 03  04 05 06 07
-Plaintext:          08 09 0A 0B  0C 0D 0E 0F          10 11 12 13  14 15 16 17  18 19 1A 1B  1C 1D 1E 1F
-Ciphertext:           7B 75 39 9A  C0 83 1D D2          F0 BB D7 58  79 A2 FD 8F  6C AE 6B 6C  D9 B7 DB 24
-MAC:          C1 7B 44 33  F4 34 96 3F  34 B4
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/chacha.txt b/src-cryptopp/TestVectors/chacha.txt
deleted file mode 100644
index 18ed115..0000000
--- a/src-cryptopp/TestVectors/chacha.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: ChaCha8
-Source: http://tools.ietf.org/html/draft-strombergson-chacha-test-vectors
-Comment: TC1 - All zero key and IV (16-byte key).
-Key: r16 00
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: e28a5fa4a67f8c5defed3e6fb7303486aa8427d31419a729572d777953491120b64ab8e72b8deb85cd6aea7cb6089a101824beeb08814a428aab1fa2c816081b
-Test: Encrypt
-Comment: TC1 - All zero key and IV (32-byte key).
-Key: r32 00
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: 3e00ef2f895f40d67f5bb8e81f09a5a12c840ec3ce9a7f3b181be188ef711a1e984ce172b9216f419f445367456d5619314a42a3da86b001387bfdb80e0cfe42
-Test: Encrypt
-Comment: TC2 - Single bit in key set. All zero IV (16-byte key).
-Key: 0x01000000000000000000000000000000
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: 03a7669888605a0765e8357475e58673f94fc8161da76c2a3aa2f3caf9fe5449e0fcf38eb882656af83d430d410927d55c972ac4c92ab9da3713e19f761eaa14
-Test: Encrypt
-Comment: TC2 - Single bit in key set. All zero IV (32-byte key).
-Key: 0x0100000000000000000000000000000000000000000000000000000000000000
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: cf5ee9a0494aa9613e05d5ed725b804b12f4a465ee635acc3a311de8740489ea289d04f43c7518db56eb4433e498a1238cd8464d3763ddbb9222ee3bd8fae3c8
-Test: Encrypt
-Comment: TC3 - Single bit in IV set. All zero key (16-byte key).
-Key: r16 00
-IV: 0x0100000000000000
-Plaintext: r64 00
-Ciphertext: 25f5bec6683916ff44bccd12d102e692176663f4cac53e719509ca74b6b2eec85da4236fb29902012adc8f0d86c8187d25cd1c486966930d0204c4ee88a6ab35
-Test: Encrypt
-Comment: TC3 - Single bit in IV set. All zero key (32-byte key).
-Key: r32 00
-IV: 0x0100000000000000
-Plaintext: r64 00
-Ciphertext: 2b8f4bb3798306ca5130d47c4f8d4ed13aa0edccc1be6942090faeeca0d7599b7ff0fe616bb25aa0153ad6fdc88b954903c22426d478b97b22b8f9b1db00cf06
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: ChaCha12
-Source: http://tools.ietf.org/html/draft-strombergson-chacha-test-vectors
-Comment: TC1 - All zero key and IV (16-byte key).
-Key: r16 00
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: e1047ba9476bf8ff312c01b4345a7d8ca5792b0ad467313f1dc412b5fdce32410dea8b68bd774c36a920f092a04d3f95274fbeff97bc8491fcef37f85970b450
-Test: Encrypt
-Comment: TC1 - All zero key and IV (32-byte key).
-Key: r32 00
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: 9bf49a6a0755f953811fce125f2683d50429c3bb49e074147e0089a52eae155f0564f879d27ae3c02ce82834acfa8c793a629f2ca0de6919610be82f411326be
-Test: Encrypt
-Comment: TC2 - Single bit in key set. All zero IV (16-byte key).
-Key: 0x01000000000000000000000000000000
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: 2a865a3b8999fa83ae8aacf33fc6be4f32c8aa9762738d26963270052f4eef8b86af758f7867560af6d0eeb973b5542bb24c8abceac8b1f36d026963d6c8a9b2
-Test: Encrypt
-Comment: TC2 - Single bit in key set. All zero IV (32-byte key).
-Key: 0x0100000000000000000000000000000000000000000000000000000000000000
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: 12056e595d56b0f6eef090f0cd25a20949248c2790525d0f930218ff0b4ddd10a6002239d9a454e29e107a7d06fefdfef0210feba044f9f29b1772c960dc29c0
-Test: Encrypt
-Comment: TC3 - Single bit in IV set. All zero key (16-byte key).
-Key: r16 00
-IV: 0x0100000000000000
-Plaintext: r64 00
-Ciphertext: 91cdb2f180bc89cfe86b8b6871cd6b3af61abf6eba01635db619c40a0b2e19edfa8ce5a9bd7f53cc2c9bcfea181e9754a9e245731f658cc282c2ae1cab1ae02c
-Test: Encrypt
-Comment: TC3 - Single bit in IV set. All zero key (32-byte key).
-Key: r32 00
-IV: 0x0100000000000000
-Plaintext: r64 00
-Ciphertext: 64b8bdf87b828c4b6dbaf7ef698de03df8b33f635714418f9836ade59be1296946c953a0f38ecffc9ecb98e81d5d99a5edfc8f9a0a45b9e41ef3b31f028f1d0f
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: ChaCha20
-Source: http://tools.ietf.org/html/draft-strombergson-chacha-test-vectors
-Comment: TC1 - All zero key and IV (16-byte key).
-Key: r16 00
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: 89670952608364fd00b2f90936f031c8e756e15dba04b8493d00429259b20f46cc04f111246b6c2ce066be3bfb32d9aa0fddfbc12123d4b9e44f34dca05a103f
-Test: Encrypt
-Comment: TC1 - All zero key and IV (32-byte key).
-Key: r32 00
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: 76b8e0ada0f13d90405d6ae55386bd28bdd219b8a08ded1aa836efcc8b770dc7da41597c5157488d7724e03fb8d84a376a43b8f41518a11cc387b669b2ee6586
-Test: Encrypt
-Comment: TC2 - Single bit in key set. All zero IV (16-byte key).
-Key: 0x01000000000000000000000000000000
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: ae56060d04f5b597897ff2af1388dbceff5a2a4920335dc17a3cb1b1b10fbe70ece8f4864d8c7cdf0076453a8291c7dbeb3aa9c9d10e8ca36be4449376ed7c42
-Test: Encrypt
-Comment: TC2 - Single bit in key set. All zero IV (32-byte key).
-Key: 0x0100000000000000000000000000000000000000000000000000000000000000
-IV: r8 00
-Plaintext: r64 00
-Ciphertext: c5d30a7ce1ec119378c84f487d775a8542f13ece238a9455e8229e888de85bbd29eb63d0a17a5b999b52da22be4023eb07620a54f6fa6ad8737b71eb0464dac0
-Test: Encrypt
-Comment: TC3 - Single bit in IV set. All zero key (16-byte key).
-Key: r16 00
-IV: 0x0100000000000000
-Plaintext: r64 00
-Ciphertext: 1663879eb3f2c9949e2388caa343d361bb132771245ae6d027ca9cb010dc1fa7178dc41f8278bc1f64b3f12769a24097f40d63a86366bdb36ac08abe60c07fe8
-Test: Encrypt
-Comment: TC3 - Single bit in IV set. All zero key (32-byte key).
-Key: r32 00
-IV: 0x0100000000000000
-Plaintext: r64 00
-Ciphertext: ef3fdfd6c61578fbf5cf35bd3dd33b8009631634d21e42ac33960bd138e50d32111e4caf237ee53ca8ad6426194a88545ddc497a0b466e7d6bbdb0041b2f586b
-Test: Encrypt
-
diff --git a/src-cryptopp/TestVectors/cmac.txt b/src-cryptopp/TestVectors/cmac.txt
deleted file mode 100644
index d719c8f..0000000
--- a/src-cryptopp/TestVectors/cmac.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-AlgorithmType: MAC
-Name: CMAC(AES)
-Source: RFC 4493
-Key: 2b7e1516 28aed2a6 abf71588 09cf4f3c
-Message:
-MAC:     bb1d6929 e9593728 7fa37d12 9b756746
-Test: Verify
-Message: 6bc1bee2 2e409f96 e93d7e11 7393172a
-MAC:     070a16b4 6b4d4144 f79bdd9d d04a287c
-Test: Verify
-Message: 6bc1bee2 2e409f96 e93d7e11 7393172a              ae2d8a57 1e03ac9c 9eb76fac 45af8e51              30c81c46 a35ce411
-MAC:     dfa66747 de9ae630 30ca3261 1497c827
-Test: Verify
-Message: 6bc1bee2 2e409f96 e93d7e11 7393172a              ae2d8a57 1e03ac9c 9eb76fac 45af8e51              30c81c46 a35ce411 e5fbc119 1a0a52ef              f69f2445 df4f9b17 ad2b417b e66c3710
-MAC:     51f0bebf 7e3b9d92 fc497417 79363cfe
-Test: Verify
-MAC:     51f0bebf 7e3b9d92 fc497417 79363cff
-Test: NotVerify
-
-AlgorithmType: MAC
-Name: CMAC(DES-EDE3)
-Source: http://csrc.nist.gov/groups/STM/cavp/documents/mac/cmactestvectors.zip
-Key: f8fba7b9b3e9d68a 2f70bfd304d32a15 9e13453e0d16928a
-Message:
-MAC: eb61515b
-Test: VerifyTruncated
-Key: 344a6732dc5e5431 e98a4f7c323dc1c4 6b0275dc150e68e9
-Message: 25db0710fb165d316e7c32dd25648ed0
-MAC: 862f0e2b
-Test: VerifyTruncated
-Key: 20ae32c49bab3bf8 f86bb66173fb54d5 3e700868c46bc291
-Message: 582bd9c8c36ec815d0a9
-MAC: 0d62f14f
-Test: VerifyTruncated
-Key: 62232501b9e9c1b5 54209d7c075d2c31 73a2f289a84c49ce
-Message: adaf4bfffab79ffb60b94647faac634929c56e694052881881e60b1149b6
-MAC: a05674f2c905d153
-Test: Verify
diff --git a/src-cryptopp/TestVectors/dlies.txt b/src-cryptopp/TestVectors/dlies.txt
deleted file mode 100644
index 90dabe9..0000000
--- a/src-cryptopp/TestVectors/dlies.txt
+++ /dev/null
@@ -1,542 +0,0 @@
-AlgorithmType: AsymmetricCipher
-Name: DLIES(NoCofactorMultiplication, KDF2(SHA-1), XOR, HMAC(SHA-1), DHAES)
-Source: generated by Wei Dai using Crypto++ 5.1
-Comment: keys are encoded as DSA keys, with OID id-dsa
-KeyFormat: DER
-Comment: 1024-bit DLIES key
-PrivateKey: \
-    308201370201003082011706072a8648ce3804013082010a02818100ba3ed941\
-    10332be99b77a345da72a33146ca960498a6fc2e0e207fdeaadf69c3e5650df7\
-    3255475854900b75af7f6aac021de687a1c166ecb2ab6ec6b9da82ad4fb0f48a\
-    966a2b968406e18ba50947d7ee3bb1f13511cb4dde191f0ade1933d089c5e82a\
-    b8d283943d85ef0102e173abf2635aeac2f84cfc9ec6c4e8f3fbc4130281805d\
-    1f6ca0881995f4cdbbd1a2ed395198a3654b024c537e1707103fef556fb4e1f2\
-    b286fb992aa3ac2a4805bad7bfb556010ef343d0e0b3765955b7635ced4156a7\
-    d87a454b3515cb420370c5d284a3ebf71dd8f89a88e5a6ef0c8f856f0c99e844\
-    e2f4155c6941ca1ec2f7808170b9d5f931ad75617c267e4f63627479fde20902\
-    01030417021501fdc788cd93f07dba3af2de42ae5aa3ede219919d
-PublicKey: \
-    308201a23082011706072a8648ce3804013082010a02818100ba3ed94110332b\
-    e99b77a345da72a33146ca960498a6fc2e0e207fdeaadf69c3e5650df7325547\
-    5854900b75af7f6aac021de687a1c166ecb2ab6ec6b9da82ad4fb0f48a966a2b\
-    968406e18ba50947d7ee3bb1f13511cb4dde191f0ade1933d089c5e82ab8d283\
-    943d85ef0102e173abf2635aeac2f84cfc9ec6c4e8f3fbc4130281805d1f6ca0\
-    881995f4cdbbd1a2ed395198a3654b024c537e1707103fef556fb4e1f2b286fb\
-    992aa3ac2a4805bad7bfb556010ef343d0e0b3765955b7635ced4156a7d87a45\
-    4b3515cb420370c5d284a3ebf71dd8f89a88e5a6ef0c8f856f0c99e844e2f415\
-    5c6941ca1ec2f7808170b9d5f931ad75617c267e4f63627479fde20902010303\
-    81840002818029eaa5b193357c200e0d42f374d4c003c633c77f4778fe40ad0b\
-    d035b87ae5da4e74110ec2b15eefe1bd8b9357534c85328382946d314e15b79f\
-    7b854227012dfaac9bd862e73a5630e01327b36319765a3eb1434e108ef6421c\
-    659e3f9223966759611429b3c86ed9937563efbfad8bfedcfa92db3d7d2157fe\
-    2c8a33f08636
-Test: KeyPairValidAndConsistent
-Plaintext: 76
-Ciphertext: B11D906CC5A8E71CA8962A8CC0AC4CAFF2DA00DC130C370F42D11FCF5C37DE046EBC07C7D457CA351CE456A043695D14ED055ADAD2B58BE0DF992685EF8B0D21597A43D7B3D9634A077CB70C4590CD73C20FAAACBC5649413EECA0C7B3CBF469E531299398F61496C51FE9FFE48AE9FE6034F104EFC562DE9529C776B86ADD4025AD6B0C3687B012F92C7B9E82F794E4FBE247D644
-Test: DecryptMatch
-Plaintext: 89338CE80AFB62E9577A310E40311BB3F77F
-Ciphertext: 8A33B0E212DB8155CA796B472F55CD77267C9106229B6055141EA3AAAE42AD27249D90E70F892B0CDC80D29D3D586A5CA6FE67D4BB44C58B03496708F80681125DCEF983B7453B1E4F927438BD2E3E506C1951E9F19BA70F9B687012440CD75C0BB78BDCFAB22AF535D3E2670ABD1F4D44ED95F3360536612B1A7DF35E2A88F66BD6E8C813EB9DC89D93A85C9A0BA13E4862B91171B681E64A0750197C6467B22566BC640E11
-Test: DecryptMatch
-Plaintext: 0835455ABD53E6FB11ED9B0C00485D3C6845DB
-Ciphertext: A81181517BD270B0D921AF735052898932008DF00D501EDE0D2D564871D61A6A837776E8D7C7F9B0E5F9181C1FC68BC430F30ABB1A64D62B444C0AC5AAE588B4481AEF08B38E466155F10CA04C8202F281186016AE35212A2C7815A22DB2750ABD526D285BDBC598672BFB52E95CE33A0D3E5DCF4CF5F46224CFBB85297F3AB170C8B9478994E32D9A21A452B095D3D902E92C7E444A3307FDD7256FE49341142E5FF7A616475A
-Test: DecryptMatch
-Plaintext: 1EBED48EC47B6987091C52BC
-Ciphertext: 1DF446FF43AAAAAC8E3F7D70C912E2D45AB832BCA3D0FBD17AF864B9EA878C45B9E2902804171A739A0552BB7CE0CD46DC16343714CC9C2E71AE26304885EEEB242665814DD9E33C480ABA214755D5449F16CD8870D1AB3A8E64E45E463AB3F4D3031FA3ECD395B61B372602665FCF218D9C51E8C791FA1E5BCC2916EFBB482E1814632CDF0F1852EE4943D9652DAA4E1F3B22F17F57F51D52A0997BED5B04ED
-Test: DecryptMatch
-Plaintext: 65D8
-Ciphertext: 4385797FD38AD5DFBB4F613BC87637B0051501E57699A5880E235DB7A6994A04A1613D0C8E07E36AFD08F2E47D018951B22E7625DA647AA1A0791DB3B2FA794610892D9A3D3F173CF95277B4B1EB92579A229510B67E171CB5BBA8B3AA732047BA038816A30124AF1C4C57CA80E93AACCC8EC70BCF7867914E7DE2C403568F9778F8DBEAF08FDB9F48452054C9735DC84F012DF8FE17
-Test: DecryptMatch
-Plaintext: F86D8ED91E9934125DA6E9B4E97545C83A
-Ciphertext: 13B0AE03AB532D5E31C9384B4E726A9AC73583CFBB0643EC322E3D2D45D9358CAF745B0541C136E8AA2220C42CEC9E1ED174886475538732AA6D6417DA89FA411AEDEADCD9F15D25D27D0AE252F77E888470AE696D5805CE8CCCB40B45D4AA835E97C7BF2CD6A2B4FEC6FCF858606CE4695DCE998C518360068ED028FC882478BF96096D92C166899EB51778BC4B7DA1BA8C4B6CEBA1139F17CEE484EA104A0325420A3D56
-Test: DecryptMatch
-Comment: 1025-bit DLIES key
-PrivateKey: \
-    308201380201003082011806072a8648ce3804013082010b028181015dd79808\
-    07a15e557e3a39466eb2987828c536a871d4fc7f3723d52f8145a0d10d996295\
-    64aca54fd567c0509ef3c428fac68d916551e77a5ca0ed6d9f12cc96262b1f11\
-    49f398ef9f0f17fc0ed92bb917f890d1e6a4f62b91a7978d0aa1bf53b89805c1\
-    06ebebd0924cb99a4168a38dad65238236d4d166d38a3dfd5359ec5f02818100\
-    aeebcc0403d0af2abf1d1ca337594c3c14629b5438ea7e3f9b91ea97c0a2d068\
-    86ccb14ab25652a7eab3e0284f79e2147d6346c8b2a8f3bd2e5076b6cf89664b\
-    13158f88a4f9cc77cf878bfe076c95dc8bfc4868f3527b15c8d3cbc68550dfa9\
-    dc4c02e08375f5e849265ccd20b451c6d6b291c11b6a68b369c51efea9acf62f\
-    020102041702150f514282f489098f1df0c7be02ccbb3f23bed00376
-PublicKey: \
-    308201a43082011806072a8648ce3804013082010b028181015dd7980807a15e\
-    557e3a39466eb2987828c536a871d4fc7f3723d52f8145a0d10d99629564aca5\
-    4fd567c0509ef3c428fac68d916551e77a5ca0ed6d9f12cc96262b1f1149f398\
-    ef9f0f17fc0ed92bb917f890d1e6a4f62b91a7978d0aa1bf53b89805c106ebeb\
-    d0924cb99a4168a38dad65238236d4d166d38a3dfd5359ec5f02818100aeebcc\
-    0403d0af2abf1d1ca337594c3c14629b5438ea7e3f9b91ea97c0a2d06886ccb1\
-    4ab25652a7eab3e0284f79e2147d6346c8b2a8f3bd2e5076b6cf89664b13158f\
-    88a4f9cc77cf878bfe076c95dc8bfc4868f3527b15c8d3cbc68550dfa9dc4c02\
-    e08375f5e849265ccd20b451c6d6b291c11b6a68b369c51efea9acf62f020102\
-    038185000281810107143658b98a3725010d3631a3f4f7448cb967ac0118e4ca\
-    8fc8871eb4fb872d55c52d93a4f21eed98b6499db74315956a268f38a288958b\
-    f7c4d548662c668669d69375e0cb710ff3a1a9f43e49add1f7ae58b836b6444e\
-    419e40474c27066cb03aae8132e65f3fead0109307ab1c7f0254eb14e9d76639\
-    1a66ca1ba442b425
-Test: KeyPairValidAndConsistent
-Plaintext: 256F07E0D37D69BE542BD17FA98CE4CFC3DA849B
-Ciphertext: 01269CE30DE12430904CEC9D8B91A6D8860B4F8D37FCE7DBDCE8FA18AC521684F4C1CD5C38BF3B42C259033CD36A53F0376A0CDD801979CF1B76ADD72AFDD27830BD85B373C4D451B84926ABA34012EB98331F0B81CCF8E801ACCDEE88A35DF60EFADABA1F395250A15463203FDCCEDAB7DD6CD1271B38A5E0946F8D189B225E8A307D198AC5E4EB33BCF26A02C0C602AA14592AEA01452E4F8AE46E7A032BABD1BA8ACB0919F2EA18
-Test: DecryptMatch
-Plaintext: A992
-Ciphertext: 007822B0BDF45CC5B15102B5E21F7656C8896E98FAD6C2AF6CD55D0DB90B7A6B05E36D260C7A5C070526813290BCA722959B9B9BF00041B4B7F3E3EAFA9B5376A1E02944EDA55B99202601AE6D402D56617B56B28BAC1B405016053CDC78AB4D372B0D58E7380D50F1CD0E31B8CB77FD2F6BA3E7A436A5B35552B9974EA5AB30AC0C4989E34F5FD7D272417FF2094B97119BEB2C73C68B
-Test: DecryptMatch
-Plaintext: 1D20C118C894EFDC67DAC33E56179C5D262C83
-Ciphertext: 001587AFEC265C244875371B680521FF93F0B1196901A7D580785B62A257B1736C86D1D9E59A31E62F53B92B209B45A7952776C6AC839243B0BBF3A059E6CEE99B120BBD45922B4E813DDE0F5793A42B3AF2DDDAA357136A010519D884589A1F9912110020A8C16E9B91C753EB8842B3224FE9C9A22AE2B82251CFF7799E78885B0B67B27DAAC6A7B58013C31115C2B8C0C0176BC2A7B96A299CC75693B4F2138B2B4053CB5320D5
-Test: DecryptMatch
-Plaintext: 83BC82A4F7A4DFC96CD7798BAC52254CD6E9
-Ciphertext: 0085E83465997BFED9CAE63B04B0419578D0BD85B1A65285E5537F4367E5E7E11DD8762BD3335916A13B8CF9D5BC651E762458E9879363B06748BEA0CA86D32CBC4F1B0C0BF67E616B872A64F7356241CD052944F6594A570522EF2BCC53D90E3326D2ECFA036C46256D9B678C93BE5877749AF8FF8FEDB6E1E17B67C7B6C6098D0C71D5B2AB503AFD7739ABCC8DE67DAC056AFE99D8A107230BA88C282FB8FD46E9E9E2C6874A
-Test: DecryptMatch
-Plaintext: 157597899A950A32
-Ciphertext: 013623199FFDD0D4689A4C50A9FEA3C2250D0C73F209F33BF3EF13E6035976D6F3EAFBA3D83A3862E4B6DFC7581EA43B62F49BC85392B7EAB854F92DA8DD5921A6A4C42777E89004EB7E6D479BD028F758171C324168DC0814369C6BCD8471D9620C4E9BED785A220EF9C0DCF1201311A16C51341E0551043C6EAB45E04A81C9280633F58621D8D3492864FFF6A39EDC48450ABFE0C7AABAEB9A86CFFD
-Test: DecryptMatch
-Plaintext: CDE651
-Ciphertext: 0040308CCDAB105426597D84A64665200A93208713004DB38594C490F7B85F08ADB67BBE47B7FB7BBDA435A6B6A2CA0B4CBE0FDCBD4FF078FD052213CBCAA4580D1C7962A3505DAA9BEA2957718AB36D061E61B9DEB3D7DD726975C6E7FD79AADBF649F5ABE51AC384E967D3CDAFD9EAA18EEB69774961E439F54844FA22DA1B6892E86471DAE6F7E74CACC944123234826621C7634AE34E
-Test: DecryptMatch
-Comment: 1026-bit DLIES key
-PrivateKey: \
-    308201380201003082011806072a8648ce3804013082010b028181031e7d8589\
-    b9fa11e77204b8c1b27ad66b39863978d26912a65de306dcb32a0c7c96bb431d\
-    c4a14204a8f01a65b0fe56a4d016716914c21576f10d63dac5f49287636519ac\
-    f9be56c9f58eeb90ba3240d4cce26f647bfd86360cf0f6b8ff609ae2ef736558\
-    155a1498adf4e92dc90f34169123a5fcd8ddfc763c81658a4d08383702818101\
-    8f3ec2c4dcfd08f3b9025c60d93d6b359cc31cbc693489532ef1836e5995063e\
-    4b5da18ee250a10254780d32d87f2b52680b38b48a610abb7886b1ed62fa4943\
-    b1b28cd67cdf2b64fac775c85d19206a667137b23dfec31b06787b5c7fb04d71\
-    77b9b2ac0aad0a4c56fa7496e4879a0b4891d2fe6c6efe3b1e40b2c526841c1b\
-    020102041702151fa3003b00efad22ecc26c5115e6d036d13d3b2f7e
-PublicKey: \
-    308201a33082011806072a8648ce3804013082010b028181031e7d8589b9fa11\
-    e77204b8c1b27ad66b39863978d26912a65de306dcb32a0c7c96bb431dc4a142\
-    04a8f01a65b0fe56a4d016716914c21576f10d63dac5f49287636519acf9be56\
-    c9f58eeb90ba3240d4cce26f647bfd86360cf0f6b8ff609ae2ef736558155a14\
-    98adf4e92dc90f34169123a5fcd8ddfc763c81658a4d083837028181018f3ec2\
-    c4dcfd08f3b9025c60d93d6b359cc31cbc693489532ef1836e5995063e4b5da1\
-    8ee250a10254780d32d87f2b52680b38b48a610abb7886b1ed62fa4943b1b28c\
-    d67cdf2b64fac775c85d19206a667137b23dfec31b06787b5c7fb04d7177b9b2\
-    ac0aad0a4c56fa7496e4879a0b4891d2fe6c6efe3b1e40b2c526841c1b020102\
-    038184000281802c6360e6e3eba6da6efb5bce8d07a99e42949b68b3c2900583\
-    c2eb34498081c7212d8dc95a631d63edeafc625f8faf063e57b41d7b662ba9c1\
-    a99b3f2506fdf5e59116a0e93e7e94aab55691abae75eaac9637a713949360a4\
-    5f6908f23ba5503d4760bcd6f7abceb8351a66bb14fae05f03b1494e7ef4154c\
-    99a9cb6a9bfe12
-Test: KeyPairValidAndConsistent
-Plaintext: DEC85711F12C0D1D6C26797E91B0F39B37
-Ciphertext: 0215D75DD99B8A59DEA3FBA9B0F8A621EFFBFD831E9543749B04B495147CE9B56D519EE71BDF56D86FD1D9C1AE8BC1D7F29DC469A05221E4A31C726971731CF627E63FAB269FC92DEDDFF3319819373F299D55F4CABE08DADF29A7C60E9B4E2806899371B93A853F828EC4312D94CFDADFDEF2037D9C1FCE21A3E451006AC542E1BC36D3C33AEAC0D1666C26AA886F4C118836EDCA7C5A428E407C4ACD62A885C03202230FA6
-Test: DecryptMatch
-Plaintext: 0E665CD2CF75C2E6E24908448F29E9A198EF
-Ciphertext: 00A4583FF3A9451C6F8970E53D95EC74F41F709F5156B4FC9C698B1E43C7B5F3230D5417AED2C7447455009CE8381A30BE400EC15BBB1D7BCB9461E593D416421157541479FE1DCEAAE635728C68C58D260337A25D0CF9FA291D84E9E1DF4FF96822CA1F05CDD247AD14E5AFB231A0AF0F2E79FB9A0528CA2FE9431724C0AC9F0A2ABCED9A20EC1203DE2A835D90EA5FB1447EC722456B6F4C75D0645CEC5BECCE35B79FF3071A
-Test: DecryptMatch
-Plaintext: BE2A
-Ciphertext: 02823CB4ABD598FC5D36300306460886BBECFAE6F56E02708A96EFB27EF7E3D8F08442FC819EAB1DC35CC70A074984A149F209EB285C6064DDDBC7781CEF7358F384D592BFC75D346A6D97D8524CB35060A35E3B3145199F4968677FA22BB468DBFF63E3E366D778B3042D5858699D9FE5D6F53D0CB084E107111B572AE9B933B94FF37F2681DC50CDED2714668375DA90787CF0144F1B
-Test: DecryptMatch
-Plaintext: 20D57B7E074BFFF8F54AF3E69C9B632253B3B5C0
-Ciphertext: 00D18C24BF39CD527455737B4B214BADDE99B070181C1E4729CC7B6EAC82298417FFAE7BDA1F41A7D74D6969BF9CAF3A7F9EC9397DB75F5E53D0282F793D601A28E8B3CA8730CD9D7A0ABA338E2DB3EB5314321EEBA2F16C8072DA6AD9A887AA5AED0EC5EF3DC7E5726626511F8F23B0BA4D83BA358DF0951B07399C7515349E3DE2938D2AA53AB11A4D1C07213E091CD3FB6453AF7DFB6799D45DA44B060F7BF5ACA5A25B3892BBB6
-Test: DecryptMatch
-Plaintext: CC47935F7976
-Ciphertext: 02366250DE032B147BCEABCB576ED39F4993251D25010FAEEB41BDDA4301B890063247EEDC041539488E70B977091BF581033EE6EF75C224C8046EE3E7D2330383A30BA07FF33D10F07FF6E1EE20FA4D112CAB1BF457B50DC301DE5C6DBFACE227903379A41DC4D92517A547968D3F147D6435C3DF6A3D0D13635360716CBAC322EBD295593865C3A117050059FBEC83D112C5C3727377EBA7778A
-Test: DecryptMatch
-Plaintext: 3A370FAFD82869FEC40117
-Ciphertext: 026AE53843D3EFE36D8E52D9FD55DC6F0A0F51584BF81529914DAB6E380A6C9716828A7254307440B6A0CD16BF0D9D713939AE7F6C4D82D5AA70F33C9531E4071B9CB415C7622A23DBF4C81820BE04272874549F081B57D40B27BC1879BF134A2CF5D15203D326F9F97BCAC8606082A50A755CAE6FE2B72060EB1E0B72EF5AFAE8A823B3F0F91877C931CA64A06F3888DD4E2C823B3FCF529407255BE2AAD36A
-Test: DecryptMatch
-Comment: 1027-bit DLIES key
-PrivateKey: \
-    308201380201003082011806072a8648ce3804013082010b028181072c45d24e\
-    de76df2a03270413d8ab37645c8d6301ea76bb6cedea97142df7aa422b83043f\
-    8cfd8874dd684f47138433f5832c83c8c811d3c6d477b088006381ffb066402c\
-    951670f1927b1b67883451202f456bdb975d8bb2cde9b43c178ecfe788a0a0ab\
-    df2cbfc700fbb97ef71e52221bc054fbd3cf8c04175e4841a45b89cf02818103\
-    9622e9276f3b6f9501938209ec559bb22e46b180f53b5db676f54b8a16fbd521\
-    15c1821fc67ec43a6eb427a389c219fac19641e46408e9e36a3bd8440031c0ff\
-    d83320164a8b3878c93d8db3c41a289017a2b5edcbaec5d966f4da1e0bc767f3\
-    c4505055ef965fe3807ddcbf7b8f29110de02a7de9e7c6020baf2420d22dc4e7\
-    0201020417021506533f6f0886a8a44137598adb93aeee548c9af303
-PublicKey: \
-    308201a43082011806072a8648ce3804013082010b028181072c45d24ede76df\
-    2a03270413d8ab37645c8d6301ea76bb6cedea97142df7aa422b83043f8cfd88\
-    74dd684f47138433f5832c83c8c811d3c6d477b088006381ffb066402c951670\
-    f1927b1b67883451202f456bdb975d8bb2cde9b43c178ecfe788a0a0abdf2cbf\
-    c700fbb97ef71e52221bc054fbd3cf8c04175e4841a45b89cf028181039622e9\
-    276f3b6f9501938209ec559bb22e46b180f53b5db676f54b8a16fbd52115c182\
-    1fc67ec43a6eb427a389c219fac19641e46408e9e36a3bd8440031c0ffd83320\
-    164a8b3878c93d8db3c41a289017a2b5edcbaec5d966f4da1e0bc767f3c45050\
-    55ef965fe3807ddcbf7b8f29110de02a7de9e7c6020baf2420d22dc4e7020102\
-    03818500028181056bf5dcced97da0ddd23c1f1294f97431e323f9719fc9bed6\
-    352d08a88ceb13a06b559b8ef7dc04c5a04a761a9631aa1000f32f885fb0de56\
-    505524ae89462079631f438284c8e5225c021d7731087ec0aad11aba9bba95de\
-    03f5c99ac228861a3ee6a7b47617cec687a58255321694b923e63ed247e65ff1\
-    4c279bec5282bc1b
-Test: KeyPairValidAndConsistent
-Plaintext: D391B4F3B53EB9B035C3AB1E3C6E
-Ciphertext: 05D90F9892F6DD3DC3654130CAA312D2287D9E57607C301BE58607BB19FC78D67F2082C907FACA819A0D946AD16B46FE1E7264BE7D25D4EAB4F80D136E89EE7BC53B65CC1692581E3ABFA3C15482A6FEEB607AD1765897E67BCEDAED0E03FDE18E05330A99BEBB8710C77E7735CBB747EB507FE1EC04F239E964B509A4FEE8463478E28BF5338AE016DED9FE6B2DDBD3FDE467C45F0FA619E039FEF085D2F1544EA3CD
-Test: DecryptMatch
-Plaintext: 28
-Ciphertext: 066BBCB2D9E474A2C6CD514663BDA7AECA1F79136A00C1F9BDBAEDE344872093E67102307C96BF824999D86543121CC3D99B5CC4B511153A42E8A1569D063C27788E105858AF8EEB0766FAD9E0EDEFAEFFC733BE6824644CEE03AEE5FF15860CB3CBF4A46F95988D5E010FB844F944628043C830E575964EC36E2C38326C771085D796F2C22C0969E58665626415463A3CA1F56C357B
-Test: DecryptMatch
-Plaintext: D2C349F40A24230689EA15736C3AEFB1588A
-Ciphertext: 019A66A4ADFED556BBD1E58728A3B7A3631458DCF677BB155DA989827C2240A586783D8C5DB98E266C39FCDF6FB016BBB25D53A6B30F3BC9D1109CB908B54F1932335F3DFC2C80847D94D13C5933953EA1D212107AB42189536171069621403681CAAB2A13EEAEC847193FA6A0234FA8F107E2C1747425584EBB4F4D702E29A3A09580E25B34413208009F9643327A636DF622B7F0267D3169A64646F301C584F64066801383ED
-Test: DecryptMatch
-Plaintext: 85D75863811C6F574222B577
-Ciphertext: 02C6FFDB38965F3061C736E633B497192862677CB247A37C5FA1FEB4F2C021EA94C65AD9506C73C2E98ADF0F340DAFAD2BF6F6CC906C93655594D093D4B0F6867755013C25ED0AD75DC9A04DD0666E6340BDD6C1E748479F3D64129F76B5BAB37D26319287EC9D65CE9E2243D4CCC7BCEA4065623C4D388A7BD779941EE541DD29E070F7356ED1A1ADAE947D79F8421FA717F933F08CBB8B699B551F1EFF75B8F5
-Test: DecryptMatch
-Plaintext: DD07A91D32C26D3258AA4ABBD82E81
-Ciphertext: 05669E0777B003CC2EBE9BF3981160806A8B416A2DEAB4058497C5AF6A5C8F8D1ADF1225CC6FF7D292320E9C98CEDA144862FB4E32EE11AD9CC76A5C85FAE56A2567E6C9D168586F288CF4D525C94FF9F0ED6C3DBD08787768B90F8CD776520EFB920E61FB0E4463BE8D5AAE2683D31F392229A9554E0977BF25BCBBAAC7BB4FCCB009630D0203451A7A2AF847BA60AA0CE8C4D656DBED02353B92025925E1A0A6DF490F
-Test: DecryptMatch
-Plaintext: 0AA6B9FB846D1230F521F2624127
-Ciphertext: 01A9D56F1547728782D4F80BB0EBC8890BAEFE994900F41D56094F4734ABA2BB371060B2A69C6B7BC8944358519D141FC277E1195B3A78F7068731C3AF3C604A062A0D551397CD804168B7F400F786BC5CC3F912457AEAD56873AEF1A2378F34E953E240C20FFD7DDA229D4C020BDC68684A53C0AB3ACF9B44581353C60CE9854E3451645A604BB7AB3EB44088A07F59CE0FEB6454CC5A83BE5E939B317D4D8537CAFA
-Test: DecryptMatch
-Comment: 1028-bit DLIES key
-PrivateKey: \
-    308201380201003082011806072a8648ce3804013082010b0281810cb31a78b6\
-    6dafe2dd020483aec0cad421e4a3df2a81b827009dd74f5ef0468fc508477190\
-    f628033471ee2d56f913d45a94a8ad1582b29785a7ead06c88ce73812e653797\
-    921d3c4a8fba91c1423d6609e85625b2f41494546500237151958b13d1cc0f90\
-    586b0233290d052a18c2aa3ec2bdc32adb4676cbeb30309e330b823702818106\
-    598d3c5b36d7f16e810241d760656a10f251ef9540dc13804eeba7af782347e2\
-    8423b8c87b14019a38f716ab7c89ea2d4a54568ac1594bc2d3f56836446739c0\
-    97329bcbc90e9e2547dd48e0a11eb304f42b12d97a0a4a2a328011b8a8cac589\
-    e8e607c82c358119948682950c61551f615ee1956da33b65f598184f1985c11b\
-    020102041702151c0cefd22a713385985cacb5fe84cd40e724ce9587
-PublicKey: \
-    308201a43082011806072a8648ce3804013082010b0281810cb31a78b66dafe2\
-    dd020483aec0cad421e4a3df2a81b827009dd74f5ef0468fc508477190f62803\
-    3471ee2d56f913d45a94a8ad1582b29785a7ead06c88ce73812e653797921d3c\
-    4a8fba91c1423d6609e85625b2f41494546500237151958b13d1cc0f90586b02\
-    33290d052a18c2aa3ec2bdc32adb4676cbeb30309e330b823702818106598d3c\
-    5b36d7f16e810241d760656a10f251ef9540dc13804eeba7af782347e28423b8\
-    c87b14019a38f716ab7c89ea2d4a54568ac1594bc2d3f56836446739c097329b\
-    cbc90e9e2547dd48e0a11eb304f42b12d97a0a4a2a328011b8a8cac589e8e607\
-    c82c358119948682950c61551f615ee1956da33b65f598184f1985c11b020102\
-    038185000281810aacd80676c540b97f74d2a94c2f389795c9f696d2a1fa934d\
-    20e93d49d0099d9312552e6e310da5d97cef87c9a5a4c47e7acd195293b09adf\
-    db8e0cac95139446aba60fd625d17eaa102c7c26568b34891edb38226f949656\
-    44a9d52ff299cd007ab3dbc15779d4388431a66774ffaae5c6be04526b28c620\
-    ac97e8618cb09d46
-Test: KeyPairValidAndConsistent
-Plaintext:
-Ciphertext: 0194C64DEB9CB401573730A29359456F4E9528347ED80F24E5AEC4441E896E38047EF95AAD9AD7A25AED6CC89FD95CAAEF27F3C814C26FE43F6D65288D87E372A204D1A66C3BCF0346CE89E9D2D7646E90BACB9A85022ACFEF8903C72A663BAED9A346E1A6B2B2FCF70E239EE70A34385F8C76CDD121F6B190085BAB3300E6B811906CE38AC740FE88A3DF8DCA1C6DF73A03236D51
-Test: DecryptMatch
-Plaintext: 9498EB7300
-Ciphertext: 0A38C373F6A96D87528D2D55F6391A9E801252A65F622F36A130ABD140E1858024E31F247C3BC8C07D9500CBE7A8A3D6C0670AF0FA14D020DC54B201E657C233F8031DF990AE801077D4D3AD9B861F4C32D36FFB9E8BD5E2651169BC4560CC7FD02159929AA50882F8B4C8508BB98F6BE8A6A7C0E21A2A81AF781447ABEC85C170F3F6256C3B6C5E2D3A01BB5EA8B502D37561C06F1DA536BD59
-Test: DecryptMatch
-Plaintext: F07FFAC9794BD8D528F750D50C05
-Ciphertext: 03DAF7F6C2BEBF8D0B380EB71BD8BEE9D649AD7647DF6DE4CBCE00D0363E31F11E0DC0331409863E3C069EE3F975E7F623B55D7F4690C7419C5AD97EB52BBC0212D3FF0A83A031591A31481116B2CD232A9C86A20EA40BD13A53BB73E644A6C7DC1E6C767756E7235538E9D5B155B3173416E99F121E96E02034C6DB9129489A050740F603DEFF96EF1D99E7EB4A32083D0D946670B1AEF30E1E38D3F076D6BCB57255
-Test: DecryptMatch
-Plaintext: 85916A46E0965C69C4773C7DF9AF
-Ciphertext: 053D29F0878C68FF55FFC8E6E0E03044AE23B79588034F0236A49A5B6D00EFE8C564D2D29ACB61FE49C0E984EFC3A48A96EAF22AF3032D8D0FD3B3BB16A0157C161F2B3D3DF802FDD6B61899212F44493383DDDEA8B2463BACD0C5E1F4F9E4063DE5E52032E7DA8B79E04C5F03144CD710ADA74506CEC2D448BEA0F2B59AB63FCC443BBE920748E122DDD6123BDDAE484DBD02088817D999FDF80D5ED4B308AF4C2DCC
-Test: DecryptMatch
-Plaintext: EB632C72F563174E680961BCF26EC7
-Ciphertext: 0BBE666C02191F668A2DB000646A14385A8E9199BD887913BA587DA4C683535801853186673AD7C43EFA5B65902559BA5345EFA111E0514D461C1B1EFFAE58708EE6C17F1758EBED31F0B3206B0EC1B4BEB2EF911C589E25CDC3B0020C47119B5F33EA2FB7C332CA6B1FDA2F350A4CB0D6844637F2CCA71EFB036C7400957AE093B21BE90E30A8672847C9BA5266EBBF9D62341F67A4D09FFA196A817DD2F5EE1A9654EC
-Test: DecryptMatch
-Plaintext: 42B5D2DB89374231
-Ciphertext: 0085B6894D887B59393F9D7365411DF239BE1104FD86CC63A52C990A84FC4660FF9B60CF0641E44A8224C169A9FD1B35EAF78008E34F14B5311CB5D725096D9DE92F35BE6E71E3AC3E3B3D68BDD5351A5AF93F0B3BCDB00B9B126D8DA07E5F42107181F9580CCD0D6F086C94177FD48ECFAE3FCF2F26D64940D749E8A964275290A247AF700210500517BEB2175326F4CD3016AB175B352F9BD3289079
-Test: DecryptMatch
-Comment: 1029-bit DLIES key
-PrivateKey: \
-    308201380201003082011806072a8648ce3804013082010b0281811b02fc18f7\
-    ba0ae7f84ebcaf319294fa2bad52e47e1926267ad38b2f1b2566145bbc190cb5\
-    c39a8d6229eb238d3742bbd234b0f28eac92363a31ac96c5b08eaeb1963de59a\
-    3b2d0295c0266a7da4ca92b64f96c497f262e98df7f20ec55814b8441acfb639\
-    7abf9c4e42ab9bd6dda6ae180b12e12ead68672f9d56b98ee40e2b630281810d\
-    817e0c7bdd0573fc275e5798c94a7d15d6a9723f0c93133d69c5978d92b30a2d\
-    de0c865ae1cd46b114f591c69ba15de91a58794756491b1d18d64b62d8475758\
-    cb1ef2cd1d96814ae013353ed265495b27cb624bf93174c6fbf90762ac0a5c22\
-    0d67db1cbd5fce272155cdeb6ed3570c0589709756b43397ceab5cc7720715b1\
-    020103041702152c7c60166a1bfebb17831e65b8e1f61f3ef9ed9ff7
-PublicKey: \
-    308201a43082011806072a8648ce3804013082010b0281811b02fc18f7ba0ae7\
-    f84ebcaf319294fa2bad52e47e1926267ad38b2f1b2566145bbc190cb5c39a8d\
-    6229eb238d3742bbd234b0f28eac92363a31ac96c5b08eaeb1963de59a3b2d02\
-    95c0266a7da4ca92b64f96c497f262e98df7f20ec55814b8441acfb6397abf9c\
-    4e42ab9bd6dda6ae180b12e12ead68672f9d56b98ee40e2b630281810d817e0c\
-    7bdd0573fc275e5798c94a7d15d6a9723f0c93133d69c5978d92b30a2dde0c86\
-    5ae1cd46b114f591c69ba15de91a58794756491b1d18d64b62d8475758cb1ef2\
-    cd1d96814ae013353ed265495b27cb624bf93174c6fbf90762ac0a5c220d67db\
-    1cbd5fce272155cdeb6ed3570c0589709756b43397ceab5cc7720715b1020103\
-    038185000281810e6e9c7b74e33a1f4683ddfa35509c39a75b75c10f438efad0\
-    82caad08a7418990983150a9a5ffe3f8e340443dfbabf82fe060da487f94afdd\
-    1e713d491b983fc4fb69d4405a12e356808c5cf6a7bd397c1a5637ba8e168b7e\
-    d3f549a9f39f343e8fe3992706e782a1dde5c5e9e6a950f7d980835c1bc1742d\
-    c2840cb2e61086d7
-Test: KeyPairValidAndConsistent
-Plaintext: 03C57B87
-Ciphertext: 1440C6776914314A1DA161EAA41D52B283E2C0B487C801CEC33DCDB639F579F69D12FD029C994A311913EB6869C7A5659EE8BD9F5D7225BBB2EB77CF6F3D24A5E9866BD2CC50E593EC5CEBA4A96C59FE8B98B5EE2121E5892F2436F98B5C4E4A12077A1A64F1FCEB783D05453A657BB91909637063813CC00754402DE24F4AD6C0D9D4C15B7F4E485AF3538D391CF5993A59F6D1FE6C76E2A7
-Test: DecryptMatch
-Plaintext: C5598C0FE0D90B10E7125079E2EDA32E531C2EBF
-Ciphertext: 129FC863B70BB82C1C59EE2DA37FF3909F1DAB4B55D9727EE0CA3311BE5797F93446ACA0409CBFA848A90756D2598B6ECA56F6341C6E9F716A62380CB5D47400CF392A5441DA5AD2C1D066F894942837EA7B6237D7BE2E94FFE0A106148C2B7B9AF624242A945BF3B217D89FDBB070FA5940C1C899AD83AF1F865DEADFF0F4E48A7E00BF7AC5625F6E32F8B01394AE90284AFA061AF6DD61ECA1B8FA77CBC172573A9938332D7AEE41
-Test: DecryptMatch
-Plaintext:
-Ciphertext: 068117F2BCF29C72CDA3F4560A2165B7DB7C29314EFEC8D110425D5AA02F35C0F9A2304A0554C097944EF3A615BD70F5461E6549C319AC1207B100FEF022410C46284CEA9CA103685A18EC944DEA0BAE8E06D2489A3E2D1D9B255F192677664CA6FF44130C28CDE1FD437E85396503DFF305BA2D64E8BF9C75B00CA1595A1AED2C60865C0DF03F408EF95517E70552B2D5A8C190DC
-Test: DecryptMatch
-Plaintext: 8DDB5FC737283E5B
-Ciphertext: 0B3E0CE51E1D3AE240EB34787DB5D49D6786B3BCC29C37EF8B9155F342C4D226CE1D07F7BAE09DFF7E8CD89915E1312F43540A26F03D918BF56B07E6D07A96870362643092F24FBCC6A2DE62F637B5F5F807E430DAF9B7AFE1890143591BBA035538FB419BE4CBADFCED5EB8BE2471B39CFCFBB2BA854C9E0F52E67524ECB80F9FBB3173D2A18C9F4C43F4E20866428A9256AB8AD199BA0BAD55A18896
-Test: DecryptMatch
-Plaintext:
-Ciphertext: 197D4DC43B0716191F926DC806A1B707ABD6684735144AFE07E0EAEEDD9BB3C89B9D0076859DACE6FFF9E2685592ECB010909910DCA50D2FB1B15EB9B9CFF4F71250D807EDDC2EFB2033BDFD93FD10E117683E3E4E8A5D3308572D4852954BD51251279A79092E3DCB95F1FCEC8310931933F47998DDB61438478CD80864F08D3370C863BE6E7E1CD22E38BC512D9A160478814057
-Test: DecryptMatch
-Plaintext: 53AC983CEE599A17261C53
-Ciphertext: 0E31EAACA9E8A86ACEFD1CB817869F48EAB342EAD0DAFE17B848CA9CB72B92567987B929F655B8D601EB1384BE380C8E4BA8B4E274F724F02FC5C00479C308813A3963E2D8AC88ACE92AEB00AB024A4EC5560857310E03009752B86793B356DA344B4AEF01F3ACCD9CBFBE399D0016260C006FCA5443359EA1E012D43921B8D2B8CFD31B94972ECE9C0031420238C76514635E9B40F17D9AF25A1009DB75E4C0
-Test: DecryptMatch
-Comment: 1030-bit DLIES key
-PrivateKey: \
-    308201380201003082011806072a8648ce3804013082010b02818127b35992d0\
-    8edcc7aaa6ca70365afa8ffacb4a9bef0ea348e27414c2100b81827fbf1abd3f\
-    14150bb5d85ab13b2aca21304365f150511a68c90f4a4eac0bfef0c548e3076b\
-    30a24929c4482f42f2b03ce122b3a251e685a3fe3dbb539932bf8d2b117b1b08\
-    dbceb78c84966270657164fe6f20c6d27dca270dd4417f843fdfb23302818113\
-    d9acc968476e63d55365381b2d7d47fd65a54df78751a4713a0a610805c0c13f\
-    df8d5e9f8a0a85daec2d589d9565109821b2f8a8288d346487a5275605ff7862\
-    a47183b598512494e22417a179581e709159d128f342d1ff1edda9cc995fc695\
-    88bd8d846de75bc6424b313832b8b27f379063693ee51386ea20bfc21fefd919\
-    0201030417021513560b35fe90d01a106b1e6ccba4cec953421d48cb
-PublicKey: \
-    308201a43082011806072a8648ce3804013082010b02818127b35992d08edcc7\
-    aaa6ca70365afa8ffacb4a9bef0ea348e27414c2100b81827fbf1abd3f14150b\
-    b5d85ab13b2aca21304365f150511a68c90f4a4eac0bfef0c548e3076b30a249\
-    29c4482f42f2b03ce122b3a251e685a3fe3dbb539932bf8d2b117b1b08dbceb7\
-    8c84966270657164fe6f20c6d27dca270dd4417f843fdfb23302818113d9acc9\
-    68476e63d55365381b2d7d47fd65a54df78751a4713a0a610805c0c13fdf8d5e\
-    9f8a0a85daec2d589d9565109821b2f8a8288d346487a5275605ff7862a47183\
-    b598512494e22417a179581e709159d128f342d1ff1edda9cc995fc69588bd8d\
-    846de75bc6424b313832b8b27f379063693ee51386ea20bfc21fefd919020103\
-    0381850002818117f468e3d38f1198556447bc16fb6c6ffe98b31f9042e59602\
-    c71286db3e0780601e47372e6eb4a570f2059a7a87ee4471eaf94bcf23e34017\
-    5a377333d39dc64b7eaefcc065bef4a92d0d10acbba71082852c2014d9d3eb2f\
-    8583947c2cbf52865730d2b9511ed8a68367e4d89eca4589b836889cd424485c\
-    9305bc0386b16619
-Test: KeyPairValidAndConsistent
-Plaintext: 4424
-Ciphertext: 0C570D0317363DB43DEB295D49A3BC937116F2ECAC9226415952CE634679272B7041A4B806164F12E87A0050AC2D60D393F845965CB3A56FF0CF28D31CFA0285015452C59949E3D96C5C6D1DBE38F6EE98E2C93357E6C036053DF920C7CA5E2EA1617AE44434A347FCE426C55295172ADDE9CAC3AEF2C6D6AB2C8F0FAB1B146FF1A10D5EC2191C99D6418519443EEE2A198BFD159BCC63
-Test: DecryptMatch
-Plaintext: 5092C5D9FA398EE31AE27C97
-Ciphertext: 196476CA0E6622569F233780EE0C449C2CAAD3819B348D01B4DE5425EBCDEAEA739C6D9CCACE4DDF06520E83C94D237AFD46A4EFED635112CC78534E2FA6046ED6C06806EA8F4B9F3FC3F87DC55F63B9E14F9ABD82E9CC80A298DB281C9F690391F5B064880CF35C5A0BC7537DE9F65DEB2467FAB5CE8F41529A5B06BFA6B587ED661849BC7388277AE7F7E5EFA3F2526E503ECB106B718275BF32C4F83278CA30
-Test: DecryptMatch
-Plaintext: 89BB350DC43CB3
-Ciphertext: 13844D63B45821E8704A9C1F6E9166B5EB7FD98DE5369E5DBB9DECE506EE467294282B5B174EF2F81B6766A3616AC5A974F06D9C47163C69668F4C1C78F8A6716A4EC28A6AE25F615A838B9C747EE857AA2AC92DEDC575AC568A78E8A86EF78D55EDB88707F7B6D558E8A760095BE8BCD066FC57396E67C9D8654245676DAE9FC4BC9D578496CA450B35E179410A5DB443C2026FFF0E5F7E54821E39
-Test: DecryptMatch
-Plaintext:
-Ciphertext: 040E084ED4A1C135C8867BAFF219A0092855E1E9FC96F38277E16B96986FDEABDC22F3B02CC53B655369DDE3356EA6FE49B77C8EAA49815CD5B1DFDC6E7D0AF6AA985483345BBA8A251F1EC7658DF708C8EED8AB6B953393C03BA2EEDB8B6391D921C9EAD2AA61DBE724B15C9C664EC4EFF83A535E46BF768FD519B043DBF46A36FA03921224281A826F6F43DEA6DF38749D600317
-Test: DecryptMatch
-Plaintext: BB296D4FF04AE0171F1F24AE
-Ciphertext: 0AA9A85958D9F1BB06E3DB48DACC842534915A7E42715057BD33523EE756F62AD973E37128BB8031358A1DC583F40598B74F079AD667C037D4BE89938233BFE1C167EFE764724F97F2EA42479FB455B1166AAB26A43440867ACE77472CCB13643D5BC9532F68C5368825BF225DF49E2D3BD023447A795AFFE927A796C70E5D6359537A9CE2B4B9323D7FE208540CC32447940ACD91F4718FC7A7CAD45A524B6DA6
-Test: DecryptMatch
-Plaintext: 87A2C6B33856C6A096EE
-Ciphertext: 12D17080AD0E7FD426E02B6A90736AB4B566F31E937B2D3E642D663D6ABFEB903FC9C4763AE492191E0C15B264CEF321DC8747C590F751A9BA2825D9250F72BA85EEB45B1F1D7B2BA972455DCE7DAE6CBD7B5BFBFB88FCEF52910F9B28D3DCD6BB5D479BBFC73896C3D1C44AB387989DE4D77855F6B8C7A8C12969D51DC6B10BA15C2B19E91A55BD5542853EC6F8F13260E8774C706958B1C9866114FADA1D
-Test: DecryptMatch
-Comment: 1031-bit DLIES key
-PrivateKey: \
-    308201380201003082011806072a8648ce3804013082010b0281814ff13b3664\
-    f5c527c36120159d9b9a82054f9ade6866b379e13d03e76cb63b25731132d5f7\
-    ec6e95186ed83c793b5d63189dac30c6e6a655605f885fe73d2ae5433c80e660\
-    c5d985ad6d12783082861829355c25cd7a7ff84b3033cb7fb530a7baa4000830\
-    2c1eb24b866cf467f570e782bceee66e15585f70b0633965c870530302818127\
-    f89d9b327ae293e1b0900acecdcd4102a7cd6f343359bcf09e81f3b65b1d92b9\
-    88996afbf6374a8c376c1e3c9daeb18c4ed6186373532ab02fc42ff39e9572a1\
-    9e40733062ecc2d6b6893c1841430c149aae12e6bd3ffc259819e5bfda9853dd\
-    52000418160f5925c3367a33fab873c15e7773370aac2fb858319cb2e4382981\
-    020103041702150910a291c216ca5f944c5f3eaaa1535c3b8a1f0b15
-PublicKey: \
-    308201a43082011806072a8648ce3804013082010b0281814ff13b3664f5c527\
-    c36120159d9b9a82054f9ade6866b379e13d03e76cb63b25731132d5f7ec6e95\
-    186ed83c793b5d63189dac30c6e6a655605f885fe73d2ae5433c80e660c5d985\
-    ad6d12783082861829355c25cd7a7ff84b3033cb7fb530a7baa40008302c1eb2\
-    4b866cf467f570e782bceee66e15585f70b0633965c870530302818127f89d9b\
-    327ae293e1b0900acecdcd4102a7cd6f343359bcf09e81f3b65b1d92b988996a\
-    fbf6374a8c376c1e3c9daeb18c4ed6186373532ab02fc42ff39e9572a19e4073\
-    3062ecc2d6b6893c1841430c149aae12e6bd3ffc259819e5bfda9853dd520004\
-    18160f5925c3367a33fab873c15e7773370aac2fb858319cb2e4382981020103\
-    038185000281812e9a62ec280cf5ee7d09e5e5675b67a4c325c7565a1129c079\
-    095d0f078e7b8a5b3c947c21c022f01c0b9267a45fdd9f267e63c7f674a02d39\
-    6fc59a960d7991d2e3552d01deb2784f26ec4c9355c0df0497271cb583d157db\
-    90b0634180578ac85005143dda75a33a127df96639e275cee8fe9c02db62d2ed\
-    879f3caae11d6e00
-Test: KeyPairValidAndConsistent
-Plaintext: 1FBE21CDBCEBA28625584CB1EA0D9627A919A6CA
-Ciphertext: 2CFC251CB2A397880EFD0077D9CEF817A6D69EB6278CD82998C5988DD18D6ED15FC8CAFD1611DE58BB46BA8A87013C7BBD4A8DCFC454F13DB282BBBD4E1594E6AF17AB6219E91D7354EB88515007B58BF0D8FF4BD4C387FF6E02BF81455803E6A936F25245863F1580F00ADFA4BDE052BEC72739B88042CF99480AB6F4489F9C8B9319828A000FDDC4D1A6E49868E3B39DBF7DCDADD9B882B755E330C762FCC023EBBCBD0330D28DB6
-Test: DecryptMatch
-Plaintext: DCF33FA5BEDFDD93DA
-Ciphertext: 14BA927F10262B134AC43F6787EAEC3546C17EFE3F6D54AD2A245A0EE732B749B7312521372F21716E1DE29AF8FB329C25ADEDE2DADE3A455235DAC6C1F347C2A052893DBA6511C3760384935D68C7808D23CB194E6A19F579782B22C3D8880736BECE89FD75E7E69022E9B2500E5A044105B832C9BFC5F18A807889B401E61A9888276B31FD299D604AEA85091578D41E5B36D66C4510F4B147C5E59615
-Test: DecryptMatch
-Plaintext: 217B0E
-Ciphertext: 37B50EFF3A3FDA419988CA44CCA3AE95F465A18C89CE2DF025F565DAF0F833E198DAEEB46517FBDE47AA3D5DC5039B873A31D0DEE1EBC63F3E97C0A63CC05A8F877FE70EB7F6198C088FF35C1C369616D3EACB013F295F764146A5AAA2D21CD36B9DA4490CF1B37D379ED7713B955C3B0581650B5C7F4F5B8F45B89B94DC364D3340414B491C29AAF2E197AD6F59B0DD687F2E60F8826169
-Test: DecryptMatch
-Plaintext: 36DA002D110CD632A9969DC42409B478A3AD3B
-Ciphertext: 37126F749ACDF2B6BF667DE9635CC0BBD61753B30931C847B612936C1AE122D6F0E409B4E9454852540C5FD8DD3DA8BA4026FBE8CC8449CA0071409DB47165907202DC078E5A8F6B0E9C8D3497A2D02F53DC3A47389C1B3778EDDEE980055BC4B7EBAC0B95C0CC4783A4B202CE127FA0D7B65B252492A1847FAA9D1ABE893376917BCD46DB4FFADC06C880AD848683B874F7CDFBF0E4BD87AFC39303C512C44EF58B510702C1129C
-Test: DecryptMatch
-Plaintext: FAFD
-Ciphertext: 0F63F22B7817F2449388E0422C6122200D76BA8D4CEDE63DE950ED26768E6779BA0A238C8C3F2CC5C87C7926F1247A7067E27245423EEEFABCDB606976BA2FD9977320F903733FB57D02620682820B1AEE165604410157C5ECFAB7090EE83638A99E4CA36CA0879D3C14856A3417690A52F14F33CC50FE44503FC47F2D90C096C03F62A85D88891E9568911AF61DF916C3677DCF152FD3
-Test: DecryptMatch
-Plaintext: 9E9145E890FEEADC706AE1
-Ciphertext: 0B60A14F132D21E47E2FA20633DE43694EC0394115DB297C1B68D1A7EE7722B6AF5D149A2EF5D0EA05761C0FABCF8C0862AF320E9D273AE743717F78A46F15B640C87F4AD0C25865EA3453B0FB59D997E41A31B6C1669F14639E2F70F7D4324B8729A26C8869D97B432740F7CE28A74EFFC82AD7EF172A02AC678C13235BA2C6EF79143D189838E1F101385BD7098AE3B5B78A80964D5C0A3D7DBA7FD7328BE8
-Test: DecryptMatch
-Comment: 1032-bit DLIES key
-PrivateKey: \
-    308201390201003082011906072a8648ce3804013082010c02818200b98458f5\
-    ada1f23f4ae8a3a519c27fde91efd1f201e386aa6119749aaf6ed389079ae49c\
-    c76317f81f14164673e8f0be00edd4db4792d446e7bf84b30200626b442af3f7\
-    c9a6ee6fb0f95807e62fa5b2d171a4b326cd60c82b20d63ef00b408ea337f50f\
-    a51f07549dc4f9a660842724566b94d6e2a58980d2d20281ce6c327643028181\
-    5cc22c7ad6d0f91fa57451d28ce13fef48f7e8f900f1c355308cba4d57b769c4\
-    83cd724e63b18bfc0f8a0b2339f4785f0076ea6da3c96a2373dfc25981003135\
-    a21579fbe4d37737d87cac03f317d2d968b8d2599366b06415906b1f7805a047\
-    519bfa87d28f83aa4ee27cd3304213922b35ca6b7152c4c069690140e736193b\
-    210201030417021534999c0e7b17cc3c110cff71571e8d4708c3122a1a
-PublicKey: \
-    308201a53082011906072a8648ce3804013082010c02818200b98458f5ada1f2\
-    3f4ae8a3a519c27fde91efd1f201e386aa6119749aaf6ed389079ae49cc76317\
-    f81f14164673e8f0be00edd4db4792d446e7bf84b30200626b442af3f7c9a6ee\
-    6fb0f95807e62fa5b2d171a4b326cd60c82b20d63ef00b408ea337f50fa51f07\
-    549dc4f9a660842724566b94d6e2a58980d2d20281ce6c3276430281815cc22c\
-    7ad6d0f91fa57451d28ce13fef48f7e8f900f1c355308cba4d57b769c483cd72\
-    4e63b18bfc0f8a0b2339f4785f0076ea6da3c96a2373dfc25981003135a21579\
-    fbe4d37737d87cac03f317d2d968b8d2599366b06415906b1f7805a047519bfa\
-    87d28f83aa4ee27cd3304213922b35ca6b7152c4c069690140e736193b210201\
-    03038185000281813c42dc88e1e15b9a737bfd64b96a7448983da5242a6cf43e\
-    1cc72e8886db723b681c291f772bfe33de5ba735404581c839341969a691c199\
-    229c2849c1c8c80396837c71d711ce34129d3006aef9d16cac504543c6e570bc\
-    3d730d5cd35d8a375edacf591b2837f9a705d63dd62754365d13c103961161dd\
-    984d89792985ad688f
-Test: KeyPairValidAndConsistent
-Plaintext: 23
-Ciphertext: 0BE692E3384A784AD01D80A65D22B48449AFC0281B36085B0D8FA03574B4BAD05F754D6FFB8E3F4B4BFE60FC7EA2BC1F11253505C753BEFB1D3BDA0084E6CC1FD82454A601F1C0ADB52B3FFC4895D36542FE0139465B490102C7B6A75C9273B737536DD122CC8C3EA0F32900C82C45B0FEE97D995AC5B4345A8899DD6888D1E814BB5A1141A86E636D31FA05689ABA512DE869D12BB4
-Test: DecryptMatch
-Plaintext: 4F571384FD52A9041C8F3094
-Ciphertext: AB7942750662F0FA422F4628B558938545FBF7C749995B4D5B32BBF392292FD1B4EF02E5A2EEF6874BCA9F0D4CBCB92D684CDA821829850BD4CAE110E78E42909CF069B54B4BC7D742E113E57C85BCF54AA5CAE1005516BADA834A857315DD6C3DEF4AEBBBF6CB4AE217107E16E83F884B2933EE618F22C45B78092B2EFF7D5C33DB7D89FED4E134921DFD9DA999FB8AFBFD094D77BD887D2C86AACC401A621905
-Test: DecryptMatch
-Plaintext: E421A467654B3B88C93C8E5384FE2B85D4E340
-Ciphertext: 7485B8E5360BC1383FCE1C586E126D5DE89FF1CA7CC8146C37A1E6582A564C4588984915CCE9635EA6ED434C80CAE138FBC1EB15D16B294AC1E59CDE544E4DFBF276D30A7F51461C2B7E7F076222DE6AC534DC47E015BA85062694FD78DC37E9460C10FDAF2C61FC7EE0669E99793A657543B881B50B0D3916E395A959EF55B02DB8E7B4C5B5B653AE2D11CCE639342C8C77C667625116D9E6B6C6AE822CDDF2AA503EC3FAD53D80
-Test: DecryptMatch
-Plaintext: 3D6C941B1F03E5C9A4
-Ciphertext: 684AA8D2AD35D2775BC30794A078CFC931096A37D472FE511F72B03B33E87AB1E7B958C3447AF6285AC379379E0D1F1BEC535E4032E186573742A75C1B42BDC52F679DCA13B2B9E67CC73461084DE1777FAAED93C7C1E4A6B19473EDF6A57CD88C076574A356748D501A05AF66A136E908993A0A70538FEB03109C62A41540EB4E166596887B4860E3AB0BF9C1AFD02C67D4BFF28BAECD31D1CEB207A245
-Test: DecryptMatch
-Plaintext:
-Ciphertext: 111C252A9E64FB777F09AF6AEF9C4210B9644C3A66D5528C631D5348E30B146A6225783DE1FB796DBAB3A901E37818B5AE49BF1F8CC0A6C8909D2DB06D651CB08009A25E13A89653DBBA5959674E37BD72039D4E7BFFB3A2395DF8C36164C3FA71334DBFF2FACA090F1C349BF68443838A0D893B9B498D3B6CC86646F935D5ADED81967A387506688B6478492129534F3A651C9985
-Test: DecryptMatch
-Plaintext: DE5F0B92C45A0C1530
-Ciphertext: AE6BAEF52B43EE88AEA7796D667D044887407ED07E7618358243A0108514FE9793EB28EB42B4BA2F28F6687FE7973FB8DBF825541010F1BC1FC7350CBEC0B055C0C71FF2C4D2634582C966C1CFD3449AF8AC956BEC3EE797F7E81E589450EA13C1A8C99116E05E49F4BB87C9B95EFDBEB35B21C36711CEC8A1ECF3E4F194251563F88C056749B835FC19A7CD560FEC785207DD14D43C6104D83BB05F1DA1
-Test: DecryptMatch
-Comment: 1536-bit DLIES key
-PrivateKey: \
-    308201bb0201003082019706072a8648ce3804013082018a0281c100f9566c8d\
-    687a5ead7c780617d3ed37b4afc46582e9fc0d75ae217fb506f5c2024c2a0e6d\
-    7e042544235b4de63047a33940d772721e895f9d4e92790bef0d3668ec7f6cad\
-    e7f9b18049b33efa773c83e97b35ef7ebf18934b48dd4700a48c1f76ffc20684\
-    521bad52834086ccdf1e3d5c9128fef52f6a9444d8e9944d49e5ab411f46b63b\
-    290b7fdc8f48fab24c2059510bb7247e0930d5043802522d67f2b69ac18b82bd\
-    0229e53bf6769fe83c469188d600e6afa6686bd9725afb9ce39bbd9f0281c07c\
-    ab3646b43d2f56be3c030be9f69bda57e232c174fe06bad710bfda837ae10126\
-    150736bf0212a211ada6f31823d19ca06bb9390f44afcea7493c85f7869b3476\
-    3fb656f3fcd8c024d99f7d3b9e41f4bd9af7bf5f8c49a5a46ea38052460fbb7f\
-    e10342290dd6a941a043666f8f1eae48947f7a97b54a226c74ca26a4f2d5a08f\
-    a35b1d9485bfee47a47d5926102ca885db923f04986a821c012916b3f95b4d60\
-    c5c15e8114f29dfb3b4ff41e2348c46b007357d33435ecb92d7dce71cddecf02\
-    0102041b02191d78b208d09b23e859be7e79ca76e612d8e5ac75a5ca02c506
-PublicKey: \
-    308202623082019706072a8648ce3804013082018a0281c100f9566c8d687a5e\
-    ad7c780617d3ed37b4afc46582e9fc0d75ae217fb506f5c2024c2a0e6d7e0425\
-    44235b4de63047a33940d772721e895f9d4e92790bef0d3668ec7f6cade7f9b1\
-    8049b33efa773c83e97b35ef7ebf18934b48dd4700a48c1f76ffc20684521bad\
-    52834086ccdf1e3d5c9128fef52f6a9444d8e9944d49e5ab411f46b63b290b7f\
-    dc8f48fab24c2059510bb7247e0930d5043802522d67f2b69ac18b82bd0229e5\
-    3bf6769fe83c469188d600e6afa6686bd9725afb9ce39bbd9f0281c07cab3646\
-    b43d2f56be3c030be9f69bda57e232c174fe06bad710bfda837ae10126150736\
-    bf0212a211ada6f31823d19ca06bb9390f44afcea7493c85f7869b34763fb656\
-    f3fcd8c024d99f7d3b9e41f4bd9af7bf5f8c49a5a46ea38052460fbb7fe10342\
-    290dd6a941a043666f8f1eae48947f7a97b54a226c74ca26a4f2d5a08fa35b1d\
-    9485bfee47a47d5926102ca885db923f04986a821c012916b3f95b4d60c5c15e\
-    8114f29dfb3b4ff41e2348c46b007357d33435ecb92d7dce71cddecf02010203\
-    81c4000281c07a5b4ddf442b2cd7fd925be84f2ef4c4032d61c5a55c5949b30a\
-    765cd4d5d4566af37ffa7f814f51bdd71c3e5575c6fd0203f14d3ded4e14baa8\
-    2747a6437d35ebc81e2035bfb0e04087fb5fe449163377d47b045b680b394962\
-    20b3138e85f6d24e06f955ec7a1b785ce34c2926cda441bfc86ba2f44a489a41\
-    ee1740ab5ec3daf6d2c598e1d143654c05ce61792b47ac92c8d6ba0711419e41\
-    221743b768eeec2601f66d277fba154a62dc996537a0caccfa313cc9fde0194c\
-    05493aab1f07
-Test: KeyPairValidAndConsistent
-Plaintext: 9302C420D137C310
-Ciphertext: EEF64A81C754B2EF543A19549AC0FF3F44E4B548284ABAA1E5F1EB704B0D246749D7F1CEF7B20A5226384DBE8FB596101591BE2B53E9909EE3723CB70A385FC2DAF6CE15629EBA21E7F26223B0A2428D8931CBB4F1B281E318A540F38A809C8BAD92D10FDD63305DBBE972E6CB973FC4F2FDF0BB9CC37FC42C7AD76E8DE3FA91E5E79B09796652BFCD62A28A59D9A97759032A0A78E0E1B081DF212A15AA44E35DE9E291EDA499DDB631486C029D56052246C9E37FF24EE9E86465B3B55BC4BAD77B9AC873B6F36EA65892B202E320756540009C81B9C6747BDAF40E
-Test: DecryptMatch
-Plaintext: 9FD4F26B7317BBD1B235
-Ciphertext: 514DB5C63AD9707197B4F0B2A30CDA18369B963E62F7ABBA1E030E08D3DE4E6C17D4BD7CB8097C2E641FBB0AED6A9FE7FBEAAC1C6B85BB3570D0E86FF6105B9F8C9B562A4EFE4AE3AECA26978C514129006D22C108B1C8A0FA55864EED3D3F81643AAFE36DF1CBC3B4E1B1AD6D5E0612214938A55114589B97286A7EE5B04E39254696DA91453027F07346984423FE2784DEA9375C236E6640504B5BCAC32062836E5BE1695CE73285CD77CE9717FA38E080C28C2959D9E32A589C04ACE5E52970ED49BE34703AD6B9F024DDA176C631EF5EE76833B427E233A5DAEC4328
-Test: DecryptMatch
-Plaintext: 337D8BDD32
-Ciphertext: A4EFBF2151DAC683F0C51D60A647151A1EA0C0DAA8CF3497D7116439E6AEEC62A36D06F89AB2F1886FB9F62403E3DA8D6F67F66DA2436EE20FFBADD698DF87EF40470749C0BE0414A7AE4D2755459F8A17F6C7D8920236400313D7846532C391A0A4D99C26C556772E2D3C74E0119C4CEC7EF224488BFEBA017A910E5FD167B4486E436F7481DC5A46F3FF0536193C75A857DC53C5242C11AB911BD21926462C5060BB89F71D99FDEAD3D16B1E21E0D0791B59ED0F49871F744B13F23EF5028C238B895532F90B0ABE9912644EC079604939A0CF519BA9D185
-Test: DecryptMatch
-Plaintext: 25549A5AE844ABEAA694E3F6
-Ciphertext: E2B30DD7781DB7EE7B2EE3FEB77F7360A6069396D8BF1DFD85D5429DA5A156677679085D612D0FCCA0979C97E924E77C43D3702940DBB556A5BB6EA33D650E078B1CDF8E5F76DA6591D0AFF4389A3A982A9AC581BFF393B35D36894E407AA56B493C2F7C4CBB75AEC72394AC4F8A99089702F3AEDB2FC7486F5CD01691C3C8F8FF3E951CEC70A4E172B763124BE1D9F96DBBFBA8FA0EBD1A71067A20F68DA6AAAE849880DD7F88901DF051715E240BF0F5B49EEFE35B9B0ED2B69757111080DCE2E2A933CFBE8FB9E6E9A2C2C75E0A4228D06689796AB919EF80405CBF648137
-Test: DecryptMatch
-Plaintext: 5E61EB24085019F4A76893517C0A13
-Ciphertext: B13E45F9288FD2C5C0FEE230D1A09DE376ADADB5A4330F33BEC04C6F14C4A1CF3789B976F402F11611AB8345B2EB1069CFEE1E2F482A02A0ED9A3B9D94EB78C7BD7222ECD48A598E34D1F0B6205331CB20E0B2C6C146FB29CC11BAD5CA06BCA3EE39DD536FF330663A817ADECCC284B92F6AE3EB75B00316992BEF8A955EBB4DDE2CEF504E9298AC243C00FDB64B6AE96FD7B2135E6BCEFA7CBFEE135A650AA3D8CD095D1C9156232DCFE1904BC4CCE58B455CEFDDEC1D201B07ED4F999D6281AE21C2008525DB24BEA2D9FDAC1BFEADC3E6E6B1181F1A55A75976C565BC28F177CF02
-Test: DecryptMatch
-Plaintext: 87
-Ciphertext: 174E5CFE167D4F6FB9A8FCC0FBEFC12864745900F5A18EA92282C8B6689EF53BBB87B30FC21DB101D93E9FFCED05538EDAB59F9FA07FB176407651DD0C4CD8269B1DBB70F24C8177EC6E16294CF5E87A3070A077B1CE84B612C3E3B1D4FD60D732C4D2CAEF5AC442A358AD0F323E60F58FC8B29894F3EAD3AE0DB8FD08BEBCCD4220CEE6B7C43A5E769D1F890A6B6505EE7FCDC7E399FE5321C2792D7AE094D13EC493CC0911B3EDBA6DAA037E2EA0CD3642784FFF2CB1BE04E5B12AC9D2871F016D8BCCE6DF25C1C04D912CBE707FD4DB0F9E89C4
-Test: DecryptMatch
-Comment: 2048-bit DLIES key
-PrivateKey: \
-    308202400201003082021906072a8648ce3804013082020c028201010096411b\
-    e93e733637e91b1d74f808f4c9c528293e3123ac1d3d2f94c462ff38d0cd2fde\
-    c0eb03bc5e54b6df41e9bbe9127a1b3a7f47cfb513340664829ffae26f832b48\
-    e2d660d10e4debc1bfb412f331ab7b2f88c0d31fb587ed5c5256e0ebf7da698a\
-    fd3cfa0443af91bab8c539376fcbad72bfa6985b6e64250e6b546b07a4575b08\
-    449d383b5650083c637d2452e7d1b9227adfd328ce473bb4374fa31e0ad52e56\
-    7feff6a9c4842d24d069e7babb35313ad63ca5d33d572bb309689a571e9ffe25\
-    38816bd7bde7bb11c10752e6a842751f594f50cf4b8111f387134e30c6c03ba6\
-    40be7cd5b6574c0d0b571a98fcdc292070595dcf6e8d034cc0ef92e8ef028201\
-    004b208df49f399b1bf48d8eba7c047a64e294149f1891d60e9e97ca62317f9c\
-    686697ef607581de2f2a5b6fa0f4ddf4893d0d9d3fa3e7da899a0332414ffd71\
-    37c195a4716b30688726f5e0dfda097998d5bd97c460698fdac3f6ae292b7075\
-    fbed34c57e9e7d0221d7c8dd5c629c9bb7e5d6b95fd34c2db732128735aa3583\
-    d22bad84224e9c1dab28041e31be922973e8dc913d6fe99467239dda1ba7d18f\
-    056a972b3ff7fb54e24216926834f3dd5d9a989d6b1e52e99eab95d984b44d2b\
-    8f4fff129c40b5ebdef3dd88e083a97354213a8faca7a867a5c088f9c389a718\
-    63601dd3205f3e6adb2ba60685ab8d4c7e6e1490382caee7b74681a66077c974\
-    77020102041e021c614682228a4bea799d01008a4bca099e7cf7711d7914a81c\
-    39d2407f
-PublicKey: \
-    308203263082021906072a8648ce3804013082020c028201010096411be93e73\
-    3637e91b1d74f808f4c9c528293e3123ac1d3d2f94c462ff38d0cd2fdec0eb03\
-    bc5e54b6df41e9bbe9127a1b3a7f47cfb513340664829ffae26f832b48e2d660\
-    d10e4debc1bfb412f331ab7b2f88c0d31fb587ed5c5256e0ebf7da698afd3cfa\
-    0443af91bab8c539376fcbad72bfa6985b6e64250e6b546b07a4575b08449d38\
-    3b5650083c637d2452e7d1b9227adfd328ce473bb4374fa31e0ad52e567feff6\
-    a9c4842d24d069e7babb35313ad63ca5d33d572bb309689a571e9ffe2538816b\
-    d7bde7bb11c10752e6a842751f594f50cf4b8111f387134e30c6c03ba640be7c\
-    d5b6574c0d0b571a98fcdc292070595dcf6e8d034cc0ef92e8ef028201004b20\
-    8df49f399b1bf48d8eba7c047a64e294149f1891d60e9e97ca62317f9c686697\
-    ef607581de2f2a5b6fa0f4ddf4893d0d9d3fa3e7da899a0332414ffd7137c195\
-    a4716b30688726f5e0dfda097998d5bd97c460698fdac3f6ae292b7075fbed34\
-    c57e9e7d0221d7c8dd5c629c9bb7e5d6b95fd34c2db732128735aa3583d22bad\
-    84224e9c1dab28041e31be922973e8dc913d6fe99467239dda1ba7d18f056a97\
-    2b3ff7fb54e24216926834f3dd5d9a989d6b1e52e99eab95d984b44d2b8f4fff\
-    129c40b5ebdef3dd88e083a97354213a8faca7a867a5c088f9c389a71863601d\
-    d3205f3e6adb2ba60685ab8d4c7e6e1490382caee7b74681a66077c974770201\
-    020382010500028201001eb30132e415358b7d3f726b93e2eeb083fe7add7abb\
-    6ca352c9e09b365e5768ce032ee52d59f1c65311045c490c42c36ae08cd0264a\
-    26199aeec8c3a8882a363397b4d7e0b6c4abc407f27847be0e8477993069a1a3\
-    a3fe68093e09ce55bbedf97c91e741ad2eceb7a0f4be6ff87f68deb03c5280d4\
-    8fdf4900485bf5ca20257b176f58fcee1f0451b3716862488b0642bcd76654ec\
-    4874512538976967a545cdc208a0050f26e541ca70343f653222e6df7aaa07cb\
-    cf354a5ab910eb8447382d7f512c440982ab37a402c87d2888eecb35c636ba6c\
-    84a5cce917f234fc7f8d9167167e30f2840407e13751f1944f6aceae3f5a7025\
-    36723c1d88c8c04981e4
-Test: KeyPairValidAndConsistent
-Plaintext: 5EE1
-Ciphertext: 73279829369404A1B68D5E86FF334259936133CB04C9186CFF733972054918C3285EE907C2863DEE872252BF03EC9FB088B8DCE6D69D78C6BCD6B3FF87E683C6CF3CA05FA6AF0C068D964BE01030A3AB4E19575811D141A59CFBC9D3558E48CB771D88CB1E0E6C7ABED041077D24005E337AFCFE8531569FE56E2CE97C40693C071409888AE46DAC8BD739AE0E1C392586917FE07A66F7D3AAF0DDC398117B594481D0D5CD19C8708DAED6338EAA552564C31F9548FFC7E5C641FDA95B252EF637C6CF708979948A3E6B4F37A9ADCD60BDD841F3B0945CFF55E2F13468EC71C550CC2AD48E7E1FB444F132AADB1EF2A7C5A22450D0E0CFE9E37D999B4794B5A594A4EB7ED406DB24ED541E575B9F2756545DDD34F6DB
-Test: DecryptMatch
-Plaintext: 0252EE2E1C603017
-Ciphertext: 0E742D794904D05C0F0B6F60E9655337F8C110F289C6E4A0D6FBA6A2A8EB0FBB566A7F9B9862175C7A00A8205E8C8012366023FD8DDB6EB713DEF86917233DC5D16C2822707230169C183FD3A714806220D7DBA735C4F747A23E4131CE12C5572BD5E659F967A8B7DAD0EB6138D1BB569C6F04EAD79F9A6301609697F73F6FD8CCE934FAC6FC138B4C552E211FB1CC242805C035815F462D0291537DE10632141ED0A7C22439C7270AF0A6244C073CE9E2654FED918C86697988B0B341C5EAD2CD6DE75EAFDB1DFFCC5FE465E8D8C9A34D5B7F0E9DDE62204FD12EE2F99435DD58F3254268F8E6CFFADEA9205DDFCC943004887C405859866A0A40456A6C50B57FCED319AE0EC92B9069F765013436FC9A0253481CBE12B707A2B20D
-Test: DecryptMatch
-Plaintext: 01AE
-Ciphertext: 6AB2E26D99942CEEE4844632355BB3B7713DF000DA11099D4E1BF9EDD1781A9396032E9D96BA0DF21B309A9CABCE9AE3D022C33A931183DEC5A3721EA5CEB39C18935A43E3B0BC153E4469AEB604D031A0084BE5927478AF8EA652D0A4AF455BDC57EDF26E2C6F9A01C91F29984C11D3C60313A53D8AC65D9FA504742868AD3D313506EB4FDD0E9799B111F3041F4C0547BBB06BF7DB20D18B427BCA1BA5099821A5F0997EF08C319B851F0C88B4814CAC7BAA4290B3182738C37B6ABFC2C4770A633F70E6FA4FA53AB286384FFC2AF9B64DECBE12C8EEB97862F76296D13D889E864418056420DCCD0DF9B76FB32FA6BDEE149585F427F133972DB7281D91D6E78B6BC46151901179D186CAAC784D6271023FD6E84B
-Test: DecryptMatch
-Plaintext: D52A1E0E3253FE281A9471
-Ciphertext: 63F60818E399024073EAF02A7A419229EA4E2FA4126C910AE7D31DE7EB6C9502752F5B7241F2A133E9D71C1A75E23A6F5DBE36C1B661935B0F20123BF434153B1F81BBDE278611C9FAF9F56BE8C78116823AC5B5F355B88A82AD6A73D2B63BECFC7D3B39DB2A6B393E23826235AB76653EDF65DD7A94BD27E221E9D511041340FE83A27F7B26CCF3FA40B2BD786BB9D67D2BCED415F2F76D116E8F3EDC953B8A327D2846F247D91626F643F8DB800F5E1DF0CDAE2369AA8969A938E0BB5A44F0A9C0BBC7D15A34DAF4713531A7B6B59CCCA2282952B16A7E1A1D1CD47D8B2AC6A88BC6A85E692FED89BB3D1F16AC2A922836152059433A29F786F2386A74DD6F555CC8D06C890A4A93E9FE88CEB078333A631E9E3EED0610F0A17F2A4F8DAF
-Test: DecryptMatch
-Plaintext: 53
-Ciphertext: 7F820C0C9A5709C6026E58446623B5D4B323BACE54724F456684526BD1966A360944227D04824B3C9BAF19A602EBAD25B8047FB6BF9997EBDE6B854140C032481F1479E4B994FC5A2DE8128375099A7A0024AE1CB985D73BB2B806B20E0751EA154BE2A70ECBCA49335BA57694DF1E0EA4566304B8DF4BBFE5AA41D0B767AE1679BDDE70F95E1C0C7E06F4A635F987E2858407BCA2133C3EC5620D58F1AB7FE1426B615959009A4706797FE4060E1C690DA373E48D6BA684F69E981DEE5DB9A58C504DED4D4CA6CD9B776DA03E55DEBA97E541A300465FFC68C5417A10ACED061023ADE00FEED4099180948F26F10D2F9470978469F67AE1092100C16D8FC4104DD1E711CF67D5842DE4102869E96E817F9C9FF520
-Test: DecryptMatch
-Plaintext: CEA6026338
-Ciphertext: 13D877F0F00D01125447982639AC82AACF30FA0573001DD809C72D0F811138088C6D6D0569E63AB001CEB0339BFB90F7B71F339CA2F75859920370C622C0C4930B79B99DAC0560C763A1162AB46F58D1409E25301AE6D70DD4FA64984FE894DAD2B6401F8864580132664DDC2A57D1AF8AAE43C2759780C8587475F21275D61765251DA8FE91921703DC8DD279DFF4260D8AFE69257BB43EC609DA30DC33526D66E46365F399AA04F34FA7BA6469CA964AD6F2299233424E7342F1BF493C0BBB31FA1C713543D758219AB0F73B9C24F4699415F96C32E2A700669FCAE7EA6921F96288723ECEDF9677EF35702C8C0B71AC27A57624A7667580A2FBFF72818B2BCBA3589DCB686486FDDB50E29E75EBC8AD3DEDC8B741AF80F7
-Test: DecryptMatch
diff --git a/src-cryptopp/TestVectors/dsa.txt b/src-cryptopp/TestVectors/dsa.txt
deleted file mode 100644
index 7667222..0000000
--- a/src-cryptopp/TestVectors/dsa.txt
+++ /dev/null
@@ -1,397 +0,0 @@
-AlgorithmType: Signature
-Name: DSA/SHA-1
-ModulusSize: 1024
-Test: GenerateKey
-Source: sent by CygnaCom during Crypto++ 5.0 FIPS 140-2 evaluation
-KeyFormat: Component
-Modulus: 8fbb9edf2fd2834b1a9fe97c25999fbc381ae165d932aa521592c2cdcb4318bfb99a2408f118ea874b73704e2cc557fc89a01ecfb5bc412951e86613b0b2fad2389e81ef42f79705fcdc87a9b9dcb1afb44c37d971aeffc1c859be367457ea19d71f22bcaa29752f15242f59b295125e9e01ab582887fa869e4b0f4a308167a7
-SubgroupOrder: cd6c675f1d22c771e7f59020ca0e94078950df9b
-SubgroupGenerator: 7b473ffda9ed6e10f85177ac05f43ec666dc6d42310151053ae83369de9f9b331232cbc83bef31166e19b111e46e57703fc6666ac9a571ff053e18f3c2fbc4c2f32521750a941981a55379a2fe13bc78c6a3787f44dea397af63a7ce432704657feb57295ab9711ac7070ca5b7344bcaaedfd8bbddecd8de9c67e7cffa2fa20d
-PublicElement: 64f31bc4d5b42622b41326361fb0d67f9feb364b34be67f6b2e4dc1f928fc70e6fe42cd9cd6ce3dc40113e7b4742d4af6fbe04d962adc5238d4d95b7bb67f0ec6592e966517d0a34137a45dc82ebe282c904750e1aa31b62c919b250d4d8ef922b0b0574cb2ccf1b451d7facd075e77fa532626602b32fee6fb334e1c2911388
-Test: PublicKeyValid
-Message: 699c4211bcba049ac8d73c37fc3d02241f70b8ccbd6a1225d813664bcd043660847dfba3dca434cf5600afb60036171ea402bfdc3279ae2f6b7deb5fd0810a96ca7ff7ff1a36021d84a92b6db7d4b03f80b1d5d2306cf3af4be2c448725fedd09399cd5d4fe8853cabc84895fb91e4400c7591e691bafa5cd0398a3c8d18f8c5
-Signature: c0aa11b2571acf6fb78dd85148d97ae04877ea1a05d27ab73783ba4efa3a4b7f110cc44c7ba2c842
-Test: Verify
-Message: f5373216e55156d66524e39dd8a345cc519edd8cee2b7cdb755222d42ef8f843000e8b69cffa4b0c154543c3bf871b804a904b5e1ed8a1ad2a29f63bc28b2ce5b5706c5fb2219e40dd682951ad7fed1709397d9ea36fa18894ad0c57391e5af74db54d8f479d4989f6e40de05b63b4a9c7f0ebe535c87485ea36dcbf4b897890
-Signature: 33e28ca5be57567a880c52451ec72f27d25b6e26c38216900ef17f0c307fd7614b399ff5febfd7e6
-Test: Verify
-Message: 92fe48a60045104207970b674f800f67cabbba0dbc8d1d120b64a4ddc9b149800003f9efbd6446825ff84fae21d4ed00e61d1f5b4562b872d53b4788ba2247677091889fd75ddd017f52075b3610e275d025ce4c366c608eb2a64a567a5688287ae2cd3066e72db701dc0ce6a7eb46bf210c9f59aa646e5c3ddd86bc210665ba
-Signature: 95616a85b6d9ff3c9af7264cbbf8b9cdb71404eec47fa7c91291fb93ddd8b0327df74cfae6698e0d
-Test: Verify
-Message: 18b8baa09b84cf8ec77a1d34d68b0971fa71016ad5b71838350ce9d114c8aa34d0bf8fd9a747615876845f58b2fb55bba757fb08f176901838b7b7042f87924fcf2a1c50d1c7cce36ab768514b0f277cd86b0a4fa7fe7c653cd729f803751b0d8f8f1cde121d47871caaf0f598deb70c0447e718f0671576ba04f68488ab80c5
-Signature: 23c6fde5fd9a2478d99c3abaa61363d90b2c161e847be181af07276e376ce4f76db56dfc3a1f2425
-Test: Verify
-Message: 598660449d62f60b1e0581b0c493803d3ba5cb49a5c5d5917f2a41d6d1b6a8f69a2ea94e7bb8334fa29a0f5ffa32b1f291313fe9491ce32ac3044e8188848db77afd10f17a0ef84b5b56a1b5076d700df021de7ebaeec51827c0eab042ecccfacf6bace5f35add3820b04e6a443e55c632ecbec05032149182d52e1a57e4fef8
-Signature: 2c07790afcaf89768f1d1492345510d937e65bca5621811e1b705651a861be1f88f52090036cc1ce
-Test: Verify
-Message: e37395964c3c1f7b37c99c2f56070cf9672de2f7cf63bc6778ae6532e81f09baa23cb7e5c2af1c6ad32e7e5bf4aaf7f42cbbf4a20a4bed578182660d02f22799db04b8b2cfa31f41f727ddebd88326ddc6b361d77860e07cedd6e1d87e28c53244a28f14ad6fa099598cb1f73bec114ceded21ad53fa0d6d7482ccaa951a5b1e
-Signature: 58697e6dad83ddfe43817e5534535ecd78a985d3928e271212165dec4e76c8025d531ee84ba8caf3
-Test: Verify
-Message: 24976d350993351696b33cf2db5440303d5a722cc2d25eeb9ccf1e20f57ec060fa8bf4a22ab9fafbe0bdcb971f5b86fb9ec41e79142e42f4c6b58dd54e71ef4eadd95cce9458b3c5ef2df19ab38896e9e9e35801fb9e079e3fdec0e3c1a7559b5638fdb1dea738edd9bd06f12d144873366f76bc0f5a83621f030d42e857cac0
-Signature: 7488f2ca5fe2bec2c7a83e73407411c9e89bf8cd594d4a03a736423ebd913c2b98a21e445bdf70f6
-Test: NotVerify
-Message: 430cde2feba0256295b6366211252174a29c9bd2b8e6db8fe97fb9ce35580a247be8364a37741b077e9f275d3b34b1f2ab3397c2171b1e04d177065972aced3c5201e6a648ef5900a3ab1e4f69f2d59bcf1488a0f84485b8f21e7508ef7ac1eac070269b97ac9726fef3539012f647450557a6c2d4fac685448d3e32235a3e06
-Signature: 7500d2fe4b2943b4da93490d3bac5c344bb18eb550975ead0e461ec33485e11714b4ceab478644b0
-Test: Verify
-Message: 81bd412f4f9c8f8b7885d9fec9b013be8246d4284121dc9c2fbfe59a6987af1db141463855cf96ef6031325800b961f2378a6a46c65722bc565ab3c0e993ae15814354790fa8217a9efa9a98c0a6599c39c95638ebf077e0010f5be860bf63df4abc032a559e47e58bd8a9f6e3ee1173e0fb2d378762f4bf87d4764aa483e631
-Signature: 37cb9d9adb92a7e74365f9e4c4857a88a6fabd200d955dc76333b0ea9c1b2f05fee9117c79b10d09
-Test: Verify
-Message: 84652beae6fec221ab800bf6303f17a47a84278a1274a2b11f40569bc58ff34ebe28c5a138e4b1c7eed4731989ae1728397db5038f8970c59e84b16353f8a1b411ede5c290de9e50f7de9fab3807f1b6ad238530f09e384900ac0c6591b6a530b30b03e2a8c47ed4fff80744f5219e650cce0eaaed8bf0547b0edf3a39a3f8d9
-Signature: 194a79f399087d977a29a3eab308670b7b133acf4e8b43068639e0e5e37d7ed305e32b85e30a0a22
-Test: Verify
-Message: 9cdf6e966c37794c7b3dd6234e76d715099128caff3d03917a4a96a2c703b19386cab41830f5b8ffe9e9fd6b88759450e4714d2f6298e413bca267cc13a5ea6c38ae6fff379b0f8e253b6e562ca95f45d4e6d3b694b6076e99bdeed7d5d9dc7b4bc275c49ae0d5f2c86c015d51cb8eed702790d7ad50c59aa8d203392456dfba
-Signature: 7b427233d9e49dbfd8ff2a7814dd99cbd4533d67155696b215d593d5ac3989c8927850601c0d453d
-Test: Verify
-Message: df577c9f2370b362f86a928e40106d7b0a511d5d8ec619776b82d57e1f195b4bc7f328c619d2490e9fa2b6ed3681ef7cc60fd51343f7cb74e5be0d37a3cb5078f6b89bc0ccd86532ca09f0f7c6bbe5eb85413088b1571e131ef5b6063e5355bfe23d8d6733993f24f036f682ead7871fbd7fe796d0ff4dae90be88c4e8c9a276
-Signature: 39a7efc692685eed0c3cea8838c026b39367c6f446a16258906787af9447329ab99e821eba53cb89
-Test: Verify
-Message: 91042eb63d47c10f678bec836f98630e13e707b29c98b28d47b1443cf699e97018d4aecfd500440e7f11134c35c982b1d97b86473500691869fadc89974840f7d2ca319045565573a0fb630bc87576a8bff09460d1027a2500e3ab28b2eeb86d995dd1afe3418c76a4c0f5778094d72c9dc04ab4c8947eede6e3c6cf9d83e80c
-Signature: a813d89e3de90f1ce1b77a7d6c629e8f83296aefb8bfe1194f914797d08b53fb59cb9186935dc10e
-Test: Verify
-Message: e644b9a45009da8248611de174b5613dfb4aafc0a772740c38f1ff480bb23e69ecabb5c2380dbfcf37b1093eb8bf4c3feea04a0d8b270cbd1bfb5a46a2487bd279a62e446649e80afb6b502431f6f97544765f4ad13f24282edb8bdb0ab635bc460d1c421314cdcc4c66eaad16b3e078b6a4e48eb21234e62b688c1d7a56e6be
-Signature: 4e4fbbd84fc44f0ecd6c163fa292cd96051ca51764fb5626f8ecbd8470faf6ae5d79c731d9a3497e
-Test: NotVerify
-Message: d30ac577ac767ce6eee34ccfe09f0278f2faf8d28f657cb424ca7f53712b7f040f7eb63643c784ab02771af64405693a8eca4a21ba22ee1b09c189d96c533a0910583e53283e5693ffc076593d7eaf9e79de5ec9002296e2e4cacc15492cc26beb52b5c4f414ca17fd77b6ee6245ad1ccbec8ec2f89c4c81cc9ca0019deeeda3
-Signature: 4ee3704d4bff39aff0efded0930cf28ff7641f089280f1d0e38a186075e91d73a5b1e7d028340fe5
-Test: Verify
-Message: 82bb8073af3e53b8ae158f342c4cae3c039dc830703bf0e893dacf5d280284948596bbd0d3a00cf8915f96464693dc328507df9e27607d43c426095b74102c90c494fc24fbaf5a628ef29146e1ce2c684020182f1e00fb338cc6d4f2fd5ed3b739ce7bc89e05f6cf9fe6b88b769558b72c01ab3accb22291e3d5667a3c8532e3
-Signature: 0b0b366b23090265e75752fdcde1a7d76113653246e0da762e25012cceb13859313e469f4dc31680
-Test: Verify
-Message: 12da3a70153655976cba8144f67dc21719410fd136aa69ab4cc11df9eaa955005ba0e5140d3955f643d82a6cfc6e7a222376afc1f8309b4dbe1dbdc4a6bcd2f5fc839f9e9020fec967f12768a3c14130b0c529b3b0d682c129f1fd00eeeceac94b7a0046746269ca30fc1171c2ed30f9182416df371436bde63376e49ab2b635
-Signature: b43f325f82eb07dd2cb3a03a022e8c89216e820da743c216ec6eec5bf445f12b2d326d52e38b90ab
-Test: Verify
-Message: 45a2799fb193f3adbef66b8035318c5f7eb3610dfc64dbd1a84b87c0f082884ed257db1435c4cce38711b30b9dc8f4e5c7d936a7330ee36984b2e172b37d8ec925c401f80ede802305d93d4ae85e56dbf3e20c7b1c0f4216b17238253465893f773f63e3f4bb07846fa781d6cfcea858382658226e3eeff166e306702e1271c9
-Signature: 238f01011e1b3e7d027af353e06e2138f5a40ffd3d7a78d55c95ea3b94ad82b8ed58c308f7db5ef3
-Test: Verify
-Message: 6cff32791fa0d15947fdedf67508fee334d1739512e15ce3ecdb5ac17f56c43e2cf51bbb0bc8b06d34e894164a4dc0ff48f3863a902d3716314916e278667de7bb914ea061279d3c36679b57ee56c6f4f7d84fbe830bcb80d6e71ee2cd15a565b00ca3a13972eebfe4b2da3279d966bad8b7a69a0533701873ed4a36951b94b0
-Signature: c9194d5ca3dbb424faae51f66377836a93bc55ab1d481e5eb9663c7033329d82c13af868f4a24efd
-Test: Verify
-Message: 37a363f2ebaa01fd1ed7902a4804c8fa46845b63d82b947e59a23073c0e97da2d72db113bbcc8d2095a6336197a744d83a923d5eb610134dc1f80d6f8de1e327fce615de26b88db10dea78599f79615aed9b906fabcaa236e8106a180e94077b1c65462c23863a07003b19e858935ad7d9360d6fae717a8f4480fd443c1a21f7
-Signature: 9ca210249d306006ecffd384f87c4dfcb1d466e005d877c2508475bf0074c4c6fffad6e123bd5dab
-Test: Verify
-Message: d3b14dfc79ab30cae8e40dcda6bafd6434741e6ab1b9e0d2cd4e8d80f10f176aac3126ef61b662772f31fe4d21bc85b99737e961f5c2c9e28a7d02aac27f7a19901529d8163c687997617e509f576890719ae9aab1c3d3e3524b9434c384036655d56d6ef035db06f7eaa68e78843e22981437fc3eb2950bff2e59d54a154b8a
-Signature: 30cffe077d2330f111eaff346634237473feb83cc522a5d20c75db7b4c90c4e21583e1cec8e00f29
-Test: NotVerify
-Message: 69d5980a58474652bf27388ea6041f9e0fe688ea95f59fa745682c69bcb1c7ea82e75f19a773eb669cff6e4d549b31219b323c1bb62d16a33c65bfdd344feb77706280b229cc51afdc571dfc6495c35f5953c8e1a83d0b1e73cec7cd2b7bca8beb20f4ec18abf2c437073cb20f4b4def00232255a27ff6b3a17b3b50d88fdcbd
-Signature: 18eeda64cc75f18f58d43ce6b95eb3918a521bfb40c1745a38f985d294caf2d86879528678881191
-Test: NotVerify
-Message: e0ac66b23eabe745886613c4698c79478f484a43f8dc444e7e7ee215a673c29ba56a56b4b41bcfc1962046ad66132d28a6eaf623858f028c71c3cc4bdd34567d54ddd4f0bf9f97dff31e3def7edd1769b39cdbbaf3f28b283e27a5d7fb548cfc04be365ff66f1717b7164e8148210f83cd1951ffda3db89a0062c5af980a3c8e
-Signature: 6db33727b795d286a69ddebadd6e09c527bcb1ee596915b6fc950549beed350fda40a4c1f52c6a34
-Test: Verify
-Message: f9cec4d6e1f2c2285dfb17d3ec5d16edec0da9b05ad12d62cbcd8f84ab4ba73eb6cad40ab44ad9a079d7f8221c544d89778a6d50df713f5f25bd1a3acdac1f6a8d0fd92c0a971459ce62fb958dc675bc995dc189a3515088b3e9e33f6b54e59978b60b9359712a2954b55883b54b475c4a9ddeb31c0a19b66f6922ebfcdbb0a1
-Signature: 947428406add226d1dd8db3245d00617b152921404ee5ab8d4e840c87d26073cc4d144a0b51e19a5
-Test: Verify
-Message: 966d6fa1ea1ae8d344037a48420d6379278133fbc0c25450974fd9105bf988398f652ad373c511c830d2eb02470dc7c63b3865507d0fc3b0994ce4e4a0dae337d55839d99bd14bbf9eba37be412de0e348653815c77acdee4b5d97d646170062c03e35ec3cb8ac73e8b3f6b40ae5c78aa7014383757a8bc4037c881f2727f772
-Signature: 63137ff0730f28235e87cd5122d22a973035869332ec538d5be6e2c9c0db94f3c012ae4abf3af9fd
-Test: Verify
-Message: 43a8f0b5992db54d1d65acbf72780493d1af881fe95f9f14f61b834f201ac1df16e5f252eb46b845306efc2b5365655d38b71c63155dbf8193e9a48623f64fd19ecf36a4205fb4ad26594bd2e6a81e3cee19aea80147d4ea2fc700c23395b0e411bf3342f050a09c357f114be21925492e2cb58564f5d666010c0f9e09cedc31
-Signature: 1bf8e80c8183d00907ce80e74989d84815db85dd1654a6d49f74c020a83e8bc931a178ce18056f57
-Test: Verify
-Message: c4aaf1632b1438752e9790c89cff4773932d3fab0ef710bcaf41794bcf5c0ccac49e1a3c7143dd2b1484e4e74cf6c4006925fd06f9702a8090276e2ad7e41b74d727a3378835c4ba9533efe5727efac4a14d073f4089b418d7ec8526605a8ed0987c65cc85a3471948dc893b254f41b7d0dd36cefafa057d1cc796b58374bfd7
-Signature: 5fa8964b471c76211e2743c4d993e793dfa7239dc84a19bb3fdad2162a8c98a2434c94213f3a163d
-Test: Verify
-Message: 739d44364282b7bc61c62188d07e0ef12b907960a740f1764ff8ed7981586c04a47ed0ef2b97fc7dcfa6adc508941762cd79c05f8d2aa15d6e037a06c5f676b7d6d40069cddbe4e0fc81aa18578030ed2d22860929cf0f1389d4d5159d762c2f82378b7a2067a73f62efd159b55a91e8c3248438714773f01704b57fffefc7c3
-Signature: 1b61d79c6b33e3c3394fff6efd641405652033690d7219da8475faaabce3e395bc720d70c60e12f0
-Test: Verify
-Message: fc205229f11c877b617739d9ac191773c207ac714c5e2a061a917ad2cde4827ec628b5924eb8e19a06b4357a927d920e8171130580e8dfffc06f2ee5a4449a89af12a87faeed963b2291676cf0d72d984c7997f8e207ba96472924a5a0161f21915542a769b33e978b85e7681f20814bfb964d03ccb25404893674cb1954a87d
-Signature: 283d55c038d4270e71ae39db618390f17675478b704764d1fe352550054076f4461eb6da6174dd17
-Test: Verify
-Message: c343029ce5d70a70251b50cc5e784126dd65e35080940f450d5cf435d567c9ce8a9dd2cd5d5096c55ba95f2f0952f2b33f6490b642942d24259aef7f62e2ea29b4771bee372ca2d5c30c4428850421c1e0cfb2978323068acb1a3d6b5be34550f9a9d416acc3a637141ef8ce09e845e7787f400d7a99120eb5b4d611f8c051db
-Signature: 0cdabb09213e0f09cf01e0329bba5661753950fc92e681173a6eb46c02d00224b50ebca62a248faa
-Test: Verify
-Message: 5e126ef683f3b61a39065574bece4ad82dbf4d34495f40cb899dd2b163717588ddb683795244ac758252a3adde0a0950126e9984d26a96a7e93b72c780ffbf60ac9d5b553cd8d831c1af2a9edef79426d13cd42942d48e204c45f611cadac252e3804f81d8e612c40dd5423e56cdc3d285e1561b31d400acc875b885d73854d5
-Signature: 01dde9613b9ce3c29b3503c19c13f863f27ab71bc0844476b3860ac891f9ce374aea6c24f517b8ab
-Test: Verify
-Message: f799a6b5a7bf7c32847fc243cbe0166f5244a377c43682c41b75530e6342174fade751e751885d10692e10858b11926ec626788fdfe925b2cd6d625272a13c899ce41e3c3ccc2f84e533ef6088840d9a6e448bf777e415a291c59ddb7b8d3cdcbca9450bde23ab67f0a6952c3bcf3fc944b6140502bc0a6d60983d00f69dcf1e
-Signature: 0fc64023e095044c9d2d003a555e2da7aa5daf413896cd4e7ac774ecbaa0e4ece8e8ccfa053ab62e
-Test: Verify
-Message: ae0424ff8fb19e8842828a3cd51c93e1123e0c4ce9f9fbbc1b326979295be9ad7c6e6783d62b337ef8924e1b95a3f4aa77546a6af0d409e483ff8b89d422958fcdf0860912c47f45a819b36be047f0538a806ea6580bd83990bf99a6f6c2682cf98316c91df69796a80f50639082a093a5b9b139fb1580739a692b0769b47b3d
-Signature: 6fbe751842e02a3fc3726a5d8298d1a7adb799a02d897597f4c459d28e9e25cf447b8cdf50001d21
-Test: Verify
-Message: fc5837b228cd6c963b52cabd227cf61b5a1e6ccb4baff71ae4f971da7904bce5d94201efb3fc28912bfc9894b87c307a414f8653784e5fbe76056e3d989f51bf990fca68f0813aa36c00646a0e685fd5278fdce1b2af9a83f41726ed5212d82072180bb396339ce235b5a5dadb187b434335e50fb2aa9f829685108260354721
-Signature: 5bb80b35dad17648220dbe980a660effaddd7c43ad3584318e835c355dd7bf2f5510091389c42914
-Test: Verify
-Message: 689eec3b665d72447abe64d4ddd79b7b73cd171bd22fa8689395e0a3d9793997205583d449fe912be240246ababb1859a5fdcdf48ce1d9ebb928ec58615503c073ced04ca0306948abf231ddf33e040b3e0ca7eac8816e218b872fa7d1ad67b9f841ab1c85ab52956d0c61a69f18b78ad5317a739dc6c102a2ea82084038bf7c
-Signature: 3cb07367288036891a8861931e5b2104734a6e7e70ffaa32a49032b968805dd0bfc9f1989da22b12
-Test: Verify
-Message: bc4828ec0810c7a43cbf028dced7a5890803681f86238a28f296aebeffc7f561a4fa5d6c9a595ab7193ab38eceb39fd220601f6ea5739efddffec8b93b7da7a74ba705014376fde4b375e33a844a57ea3583a43f56a55f9745723c4d287b34e82be7d584fb82e98183094b6be6b4052abd05ae6b92d0034d9d8cc550bdd8d27b
-Signature: 67b214ed56ba44ced95d3d9e8c25c99331e3e973a3099e524473ccc8d4256f4ff7de9674a369cb57
-Test: Verify
-PublicElement: 19b80e6f0132bd24dc0f26acc6a30445c4deb4fe7394440ce1ea0039d9c8137ec962e54b09d4383989baa288129e551e027477965ba1dbca0b6d586e482325f09a0fb16236d7b4ac3a3bb822a7a329aefeb91936f4b8cae38fd1e369db4f3f97421277533724d27e39248de3618a662c4b757cbbea2e3d805116d3e9d0ab3547
-Test: PublicKeyValid
-Message: ceba9387e7ba8d55f8010aa2e8ed7de2c8310df67951e1c49c5fad18baf47dbbb571c2d26f779a79b8a564a07d9184252f097432728b0cda080212effcc3052612c8266e6f2bc88e85e6dafd42cab20679bd1b1d9038a27b6b001e0199237e4cbe37d81441ceaeca363d82728d8f9ebe7dc41d6c2b4f3ee19fcfea07e90c8364
-Signature: 84d8e940de14bfb65b8c0e0999e296a1d3c51f18b8bd79c57d826d9d200a6e38e52490722c6ee201
-Test: Verify
-Message: 7b9058ef673b23e5b6a3d97784b898e0d912c990449be876b77b768da6443ba95b5fc1849db70e0482a4a1cf901aaf111b129e8dda38c3e2ccd758204a03c18b6d0500aea30b76a48c11dca21b0a82c9ea54c62bdd5bd71bfb8bacba897c3fbf68590f86b191d55c8ec285095ce2899fffb03983845a9eb9fe6f68749a082ddd
-Signature: 7d07f3033c1c841466eeb641ad899ee247757ca067ab38f6f698ad0cce5f26517da7bc51b8e630fa
-Test: Verify
-Message: 2404a0e4c5ff8fa11c40f9932c8bfd3bac118eee53085c8e658cff857eb56b029ffa907876c65054f258a7fd07e01512bfd850df82a02820a65dbafb3a13d9380f01b9c3093ddd64a49044bcc994cf84d30cf602dd84accc4f2a8fc1a8eb55458ed173bc139c0f494aa028c80ade040a0166da50fdecc00a77aad8d16175b7a2
-Signature: 793e491940787f4e76495575616901c1c77d023342569cb8bc96efcfbc9746b3f51c31e29b221b02
-Test: Verify
-Message: 5c311c167d2e3ebc19fbf7ab1c619d8ac1611152527a953d2137eaecc6fdaed79c13f4fa76f224bea7cf162531676a3a4c0a2ab81beba3f9aaa681222b122a8d724a5c77aef60aeb69df73eec3b384eceb157063dee88dce64dd72d4473b4fb2d6ee8de59bd3a61d5843465e48dea37894991aaa130a0b9246f3f659940ed61c
-Signature: 7f76e9d084a9afd5c390271261b316cbd1095e710d1b7e4503188c99b8a8d851b130ad240e31f0c3
-Test: NotVerify
-Message: 9dc221be2ab612b2ce6c7fc8b739af7fe740e9601f3201d3094a2444a488e076f52c7727ec7665e5949d2f307f0e6ed171e71c7a4cb21f9f3c661494239b5de7470e6d003a5553f80ae385b6aa3fef50a0803ca1f10d64264a93761e6f47a8e2e95e9c82ecc9f5a186361a930e434ab5cc05e10ce5b9e9218bc9e41b6203d81e
-Signature: 332a2daa48681410763f13c3b127516c861bf1f187504d8b3bb1bd11ecbf9a9821f18466c10f1859
-Test: Verify
-Message: e4354b9c9bd98d62fe629486b6856c96f34d2fa2460200c5c25746f454d32a065f8153049bdbe1b32ff4a8600de6aeeb8f7be7174f1f2f114c06893e3a9997492927596d5bc92a005f96f8417209c36316af59d9f41450e4eff0445b8a8e52ba7d7ed56e927b6060c59ffcc09bc5a313c33ffc80ecba5957e56deee2fc895471
-Signature: 65c2fd8a2635d6942b4b833682b29637eff64d80ac5ba18491bdc26d1c34d70a2c4b680900347d1d
-Test: Verify
-Message: a090ca3eecf8677a7699f42b16428445a3cbe74981efd6436d66620185469e959b9c8c0dbb464672fa136dff821ed7a2db6874b97bb5810691a9f1f30f22180df6d89abae633943ee56c08ee6fe88eb3bfd139c25df7c899e8e60e3d2647a3b3497cccbd8477a9d7cfdb9d71f657036ee83f0fdc3e6b01f60a559157e36e9781
-Signature: 19b4876e4043fe5f5a58e70b1560b0942ff4fdba842266a6653a6aa1550b91f4ba85a3b676a3659b
-Test: Verify
-Message: 8e2ecbfb35ae99dd004f2305cb2fe98c81edcccc13372e86b98f4e526d5dde4da43ae6fd4f7cdd8812fd0516c43107832767cf49e95faaaddb0e9f2a70ad0b1b790880ac1f05df022172b3a94f14d13f47ee2e5f70cf01d0341f19ef82ea805a832e51de9b61d7a3a346e89665f280175919a0e59f9e69463d5b757a9a2d7662
-Signature: 6d67367aa1caef2722c125a30e9e08ef7dad05a015893ec3c395c35d81944fe2db2a660e4e60913e
-Test: Verify
-Message: 6d3ba912c4bc10feb611e15965fe814bb2d5e5de67705a1ca46e8e6a8cb2e3243018f57abb7a698bdfe3f9c08012bd6aa033bc9f8bd9b351433f24b12ec0a3c3fe945c42e1cce9b6eb9153d4c099661686ea3a9b0ad3ff4131280800a2bd1b8ab125f7218fac27b8b092064d7d8a13863c73788a3c56d52344a051113ea1e3b1
-Signature: c56d1aa9f30790bec01fc07e5816fc6f44ab659898a959ecb061b4347e7f2be6f2df97ba33043a00
-Test: Verify
-Message: cf2010dec81c60bbe408df2bf20f465d259a5a8d2f7920ce9c566318705c69950423f1281edf713f50ca8eda93cedbdc2378d6929d192081573efd7500520cc6799247edf3323e4849cd902aa013aa273daec49ea6741887fcd4657e987aa511e5450a467e6c3f7088ebdc3451342ad729141aca81e3807843f0944e712bab0c
-Signature: a6640671721cb21d86265e30cabbc09ba20cf6081b4a5c7928ab3a53d4e291bf6049e8bf8418f6d6
-Test: Verify
-Message: 4b00e4324ff7fbeb0fc48a6c83de82d52da1bcd1eb6669cffbe2bd824fc1d7971383f4b67d96d5bcd4b56e36c480d021e05d58e0788e197f9e93882773c267e1b725f38f919451289b143633316ed687fb131041b930d7064e0de47a10ac9a014f9e39b5232847a87b973c5b63e16d7f957d3aea43847cdd24092975bdb5496f
-Signature: ab2f5b0d5237ec1b7e6297700a7c06647a526cb069c8162c513100008fe0dc37d4a8c9639ac94cb0
-Test: Verify
-Message: 20f18b1eb4ccf98fa68c10d680f1536bd5c7c3307cb13ede0e3717afa213f74dc8b8f4fbc324ef020ce7335e03744baaf8a824495a9964d63ea00ace13a9467ca4ba9b264fc2337684a4822b81841f004c51dfdcf193333cfd77c4de3a184db0ad10b8f8ce3f7cc407da369470b88647c8d92d43b73864e942d37f388ff7c3c0
-Signature: ae23d943a56fc60ef381a2a5c056d24e472e9e906e4af1bcc91a27800b99b7cbbae8d4fc303ada82
-Test: Verify
-Message: c9db3284c5b9a283f38da98655485939d5662045b325ccae3207df72838a1660f22634364f8814fe9f0eeeaa0483e9efea1ce25f74b37bca264268d6d3a3f6dcc986dc063cb347a7f08220db2b97a060dae317b302d8f86e6aec29e287518af0a8f2c32d62b153363ee0d650a2fe9744fdb3567a370e5a5458fdbbce770de953
-Signature: 06bd46f7ec091697c86e82497dc184139a988e3b9adee67ce3d87d739871fb1cdcef9dc6de421615
-Test: Verify
-Message: e2e5fc81619b215141e12ea9544184e5ebabcb3834e96dbad2464fb5be7bd22c5dda0aade2be3d59e732a03147e04da33f3c8854c4f23330278e8fb0e76b356bd7de54e071a22c827987cb05d65708e8ac09bd43be2948d304874443881f84bd874852b1c421e6e52f3929bdb77eabcd6c68e29dda66a4bba189e807596fb93b
-Signature: c86708f91828158b1c129e48ccc6adfdccf4997e8eb2214c24fd4bf4edd8ac1f3411d77ec65321c2
-Test: Verify
-Message: b9a5127b9995a063f3422d3069a4b22ff9b7816e01ceeb3f933733f1fc11b3ca8f694d49b79c159a3ce93c59d555408befc452dabd54071181fd43d8196863b1cc0caa32568fee84335c841c298068b919cbb19e06233412662b7815a916da6408c501af8f2885196ed3dbf17cdf84af0c047632f5f4ca39dcfaa81fc5d370db
-Signature: 0461b5dfdcfa1f9be6e7528478e2785903f0b8990f2354209554aeedd246d231567b06c5f81e0842
-Test: Verify
-Message: 38da1e2a517a87304f85291a67e7a7ea0e637e797fa1a122707b58ac10845b7d44da2afe232eaf49b011171ad781edf4aab47992dc2358927eda5d5df9ffa75a4da2035389c484278aaa60b1f7630ef97d979e9a48935873c2929892904ee95dc9c7610279533c2256e7bcb9c1a4405100a5a367ba08d81db43bc322cb885adf
-Signature: 3e7f697603dd770218ff55f027a8fc980763b6b9bbe84a766e0e55fc7c23e4f734d28f67fd73e14c
-Test: Verify
-Message: e431f4fc91ec6111098c5de4532c76bdd3ab9a42e92c6c10e7ccc69539a38f31cffdbe8dcedaaf3b78a3a68f592fa1bcb4f663332d94bd38b8811fc7c10f60a69da5cacb303a6af0e0159675bac3bf76e459782d43ebc7896c4dac0fd009f0f224a0306e0f06296a1858454ecee06722394bf4e88129223adda68528bf87d74c
-Signature: 2b2111694dd96095c76bd18fbce8f720ddcffe6c8d9c194e880b0abfa44bcaee6b97addc84c519de
-Test: NotVerify
-Message: 2f3e3407e1c3e585d3f87ecdf8ee45321c8d46ed84410565c7e282c1ece573acc5c2bd688ba53416bb5894433070bfb782b7397b9edae229a653f2780b993a07e887996aa20bbd73be101bc203ad318fd18efbb7c0a3b4057c08cfc3e03535825167c0255d4ef73495f80c60a8fd1352c1ec85b822f6f59201da10baa310dbb2
-Signature: 88ed45212439c0cb86f513026b72002cdae6317544b95fcf4dd1eeaf460edb6f5891080272a3b31c
-Test: Verify
-Message: b3b7c629f3f5e85b35f7b95d9757a8dd980a2acc68fd9f1b74ee82af328cd5a62ad2ccce45a1b8625a9c3706f6499a066c6597cb1e88309f0afae3a298d4130ca25bb6a5c5994181e73dd00109b59a074e8a95794cfb65f993dd8be27cb2cb863409dea709155933f391dd4466d38058562f7ccd8c8f17a02850d267775fd58c
-Signature: b2101fe80d5d71592eae972be0cb7f67e0fc2950bf60fb12b91a1a63d9f4747c1d92d2712cc33300
-Test: Verify
-Message: cbf84e9aefa950d9c997dcb571a50e25c09c7ba40e730a1c28e112109621b4090b057b442c3e339a86ea07afc95fde5f4a37f765b99cc34e1fd5039d1b1122405d74d5336360f17273058c25da2b5807633f3c181a9d3483421d6ad294e09550bb5c93bf0ca6423b8affa46e1aa232f603cd8113a90e13958ad080057925c612
-Signature: bb80dfc840147d79654ed993f5266da74985e2225e7f5d61266fb1caa2deb06fa3bebd930122cfe4
-Test: Verify
-Message: 3f1ba8edcc9ff1dfe2c25c860202f927af2188fe5bde071b8fef797c5f42f96c0d75001bfc94f37ed912f06a040adaec45b6a3ebac30d901c96974960d67de3f80c34456a5621cdaab73f788d5a9893b2bbaf68162185f7f09efad07f6609df7f0fb0cd59e8284a8b0dd08194c591dcbbb2519f7540fb04ca97bbc06f1a44d4d
-Signature: 06c8b4f82b1e5429a07857ad5a1753f1d7cb43b345bd935a1f203ca2e69fcbd2321b295b1ed3c2a2
-Test: Verify
-Message: d0b56cf1a2bf4845544090bc5440efaf864b8ba6205a03e5cbffac3af8d50d067f28988a7fe0ab7472b3c7aa8f8b0f5664350432b44c80168f65f0bfb07cd6e11b9f7e70f7d9ff2ca961766b33047f2bcbd0f458bf02e95a8932e8e22ebd69f6dc73953bc3823d8333a21597f8833546f374d1aefa5438c9f1be0b3c2970c05d
-Signature: 035b9d105cbcce5d24fc186ff52ca07663ca774e057e6de4f5cba8df8b24cbd361df4878c6ebd3c8
-Test: Verify
-Message: 82f8b357919acf5ac548e01bbe97782acc131a157d1b616364ff6dd32c5993d1dea9453a6f343e518e1ef301abc636554b632d368cdc7363f3ec8cb67e768e95e6260eb7354a491989ef9440274005b0c31b63ac0ef54c3081efa52d6939470433a8e745fa9346a94ff39b4e47ba3d31cb7495f11c1c44c2a54190b0055a1416
-Signature: a4e3cd2cbd2151d2033d0a56fa7d388af1e050efbc23bdd5fd17061234244d0a9511b84525e719bc
-Test: Verify
-Message: 5e5dc7a9fad7608fa377eee0d126a5377bfc0b9c11cd19b3b7f88f25c36c984f78fb9f2a05e3707bb99a933b88dae649c4ed794e143aaff1b911923d02b3764f0da5d244bf375b61064f62854e7b6fcc42371f85c57b3b562f891aaeccf5396c93f518cd23ea579b032f12941b2279186e71b4181aa7f63b91f7df51194718fd
-Signature: a96a7dffb16216ec93857df38b10fc73c4792e61055a3d5c2aea3e5193113b7d0bfd81f6c3b0d01c
-Test: NotVerify
-Message: 9f8215298027d29e4128e75b86e6343bdebfd7f0f60bf417ff57c49a5ce1e14b9154d0be68c5cf6765ede1f56ca818eeb1af228be19217d68ef98202e01cad0b7a7f328eabf3bfebd6ca2999245ab4c968b4a13e52a6f96cd8ef99d0e1c17f8f347d5352a1aa39616e36d6fe04f1a104db476cc0a33e3210b4b022bab7c9ed0f
-Signature: 7956b42cf6762bfa1d84425dbde83554a598caeb6e3298db6c225befa59a9840faab00f16b662ca5
-Test: Verify
-Message: c196e14d01a2abd6dc046801d766e076cae2539afa2ab5597af92c35c4bbcd8f9378923503069f2dec6fb6c17ba1f7cc1355dd4363417607c881e2e9e5430ffe80b2b326a0258ad7e589d22f270c043a530cd480823f6bd35a23e357aaa804d2411c3d360f58e66c7f29b56314017e5942df2f698f7c0b56eab727964b4222a2
-Signature: caee28fd1cc548ceeb7141e3255c6043751425f2c344e1ddfe08ee2d42ae77391ed03f9baa195aef
-Test: Verify
-Message: 7d8df5288388272a7473d757c078a6de15994fe827c215d0bf2f6aa50701e1e2141c566cb5445bcd7b78e6b0098d399c9d0f12f5df541530eae276569803ebbc13a7d101997a9d488f4686b7c98b7130185c1c4f157c8fa42ebac032ee8a852891e5c0dec862c513c9950f659aa824129f39c5ee63735ba4a36f9e31a1cd889d
-Signature: 75bb8dd4118b861c56c6a56bf00f194b9296bb677ea7ca4f5cda2855253f880473d5aaa8196c39b3
-Test: Verify
-Message: fca73579a6d91eabb3401ed9b9145c2bc94a7066a85eba514a62046a95485bca536c2a5678659828970d253c9fce805fda30ab5527a0514a7783677b867b0325dbf979ae0303bc120947f3913a615a9717695ceb9ac1ef1cae1d2f29e9d33e6f8c655bd8bd4c41420307c22e0365a4aa790fbc80795849a0e84993cb36e8c482
-Signature: bb488822df803c1b8b424169ebc82e4638af6d567a7d2adfeaff0861631adc4c602a95a7ea8a0c00
-Test: Verify
-Message: 2e5dd807911f65df6c7b71c9727137156df8fe02af3c1e19bb1d51cb35e43d4e07483eb5d5a1784ea46b1d41c6fefc66088c4b661f5bb5165044a710606dd893bb43179de8ba59472cc902617d20744eab2cd621ca4e26f8e2578299da47b24ca247faf8a0e41f815e8eb8617150b785acd1376a868c8878c94c799e7debe530
-Signature: 02bd342623b4f7cadbd88af72c8ccfb29f85042d4d2d6853d6a7769f2ed879fbed85cc6c7440fcd3
-Test: Verify
-Message: fd149580b4d7b1e3799006d6c37974de79658e074d2d1cf4585ed124f7204986e569464099642cbde21cbaf5c16d0a01872dccde2f96bf81fef7711c599b37b0e6fa6fd3e71ff5c4d359e4ac36258e37cb5bbe53d7992d48c8ed42f90fc60e793a1d88d156e00510849ffb94da79f7987d49dcfffc0e5d60ef98bd52d07ac6f9
-Signature: 52c97e4fd456b9a2141afde95fc0ebf4ee2a509f274e31f5a6ee2730194eb09532d7c12583b2413f
-Test: Verify
-Message: d1197e08ba9f4654452e42783e664e3c7ad5cd9de2565149c0aa8d5a49547d576cb9d369da79a5da560856d33e91c2565b0cae7ae59e6ee7da31d891815469b93954b621879c168e5f4a8e84b313fd3d3a5989eb828b493039bc33dab88749e3d12200a9dac0f16afa2dc303b3a557e9b0f53668d1d5381b748477ad07a573ce
-Signature: 41b31f1faac06a781ce424ab9ec6cff44f1e015bc7237a3019af5d73774a0b60345b6ed2293b7fa3
-Test: Verify
-Message: 78cb9e8764eae88cc7bcfecb525617286955348da2e9c0958124677a7285334108c0ee2475d0b3404940d6806fb5f7c965c06166bbe3a9b7cfe18316c74be80acf4766af95a4c765011ce6b839e8cd90d58a139a60d675f60f42b421c570ae2647fac001bb7d5b5367e8e44da806d2d6324a03ff87db5ea9b9e0af75630dbfed
-Signature: 62a367ef341b27a22c1ecb52dcfc34180902479129796872ce1b0cdbb678fcb0df10b1f37da5ac9f
-Test: Verify
-Message: f0e673b363e13da716f3288bf4b4993d6ff109e72a28529ce9453a2eb69b3d5256249ff7ebfdb3e3ea1d659040550e46c08d7979d03d3165552a0ee8db63ffa0097b19454508e148a35cd6ad14834226cc7d4371f3bc14f391e1a196b3b44be0e361f854c7fa5f0d18299399c635cd1469387e86eb9f947e74e20dee9785ba4a
-Signature: bd8054b1502e66908555110fc569ac6ddccdea0285a04c81b9ed46ff160a26eedfeb4a8255147239
-Test: NotVerify
-Message: dcbaca556bcbfcc70d2164b348b037467071dc423c11a549aad8d06716ddbee49668724899a84daebf96084efb29f246e7bb6ca967bba2ca82948bca7dde246039c4e8e8cfb593af694f197d6488e164a41f46c8364250b02d81af4cb6f2f9c67da6254d454c4860c3248e58bb277c395d7564bae2fe299263753405f972b7af
-Signature: cc52d6498a412d0b801d243e37a0291644135294bb91fd182f3458c59e60725b21436a401d534497
-Test: Verify
-Message: 901bc4215934ede2f6835d615c38953a95cd48bc09a249a30edcb412b37f5cd4c9ca75d433d383da706382886614579471a97647acaed5377f511241697fe0c90f42b735865abca8dd1beefcef86930267abe2fd143ef25c6f79e2b86a314a0e7b3ce23ee90271c35661f9b58ec721fc8f8ae2d6d88b768cf70c7e704dce721b
-Signature: 69fe1c37cddc2db194719f80d9db24c60618f5e99cda4d645d1be7c3c4ba192c5d8606dc9c2cdc61
-Test: Verify
-Message: e524024ea5f5ef7baaf30efbfadbffd9ca00ccd03d91c23a612e8d3c67ab933023239253c4417cb0d5cb934c7370c193d0d23a03e8d75417832da6766c1c605df090eb4a9966c1ea2cf68e45e0e28828e11f0bd305417ae4ce0b5283a0378fcf438243899cfb75ffa88e383cbacc0c6ef5fd7a970c68ea7839e1c8bb7c94d760
-Signature: 41bfc6a00915f9a7e24e0d4a7a1220aa0c0f3127b0286f8333c9b002a4acba9673717ffb09368caa
-Test: Verify
-PublicElement: 1dd203bc368c505fafbc02d560b4b9f003d93be0f78a11fe60e94c406890ce920be3fab9d9ffe84b80f3fdb9071dc602d7c8165fb62e346847b3918d450b3dcccb4bcff0ab98e3052ae36d1a65caa37c7187bb620c5147870ef676091f5199be871dce4fcda065da9f3568fa70edd637450acaa7e42f128b6a3a0519d86784d4
-Test: PublicKeyValid
-Message: 691699d5c945a8508a41c3c83f768406a904e3bcad75c75e76becc40e67857f0435fd8d61f0b5f0b88ee6276718fcd2d60064b0b5ab7d48d0c5377f23b0c69936d174f80d968c95c8ca93f7bde7cef3914f2379e574c202fd5f12c1735af62774136970acfd2fefdf068f20e5cb403e31dc140ad7caac5fd298f84e6aeda5855
-Signature: 9c2687d271c475a3ca252997642f12c2494e6e1612ca7c28dcebefb178a72071de741a27699cbb58
-Test: Verify
-Message: ad15c247a6d92417670bb015e2c56b2170d449feaea127d898600517e37d88639f43b0f80ecfd52cbf34e83deff0e860208fa308fb9eaf7463d2a87cdb79ab9c1a221341ed8973544dc5d405c0b530d9f5a72ff69a4b20af81d83b4bf47c151b560a65bbfbdff6a74915ec020fec3ba325746462458072a12ac8351de75dbef7
-Signature: 3edf3214d7492ead518c21641cdeeaf11955cf2c9fd41dd6990a3d93b5b996dc65b4480102910be6
-Test: Verify
-Message: fe8aa91c3ff17c55cfeb6ca7d7934f00e1ea15bb63b4fb9d8a94f410486b559ea1eebfb131865289026c0f7e8d058e780e7be2ac0d9dca9929f91942283868ad3cbafa9c9872ef8a3303ade9dc1c8b9b7f11c0afb6ba8b5d9391a444ac07e4e2682730548a6eab50fbe91c60dc909d61cce2853b76c398e25f926e8def8f2136
-Signature: 454f59ad954b584350b19484ee93f3fac35e5a21025acec86b4d2cedb998a838f9c3d801acf7ff52
-Test: Verify
-Message: 53bd313ad31f55de5bf21a35c1a6291bca8e6e0b206736489726884da107c1770fd273f10a707fe051af70d0b5521b5fd25d75280f9fb5f2d880aa1a1b0c5e3e0140ec2bee959f09bccb4cc633f7f2c0ccd08fb6a73645f0ca04aeae9c177ccea19f55c277a5eeb212dd66ed34aee5963080758bdf452099e34a4bdf1b405280
-Signature: 7408d817a92cce7b17409ca4a522ee8d2a05bc6ab21cfaa6c48819dde84f86090139f18c389ec906
-Test: Verify
-Message: 8d67b965319d7ea31ecc8f7538b0042c8175e4de45b0eb7d869b9e3aaa918d1964cae8d5e05846f63261b131009ef5006f152a824c137f957c6c4a31a6f64d081e444b5c159fcc20004b2c5245f8ea982d862f1906fd9d9f98cd5beaca425e57954bf9b22a6ca8585f00199160b47c2c93410c5ccb69ded3b135ea1d706d573e
-Signature: 3c2251163492bf6e777793020a5010959d84a258b28ebc211aeffb54f4f99500f88cf0b2eee180ca
-Test: NotVerify
-Message: 8fa0b50bd675f973a529cb90f5a7be4302794ed969f31dda80a16e0ef6efe2d1ac177399d350aec5463535a82a7374d6c4b7a3ae9ad7fd28cd3f3fe0b69e6363c0d29eba861297352d5bea7a031cddcd582561a29dcd4c60bc63d678b7d751a683a92d8727132c5c1172e11db8fb6fc2789b80cdaa2e841b03e52ced2ff12632
-Signature: 4d6e667824358fe066bf44377146bf2f5f2d92d2adc0aa673fc3912c3ae67bf8d0c529fb1c25776d
-Test: Verify
-Message: 17aeab19d1ee54e4aaaa66144a82f1a348dc53f8f1fa9d1b575c44389e580c5883f8315b2d14d83838b1b679009800f12b3a92c179c4638ad07e28f4836a475fe21900e908d0d6a0e0dc44097a339ed18d4c45d24c400f496e22f556789bffb54dca6dbbf95b2794bae667bb508aa4bb86cac22401a779d049ff035715250ad1
-Signature: 570867e6fd129769612e82d31a833ddfbb9a07833815df754b1db1c729e7a85fa4bee867dbcd42ce
-Test: Verify
-Message: cbdcecd18c9984a189ddd576261b6aebaf3030639731cd79ef7a3faa2af4b9420fa6bb84ff7f701d69624ccb8b73e6496ba1137f157444e81618224339ab687d81c300de67436173556028bd62eff59850f1896dc3611d9cc43c052476d28695174df4383a7f107c43f0a0a4232750af5539c98719900f6ef0fe20a65802cb60
-Signature: bed7f5866b9ec24dc7f0ec818262aa7a2197926c314a353cfdb5d11c7e57685ddc0c1863b7915521
-Test: Verify
-Message: e8cac9ce0ef12933d72bb5ec654590ae24739b0b378f75d32293d3acb85902ef4791b9c603032484b0072f45944210c79ca21787cd9dba1feea5dcdf74ef5dabae66e81531eaf9bb86ce2de21390ce5347da9f760abae4ad641eb5f46c9385b6733feef2721cbf8eb27748fbbaa8e40b7d13c80fc55f0c35daf6f82078bd90c9
-Signature: 35dc7ce798a62cf86653c31306ee9dc5a8ffef2a8c086ebe25b001f990e5f511f780ad9d7eeed027
-Test: Verify
-Message: 95f01262b79dfb8fc98a0217a661456a8b97042d6dd524499daae53a9a70e096377c44dcee8a528083671634dce0677820eb21640f14a2b4a22b8316e32c98b10f6f2af6e91073aa61a15b34660f722408d22e05d359666567b50e225c8434f655203c46620958279c914bb1fbc65e897ba4a2a96f7c697325a0fff6bb50ae7f
-Signature: 9e75e572e76eca4859c954248a01d31921da32e371ecee37eb40aa9c13ca2e65961359e4466e9e72
-Test: Verify
-Message: 64414cf10d118df7436add5cbd54ba23e8af55f7f79d44a22b1369ce64ba21fce90cb1c274acee4981062d07d9276ab859debca30814f90b5969a5f3bd1120176ced102775ed0d4604a58cc3f42e0e179540891fbf8d179a1760dde6a1763ef7861d4298288b41e66481d30a2620fd36330b94e333bff649fe2fea1e28a3d493
-Signature: 212c24985e37ee89e71cbe6d6012b89fa181db569227db91fc0b6f557f377e380cc56c271f7cb77f
-Test: Verify
-Message: 8dcf3f1d21a4d1e15238b6db0e89798e66cc62b60e7d0eee15a550a2e56b47387ddec07aee02cd471418a77a9733c21b22f82ec5e1b4365741a533dfe382b1c3e24cc6314659aecac89eab8ac93c1cfb8d4edc9abcf2de891b95067786844acd32b0091b21c2abc2e65f7be29bbdc1862066230e954c3edd1a0e8044c68a49af
-Signature: 7add75db81ef8d210f6dad09da3d11381324430bc473f003495c0288a42fd93957dfa5321bdc3d82
-Test: Verify
-Message: 0ee654428677f6fd59e6cdcd1406dae8f753dcbca966a88e1db8ab5abf9bbde6e47528287040f8dac93f865cfd023fca2f9dba5d4725fa07da6b004a57fc955a73595573d773007c096afddd9987309e8c78fdc10dca9de053aca00bcde3c3dc9508f5dc1409a41bf1e04c0a408d429ce85abe9d554f285260f3a4527b46e0a4
-Signature: ccfd740744131a05fbfebb26edf96572d3475d6441c042287c109e0aaa4e9db694d074889cb55dfc
-Test: Verify
-Message: 1a21fb1ded7d167c9a590c8bfc4abc10ab1aab159476b834d9d91e24ebb8aa84e5ee3ee72c6b87214519fbd2f70f1630a2fad519dec7735857966237e8db8d46f6d6cd6b0f36aa2bc4095337c4e7e03a3a60c6e268a29b2d846f0cf6d33e1cbf04b09fc1cf37f631ce010cd59b2b91c82b2376896b5ea94b193c1278e438ce87
-Signature: a07b8566ada6bbd54b5fc36b4a3b698cbf60c1ee912a5197ba6e98bd4777a884d6bc66022020de8f
-Test: Verify
-Message: ffc7c4abcca3dae4c21b311e6fb51da2262e53dd491ed515d6cd216d34549a1c40f836ea93c36aec17645380c949258bd0fbd9f2bfb9135727585115615a5a7e9a4ee6541f678a86eb60e72c6e8f14c4a04848af4675cce784732002a42f6c6c25812be108c8132956c74718f6c0c0c5adcff80a7689d93c05d5e62c960aa95e
-Signature: 60b09ca0f393d3398635c5075d114429b6cdc8bcc7e66888f49148be9a9f96edc5014b106de6afe6
-Test: Verify
-Message: 88fb1d5c4fe552db3d7213c906f74702fc102d41cfe636138ac123fbcbce5fe743319fd36e4eb8bc9355c0c7fe0c69b27de19a7c182f4e5016d0b2b82de57aff08e284e7ffdcb18c1217009826cbeba9843706ff8fe9d66ac64bf073fa7253cad02307f07927f625b1d10994f6cd87bd0b2aac23acab8638934a1485ab0ea11e
-Signature: a4e8a3e21168f000ced52e3a35573fb6ba82eaa164813969ad388163d2cb861f472e7cbee985e0e1
-Test: Verify
-Message: 4593c65d5e569a3d1369a916c8e6d4f541080dc192e7e51447745056d5b7bc1c404852c00e0d8b406d32f75ca06e4aecaf74a87f4fb7323a0f63d1efc598427c38e963670f15bcb7fa0451151f05a724c747141d49954caf37562916c8c4ba7a866c908a38e7445912d74d781b240055e078e8d457f9492b1646ef03b5b43ccd
-Signature: 8c8e17b621fc67bbf36704f2356e7755d960fce3a52357c84b778376dcca9f92c91b9be575daf7b0
-Test: Verify
-Message: 6180fb71de61a23cbe0d4383386e0170da515bbd67512b41ef03e0bc2d63fbdf257fc89ffe625fbb1d43da8c84efd80d6974322a1a0ffd4d1158c02753acf7bc0edbc8b2721304dacf0d6100f176f6efb9a0f8c8fd69b385a16cccc9f667b5ea52ed7141f14c8ab10cc1507638db532f012d232fc6384700d7977b39ce6c2f82
-Signature: 4156c005b5e099e4cae1d24a4ef35ae0749e4cdeade8929a74ef00f4f57e18c864ae6a376d8bdb55
-Test: Verify
-Message: e52be63c5733b8e9860af61ee50f73e7f679522cd72f31af10ec93469c938e5b35d0b7a1e4f14b18c9039f442831caa9b659908b22ef92e4e617b4a54ffecf32ca7a981872e2d011d72fae3a11538a9306d9cbb7f8bf12de5291a710b3c625ab3b5f621816bea1ca48c4fb78b82f0b9b7e32d92a71560994ec9145ffe1a4e7c0
-Signature: b07e9d17a45cc2ceeb1fde1299ba0d6b3bcbe7dcc50e823d12ae5d86972fc6e21d499d38120d7638
-Test: Verify
-Message: 1b223eeb3cebfc1575b37c5eba339ca55ab86c9300a64fcfe94d4f6467f1c06f9714190d5f060f84abb0f3b0e89d4db0c04abad218af03bd480d7fdd9afaab1405ab079e2a82334590d84ac71c0c7f85d4ccf76dd5a3e62992c4ec894f15b22edd7fc0789775a2b29dc33c7d5099697a0ed7db3b2f9b2f6c40084f3e7e590d15
-Signature: 199d5f32d2645a1d46ef1cb3ecb15a34eab59b9a8c3cbf5810966097bb9c280e812c22ac298e156a
-Test: Verify
-Message: 7296f7fd229c0893a84a5b7ee87a034416e5ae1edf1e7416d6c9df5f20213cf564aa2175ed32403f220e6aca2893e747d5d3f579d8999ed427a7bfd5aa2f55a1258f0be16b5102dcc163e0d790931baa504e87a3b1991ea00b501067089f0b498fbeccf8f4f1e7a55fbfd35d7a7239a55fcf7d55c0178eb2583eebcf936af626
-Signature: 5e2044f956599ab077c91e0f9f9408dfd3c458c61fe6edfab105b1f711919c0b43bbb7557252b193
-Test: Verify
-Message: 7279097dcfe09b8615d3275b713dced645da08ef435fe783c5e888676fa3daad07bb933594886f78b6f4ab914530c28d2e9967f48ae5c398ff92f09d5c90b6c9702d850d2b42b355f89cf68d5aad25f4c5742ba5bfaa4c62372e9ca425b3bce164a8d81dcc67deb494a20066e60b6da3c4434b191a06f87c249482950362658e
-Signature: c2b345d1c28a149215db60952dac2854103f0260bd4994a0b35394474ab82958d7ceb406f6285f4c
-Test: Verify
-Message: 7c9b50842db0de693441a2c13323de1369e251c07cd49c41877ff69b672d142642ce53805a0e28cd11b7ca313c491e8facd7e382fa241e9d93ffc8df05dcb67a89b4cac6d01e587f12aedb47558ed958fb5b14898f43f284d15c2f46ff47c1d866050b4c2a1947fa52df2dfc172ce9e86d273ccdd368f070584f82c8eea60bb7
-Signature: 363c61fe40b4c0a4f06908df5c46d8a9c98dee71cd1c56f8d7a16c081712cb1b8c92cfd00464a3e7
-Test: Verify
-Message: 0bf43670b5fe01cb48e75a19b519f324451ccbb3d85d8ef15c41311b906aca6efb48ad5027e4cdbd23e951f538f47564ea1da4d133c6d4cbfba32151db0aadc1137db703c975faf58471481ae93f677fb48a2ceffaa5d6579d97ad7c1067dbdb4da98ae01349404c659777e04093804f9b7b9a63a5934e6e3a340df4a7180d96
-Signature: bbefc869907609019f4a85294aa854961e51c4884c235f4cdf85c4c3e0ff34069183ebf0ef50bb9f
-Test: Verify
-Message: 419ff761987d7257a0bc8817abb4077986972726e6ac93f311cab67ac91747fa7d021871b37f1bf8b082b55e6bbf4709b1a0fa099986cc7d2b44d82b4cd9ea5bec6e43f47490a9da6aafb38767d753e83bada47a5eacf6a59aa11758f665e4e6e7db1121b22a35b5253b19c7767542ce7bb7bcb10c972922b6da0b3aa1334e56
-Signature: 29becc5afb5ea31a71b4169b91f9594d0819de2d409e4c0c3bfe8e2ea53e98dc1ad4a72f3e3081b9
-Test: NotVerify
-Message: 31c4c31942471dd6583810807472b62ce7cbbddbac7de47f08d7bb4b6024973f5adcd3f4380a4ea571fd227f9133a22a53829698fc88ba0dfa55746fbe58d6d0d687d43a4fd3c7ba4acb21afdd8f72542df89c8cc90553ee4989d8112713f619dd1e3d82407a7d2c1cfa87a8115f20c1ad84454ecbcca6382bc95dc6532eef31
-Signature: 3c999e56f7ba49e48cb72c76bb7848d4562aa96dbb8c5a3adc19533b00cb2a421fa107b0b956452d
-Test: Verify
-Message: 64a5d78514c2e26b011e7bca8ae480a2770cb50b03bb6fac29db817c30fb6bb87a68c225898ddb885288bb62c70e43f19f8198646850d15dd08ee5ad30d6d34b595e1395a4593dcb3493f8c98e4825055d454dc87f4249b1537e3067469c869e9cbda24d7cdf602d3f760876fa497fd5498facb15f492d9f4be23c238d05dbaa
-Signature: c3a0e8c6df40bb4d672d2438f4f770c141054f1e0b6cd25a0f9d0de138d6c8eb028ae0b23dbd2720
-Test: Verify
-Message: c4d9d647a62a699ce00ac9c55b2197a796fd1e8e2120f2d75a50cadf671a9c2c74a8f7db2ec5a549802e81058d1c95f6ee0e78c92ddce79e82f9a3f3cc088ad0d3a2f934bd6661c0ce4327a26402c2c432171036bca8f8da13df464ed36dc31f5a5f942b4a25d55741e07673d8ec556adaae9caec69f5ee387996dca72617e71
-Signature: 1145693d535af4e7b13ed5801c2539db279007dca94800d15c4f2d184c71cf793feab7e46c52121b
-Test: Verify
-Message: 9981198067ce9d394f53f1233ee06b86075ed7d61142c04f3e54fdcf1ea280f454bf5b76494113c6107a2ae89a76e78e1b356876bc2aeb0582f459257e5b145b368e022d539bdab38d2fae7cd490baa4c1d86b333c74b3b86edd8c25e995cbee1664275ddfd489399eea969746277b00d0c0f8c5e919b09eda88af89b7473ce2
-Signature: 57f2c2fd72f077ef67ceaf46d99753bf796a4712a018b08a786d4c40136256ac0a8618db7dd1eb28
-Test: Verify
-Message: bfcbe3e18f4423b9f21b33fadb4763c2e4221126f11b6c79099e6bd9714008000a2fc249edda520144dcacf16c2e3929488e540ee82a03a65c92f723d2dcc6aff61967778bf8eefa46b98a94eb55bc45aaecd9c7bc6fc3d13a8ee4a53de46be03c61cb82a2f8703cae8bc4fa901362b1c2149a6aa440258f5b6a2a76ebae712c
-Signature: 5c141ab2f4ee5a513c4ee7e9a5e770f294859b1f6551d44ed78029dbbebe181a73e2726f1b553022
-Test: Verify
-Message: 839331e55e6928503c36c0530394dea50f46f78d7bd8fea1ae7894c02a136b4e91b3fbaff91869067196b42fd32e22fbcdf0eaab2b9023af6747ec9f73eddd7bc555ae1fa4e8260ab2844750ba97b8ddbc7773ec3705afc6b68310c09eb20d6f362fa22ef71038d316bad1ae500678c2f594e847386e7c60b6e157194499d4a4
-Signature: 0ad3d7f5ea209ad35ba4a0a17e16483c50f5e4953a692ea71730d7c5c4c13feed38ed90759aa2e86
-Test: Verify
-Message: d4fdc830db8cef7540b6b3ab242cfe3bb59004a3f3c61b60a37cda1890fc7108093249ae98f9dcb7ffaad62b79e76dd72fa4fdfbf878e8355523aeadac5f4882c5ecc97583d638d5e309a8aa3a189925ab4a9348e7e601d129c14b6d7005381bff4383dd13bcbba6e4ec6081df583bfe229afee237aa1d0e156eecb05485f9a9
-Signature: 189c08e378bc9feb81891706f80a9fcd1f10725564e3814342937391e39f8830eaed6702b8579e3d
-Test: NotVerify
-Message: 3fb043ac04c26a1d06fa3f3638e0ab0a218b5a74c36243f4ce1278c606d02b44f1d1027ec6069c17931c6463adb495be5de08e2fc8de583e1f187513085bebd04d579130c4589a607e445f1e33d57110ee17df67f524c4b4fb1f150a896fa955aa3d8afbd6307bb12168c99fa4b957b72c29e45222aca00dba1eefe460827d8c
-Signature: 65ab093718776e0b945e5fa24014468ee40422b3688c00beb21593dd4785c90b350e9471a5dff538
-Test: Verify
-Message: 155f0682c1d481571fd2d93a6bd70e5e2a6fee3702270f03d7b40d9c2c65057eb8c6521448968747d5ebac49e5a4be9f270f616d49dce8061d4287b4ed6fd7c41c368bd6fef47163f9c3ac8fdce330317f657e209c19a2c1eeba6ace8858e86877072a609cc638c2c3b24fa3086c5d2d6cc7bde8b3b6344b80762c83b4f73082
-Signature: 90e0b86567a2b176a74a817d52009c2bb553eb9ac3694f997c5f70ca3936b6d57f1908868ffc7518
-Test: Verify
-Message: 4b03e4a77dd910d51e6c170faa228f3d5c258c96bc44cc986a0d244629292ca62ff8277aab6d353e982bbc62c1e113c815e371812d0916c41ccdb83076a03043a38c651b6511796ba83933c18afdadf6abdc3ef6b6baaab230f6896280d0f50040f97801c37c3456e7cd54a31c2eb3bfb54bcc6c6e0de2583fc270536071d3d3
-Signature: 999adeab789df72dab3c86e115140d0dbb4905adbebe59a1995fbc73fc678a8ca89d7b6cb644569f
-Test: Verify
-Message: a59d6636f5dc1fbe82ec2df71a90657f5ccbbcf1af6e69157de03b45b42e3c227f53877942c96770d450b1f500fd64683e877e87aece219a56ace7e19d01823b07f9981733a1dea012aa7324697c7fc68a7e0c654fa524cb573b2c1a84f18074b52850eac17cbba7b4932a5e4d24eef1b84b1d62880ba9fff824c2ca63186f26
-Signature: 30f81281e18c995d53f02e6d04eb988bb0b8bd3f1af1a7c8447c704f06d7379dae2ccf95ec13edd9
-Test: NotVerify
-
-AlgorithmType: Signature
-Name: DSA/SHA-224
-Source: http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf
-KeyFormat: Component
-Modulus: C196BA05 AC29E1F9 C3C72D56 DFFC6154 A033F147 7AC88EC3 7F09BE6C 5BB95F51 C296DD20 D1A28A06 7CCC4D43 16A4BD1D CA55ED10 66D438C3 5AEBAABF 57E7DAE4 28782A95 ECA1C143 DB701FD4 8533A3C1 8F0FE235 57EA7AE6 19ECACC7 E0B51652 A8776D02 A425567D ED36EABD 90CA33A1 E8D988F0 BBB92D02 D1D20290 113BB562 CE1FC856 EEB7CDD9 2D33EEA6 F410859B 179E7E78 9A8F75F6 45FAE2E1 36D252BF FAFF8952 8945C1AB E705A38D BC2D364A ADE99BE0 D0AAD82E 53201214 96DC65B3 930E3804 7294FF87 7831A16D 5228418D E8AB275D 7D75651C EFED65F7 8AFC3EA7 FE4D79B3 5F62A040 2A111759 9ADAC7B2 69A59F35 3CF450E6 982D3B17 02D9CA83
-SubgroupOrder: 90EAF4D1 AF0708B1 B612FF35 E0A2997E B9E9D263 C9CE6595 28945C0D
-SubgroupGenerator: A59A749A 11242C58 C894E9E5 A91804E8 FA0AC64B 56288F8D 47D51B1E DC4D6544 4FECA011 1D78F35F C9FDD4CB 1F1B79A3 BA9CBEE8 3A3F8110 12503C81 17F98E50 48B089E3 87AF6949 BF8784EB D9EF4587 6F2E6A5A 495BE64B 6E770409 494B7FEE 1DBB1E4B 2BC2A53D 4F893D41 8B715959 2E4FFFDF 6969E91D 770DAEBD 0B5CB14C 00AD68EC 7DC1E574 5EA55C70 6C4A1C5C 88964E34 D09DEB75 3AD418C1 AD0F4FDF D049A955 E5D78491 C0B7A2F1 575A008C CD727AB3 76DB6E69 5515B05B D412F5B8 C2F4C77E E10DA48A BD53F5DD 498927EE 7B692BBB CDA2FB23 A516C5B4 533D7398 0B2A3B60 E384ED20 0AE21B40 D273651A D6060C13 D97FD69A A13C5611 A51B9085
-PrivateExponent: 00D0F09E D3E2568F 6CADF922 4117DA2A EC5A4300 E009DE13 66023E17
-PublicElement: 70035C9A 3B225B25 8F16741F 3941FBF0 6F3D056C D7BD8646 04CBB5EE 9DD85304 EE8E8E4A BD5E9032 11DDF25C E1490755 10ACE166 970AFDC7 DF552B72 44F342FA 02F7A621 405B7549 09D757F9 7290E1FE 5036E904 CF593446 0C046D95 659821E1 597ED9F2 B1F0E208 63A6BBD0 CE74DACB A5D8C68A 90B29C21 57CDEDB8 2EC12B81 EE3068F9 BF5F7F34 6ECA41ED 174CCCD7 D154FA4F 42F80FFE 1BF46AE9 D8125DEB 5B4BA08A 72BDD865 96DBEDDC 9550FDD6 50C58F5A E5133509 A702F79A 31ECB490 F7A3C558 1631F7C5 BE4FF7F9 E9F27FA3 90E47347 AD118350 9FED6FCF 198BA9A7 1AB3335B 4F38BE8D 15496A00 B6DC2263 E20A5F6B 662320A3 A1EC033A A61E3B68
-Test: KeyPairValidAndConsistent
-Message: "abc"
-Signature: 4400138D 05F9639C AF54A583 CAAF25D2 B76D0C3E AD752CE1 7DBC85FE 874D4F12 CB13B617 32D39844 5698CFA9 D92381D9 38AA57EE 2C9327B3
-Test: Verify
-Signature: 5400138D 05F9639C AF54A583 CAAF25D2 B76D0C3E AD752CE1 7DBC85FE 874D4F12 CB13B617 32D39844 5698CFA9 D92381D9 38AA57EE 2C9327B3
-Test: NotVerify
-ModulusSize: 2048
-SlowTest: 1
-Test: GenerateKey
-
-AlgorithmType: Signature
-Name: DSA/SHA-256
-Source: http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf
-KeyFormat: Component
-Modulus: F56C2A7D 366E3EBD EAA1891F D2A0D099 436438A6 73FED4D7 5F594959 CFFEBCA7 BE0FC72E 4FE67D91 D801CBA0 693AC4ED 9E411B41 D19E2FD1 699C4390 AD27D94C 69C0B143 F1DC8893 2CFE2310 C8864120 47BD9B1C 7A67F8A2 59091326 27F51A0C 866877E6 72E55534 2BDF9355 347DBD43 B47156B2 C20BAD9D 2B071BC2 FDCF9757 F75C168C 5D9FC431 31BE162A 0756D1BD EC2CA0EB 0E3B018A 8B38D3EF 2487782A EB9FBF99 D8B30499 C55E4F61 E5C7DCEE 2A2BB55B D7F75FCD F00E48F2 E8356BDB 59D86114 028F67B8 E07B1277 44778AFF 1CF1399A 4D679D92 FDE7D941 C5C85C5D 7BFF91BA 69F9489D 531D1EBF A727CFDA 651390F8 021719FA 9F7216CE B177BD75
-SubgroupOrder: C24ED361 870B61E0 D367F008 F99F8A1F 75525889 C89DB1B6 73C45AF5 867CB467
-SubgroupGenerator: 8DC6CC81 4CAE4A1C 05A3E186 A6FE27EA BA8CDB13 3FDCE14A 963A92E8 09790CBA 096EAA26 140550C1 29FA2B98 C16E8423 6AA33BF9 19CD6F58 7E048C52 666576DB 6E925C6C BE9B9EC5 C16020F9 A44C9F1C 8F7A8E61 1C1F6EC2 513EA6AA 0B8D0F72 FED73CA3 7DF240DB 57BBB274 31D61869 7B9E771B 0B301D5D F0595542 5061A30D C6D33BB6 D2A32BD0 A75A0A71 D2184F50 6372ABF8 4A56AEEE A8EB693B F29A6403 45FA1298 A16E8542 1B2208D0 0068A5A4 2915F82C F0B858C8 FA39D43D 704B6927 E0B2F916 304E86FB 6A1B487F 07D8139E 428BB096 C6D67A76 EC0B8D4E F274B8A2 CF556D27 9AD267CC EF5AF477 AFED029F 485B5597 739F5D02 40F67C2D 948A6279
-PrivateExponent: 0CAF2EF5 47EC49C4 F3A6FE6D F4223A17 4D01F2C1 15D49A6F 73437C29 A2A8458C
-PublicElement: 2828003D 7C747199 143C370F DD07A286 1524514A CC57F63F 80C38C20 87C6B795 B62DE1C2 24BF8D1D 1424E60C E3F5AE3F 76C754A2 464AF292 286D873A 7A30B7EA CBBC75AA FDE7191D 9157598C DB0B60E0 C5AA3F6E BE425500 C611957D BF5ED354 90714A42 811FDCDE B19AF2AB 30BEADFF 2907931C EE7F3B55 532CFFAE B371F84F 01347630 EB227A41 9B1F3F55 8BC8A509 D64A765D 8987D493 B007C441 2C297CAF 41566E26 FAEE4751 37EC781A 0DC088A2 6C8804A9 8C23140E 7C936281 864B9957 1EE95C41 6AA38CEE BB41FDBF F1EB1D1D C97B63CE 13552576 27C8B0FD 840DDB20 ED35BE92 F08C49AE A5613957 D7E5C7A6 D5A5834B 4CB069E0 831753EC F65BA02B
-Test: KeyPairValidAndConsistent
-Message: "abc"
-Signature: 315C875D CD4850E9 48B8AC42 824E9483 A32D5BA5 ABE0681B 9B9448D4 44F2BE3C 89718D12 E54A8D9E D066E4A5 5F7ED5A2 229CD23B 9A3CEE78 F83ED6AA 61F6BCB9
-Test: Verify
-Signature: 415C875D CD4850E9 48B8AC42 824E9483 A32D5BA5 ABE0681B 9B9448D4 44F2BE3C 89718D12 E54A8D9E D066E4A5 5F7ED5A2 229CD23B 9A3CEE78 F83ED6AA 61F6BCB9
-Test: NotVerify
-ModulusSize: 2048
-SubgroupOrderSize: 256
-SlowTest: 1
-Test: GenerateKey
-
-AlgorithmType: Signature
-Name: DSA/SHA-256
-Source: http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf
-KeyFormat: Component
-Modulus: 90066455 B5CFC38F 9CAA4A48 B4281F29 2C260FEE F01FD610 37E56258 A7795A1C 7AD46076 982CE6BB 956936C6 AB4DCFE0 5E678458 6940CA54 4B9B2140 E1EB523F 009D20A7 E7880E4E 5BFA690F 1B9004A2 7811CD99 04AF7042 0EEFD6EA 11EF7DA1 29F58835 FF56B89F AA637BC9 AC2EFAAB 90340222 9F491D8D 3485261C D068699B 6BA58A1D DBBEF6DB 51E8FE34 E8A78E54 2D7BA351 C21EA8D8 F1D29F5D 5D159394 87E27F44 16B0CA63 2C59EFD1 B1EB6651 1A5A0FBF 615B766C 5862D0BD 8A3FE7A0 E0DA0FB2 FE1FCB19 E8F9996A 8EA0FCCD E5381752 38FC8B0E E6F29AF7 F642773E BE8CD540 2415A014 51A84047 6B2FCEB0 E388D30D 4B376C37 FE401C2A 2C2F941D AD179C54 0C1C8CE0 30D460C4 D983BE9A B0B20F69 144C1AE1 3F9383EA 1C08504F B0BF3215 03EFE434 88310DD8 DC77EC5B 8349B8BF E97C2C56 0EA878DE 87C11E3D 597F1FEA 742D73EE C7F37BE4 3949EF1A 0D15C3F3 E3FC0A83 35617055 AC91328E C22B50FC 15B941D3 D1624CD8 8BC25F3E 941FDDC6 20068958 1BFEC416 B4B2CB73
-SubgroupOrder: CFA0478A 54717B08 CE64805B 76E5B142 49A77A48 38469DF7 F7DC987E FCCFB11D
-SubgroupGenerator: 5E5CBA99 2E0A680D 885EB903 AEA78E4A 45A46910 3D448EDE 3B7ACCC5 4D521E37 F84A4BDD 5B06B097 0CC2D2BB B715F7B8 2846F9A0 C393914C 792E6A92 3E2117AB 805276A9 75AADB52 61D91673 EA9AAFFE ECBFA618 3DFCB5D3 B7332AA1 9275AFA1 F8EC0B60 FB6F66CC 23AE4870 791D5982 AAD1AA94 85FD8F4A 60126FEB 2CF05DB8 A7F0F09B 3397F393 7F2E90B9 E5B9C9B6 EFEF642B C48351C4 6FB171B9 BFA9EF17 A961CE96 C7E7A7CC 3D3D03DF AD1078BA 21DA4251 98F07D24 81622BCE 45969D9C 4D6063D7 2AB7A0F0 8B2F49A7 CC6AF335 E08C4720 E31476B6 7299E231 F8BD90B3 9AC3AE3B E0C6B6CA CEF8289A 2E2873D5 8E51E029 CAFBD55E 6841489A B66B5B4B 9BA6E2F7 84660896 AFF387D9 2844CCB8 B6947549 6DE19DA2 E58259B0 90489AC8 E62363CD F82CFD8E F2A427AB CD65750B 506F56DD E3B98856 7A88126B 914D7828 E2B63A6D 7ED0747E C59E0E0A 23CE7D8A 74C1D2C2 A7AFB6A2 9799620F 00E11C33 787F7DED 3B30E1A2 2D09F1FB DA1ABBBF BF25CAE0 5A13F812 E34563F9 9410E73B
-PrivateExponent: 3ABC1587 297CE7B9 EA1AD665 1CF2BC4D 7F92ED25 CABC8553 F567D1B4 0EBB8764
-PublicElement: 8B891C86 92D3DE87 5879390F 2698B26F BECCA6B0 75535DCE 6B0C8625 77F9FA0D EF6074E7 A7624121 224A5958 96ABD4CD A56B2CEF B942E025 D2A4282F FAA98A48 CDB47E1A 6FCB5CFB 393EF35A F9DF9131 02BB303C 2B5C36C3 F8FC04ED 7B8B69FE FE0CF3E1 FC05CFA7 13B3435B 2656E913 BA8874AE A9F93600 6AEB448B CD005D18 EC3562A3 3D04CF25 C8D3D698 44343442 FA3DB7DE 618C5E2D A064573E 61E6D558 1BFB694A 23AC87FD 5B52D62E 954E1376 DB8DDB52 4FFC0D46 9DF97879 2EE44173 8E5DB05A 7DC43E94 C11A2E7A 4FBE3830 71FA36D2 A7EC8A93 88FE1C4F 79888A99 D3B61056 97C2556B 79BB4D7E 781CEBB3 D4866AD8 25A5E830 84607228 9FDBC941 FA679CA8 2F5F78B7 461B2404 DB883D21 5F4E0676 CF549395 0AC55916 97BFEA8D 1EE6EC01 6B89BA51 CAFB5F9C 84C989FA 117375E9 4578F28B E0B34CE0 545DA462 66FD77F6 2D8F2CEE 92AB7701 2AFEBC11 008985A8 21CD2D97 8C7E6FE7 499D1AAF 8DE632C2 1BB48CA5 CBF9F310 98FD3FD3 854C49A6 5D920174 4AACE540 354974F9
-Test: KeyPairValidAndConsistent
-Message: "abc"
-Signature: 5F184E64 5A38BE8F B4A6871B 6503A9D1 2924C7AB E04B7141 0066C2EC A6E3BE3E 91EB0C7B A3D4B9B6 0B825C3D 9F2CADA8 A2C9D772 3267B033 CBCDCF88 03DB9C18
-Test: Verify
-Signature: 5F184E64 5A38BE8F B4A6871B 6503A9D1 2924C7AB E04B7141 0066C2EC A6E3BE3E 91EB0C7B A3D4B9B6 0B825C3D 9F2CADA8 A2C9D772 3267B033 CBCDCF88 03DB9C19
-Test: NotVerify
-ModulusSize: 3072
-SlowTest: 1
-Test: GenerateKey
diff --git a/src-cryptopp/TestVectors/dsa_1363.txt b/src-cryptopp/TestVectors/dsa_1363.txt
deleted file mode 100644
index 3991ae3..0000000
--- a/src-cryptopp/TestVectors/dsa_1363.txt
+++ /dev/null
@@ -1,553 +0,0 @@
-AlgorithmType: Signature
-Name: DSA-1363/EMSA1(SHA-1)
-Source: generated by Wei Dai using Crypto++ 5.0
-KeyFormat: DER
-Comment: 1024-bit DSA key
-PrivateKey: \
-    3082014c0201003082012c06072a8648ce3804013082011f02818100bd670f79\
-    b0cde98a84fd97e54d5d5c81525a016d222a3986dd7af3f32cde8a9f6564e43a\
-    559a0c9f8bad36cc25330548b347ac158a345631fa90f7b873c36effae2f7823\
-    227a3f580b5dd18304d5932751e743e922eebfbb4289c389d9019c36f96c6b81\
-    fffbf20be062182104e3c4b7d02b872d9a21e0fb5f10ded64420951b021509b2\
-    940496d6d9a43bb7ec642c57b302e59b3a515502818100a1c379ba91fe1f9d52\
-    83807b809c698bce4aee6f405f4de8c46becf33c08a63bc5f8088f75b5b6bcfb\
-    0847ccbdee700e4e698652317bbd7a3056404c541136d7332c2b835ef0d1508e\
-    f57b437de60675f20f75df0483f242ddeb57efacd180418790f4dec0a8250593\
-    ba36f17316580d50db1383ea93a21247650a2e04af904d041702150355dc8843\
-    45c08fb399b23b161831e94dbe61571e
-PublicKey: \
-    308201b73082012c06072a8648ce3804013082011f02818100bd670f79b0cde9\
-    8a84fd97e54d5d5c81525a016d222a3986dd7af3f32cde8a9f6564e43a559a0c\
-    9f8bad36cc25330548b347ac158a345631fa90f7b873c36effae2f7823227a3f\
-    580b5dd18304d5932751e743e922eebfbb4289c389d9019c36f96c6b81fffbf2\
-    0be062182104e3c4b7d02b872d9a21e0fb5f10ded64420951b021509b2940496\
-    d6d9a43bb7ec642c57b302e59b3a515502818100a1c379ba91fe1f9d5283807b\
-    809c698bce4aee6f405f4de8c46becf33c08a63bc5f8088f75b5b6bcfb0847cc\
-    bdee700e4e698652317bbd7a3056404c541136d7332c2b835ef0d1508ef57b43\
-    7de60675f20f75df0483f242ddeb57efacd180418790f4dec0a8250593ba36f1\
-    7316580d50db1383ea93a21247650a2e04af904d03818400028180255cf6b0a3\
-    3f80cab614eafd5f7b2a6d83b3eafe27cd97b77ae70c7b966707d823f0e6aaaa\
-    41dc005aaefd3a0c269e60a665d2642f5d631ff1a3b8701bc06be9c44ab7367f\
-    77fefeec4c5959cd07e50d74a05af60b059ad3fc75249ecf44774b88b46860d9\
-    c3fa35d033bcfc7b0b2d48dc180d192d4918cddff4f7ebcdaaa198
-Test: KeyPairValidAndConsistent
-Message: 66B92E1E2C44B80F7BFA
-Signature: 06418D4F24A8059553951CA062BBD6E0833ED1745608E1158CA4B8F8FE1CD2AF087B5EEE08FCA0D7A63C
-Test: Verify
-Message: 973266BB0A492248082A
-Signature: 02BA236FE800EECABB85698A76B5485865454B3016010755F0E1BF7CE26FB62BE4FD01141F5CA4144811
-Test: Verify
-Message: 9A6D079ED0CA9D8B40E8
-Signature: 045BA3DB16E6B910DC89A2D26096625F757D62077D049886B85EBC7500884B4DDD1898BC52746C54F68D
-Test: Verify
-Message: AA34DCE67BCDAC927DA6
-Signature: 0835C94121313842ABF04D4960E711D1F0904612BC09840989EEAFF2071522B75957DEAC801574BD22EB
-Test: Verify
-Message: 4EDAC08816AFDBF284DA
-Signature: 08E1574E5299C910694D17075136F41EBD558D1B1805CAA3B6E98DCCC3702F286E76BBD29435CA2CEA5C
-Test: Verify
-Message: D82F2E903230962B8174
-Signature: 0366F1AE94FD2CDEBA4EE879BB8923F0E49CFB921008E6A5C7457E88811D46DC7F297D6A96E909268244
-Test: Verify
-Comment: 1025-bit DSA key
-PrivateKey: \
-    3082014c0201003082012c06072a8648ce3804013082011f028181017310bf02\
-    d70ef2cee45d1cc47ec8ce8cabdd6bf32a560975a42ef057bf9dfd553bc9368d\
-    db154a55d855edaa755e69f511a4c69ba78571cc4b14ddbb0f32a4a9c56c2863\
-    05aa21ec4e35de7390747477b3bd574e7b87cbebde2f665703137a1172350ad2\
-    f48a0884d076ada9db82f104e6b0ad86693cd4adbd0067639102fcf102150b39\
-    49dadf3196f08bca0606f06443afce2fb1d02f028181015f0f6d1729ef2af723\
-    c00e36450a04c7e7681d65b74a6417a53b3eb6036989eff8e0ab11a7ec3ce234\
-    0b7c7a92e1a977aee52555c06c12c4cc28496ddc2598feeb7539ce90d3888e21\
-    f61d7f14746cf67d9fed373afd97e2483700e300ed9da25e7200b363a4727ad2\
-    01194b36ea5f816cf83488c3e527d3a5515870d2da63d6041702150696b0f255\
-    468b7ac18e11632f208ca86383a46724
-PublicKey: \
-    308201b73082012c06072a8648ce3804013082011f028181017310bf02d70ef2\
-    cee45d1cc47ec8ce8cabdd6bf32a560975a42ef057bf9dfd553bc9368ddb154a\
-    55d855edaa755e69f511a4c69ba78571cc4b14ddbb0f32a4a9c56c286305aa21\
-    ec4e35de7390747477b3bd574e7b87cbebde2f665703137a1172350ad2f48a08\
-    84d076ada9db82f104e6b0ad86693cd4adbd0067639102fcf102150b3949dadf\
-    3196f08bca0606f06443afce2fb1d02f028181015f0f6d1729ef2af723c00e36\
-    450a04c7e7681d65b74a6417a53b3eb6036989eff8e0ab11a7ec3ce2340b7c7a\
-    92e1a977aee52555c06c12c4cc28496ddc2598feeb7539ce90d3888e21f61d7f\
-    14746cf67d9fed373afd97e2483700e300ed9da25e7200b363a4727ad201194b\
-    36ea5f816cf83488c3e527d3a5515870d2da63d60381840002818045bf83e62f\
-    50190374b23de5e4a1d0278e9e8e6c8335577d62e80662a380c206e326819c50\
-    82d321dfda1f905fa5a3ead9a2dc769885a27b1fd6a133185dc5a7876a76ab0a\
-    09fe02b7071a924169e4d2d2a67e67ed3628800134183b962c0b313463aa154e\
-    6437d644e025ab234e63d19c129842a61c5e5ea5a06466c858c81c
-Test: KeyPairValidAndConsistent
-Message: 2F585D0CE4FA1CD93880
-Signature: 0643ABF8D3C2F4BAB02CF79D698948A1A416BEC05D00F33CC3D41CA9117E6CD99E5DCBBD4425DA12E98E
-Test: Verify
-Message: 4F09A1F217B8393199EE
-Signature: 052DE620B5628EECCF7C56410CAC2B72A5AD1B5A67072ABF369453BC28A386ACD5939C9985C09338FD03
-Test: Verify
-Message: 03D7110A753B008A76A0
-Signature: 01D44D16B5FDFB8C39AACEA72391A889EECBFFB5E701EB8F46E4FAB96326F73E0CC698E1F66C32FE5C2E
-Test: Verify
-Message: 129F4781D417671F886D
-Signature: 00CE142CE967BA951B9DE26DEFB5B341CB49247C1308515315449B5533ED469B6470C4E3A3751E35E7BB
-Test: Verify
-Message: 3E1594F559D1248D1112
-Signature: 07B192657E256B60567BF6EB399D8A2DE8FFF7AE8A031A655BEC911A82049155CDB4F2A76A8004AE646D
-Test: Verify
-Message: D6F0354F1B6B253B6997
-Signature: 07FE18E0C00F6AC3CBCB95874AB66A98E34DF74F37059178C920C5D13CE173B8D2832310B9587940F6D9
-Test: Verify
-Comment: 1026-bit DSA key
-PrivateKey: \
-    3082014c0201003082012c06072a8648ce3804013082011f0281810250988282\
-    17d00108030801e5f135fc6fd3010be39e49060a96addc8a081198803402c4b4\
-    6e4ce0750fcbab8cf084c7ca8cae09f1b5482d336fa3af47b96791d02d8143e2\
-    74b1325f2213e17f9384c805f479e52a3117cf84869d395f1bc025c918484478\
-    d2da1880d32bc519f4e6b2fd2d46958795550ce1765f725626f3fc17021536bb\
-    68cd95dab195f14c4534283e7ea50b00cc31a302818100e2782ad6992f4b7e88\
-    787b4d616744b60e095575a177569c4a069e311e38b7240c43343367e23574c3\
-    0e4d9f05afe1fbe61423bab715915c4ccf28aa0ed2f52b092b86c8ec1f9d4795\
-    d6e91c88ba41297625c11a9e1f4f182da13cf51e541038a1266bf32b2dd81ecd\
-    84bb80be8fdf97689942e944b7fbb6981e00cd680ee25f041702152db270c284\
-    328353f979cad99f4133c53acaa6ee71
-PublicKey: \
-    308201b83082012c06072a8648ce3804013082011f028181025098828217d001\
-    08030801e5f135fc6fd3010be39e49060a96addc8a081198803402c4b46e4ce0\
-    750fcbab8cf084c7ca8cae09f1b5482d336fa3af47b96791d02d8143e274b132\
-    5f2213e17f9384c805f479e52a3117cf84869d395f1bc025c918484478d2da18\
-    80d32bc519f4e6b2fd2d46958795550ce1765f725626f3fc17021536bb68cd95\
-    dab195f14c4534283e7ea50b00cc31a302818100e2782ad6992f4b7e88787b4d\
-    616744b60e095575a177569c4a069e311e38b7240c43343367e23574c30e4d9f\
-    05afe1fbe61423bab715915c4ccf28aa0ed2f52b092b86c8ec1f9d4795d6e91c\
-    88ba41297625c11a9e1f4f182da13cf51e541038a1266bf32b2dd81ecd84bb80\
-    be8fdf97689942e944b7fbb6981e00cd680ee25f038185000281810179b283f6\
-    7868aeded3a0c5633d0e6c18fad77174e2c89c03452593d05e77a9fb029c0ccb\
-    2b6f2328e79c286ee392713f12d9d45578348383b81d11b0e0f7e89965a7785d\
-    5ab64ea25bb73e8acaa8e84cb9897985015757a48c0b1dac3a6a606fe671ea07\
-    3ec434a46f227b8d4b02a46fbba2f6c6216736d669f55778d81004d8
-Test: KeyPairValidAndConsistent
-Message: 7E4F2ED4E79062778A2D
-Signature: 03DF91D560884BAA90258F0F78A7AB61F9A4A5CF3D363E8DE2EAAB389B9492C2B80C44509BF2372BDEE0
-Test: Verify
-Message: A0E35846B5CF1B5BF560
-Signature: 21DF9C60877B6D7F531AAF1C39122779436029685109B2D736A45F51A80099041AA5F118D7D6025AD30E
-Test: Verify
-Message: 3B138785EFC6F520EAE0
-Signature: 10A38520BAC07202DD1CB5A9C88B15B9579B9A1344025E4C4B9D1BC3AAA8C97AA90121D52E42E59A0A99
-Test: Verify
-Message: 0F6BE2AA764B485145D4
-Signature: 0233267173F284737B68D15A500D23F3C86988E3DB28DD55AE3DFEAAA7251D354CB44315D6024CBE3E36
-Test: Verify
-Message: 6CD9FBD23EA58826FB04
-Signature: 15A1B0DDA6BDB62D96AC557E3F1F24DCAD0C51EF3523B01EA2A8FD93761D0E4D070BA6352A81F31B776A
-Test: Verify
-Message: 473A82649565109E9E89
-Signature: 1FE31C3A3EF6F57DE2586A5F2EBD48A5C707092D230E1D217EE0A752EFD9ACA8BF0B9EE9424184B8F8F2
-Test: Verify
-Comment: 1027-bit DSA key
-PrivateKey: \
-    3082014c0201003082012c06072a8648ce3804013082011f028181055402a8ab\
-    e9cda3072ca8601d68032651feb0335856e57f8f8d4ec949098a6459151cefee\
-    f91b7aa733668c8cf0e9b96c93c61f3528d4036daa6565646f65d74c4552817d\
-    f7e5fb1cc421cfd885e27bb811ad227e81b3fa02f7a00bf01ee6e23fb5572a75\
-    f8f29b58bd5f7db435e8a92a923f15d50f34213d29816921bf195b2d0215291d\
-    0ba731a4303070504d8b9615640a5e1345e00f028181051c9d0270b69ceef82a\
-    f5aed5f91dc88d585096609d835d03d39cf3ce74f5a3402d4e8e192455493da6\
-    1cc58ee6f54dd941172be3d7642169cbc52273f4b725f1d6c820c3333336c64d\
-    32fb6238121b3ccb7c71b847764946bb0887a44ca9de802cda62efa9dda57375\
-    1084225353f11ed837f3dc25de8374b6fdbfb6e313e46d0417021513b27094d9\
-    a5a3a9704cebdbe890da325fa26ad555
-PublicKey: \
-    308201b83082012c06072a8648ce3804013082011f028181055402a8abe9cda3\
-    072ca8601d68032651feb0335856e57f8f8d4ec949098a6459151cefeef91b7a\
-    a733668c8cf0e9b96c93c61f3528d4036daa6565646f65d74c4552817df7e5fb\
-    1cc421cfd885e27bb811ad227e81b3fa02f7a00bf01ee6e23fb5572a75f8f29b\
-    58bd5f7db435e8a92a923f15d50f34213d29816921bf195b2d0215291d0ba731\
-    a4303070504d8b9615640a5e1345e00f028181051c9d0270b69ceef82af5aed5\
-    f91dc88d585096609d835d03d39cf3ce74f5a3402d4e8e192455493da61cc58e\
-    e6f54dd941172be3d7642169cbc52273f4b725f1d6c820c3333336c64d32fb62\
-    38121b3ccb7c71b847764946bb0887a44ca9de802cda62efa9dda57375108422\
-    5353f11ed837f3dc25de8374b6fdbfb6e313e46d0381850002818103b06b9909\
-    7cd7145c7d7782b02e247a4741f3c7f39233627f17e13ebff89a18cad6a454c3\
-    f32f7ef2910384030da71ae47e1c3fa79c2141dad107f8e715e47fb0bb626baa\
-    fc35db769852ebbec2d339c3c3d5f2287cfdd20b3b78ea4607086c42558ae463\
-    7eddd6a74bc1072d0f34d9c0130cbc9e84f537e7ce50df502d17b5c3
-Test: KeyPairValidAndConsistent
-Message: AE6DCD9535AEEE3ECC89
-Signature: 1BB090DC4573AA79F34181020C4D5B582BBA67062C23E5DD6913CE91482A05716784BA680F7F4AC1684B
-Test: Verify
-Message: C83A14EAC016D659F9FE
-Signature: 182AC27BC4B77B145BF90E73A2CEEC5325941507F925279DF5B6280664CE82248348C3EDC59DCD428B64
-Test: Verify
-Message: 745E02041EB487D16CE6
-Signature: 13C4F9AC03EA094CF7F60B96CAAA29053706E93DEC1024EAA1606E13B2C3062F2D6082846D29E6E60829
-Test: Verify
-Message: 62F019655A83501FC4E7
-Signature: 077E19089B0BB32A7B21B0D27218C6E1F14AD432181BB76FF5E7EC35EC01CA47595F4C7ABB8ABD6064A9
-Test: Verify
-Message: 351D37A4B5046E885EAA
-Signature: 21962B09FF030A41251AD592F8D2AF24144B3AC713245AF18BE28F192FD29326D91F12A76A01477C8788
-Test: Verify
-Message: 4073D33915F595F4FF9D
-Signature: 1F4CF158E806AFE59139E2A9840BCEF79237800C521E49B7DBDF9830C86E7653FC716B43224EA00C883F
-Test: Verify
-Comment: 1028-bit DSA key
-PrivateKey: \
-    3082014c0201003082012c06072a8648ce3804013082011f0281810abdeff64b\
-    6f28256e4562109bffed29cb5aa95d89cc0ec95da0e773dbff3467c271bbb1e1\
-    fbb6af058517fdacdf26b5919674c625eced6317d8631c063f43b3ade2cd633d\
-    554913339071d6ebed5fd665fc5dd7d47b80721a976c3b14fbd253f0f988c354\
-    725289f2897df0a15985c92b2d4da8d087870c251c72d979b8304d5102152368\
-    e2b864b250ad45406391e7eeaa3d27cd053c2b02818107c325695dfe315a77ad\
-    7b42f0d18f9d4821b5c153fee7385877602fa54477bb8c0639d2438f34352b97\
-    c22d02a7295d2b53d5286a01caa919d6283614690624240af922675ccd4a0534\
-    ec336cb79cde31b02b5988cc5a53ca17790d67d803a27bb927b9c59bdc6ac794\
-    175e285cafdece6778ab19a0b444747fee20d5bf929e70041702150771305163\
-    506b2b83bd5279935df1b5fcf180b004
-PublicKey: \
-    308201b83082012c06072a8648ce3804013082011f0281810abdeff64b6f2825\
-    6e4562109bffed29cb5aa95d89cc0ec95da0e773dbff3467c271bbb1e1fbb6af\
-    058517fdacdf26b5919674c625eced6317d8631c063f43b3ade2cd633d554913\
-    339071d6ebed5fd665fc5dd7d47b80721a976c3b14fbd253f0f988c354725289\
-    f2897df0a15985c92b2d4da8d087870c251c72d979b8304d5102152368e2b864\
-    b250ad45406391e7eeaa3d27cd053c2b02818107c325695dfe315a77ad7b42f0\
-    d18f9d4821b5c153fee7385877602fa54477bb8c0639d2438f34352b97c22d02\
-    a7295d2b53d5286a01caa919d6283614690624240af922675ccd4a0534ec336c\
-    b79cde31b02b5988cc5a53ca17790d67d803a27bb927b9c59bdc6ac794175e28\
-    5cafdece6778ab19a0b444747fee20d5bf929e7003818500028181043e4ae624\
-    4408879264fe6b859b578218705b9a45af22efded27141b7f090cbcbe42dcf48\
-    1df3e41b13920ae02b694eaa6bfd62f2d3c5d677b8c4ce783cbe2789e088b044\
-    89ef535ad4a517351c8835cf128f7ec677a1b1dbe3ae9cc4198ddb6e1cef8e97\
-    8c0725f5063797bc43eb9ae496286cccbad5d4e026e9edb997d2f918
-Test: KeyPairValidAndConsistent
-Message: 4867852C83F181CDD010
-Signature: 1D0F4F49AFA0448163604847C9308A824ECE928E05066D47892256DB725FCB31F93F38B9E02C71E100EE
-Test: Verify
-Message: DA6493C86D6B62C5961C
-Signature: 1BB4A8A1B8D81EEE9AB291C49F688F27D2191EA51B15A5DA66A6367D931DAB338E595C80E70CEE4BB644
-Test: Verify
-Message: AE2C1136BFE966794A6C
-Signature: 02AFAB91234D08FCEC22E57AB5718FBF41A86D2469012F8476BFCF4EA4E03D9F7A6E467ABDD0B5626784
-Test: Verify
-Message: B20160E0442E726BE749
-Signature: 140A45F4933F05807A533628962E42A8BEFAF5977917F2A8D8706B8BE83EE6B6CEBCC951553B4E3203B5
-Test: Verify
-Message: 3638935C4492F5CA42F2
-Signature: 234F78EF68343E77710E17285E47994AB599F3646315C37B8CC01CF6BE9C803D6B81B232DE9171DA7967
-Test: Verify
-Message: DFB674CA6E0FDC0CBE99
-Signature: 1DF9B1B9F78F5FCCCCC5F698EDDBC8EB28C0F4D10002A052284AA4FBA601D3047E3AA97F8CF73731A44B
-Test: Verify
-Comment: 1029-bit DSA key
-PrivateKey: \
-    3082014c0201003082012c06072a8648ce3804013082011f0281811d0f176b67\
-    99b36724c92954c38d0288fa95400c2b14e064f76a6338fccaebca8d978b93bb\
-    76507bc150a50f9fe799fffe12ae2875b13ac1084ffcfde9f62b86185a72f04f\
-    f80538d6eac177edc98d61a517b1275bcf4b57aa262e1702d623bc344db7e562\
-    1c949a9b12e9936e88fae9b200a1f8ad5b40ec8220aa301267f38dd702153357\
-    536531dec150be0ef8747f69ea30d987ff7df1028181067dd80dbc6b41f58d08\
-    f077a9a3dcbfe12a62065fe6b4691c457f506b56dcab0433b3aad6ef96250163\
-    3d0f3947b491a1317e7e6b632f062c53104d609c9222b056f08a0c83662a7074\
-    4331fd09b2b42fb0768e52da27e92732106fbd41ec737373fd080b56b543d808\
-    d49eeb6e1bb0a8619b1edee8fb8295dc042423f684af8a041702152dcdc00a86\
-    ecc2a60ebfa6660a83af1d7c3e570b85
-PublicKey: \
-    308201b83082012c06072a8648ce3804013082011f0281811d0f176b6799b367\
-    24c92954c38d0288fa95400c2b14e064f76a6338fccaebca8d978b93bb76507b\
-    c150a50f9fe799fffe12ae2875b13ac1084ffcfde9f62b86185a72f04ff80538\
-    d6eac177edc98d61a517b1275bcf4b57aa262e1702d623bc344db7e5621c949a\
-    9b12e9936e88fae9b200a1f8ad5b40ec8220aa301267f38dd702153357536531\
-    dec150be0ef8747f69ea30d987ff7df1028181067dd80dbc6b41f58d08f077a9\
-    a3dcbfe12a62065fe6b4691c457f506b56dcab0433b3aad6ef962501633d0f39\
-    47b491a1317e7e6b632f062c53104d609c9222b056f08a0c83662a70744331fd\
-    09b2b42fb0768e52da27e92732106fbd41ec737373fd080b56b543d808d49eeb\
-    6e1bb0a8619b1edee8fb8295dc042423f684af8a0381850002818113834f0fa1\
-    f42abf7dbd264cb7d2eb5798da8972df67f517c62d7ae5070fd588d61db62e49\
-    2f9654833e876ed5737df35069f5ee01a45de881d8f5e68ec52ad9ef32780e8c\
-    453a5f1e38cc17bc5cd061a3c122080f6e1b82d31877e8b08f634f497bd90b06\
-    824eaa0416c64104ce5622c272673d0dedb836ac7d47e0cea0673902
-Test: KeyPairValidAndConsistent
-Message: 1E34034C47FE533F8FF5
-Signature: 04E171B845E602A871CD5DACA5738BC4585A452A86108D03D70C3D2D605FAE90DB8D339AADB692EB1ABE
-Test: Verify
-Message: 53D2CA23AF7DF95634F0
-Signature: 1327D4C32DFB874EA2104A9B30EAF288C7016146D1217C237E0201482E483EBC7F0A713748547F9B6B21
-Test: Verify
-Message: 0F056E08AE77B3B30F33
-Signature: 1B4A688745F3D86B0D8A5D97FFA0E31C322EFAAD0A0FCD907B2D49EB8150539E81FF29341EC34440425C
-Test: Verify
-Message: F08C80E8FD38A3867B76
-Signature: 0972705B5E84A8BA57226C770CCB0ECDEBC816EA162FCB3BA5B3C235105EA75F379EE84187E27A86D21D
-Test: Verify
-Message: 6D392690B92B3E75020F
-Signature: 185968475C67C936CB152F76E80EE22FB82A27ED120C5C0ADB2D750D2C38F0A9671EBFEC2815F675C24C
-Test: Verify
-Message: 10AE0E091A267641FACF
-Signature: 1AC3C2010BFB10CA6889120A23F984FE0D4CF79D1B07578217E5A3C68EDF05006C1F3F1BFB3848E4ECE5
-Test: Verify
-Comment: 1030-bit DSA key
-PrivateKey: \
-    3082014c0201003082012c06072a8648ce3804013082011f0281812a32d68d31\
-    248024053bf628a94404b9a49d91ade4d7a45b071e93292a7f8c2661d9165f0a\
-    b85491d4b0dc67d335fa7d7dd172cb17193390a55eb000aa97e2b8ed3ee64b73\
-    aa43ea9b8979132c2d966ab03c42cc14782c96e4284ee1136b8515007ed1b1a5\
-    708b5e8d81304fa651edc715918e2299cfe9016dfec5f454d907f59f021527c7\
-    996c1d3729c4cf1de06529e5619771e27ad9eb0281810d87a4b01385da7f43b6\
-    277933c5f0dc8072dcacd5252e1b29f588114a7ac56e377050aa8174b5dda400\
-    f043234e4a746442792734dc80274a00a3676101be94759fc2630b9a85896648\
-    8b12611d03d0b31e7243e124497a754544cee1db10bb0a81cf0b2a68045b76fe\
-    935f641c666fdc788a2b968c6668c669115756b961d9fe04170215091155581e\
-    cb7a0a792ba95c772d9382298bfdfa6f
-PublicKey: \
-    308201b83082012c06072a8648ce3804013082011f0281812a32d68d31248024\
-    053bf628a94404b9a49d91ade4d7a45b071e93292a7f8c2661d9165f0ab85491\
-    d4b0dc67d335fa7d7dd172cb17193390a55eb000aa97e2b8ed3ee64b73aa43ea\
-    9b8979132c2d966ab03c42cc14782c96e4284ee1136b8515007ed1b1a5708b5e\
-    8d81304fa651edc715918e2299cfe9016dfec5f454d907f59f021527c7996c1d\
-    3729c4cf1de06529e5619771e27ad9eb0281810d87a4b01385da7f43b6277933\
-    c5f0dc8072dcacd5252e1b29f588114a7ac56e377050aa8174b5dda400f04323\
-    4e4a746442792734dc80274a00a3676101be94759fc2630b9a858966488b1261\
-    1d03d0b31e7243e124497a754544cee1db10bb0a81cf0b2a68045b76fe935f64\
-    1c666fdc788a2b968c6668c669115756b961d9fe038185000281810d7d22c931\
-    422fc46505887559a51490c2e367cdb40242cdbaeb23024693fd5c68f6a3307c\
-    a34b224457d5aa610b90eca3b39905481daaba7151318f09f974ad664546d14c\
-    87f797e38139ee1e07adba9c775e07b7f7b3edba87d886920d6b2cef5f084359\
-    566b0a3b8b940a65b9ad93fd7ccd1354cdcee3c43c6bd315180498ad
-Test: KeyPairValidAndConsistent
-Message: 23EEE1D0EA8950B8F322
-Signature: 1800356929B316D1E4FA886CAE0CAD56E32506522D0B8440BB7695D522F31CD87079BEA4CA9F18ED4288
-Test: Verify
-Message: 13FA6F2816FB83190A21
-Signature: 207830C2DE87296BC39CD21630F26228F00CF60BC3150CBC82CFA9006534A6C5E354AA281C434A8C2077
-Test: Verify
-Message: D071CCC0C6E4CAE82E5A
-Signature: 054C9C0C30C6B73AAB9E54C11D4EFC82BD6E8680932501D78A58EE305930E72ACD3BB2565023455DEAEA
-Test: Verify
-Message: 22CE83F4803BF3EA2C48
-Signature: 07065A6F5C9A086CB83F2F113895730C1B2FE0DCD90FD6AA887B066D685D3DD6C3C0D95CB8C8A48FBFF1
-Test: Verify
-Message: 7A927EC7BB9CA16C1B0A
-Signature: 24BF344DC7B25F831428078AC0D929A72A29160B6205A1BD4B1B2C5BD8BEFCB650DE23652701DDD4F4EF
-Test: Verify
-Message: 9591B069993E10BC0B84
-Signature: 0E6E6BF91BBC9FB91FCD3CE32907F5B6AB5E88928C1E3BC92649EDFDFE672AFB654C765F2758DE4BD78F
-Test: Verify
-Comment: 1031-bit DSA key
-PrivateKey: \
-    3082014c0201003082012c06072a8648ce3804013082011f0281814d58515f7b\
-    41c4fc87e4fcefe5cf6d84b2d74a9d6f498ae9605fcbf1c59217422001a272ef\
-    91dbd09e7af5ee54126dd4fc44bb1ed624d0dd5dafb984d52781140bba40600c\
-    bd4752d2c32b43253efee57af6964c339570edb24195502e6d424b84bed65ac9\
-    8c6fc52ec90e40a525f1863a53f2fbe2a0a133342eff4337f26ceb93021526f8\
-    6a81a6bb530c2f9b63e3690e95a0894575f4450281811e24828adb4ebf2becdb\
-    dcadf6706631293ad6566803d12479f04a7bb20b6086fe81df164f8bd02c5f41\
-    8c1140d143f11a71170b42d0753c952bfff951b9ca4204868375efaa4afad50b\
-    75787e41c5ab9ce8adcbccecd3716f350bb8aaeca9b6098bd0002d789e1f7db9\
-    c19d9045499877b93ecb4e7c64808b742063bbecf60e29041702150e61a054ee\
-    6510734a80f67a54d8c4151c957ef16f
-PublicKey: \
-    308201b83082012c06072a8648ce3804013082011f0281814d58515f7b41c4fc\
-    87e4fcefe5cf6d84b2d74a9d6f498ae9605fcbf1c59217422001a272ef91dbd0\
-    9e7af5ee54126dd4fc44bb1ed624d0dd5dafb984d52781140bba40600cbd4752\
-    d2c32b43253efee57af6964c339570edb24195502e6d424b84bed65ac98c6fc5\
-    2ec90e40a525f1863a53f2fbe2a0a133342eff4337f26ceb93021526f86a81a6\
-    bb530c2f9b63e3690e95a0894575f4450281811e24828adb4ebf2becdbdcadf6\
-    706631293ad6566803d12479f04a7bb20b6086fe81df164f8bd02c5f418c1140\
-    d143f11a71170b42d0753c952bfff951b9ca4204868375efaa4afad50b75787e\
-    41c5ab9ce8adcbccecd3716f350bb8aaeca9b6098bd0002d789e1f7db9c19d90\
-    45499877b93ecb4e7c64808b742063bbecf60e290381850002818119b50f1eea\
-    45bfaa22352a38f3c3b86d6f670747ac2fd94359608e25f2bb9f602506bc3572\
-    45deeb4c3c702d435c557da4f4a9fd37330a75547c91681fdbb51f286adb498d\
-    1e489e89b2e6a4eb9ff30222c51fefbeac7435f629f536ac2d6b87664d80e5c9\
-    7398cf489a1d1ca217f7f21ea8e409f938378875cf5f528162e3bc07
-Test: KeyPairValidAndConsistent
-Message: B4B3C8FBE82013228A21
-Signature: 0E08FE696A4C70B16A127CAE8C61E5B38B7A1F34402584D1F21F71016054E820E3B1BB866309D93A7DA5
-Test: Verify
-Message: 17D2D18302173E2CE992
-Signature: 0203C3869E15F8847B58BD158CB746433AA05F201317C0541908ACD5EA78A02D1FAB79380619199CC5B8
-Test: Verify
-Message: 8032AE177D6DF38C7E27
-Signature: 1F436F5BC73A3402221B539F1D7CCBD4C3AE948418216122809E062ACF5D6086546FCBB293B4C7510CBD
-Test: Verify
-Message: 768640A60A3C62E02428
-Signature: 0A5D52C534A9BF1175247538638077489537025975254955F8A96B0CA2E7985D5D6E3DD54EE298C90100
-Test: Verify
-Message: B0999CA45B77ED63639D
-Signature: 144DDD0C1BE6D96FC3AFFA240FCD6D2AD0748C848F0C8A25AE8AC2E55A38DE9DBBAFF90CF464547365E2
-Test: Verify
-Message: 587EDB968FA82C12C930
-Signature: 01FC4F6F98898F3639E8D93E7C2E6F3945120AD19D15EA13EDC96BED7E73A7D5D161217F1C67F3048BE3
-Test: Verify
-Comment: 1032-bit DSA key
-PrivateKey: \
-    3082014e0201003082012e06072a8648ce3804013082012102818200d551680a\
-    62ebf98f0ed8930cc5b12de86d0a0c29a0d7e5524c24672a25428833f4c19ac8\
-    83ead22efcc0c6823f2e942c17adb7ab763ff2c7cc2698fa8b6448e514d4628b\
-    197721bdaec780e126ac80ac83f24fef5c154f7690ceba903748be5212e3180e\
-    a718ca7a71a49dee939bf9bc5b7845c9648d074587ccd3724493b91f0902152e\
-    802b5369c3f1ddfa789bf8f2ad2e048ced3bf35502818200a9aebee7d29f90b0\
-    81afc4d496a6a78210e918bb57a8a21c5995586c0bf20f7a56bb10a97e05a3a7\
-    23e7db64612b12bb591b1fe7d2e46be8c96a7b2ce7c66076aeded938775ae222\
-    3900adaf52a93f52d62173c82d4b67388c85d4c1127e1edf4643cf09f5375b60\
-    c19316c4f8f8fd7daea1d8b44a2d03e97c2741537f63d86b4a041702150f66e0\
-    4c5a75d3eac03d744e5432f23e3aea066a63
-PublicKey: \
-    308201ba3082012e06072a8648ce3804013082012102818200d551680a62ebf9\
-    8f0ed8930cc5b12de86d0a0c29a0d7e5524c24672a25428833f4c19ac883ead2\
-    2efcc0c6823f2e942c17adb7ab763ff2c7cc2698fa8b6448e514d4628b197721\
-    bdaec780e126ac80ac83f24fef5c154f7690ceba903748be5212e3180ea718ca\
-    7a71a49dee939bf9bc5b7845c9648d074587ccd3724493b91f0902152e802b53\
-    69c3f1ddfa789bf8f2ad2e048ced3bf35502818200a9aebee7d29f90b081afc4\
-    d496a6a78210e918bb57a8a21c5995586c0bf20f7a56bb10a97e05a3a723e7db\
-    64612b12bb591b1fe7d2e46be8c96a7b2ce7c66076aeded938775ae2223900ad\
-    af52a93f52d62173c82d4b67388c85d4c1127e1edf4643cf09f5375b60c19316\
-    c4f8f8fd7daea1d8b44a2d03e97c2741537f63d86b4a038185000281812640c1\
-    88055329f0b44aaf80f82f7fc7f0e421031834dfbd1fb6d6af6ab3e1c173c901\
-    370a4ce2793c1b88d12f764c58ff064905da9c5001f679c7508972f237bccca5\
-    6524787466a7c9c2d6bb6392963008ed1a3e4cf3b13e66086bce3a4ca04d8cab\
-    cf0cadb4c403c7d02a858460d04350e730289cb5adf200b5fdf1198168b5
-Test: KeyPairValidAndConsistent
-Message: 909068BEFFA43331FDC7
-Signature: 2CCCFF8A67073E5DF643B61A5AE7A5BC216FE267E713B9005F69797B44ECD33BA5DD87461B5C72C50390
-Test: Verify
-Message: AC8AFC7A1D9105539E10
-Signature: 0A2BEB58D806EECDDCBD590EBE4AE5AE7BDA326EA0072ADB9FA6A6FEBF40488C80690A2B1DF141BACF91
-Test: Verify
-Message: 310E40311BB3F77F9483
-Signature: 28726153B52FE75F1FAA4C97124EE042065D2C90B50B43F885FC45C42C3ED9BDC4EC2D36A2799A041C67
-Test: Verify
-Message: 35455ABD53E6FB11ED9B
-Signature: 15B3D6ACA9EAD5AA1501ED201335AF9B46657A4CBF00D19328018D82624D4BD9B22D645429B385DADBCA
-Test: Verify
-Message: 95FFA73B52F0D06A0C1E
-Signature: 2904FA8F78B6DF0D15A08714C8F86B97532A9D13B617EC03F329DA20E42816CCF45DBACB432B1F5011C8
-Test: Verify
-Message: 1E9934125DA6E9B4E975
-Signature: 1666A3B9DBE26F2AE3F9BF7CBF47989D87AF82F580147BEC8350E21D4DB0691074F63B85A3A7D8E82A8D
-Test: Verify
-Comment: 1536-bit DSA key
-PrivateKey: \
-    308201d4020100308201b006072a8648ce380401308201a30281c100fada6e4b\
-    ecef964a85caf9e129639a5616ac000dbac59bd50b84bc8d464114079c34c5b5\
-    8d7d40027faaf037c6a649c527cb002d3a716bdef62b6c94d7a47a8b65c2ebac\
-    05da09e40cdc417024cccba267a98f4eb69701a276b4f117662b566605c36054\
-    e7f015d2e5f81331e5666ec17ebf71907788b40cbcea0f24aaffb029ef5c25c5\
-    5ae998f28a2ddb091d262c32ad324f4e64c7b4b50a19e9d92f6d8024188627cf\
-    5ce68674e7ec7da38fd6cf4ec29a6ce2f17e3188d8ef6b0e50d77d5b0219232c\
-    f9bee9d56c8bd8252d1edb59d99c40cf32d07d9e5a48930281c100f028143e3f\
-    9d1317aafb814215ffda9c584da8943e96212c90a082c3d2f335e8a6b64d1c89\
-    0aa2224ebf158bec2b6fe6bad236417acd517a4907331e0be0dd0b801218ac27\
-    0acdd45579290be1b94bc418b8f82c651d82a19d2f0e1cbb0fbc0f054d95150a\
-    f96f9a7488010787a799c544883ff76a4e3092f2ca9aa9000cecb88dda343c97\
-    2c8192a83820727b1945c1a270cf913ab932457e8e6e207d06cd0efdf265b762\
-    b9fa15c9a14633af17204ba2b755ed1b3b421ac596a2a04e64be43041b02191d\
-    4cedc87d55eea31bd702139b90be08d58692a1f97628a01b
-PublicKey: \
-    3082027c308201b006072a8648ce380401308201a30281c100fada6e4becef96\
-    4a85caf9e129639a5616ac000dbac59bd50b84bc8d464114079c34c5b58d7d40\
-    027faaf037c6a649c527cb002d3a716bdef62b6c94d7a47a8b65c2ebac05da09\
-    e40cdc417024cccba267a98f4eb69701a276b4f117662b566605c36054e7f015\
-    d2e5f81331e5666ec17ebf71907788b40cbcea0f24aaffb029ef5c25c55ae998\
-    f28a2ddb091d262c32ad324f4e64c7b4b50a19e9d92f6d8024188627cf5ce686\
-    74e7ec7da38fd6cf4ec29a6ce2f17e3188d8ef6b0e50d77d5b0219232cf9bee9\
-    d56c8bd8252d1edb59d99c40cf32d07d9e5a48930281c100f028143e3f9d1317\
-    aafb814215ffda9c584da8943e96212c90a082c3d2f335e8a6b64d1c890aa222\
-    4ebf158bec2b6fe6bad236417acd517a4907331e0be0dd0b801218ac270acdd4\
-    5579290be1b94bc418b8f82c651d82a19d2f0e1cbb0fbc0f054d95150af96f9a\
-    7488010787a799c544883ff76a4e3092f2ca9aa9000cecb88dda343c972c8192\
-    a83820727b1945c1a270cf913ab932457e8e6e207d06cd0efdf265b762b9fa15\
-    c9a14633af17204ba2b755ed1b3b421ac596a2a04e64be430381c5000281c100\
-    819c8cedb9c014aa577e9046b90795accbebe81bef68b1b5c37c68cb357e1a5f\
-    f92761bc26cb0953956b6c0aec05acfc9d1a27c50789793b13d9eaf2361760c9\
-    7a7d86e7d922f4809a5d2d01448e938190bbc24c150e03ef8305365ddbf5ca19\
-    6857314e3b3023f8ddc9d209bd7dad1ee763e7003fd1b0c53057d2e9acadd23a\
-    a18f83d20143bc41a2dfa4a164c82621fc0f800052ec01bec7c99c66fe20ec57\
-    67e6fbbe8810cd5aa75eff3d8a4cb53e1259ebcfebcc2fcf21ba7f3589cd525a
-Test: KeyPairValidAndConsistent
-Message: 9F6DC301DF53FE22CAC0
-Signature: 15B22111FEFA4AC1E53F2FEC346559E3613BB94F7BB3E2B7551D8B982FA10C38E7F182834DFC7391155FFA42AB945A29E118
-Test: Verify
-Message: 2D7B5B9A27EAB468331E
-Signature: 029EEA97097FE926DD09821284BCA3F45750B1F8102380D20100596D914DBF6BEFBE1B7A938E3AA5D656B6FD99E8EEE7C606
-Test: Verify
-Message: F552FCBBA04FFCCC5CB6
-Signature: 115DE3CC1553CD5E4D40CCED80146DB1D76C10D992AACBCBCB05375C5FDA9F65B9A19DF7E51E6A36A3F2830AEA433AFD4F8B
-Test: Verify
-Message: 0D52B894153A4BB74068
-Signature: 0F6B8CC28D82E22B9B87D62CFF5C7B2289BB2F8008C42F105B2322CF95BC6D443A9D89A292F482490D94693A44DDF7AC4BD3
-Test: Verify
-Message: 294442E103CC0CBA32A6
-Signature: 0FBD8768A18C2B28CE95775AD734157C34C1C3961C1DBBAFDD0A3E92A312A7925AFC9F7F4760FB0C56B42A2042C6B8B37C0E
-Test: Verify
-Message: E993D8FE1E6F6C3914ED
-Signature: 0559D66BAC906C607BBA769AAFEB93E9AEC55FDD4597E432870CDC8A3DF9778301A0B218C886F6B08A414C51BD2F8214201A
-Test: Verify
-Comment: 2048-bit DSA key
-PrivateKey: \
-    3082025d0201003082023506072a8648ce3804013082022802820101009a0886\
-    5d2bc9e0cf03d2500b2a08402bb9dc953d5fcd73f04be61236efc0998a8f012f\
-    00e52f7a6e91e81b88a4c9f985a2da523cbe7caff08cae44963d2035eda72e1f\
-    31f82c8d64c86e686899d53c0200282f407ceb1507db480f1db223606a57466c\
-    f60fe9fc5f7ea7d5fd82ed3ab2cf5e35491dfaef0aa2e10fbfa3cdfeb5ebf65e\
-    4dfc2837e1f6399db06cc2e0420c7b14a4c0d483b742ca58b31fec9f26a64e9b\
-    fcaa82334e644f4b954e2a9c7eeae096b8864ecd223ead3bcf9e8c1f68f6678f\
-    accdb7f26d8f33d8a5fb0cb156cc7daf4a96ec2b730c0d7f666d699f7345a37d\
-    dc1ccdea6d8f439ddb23de04a941b246bc257b0aef544a8e868bc8444f021d03\
-    f35f80fcd896f03eda9ff07f2e35295384c4f3b8f8c4821369ab541702820100\
-    75c5d8c8f72302d92be3bf486b8648330ff86954de5e6e83efef624a277574c1\
-    6757684d3874ee303fa08343fe82dae484e5dda6781280b434c4090044cc7ff9\
-    b6e962594d3ca069815c0f0b6bfd25215a419420d0ef8a1595c6eb1b44a719b4\
-    0131081f75cc15cb09a5d5a029c8546230c30b4af2d4a9f4374c93a095c83b59\
-    4b1774d635d4aee965f1d094469f7bbf8bdc93216a6b8a6c5753b48962335bf2\
-    092aa583c897878c8a7ce61186b592b05d2aea710b673d5994cedb5f117fdb6b\
-    8ad4d89f443c4eb662b428a34a7522c69794cc0274f3eba837e90da86acbc707\
-    4ee3a0b029d970efa48b3d582b740ae0e585d175a5f63a385f8b6b8878b44e1a\
-    041f021d0212c34d3d17b96a899548ebf43bb886676acebd2f040f5b33a4e88d\
-    2d
-PublicKey: \
-    308203423082023506072a8648ce3804013082022802820101009a08865d2bc9\
-    e0cf03d2500b2a08402bb9dc953d5fcd73f04be61236efc0998a8f012f00e52f\
-    7a6e91e81b88a4c9f985a2da523cbe7caff08cae44963d2035eda72e1f31f82c\
-    8d64c86e686899d53c0200282f407ceb1507db480f1db223606a57466cf60fe9\
-    fc5f7ea7d5fd82ed3ab2cf5e35491dfaef0aa2e10fbfa3cdfeb5ebf65e4dfc28\
-    37e1f6399db06cc2e0420c7b14a4c0d483b742ca58b31fec9f26a64e9bfcaa82\
-    334e644f4b954e2a9c7eeae096b8864ecd223ead3bcf9e8c1f68f6678faccdb7\
-    f26d8f33d8a5fb0cb156cc7daf4a96ec2b730c0d7f666d699f7345a37ddc1ccd\
-    ea6d8f439ddb23de04a941b246bc257b0aef544a8e868bc8444f021d03f35f80\
-    fcd896f03eda9ff07f2e35295384c4f3b8f8c4821369ab54170282010075c5d8\
-    c8f72302d92be3bf486b8648330ff86954de5e6e83efef624a277574c1675768\
-    4d3874ee303fa08343fe82dae484e5dda6781280b434c4090044cc7ff9b6e962\
-    594d3ca069815c0f0b6bfd25215a419420d0ef8a1595c6eb1b44a719b4013108\
-    1f75cc15cb09a5d5a029c8546230c30b4af2d4a9f4374c93a095c83b594b1774\
-    d635d4aee965f1d094469f7bbf8bdc93216a6b8a6c5753b48962335bf2092aa5\
-    83c897878c8a7ce61186b592b05d2aea710b673d5994cedb5f117fdb6b8ad4d8\
-    9f443c4eb662b428a34a7522c69794cc0274f3eba837e90da86acbc7074ee3a0\
-    b029d970efa48b3d582b740ae0e585d175a5f63a385f8b6b8878b44e1a038201\
-    050002820100267f9c3ff3ee3cbc0f9e94dc7e6837e1ff65175e967987b90b9a\
-    ea7eef1de6e4c342bebb5dbd0c4e2f6514f2d487857a146dda6cfdbc8b56ed25\
-    4cd65754d84dd21a271cd15fc656274725643728b41ce3f0e6872b6dfb4c289e\
-    03f9b903880ce3d7d745dfbb641c8c42ec0bfb6951ca2611fd877c32248c9725\
-    2bdb42d7bd65ebc50653dff389526c546d1e6ebaf6bd8b3298c01935901b7efb\
-    288b78730d89fba7f46f2a642aee0dbc93aa29c190b201acf89d4f8ba28f3e3f\
-    54a1c5a48294dda908f904afb7db398682c809ce13abd49279221d5b40ad7621\
-    6bad7ca256d718d3552344c481b20da5aac3e637fb7edeaf7960b532ef761376\
-    489f02fa8c10
-Test: KeyPairValidAndConsistent
-Message: 5F3914F7AE0F6C76D152
-Signature: 03D30B7EAADDCB384CECDBB7541DFE57187242C836A6C72AF6C2525E1A01DB97DF3F41156089162FAFC87361F2F28E55616A50633637FB13EFE3
-Test: Verify
-Message: 769583D4E7EAD14C137A
-Signature: 01DC2815FD4918B8D314526066A03AD6593C8CED9E1ED04252B1BBA59D019F1C965028DA88BF4DB35AEDBA2C3C963B7933E5C07C590EF78BDFA1
-Test: Verify
-Message: 6441D5239F50C71DE0F5
-Signature: 013F6D395DE56832F72F17F7F7572BB6DD1C48BADCBDEA91F0A634486E034B617DA8F5AB5E6F78C691313F822C599B6400A0A119A5DA330C6830
-Test: Verify
-Message: F1C2D4F7C3ECDF2C17B7
-Signature: 006441A8B3517613F950BC1C84504082C0C3EA10CC08DCC1DA22E05480036D78345B17244F0DE41DA8342AF3441489CF9880BAA01BF2745CAB3A
-Test: Verify
-Message: 752A1F2B8D9A717A882F
-Signature: 0127027984402F5B8C7DB1B7666FFA787548E4200D26B9D3B20EA9B4370298A9BDC901F324844613E8B5F34F2BFE40D9E6513D0E207B5105A9B1
-Test: Verify
-Message: 666DC6B1E871026EDE56
-Signature: 03E87B55A7E81318B6B7057C901F8E3DC564053C1EA08B1F1FD965453803F21C20CE7FCCF606FB1328EC987666E87AF16ABE6B42DB854BFAA019
-Test: Verify
diff --git a/src-cryptopp/TestVectors/eax.txt b/src-cryptopp/TestVectors/eax.txt
deleted file mode 100644
index 8b77f82..0000000
--- a/src-cryptopp/TestVectors/eax.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-AlgorithmType: AuthenticatedSymmetricCipher
-Name: AES/EAX
-Source: http://www.cs.ucdavis.edu/~rogaway/papers/eax.pdf
-Plaintext:
-Key: 233952DEE4D5ED5F9B9C6D6FF80FF478
-IV: 62EC67F9C3A4A407FCB2A8C49031A8B3
-Header: 6BFB914FD07EAE6B
-Ciphertext: E037830E8389F27B025A2D6527E79D01
-Test: Encrypt
-Plaintext: F7FB
-Key: 91945D3F4DCBEE0BF45EF52255F095A4
-IV: BECAF043B0A23D843194BA972C66DEBD
-Header: FA3BFD4806EB53FA
-Ciphertext: 19DD5C4C9331049D0BDAB0277408F67967E5
-Test: Encrypt
-Plaintext: 1A47CB4933
-Key: 01F74AD64077F2E704C0F60ADA3DD523
-IV: 70C3DB4F0D26368400A10ED05D2BFF5E
-Header: 234A3463C1264AC6
-Ciphertext: D851D5BAE03A59F238A23E39199DC9266626C40F80
-Test: Encrypt
-Plaintext: 481C9E39B1
-Key: D07CF6CBB7F313BDDE66B727AFD3C5E8
-IV: 8408DFFF3C1A2B1292DC199E46B7D617
-Header: 33CCE2EABFF5A79D
-Ciphertext: 632A9D131AD4C168A4225D8E1FF755939974A7BEDE
-Test: Encrypt
-Plaintext: 40D0C07DA5E4
-Key: 35B6D0580005BBC12B0587124557D2C2
-IV: FDB6B06676EEDC5C61D74276E1F8E816
-Header: AEB96EAEBE2970E9
-Ciphertext: 071DFE16C675CB0677E536F73AFE6A14B74EE49844DD
-Test: Encrypt
-Plaintext: 4DE3B35C3FC039245BD1FB7D
-Key: BD8E6E11475E60B268784C38C62FEB22
-IV: 6EAC5C93072D8E8513F750935E46DA1B
-Header: D4482D1CA78DCE0F
-Ciphertext: 835BB4F15D743E350E728414ABB8644FD6CCB86947C5E10590210A4F
-Test: Encrypt
-Plaintext: 8B0A79306C9CE7ED99DAE4F87F8DD61636
-Key: 7C77D6E813BED5AC98BAA417477A2E7D
-IV: 1A8C98DCD73D38393B2BF1569DEEFC19
-Header: 65D2017990D62528
-Ciphertext: 02083E3979DA014812F59F11D52630DA30137327D10649B0AA6E1C181DB617D7F2
-Test: Encrypt
-Plaintext: 1BDA122BCE8A8DBAF1877D962B8592DD2D56
-Key: 5FFF20CAFAB119CA2FC73549E20F5B0D
-IV: DDE59B97D722156D4D9AFF2BC7559826
-Header: 54B9F04E6A09189A
-Ciphertext: 2EC47B2C4954A489AFC7BA4897EDCDAE8CC33B60450599BD02C96382902AEF7F832A
-Test: Encrypt
-Plaintext: 6CF36720872B8513F6EAB1A8A44438D5EF11
-Key: A4A4782BCFFD3EC5E7EF6D8C34A56123
-IV: B781FCF2F75FA5A8DE97A9CA48E522EC
-Header: 899A175897561D7E
-Ciphertext: 0DE18FD0FDD91E7AF19F1D8EE8733938B1E8E7F6D2231618102FDB7FE55FF1991700
-Test: Encrypt
-Plaintext: CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7
-Key: 8395FCF1E95BEBD697BD010BC766AAC3
-IV: 22E7ADD93CFC6393C57EC0B3C17D6B44
-Header: 126735FCC320D25A
-Ciphertext: CB8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC253B4652B1AF3795B124AB6E
-Test: Encrypt
-Plaintext: CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7
-Key: 8395FCF1E95BEBD697BD010BC766AAC3
-IV: 22E7ADD93CFC6393C57EC0B3C17D6B44
-Header: 126735FCC320D25A
-Ciphertext: CB8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC253B4652B1AF3795B124AB6E
-Test: Encrypt
-Plaintext: CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7
-Key: 8395FCF1E95BEBD697BD010BC766AAC3
-IV: 22E7ADD93CFC6393C57EC0B3C17D6B44
-Header: 126735FCC320D25A
-Ciphertext: 0B8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC253B4652B1AF3795B124AB6E
-Test: NotVerify
diff --git a/src-cryptopp/TestVectors/esign.txt b/src-cryptopp/TestVectors/esign.txt
deleted file mode 100644
index da1bcf2..0000000
--- a/src-cryptopp/TestVectors/esign.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-AlgorithmType: Signature
-Name: ESIGN/EMSA5-MGF1(SHA-1)
-Source: Crypto++ 5.0 test vectors, generated by Wei Dai
-Comment: 1536-bit key
-KeyFormat: DER
-PrivateKey: \
-	3082014D0281C100E2A6788AB3CC986AEC06C51690143D3677141645D0628165EE924B9AFB7E6EDD\
-	52D90145B2F6031522C7A6CEC05E358F42B7837DACEA589F868F8DCA1C0F5FD8E5EDB8BBBAFCFF6D\
-	64CFCFBE68F46FBA6EFF45BC9D0CBB4F7F6075F5FFC2049C2F304B51C417764E18D182926E02D411\
-	6CE5C5C010E3D0AA6872A49B0D1FF4B37D54689C31F5821D04E9D4DB34D7536EE7F88B8C481B0EC1\
-	F93193A0B70567E6FD76E9FAC4F67BB47DACD356D0C8015261E068DDF8C34C0CAFCF3FA775577FEB\
-	020120024100FAF0F292EE96D4F449024F86C0A104E0633C722586EC00AD33E0234629825D2081BA\
-	337597889CAC55DC6BEBDD8F13FE3AA2133D6371601A37D195DA7BC45EF3024100EBE16F88887A42\
-	5AA08E271467CC2220DC44012AB24ED4FF3512A96E8CB600C8BBCB771459FF0EE63D4B6786952A83\
-	A7143A775073F0A1D69B6D0B5817755673
-PublicKey: \
-	3081C70281C100E2A6788AB3CC986AEC06C51690143D3677141645D0628165EE924B9AFB7E6EDD52\
-	D90145B2F6031522C7A6CEC05E358F42B7837DACEA589F868F8DCA1C0F5FD8E5EDB8BBBAFCFF6D64\
-	CFCFBE68F46FBA6EFF45BC9D0CBB4F7F6075F5FFC2049C2F304B51C417764E18D182926E02D4116C\
-	E5C5C010E3D0AA6872A49B0D1FF4B37D54689C31F5821D04E9D4DB34D7536EE7F88B8C481B0EC1F9\
-	3193A0B70567E6FD76E9FAC4F67BB47DACD356D0C8015261E068DDF8C34C0CAFCF3FA775577FEB02\
-	0120
-Test: KeyPairValidAndConsistent
-Message: "test"
-Signature: \
-	A3E32065DEDAE7EC05C1BFCD25797D99CDD5739D9DF3A4AA9AA45AC8233D0D37FEBC763FF184F659\
-	14914F0C341BAE9A5C2E2E38087877CBDC3C7EA034445B0F67D9352A79471A523771DB1267C1B6C6\
-	6673B3402ED6F21A840AB67B0FEB8B88AB33DDE4832190632D512AB16FABA75CFD7799F2E1EF671A\
-	7402370EED0A06ADF41565B8E1D145AE3919B4FF5DF1457BE0FE72ED11928F61414F0200F2766F7C\
-	79A2E552205D975EFE39AE2110FB35F480814113DDE85FCA1E4FF89BB268FB28
-Test: Verify
-Message: "test1"
-Test: NotVerify
-
-AlgorithmType: Signature
-Name: ESIGN/EMSA5-MGF1(SHA-1)
-Source: http://www.nttmcl.com/sec/Esign/esign_emsa5_data_ntt.txt, \
-	ESIGN ( IFSSA-ESIGN-EMSA5 ) Test Vector No.1-3 ( 1152 bits )
-KeyFormat: Component
-Prime1: ec8b4bdc9a56ae7b60619814ec45d617246063b5aac39c286f7c82ec2824c245001b678217a7cf178979c7270eb510db
-Prime2: e7b1c3ae3494d0ac7b6868a53a5fe3ba19471437c54b25699e8c348a003e5e1d4c6d244d4f6a78f260c98fc54795a6a3
-Modulus: c5d0b8fac0cc6acc9d52c61200b541f7b4f8ff9f1bda97e0ebf78a3df768ba70ade59306d6ae65655bff7c6a94518c91e43dc0003b6f8730acc244799bdacb1e5070c6ea3089ea83bd5ef0a533adf3d9d63c0e88ce74545cfb21213fc33813fd913c6a6cf84b5adabc7d74751e9945521ac76a790bba95ad48d9d3fb2fbc4b0ed2ddee7d5ea6aa61633eccdac6381fab
-PublicExponent: 0400
-Test: KeyPairValidAndConsistent
-Message: 86f28c1cb5e640548309b85dc6e64c1a
-Signature: 348dc9a0943b1e2ba7ef501cbe970a023b37ca4019b9a5cb35ffc3bcdb28dcbd4193d7817d418bbaf291d97a1eeb918a03ee65caa7ad26c24f9ef807c8798ade5b70d7328cd36ac0844bf63f511bb63067e8236d084cf8af68e88155ea94b978aab6bd0339c55d976434423fc779d549779e81f528d028c7343e060544410e528814fb0874417d1eedf38d6db4b97dd6
-Test: Verify
-Message: 2fd87bfa6c8a965c9e1aaa8e3574202b
-Signature: 561ad8bd11270c71f00af0e0cf256d858c757e8b55b9c4d6fb6bf71598ab59352992656348c1ff1ccda14fb7c5c3b53be49727c07422b78ffc380eeb03be7bdf07b279337af8a1eb7c5bdb725b33a82926b6afb7a1fff0750cc2532c6f96e28d7f1e621cf222b42bb850312f1a5fb7d99acd1c6f6d2347a121dd478374d6a40a7b0cd42e430f01b926135fc8d850366a
-Test: Verify
-Message: 888330ef1dc1588d578badde35c98d1e
-Signature: 915d64d7b9b811fe8b58eaff4c2bf9ce2ad886eef95b28093f8c21f4ca950fdb2f6e77f97d0f2f8158445347f5b3ce33e082f3b5204522e15614d1891078d9557796726b5555cbd8d5489638ecf4738257dea70175fe27de54b1f45c0a96c229bd59260bebfb241e8eacb8a1a23b9a9a79b6d1f52cfed8cca2f1968e37d76c435ad1acd44131ef2c5f5e4ea8a33aee4e
-Test: Verify
-
-AlgorithmType: Signature
-Name: ESIGN/EMSA5-MGF1(SHA-1)
-Source: http://www.nttmcl.com/sec/Esign/esign_emsa5_data_ntt.txt, \
-	ESIGN ( IFSSA-ESIGN-EMSA5 ) Test Vector No.4-6 ( 1152 bits )
-KeyFormat: Component
-Prime1: d64dac2fb3506111bbac11a04e138d2d6f32df119f2f259065cf5785a46aaf404ad887f0a310b36be4a3a1a33c8a054f
-Prime2: d1158628ed1e0695c02a821ab8590f59fc1a3fb1e19ee192ab789e9d963766d78f55cfef9bf58c0c774a32d8a8943955
-Modulus: 92855120174c4a115bf525fa1f2ebf68d8328162149a5a6751b2512584eab7e5582d38d0e5029e01ece85a484030bb884a29121d8924f0195b22842b16436cd36c33bbe843e1cf7a585e89894b14595641d081a3077d667096df251bd93c86ebd94e0d555601794fa66fa2bcea920287c19922bed486a4f631390d1e36cc3635b509cb14c44d50313919a6cbb75eff35
-PublicExponent: 0400
-Test: KeyPairValidAndConsistent
-Message: 16a3632339c463e243a4909f8a3810a8
-Signature: 7d8790ee852a4f3ba8bb3fa0f6fc30c29b6bc2bc538195826544138dcb92500122148ac2cf0dc77dd37182c2267a73317ce5b2ae26db79204abe0e10c7212ba8de99fdc5cf498f7ee689588541fb78291afb9b65242f725a4aa32b119957b4314a58b4239a0235b9b1a8a6efbaa3601961d4b0730a6d9e5659f20105931d473daf3d378b39b7f3f01516d72ade9ef68a
-Test: Verify
-Message: ef8bcad6c164a86b0e0a3c011d556744
-Signature: 6ce6024f64a7f04a0fe29b65cf2ec2ac49d9f90078a77db8bc260d3cfef233165a90b29d5787218b4d05a0e9321f2e802a8ed6d1a4201feb982a5d06bef051d60436d8c61a249432e662e625806526075f02b60d198142b96b67a4ac31d0071a1f971dae5a6a1b6db177591edfe80f7e51c7335441490f05f214b5a1aec94de572e3ec11ef4bebeb42f27037d38a186f
-Test: Verify
-Message: 29023889c79230c1c479820c5ff2e006
-Signature: 85f0b648ee0f6d30a18666e2da8bcda319ede91ca18e018548e2a1c21b0e0049b91528eba4da3be4551b26c4e59e6aba25312874f2320eaf7c94c541e17fb16fb0d9d9928ea526b0fc0c0fb2d12e425a5917e4039a5366585327bc3456107ff31c889c5e04259457dfe65952dc43cd35f4ca689272769096b9583bbffad4a057673f938fa7192bbca44598cf5600e3eb
-Test: Verify
-
-AlgorithmType: Signature
-Name: ESIGN/EMSA5-MGF1(SHA-1)
-Source: http://www.nttmcl.com/sec/Esign/esign_emsa5_data_ntt.txt, \
-	ESIGN ( IFSSA-ESIGN-EMSA5 ) Test Vector No.7-9 ( 1152 bits )
-KeyFormat: Component
-Prime1: fd5708b30e8ee342bacaeb01c0d3baa91a833dacff2878c7df62e04a65afe770acdcefeaf8a72a5809387e5ed97756ef
-Prime2: fa335563d5da151e3ab025f3b77d3f1eaf4a0d431012e79b12ca8ec433d347bd9a2b5179f2ed332a19ea2cad694c97dd
-Modulus: f5072ba25e7df2c0e0a0abde031dda9534a493396ab895e6132abc90f993535ce55d6395e1fd548371228decc1cfefa9737344243ddb1eccbbc22d68571617afb23638c3f0222a84b0a8c9889ab934aa84cc92e14d972670db6d2105bbd0212c1843ff0ccbae19535ac01cf02ad98aa941fce32fac874cea7f1f83969fbaf025fb562a087efb4652210d45279312da7d
-PublicExponent: 0400
-Test: KeyPairValidAndConsistent
-Message: abbf5c71245af5d272e627ec845e9ed4
-Signature: b75e2869c052df20d6c008dd911a5bd752d5a23ee42ae47def37f76f6b2d5f04eb8d9b0783c502e0abd30bc567a6672292c3a6736fe8d4034fad857456cd599259d09f42f1d4c64d244fd149f6316f0b763be0de4f9da7f9649a76b984fe2ae99293d406904a9df59d28cc8a58b7ad0029657a47ac0e28d6353287df1ea8feef2fbb65d86425e80487420c1c9c1bda7e
-Test: Verify
-Message: cf2c943bc4c23175b43ba128c75339d1
-Signature: 64616eb627bf49c2a5a183479a66b7dae12cd1a0982baa0cc12329f594196b9de47909e6b5cf4653bfccdeeb5478fd88c31c197c9adc335a84ec58664ce5fc55c7b2f17b0f32ffac4ff3f3b4ddb3ce125ab7e43efc0be6ae8357895ab5f118a4ec71b57cc1b252373fecd4a1f404ed295f2d97868e3737fdd6fdf124bc2f1e083b57d5c237db775d429d08d5b5ced857
-Test: Verify
-Message: 4d011f09f665d5f4a12595900e3827ec
-Signature: 1911d3df18bdd9907b69ce6b655086c952c92d826bbef199fb1e0dcb7209a1b28d0a03beabc9e7d8df052febe26f691ff808caaac697c3005d524f3da8c700bf620aa37fd0793b3f22c6a488d733336d040642e0767755391951a754a1111345b912b4c0228ab154eb4baac0383a54023bd7c7ea2ed4bb894444b80d7e5f18407f51c3af858b9fa9198190b4b540fce8
-Test: Verify
diff --git a/src-cryptopp/TestVectors/gcm.txt b/src-cryptopp/TestVectors/gcm.txt
deleted file mode 100644
index c301641..0000000
--- a/src-cryptopp/TestVectors/gcm.txt
+++ /dev/null
@@ -1,168 +0,0 @@
-AlgorithmType: AuthenticatedSymmetricCipher
-Name: AES/GCM
-Source: aes-modes-src-07-10-08/Testvals/gcm.1, Basic Tests for GCM (compiled by B. R. Gladman)
-Key: 00000000000000000000000000000000
-IV:  000000000000000000000000
-MAC: 00000000000000000000000000000000
-Test: NotVerify
-Key: 00000000000000000000000000000000
-IV:  000000000000000000000000
-MAC: 58e2fccefa7e3061367f1d57a4e7455a
-Test: Encrypt
-Key: 00000000000000000000000000000000
-IV:  000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: 0388dace60b6a392f328c2b971b2fe78
-MAC: ab6e47d42cec13bdf53a67b21257bddf
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308
-IV:  cafebabefacedbaddecaf888
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
-Ciphertext: 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e 21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985
-MAC: 4d5c2af327cd64a62cf35abd2ba6fab4
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308
-IV:  cafebabefacedbaddecaf888
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e 21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091
-MAC: 5bc94fbc3221a5db94fae95ae7121a47
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308
-IV:  cafebabefacedbad
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: 61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c7423 73806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598
-MAC: 3612d2e79e3b0785561be14aaca2fccb
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308
-IV:  9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728 c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca7 01e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5
-MAC: 619cc5aefffe0bfa462af43c1699d050
-Test: Encrypt
-Header:
-Plaintext:
-Ciphertext:
-Key: 000000000000000000000000000000000000000000000000
-IV:  000000000000000000000000
-MAC: cd33b28ac773f74ba00ed1f312572435
-Test: Encrypt
-Key: 000000000000000000000000000000000000000000000000
-IV:  000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: 98e7247c07f0fe411c267e4384b0f600
-MAC: 2ff58d80033927ab8ef4d4587514f0fb
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308feffe9928665731c
-IV:  cafebabefacedbaddecaf888
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
-Ciphertext: 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c 7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256
-MAC: 9924a7c8587336bfb118024db8674a14
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308feffe9928665731c
-IV:  cafebabefacedbaddecaf888
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c 7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710
-MAC: 2519498e80f1478f37ba55bd6d27618c
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308feffe9928665731c
-IV:  cafebabefacedbad
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: 0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057 fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7
-MAC: 65dcc57fcf623a24094fcca40d3533f8
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308feffe9928665731c
-IV:  9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728 c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e45 81e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b
-MAC: dcf566ff291c25bbb8568fc3d376a6d9
-Test: Encrypt
-Header:
-Plaintext:
-Ciphertext:
-Key: 0000000000000000000000000000000000000000000000000000000000000000
-IV:  000000000000000000000000
-MAC: 530f8afbc74536b9a963b4f1c4cb738b
-Test: Encrypt
-Key: 0000000000000000000000000000000000000000000000000000000000000000
-IV:  000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: cea7403d4d606b6e074ec5d3baf39d18
-MAC: d0d1c8a799996bf0265b98b5d48ab919
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
-IV:  cafebabefacedbaddecaf888
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255
-Ciphertext: 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa 8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad
-MAC: b094dac5d93471bdec1a502270e3cc6c
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
-IV:  cafebabefacedbaddecaf888
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa 8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662
-MAC: 76fc6ece0f4e1768cddf8853bb2d551b
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
-IV:  cafebabefacedbad
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0 feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f
-MAC: 3a337dbf46a792c45e454913fe2ea8f2
-Test: Encrypt
-Key: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308
-IV:  9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728 c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b
-Header: feedfacedeadbeeffeedfacedeadbeefabaddad2
-Plaintext: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a72 1c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39
-Ciphertext: 5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf4 0fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f
-MAC: a44a8266ee1c8eb0c8b5d4cf5ae9f19a
-Test: Encrypt
-Header:
-Plaintext:
-Ciphertext:
-Key: 00000000000000000000000000000000
-IV:  000000000000000000000000
-Plaintext: 000102030405060708090a0b0c0d0e0f 101112131415161718191a1b1c1d1e1f 202122232425262728292a2b2c2d2e2f 303132333435363738393a3b3c3d3e3f 404142434445464748494a4b4c4d4e4f 505152535455565758595a5b5c5d5e5f 606162636465666768696a6b6c6d6e6f 707172737475767778797a7b7c7d7e7f 808182838485868788898a8b8c8d8e8f 909192939495969798999a9b9c9d9e9f a0a1a2a3a4a5a6a7a8a9aaabacadaeaf b0b1b2b3b4b5b6b7b8b9babbbcbdbebf c0c1c2c3c4c5c6c7c8c9cacbcccdcecf d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
-Ciphertext: 0389d8cd64b3a595fb21c8b27dbff077 e784b8b85d5e4f34efe493e48896dfff 002333026a56b2fd08a09c87fcbe85cf f97c902a25bb1f4a43478687f5feb6cd ca9f3fc6ecab732627386ee2996a4cde c5e91f48c293c6a87774b950aeb1d7bf 62321a0d76006297b2d06623cf6e4fb1 433494c3326b0ae914120085a195413f 5e3278e4107d7b08dd2107405610e67d 83ed5b5ba0b591e9e46b1029f5f6936f fdb0e788fc09f60d861a0b3e1ab6294a 76ebdf6663421ef7dd6c1bc448dfcdb7 a0c38bae72fa627ed327f2b46fcec25a 77ee5fd7e3354788643c0d7df15075d5
-MAC: 6b385f3012eafda4189da7ad3b6eafbf
-Test: Encrypt
-Key: 00000000000000000000000000000000
-IV:  000000000000000000000000
-Plaintext: 000102030405060708090a0b0c0d0e0f 101112131415161718191a1b1c1d1e1f 202122232425262728292a2b2c2d2e2f 303132333435363738393a3b3c3d3e3f 404142434445464748494a4b4c4d4e4f 505152535455565758595a5b5c5d5e5f 606162636465666768696a6b6c6d6e6f 707172737475767778797a7b7c7d7e7f 808182838485868788898a8b8c8d8e8f 909192939495969798999a9b9c9d9e9f a0a1a2a3a4a5a6a7a8a9aaabacadaeaf b0b1b2b3b4b5b6b7b8b9babbbcbdbebf c0c1c2c3c4c5c6c7c8c9cacbcccdcecf d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
-Ciphertext: 0389d8cd64b3a595fb21c8b27dbff077 e784b8b85d5e4f34efe493e48896dfff 002333026a56b2fd08a09c87fcbe85cf f97c902a25bb1f4a43478687f5feb6cd ca9f3fc6ecab732627386ee2996a4cde c5e91f48c293c6a87774b950aeb1d7bf 62321a0d76006297b2d06623cf6e4fb1 433494c3326b0ae914120085a195413f 5e3278e4107d7b08dd2107405610e67d 83ed5b5ba0b591e9e46b1029f5f6936f fdb0e788fc09f60d861a0b3e1ab6294a 76ebdf6663421ef7dd6c1bc448dfcdb7 a0c38bae72fa627ed327f2b46fcec25a 77ee5fd7e3354788643c0d7df15075d5
-MAC: 6b385f3012eafda4189da7ad3b6eafbf
-Test: Encrypt
-
-AlgorithmType: AuthenticatedSymmetricCipher
-Name: AES/GCM
-Source: Generated by Crypto++ 5.6.1
-Comment: long test vector with odd length
-IV: f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-Plaintext: r11 006bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710
-Key: 2b7e151628aed2a6abf7158809cf4f3c
-Ciphertext: BD70C168B0D4371B0A85B4B5D65D92569B17	\
-F9A3D0A25B9F608E2C34621CF4D37357845431E04E585CDAAD7527BF8A2426DEEF451320C78D5EF0	\
-9F5B11A8B8C700CD329A3D4CDED92C20F6BF28CB3627681C5B0AF2B5692CC7EC9049008ACBBD127A	\
-9CD8DEF00425697E0BCF67E05AEE70EA1A5D7EE95E3B88FBAF3C196AAAECB73E09BDF057AF701A02	\
-42394BCC104FF4F75F15D287325FCFFDB7E7FF3A939A80A6A3A9D7570E6EF6AD0BBE6E291338938D	\
-2FEBBC7D5EE95CD73E752ACD48915DCAE0A0807E6F4B2ADADBD945667318264EF7D8C2ECC0B8FB67	\
-A43614C5F5EA51CADD4AEE91DC371A7FC5A3B4581D1D9DD99608CD2BB0338F82933C19F5B8EBAD6B	\
-BA583835FBD29136302BAC163F86CA9E3E6F3B5BFDEFAB3E4B019190AE2EBC0B71034EA9BF882879	\
-139FFE76DD997F6729425F3D5C5392762C245769D18CC963C92211B71F564203AFBF68626C083303	\
-1D449B02DFA5C0F09FAFCE951FE35F4AD8122AB682A4AF28931113F75615E12DB05DD9247973F1C6	\
-057666848C13EDE41192F38948366D468D84CAF896EFF724082D2BAB2376E2813B41A014999B0EE7	\
-377758715D9554926AB3514EEB96A0ABD501D94A05692D858190D5AD307CEB6E6C8A63841A8257BE	\
-C2527C4B937840AA51292E15834AB801F0275A6A4B1B6E969B7A7FCE217D6F823CDE1760F847E8F4	\
-6CBDE152A24F2319EC2A7089D2954259D30332089FF928034391D1B0B8AFD7C8A5D4F8E0DAB5883C	\
-A7D581F78E4848DC3B01E5F2A5C01BA8910D0F144BC494E29450271174B866868EE8DC6B0DD396ED	\
-9D72F83DE3BB6DE6FEBC64178961E011D0D746C2CE3A0FBD05CDF8FA79AC03E94C88368BD903E142	\
-7FCFC30C9D100E220B4CB9B7BA242DA49D334E930B6C4EB877D1DF2C0F8CF4AF7813E2F295929707	\
-19846FC52A47FCE6E71DC5E58FC5F49C91BDE56B7A2A68CFA994D6BFA5357A8403A2B37C69A6A0A4	\
-35E4AB4C9E450473AF0CDFDBCC238A2DD7
-MAC: 4FEA89D75727E82B3A9F9EEB5E217A3E
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/hmac.txt b/src-cryptopp/TestVectors/hmac.txt
deleted file mode 100644
index 8bef56f..0000000
--- a/src-cryptopp/TestVectors/hmac.txt
+++ /dev/null
@@ -1,281 +0,0 @@
-AlgorithmType: MAC
-Name: HMAC(MD5)
-Source: RFC 2202
-Comment: Test Case 1
-Key: 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
-Message: "Hi There"
-MAC: 0x9294727a3638bb1c13f48ef8158bfc9d
-Test: Verify
-Comment: Test Case 2
-Key: "Jefe"
-Message: "what do ya want for nothing?"
-MAC: 0x750c783e6ab0b503eaa86e310a5db738
-Test: Verify
-Comment: Test Case 3
-Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Message: r50 0xdd
-MAC: 0x56be34521d144c88dbb8c733f0e8b3f6
-Test: Verify
-Comment: Test Case 4
-Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819
-Message: r50 0xcd
-MAC: 0x697eaf0aca3a3aea3a75164746ffaa79
-Test: Verify
-Comment: Test Case 5
-Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-Message: "Test With Truncation"
-MAC: 0x56461ef2342edc00f9bab995690efd4c
-Test: Verify
-MAC: 0x56461ef2342edc00f9bab995
-#TruncatedSize: 12
-Test: VerifyTruncated
-Comment: Test Case 6
-Key: r80 0xaa
-Message: "Test Using Larger Than Block-Size Key - Hash Key First"
-MAC: 0x6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd
-Test: Verify
-Comment: Test Case 7
-Key: r80 0xaa
-Message: "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"
-MAC: 0x6f630fad67cda0ee1fb1f562db3aa53e
-Test: Verify
-
-AlgorithmType: MAC
-Name: HMAC(SHA-1)
-Source: RFC 2202
-Comment: Test Case 1
-Key: 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
-Message: "Hi There"
-MAC: 0xb617318655057264e28bc0b6fb378c8ef146be00
-Test: Verify
-Comment: Test Case 2
-Key: "Jefe"
-Message: "what do ya want for nothing?"
-MAC: 0xeffcdf6ae5eb2fa2d27416d5f184df9c259a7c79
-Test: Verify
-Comment: Test Case 3
-Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Message: r50 0xdd
-MAC: 0x125d7342b9ac11cd91a39af48aa17b4f63f175d3
-Test: Verify
-Comment: Test Case 4
-Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819
-Message: r50 0xcd
-MAC: 0x4c9007f4026250c6bc8414f9bf50c86c2d7235da
-Test: Verify
-Comment: Test Case 5
-Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-Message: "Test With Truncation"
-MAC: 0x4c1a03424b55e07fe7f27be1d58bb9324a9a5a04
-Test: Verify
-MAC: 0x4c1a03424b55e07fe7f27be1
-#TruncatedSize: 12
-Test: VerifyTruncated
-Comment: Test Case 6
-Key: r80 0xaa
-Message: "Test Using Larger Than Block-Size Key - Hash Key First"
-MAC: 0xaa4ae5e15272d00e95705637ce8a3b55ed402112
-Test: Verify
-Comment: Test Case 7
-Key: r80 0xaa
-Message: "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"
-MAC: 0xe8e99d0f45237d786d6bbaa7965c7808bbff1a91
-Test: Verify
-
-AlgorithmType: MAC
-Name: HMAC(RIPEMD-160)
-Source: RFC 2286
-Comment: Test Case 1
-Key: 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
-Message: "Hi There"
-MAC: 0x24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668
-Test: Verify
-Comment: Test Case 2
-Key: "Jefe"
-Message: "what do ya want for nothing?"
-MAC: 0xdda6c0213a485a9e24f4742064a7f033b43c4069
-Test: Verify
-Comment: Test Case 3
-Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Message: r50 0xdd
-MAC: 0xb0b105360de759960ab4f35298e116e295d8e7c1
-Test: Verify
-Comment: Test Case 4
-Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819
-Message: r50 0xcd
-MAC: 0xd5ca862f4d21d5e610e18b4cf1beb97a4365ecf4
-Test: Verify
-Comment: Test Case 5
-Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-Message: "Test With Truncation"
-MAC: 0x7619693978f91d90539ae786500ff3d8e0518e39
-Test: Verify
-MAC: 0x7619693978f91d90539ae786
-#TruncatedSize: 12
-Test: VerifyTruncated
-Comment: Test Case 6
-Key: r80 0xaa
-Message: "Test Using Larger Than Block-Size Key - Hash Key First"
-MAC: 0x6466ca07ac5eac29e1bd523e5ada7605b791fd8b
-Test: Verify
-Comment: Test Case 7
-Key: r80 0xaa
-Message: "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"
-MAC: 0x69ea60798d71616cce5fd0871e23754cd75d5a0a
-Test: Verify
-
-AlgorithmType: MAC
-Name: HMAC(SHA-224)
-Source: RFC 4231
-Comment: Test Case 1
-Key: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
-Message: "Hi There"
-MAC: 0x896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22
-Test: Verify
-Comment: Test Case 2
-Key: "Jefe"
-Message: "what do ya want for nothing?"
-MAC: 0xa30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44
-Test: Verify
-Comment: Test Case 3
-Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Message: r50 0xdd
-MAC: 0x7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea
-Test: Verify
-Comment: Test Case 4
-Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819
-Message: r50 0xcd
-MAC: 0x6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a
-Test: Verify
-Comment: Test Case 5
-Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-Message: "Test With Truncation"
-MAC: 0x0e2aea68a90c8d37c988bcdb9fca6fa8
-Test: VerifyTruncated
-Comment: Test Case 6
-Key: r131 0xaa
-Message: "Test Using Larger Than Block-Size Key - Hash Key First"
-MAC: 0x95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e
-Test: Verify
-Comment: Test Case 7
-Key: r131 0xaa
-Message: "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.")
-MAC: 0x3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1
-Test: Verify
-
-AlgorithmType: MAC
-Name: HMAC(SHA-256)
-Source: RFC 4231
-Comment: Test Case 1
-Key: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
-Message: "Hi There"
-MAC: b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7
-Test: Verify
-Comment: Test Case 2
-Key: "Jefe"
-Message: "what do ya want for nothing?"
-MAC: 5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843
-Test: Verify
-Comment: Test Case 3
-Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Message: r50 0xdd
-MAC: 773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe
-Test: Verify
-Comment: Test Case 4
-Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819
-Message: r50 0xcd
-MAC: 82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff46729665b
-Test: Verify
-Comment: Test Case 5
-Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-Message: "Test With Truncation"
-MAC: a3b6167473100ee06e0c796c2955552b
-Test: VerifyTruncated
-Comment: Test Case 6
-Key: r131 0xaa
-Message: "Test Using Larger Than Block-Size Key - Hash Key First"
-MAC: 60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54
-Test: Verify
-Comment: Test Case 7
-Key: r131 0xaa
-Message: "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.")
-MAC: 9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2
-Test: Verify
-
-AlgorithmType: MAC
-Name: HMAC(SHA-384)
-Source: RFC 4231
-Comment: Test Case 1
-Key: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
-Message: "Hi There"
-MAC: afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6
-Test: Verify
-Comment: Test Case 2
-Key: "Jefe"
-Message: "what do ya want for nothing?"
-MAC: af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649
-Test: Verify
-Comment: Test Case 3
-Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Message: r50 0xdd
-MAC: 88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc13814b94e3ab6e101a34f27
-Test: Verify
-Comment: Test Case 4
-Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819
-Message: r50 0xcd
-MAC: 3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e1f573b4e6801dd23c4a7d679ccf8a386c674cffb
-Test: Verify
-Comment: Test Case 5
-Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-Message: "Test With Truncation"
-MAC: 3abf34c3503b2a23a46efc619baef897
-Test: VerifyTruncated
-Comment: Test Case 6
-Key: r131 0xaa
-Message: "Test Using Larger Than Block-Size Key - Hash Key First"
-MAC: 4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4030fe8296248df163f44952
-Test: Verify
-Comment: Test Case 7
-Key: r131 0xaa
-Message: "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.")
-MAC: 6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e799176d3860e6110c46523e
-Test: Verify
-
-AlgorithmType: MAC
-Name: HMAC(SHA-512)
-Source: RFC 4231
-Comment: Test Case 1
-Key: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
-Message: "Hi There"
-MAC: 87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854
-Test: Verify
-Comment: Test Case 2
-Key: "Jefe"
-Message: "what do ya want for nothing?"
-MAC: 164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737
-Test: Verify
-Comment: Test Case 3
-Key: 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Message: r50 0xdd
-MAC: fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb
-Test: Verify
-Comment: Test Case 4
-Key: 0x0102030405060708090a0b0c0d0e0f10111213141516171819
-Message: r50 0xcd
-MAC: b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2de2adebeb10a298dd
-Test: Verify
-Comment: Test Case 5
-Key: 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
-Message: "Test With Truncation"
-MAC: 415fad6271580a531d4179bc891d87a6
-Test: VerifyTruncated
-Comment: Test Case 6
-Key: r131 0xaa
-Message: "Test Using Larger Than Block-Size Key - Hash Key First"
-MAC: 80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598
-Test: Verify
-Comment: Test Case 7
-Key: r131 0xaa
-Message: "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.")
-MAC: e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58
-Test: Verify
diff --git a/src-cryptopp/TestVectors/mars.txt b/src-cryptopp/TestVectors/mars.txt
deleted file mode 100644
index 82a7ff5..0000000
--- a/src-cryptopp/TestVectors/mars.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: MARS/ECB
-Key: 80000000000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: B3E2AD5608AC1B6733A7CB4FDF8F9952
-Test: Encrypt
-Key: 00000000000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: DCC07B8DFB0738D6E30A22DFCF27E886
-Test: Encrypt
-Key: 00000000000000000000000000000000
-Plaintext: DCC07B8DFB0738D6E30A22DFCF27E886
-Ciphertext: 33CAFFBDDC7F1DDA0F9C15FA2F30E2FF
-Test: Encrypt
-Key: CB14A1776ABBC1CDAFE7243DEF2CEA02
-Plaintext: F94512A9B42D034EC4792204D708A69B
-Ciphertext: 225DA2CB64B73F79069F21A5E3CB8522
-Test: Encrypt
-Key: 86EDF4DA31824CABEF6A4637C40B0BAB
-Plaintext: 4DF955AD5B398D66408D620A2B27E1A9
-Ciphertext: A4B737340AE6D2CAFD930BA97D86129F
-Test: Encrypt
-Key: 000000000000000000000000000000000000000000000000
-Plaintext: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Ciphertext: 97778747D60E425C2B4202599DB856FB
-Test: Encrypt
-Key: D158860838874D9500000000000000000000000000000000
-Plaintext: 93A953A82C10411DD158860838874D95
-Ciphertext: 4FA0E5F64893131712F01408D233E9F7
-Test: Encrypt
-Key: 791739A58B04581A93A953A82C10411DD158860838874D95
-Plaintext: 6761C42D3E6142D2A84FBFADB383158F
-Ciphertext: F706BC0FD97E28B6F1AF4E17D8755FFF
-Test: Encrypt
-Key: 0000000000000000000000000000000000000000000000000000000000000000
-Plaintext: 62E45B4CF3477F1DD65063729D9ABA8F
-Ciphertext: 0F4B897EA014D21FBC20F1054A42F719
-Test: Encrypt
-Key: FBA167983E7AEF22317CE28C02AAE1A3E8E5CC3CEDBEA82A99DBC39AD65E7227
-Plaintext: 1344ABA4D3C44708A8A72116D4F49384
-Ciphertext: 458335D95EA42A9F4DCCD41AECC2390D
-Test: Encrypt
-Key: 00000000000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: 3FE24DC09173D15F4616A849D396F7E3
-Test: EncryptionMCT
-Key: 00000000000000000000000000000000
-Plaintext: 24BD3D2FC6FEE152D1D64545E2230584
-Ciphertext: 00000000000000000000000000000000
-Test: DecryptionMCT
-Key: 000000000000000000000000000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: 34EC834E2F30741ECB476DA7E9662BBD
-Test: EncryptionMCT
-Key: 000000000000000000000000000000000000000000000000
-Plaintext: 7F27C3397A8CEEF1BDF859459690FEA8
-Ciphertext: 00000000000000000000000000000000
-Test: DecryptionMCT
-Key: 0000000000000000000000000000000000000000000000000000000000000000
-Plaintext: 00000000000000000000000000000000
-Ciphertext: EDE145C10E279501D921C5E3B04420A6
-Test: EncryptionMCT
-Key: 0000000000000000000000000000000000000000000000000000000000000000
-Plaintext: 95615ADB0DDF6613A5E84F849AC8C00D
-Ciphertext: 00000000000000000000000000000000
-Test: DecryptionMCT
diff --git a/src-cryptopp/TestVectors/nr.txt b/src-cryptopp/TestVectors/nr.txt
deleted file mode 100644
index 6d9487c..0000000
--- a/src-cryptopp/TestVectors/nr.txt
+++ /dev/null
@@ -1,615 +0,0 @@
-AlgorithmType: Signature
-Name: NR(1363)/EMSA1(SHA-1)
-Source: generated by Wei Dai using Crypto++ 5.0
-Comment: 1024-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    09b2940496d6d9a43bb7ec642c57b302e59b3a5155
-SubgroupGenerator: \
-    a1c379ba91fe1f9d5283807b809c698bce4aee6f405f4de8c46becf33c08a63b\
-    c5f8088f75b5b6bcfb0847ccbdee700e4e698652317bbd7a3056404c541136d7\
-    332c2b835ef0d1508ef57b437de60675f20f75df0483f242ddeb57efacd18041\
-    8790f4dec0a8250593ba36f17316580d50db1383ea93a21247650a2e04af904d
-Modulus: \
-    bd670f79b0cde98a84fd97e54d5d5c81525a016d222a3986dd7af3f32cde8a9f\
-    6564e43a559a0c9f8bad36cc25330548b347ac158a345631fa90f7b873c36eff\
-    ae2f7823227a3f580b5dd18304d5932751e743e922eebfbb4289c389d9019c36\
-    f96c6b81fffbf20be062182104e3c4b7d02b872d9a21e0fb5f10ded64420951b
-PrivateExponent: \
-    0355dc884345c08fb399b23b161831e94dbe61571e
-PublicElement: \
-    255cf6b0a33f80cab614eafd5f7b2a6d83b3eafe27cd97b77ae70c7b966707d8\
-    23f0e6aaaa41dc005aaefd3a0c269e60a665d2642f5d631ff1a3b8701bc06be9\
-    c44ab7367f77fefeec4c5959cd07e50d74a05af60b059ad3fc75249ecf44774b\
-    88b46860d9c3fa35d033bcfc7b0b2d48dc180d192d4918cddff4f7ebcdaaa198
-Test: KeyPairValidAndConsistent
-Message: 66B92E1E2C44B80F7BFA
-Signature: \
-    06e7586b76d5a8270155cce2d3ff4495237eed29a101eb1341fce0b43d95397b\
-    053d93772b0a9cf3117b
-Test: Verify
-Message: 973266BB0A492248082A
-Signature: \
-    02de44ed2233f0f11dcf567217d2089ec039a211bf000d42e04900a66ce45c58\
-    526a97d7f4cfba29e43d
-Test: Verify
-Message: 9A6D079ED0CA9D8B40E8
-Signature: \
-    04f59dbb2712926b3bc1d3c428f16203f3443f88db0669adda94dcb54e1fff71\
-    fb51bb603e7adff13f84
-Test: Verify
-Message: AA34DCE67BCDAC927DA6
-Signature: \
-    08ad21bf9d0cc598a214329d3544685d39487988bb01aced68ad0a4831affbff\
-    3b14df6c0f4ac4d2e967
-Test: Verify
-Message: 4EDAC08816AFDBF284DA
-Signature: \
-    09a9d5aa9bd1b6b61fe8825128c8e52a6213692b2504c8c6951299b5ca51b03d\
-    ea0a5e56f9a7c4cd44f7
-Test: Verify
-Message: D82F2E903230962B8174
-Signature: \
-    0441c8d089e690a7fab391de07073326d443a0d9d806a3997ac1641175310890\
-    1e55582a582541330539
-Test: Verify
-Comment: 1025-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    0b3949dadf3196f08bca0606f06443afce2fb1d02f
-SubgroupGenerator: \
-    015f0f6d1729ef2af723c00e36450a04c7e7681d65b74a6417a53b3eb6036989\
-    eff8e0ab11a7ec3ce2340b7c7a92e1a977aee52555c06c12c4cc28496ddc2598\
-    feeb7539ce90d3888e21f61d7f14746cf67d9fed373afd97e2483700e300ed9d\
-    a25e7200b363a4727ad201194b36ea5f816cf83488c3e527d3a5515870d2da63\
-    d6
-Modulus: \
-    017310bf02d70ef2cee45d1cc47ec8ce8cabdd6bf32a560975a42ef057bf9dfd\
-    553bc9368ddb154a55d855edaa755e69f511a4c69ba78571cc4b14ddbb0f32a4\
-    a9c56c286305aa21ec4e35de7390747477b3bd574e7b87cbebde2f665703137a\
-    1172350ad2f48a0884d076ada9db82f104e6b0ad86693cd4adbd0067639102fc\
-    f1
-PrivateExponent: \
-    0696b0f255468b7ac18e11632f208ca86383a46724
-PublicElement: \
-    45bf83e62f50190374b23de5e4a1d0278e9e8e6c8335577d62e80662a380c206\
-    e326819c5082d321dfda1f905fa5a3ead9a2dc769885a27b1fd6a133185dc5a7\
-    876a76ab0a09fe02b7071a924169e4d2d2a67e67ed3628800134183b962c0b31\
-    3463aa154e6437d644e025ab234e63d19c129842a61c5e5ea5a06466c858c81c
-Test: KeyPairValidAndConsistent
-Message: 2F585D0CE4FA1CD93880
-Signature: \
-    06586d8a703cdc27200d5261853f50effa8ebbdfc905f5becb68b81eca506992\
-    50fb54e46d557c6095dd
-Test: Verify
-Message: 4F09A1F217B8393199EE
-Signature: \
-    0622cd33b1d715829d8fae104759ed449f95becb5e03d36f5578fd6a2951d2e6\
-    26cfce85ba6563990d64
-Test: Verify
-Message: 03D7110A753B008A76A0
-Signature: \
-    02925630b4c80e604fc1d8680bfd0e3d878e22b3a30ab8b10da7fc38816a8c5f\
-    1e06927c68f9d3db60d9
-Test: Verify
-Message: 129F4781D417671F886D
-Signature: \
-    016c2c4ce845b4d412828cbb8a396d080c7eb93bcb01f7010410198c8bac96df\
-    8ab8761cebdb7d87f3a2
-Test: Verify
-Message: 3E1594F559D1248D1112
-Signature: \
-    080bab68c62be86ab2c1bfd0edf10387a7cd66b69f054e254218e01f650e4e8c\
-    6bfa10054e367893e59e
-Test: Verify
-Message: D6F0354F1B6B253B6997
-Signature: \
-    08755c7e8012e8160db75c6160686351e5c577207f01602b4dda2fa56b864374\
-    703c83bb323c7bb34f5f
-Test: Verify
-Comment: 1026-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    36bb68cd95dab195f14c4534283e7ea50b00cc31a3
-SubgroupGenerator: \
-    e2782ad6992f4b7e88787b4d616744b60e095575a177569c4a069e311e38b724\
-    0c43343367e23574c30e4d9f05afe1fbe61423bab715915c4ccf28aa0ed2f52b\
-    092b86c8ec1f9d4795d6e91c88ba41297625c11a9e1f4f182da13cf51e541038\
-    a1266bf32b2dd81ecd84bb80be8fdf97689942e944b7fbb6981e00cd680ee25f
-Modulus: \
-    025098828217d00108030801e5f135fc6fd3010be39e49060a96addc8a081198\
-    803402c4b46e4ce0750fcbab8cf084c7ca8cae09f1b5482d336fa3af47b96791\
-    d02d8143e274b1325f2213e17f9384c805f479e52a3117cf84869d395f1bc025\
-    c918484478d2da1880d32bc519f4e6b2fd2d46958795550ce1765f725626f3fc\
-    17
-PrivateExponent: \
-    2db270c284328353f979cad99f4133c53acaa6ee71
-PublicElement: \
-    0179b283f67868aeded3a0c5633d0e6c18fad77174e2c89c03452593d05e77a9\
-    fb029c0ccb2b6f2328e79c286ee392713f12d9d45578348383b81d11b0e0f7e8\
-    9965a7785d5ab64ea25bb73e8acaa8e84cb9897985015757a48c0b1dac3a6a60\
-    6fe671ea073ec434a46f227b8d4b02a46fbba2f6c6216736d669f55778d81004\
-    d8
-Test: KeyPairValidAndConsistent
-Message: 7E4F2ED4E79062778A2D
-Signature: \
-    03f523873462ee1513833e2853c3b62e30c5c1cc3224f1a42dc154fa84ecce04\
-    487069530d76e0574a38
-Test: Verify
-Message: A0E35846B5CF1B5BF560
-Signature: \
-    2264285d75a55c431a7adb9347bc07d58efbeb1dd9354d01b0b86f2875f8dec0\
-    294d20289d39369c5afa
-Test: Verify
-Message: 3B138785EFC6F520EAE0
-Signature: \
-    116e45961ca73f3ccf08b35f94877fef88772cf0fa2ab196c85a91104d8fbde6\
-    65b7032b2fb4011a88cc
-Test: Verify
-Message: 0F6BE2AA764B485145D4
-Signature: \
-    027ad753bde13c7f2fcd7571e5558f8af756cdb9463237fb0e285cb633cc86be\
-    1b410188d701f6ca83c6
-Test: Verify
-Message: 6CD9FBD23EA58826FB04
-Signature: \
-    1651decd376899104e3fdbe40ab2d9bfd3c8577f3b092b66e3760678ecb3fc35\
-    23a59107e0bdccb76a73
-Test: Verify
-Message: 473A82649565109E9E89
-Signature: \
-    2045ef56d92f89a214d76cca6b591068ac5f0d008c121ec4e5c4c1e8ca9b67cd\
-    bb5ecc776a23b6d54ba5
-Test: Verify
-Comment: 1027-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    291d0ba731a4303070504d8b9615640a5e1345e00f
-SubgroupGenerator: \
-    051c9d0270b69ceef82af5aed5f91dc88d585096609d835d03d39cf3ce74f5a3\
-    402d4e8e192455493da61cc58ee6f54dd941172be3d7642169cbc52273f4b725\
-    f1d6c820c3333336c64d32fb6238121b3ccb7c71b847764946bb0887a44ca9de\
-    802cda62efa9dda573751084225353f11ed837f3dc25de8374b6fdbfb6e313e4\
-    6d
-Modulus: \
-    055402a8abe9cda3072ca8601d68032651feb0335856e57f8f8d4ec949098a64\
-    59151cefeef91b7aa733668c8cf0e9b96c93c61f3528d4036daa6565646f65d7\
-    4c4552817df7e5fb1cc421cfd885e27bb811ad227e81b3fa02f7a00bf01ee6e2\
-    3fb5572a75f8f29b58bd5f7db435e8a92a923f15d50f34213d29816921bf195b\
-    2d
-PrivateExponent: \
-    13b27094d9a5a3a9704cebdbe890da325fa26ad555
-PublicElement: \
-    03b06b99097cd7145c7d7782b02e247a4741f3c7f39233627f17e13ebff89a18\
-    cad6a454c3f32f7ef2910384030da71ae47e1c3fa79c2141dad107f8e715e47f\
-    b0bb626baafc35db769852ebbec2d339c3c3d5f2287cfdd20b3b78ea4607086c\
-    42558ae4637eddd6a74bc1072d0f34d9c0130cbc9e84f537e7ce50df502d17b5\
-    c3
-Test: KeyPairValidAndConsistent
-Message: AE6DCD9535AEEE3ECC89
-Signature: \
-    1c6794878aabf07cf9f59b685d4a3a6e51c9135dc101a4a6a62c95a20902e2fa\
-    23db7d15293f595f86ab
-Test: Verify
-Message: C83A14EAC016D659F9FE
-Signature: \
-    18ed4812925dca6a9c30e2e3566433e202be2d305414e1e6583905ad845cbc63\
-    2049804932aac79b858c
-Test: Verify
-Message: 745E02041EB487D16CE6
-Signature: \
-    13d4ef1de59ef0fe9bc4ecc6d382908642f6f5793e255b819e25ed124f7fa574\
-    d91fc2e9b258f0514b15
-Test: Verify
-Message: 62F019655A83501FC4E7
-Signature: \
-    07f797768984ecc792f366ece16f5102aec2aac6d31fdaf3972839cac2c99a2b\
-    f5b347c887d37943383c
-Test: Verify
-Message: 351D37A4B5046E885EAA
-Signature: \
-    22064cd5179ff1551dbf73c5220e17a9dfa1aa8f7f22f44a6c70f13c6d0a21f8\
-    7e53278251037a6cdc5e
-Test: Verify
-Message: 4073D33915F595F4FF9D
-Signature: \
-    1f902ea2c9521b8c7f11619d35dd22a4667e2eb89a017194bb68ec0a9df762c9\
-    377c1c075b5f09566048
-Test: Verify
-Comment: 1028-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    2368e2b864b250ad45406391e7eeaa3d27cd053c2b
-SubgroupGenerator: \
-    07c325695dfe315a77ad7b42f0d18f9d4821b5c153fee7385877602fa54477bb\
-    8c0639d2438f34352b97c22d02a7295d2b53d5286a01caa919d6283614690624\
-    240af922675ccd4a0534ec336cb79cde31b02b5988cc5a53ca17790d67d803a2\
-    7bb927b9c59bdc6ac794175e285cafdece6778ab19a0b444747fee20d5bf929e\
-    70
-Modulus: \
-    0abdeff64b6f28256e4562109bffed29cb5aa95d89cc0ec95da0e773dbff3467\
-    c271bbb1e1fbb6af058517fdacdf26b5919674c625eced6317d8631c063f43b3\
-    ade2cd633d554913339071d6ebed5fd665fc5dd7d47b80721a976c3b14fbd253\
-    f0f988c354725289f2897df0a15985c92b2d4da8d087870c251c72d979b8304d\
-    51
-PrivateExponent: \
-    0771305163506b2b83bd5279935df1b5fcf180b004
-PublicElement: \
-    043e4ae6244408879264fe6b859b578218705b9a45af22efded27141b7f090cb\
-    cbe42dcf481df3e41b13920ae02b694eaa6bfd62f2d3c5d677b8c4ce783cbe27\
-    89e088b04489ef535ad4a517351c8835cf128f7ec677a1b1dbe3ae9cc4198ddb\
-    6e1cef8e978c0725f5063797bc43eb9ae496286cccbad5d4e026e9edb997d2f9\
-    18
-Test: KeyPairValidAndConsistent
-Message: 4867852C83F181CDD010
-Signature: \
-    1db6a5661b20c9289428c3b9ebf65d5a8f757f3a3b1eb15dfaf0c8cefc891954\
-    b48279eb45910a141ec3
-Test: Verify
-Message: DA6493C86D6B62C5961C
-Signature: \
-    1c05300a56319ba4a8ace1206f5f37b5bbefc9d80a171a57b6da3c02aa1f3079\
-    70583c008f073996d932
-Test: Verify
-Message: AE2C1136BFE966794A6C
-Signature: \
-    02dfd79eb18f3a862b11a5d199a7db1dc53580ade90517a7739cbd8ab1849c44\
-    54ba17a69b8d03ecc4f9
-Test: Verify
-Message: B20160E0442E726BE749
-Signature: \
-    14c0cf809174d39f1324b7dd0d6d1fb3be5b5577c10048b12def39772fa60cd5\
-    a9d2cca9075f12e5a3c1
-Test: Verify
-Message: 3638935C4492F5CA42F2
-Signature: \
-    0081d7216636bc6fb9bc7a637a377ebf4f9048826e0360c8faf03dd28c4ee4a4\
-    da82689259f140b3d918
-Test: Verify
-Message: DFB674CA6E0FDC0CBE99
-Signature: \
-    1e3e21aa3dcccddb8cf3e360631fc36956263951ff18fec553531252b4dbe753\
-    6ed5fc62897d51500c38
-Test: Verify
-Comment: 1029-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    3357536531dec150be0ef8747f69ea30d987ff7df1
-SubgroupGenerator: \
-    067dd80dbc6b41f58d08f077a9a3dcbfe12a62065fe6b4691c457f506b56dcab\
-    0433b3aad6ef962501633d0f3947b491a1317e7e6b632f062c53104d609c9222\
-    b056f08a0c83662a70744331fd09b2b42fb0768e52da27e92732106fbd41ec73\
-    7373fd080b56b543d808d49eeb6e1bb0a8619b1edee8fb8295dc042423f684af\
-    8a
-Modulus: \
-    1d0f176b6799b36724c92954c38d0288fa95400c2b14e064f76a6338fccaebca\
-    8d978b93bb76507bc150a50f9fe799fffe12ae2875b13ac1084ffcfde9f62b86\
-    185a72f04ff80538d6eac177edc98d61a517b1275bcf4b57aa262e1702d623bc\
-    344db7e5621c949a9b12e9936e88fae9b200a1f8ad5b40ec8220aa301267f38d\
-    d7
-PrivateExponent: \
-    2dcdc00a86ecc2a60ebfa6660a83af1d7c3e570b85
-PublicElement: \
-    13834f0fa1f42abf7dbd264cb7d2eb5798da8972df67f517c62d7ae5070fd588\
-    d61db62e492f9654833e876ed5737df35069f5ee01a45de881d8f5e68ec52ad9\
-    ef32780e8c453a5f1e38cc17bc5cd061a3c122080f6e1b82d31877e8b08f634f\
-    497bd90b06824eaa0416c64104ce5622c272673d0dedb836ac7d47e0cea06739\
-    02
-Test: KeyPairValidAndConsistent
-Message: 1E34034C47FE533F8FF5
-Signature: \
-    05c110848feacc9ac762ffa14943f9ce9a111777de0502d9f364ad9b2df4e1a8\
-    17bc15a602579b3a6a25
-Test: Verify
-Message: 53D2CA23AF7DF95634F0
-Signature: \
-    14009997efeb3fd246956e44b5b0e48581ac5f414613b41fe5842c85b031ab8a\
-    e68f66f8e1f1f9fc1d74
-Test: Verify
-Message: 0F056E08AE77B3B30F33
-Signature: \
-    1beedf85b426d36a657f422ab9a9132986eaf415332816d33d70c726c3066158\
-    c6481fd00503ffb65518
-Test: Verify
-Message: F08C80E8FD38A3867B76
-Signature: \
-    0a23b8d8f920cfb0dec93725e4972080445647c54227fb987dd9f80fab446c75\
-    1c2594276168aa68f318
-Test: Verify
-Message: 6D392690B92B3E75020F
-Signature: \
-    18668f59c6974dad551a89bec5cacf0bf8617e8f43052eb97d7a1b12411b27b7\
-    4248b3d1f5070823e951
-Test: Verify
-Message: 10AE0E091A267641FACF
-Signature: \
-    1b3d10f74fdaed3d4d61fedfa3f6ad3a37c0cf6687166a312d5b280724c3545d\
-    225e1fe0639cfb1113d6
-Test: Verify
-Comment: 1030-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    27c7996c1d3729c4cf1de06529e5619771e27ad9eb
-SubgroupGenerator: \
-    0d87a4b01385da7f43b6277933c5f0dc8072dcacd5252e1b29f588114a7ac56e\
-    377050aa8174b5dda400f043234e4a746442792734dc80274a00a3676101be94\
-    759fc2630b9a858966488b12611d03d0b31e7243e124497a754544cee1db10bb\
-    0a81cf0b2a68045b76fe935f641c666fdc788a2b968c6668c669115756b961d9\
-    fe
-Modulus: \
-    2a32d68d31248024053bf628a94404b9a49d91ade4d7a45b071e93292a7f8c26\
-    61d9165f0ab85491d4b0dc67d335fa7d7dd172cb17193390a55eb000aa97e2b8\
-    ed3ee64b73aa43ea9b8979132c2d966ab03c42cc14782c96e4284ee1136b8515\
-    007ed1b1a5708b5e8d81304fa651edc715918e2299cfe9016dfec5f454d907f5\
-    9f
-PrivateExponent: \
-    091155581ecb7a0a792ba95c772d9382298bfdfa6f
-PublicElement: \
-    0d7d22c931422fc46505887559a51490c2e367cdb40242cdbaeb23024693fd5c\
-    68f6a3307ca34b224457d5aa610b90eca3b39905481daaba7151318f09f974ad\
-    664546d14c87f797e38139ee1e07adba9c775e07b7f7b3edba87d886920d6b2c\
-    ef5f084359566b0a3b8b940a65b9ad93fd7ccd1354cdcee3c43c6bd315180498\
-    ad
-Test: KeyPairValidAndConsistent
-Message: 23EEE1D0EA8950B8F322
-Signature: \
-    18fe1a5f61c4946810e82a1e30fb6c87ce4ad9cebb1ae27eebfa8779fe292b2a\
-    451be3506bb65519dfd0
-Test: Verify
-Message: 13FA6F2816FB83190A21
-Signature: \
-    2161a5be85f7ffe806df00f4bd50915e4b0674e7591f1c0902153823f881bc7b\
-    3f093d92bf86b74b5b3e
-Test: Verify
-Message: D071CCC0C6E4CAE82E5A
-Signature: \
-    059158b2cf143f38eb8c51088dd79bf45990e596c8026fa3de5e668368b9d8d7\
-    fe9ffdbdecf66aaf02bb
-Test: Verify
-Message: 22CE83F4803BF3EA2C48
-Signature: \
-    073b56d72a5b706455cfdcbf85b75ee45c40e96dd21a5460542ade665e51a85c\
-    510315a50307c2bbdb2d
-Test: Verify
-Message: 7A927EC7BB9CA16C1B0A
-Signature: \
-    254c7525aad9b4b3807b3900a963fbf42f9ff2144820ea69abe5ba2c80613510\
-    e1429ebc726fd0a87a4c
-Test: Verify
-Message: 9591B069993E10BC0B84
-Signature: \
-    0ed4210e5e4f2f9546ea181c4a61d062a1158810071905b180dbf070b480f436\
-    0b1f66065ecf111741cf
-Test: Verify
-Comment: 1031-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    26f86a81a6bb530c2f9b63e3690e95a0894575f445
-SubgroupGenerator: \
-    1e24828adb4ebf2becdbdcadf6706631293ad6566803d12479f04a7bb20b6086\
-    fe81df164f8bd02c5f418c1140d143f11a71170b42d0753c952bfff951b9ca42\
-    04868375efaa4afad50b75787e41c5ab9ce8adcbccecd3716f350bb8aaeca9b6\
-    098bd0002d789e1f7db9c19d9045499877b93ecb4e7c64808b742063bbecf60e\
-    29
-Modulus: \
-    4d58515f7b41c4fc87e4fcefe5cf6d84b2d74a9d6f498ae9605fcbf1c5921742\
-    2001a272ef91dbd09e7af5ee54126dd4fc44bb1ed624d0dd5dafb984d5278114\
-    0bba40600cbd4752d2c32b43253efee57af6964c339570edb24195502e6d424b\
-    84bed65ac98c6fc52ec90e40a525f1863a53f2fbe2a0a133342eff4337f26ceb\
-    93
-PrivateExponent: \
-    0e61a054ee6510734a80f67a54d8c4151c957ef16f
-PublicElement: \
-    19b50f1eea45bfaa22352a38f3c3b86d6f670747ac2fd94359608e25f2bb9f60\
-    2506bc357245deeb4c3c702d435c557da4f4a9fd37330a75547c91681fdbb51f\
-    286adb498d1e489e89b2e6a4eb9ff30222c51fefbeac7435f629f536ac2d6b87\
-    664d80e5c97398cf489a1d1ca217f7f21ea8e409f938378875cf5f528162e3bc\
-    07
-Test: KeyPairValidAndConsistent
-Message: B4B3C8FBE82013228A21
-Signature: \
-    0e1003dd216194ded89f7d10b35a266ca7587d8cfb06a1fe3dd43f07dea4a6d6\
-    acaa1477f2552c9b3114
-Test: Verify
-Message: 17D2D18302173E2CE992
-Signature: \
-    027b40cd9a159257a57efae3a657399a3b6d8b06f707ba3a323abc383a93f919\
-    1246c38c03b028be05df
-Test: Verify
-Message: 8032AE177D6DF38C7E27
-Signature: \
-    1f5e3d759e3b832f5a6c57b055764ff5b8ad942dd819610ef94cfec296cd1b56\
-    4fd0b18bfa08c3645db3
-Test: Verify
-Message: 768640A60A3C62E02428
-Signature: \
-    0abe2dfabc81ab677d2cbd781ef9768325a5d6d15a22f41b32972bd67058e617\
-    e28c7e0dfbaae535d655
-Test: Verify
-Message: B0999CA45B77ED63639D
-Signature: \
-    1525539cd207d5f6f915eb2731b6451e38e11e0a031d7e420e0bb95d6616d8ef\
-    35d20eb43c111f8f9ca1
-Test: Verify
-Message: 587EDB968FA82C12C930
-Signature: \
-    024ed20dc19a07e00158aa2fe9cb6353f0112b8fab0e6775667115e1c92e5eb4\
-    29876c12ed48e996f4f7
-Test: Verify
-Comment: 1032-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    2e802b5369c3f1ddfa789bf8f2ad2e048ced3bf355
-SubgroupGenerator: \
-    a9aebee7d29f90b081afc4d496a6a78210e918bb57a8a21c5995586c0bf20f7a\
-    56bb10a97e05a3a723e7db64612b12bb591b1fe7d2e46be8c96a7b2ce7c66076\
-    aeded938775ae2223900adaf52a93f52d62173c82d4b67388c85d4c1127e1edf\
-    4643cf09f5375b60c19316c4f8f8fd7daea1d8b44a2d03e97c2741537f63d86b\
-    4a
-Modulus: \
-    d551680a62ebf98f0ed8930cc5b12de86d0a0c29a0d7e5524c24672a25428833\
-    f4c19ac883ead22efcc0c6823f2e942c17adb7ab763ff2c7cc2698fa8b6448e5\
-    14d4628b197721bdaec780e126ac80ac83f24fef5c154f7690ceba903748be52\
-    12e3180ea718ca7a71a49dee939bf9bc5b7845c9648d074587ccd3724493b91f\
-    09
-PrivateExponent: \
-    0f66e04c5a75d3eac03d744e5432f23e3aea066a63
-PublicElement: \
-    2640c188055329f0b44aaf80f82f7fc7f0e421031834dfbd1fb6d6af6ab3e1c1\
-    73c901370a4ce2793c1b88d12f764c58ff064905da9c5001f679c7508972f237\
-    bccca56524787466a7c9c2d6bb6392963008ed1a3e4cf3b13e66086bce3a4ca0\
-    4d8cabcf0cadb4c403c7d02a858460d04350e730289cb5adf200b5fdf1198168\
-    b5
-Test: KeyPairValidAndConsistent
-Message: 909068BEFFA43331FDC7
-Signature: \
-    2d557d8fae420880640dd9f60a524db48980c80d8b0179dd3c1892f02e87c9f6\
-    a04a8aa731be05aaffef
-Test: Verify
-Message: AC8AFC7A1D9105539E10
-Signature: \
-    0ae7f23328453fdb03c090c09ee69d787ee7dfaccd047445b1026a9a7cacdd1f\
-    91455db7299538817894
-Test: Verify
-Message: 310E40311BB3F77F9483
-Signature: \
-    28a8d8de06dc0011b044d19a163d350535d6ca91a023c9687557690ddf102d8c\
-    7558246ced311f2fc444
-Test: Verify
-Message: 35455ABD53E6FB11ED9B
-Signature: \
-    162156e476cba65e767b4db942bb35cdc6293cf4360f1801a215bb2c726c22af\
-    f3a711d3c6473f1eb985
-Test: Verify
-Message: 95FFA73B52F0D06A0C1E
-Signature: \
-    29bf4f13e6aff528aa1b060c2baed865c442e0472422b4bd485aa5ba2a09ad0d\
-    732637bb3ee520f6bc0b
-Test: Verify
-Message: 1E9934125DA6E9B4E975
-Signature: \
-    1674975d0a97e799d113ff9cad06b7f70a33f5ca5f1916cee07b525270284fbb\
-    1c0428666987ad7e2116
-Test: Verify
-Comment: 1536-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    232cf9bee9d56c8bd8252d1edb59d99c40cf32d07d9e5a4893
-SubgroupGenerator: \
-    f028143e3f9d1317aafb814215ffda9c584da8943e96212c90a082c3d2f335e8\
-    a6b64d1c890aa2224ebf158bec2b6fe6bad236417acd517a4907331e0be0dd0b\
-    801218ac270acdd45579290be1b94bc418b8f82c651d82a19d2f0e1cbb0fbc0f\
-    054d95150af96f9a7488010787a799c544883ff76a4e3092f2ca9aa9000cecb8\
-    8dda343c972c8192a83820727b1945c1a270cf913ab932457e8e6e207d06cd0e\
-    fdf265b762b9fa15c9a14633af17204ba2b755ed1b3b421ac596a2a04e64be43
-Modulus: \
-    fada6e4becef964a85caf9e129639a5616ac000dbac59bd50b84bc8d46411407\
-    9c34c5b58d7d40027faaf037c6a649c527cb002d3a716bdef62b6c94d7a47a8b\
-    65c2ebac05da09e40cdc417024cccba267a98f4eb69701a276b4f117662b5666\
-    05c36054e7f015d2e5f81331e5666ec17ebf71907788b40cbcea0f24aaffb029\
-    ef5c25c55ae998f28a2ddb091d262c32ad324f4e64c7b4b50a19e9d92f6d8024\
-    188627cf5ce68674e7ec7da38fd6cf4ec29a6ce2f17e3188d8ef6b0e50d77d5b
-PrivateExponent: \
-    1d4cedc87d55eea31bd702139b90be08d58692a1f97628a01b
-PublicElement: \
-    819c8cedb9c014aa577e9046b90795accbebe81bef68b1b5c37c68cb357e1a5f\
-    f92761bc26cb0953956b6c0aec05acfc9d1a27c50789793b13d9eaf2361760c9\
-    7a7d86e7d922f4809a5d2d01448e938190bbc24c150e03ef8305365ddbf5ca19\
-    6857314e3b3023f8ddc9d209bd7dad1ee763e7003fd1b0c53057d2e9acadd23a\
-    a18f83d20143bc41a2dfa4a164c82621fc0f800052ec01bec7c99c66fe20ec57\
-    67e6fbbe8810cd5aa75eff3d8a4cb53e1259ebcfebcc2fcf21ba7f3589cd525a
-Test: KeyPairValidAndConsistent
-Message: 9F6DC301DF53FE22CAC0
-Signature: \
-    15b22111ffa1b733979cd9d8944b1291ce09468ccbd05040de0f83023c8fe083\
-    734ec39a542011643e448b01429c4bae06d1
-Test: Verify
-Message: 2D7B5B9A27EAB468331E
-Signature: \
-    029eea970a049ffcb4c6117c97d181bec7a27557ceb88d422b2212ca36238380\
-    87cd52d2445f539c9c03705ba4b485f56e19
-Test: Verify
-Message: F552FCBBA04FFCCC5CB6
-Signature: \
-    115de3cc15d9a066c00fed43f583f6a9c984d4b8f4c93c3d72094a4b04dda506\
-    7d460c3d1ae33ba66ceaac676256c1e73001
-Test: Verify
-Message: 0D52B894153A4BB74068
-Signature: \
-    0f6b8cc28e2068a3fe14d220177793daf3512ba6942e9d16ef1571fa34926c27\
-    edd1bfa94723a663425f5c2d01eaddaa972e
-Test: Verify
-Message: 294442E103CC0CBA32A6
-Signature: \
-    0fbd8768a1b3025c0d0d309cc448320e086318772bb9485a5a0a2afa1eb2afb2\
-    d1818aa7b1c55b9dc424e654524278f0ddbc
-Test: Verify
-Message: E993D8FE1E6F6C3914ED
-Signature: \
-    0559d66bad3a51520bbb85827a257ab09dfa33938127c69bf40f08339b2f2251\
-    c0e50b63d2a4d05225dea7f58f67de3071e9
-Test: Verify
-Comment: 2048-bit NR key
-KeyFormat: Component
-SubgroupOrder: \
-    03f35f80fcd896f03eda9ff07f2e35295384c4f3b8f8c4821369ab5417
-SubgroupGenerator: \
-    75c5d8c8f72302d92be3bf486b8648330ff86954de5e6e83efef624a277574c1\
-    6757684d3874ee303fa08343fe82dae484e5dda6781280b434c4090044cc7ff9\
-    b6e962594d3ca069815c0f0b6bfd25215a419420d0ef8a1595c6eb1b44a719b4\
-    0131081f75cc15cb09a5d5a029c8546230c30b4af2d4a9f4374c93a095c83b59\
-    4b1774d635d4aee965f1d094469f7bbf8bdc93216a6b8a6c5753b48962335bf2\
-    092aa583c897878c8a7ce61186b592b05d2aea710b673d5994cedb5f117fdb6b\
-    8ad4d89f443c4eb662b428a34a7522c69794cc0274f3eba837e90da86acbc707\
-    4ee3a0b029d970efa48b3d582b740ae0e585d175a5f63a385f8b6b8878b44e1a
-Modulus: \
-    9a08865d2bc9e0cf03d2500b2a08402bb9dc953d5fcd73f04be61236efc0998a\
-    8f012f00e52f7a6e91e81b88a4c9f985a2da523cbe7caff08cae44963d2035ed\
-    a72e1f31f82c8d64c86e686899d53c0200282f407ceb1507db480f1db223606a\
-    57466cf60fe9fc5f7ea7d5fd82ed3ab2cf5e35491dfaef0aa2e10fbfa3cdfeb5\
-    ebf65e4dfc2837e1f6399db06cc2e0420c7b14a4c0d483b742ca58b31fec9f26\
-    a64e9bfcaa82334e644f4b954e2a9c7eeae096b8864ecd223ead3bcf9e8c1f68\
-    f6678faccdb7f26d8f33d8a5fb0cb156cc7daf4a96ec2b730c0d7f666d699f73\
-    45a37ddc1ccdea6d8f439ddb23de04a941b246bc257b0aef544a8e868bc8444f
-PrivateExponent: \
-    0212c34d3d17b96a899548ebf43bb886676acebd2f040f5b33a4e88d2d
-PublicElement: \
-    267f9c3ff3ee3cbc0f9e94dc7e6837e1ff65175e967987b90b9aea7eef1de6e4\
-    c342bebb5dbd0c4e2f6514f2d487857a146dda6cfdbc8b56ed254cd65754d84d\
-    d21a271cd15fc656274725643728b41ce3f0e6872b6dfb4c289e03f9b903880c\
-    e3d7d745dfbb641c8c42ec0bfb6951ca2611fd877c32248c97252bdb42d7bd65\
-    ebc50653dff389526c546d1e6ebaf6bd8b3298c01935901b7efb288b78730d89\
-    fba7f46f2a642aee0dbc93aa29c190b201acf89d4f8ba28f3e3f54a1c5a48294\
-    dda908f904afb7db398682c809ce13abd49279221d5b40ad76216bad7ca256d7\
-    18d3552344c481b20da5aac3e637fb7edeaf7960b532ef761376489f02fa8c10
-Test: KeyPairValidAndConsistent
-Message: 5F3914F7AE0F6C76D152
-Signature: \
-    03d30b7eaaddcb384dce378f806e88d646419bbedbc2c0c5cae32f3c3b02e0e1\
-    a3c3ab04b31e2c25db713db539a65c9419a846aea88aaa707cb4
-Test: Verify
-Message: 769583D4E7EAD14C137A
-Signature: \
-    01dc2815fd4918b8d3bd1743f5ab4546313b1fa8044b4737b2c485eeb0016bcc\
-    cc084be064b6a8934a28011167eebbc33513ce609aa206810aa1
-Test: Verify
-Message: 6441D5239F50C71DE0F5
-Signature: \
-    013f6d395de56832f82ee813b574002c36e551aaeffbb28ddebb84da7f01ff6f\
-    4c3d0f3519d548e2ec1a0b36f12ac1e4fedc83071bbbbce024a6
-Test: Verify
-Message: F1C2D4F7C3ECDF2C17B7
-Signature: \
-    006441a8b3517613f9a8c2e7a89c492e7f49300d901ad01b92167c1fce02453d\
-    52b69dc1fc6532e792ad6366eae7fb14de3ad3f6f3132b0519fc
-Test: Verify
-Message: 752A1F2B8D9A717A882F
-Signature: \
-    0127027984402f5b8cc069decc1bd611f0bb59c6eee86da7d334e3f8b903c5f3\
-    02c65aaf16a837963bf772931235f81e963e4d692699dfd4f7e1
-Test: Verify
-Message: 666DC6B1E871026EDE56
-Signature: \
-    03e87b55a7e81318b7599da3fa8f18d46253b6546814fd1ae19318820100c297\
-    4de2624da0d54ca27e7fe3477913a6df35bf925de3f3d9a06849
-Test: Verify
diff --git a/src-cryptopp/TestVectors/panama.txt b/src-cryptopp/TestVectors/panama.txt
deleted file mode 100644
index a89b252..0000000
--- a/src-cryptopp/TestVectors/panama.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-AlgorithmType: MessageDigest
-Name: Panama-LE
-Source: Panama reference implementation
-Message: ""
-Digest: aa0cc954d757d7ac7779ca3342334ca471abd47d5952ac91ed837ecd5b16922b
-Test: Verify
-Message: "The quick brown fox jumps over the lazy dog"
-Digest: 5f5ca355b90ac622b0aa7e654ef5f27e9e75111415b48b8afe3add1c6b89cba1
-Test: Verify
-Source: generated by Crypto++ 5.2.1
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-Digest: af9c66fb6058e2232a5dfba063ee14b0f86f0e334e165812559435464dd9bb60
-Test: Verify
-
-AlgorithmType: MessageDigest
-Name: Panama-BE
-Source: Panama reference implementation
-Message: ""
-Digest: e81aa04523532dd7267e5c5bc3ba0e289837a62ba032350351980e960a84b0af
-Test: Verify
-Message: "The quick brown fox jumps over the lazy dog"
-Digest: 8fa7dadce0110f979a0b795e76b2c25628d8bda88747758149c42e3bc13f85bc
-Test: Verify
-Source: generated by Crypto++ 5.2.1
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-Digest: cb34f0937e8d870d3bd7ff6311765f2c229a6c2154e4db119538db5159437cab
-Test: Verify
-
-AlgorithmType: MAC
-Name: Panama-LE
-Source: modified from Panama hash test vectors
-Key: ""
-Message: ""
-MAC: aa0cc954d757d7ac7779ca3342334ca471abd47d5952ac91ed837ecd5b16922b
-Test: Verify
-Message: "The quick brown fox jumps over the lazy dog"
-MAC: 5f5ca355b90ac622b0aa7e654ef5f27e9e75111415b48b8afe3add1c6b89cba1
-Test: Verify
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-MAC: af9c66fb6058e2232a5dfba063ee14b0f86f0e334e165812559435464dd9bb60
-Test: Verify
-Key: "The "
-Message: "quick brown fox jumps over the lazy dog"
-MAC: 5f5ca355b90ac622b0aa7e654ef5f27e9e75111415b48b8afe3add1c6b89cba1
-Test: Verify
-
-AlgorithmType: MAC
-Name: Panama-BE
-Source: modified from Panama hash test vectors
-Key: ""
-Message: ""
-MAC: e81aa04523532dd7267e5c5bc3ba0e289837a62ba032350351980e960a84b0af
-Test: Verify
-Message: "The quick brown fox jumps over the lazy dog"
-MAC: 8fa7dadce0110f979a0b795e76b2c25628d8bda88747758149c42e3bc13f85bc
-Test: Verify
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-MAC: cb34f0937e8d870d3bd7ff6311765f2c229a6c2154e4db119538db5159437cab
-Test: Verify
-Key: "The "
-Message: "quick brown fox jumps over the lazy dog"
-MAC: 8fa7dadce0110f979a0b795e76b2c25628d8bda88747758149c42e3bc13f85bc
-Test: Verify
-
-AlgorithmType: SymmetricCipher
-Source: generated by Crypto++ 5.2.1
-Key: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
-IV: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
-Name: Panama-LE
-Plaintext: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
-Ciphertext: F07F5FF2CCD01A0A7D44ACD6D239C2AF0DA1FF35275BAF5DFA6E09411B79D8B9
-Test: Encrypt
-Name: Panama-BE
-Plaintext: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
-Ciphertext: E12E2F6BA41AE832D888DA9FA6863BC37C0E996F190A1711330322D37BD98CA4
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/rsa_oaep.txt b/src-cryptopp/TestVectors/rsa_oaep.txt
deleted file mode 100644
index 3d8e3e2..0000000
--- a/src-cryptopp/TestVectors/rsa_oaep.txt
+++ /dev/null
@@ -1,1765 +0,0 @@
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 1: A 1024-bit RSA Key Pair
-Modulus: \
-a8 b3 b2 84 af 8e b5 0b 38 70 34 a8 60 f1 46 c4 \
-91 9f 31 87 63 cd 6c 55 98 c8 ae 48 11 a1 e0 ab \
-c4 c7 e0 b0 82 d6 93 a5 e7 fc ed 67 5c f4 66 85 \
-12 77 2c 0c bc 64 a7 42 c6 c6 30 f5 33 c8 cc 72 \
-f6 2a e8 33 c4 0b f2 58 42 e9 84 bb 78 bd bf 97 \
-c0 10 7d 55 bd b6 62 f5 c4 e0 fa b9 84 5c b5 14 \
-8e f7 39 2d d3 aa ff 93 ae 1e 6b 66 7b b3 d4 24 \
-76 16 d4 f5 ba 10 d4 cf d2 26 de 88 d3 9f 16 fb
-PublicExponent: 01 00 01
-PrivateExponent: \
-53 33 9c fd b7 9f c8 46 6a 65 5c 73 16 ac a8 5c \
-55 fd 8f 6d d8 98 fd af 11 95 17 ef 4f 52 e8 fd \
-8e 25 8d f9 3f ee 18 0f a0 e4 ab 29 69 3c d8 3b \
-15 2a 55 3d 4a c4 d1 81 2b 8b 9f a5 af 0e 7f 55 \
-fe 73 04 df 41 57 09 26 f3 31 1f 15 c4 d6 5a 73 \
-2c 48 31 16 ee 3d 3d 2d 0a f3 54 9a d9 bf 7c bf \
-b7 8a d8 84 f8 4d 5b eb 04 72 4d c7 36 9b 31 de \
-f3 7d 0c f5 39 e9 cf cd d3 de 65 37 29 ea d5 d1
-Prime1: \
-d3 27 37 e7 26 7f fe 13 41 b2 d5 c0 d1 50 a8 1b \
-58 6f b3 13 2b ed 2f 8d 52 62 86 4a 9c b9 f3 0a \
-f3 8b e4 48 59 8d 41 3a 17 2e fb 80 2c 21 ac f1 \
-c1 1c 52 0c 2f 26 a4 71 dc ad 21 2e ac 7c a3 9d
-Prime2: \
-cc 88 53 d1 d5 4d a6 30 fa c0 04 f4 71 f2 81 c7 \
-b8 98 2d 82 24 a4 90 ed be b3 3d 3e 3d 5c c9 3c \
-47 65 70 3d 1d d7 91 64 2f 1f 11 6a 0d d8 52 be \
-24 19 b2 af 72 bf e9 a0 30 e8 60 b0 28 8b 5d 77
-ModPrime1PrivateExponent: \
-0e 12 bf 17 18 e9 ce f5 59 9b a1 c3 88 2f e8 04 \
-6a 90 87 4e ef ce 8f 2c cc 20 e4 f2 74 1f b0 a3 \
-3a 38 48 ae c9 c9 30 5f be cb d2 d7 68 19 96 7d \
-46 71 ac c6 43 1e 40 37 96 8d b3 78 78 e6 95 c1
-ModPrime2PrivateExponent: \
-95 29 7b 0f 95 a2 fa 67 d0 07 07 d6 09 df d4 fc \
-05 c8 9d af c2 ef 6d 6e a5 5b ec 77 1e a3 33 73 \
-4d 92 51 e7 90 82 ec da 86 6e fe f1 3c 45 9e 1a \
-63 13 86 b7 e3 54 c8 99 f5 f1 12 ca 85 d7 15 83
-MultiplicativeInverseOfPrime2ModPrime1: \
-4f 45 6c 50 24 93 bd c0 ed 2a b7 56 a3 a6 ed 4d \
-67 35 2a 69 7d 42 16 e9 32 12 b1 27 a6 3d 54 11 \
-ce 6f a9 8d 5d be fd 73 26 3e 37 28 14 27 43 81 \
-81 66 ed 7d d6 36 87 dd 2a 8c a1 d2 f4 fb d8 e1
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 1.1
-Plaintext: \
-66 28 19 4e 12 07 3d b0 3b a9 4c da 9e f9 53 23 \
-97 d5 0d ba 79 b9 87 00 4a fe fe 34
-Seed: # not used yet\
-18 b7 76 ea 21 06 9d 69 77 6a 33 e9 6b ad 48 e1 \
-dd a0 a5 ef
-Ciphertext: \
-35 4f e6 7b 4a 12 6d 5d 35 fe 36 c7 77 79 1a 3f \
-7b a1 3d ef 48 4e 2d 39 08 af f7 22 fa d4 68 fb \
-21 69 6d e9 5d 0b e9 11 c2 d3 17 4f 8a fc c2 01 \
-03 5f 7b 6d 8e 69 40 2d e5 45 16 18 c2 1a 53 5f \
-a9 d7 bf c5 b8 dd 9f c2 43 f8 cf 92 7d b3 13 22 \
-d6 e8 81 ea a9 1a 99 61 70 e6 57 a0 5a 26 64 26 \
-d9 8c 88 00 3f 84 77 c1 22 70 94 a0 d9 fa 1e 8c \
-40 24 30 9c e1 ec cc b5 21 00 35 d4 7a c7 2e 8a
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 1.2
-Plaintext: \
-75 0c 40 47 f5 47 e8 e4 14 11 85 65 23 29 8a c9\
-ba e2 45 ef af 13 97 fb e5 6f 9d d5
-Seed: # not used yet\
-0c c7 42 ce 4a 9b 7f 32 f9 51 bc b2 51 ef d9 25\
-fe 4f e3 5f
-Ciphertext: \
-64 0d b1 ac c5 8e 05 68 fe 54 07 e5 f9 b7 01 df\
-f8 c3 c9 1e 71 6c 53 6f c7 fc ec 6c b5 b7 1c 11\
-65 98 8d 4a 27 9e 15 77 d7 30 fc 7a 29 93 2e 3f\
-00 c8 15 15 23 6d 8d 8e 31 01 7a 7a 09 df 43 52\
-d9 04 cd eb 79 aa 58 3a dc c3 1e a6 98 a4 c0 52\
-83 da ba 90 89 be 54 91 f6 7c 1a 4e e4 8d c7 4b\
-bb e6 64 3a ef 84 66 79 b4 cb 39 5a 35 2d 5e d1\
-15 91 2d f6 96 ff e0 70 29 32 94 6d 71 49 2b 44
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 1.3
-Plaintext: \
-d9 4a e0 83 2e 64 45 ce 42 33 1c b0 6d 53 1a 82\
-b1 db 4b aa d3 0f 74 6d c9 16 df 24 d4 e3 c2 45\
-1f ff 59 a6 42 3e b0 e1 d0 2d 4f e6 46 cf 69 9d\
-fd 81 8c 6e 97 b0 51
-Seed: # not used yet\
-25 14 df 46 95 75 5a 67 b2 88 ea f4 90 5c 36 ee\
-c6 6f d2 fd
-Ciphertext: \
-42 37 36 ed 03 5f 60 26 af 27 6c 35 c0 b3 74 1b\
-36 5e 5f 76 ca 09 1b 4e 8c 29 e2 f0 be fe e6 03\
-59 5a a8 32 2d 60 2d 2e 62 5e 95 eb 81 b2 f1 c9\
-72 4e 82 2e ca 76 db 86 18 cf 09 c5 34 35 03 a4\
-36 08 35 b5 90 3b c6 37 e3 87 9f b0 5e 0e f3 26\
-85 d5 ae c5 06 7c d7 cc 96 fe 4b 26 70 b6 ea c3\
-06 6b 1f cf 56 86 b6 85 89 aa fb 7d 62 9b 02 d8\
-f8 62 5c a3 83 36 24 d4 80 0f b0 81 b1 cf 94 eb
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 1.4
-Plaintext: \
-52 e6 50 d9 8e 7f 2a 04 8b 4f 86 85 21 53 b9 7e\
-01 dd 31 6f 34 6a 19 f6 7a 85
-Seed: # not used yet\
-c4 43 5a 3e 1a 18 a6 8b 68 20 43 62 90 a3 7c ef\
-b8 5d b3 fb
-Ciphertext: \
-45 ea d4 ca 55 1e 66 2c 98 00 f1 ac a8 28 3b 05\
-25 e6 ab ae 30 be 4b 4a ba 76 2f a4 0f d3 d3 8e\
-22 ab ef c6 97 94 f6 eb bb c0 5d db b1 12 16 24\
-7d 2f 41 2f d0 fb a8 7c 6e 3a cd 88 88 13 64 6f\
-d0 e4 8e 78 52 04 f9 c3 f7 3d 6d 82 39 56 27 22\
-dd dd 87 71 fe c4 8b 83 a3 1e e6 f5 92 c4 cf d4\
-bc 88 17 4f 3b 13 a1 12 aa e3 b9 f7 b8 0e 0f c6\
-f7 25 5b a8 80 dc 7d 80 21 e2 2a d6 a8 5f 07 55
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 1.5
-Plaintext: \
-8d a8 9f d9 e5 f9 74 a2 9f ef fb 46 2b 49 18 0f\
-6c f9 e8 02
-Seed: # not used yet\
-b3 18 c4 2d f3 be 0f 83 fe a8 23 f5 a7 b4 7e d5\
-e4 25 a3 b5
-Ciphertext: \
-36 f6 e3 4d 94 a8 d3 4d aa cb a3 3a 21 39 d0 0a\
-d8 5a 93 45 a8 60 51 e7 30 71 62 00 56 b9 20 e2\
-19 00 58 55 a2 13 a0 f2 38 97 cd cd 73 1b 45 25\
-7c 77 7f e9 08 20 2b ef dd 0b 58 38 6b 12 44 ea\
-0c f5 39 a0 5d 5d 10 32 9d a4 4e 13 03 0f d7 60\
-dc d6 44 cf ef 20 94 d1 91 0d 3f 43 3e 1c 7c 6d\
-d1 8b c1 f2 df 7f 64 3d 66 2f b9 dd 37 ea d9 05\
-91 90 f4 fa 66 ca 39 e8 69 c4 eb 44 9c bd c4 39
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 1.6
-Plaintext: \
-26 52 10 50 84 42 71
-Seed: # not used yet\
-e4 ec 09 82 c2 33 6f 3a 67 7f 6a 35 61 74 eb 0c\
-e8 87 ab c2
-Ciphertext: \
-42 ce e2 61 7b 1e ce a4 db 3f 48 29 38 6f bd 61\
-da fb f0 38 e1 80 d8 37 c9 63 66 df 24 c0 97 b4\
-ab 0f ac 6b df 59 0d 82 1c 9f 10 64 2e 68 1a d0\
-5b 8d 78 b3 78 c0 f4 6c e2 fa d6 3f 74 e0 ad 3d\
-f0 6b 07 5d 7e b5 f5 63 6f 8d 40 3b 90 59 ca 76\
-1b 5c 62 bb 52 aa 45 00 2e a7 0b aa ce 08 de d2\
-43 b9 d8 cb d6 2a 68 ad e2 65 83 2b 56 56 4e 43\
-a6 fa 42 ed 19 9a 09 97 69 74 2d f1 53 9e 82 55
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 2: A 1025-bit RSA Key Pair
-Modulus: \
-01 94 7c 7f ce 90 42 5f 47 27 9e 70 85 1f 25 d5\
-e6 23 16 fe 8a 1d f1 93 71 e3 e6 28 e2 60 54 3e\
-49 01 ef 60 81 f6 8c 0b 81 41 19 0d 2a e8 da ba\
-7d 12 50 ec 6d b6 36 e9 44 ec 37 22 87 7c 7c 1d\
-0a 67 f1 4b 16 94 c5 f0 37 94 51 a4 3e 49 a3 2d\
-de 83 67 0b 73 da 91 a1 c9 9b c2 3b 43 6a 60 05\
-5c 61 0f 0b af 99 c1 a0 79 56 5b 95 a3 f1 52 66\
-32 d1 d4 da 60 f2 0e da 25 e6 53 c4 f0 02 76 6f\
-45
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-08 23 f2 0f ad b5 da 89 08 8a 9d 00 89 3e 21 fa\
-4a 1b 11 fb c9 3c 64 a3 be 0b aa ea 97 fb 3b 93\
-c3 ff 71 37 04 c1 9c 96 3c 1d 10 7a ae 99 05 47\
-39 f7 9e 02 e1 86 de 86 f8 7a 6d de fe a6 d8 cc\
-d1 d3 c8 1a 47 bf a7 25 5b e2 06 01 a4 a4 b2 f0\
-8a 16 7b 5e 27 9d 71 5b 1b 45 5b dd 7e ab 24 59\
-41 d9 76 8b 9a ce fb 3c cd a5 95 2d a3 ce e7 25\
-25 b4 50 16 63 a8 ee 15 c9 e9 92 d9 24 62 fe 39
-Prime1: \
-01 59 db de 04 a3 3e f0 6f b6 08 b8 0b 19 0f 4d\
-3e 22 bc c1 3a c8 e4 a0 81 03 3a bf a4 16 ed b0\
-b3 38 aa 08 b5 73 09 ea 5a 52 40 e7 dc 6e 54 37\
-8c 69 41 4c 31 d9 7d db 1f 40 6d b3 76 9c c4 1a\
-43
-Prime2: \
-01 2b 65 2f 30 40 3b 38 b4 09 95 fd 6f f4 1a 1a\
-cc 8a da 70 37 32 36 b7 20 2d 39 b2 ee 30 cf b4\
-6d b0 95 11 f6 f3 07 cc 61 cc 21 60 6c 18 a7 5b\
-8a 62 f8 22 df 03 1b a0 df 0d af d5 50 6f 56 8b\
-d7
-ModPrime1PrivateExponent: \
-43 6e f5 08 de 73 65 19 c2 da 4c 58 0d 98 c8 2c\
-b7 45 2a 3f b5 ef ad c3 b9 c7 78 9a 1b c6 58 4f\
-79 5a dd bb d3 24 39 c7 46 86 55 2e cb 6c 2c 30\
-7a 4d 3a f7 f5 39 ee c1 57 24 8c 7b 31 f1 a2 55
-ModPrime2PrivateExponent: \
-01 2b 15 a8 9f 3d fb 2b 39 07 3e 73 f0 2b dd 0c\
-1a 7b 37 9d d4 35 f0 5c dd e2 ef f9 e4 62 94 8b\
-7c ec 62 ee 90 50 d5 e0 81 6e 07 85 a8 56 b4 91\
-08 dc b7 5f 36 83 87 4d 1c a6 32 9a 19 01 30 66\
-ff
-MultiplicativeInverseOfPrime2ModPrime1: \
-02 70 db 17 d5 91 4b 01 8d 76 11 8b 24 38 9a 73\
-50 ec 83 6b 00 63 a2 17 21 23 6f d8 ed b6 d8 9b\
-51 e7 ee b8 7b 61 1b 71 32 cb 7e a7 35 6c 23 15\
-1c 1e 77 51 50 7c 78 6d 9e e1 79 41 70 a8 c8 e8
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 2.1
-Plaintext: \
-8f f0 0c aa 60 5c 70 28 30 63 4d 9a 6c 3d 42 c6\
-52 b5 8c f1 d9 2f ec 57 0b ee e7
-Seed: # not used yet\
-8c 40 7b 5e c2 89 9e 50 99 c5 3e 8c e7 93 bf 94\
-e7 1b 17 82
-Ciphertext: \
-01 81 af 89 22 b9 fc b4 d7 9d 92 eb e1 98 15 99\
-2f c0 c1 43 9d 8b cd 49 13 98 a0 f4 ad 3a 32 9a\
-5b d9 38 55 60 db 53 26 83 c8 b7 da 04 e4 b1 2a\
-ed 6a ac df 47 1c 34 c9 cd a8 91 ad dc c2 df 34\
-56 65 3a a6 38 2e 9a e5 9b 54 45 52 57 eb 09 9d\
-56 2b be 10 45 3f 2b 6d 13 c5 9c 02 e1 0f 1f 8a\
-bb 5d a0 d0 57 09 32 da cf 2d 09 01 db 72 9d 0f\
-ef cc 05 4e 70 96 8e a5 40 c8 1b 04 bc ae fe 72\
-0e
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 2.2
-Plaintext: \
-2d
-Seed: # not used yet\
-b6 00 cf 3c 2e 50 6d 7f 16 77 8c 91 0d 3a 8b 00\
-3e ee 61 d5
-Ciphertext: \
-01 87 59 ff 1d f6 3b 27 92 41 05 62 31 44 16 a8\
-ae af 2a c6 34 b4 6f 94 0a b8 2d 64 db f1 65 ee\
-e3 30 11 da 74 9d 4b ab 6e 2f cd 18 12 9c 9e 49\
-27 7d 84 53 11 2b 42 9a 22 2a 84 71 b0 70 99 39\
-98 e7 58 86 1c 4d 3f 6d 74 9d 91 c4 29 0d 33 2c\
-7a 4a b3 f7 ea 35 ff 3a 07 d4 97 c9 55 ff 0f fc\
-95 00 6b 62 c6 d2 96 81 0d 9b fa b0 24 19 6c 79\
-34 01 2c 2d f9 78 ef 29 9a ba 23 99 40 cb a1 02\
-45
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 2.3
-Plaintext: \
-74 fc 88 c5 1b c9 0f 77 af 9d 5e 9a 4a 70 13 3d\
-4b 4e 0b 34 da 3c 37 c7 ef 8e
-Seed: # not used yet\
-a7 37 68 ae ea a9 1f 9d 8c 1e d6 f9 d2 b6 34 67\
-f0 7c ca e3
-Ciphertext: \
-01 88 02 ba b0 4c 60 32 5e 81 c4 96 23 11 f2 be\
-7c 2a dc e9 30 41 a0 07 19 c8 8f 95 75 75 f2 c7\
-9f 1b 7b c8 ce d1 15 c7 06 b3 11 c0 8a 2d 98 6c\
-a3 b6 a9 33 6b 14 7c 29 c6 f2 29 40 9d de c6 51\
-bd 1f dd 5a 0b 7f 61 0c 99 37 fd b4 a3 a7 62 36\
-4b 8b 32 06 b4 ea 48 5f d0 98 d0 8f 63 d4 aa 8b\
-b2 69 7d 02 7b 75 0c 32 d7 f7 4e af 51 80 d2 e9\
-b6 6b 17 cb 2f a5 55 23 bc 28 0d a1 0d 14 be 20\
-53
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 2.4
-Plaintext: \
-a7 eb 2a 50 36 93 1d 27 d4 e8 91 32 6d 99 69 2f\
-fa dd a9 bf 7e fd 3e 34 e6 22 c4 ad c0 85 f7 21\
-df e8 85 07 2c 78 a2 03 b1 51 73 9b e5 40 fa 8c\
-15 3a 10 f0 0a
-Seed: # not used yet\
-9a 7b 3b 0e 70 8b d9 6f 81 90 ec ab 4f b9 b2 b3\
-80 5a 81 56
-Ciphertext: \
-00 a4 57 8c bc 17 63 18 a6 38 fb a7 d0 1d f1 57\
-46 af 44 d4 f6 cd 96 d7 e7 c4 95 cb f4 25 b0 9c\
-64 9d 32 bf 88 6d a4 8f ba f9 89 a2 11 71 87 ca\
-fb 1f b5 80 31 76 90 e3 cc d4 46 92 0b 7a f8 2b\
-31 db 58 04 d8 7d 01 51 4a cb fa 91 56 e7 82 f8\
-67 f6 be d9 44 9e 0e 9a 2c 09 bc ec c6 aa 08 76\
-36 96 5e 34 b3 ec 76 6f 2f e2 e4 30 18 a2 fd de\
-b1 40 61 6a 0e 9d 82 e5 33 10 24 ee 06 52 fc 76\
-41
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 2.5
-Plaintext: \
-2e f2 b0 66 f8 54 c3 3f 3b dc bb 59 94 a4 35 e7\
-3d 6c 6c
-Seed: # not used yet\
-eb 3c eb bc 4a dc 16 bb 48 e8 8c 8a ec 0e 34 af\
-7f 42 7f d3
-Ciphertext: \
-00 eb c5 f5 fd a7 7c fd ad 3c 83 64 1a 90 25 e7\
-7d 72 d8 a6 fb 33 a8 10 f5 95 0f 8d 74 c7 3e 8d\
-93 1e 86 34 d8 6a b1 24 62 56 ae 07 b6 00 5b 71\
-b7 f2 fb 98 35 12 18 33 1c e6 9b 8f fb dc 9d a0\
-8b bc 9c 70 4f 87 6d eb 9d f9 fc 2e c0 65 ca d8\
-7f 90 90 b0 7a cc 17 aa 7f 99 7b 27 ac a4 88 06\
-e8 97 f7 71 d9 51 41 fe 45 26 d8 a5 30 1b 67 86\
-27 ef ab 70 7f d4 0f be bd 6e 79 2a 25 61 3e 7a\
-ec
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 2.6
-Plaintext: \
-8a 7f b3 44 c8 b6 cb 2c f2 ef 1f 64 3f 9a 32 18\
-f6 e1 9b ba 89 c0
-Seed: # not used yet\
-4c 45 cf 4d 57 c9 8e 3d 6d 20 95 ad c5 1c 48 9e\
-b5 0d ff 84
-Ciphertext: \
-01 08 39 ec 20 c2 7b 90 52 e5 5b ef b9 b7 7e 6f\
-c2 6e 90 75 d7 a5 43 78 c6 46 ab df 51 e4 45 bd\
-57 15 de 81 78 9f 56 f1 80 3d 91 70 76 4a 9e 93\
-cb 78 79 86 94 02 3e e7 39 3c e0 4b c5 d8 f8 c5\
-a5 2c 17 1d 43 83 7e 3a ca 62 f6 09 eb 0a a5 ff\
-b0 96 0e f0 41 98 dd 75 4f 57 f7 fb e6 ab f7 65\
-cf 11 8b 4c a4 43 b2 3b 5a ab 26 6f 95 23 26 ac\
-45 81 10 06 44 32 5f 8b 72 1a cd 5d 04 ff 14 ef\
-3a
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 3: A 1026-bit RSA Key Pair
-Modulus: \
-02 b5 8f ec 03 9a 86 07 00 a4 d7 b6 46 2f 93 e6\
-cd d4 91 16 1d dd 74 f4 e8 10 b4 0e 3c 16 52 00\
-6a 5c 27 7b 27 74 c1 13 05 a4 cb ab 5a 78 ef a5\
-7e 17 a8 6d f7 a3 fa 36 fc 4b 1d 22 49 f2 2e c7\
-c2 dd 6a 46 32 32 ac ce a9 06 d6 6e be 80 b5 70\
-4b 10 72 9d a6 f8 33 23 4a bb 5e fd d4 a2 92 cb\
-fa d3 3b 4d 33 fa 7a 14 b8 c3 97 b5 6e 3a cd 21\
-20 34 28 b7 7c df a3 3a 6d a7 06 b3 d8 b0 fc 43\
-e9
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-15 b4 8a 5b 56 83 a9 46 70 e2 3b 57 18 f8 14 fa\
-0e 13 f8 50 38 f5 07 11 18 2c ba 61 51 05 81 f3\
-d2 2c 7e 23 2e f9 37 e2 2e 55 1d 68 b8 6e 2f 8c\
-b1 aa d8 be 2e 48 8f 5d f7 ef d2 79 e3 f5 68 d4\
-ea f3 6f 80 cf 71 41 ac e6 0f cc 91 13 fb 6c 4a\
-84 1f d5 0b bc 7c 51 2f fc be ff 21 48 7a a8 11\
-eb 3c a8 c6 20 05 34 6a 86 de 86 bf a1 d8 a9 48\
-fd 3f 34 8c 22 ea ad f3 33 c3 ce 6c e1 32 08 fd
-Prime1: \
-01 bf 01 d2 16 d7 35 95 cf 02 70 c2 be b7 8d 40\
-a0 d8 44 7d 31 da 91 9a 98 3f 7e ea 78 1b 77 d8\
-5f e3 71 b3 e9 37 3e 7b 69 21 7d 31 50 a0 2d 89\
-58 de 7f ad 9d 55 51 60 95 8b 44 54 12 7e 0e 7e\
-af
-Prime2: \
-01 8d 33 99 65 81 66 db 38 29 81 6d 7b 29 54 16\
-75 9e 9c 91 98 7f 5b 2d 8a ec d6 3b 04 b4 8b d7\
-b2 fc f2 29 bb 7f 8a 6d c8 8b a1 3d d2 e3 9a d5\
-5b 6d 1a 06 16 07 08 f9 70 0b e8 0b 8f d3 74 4c\
-e7
-ModPrime1PrivateExponent: \
-06 c0 a2 49 d2 0a 6f 2e e7 5c 88 b4 94 d5 3f 6a\
-ae 99 aa 42 7c 88 c2 8b 16 3a 76 94 45 e5 f3 90\
-cf 40 c2 74 fd 6e a6 32 9a 5c e7 c7 ce 03 a2 15\
-83 96 ee 2a 78 45 78 6e 09 e2 88 5a 97 28 e4 e5
-ModPrime2PrivateExponent: \
-d1 d2 7c 29 fe dd 92 d8 6c 34 8e dd 0c cb fa c1\
-4f 74 6e 05 1c e1 d1 81 1d f3 5d 61 f2 ee 1c 97\
-d4 bf 28 04 80 2f 64 27 18 7b a8 e9 0a 8a f4 42\
-43 b4 07 9b 03 44 5e 60 2e 29 fa 51 93 e6 4f e9
-MultiplicativeInverseOfPrime2ModPrime1: \
-8c b2 f7 56 bd 89 41 b1 d3 b7 70 e5 ad 31 ee 37\
-3b 28 ac da 69 ff 9b 6f 40 fe 57 8b 9f 1a fb 85\
-83 6f 96 27 d3 7a cf f7 3c 27 79 e6 34 bb 26 01\
-1c 2c 8f 7f 33 61 ae 2a 9e a6 5e d6 89 e3 63 9a
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 3.1
-Plaintext: \
-08 78 20 b5 69 e8 fa 8d
-Seed: # not used yet\
-8c ed 6b 19 62 90 80 57 90 e9 09 07 40 15 e6 a2\
-0b 0c 48 94
-Ciphertext: \
-02 6a 04 85 d9 6a eb d9 6b 43 82 08 50 99 b9 62\
-e6 a2 bd ec 3d 90 c8 db 62 5e 14 37 2d e8 5e 2d\
-5b 7b aa b6 5c 8f af 91 bb 55 04 fb 49 5a fc e5\
-c9 88 b3 f6 a5 2e 20 e1 d6 cb d3 56 6c 5c d1 f2\
-b8 31 8b b5 42 cc 0e a2 5c 4a ab 99 32 af a2 07\
-60 ea dd ec 78 43 96 a0 7e a0 ef 24 d4 e6 f4 d3\
-7e 50 52 a7 a3 1e 14 6a a4 80 a1 11 bb e9 26 40\
-13 07 e0 0f 41 00 33 84 2b 6d 82 fe 5c e4 df ae\
-80
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 3.2
-Plaintext: \
-46 53 ac af 17 19 60 b0 1f 52 a7 be 63 a3 ab 21\
-dc 36 8e c4 3b 50 d8 2e c3 78 1e 04
-Seed: # not used yet\
-b4 29 1d 65 67 55 08 48 cc 15 69 67 c8 09 ba ab\
-6c a5 07 f0
-Ciphertext: \
-02 4d b8 9c 78 02 98 9b e0 78 38 47 86 30 84 94\
-1b f2 09 d7 61 98 7e 38 f9 7c b5 f6 f1 bc 88 da\
-72 a5 0b 73 eb af 11 c8 79 c4 f9 5d f3 7b 85 0b\
-8f 65 d7 62 2e 25 b1 b8 89 e8 0f e8 0b ac a2 06\
-9d 6e 0e 1d 82 99 53 fc 45 90 69 de 98 ea 97 98\
-b4 51 e5 57 e9 9a bf 8f e3 d9 cc f9 09 6e bb f3\
-e5 25 5d 3b 4e 1c 6d 2e ca df 06 7a 35 9e ea 86\
-40 5a cd 47 d5 e1 65 51 7c ca fd 47 d6 db ee 4b\
-f5
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 3.3
-Plaintext: \
-d9 4c d0 e0 8f a4 04 ed 89
-Seed: # not used yet\
-ce 89 28 f6 05 95 58 25 40 08 ba dd 97 94 fa dc\
-d2 fd 1f 65
-Ciphertext: \
-02 39 bc e6 81 03 24 41 52 88 77 d6 d1 c8 bb 28\
-aa 3b c9 7f 1d f5 84 56 36 18 99 57 97 68 38 44\
-ca 86 66 47 32 f4 be d7 a0 aa b0 83 aa ab fb 72\
-38 f5 82 e3 09 58 c2 02 4e 44 e5 70 43 b9 79 50\
-fd 54 3d a9 77 c9 0c dd e5 33 7d 61 84 42 f9 9e\
-60 d7 78 3a b5 9c e6 dd 9d 69 c4 7a d1 e9 62 be\
-c2 2d 05 89 5c ff 8d 3f 64 ed 52 61 d9 2b 26 78\
-51 03 93 48 49 90 ba 3f 7f 06 81 8a e6 ff ce 8a\
-3a
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 3.4
-Plaintext: \
-6c c6 41 b6 b6 1e 6f 96 39 74 da d2 3a 90 13 28\
-4e f1
-Seed: # not used yet\
-6e 29 79 f5 2d 68 14 a5 7d 83 b0 90 05 48 88 f1\
-19 a5 b9 a3
-Ciphertext: \
-02 99 4c 62 af d7 6f 49 8b a1 fd 2c f6 42 85 7f\
-ca 81 f4 37 3c b0 8f 1c ba ee 6f 02 5c 3b 51 2b\
-42 c3 e8 77 91 13 47 66 48 03 9d be 04 93 f9 24\
-62 92 fa c2 89 50 60 0e 7c 0f 32 ed f9 c8 1b 9d\
-ec 45 c3 bd e0 cc 8d 88 47 59 01 69 90 7b 7d c5\
-99 1c eb 29 bb 07 14 d6 13 d9 6d f0 f1 2e c5 d8\
-d3 50 7c 8e e7 ae 78 dd 83 f2 16 fa 61 de 10 03\
-63 ac a4 8a 7e 91 4a e9 f4 2d df be 94 3b 09 d9\
-a0
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 3.5
-Plaintext: \
-df 51 51 83 2b 61 f4 f2 58 91 fb 41 72 f3 28 d2\
-ed df 83 71 ff cf db e9 97 93 92 95 f3 0e ca 69\
-18 01 7c fd a1 15 3b f7 a6 af 87 59 32 23
-Seed: # not used yet\
-2d 76 0b fe 38 c5 9d e3 4c dc 8b 8c 78 a3 8e 66\
-28 4a 2d 27
-Ciphertext: \
-01 62 04 2f f6 96 95 92 a6 16 70 31 81 1a 23 98\
-34 ce 63 8a bf 54 fe c8 b9 94 78 12 2a fe 2e e6\
-7f 8c 5b 18 b0 33 98 05 bf db c5 a4 e6 72 0b 37\
-c5 9c fb a9 42 46 4c 59 7f f5 32 a1 19 82 15 45\
-fd 2e 59 b1 14 e6 1d af 71 82 05 29 f5 02 9c f5\
-24 95 43 27 c3 4e c5 e6 f5 ba 7e fc c4 de 94 3a\
-b8 ad 4e d7 87 b1 45 43 29 f7 0d b7 98 a3 a8 f4\
-d9 2f 82 74 e2 b2 94 8a de 62 7c e8 ee 33 e4 3c\
-60
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 3.6
-Plaintext: \
-3c 3b ad 89 3c 54 4a 6d 52 0a b0 22 31 91 88 c8\
-d5 04 b7 a7 88 b8 50 90 3b 85 97 2e aa 18 55 2e\
-11 34 a7 ad 60 98 82 62 54 ff 7a b6 72 b3 d8 eb\
-31 58 fa c6 d4 cb ae f1
-Seed: # not used yet\
-f1 74 77 9c 5f d3 cf e0 07 ba dc b7 a3 6c 9b 55\
-bf cf bf 0e
-Ciphertext: \
-00 11 20 51 e7 5d 06 49 43 bc 44 78 07 5e 43 48\
-2f d5 9c ee 06 79 de 68 93 ee c3 a9 43 da a4 90\
-b9 69 1c 93 df c0 46 4b 66 23 b9 f3 db d3 e7 00\
-83 26 4f 03 4b 37 4f 74 16 4e 1a 00 76 37 25 e5\
-74 74 4b a0 b9 db 83 43 4f 31 df 96 f6 e2 a2 6f\
-6d 8e ba 34 8b d4 68 6c 22 38 ac 07 c3 7a ac 37\
-85 d1 c7 ee a2 f8 19 fd 91 49 17 98 ed 8e 9c ef\
-5e 43 b7 81 b0 e0 27 6e 37 c4 3f f9 49 2d 00 57\
-30
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 4: A 1027-bit RSA Key Pair
-Modulus: \
-05 12 40 b6 cc 00 04 fa 48 d0 13 46 71 c0 78 c7\
-c8 de c3 b3 e2 f2 5b c2 56 44 67 33 9d b3 88 53\
-d0 6b 85 ee a5 b2 de 35 3b ff 42 ac 2e 46 bc 97\
-fa e6 ac 96 18 da 95 37 a5 c8 f5 53 c1 e3 57 62\
-59 91 d6 10 8d cd 78 85 fb 3a 25 41 3f 53 ef ca\
-d9 48 cb 35 cd 9b 9a e9 c1 c6 76 26 d1 13 d5 7d\
-de 4c 5b ea 76 bb 5b b7 de 96 c0 0d 07 37 2e 96\
-85 a6 d7 5c f9 d2 39 fa 14 8d 70 93 1b 5f 3f b0\
-39
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-04 11 ff ca 3b 7c a5 e9 e9 be 7f e3 8a 85 10 5e\
-35 38 96 db 05 c5 79 6a ec d2 a7 25 16 1e b3 65\
-1c 86 29 a9 b8 62 b9 04 d7 b0 c7 b3 7f 8c b5 a1\
-c2 b5 40 01 01 8a 00 a1 eb 2c af e4 ee 4e 94 92\
-c3 48 bc 2b ed ab 4b 9e bb f0 64 e8 ef f3 22 b9\
-00 9f 8e ec 65 39 05 f4 0d f8 8a 3c dc 49 d4 56\
-7f 75 62 7d 41 ac a6 24 12 9b 46 a0 b7 c6 98 e5\
-e6 5f 2b 7b a1 02 c7 49 a1 01 35 b6 54 0d 04 01
-Prime1: \
-02 74 58 c1 9e c1 63 69 19 e7 36 c9 af 25 d6 09\
-a5 1b 8f 56 1d 19 c6 bf 69 43 dd 1e e1 ab 8a 4a\
-3f 23 21 00 bd 40 b8 8d ec c6 ba 23 55 48 b6 ef\
-79 2a 11 c9 de 82 3d 0a 79 22 c7 09 5b 6e ba 57\
-01
-Prime2: \
-02 10 ee 9b 33 ab 61 71 6e 27 d2 51 bd 46 5f 4b\
-35 a1 a2 32 e2 da 00 90 1c 29 4b f2 23 50 ce 49\
-0d 09 9f 64 2b 53 75 61 2d b6 3b a1 f2 03 86 49\
-2b f0 4d 34 b3 c2 2b ce b9 09 d1 34 41 b5 3b 51\
-39
-ModPrime1PrivateExponent: \
-39 fa 02 8b 82 6e 88 c1 12 1b 75 0a 8b 24 2f a9\
-a3 5c 5b 66 bd fd 1f a6 37 d3 cc 48 a8 4a 4f 45\
-7a 19 4e 77 27 e4 9f 7b cc 6e 5a 5a 41 26 57 fc\
-47 0c 73 22 eb c3 74 16 ef 45 8c 30 7a 8c 09 01
-ModPrime2PrivateExponent: \
-01 5d 99 a8 41 95 94 39 79 fa 9e 1b e2 c3 c1 b6\
-9f 43 2f 46 fd 03 e4 7d 5b ef bb bf d6 b1 d1 37\
-1d 83 ef b3 30 a3 e0 20 94 2b 2f ed 11 5e 5d 02\
-be 24 fd 92 c9 01 9d 1c ec d6 dd 4c f1 e5 4c c8\
-99
-MultiplicativeInverseOfPrime2ModPrime1: \
-01 f0 b7 01 51 70 b3 f5 e4 22 23 ba 30 30 1c 41\
-a6 d8 7c bb 70 e3 0c b7 d3 c6 7d 25 47 3d b1 f6\
-cb f0 3e 3f 91 26 e3 e9 79 68 27 9a 86 5b 2c 2b\
-42 65 24 cf c5 2a 68 3d 31 ed 30 eb 98 4b e4 12\
-ba
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 4.1
-Plaintext: \
-4a 86 60 95 34 ee 43 4a 6c bc a3 f7 e9 62 e7 6d\
-45 5e 32 64 c1 9f 60 5f 6e 5f f6 13 7c 65 c5 6d\
-7f b3 44 cd 52 bc 93 37 4f 3d 16 6c 9f 0c 6f 9c\
-50 6b ad 19 33 09 72 d2
-Seed: # not used yet\
-1c ac 19 ce 99 3d ef 55 f9 82 03 f6 85 28 96 c9\
-5c cc a1 f3
-Ciphertext: \
-04 cc e1 96 14 84 5e 09 41 52 a3 fe 18 e5 4e 33\
-30 c4 4e 5e fb c6 4a e1 68 86 cb 18 69 01 4c c5\
-78 1b 1f 8f 9e 04 53 84 d0 11 2a 13 5c a0 d1 2e\
-9c 88 a8 e4 06 34 16 de aa e3 84 4f 60 d6 e9 6f\
-e1 55 14 5f 45 25 b9 a3 44 31 ca 37 66 18 0f 70\
-e1 5a 5e 5d 8e 8b 1a 51 6f f8 70 60 9f 13 f8 96\
-93 5c ed 18 82 79 a5 8e d1 3d 07 11 42 77 d7 5c\
-65 68 60 7e 0a b0 92 fd 80 3a 22 3e 4a 8e e0 b1\
-a8
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 4.2
-Plaintext: \
-b0 ad c4 f3 fe 11 da 59 ce 99 27 73 d9 05 99 43\
-c0 30 46 49 7e e9 d9 f9 a0 6d f1 16 6d b4 6d 98\
-f5 8d 27 ec 07 4c 02 ee e6 cb e2 44 9c 8b 9f c5\
-08 0c 5c 3f 44 33 09 25 12 ec 46 aa 79 37 43 c8
-Seed: # not used yet\
-f5 45 d5 89 75 85 e3 db 71 aa 0c b8 da 76 c5 1d\
-03 2a e9 63
-Ciphertext: \
-00 97 b6 98 c6 16 56 45 b3 03 48 6f bf 5a 2a 44\
-79 c0 ee 85 88 9b 54 1a 6f 0b 85 8d 6b 65 97 b1\
-3b 85 4e b4 f8 39 af 03 39 9a 80 d7 9b da 65 78\
-c8 41 f9 0d 64 57 15 b2 80 d3 71 43 99 2d d1 86\
-c8 0b 94 9b 77 5c ae 97 37 0e 4e c9 74 43 13 6c\
-6d a4 84 e9 70 ff db 13 23 a2 08 47 82 1d 3b 18\
-38 1d e1 3b b4 9a ae a6 65 30 c4 a4 b8 27 1f 3e\
-ae 17 2c d3 66 e0 7e 66 36 f1 01 9d 2a 28 ae d1\
-5e
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 4.3
-Plaintext: \
-bf 6d 42 e7 01 70 7b 1d 02 06 b0 c8 b4 5a 1c 72\
-64 1f f1 28 89 21 9a 82 bd ea 96 5b 5e 79 a9 6b\
-0d 01 63 ed 9d 57 8e c9 ad a2 0f 2f bc f1 ea 3c\
-40 89 d8 34 19 ba 81 b0 c6 0f 36 06 da 99
-Seed: # not used yet\
-ad 99 7f ee f7 30 d6 ea 7b e6 0d 0d c5 2e 72 ea\
-cb fd d2 75
-Ciphertext: \
-03 01 f9 35 e9 c4 7a bc b4 8a cb be 09 89 5d 9f\
-59 71 af 14 83 9d a4 ff 95 41 7e e4 53 d1 fd 77\
-31 90 72 bb 72 97 e1 b5 5d 75 61 cd 9d 1b b2 4c\
-1a 9a 37 c6 19 86 43 08 24 28 04 87 9d 86 eb d0\
-01 dc e5 18 39 75 e1 50 69 89 b7 0e 5a 83 43 41\
-54 d5 cb fd 6a 24 78 7e 60 eb 0c 65 8d 2a c1 93\
-30 2d 11 92 c6 e6 22 d4 a1 2a d4 b5 39 23 bc a2\
-46 df 31 c6 39 5e 37 70 2c 6a 78 ae 08 1f b9 d0\
-65
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 4.4
-Plaintext: \
-fb 2e f1 12 f5 e7 66 eb 94 01 92 97 93 47 94 f7\
-be 2f 6f c1 c5 8e
-Seed: # not used yet\
-13 64 54 df 57 30 f7 3c 80 7a 7e 40 d8 c1 a3 12\
-ac 5b 9d d3
-Ciphertext: \
-02 d1 10 ad 30 af b7 27 be b6 91 dd 0c f1 7d 0a\
-f1 a1 e7 fa 0c c0 40 ec 1a 4b a2 6a 42 c5 9d 0a\
-79 6a 2e 22 c8 f3 57 cc c9 8b 65 19 ac eb 68 2e\
-94 5e 62 cb 73 46 14 a5 29 40 7c d4 52 be e3 e4\
-4f ec e8 42 3c c1 9e 55 54 8b 8b 99 4b 84 9c 7e\
-cd e4 93 3e 76 03 7e 1d 0c e4 42 75 b0 87 10 c6\
-8e 43 01 30 b9 29 73 0e d7 7e 09 b0 15 64 2c 55\
-93 f0 4e 4f fb 94 10 79 81 02 a8 e9 6f fd fe 11\
-e4
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 4.5
-Plaintext: \
-28 cc d4 47 bb 9e 85 16 6d ab b9 e5 b7 d1 ad ad\
-c4 b9 d3 9f 20 4e 96 d5 e4 40 ce 9a d9 28 bc 1c\
-22 84
-Seed: # not used yet\
-bc a8 05 7f 82 4b 2e a2 57 f2 86 14 07 ee f6 3d\
-33 20 86 81
-Ciphertext: \
-00 db b8 a7 43 9d 90 ef d9 19 a3 77 c5 4f ae 8f\
-e1 1e c5 8c 3b 85 83 62 e2 3a d1 b8 a4 43 10 79\
-90 66 b9 93 47 aa 52 56 91 d2 ad c5 8d 9b 06 e3\
-4f 28 8c 17 03 90 c5 f0 e1 1c 0a a3 64 59 59 f1\
-8e e7 9e 8f 2b e8 d7 ac 5c 23 d0 61 f1 8d d7 4b\
-8c 5f 2a 58 fc b5 eb 0c 54 f9 9f 01 a8 32 47 56\
-82 92 53 65 83 34 09 48 d7 a8 c9 7c 4a cd 1e 98\
-d1 e2 9d c3 20 e9 7a 26 05 32 a8 aa 7a 75 8a 1e\
-c2
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 4.6
-Plaintext: \
-f2 22 42 75 1e c6 b1
-Seed: # not used yet\
-2e 7e 1e 17 f6 47 b5 dd d0 33 e1 54 72 f9 0f 68\
-12 f3 ac 4e
-Ciphertext: \
-00 a5 ff a4 76 8c 8b be ca ee 2d b7 7e 8f 2e ec\
-99 59 59 33 54 55 20 83 5e 5b a7 db 94 93 d3 e1\
-7c dd ef e6 a5 f5 67 62 44 71 90 8d b4 e2 d8 3a\
-0f be e6 06 08 fc 84 04 95 03 b2 23 4a 07 dc 83\
-b2 7b 22 84 7a d8 92 0f f4 2f 67 4e f7 9b 76 28\
-0b 00 23 3d 2b 51 b8 cb 27 03 a9 d4 2b fb c8 25\
-0c 96 ec 32 c0 51 e5 7f 1b 4b a5 28 db 89 c3 7e\
-4c 54 e2 7e 6e 64 ac 69 63 5a e8 87 d9 54 16 19\
-a9
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 5: A 1028-bit RSA Key Pair
-Modulus: \
-0a ad f3 f9 c1 25 e5 d8 91 f3 1a c4 48 e9 93 de\
-fe 58 0f 80 2b 45 f9 d7 f2 2b a5 02 1e 9c 47 57\
-6b 5a 1e 68 03 1b a9 db 4e 6d ab e4 d9 6a 1d 6f\
-3d 26 72 68 cf f4 08 00 5f 11 8e fc ad b9 98 88\
-d1 c2 34 46 71 66 b2 a2 b8 49 a0 5a 88 9c 06 0a\
-c0 da 0c 5f ae 8b 55 f3 09 ba 62 e7 03 74 2f a0\
-32 6f 2d 10 b0 11 02 14 89 ff 49 77 70 19 0d 89\
-5f d3 9f 52 29 3c 39 ef d7 3a 69 8b da b9 f1 0e\
-d9
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-02 56 eb 4c ba 70 67 f2 d2 be 54 0d cd ff 45 82\
-a3 6b 7d 31 d1 c9 09 9b b2 14 b7 98 48 46 6a 26\
-8f 80 f5 8a 49 ac 04 c0 e3 64 89 34 a0 20 6c 04\
-53 7c 19 b2 36 64 3a 60 82 73 21 44 df 75 fa 21\
-75 88 f7 94 68 2b e8 91 68 27 6d c7 26 c5 c0 cb\
-db 84 d3 1b bf 26 d0 a4 3a f4 95 71 7f 7d 52 8a\
-cf ee 34 15 61 f6 ff 3c ae 05 c5 78 f8 47 0d 96\
-82 f9 c0 d0 72 f9 f6 06 8b 56 d5 88 0f 68 2b e2\
-c5
-Prime1: \
-03 b0 d3 96 2f 6d 17 54 9c bf ca 11 29 43 48 dc\
-f0 e7 e3 9f 8c 2b c6 82 4f 21 64 b6 06 d6 87 86\
-0d ae 1e 63 23 93 cf ed f5 13 22 82 29 06 9e 2f\
-60 e4 ac d7 e6 33 a4 36 06 3f 82 38 5f 48 99 37\
-07
-Prime2: \
-02 e4 c3 2e 2f 51 72 69 b7 07 23 09 f0 0c 0e 31\
-36 5f 7c e2 8b 23 6b 82 91 2d f2 39 ab f3 95 72\
-cf 0e d6 04 b0 29 82 e5 35 64 c5 2d 6a 05 39 7d\
-e5 c0 52 a2 fd dc 14 1e f7 18 98 36 34 6a eb 33\
-1f
-ModPrime1PrivateExponent: \
-01 e8 4b 11 9d 25 16 1f a6 7b 00 25 6a 5b d9 b6\
-45 d2 b2 32 ec b0 5b 01 51 80 02 9a 88 62 2a dc\
-3f 09 b3 ae ac de 61 61 ab 7c de 22 c2 ad 26 e7\
-79 7d f5 4e 07 2c bd 3b 26 73 80 0b 3e 43 38 db\
-d5
-ModPrime2PrivateExponent: \
-eb 90 aa 1a 40 13 5b 4c ea 07 19 7c ed c8 81 9b\
-e1 e7 cb ff 25 47 66 21 16 f4 65 a4 a9 f4 87 ab\
-12 f3 ba 4f ef 13 82 22 65 a6 52 97 d9 8b 7b de\
-d9 37 2e 3f fe 81 a3 8b 3e 96 00 fe d0 55 75 4f
-MultiplicativeInverseOfPrime2ModPrime1: \
-01 2f 7f 81 38 f9 40 40 62 eb 85 a4 29 24 52 0b\
-38 f5 bb 88 6a 01 96 f4 8b b8 dc ea 60 fd 92 cc\
-02 7f 18 e7 81 58 a3 4a 5c 5d 5f 86 0a 0f 6c 04\
-07 1a 7d 01 31 2c 06 50 62 f1 eb 48 b7 9d 1c 83\
-cb
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 5.1
-Plaintext: \
-af 71 a9 01 e3 a6 1d 31 32 f0 fc 1f db 47 4f 9e\
-a6 57 92 57 ff c2 4d 16 41 70 14 5b 3d bd e8
-Seed: # not used yet\
-44 c9 2e 28 3f 77 b9 49 9c 60 3d 96 36 60 c8 7d\
-2f 93 94 61
-Ciphertext: \
-03 60 46 a4 a4 7d 9e d3 ba 9a 89 13 9c 10 50 38\
-eb 74 92 b0 5a 5d 68 bf d5 3a cc ff 45 97 f7 a6\
-86 51 b4 7b 4a 46 27 d9 27 e4 85 ee d7 b4 56 64\
-20 e8 b4 09 87 9e 5d 60 6e ae 25 1d 22 a5 df 79\
-9f 79 20 bf c1 17 b9 92 57 2a 53 b1 26 31 46 bc\
-ea 03 38 5c c5 e8 53 c9 a1 01 c8 c3 e1 bd a3 1a\
-51 98 07 49 6c 6c b5 e5 ef b4 08 82 3a 35 2b 8f\
-a0 66 1f b6 64 ef ad d5 93 de b9 9f ff 5e d0 00\
-e5
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 5.2
-Plaintext: \
-a3 b8 44 a0 82 39 a8 ac 41 60 5a f1 7a 6c fd a4\
-d3 50 13 65 85 90 3a 41 7a 79 26 87 60 51 9a 4b\
-4a c3 30 3e c7 3f 0f 87 cf b3 23 99
-Seed: # not used yet\
-cb 28 f5 86 06 59 fc ee e4 9c 3e ea fc e6 25 a7\
-08 03 bd 32
-Ciphertext: \
-03 d6 eb 65 4e dc e6 15 bc 59 f4 55 26 5e d4 e5\
-a1 82 23 cb b9 be 4e 40 69 b4 73 80 4d 5d e9 6f\
-54 dc aa a6 03 d0 49 c5 d9 4a a1 47 0d fc d2 25\
-40 66 b7 c7 b6 1f f1 f6 f6 77 0e 32 15 c5 13 99\
-fd 4e 34 ec 50 82 bc 48 f0 89 84 0a d0 43 54 ae\
-66 dc 0f 1b d1 8e 46 1a 33 cc 12 58 b4 43 a2 83\
-7a 6d f2 67 59 aa 23 02 33 49 86 f8 73 80 c9 cc\
-9d 53 be 9f 99 60 5d 2c 9a 97 da 7b 09 15 a4 a7\
-ad
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 5.3
-Plaintext: \
-30 8b 0e cb d2 c7 6c b7 7f c6 f7 0c 5e dd 23 3f\
-d2 f2 09 29 d6 29 f0 26 95 3b b6 2a 8f 4a 3a 31\
-4b de 19 5d e8 5b 5f 81 6d a2 aa b0 74 d2 6c b6\
-ac dd f3 23 ae 3b 9c 67 8a c3 cf 12 fb dd e7
-Seed: # not used yet\
-22 85 f4 0d 77 04 82 f9 a9 ef a2 c7 2c b3 ac 55\
-71 6d c0 ca
-Ciphertext: \
-07 70 95 21 81 64 9f 9f 9f 07 ff 62 6f f3 a2 2c\
-35 c4 62 44 3d 90 5d 45 6a 9f d0 bf f4 3c ac 2c\
-a7 a9 f5 54 e9 47 8b 9a cc 3a c8 38 b0 20 40 ff\
-d3 e1 84 7d e2 e4 25 39 29 f9 dd 9e e4 04 43 25\
-a9 b0 5c ab b8 08 b2 ee 84 0d 34 e1 5d 10 5a 3f\
-1f 7b 27 69 5a 1a 07 a2 d7 3f e0 8e ca aa 3c 9c\
-9d 4d 5a 89 ff 89 0d 54 72 7d 7a e4 0c 0e c1 a8\
-dd 86 16 5d 8e e2 c6 36 81 41 01 6a 48 b5 5b 69\
-67
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 5.4
-Plaintext: \
-15 c5 b9 ee 11 85
-Seed: # not used yet\
-49 fa 45 d3 a7 8d d1 0d fd 57 73 99 d1 eb 00 af\
-7e ed 55 13
-Ciphertext: \
-08 12 b7 67 68 eb cb 64 2d 04 02 58 e5 f4 44 1a\
-01 85 21 bd 96 68 7e 6c 5e 89 9f cd 6c 17 58 8f\
-f5 9a 82 cc 8a e0 3a 4b 45 b3 12 99 af 17 88 c3\
-29 f7 dc d2 85 f8 cf 4c ed 82 60 6b 97 61 26 71\
-a4 5b ed ca 13 34 42 14 4d 16 17 d1 14 f8 02 85\
-7f 0f 9d 73 97 51 c5 7a 3f 9e e4 00 91 2c 61 e2\
-e6 99 2b e0 31 a4 3d d4 8f a6 ba 14 ee f7 c4 22\
-b5 ed c4 e7 af a0 4f dd 38 f4 02 d1 c8 bb 71 9a\
-bf
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 5.5
-Plaintext: \
-21 02 6e 68 00 c7 fa 72 8f ca ab a0 d1 96 ae 28\
-d7 a2 ac 4f fd 8a bc e7 94 f0 98 5f 60 c8 a6 73\
-72 77 36 5d 3f ea 11 db 89 23 a2 02 9a
-Seed: # not used yet\
-f0 28 74 13 23 4c c5 03 47 24 a0 94 c4 58 6b 87\
-af f1 33 fc
-Ciphertext: \
-07 b6 0e 14 ec 95 4b fd 29 e6 0d 00 47 e7 89 f5\
-1d 57 18 6c 63 58 99 03 30 67 93 ce d3 f6 82 41\
-c7 43 52 9a ba 6a 63 74 f9 2e 19 e0 16 3e fa 33\
-69 7e 19 6f 76 61 df aa a4 7a ac 6b de 5e 51 de\
-b5 07 c7 2c 58 9a 2c a1 69 3d 96 b1 46 03 81 24\
-9b 2c db 9e ac 44 76 9f 24 89 c5 d3 d2 f9 9f 0e\
-e3 c7 ee 5b f6 4a 5a c7 9c 42 bd 43 3f 14 9b e8\
-cb 59 54 83 61 64 05 95 51 3c 97 af 7b c2 50 97\
-23
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 5.6
-Plaintext: \
-54 1e 37 b6 8b 6c 88 72 b8 4c 02
-Seed: # not used yet\
-d9 fb a4 5c 96 f2 1e 6e 26 d2 9e b2 cd cb 65 85\
-be 9c b3 41
-Ciphertext: \
-08 c3 6d 4d da 33 42 3b 2e d6 83 0d 85 f6 41 1b\
-a1 dc f4 70 a1 fa e0 eb ef ee 7c 08 9f 25 6c ef\
-74 cb 96 ea 69 c3 8f 60 f3 9a be e4 41 29 bc b4\
-c9 2d e7 f7 97 62 3b 20 07 4e 3d 9c 28 99 70 1e\
-d9 07 1e 1e fa 0b dd 84 d4 c3 e5 13 03 02 d8 f0\
-24 0b ab a4 b8 4a 71 cc 03 2f 22 35 a5 ff 0f ae\
-27 7c 3e 8f 91 12 be f4 4c 9a e2 0d 17 5f c9 a4\
-05 8b fc 93 0b a3 1b 02 e2 e4 f4 44 48 37 10 f2\
-4a
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 6: A 1029-bit RSA Key Pair
-Modulus: \
-12 b1 7f 6d ad 2e cd 19 ff 46 dc 13 f7 86 0f 09\
-e0 e0 cf b6 77 b3 8a 52 59 23 05 ce af 02 2c 16\
-6d b9 0d 04 ac 29 e3 3f 7d d1 2d 9f af 66 e0 81\
-6b b6 3e ad 26 7c c7 d4 6c 17 c3 7b e2 14 bc a2\
-a2 2d 72 3a 64 e4 44 07 43 6b 6f c9 65 72 9a ef\
-c2 55 4f 37 6c d5 dc ea 68 29 37 80 a6 2b f3 9d\
-00 29 48 5a 16 0b bb 9e 5d c0 97 2d 21 a5 04 f5\
-2e 5e e0 28 aa 41 63 32 f5 10 b2 e9 cf f5 f7 22\
-af
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-02 95 ec a3 56 06 18 36 95 59 ce cd 30 3a a9 cf\
-da fc 1d 9f 06 95 9d f7 5f fe f9 29 aa 89 69 61\
-bc d1 90 dc 69 97 ed a7 f5 96 3e 72 4d 07 b4 dc\
-11 f3 06 5e 5a e9 7d 96 83 51 12 28 0b 90 84 bb\
-14 f2 a2 1e bd 4e 88 9d 41 b9 c4 13 2e c1 95 6f\
-ca b8 bb 2f ed 05 75 88 49 36 52 2c 5f f7 d3 32\
-61 90 48 24 e7 ca de e4 e0 bb 37 2d 24 57 cf 78\
-e2 bd 12 86 22 8f f8 3f 10 73 1c e6 3c 90 cf f3\
-f9
-Prime1: \
-04 a6 ce 8b 73 58 df a6 9b dc f7 42 61 70 05 af\
-b5 38 5f 5f 3a 58 a2 4e f7 4a 22 a8 c0 5c b7 cc\
-38 eb d4 cc 9d 9a 9d 78 9a 62 cd 0f 60 f0 cb 94\
-1d 34 23 c9 69 2e fa 4f e3 ad ff 29 0c 47 49 a3\
-8b
-Prime2: \
-04 04 c9 a8 03 37 1f ed b4 c5 be 39 f3 c0 0b 00\
-9e 5e 08 a6 3b e1 e4 00 35 cd ac a5 01 1c c7 01\
-cf 7e eb cb 99 f0 ff e1 7c fd 0a 4b f7 be fd 2d\
-d5 36 ac 94 6d b7 97 fd bc 4a be 8f 29 34 9b 91\
-ed
-ModPrime1PrivateExponent: \
-03 96 1c 8f 76 0a a2 bd 51 54 c7 aa fd 77 22 5b\
-3b ac d0 13 9a e7 b5 94 8e a3 31 1f cc d8 6f b9\
-5c 75 af a7 67 28 4b 9b 2d e5 59 57 2f 15 d8 d0\
-44 c7 eb 83 a1 be 5f ad f2 cc 37 7c 0d 84 75 29\
-4b
-ModPrime2PrivateExponent: \
-02 21 97 e0 66 74 21 96 aa bc 03 fa 2f ee b4 e7\
-0b 15 cb 78 7d 61 7a cd 31 bb 75 c7 bc 23 4a d7\
-06 f7 c4 8d 21 82 d1 f0 ff 9c 22 8d cf 41 96 7b\
-6c 0b a6 d2 c0 ad 11 0a 1b 85 78 31 ec 24 5e 2c\
-b1
-MultiplicativeInverseOfPrime2ModPrime1: \
-04 01 c4 c0 c5 3d 45 db db 5e 9d 96 d0 fe cf 42\
-75 df 09 74 bc 4a 07 36 b4 a7 4c 32 69 05 3e fb\
-68 6a ce 24 06 e2 2c 9e 05 8d db 4a e5 40 62 7a\
-e2 fd b0 82 61 e8 e7 e4 bc bc 99 4d aa fa 30 5c\
-45
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 6.1
-Plaintext: \
-40 46 ca 8b aa 33 47 ca 27 f4 9e 0d 81 f9 cc 1d\
-71 be 9b a5 17 d4
-Seed: # not used yet\
-dd 0f 6c fe 41 5e 88 e5 a4 69 a5 1f bb a6 df d4\
-0a db 43 84
-Ciphertext: \
-06 30 ee bc d2 85 6c 24 f7 98 80 6e 41 f9 e6 73\
-45 ed a9 ce da 38 6a cc 9f ac ae a1 ee ed 06 ac\
-e5 83 70 97 18 d9 d1 69 fa df 41 4d 5c 76 f9 29\
-96 83 3e f3 05 b7 5b 1e 4b 95 f6 62 a2 0f ae dc\
-3b ae 0c 48 27 a8 bf 8a 88 ed bd 57 ec 20 3a 27\
-a8 41 f0 2e 43 a6 15 ba b1 a8 ca c0 70 1d e3 4d\
-eb de f6 2a 08 80 89 b5 5e c3 6e a7 52 2f d3 ec\
-8d 06 b6 a0 73 e6 df 83 31 53 bc 0a ef d9 3b d1\
-a3
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 6.2
-Plaintext: \
-5c c7 2c 60 23 1d f0 3b 3d 40 f9 b5 79 31 bc 31\
-10 9f 97 25 27 f2 8b 19 e7 48 0c 72 88 cb 3c 92\
-b2 25 12 21 4e 4b e6 c9 14 79 2d da bd f5 7f aa\
-8a a7
-Seed: # not used yet\
-8d 14 bd 94 6a 13 51 14 8f 5c ae 2e d9 a0 c6 53\
-e8 5e bd 85
-Ciphertext: \
-0e bc 37 37 61 73 a4 fd 2f 89 cc 55 c2 ca 62 b2\
-6b 11 d5 1c 3c 7c e4 9e 88 45 f7 4e 76 07 31 7c\
-43 6b c8 d2 3b 96 67 df eb 9d 08 72 34 b4 7b c6\
-83 71 75 ae 5c 05 59 f6 b8 1d 7d 22 41 6d 3e 50\
-f4 ac 53 3d 8f 08 12 f2 db 9e 79 1f e9 c7 75 ac\
-8b 6a d0 f5 35 ad 9c eb 23 a4 a0 20 14 c5 8a b3\
-f8 d3 16 14 99 a2 60 f3 93 48 e7 14 ae 2a 1d 34\
-43 20 8f d8 b7 22 cc fd fb 39 3e 98 01 1f 99 e6\
-3f
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 6.3
-Plaintext: \
-b2 0e 65 13 03 09 2f 4b cc b4 30 70 c0 f8 6d 23\
-04 93 62 ed 96 64 2f c5 63 2c 27 db 4a 52 e3 d8\
-31 f2 ab 06 8b 23 b1 49 87 9c 00 2f 6b f3 fe ee\
-97 59 11 12 56 2c
-Seed: # not used yet\
-6c 07 5b c4 55 20 f1 65 c0 bf 5e a4 c5 df 19 1b\
-c9 ef 0e 44
-Ciphertext: \
-0a 98 bf 10 93 61 93 94 43 6c f6 8d 8f 38 e2 f1\
-58 fd e8 ea 54 f3 43 5f 23 9b 8d 06 b8 32 18 44\
-20 24 76 ae ed 96 00 94 92 48 0c e3 a8 d7 05 49\
-8c 4c 8c 68 f0 15 01 dc 81 db 60 8f 60 08 73 50\
-c8 c3 b0 bd 2e 9e f6 a8 14 58 b7 c8 01 b8 9f 2e\
-4f e9 9d 49 00 ba 6a 4b 5e 5a 96 d8 65 dc 67 6c\
-77 55 92 87 94 13 0d 62 80 a8 16 0a 19 0f 2d f3\
-ea 7c f9 aa 02 71 d8 8e 9e 69 05 ec f1 c5 15 2d\
-65
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 6.4
-Plaintext: \
-68 4e 30 38 c5 c0 41 f7
-Seed: # not used yet\
-3b bc 3b d6 63 7d fe 12 84 69 01 02 9b f5 b0 c0\
-71 03 43 9c
-Ciphertext: \
-00 8e 7a 67 ca cf b5 c4 e2 4b ec 7d ee 14 91 17\
-f1 95 98 ce 8c 45 80 8f ef 88 c6 08 ff 9c d6 e6\
-95 26 3b 9a 3c 0a d4 b8 ba 4c 95 23 8e 96 a8 42\
-2b 85 35 62 9c 8d 53 82 37 44 79 ad 13 fa 39 97\
-4b 24 2f 9a 75 9e ea f9 c8 3a d5 a8 ca 18 94 0a\
-01 62 ba 75 58 76 df 26 3f 4b d5 0c 65 25 c5 60\
-90 26 7c 1f 0e 09 ce 08 99 a0 cf 35 9e 88 12 0a\
-bd 9b f8 93 44 5b 3c ae 77 d3 60 73 59 ae 9a 52\
-f8
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 6.5
-Plaintext: \
-32 48 8c b2 62 d0 41 d6 e4 dd 35 f9 87 bf 3c a6\
-96 db 1f 06 ac 29 a4 46 93
-Seed: # not used yet\
-b4 6b 41 89 3e 8b ef 32 6f 67 59 38 3a 83 07 1d\
-ae 7f ca bc
-Ciphertext: \
-00 00 34 74 41 6c 7b 68 bd f9 61 c3 85 73 79 44\
-d7 f1 f4 0c b3 95 34 3c 69 3c c0 b4 fe 63 b3 1f\
-ed f1 ea ee ac 9c cc 06 78 b3 1d c3 2e 09 77 48\
-95 14 c4 f0 90 85 f6 29 8a 96 53 f0 1a ea 40 45\
-ff 58 2e e8 87 be 26 ae 57 5b 73 ee f7 f3 77 49\
-21 e3 75 a3 d1 9a dd a0 ca 31 aa 18 49 88 7c 1f\
-42 ca c9 67 7f 7a 2f 4e 92 3f 6e 5a 86 8b 38 c0\
-84 ef 18 75 94 dc 9f 7f 04 8f ea 2e 02 95 53 84\
-ab
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 6.6
-Plaintext: \
-50 ba 14 be 84 62 72 02 79 c3 06 ba
-Seed: # not used yet\
-0a 24 03 31 2a 41 e3 d5 2f 06 0f bc 13 a6 7d e5\
-cf 76 09 a7
-Ciphertext: \
-0a 02 6d da 5f c8 78 5f 7b d9 bf 75 32 7b 63 e8\
-5e 2c 0f de e5 da db 65 eb dc ac 9a e1 de 95 c9\
-2c 67 2a b4 33 aa 7a 8e 69 ce 6a 6d 88 97 fa c4\
-ac 4a 54 de 84 1a e5 e5 bb ce 76 87 87 9d 79 63\
-4c ea 7a 30 68 40 65 c7 14 d5 24 09 b9 28 25 6b\
-bf 53 ea bc d5 23 1e b7 25 95 04 53 73 99 bd 29\
-16 4b 72 6d 33 a4 6d a7 01 36 0a 41 68 a0 91 cc\
-ab 72 d4 4a 62 fe d2 46 c0 ff ea 5b 13 48 ab 54\
-70
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 7: A 1030-bit RSA Key Pair
-Modulus: \
-31 11 79 f0 bc fc 9b 9d 3c a3 15 d0 0e f3 0d 7b\
-dd 3a 2c fa e9 91 1b fe dc b9 48 b3 a4 78 2d 07\
-32 b6 ab 44 aa 4b f0 37 41 a6 44 dc 01 be c3 e6\
-9b 01 a0 33 e6 75 d8 ac d7 c4 92 5c 6b 1a ec 31\
-19 05 1d fd 89 76 2d 21 5d 45 47 5f fc b5 9f 90\
-81 48 62 3f 37 17 71 56 f6 ae 86 dd 7a 7c 5f 43\
-dc 1e 1f 90 82 54 05 8a 28 4a 5f 06 c0 02 17 93\
-a8 7f 1a c5 fe ff 7d ca ee 69 c5 e5 1a 37 89 e3\
-73
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-07 0c fc ff 2f eb 82 76 e2 74 32 c4 5d fe e4 8f\
-49 b7 91 7d 65 30 e1 f0 ca 34 60 f3 2e 02 76 17\
-44 87 c5 6e 22 a4 5d 25 00 d7 77 54 95 21 9d 7d\
-16 5a 9c f3 bd 92 c3 2a f9 a9 8d 8d c9 cc 29 68\
-00 ad c9 4a 0a 54 fb 40 f3 42 91 bf 84 ee 8e a1\
-2b 6f 10 93 59 c6 d3 54 2a 50 f9 c7 67 f5 cf ff\
-05 a6 81 c2 e6 56 fb 77 ca aa db 4b e9 46 8d 8a\
-bc d4 df 98 f5 8e 86 d2 05 3f a1 34 9f 74 8e 21\
-b1
-Prime1: \
-07 49 26 2c 11 1c d4 70 ec 25 66 e6 b3 73 2f c0\
-93 29 46 9a a1 90 71 d3 b9 c0 19 06 51 4c 6f 1d\
-26 ba a1 4b ea b0 97 1c 8b 7e 61 1a 4f 79 00 9d\
-6f ea 77 69 28 ca 25 28 5b 0d e3 64 3d 1a 3f 8c\
-71
-Prime2: \
-06 bc 1e 50 e9 6c 02 bf 63 6e 9e ea 8b 89 9b be\
-bf 76 51 de 77 dd 47 4c 3e 9b c2 3b ad 81 82 b6\
-19 04 c7 d9 7d fb eb fb 1e 00 10 88 78 b6 e6 7e\
-41 53 91 d6 79 42 c2 b2 bf 9b 44 35 f8 8b 0c b0\
-23
-ModPrime1PrivateExponent: \
-03 bc 7e a7 f0 aa b1 43 ab c6 ce 8b 97 11 86 36\
-a3 01 72 e4 cf e0 2c 8f a0 dd a3 b7 ba af 90 f8\
-09 29 82 98 55 25 f4 88 bd fc b4 bd 72 6e 22 63\
-9a c6 4a 30 92 ab 7f fc bf 1d 53 34 cf a5 0b 5b\
-f1
-ModPrime2PrivateExponent: \
-02 62 a6 aa 29 c2 a3 c6 7d c5 34 6c 06 38 1a fd\
-98 7a a3 cc 93 cf bf ec f5 4f dd 9f 9d 78 7d 7f\
-59 a5 23 d3 98 97 9d a1 37 a2 f6 38 1f e9 48 01\
-f7 c9 4d a2 15 18 dc 34 cb 40 87 0c 46 97 99 4a\
-d9
-MultiplicativeInverseOfPrime2ModPrime1: \
-64 9d 4c 17 b6 ee 17 21 e7 72 d0 38 9a 55 9c 3d\
-3c df 95 50 d4 57 c4 6b 03 7b 74 64 1b 1d 52 16\
-6a f8 a2 13 c8 39 62 06 cd fb a4 42 2f 18 d6 f6\
-1d bc b5 d2 14 c9 71 bf 48 2a eb 97 6a 73 70 c2
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 7.1
-Plaintext: \
-47 aa e9 09
-Seed: # not used yet\
-43 dd 09 a0 7f f4 ca c7 1c aa 46 32 ee 5e 1c 1d\
-ae e4 cd 8f
-Ciphertext: \
-16 88 e4 ce 77 94 bb a6 cb 70 14 16 9e cd 55 9c\
-ed e2 a3 0b 56 a5 2b 68 d9 fe 18 cf 19 73 ef 97\
-b2 a0 31 53 95 1c 75 5f 62 94 aa 49 ad bd b5 58\
-45 ab 68 75 fb 39 86 c9 3e cf 92 79 62 84 0d 28\
-2f 9e 54 ce 8b 69 0f 7c 0c b8 bb d7 34 40 d9 57\
-1d 1b 16 cd 92 60 f9 ea b4 78 3c c4 82 e5 22 3d\
-c6 09 73 87 17 83 ec 27 b0 ae 0f d4 77 32 cb c2\
-86 a1 73 fc 92 b0 0f b4 ba 68 24 64 7c d9 3c 85\
-c1
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 7.2
-Plaintext: \
-1d 9b 2e 22 23 d9 bc 13 bf b9 f1 62 ce 73 5d b4\
-8b a7 c6 8f 68 22 a0 a1 a7 b6 ae 16 58 34 e7
-Seed: # not used yet\
-3a 9c 3c ec 7b 84 f9 bd 3a de cb c6 73 ec 99 d5\
-4b 22 bc 9b
-Ciphertext: \
-10 52 ed 39 7b 2e 01 e1 d0 ee 1c 50 bf 24 36 3f\
-95 e5 04 f4 a0 34 34 a0 8f d8 22 57 4e d6 b9 73\
-6e db b5 f3 90 db 10 32 14 79 a8 a1 39 35 0e 2b\
-d4 97 7c 37 78 ef 33 1f 3e 78 ae 11 8b 26 84 51\
-f2 0a 2f 01 d4 71 f5 d5 3c 56 69 37 17 1b 2d bc\
-2d 4b de 45 9a 57 99 f0 37 2d 65 74 23 9b 23 23\
-d2 45 d0 bb 81 c2 86 b6 3c 89 a3 61 01 73 37 e4\
-90 2f 88 a4 67 f4 c7 f2 44 bf d5 ab 46 43 7f f3\
-b6
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 7.3
-Plaintext: \
-d9 76 fc
-Seed: # not used yet\
-76 a7 5e 5b 61 57 a5 56 cf 88 84 bb 2e 45 c2 93\
-dd 54 5c f5
-Ciphertext: \
-21 55 cd 84 3f f2 4a 4e e8 ba db 76 94 26 00 28\
-a4 90 81 3b a8 b3 69 a4 cb f1 06 ec 14 8e 52 98\
-70 7f 59 65 be 7d 10 1c 10 49 ea 85 84 c2 4c d6\
-34 55 ad 9c 10 4d 68 62 82 d3 fb 80 3a 4c 11 c1\
-c2 e9 b9 1c 71 78 80 1d 1b 66 40 f0 03 f5 72 8d\
-f0 07 b8 a4 cc c9 2b ce 05 e4 1a 27 27 8d 7c 85\
-01 8c 52 41 43 13 a5 07 77 89 00 1d 4f 01 91 0b\
-72 aa d0 5d 22 0a a1 4a 58 73 3a 74 89 bc 54 55\
-6b
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 7.4
-Plaintext: \
-d4 73 86 23 df 22 3a a4 38 43 df 84 67 53 4c 41\
-d0 13 e0 c8 03 c6 24 e2 63 66 6b 23 9b de 40 a5\
-f2 9a eb 8d e7 9e 3d aa 61 dd 03 70 f4 9b d4 b0\
-13 83 4b 98 21 2a ef 6b 1c 5e e3 73 b3 cb
-Seed: # not used yet\
-78 66 31 4a 6a d6 f2 b2 50 a3 59 41 db 28 f5 86\
-4b 58 58 59
-Ciphertext: \
-0a b1 4c 37 3a eb 7d 43 28 d0 aa ad 8c 09 4d 88\
-b9 eb 09 8b 95 f2 10 54 a2 90 82 52 2b e7 c2 7a\
-31 28 78 b6 37 91 7e 3d 81 9e 6c 3c 56 8d b5 d8\
-43 80 2b 06 d5 1d 9e 98 a2 be 0b f4 0c 03 14 23\
-b0 0e df bf f8 32 0e fb 91 71 bd 20 44 65 3a 4c\
-b9 c5 12 2f 6c 65 e8 3c da 2e c3 c1 26 02 7a 9c\
-1a 56 ba 87 4d 0f ea 23 f3 80 b8 2c f2 40 b8 cf\
-54 00 04 75 8c 4c 77 d9 34 15 7a 74 f3 fc 12 bf\
-ac
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 7.5
-Plaintext: \
-bb 47 23 1c a5 ea 1d 3a d4 6c 99 34 5d 9a 8a 61
-Seed: # not used yet\
-b2 16 6e d4 72 d5 8d b1 0c ab 2c 6b 00 0c cc f1\
-0a 7d c5 09
-Ciphertext: \
-02 83 87 a3 18 27 74 34 79 8b 4d 97 f4 60 06 8d\
-f5 29 8f ab a5 04 1b a1 17 61 a1 cb 73 16 b2 41\
-84 11 4e c5 00 25 7e 25 89 ed 3b 60 7a 1e bb e9\
-7a 6c c2 e0 2b f1 b6 81 f4 23 12 a3 3b 7a 77 d8\
-e7 85 5c 4a 6d e0 3e 3c 04 64 3f 78 6b 91 a2 64\
-a0 d6 80 5e 2c ea 91 e6 81 77 eb 7a 64 d9 25 5e\
-4f 27 e7 13 b7 cc ec 00 dc 20 0e bd 21 c2 ea 2b\
-b8 90 fe ae 49 42 df 94 1d c3 f9 78 90 ed 34 74\
-78
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 7.6
-Plaintext: \
-21 84 82 70 95 d3 5c 3f 86 f6 00 e8 e5 97 54 01\
-32 96
-Seed: # not used yet\
-52 67 3b de 2c a1 66 c2 aa 46 13 1a c1 dc 80 8d\
-67 d7 d3 b1
-Ciphertext: \
-14 c6 78 a9 4a d6 05 25 ef 39 e9 59 b2 f3 ba 5c\
-09 7a 94 ff 91 2b 67 db ac e8 05 35 c1 87 ab d4\
-7d 07 54 20 b1 87 21 52 bb a0 8f 7f c3 1f 31 3b\
-bf 92 73 c9 12 fc 4c 01 49 a9 b0 cf b7 98 07 e3\
-46 eb 33 20 69 61 1b ec 0f f9 bc d1 68 f1 f7 c3\
-3e 77 31 3c ea 45 4b 94 e2 54 9e ec f0 02 e2 ac\
-f7 f6 f2 d2 84 5d 4f e0 aa b2 e5 a9 2d df 68 c4\
-80 ae 11 24 79 35 d1 f6 25 74 84 22 16 ae 67 41\
-15
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 8: A 1031-bit RSA Key Pair
-Modulus: \
-5b df 0e 30 d3 21 dd a5 14 7f 88 24 08 fa 69 19\
-54 80 df 8f 80 d3 f6 e8 bf 58 18 50 4f 36 42 7c\
-a9 b1 f5 54 0b 9c 65 a8 f6 97 4c f8 44 7a 24 4d\
-92 80 20 1b b4 9f cb be 63 78 d1 94 4c d2 27 e2\
-30 f9 6e 3d 10 f8 19 dc ef 27 6c 64 a0 0b 2a 4b\
-67 01 e7 d0 1d e5 fa bd e3 b1 e9 a0 df 82 f4 63\
-13 59 cd 22 66 96 47 fb b1 71 72 46 13 4e d7 b4\
-97 cf ff bd c4 2b 59 c7 3a 96 ed 90 16 62 12 df\
-f7
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-0f 7d 1e 9e 5a aa 25 fd 13 e4 a0 66 3a e1 44 e0\
-d1 5f 5c d1 8b cd b0 9d f2 cc 7e 64 e3 c5 e9 15\
-ad 62 64 53 04 16 1d 09 8c 71 5b b7 ab 8b d0 1d\
-07 ea f3 fe d7 c7 ed 08 af 2a 8a 62 ef 44 ab 16\
-b3 20 e1 4a f7 2a 48 f9 6a fe 26 2a 0a e4 cf 65\
-e6 35 e9 10 79 0c d4 ee 5c ea 76 8a 4b 26 39 f7\
-e6 f6 77 b3 f0 bb 6b e3 2b 75 74 7d 89 09 03 6f\
-02 64 f5 8d 40 1c db a1 31 71 61 57 a7 5e cf 63\
-31
-Prime1: \
-0a 02 ef 84 48 d9 fa d8 bb d0 d0 04 c8 c2 aa 97\
-51 ef 97 21 c1 b0 d0 32 36 a5 4b 0d f9 47 cb ae\
-d5 a2 55 ee 9e 8e 20 d4 91 ea 17 23 fe 09 47 04\
-a9 76 2e 88 af d1 6e bb 59 94 41 2c a9 66 dc 4f\
-9f
-Prime2: \
-09 2d 36 2e 7e d3 a0 bf d9 e9 fd 0e 6c 03 01 b6\
-df 29 15 9c f5 0c c8 3b 9b 0c f4 d6 ee a7 1a 61\
-e0 02 b4 6e 0a e9 f2 de 62 d2 5b 5d 74 52 d4 98\
-b8 1c 9a c6 fc 58 59 3d 4c 3f b4 f5 d7 2d fb b0\
-a9
-ModPrime1PrivateExponent: \
-07 c7 14 10 af 10 39 62 db 36 74 04 e3 7a e8 50\
-ba a4 e9 c2 9d d9 21 45 81 52 94 a6 7c 7d 1c 6d\
-ed 26 3a a0 30 a9 b6 33 ae 50 30 3e 14 03 5d 1a\
-f0 14 12 3e ba 68 78 20 30 8d 8e bc 85 b6 95 7d\
-7d
-ModPrime2PrivateExponent: \
-ae 2c 75 38 0c 02 c0 16 ad 05 89 1b 33 01 de 88\
-1f 28 ae 11 71 18 2b 6b 2c 83 be a7 c5 15 ec a9\
-ca 29 8c 7b 1c ab 58 17 a5 97 06 8f c8 50 60 de\
-4d a8 a0 16 37 8a ae 43 c7 f9 67 bc c3 79 04 b9
-MultiplicativeInverseOfPrime2ModPrime1: \
-05 98 d1 05 9e 3a da 4f 63 20 75 2c 09 d8 05 ff\
-7d 1f 1a e0 d0 17 ae ee e9 ce fa 0d 7d d7 ff 77\
-5e 44 b5 78 32 2f 64 05 d6 21 1d a1 95 19 66 6a\
-a8 7f dc 4c d8 c8 8f 6b 6e 3d 67 e9 61 dc bb a3\
-d0
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 8.1
-Plaintext: \
-05 0b 75 5e 5e 68 80 f7 b9 e9 d6 92 a7 4c 37 aa\
-e4 49 b3 1b fe a6 de ff 83 74 7a 89 7f 6c 2c 82\
-5b b1 ad bf 85 0a 3c 96 99 4b 5d e5 b3 3c bc 7d\
-4a 17 91 3a 79 67
-Seed: # not used yet\
-77 06 ff ca 1e cf b1 eb ee 2a 55 e5 c6 e2 4c d2\
-79 7a 41 25
-Ciphertext: \
-09 b3 68 3d 8a 2e b0 fb 29 5b 62 ed 1f b9 29 0b\
-71 44 57 b7 82 53 19 f4 64 78 72 af 88 9b 30 40\
-94 72 02 0a d1 29 12 bf 19 b1 1d 48 19 f4 96 14\
-82 4f fd 84 d0 9c 0a 17 e7 d1 73 09 d1 29 19 79\
-04 10 aa 29 95 69 9f 6a 86 db e3 24 2b 5a cc 23\
-af 45 69 10 80 d6 b1 ae 81 0f b3 e3 05 70 87 f0\
-97 00 92 ce 00 be 95 62 ff 40 53 b6 26 2c e0 ca\
-a9 3e 13 72 3d 2e 3a 5b a0 75 d4 5f 0d 61 b5 4b\
-61
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 8.2
-Plaintext: \
-4e b6 8d cd 93 ca 9b 19 df 11 1b d4 36 08 f5 57\
-02 6f e4 aa 1d 5c fa c2 27 a3 eb 5a b9 54 8c 18\
-a0 6d de d2 3f 81 82 59 86 b2 fc d7 11 09 ec ef\
-7e ff 88 87 3f 07 5c 2a a0 c4 69 f6 9c 92 bc
-Seed: # not used yet\
-a3 71 7d a1 43 b4 dc ff bc 74 26 65 a8 fa 95 05\
-85 54 83 43
-Ciphertext: \
-2e cf 15 c9 7c 5a 15 b1 47 6a e9 86 b3 71 b5 7a\
-24 28 4f 4a 16 2a 8d 0c 81 82 e7 90 5e 79 22 56\
-f1 81 2b a5 f8 3f 1f 7a 13 0e 42 dc c0 22 32 84\
-4e dc 14 a3 1a 68 ee 97 ae 56 4a 38 3a 34 11 65\
-64 24 c5 f6 2d db 64 60 93 c3 67 be 1f cd a4 26\
-cf 00 a0 6d 8a cb 7e 57 77 6f bb d8 55 ac 3d f5\
-06 fc 16 b1 d7 c3 f2 11 0f 3d 80 68 e9 1e 18 63\
-63 83 1c 84 09 68 0d 8d a9 ec d8 cf 1f a2 0e e3\
-9d
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 8.3
-Plaintext: \
-86 04 ac 56 32 8c 1a b5 ad 91 78 61
-Seed: # not used yet\
-ee 06 20 90 73 cc a0 26 bb 26 4e 51 85 bf 8c 68\
-b7 73 9f 86
-Ciphertext: \
-4b c8 91 30 a5 b2 da bb 7c 2f cf 90 eb 5d 0e af\
-9e 68 1b 71 46 a3 8f 31 73 a3 d9 cf ec 52 ea 9e\
-0a 41 93 2e 64 8a 9d 69 34 4c 50 da 76 3f 51 a0\
-3c 95 76 21 31 e8 05 22 54 dc d2 24 8c ba 40 fd\
-31 66 77 86 ce 05 a2 b7 b5 31 ac 9d ac 9e d5 84\
-a5 9b 67 7c 1a 8a ed 8c 5d 15 d6 8c 05 56 9e 2b\
-e7 80 bf 7d b6 38 fd 2b fd 2a 85 ab 27 68 60 f3\
-77 73 38 fc a9 89 ff d7 43 d1 3e e0 8e 0c a9 89\
-3f
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 8.4
-Plaintext: \
-fd da 5f bf 6e c3 61 a9 d9 a4 ac 68 af 21 6a 06\
-86 f4 38 b1 e0 e5 c3 6b 95 5f 74 e1 07 f3 9c 0d\
-dd cc
-Seed: # not used yet\
-99 0a d5 73 dc 48 a9 73 23 5b 6d 82 54 36 18 f2\
-e9 55 10 5d
-Ciphertext: \
-2e 45 68 47 d8 fc 36 ff 01 47 d6 99 35 94 b9 39\
-72 27 d5 77 75 2c 79 d0 f9 04 fc b0 39 d4 d8 12\
-fe a6 05 a7 b5 74 dd 82 ca 78 6f 93 75 23 48 43\
-8e e9 f5 b5 45 49 85 d5 f0 e1 69 9e 3e 7a d1 75\
-a3 2e 15 f0 3d eb 04 2a b9 fe 1d d9 db 1b b8 6f\
-8c 08 9c cb 45 e7 ef 0c 5e e7 ca 9b 72 90 ca 6b\
-15 be d4 70 39 78 8a 8a 93 ff 83 e0 e8 d6 24 4c\
-71 00 63 62 de ef 69 b6 f4 16 fb 3c 68 43 83 fb\
-d0
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 8.5
-Plaintext: \
-4a 5f 49 14 be e2 5d e3 c6 93 41 de 07
-Seed: # not used yet\
-ec c6 3b 28 f0 75 6f 22 f5 2a c8 e6 ec 12 51 a6\
-ec 30 47 18
-Ciphertext: \
-1f b9 35 6f d5 c4 b1 79 6d b2 eb f7 d0 d3 93 cc\
-81 0a df 61 45 de fc 2f ce 71 4f 79 d9 38 00 d5\
-e2 ac 21 1e a8 bb ec ca 4b 65 4b 94 c3 b1 8b 30\
-dd 57 6c e3 4d c9 54 36 ef 57 a0 94 15 64 59 23\
-35 9a 5d 7b 41 71 ef 22 c2 46 70 f1 b2 29 d3 60\
-3e 91 f7 66 71 b7 df 97 e7 31 7c 97 73 44 76 d5\
-f3 d1 7d 21 cf 82 b5 ba 9f 83 df 2e 58 8d 36 98\
-4f d1 b5 84 46 8b d2 3b 2e 87 5f 32 f6 89 53 f7\
-b2
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 8.6
-Plaintext: \
-8e 07 d6 6f 7b 88 0a 72 56 3a bc d3 f3 50 92 bc\
-33 40 9f b7 f8 8f 24 72 be
-Seed: # not used yet\
-39 25 c7 1b 36 2d 40 a0 a6 de 42 14 55 79 ba 1e\
-7d d4 59 fc
-Ciphertext: \
-3a fd 9c 66 00 14 7b 21 79 8d 81 8c 65 5a 0f 4c\
-92 12 db 26 d0 b0 df dc 2a 75 94 cc b3 d2 2f 5b\
-f1 d7 c3 e1 12 cd 73 fc 7d 50 9c 7a 8b af dd 3c\
-27 4d 13 99 00 9f 96 09 ec 4b e6 47 7e 45 3f 07\
-5a a3 3d b3 82 87 0c 1c 34 09 ae f3 92 d7 38 6a\
-e3 a6 96 b9 9a 94 b4 da 05 89 44 7e 95 5d 16 c9\
-8b 17 60 2a 59 bd 73 62 79 fc d8 fb 28 0c 44 62\
-d5 90 bf a9 bf 13 fe d5 70 ea fd e9 73 30 a2 c2\
-10
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 9: A 1536-bit RSA Key Pair
-Modulus: \
-cf 2c d4 1e 34 ca 3a 72 8e a5 cb 8a ff 64 c3 6d\
-27 bd ef 53 64 e3 36 fd 68 d3 12 3c 5a 19 6a 8c\
-28 70 13 e8 53 d5 15 6d 58 d1 51 95 45 20 fb 4f\
-6d 7b 17 ab b6 81 77 65 90 9c 57 61 19 65 9d 90\
-2b 19 06 ed 8a 2b 10 c1 55 c2 4d 12 45 28 da b9\
-ee ae 37 9b ea c6 6e 4a 41 17 86 dc b8 fd 00 62\
-eb c0 30 de 12 19 a0 4c 2a 8c 1b 7d d3 13 1e 4d\
-6b 6c ae e2 e3 1a 5e d4 1a c1 50 9b 2e f1 ee 2a\
-b1 83 64 be 56 8c a9 41 c2 5e cc 84 ff 9d 64 3b\
-5e c1 aa ae 10 2a 20 d7 3f 47 9b 78 0f d6 da 91\
-07 52 12 d9 ea c0 3a 06 74 d8 99 eb a2 e4 31 f4\
-c4 4b 61 5b 6b a2 23 2b d4 b3 3b ae d7 3d 62 5d
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-19 8c 14 1e 23 71 5a 92 bc cf 6a 11 9a 5b c1 13\
-89 46 8d 28 11 f5 48 d7 27 e1 7b 4a b0 eb 98 6d\
-6f 21 1e fb 53 b7 1f 7c cb ea 87 ee 69 c7 5e e6\
-15 00 8c 53 32 de b5 2b f3 90 ab df bf e3 7d 72\
-05 36 81 59 b2 63 8c 1d e3 26 e2 1d 22 25 1f 0f\
-b5 84 8b 3b f1 50 05 d2 a7 43 30 f0 af e9 16 ee\
-62 cc c1 34 4d 1d 83 a7 09 e6 06 76 27 38 40 f7\
-f3 77 42 4a 5e 0a 4d a7 5f 01 b3 1f f7 68 19 cf\
-9c bf dd 21 52 43 c3 91 7c 03 ef 38 19 93 12 e5\
-67 b3 bf 7a ed 3a b4 57 f3 71 ef 8a 14 23 f4 5b\
-68 c6 e2 82 ec 11 1b ba 28 33 b9 87 fd 69 fa d8\
-3b c1 b8 c6 13 c5 e1 ea 16 c1 1e d1 25 ea 7e c1
-Prime1: \
-fc 8d 6c 04 be c4 eb 9a 81 92 ca 79 00 cb e5 36\
-e2 e8 b5 19 de cf 33 b2 45 97 98 c6 90 9d f4 f1\
-76 db 7d 23 19 0f c7 2b 88 65 a7 18 af 89 5f 1b\
-cd 91 45 29 80 27 42 3b 60 5e 70 a4 7c f5 83 90\
-a8 c3 e8 8f c8 c4 8e 8b 32 e3 da 21 0d fb e3 e8\
-81 ea 56 74 b6 a3 48 c2 1e 93 f9 e5 5e a6 5e fd
-Prime2: \
-d2 00 d4 5e 78 8a ac ea 60 6a 40 1d 04 60 f8 7d\
-d5 c1 02 7e 12 dc 1a 0d 75 86 e8 93 9d 9c f7 89\
-b4 0f 51 ac 04 42 96 1d e7 d2 1c c2 1e 05 c8 31\
-55 c1 f2 aa 91 93 38 7c fd f9 56 cb 48 d1 53 ba\
-27 04 06 f9 bb ba 53 7d 49 87 d9 e2 f9 94 2d 7a\
-14 cb ff fe a7 4f ec dd a9 28 d2 3e 25 9f 5e e1
-ModPrime1PrivateExponent: \
-db 16 80 2f 79 a2 f0 d4 5f 35 8d 69 fd 33 e4 4b\
-81 fa e8 28 62 2e 93 a5 42 53 e9 97 d0 1b 07 43\
-75 9d a0 e8 12 b4 aa 4e 6c 8b ea b2 32 8d 54 31\
-95 5a 41 8a 67 ff 26 a8 c5 c8 07 a5 da 35 4e 05\
-ef 31 cc 8c f7 58 f4 63 73 29 50 b0 3e 26 57 26\
-fb 94 e3 9d 6a 57 2a 26 24 4a b0 8d b7 57 52 ad
-ModPrime2PrivateExponent: \
-a0 a3 17 cf e7 df 14 23 f8 7a 6d ee 84 51 f4 e2\
-b4 a6 7e 54 97 f2 9b 4f 1e 4e 83 0b 9f ad d9 40\
-11 67 02 6f 55 96 e5 a3 9c 97 81 7e 0f 5f 16 e2\
-7e 19 ec 99 02 e0 1d 7e a6 fb 9a a3 c7 60 af ee\
-1e 38 1b 69 de 6a c9 c0 75 85 a0 6a d9 c4 ba 00\
-bf 75 c8 ad 2f a8 98 a4 79 e8 0a e2 94 fe d2 a1
-MultiplicativeInverseOfPrime2ModPrime1: \
-0b 21 f3 35 c3 53 34 2e b4 4c 3a a2 44 45 78 0c\
-2d 65 5b 94 01 74 ca e3 8c 7c 8a 4e 64 93 c0 ba\
-9f d3 03 74 82 67 b0 83 b9 a7 a6 cb 61 e4 2d b3\
-62 b8 c9 89 6d b7 06 4e 02 ad 5a e6 15 87 da 15\
-b4 64 9c 90 59 49 09 fe b3 7d bc b6 54 be b7 26\
-8e c8 01 e5 a8 b4 aa 39 11 be bd 88 54 2f 05 be
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 9.1
-Plaintext: \
-f7 35 fd 55 ba 92 59 2c 3b 52 b8 f9 c4 f6 9a aa\
-1c be f8 fe 88 ad d0 95 59 54 12 46 7f 9c f4 ec\
-0b 89 6c 59 ed a1 62 10 e7 54 9c 8a bb 10 cd bc\
-21 a1 2e c9 b6 b5 b8 fd 2f 10 39 9e b6
-Seed: # not used yet\
-8e c9 65 f1 34 a3 ec 99 31 e9 2a 1c a0 dc 81 69\
-d5 ea 70 5c
-Ciphertext: \
-26 7b cd 11 8a ca b1 fc 8b a8 1c 85 d7 30 03 cb\
-86 10 fa 55 c1 d9 7d a8 d4 8a 7c 7f 06 89 6a 4d\
-b7 51 aa 28 42 55 b9 d3 6a d6 5f 37 65 3d 82 9f\
-1b 37 f9 7b 80 01 94 25 45 b2 fc 2c 55 a7 37 6c\
-a7 a1 be 4b 17 60 c8 e0 5a 33 e5 aa 25 26 b8 d9\
-8e 31 70 88 e7 83 4c 75 5b 2a 59 b1 26 31 a1 82\
-c0 5d 5d 43 ab 17 79 26 4f 84 56 f5 15 ce 57 df\
-df 51 2d 54 93 da b7 b7 33 8d c4 b7 d7 8d b9 c0\
-91 ac 3b af 53 7a 69 fc 7f 54 9d 97 9f 0e ff 9a\
-94 fd a4 16 9b d4 d1 d1 9a 69 c9 9e 33 c3 b5 54\
-90 d5 01 b3 9b 1e da e1 18 ff 67 93 a1 53 26 15\
-84 d3 a5 f3 9f 6e 68 2e 3d 17 c8 cd 12 61 fa 72
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 9.2
-Plaintext: \
-81 b9 06 60 50 15 a6 3a ab e4 2d df 11 e1 97 89\
-12 f5 40 4c 74 74 b2 6d ce 3e d4 82 bf 96 1e cc\
-81 8b f4 20 c5 46 59
-Seed: # not used yet\
-ec b1 b8 b2 5f a5 0c da b0 8e 56 04 28 67 f4 af\
-58 26 d1 6c
-Ciphertext: \
-93 ac 9f 06 71 ec 29 ac bb 44 4e ff c1 a5 74 13\
-51 d6 0f db 0e 39 3f bf 75 4a cf 0d e4 97 61 a1\
-48 41 df 77 72 e9 bc 82 77 39 66 a1 58 4c 4d 72\
-ba ea 00 11 8f 83 f3 5c ca 6e 53 7c bd 4d 81 1f\
-55 83 b2 97 83 d8 a6 d9 4c d3 1b e7 0d 6f 52 6c\
-10 ff 09 c6 fa 7c e0 69 79 5a 3f cd 05 11 fd 5f\
-cb 56 4b cc 80 ea 9c 78 f3 8b 80 01 25 39 d8 a4\
-dd f6 fe 81 e9 cd db 7f 50 db bb bc c7 e5 d8 60\
-97 cc f4 ec 49 18 9f b8 bf 31 8b e6 d5 a0 71 5d\
-51 6b 49 af 19 12 58 cd 32 dc 83 3c e6 eb 46 73\
-c0 3a 19 bb ac e8 8c c5 48 95 f6 36 cc 0c 1e c8\
-90 96 d1 1c e2 35 a2 65 ca 17 64 23 2a 68 9a e8
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 9.3
-Plaintext: \
-fd 32 64 29 df 9b 89 0e 09 b5 4b 18 b8 f3 4f 1e\
-24
-Seed: # not used yet\
-e8 9b b0 32 c6 ce 62 2c bd b5 3b c9 46 60 14 ea\
-77 f7 77 c0
-Ciphertext: \
-81 eb dd 95 05 4b 0c 82 2e f9 ad 76 93 f5 a8 7a\
-df b4 b4 c4 ce 70 df 2d f8 4e d4 9c 04 da 58 ba\
-5f c2 0a 19 e1 a6 e8 b7 a3 90 0b 22 79 6d c4 e8\
-69 ee 6b 42 79 2d 15 a8 ec eb 56 c0 9c 69 91 4e\
-81 3c ea 8f 69 31 e4 b8 ed 6f 42 1a f2 98 d5 95\
-c9 7f 47 89 c7 ca a6 12 c7 ef 36 09 84 c2 1b 93\
-ed c5 40 10 68 b5 af 4c 78 a8 77 1b 98 4d 53 b8\
-ea 8a df 2f 6a 7d 4a 0b a7 6c 75 e1 dd 9f 65 8f\
-20 de d4 a4 60 71 d4 6d 77 91 b5 68 03 d8 fe a7\
-f0 b0 f8 e4 1a e3 f0 93 83 a6 f9 58 5f e7 75 3e\
-aa ff d2 bf 94 56 31 08 be ec c2 07 bb b5 35 f5\
-fc c7 05 f0 dd e9 f7 08 c6 2f 49 a9 c9 03 71 d3
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 9.4
-Plaintext: \
-f1 45 9b 5f 0c 92 f0 1a 0f 72 3a 2e 56 62 48 4d\
-8f 8c 0a 20 fc 29 da d6 ac d4 3b b5 f3 ef fd f4\
-e1 b6 3e 07 fd fe 66 28 d0 d7 4c a1 9b f2 d6 9e\
-4a 0a bf 86 d2 93 92 5a 79 67 72 f8 08 8e
-Seed: # not used yet\
-60 6f 3b 99 c0 b9 cc d7 71 ea a2 9e a0 e4 c8 84\
-f3 18 9c cc
-Ciphertext: \
-bc c3 5f 94 cd e6 6c b1 13 66 25 d6 25 b9 44 32\
-a3 5b 22 f3 d2 fa 11 a6 13 ff 0f ca 5b d5 7f 87\
-b9 02 cc dc 1c d0 ae bc b0 71 5e e8 69 d1 d1 fe\
-39 5f 67 93 00 3f 5e ca 46 50 59 c8 86 60 d4 46\
-ff 5f 08 18 55 20 22 55 7e 38 c0 8a 67 ea d9 91\
-26 22 54 f1 06 82 97 5e c5 63 97 76 85 37 f4 97\
-7a f6 d5 f6 aa ce b7 fb 25 de c5 93 72 30 23 1f\
-d8 97 8a f4 91 19 a2 9f 29 e4 24 ab 82 72 b4 75\
-62 79 2d 5c 94 f7 74 b8 82 9d 0b 0d 9f 1a 8c 9e\
-dd f3 75 74 d5 fa 24 8e ef a9 c5 27 1f c5 ec 25\
-79 c8 1b dd 61 b4 10 fa 61 fe 36 e4 24 22 1c 11\
-3a dd b2 75 66 4c 80 1d 34 ca 8c 63 51 e4 a8 58
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 9.5
-Plaintext: \
-53 e6 e8 c7 29 d6 f9 c3 19 dd 31 7e 74 b0 db 8e\
-4c cc a2 5f 3c 83 05 74 6e 13 7a c6 3a 63 ef 37\
-39 e7 b5 95 ab b9 6e 8d 55 e5 4f 7b d4 1a b4 33\
-37 8f fb 91 1d
-Seed: # not used yet\
-fc bc 42 14 02 e9 ec ab c6 08 2a fa 40 ba 5f 26\
-52 2c 84 0e
-Ciphertext: \
-23 2a fb c9 27 fa 08 c2 f6 a2 7b 87 d4 a5 cb 09\
-c0 7d c2 6f ae 73 d7 3a 90 55 88 39 f4 fd 66 d2\
-81 b8 7e c7 34 bc e2 37 ba 16 66 98 ed 82 91 06\
-a7 de 69 42 cd 6c dc e7 8f ed 8d 2e 4d 81 42 8e\
-66 49 0d 03 62 64 ce f9 2a f9 41 d3 e3 50 55 fe\
-39 81 e1 4d 29 cb b9 a4 f6 74 73 06 3b ae c7 9a\
-11 79 f5 a1 7c 9c 18 32 f2 83 8f d7 d5 e5 9b b9\
-65 9d 56 dc e8 a0 19 ed ef 1b b3 ac cc 69 7c c6\
-cc 7a 77 8f 60 a0 64 c7 f6 f5 d5 29 c6 21 02 62\
-e0 03 de 58 3e 81 e3 16 7b 89 97 1f b8 c0 e1 5d\
-44 ff fe f8 9b 53 d8 d6 4d d7 97 d1 59 b5 6d 2b\
-08 ea 53 07 ea 12 c2 41 bd 58 d4 ee 27 8a 1f 2e
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 9.6
-Plaintext: \
-b6 b2 8e a2 19 8d 0c 10 08 bc 64
-Seed: # not used yet\
-23 aa de 0e 1e 08 bb 9b 9a 78 d2 30 2a 52 f9 c2\
-1b 2e 1b a2
-Ciphertext: \
-43 8c c7 dc 08 a6 8d a2 49 e4 25 05 f8 57 3b a6\
-0e 2c 27 73 d5 b2 90 f4 cf 9d ff 71 8e 84 20 81\
-c3 83 e6 70 24 a0 f2 95 94 ea 98 7b 9d 25 e4 b7\
-38 f2 85 97 0d 19 5a bb 3a 8c 80 54 e3 d7 9d 6b\
-9c 9a 83 27 ba 59 6f 12 59 e2 71 26 67 47 66 90\
-7d 8d 58 2f f3 a8 47 61 54 92 9a db 1e 6d 12 35\
-b2 cc b4 ec 8f 66 3b a9 cc 67 0a 92 be bd 85 3c\
-8d bf 69 c6 43 6d 01 6f 61 ad d8 36 e9 47 32 45\
-04 34 20 7f 9f d4 c4 3d ec 2a 12 a9 58 ef a0 1e\
-fe 26 69 89 9b 5e 60 4c 25 5c 55 fb 71 66 de 55\
-89 e3 69 59 7b b0 91 68 c0 6d d5 db 17 7e 06 a1\
-74 0e b2 d5 c8 2f ae ca 6d 92 fc ee 99 31 ba 9f
-Test: DecryptMatch
-
-AlgorithmType: AsymmetricCipher
-Name: RSA/OAEP-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 10: A 2048-bit RSA Key Pair
-Modulus: \
-ae 45 ed 56 01 ce c6 b8 cc 05 f8 03 93 5c 67 4d\
-db e0 d7 5c 4c 09 fd 79 51 fc 6b 0c ae c3 13 a8\
-df 39 97 0c 51 8b ff ba 5e d6 8f 3f 0d 7f 22 a4\
-02 9d 41 3f 1a e0 7e 4e be 9e 41 77 ce 23 e7 f5\
-40 4b 56 9e 4e e1 bd cf 3c 1f b0 3e f1 13 80 2d\
-4f 85 5e b9 b5 13 4b 5a 7c 80 85 ad ca e6 fa 2f\
-a1 41 7e c3 76 3b e1 71 b0 c6 2b 76 0e de 23 c1\
-2a d9 2b 98 08 84 c6 41 f5 a8 fa c2 6b da d4 a0\
-33 81 a2 2f e1 b7 54 88 50 94 c8 25 06 d4 01 9a\
-53 5a 28 6a fe b2 71 bb 9b a5 92 de 18 dc f6 00\
-c2 ae ea e5 6e 02 f7 cf 79 fc 14 cf 3b dc 7c d8\
-4f eb bb f9 50 ca 90 30 4b 22 19 a7 aa 06 3a ef\
-a2 c3 c1 98 0e 56 0c d6 4a fe 77 95 85 b6 10 76\
-57 b9 57 85 7e fd e6 01 09 88 ab 7d e4 17 fc 88\
-d8 f3 84 c4 e6 e7 2c 3f 94 3e 0c 31 c0 c4 a5 cc\
-36 f8 79 d8 a3 ac 9d 7d 59 86 0e aa da 6b 83 bb
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-05 6b 04 21 6f e5 f3 54 ac 77 25 0a 4b 6b 0c 85\
-25 a8 5c 59 b0 bd 80 c5 64 50 a2 2d 5f 43 8e 59\
-6a 33 3a a8 75 e2 91 dd 43 f4 8c b8 8b 9d 5f c0\
-d4 99 f9 fc d1 c3 97 f9 af c0 70 cd 9e 39 8c 8d\
-19 e6 1d b7 c7 41 0a 6b 26 75 df bf 5d 34 5b 80\
-4d 20 1a dd 50 2d 5c e2 df cb 09 1c e9 99 7b be\
-be 57 30 6f 38 3e 4d 58 81 03 f0 36 f7 e8 5d 19\
-34 d1 52 a3 23 e4 a8 db 45 1d 6f 4a 5b 1b 0f 10\
-2c c1 50 e0 2f ee e2 b8 8d ea 4a d4 c1 ba cc b2\
-4d 84 07 2d 14 e1 d2 4a 67 71 f7 40 8e e3 05 64\
-fb 86 d4 39 3a 34 bc f0 b7 88 50 1d 19 33 03 f1\
-3a 22 84 b0 01 f0 f6 49 ea f7 93 28 d4 ac 5c 43\
-0a b4 41 49 20 a9 46 0e d1 b7 bc 40 ec 65 3e 87\
-6d 09 ab c5 09 ae 45 b5 25 19 01 16 a0 c2 61 01\
-84 82 98 50 9c 1c 3b f3 a4 83 e7 27 40 54 e1 5e\
-97 07 50 36 e9 89 f6 09 32 80 7b 52 57 75 1e 79
-Prime1: \
-ec f5 ae cd 1e 55 15 ff fa cb d7 5a 28 16 c6 eb\
-f4 90 18 cd fb 46 38 e1 85 d6 6a 73 96 b6 f8 09\
-0f 80 18 c7 fd 95 cc 34 b8 57 dc 17 f0 cc 65 16\
-bb 13 46 ab 4d 58 2c ad ad 7b 41 03 35 23 87 b7\
-03 38 d0 84 04 7c 9d 95 39 b6 49 62 04 b3 dd 6e\
-a4 42 49 92 07 be c0 1f 96 42 87 ff 63 36 c3 98\
-46 58 33 68 46 f5 6e 46 86 18 81 c1 02 33 d2 17\
-6b f1 5a 5e 96 dd c7 80 bc 86 8a a7 7d 3c e7 69
-Prime2: \
-bc 46 c4 64 fc 6a c4 ca 78 3b 0e b0 8a 3c 84 1b\
-77 2f 7e 9b 2f 28 ba bd 58 8a e8 85 e1 a0 c6 1e\
-48 58 a0 fb 25 ac 29 99 90 f3 5b e8 51 64 c2 59\
-ba 11 75 cd d7 19 27 07 13 51 84 99 2b 6c 29 b7\
-46 dd 0d 2c ab e1 42 83 5f 7d 14 8c c1 61 52 4b\
-4a 09 94 6d 48 b8 28 47 3f 1c e7 6b 6c b6 88 6c\
-34 5c 03 e0 5f 41 d5 1b 5c 3a 90 a3 f2 40 73 c7\
-d7 4a 4f e2 5d 9c f2 1c 75 96 0f 3f c3 86 31 83
-ModPrime1PrivateExponent: \
-c7 35 64 57 1d 00 fb 15 d0 8a 3d e9 95 7a 50 91\
-5d 71 26 e9 44 2d ac f4 2b c8 2e 86 2e 56 73 ff\
-6a 00 8e d4 d2 e3 74 61 7d f8 9f 17 a1 60 b4 3b\
-7f da 9c b6 b6 b7 42 18 60 98 15 f7 d4 5c a2 63\
-c1 59 aa 32 d2 72 d1 27 fa f4 bc 8c a2 d7 73 78\
-e8 ae b1 9b 0a d7 da 3c b3 de 0a e7 31 49 80 f6\
-2b 6d 4b 0a 87 5d 1d f0 3c 1b ae 39 cc d8 33 ef\
-6c d7 e2 d9 52 8b f0 84 d1 f9 69 e7 94 e9 f6 c1
-ModPrime2PrivateExponent: \
-26 58 b3 7f 6d f9 c1 03 0b e1 db 68 11 7f a9 d8\
-7e 39 ea 2b 69 3b 7e 6d 3a 2f 70 94 74 13 ee c6\
-14 2e 18 fb 8d fc b6 ac 54 5d 7c 86 a0 ad 48 f8\
-45 71 70 f0 ef b2 6b c4 81 26 c5 3e fd 1d 16 92\
-01 98 dc 2a 11 07 dc 28 2d b6 a8 0c d3 06 23 60\
-ba 3f a1 3f 70 e4 31 2f f1 a6 cd 6b 8f c4 cd 9c\
-5c 3d b1 7c 6d 6a 57 21 2f 73 ae 29 f6 19 32 7b\
-ad 59 b1 53 85 85 85 ba 4e 28 b6 0a 62 a4 5e 49
-MultiplicativeInverseOfPrime2ModPrime1: \
-6f 38 52 6b 39 25 08 55 34 ef 3e 41 5a 83 6e de\
-8b 86 15 8a 2c 7c bf ec cb 0b d8 34 30 4f ec 68\
-3b a8 d4 f4 79 c4 33 d4 34 16 e6 32 69 62 3c ea\
-10 07 76 d8 5a ff 40 1d 3f ff 61 0e e6 54 11 ce\
-3b 13 63 d6 3a 97 09 ee de 42 64 7c ea 56 14 93\
-d5 45 70 a8 79 c1 86 82 cd 97 71 0b 96 20 5e c3\
-11 17 d7 3b 5f 36 22 3f ad d6 e8 ba 90 dd 7c 0e\
-e6 1d 44 e1 63 25 1e 20 c7 f6 6e b3 05 11 7c b8
-Test: KeyPairValidAndConsistent
-Comment: RSAES-OAEP Encryption Example 10.1
-Plaintext: \
-8b ba 6b f8 2a 6c 0f 86 d5 f1 75 6e 97 95 68 70\
-b0 89 53 b0 6b 4e b2 05 bc 16 94 ee
-Seed: # not used yet\
-47 e1 ab 71 19 fe e5 6c 95 ee 5e aa d8 6f 40 d0\
-aa 63 bd 33
-Ciphertext: \
-53 ea 5d c0 8c d2 60 fb 3b 85 85 67 28 7f a9 15\
-52 c3 0b 2f eb fb a2 13 f0 ae 87 70 2d 06 8d 19\
-ba b0 7f e5 74 52 3d fb 42 13 9d 68 c3 c5 af ee\
-e0 bf e4 cb 79 69 cb f3 82 b8 04 d6 e6 13 96 14\
-4e 2d 0e 60 74 1f 89 93 c3 01 4b 58 b9 b1 95 7a\
-8b ab cd 23 af 85 4f 4c 35 6f b1 66 2a a7 2b fc\
-c7 e5 86 55 9d c4 28 0d 16 0c 12 67 85 a7 23 eb\
-ee be ff 71 f1 15 94 44 0a ae f8 7d 10 79 3a 87\
-74 a2 39 d4 a0 4c 87 fe 14 67 b9 da f8 52 08 ec\
-6c 72 55 79 4a 96 cc 29 14 2f 9a 8b d4 18 e3 c1\
-fd 67 34 4b 0c d0 82 9d f3 b2 be c6 02 53 19 62\
-93 c6 b3 4d 3f 75 d3 2f 21 3d d4 5c 62 73 d5 05\
-ad f4 cc ed 10 57 cb 75 8f c2 6a ee fa 44 12 55\
-ed 4e 64 c1 99 ee 07 5e 7f 16 64 61 82 fd b4 64\
-73 9b 68 ab 5d af f0 e6 3e 95 52 01 68 24 f0 54\
-bf 4d 3c 8c 90 a9 7b b6 b6 55 32 84 eb 42 9f cc
-Test: DecryptMatch
-Comment:  RSAES-OAEP Encryption Example 10.2
-Plaintext: \
-e6 ad 18 1f 05 3b 58 a9 04 f2 45 75 10 37 3e 57
-Seed: # not used yet\
-6d 17 f5 b4 c1 ff ac 35 1d 19 5b f7 b0 9d 09 f0\
-9a 40 79 cf
-Ciphertext: \
-a2 b1 a4 30 a9 d6 57 e2 fa 1c 2b b5 ed 43 ff b2\
-5c 05 a3 08 fe 90 93 c0 10 31 79 5f 58 74 40 01\
-10 82 8a e5 8f b9 b5 81 ce 9d dd d3 e5 49 ae 04\
-a0 98 54 59 bd e6 c6 26 59 4e 7b 05 dc 42 78 b2\
-a1 46 5c 13 68 40 88 23 c8 5e 96 dc 66 c3 a3 09\
-83 c6 39 66 4f c4 56 9a 37 fe 21 e5 a1 95 b5 77\
-6e ed 2d f8 d8 d3 61 af 68 6e 75 02 29 bb d6 63\
-f1 61 86 8a 50 61 5e 0c 33 7b ec 0c a3 5f ec 0b\
-b1 9c 36 eb 2e 0b bc c0 58 2f a1 d9 3a ac db 06\
-10 63 f5 9f 2c e1 ee 43 60 5e 5d 89 ec a1 83 d2\
-ac df e9 f8 10 11 02 2a d3 b4 3a 3d d4 17 da c9\
-4b 4e 11 ea 81 b1 92 96 6e 96 6b 18 20 82 e7 19\
-64 60 7b 4f 80 02 f3 62 99 84 4a 11 f2 ae 0f ae\
-ac 2e ae 70 f8 f4 f9 80 88 ac dc d0 ac 55 6e 9f\
-cc c5 11 52 19 08 fa d2 6f 04 c6 42 01 45 03 05\
-77 87 58 b0 53 8b f8 b5 bb 14 4a 82 8e 62 97 95
-Test: DecryptMatch
-Comment: RSAES-OAEP Encryption Example 10.3
-Plaintext: \
-51 0a 2c f6 0e 86 6f a2 34 05 53 c9 4e a3 9f bc\
-25 63 11 e8 3e 94 45 4b 41 24
-Seed: # not used yet\
-38 53 87 51 4d ec cc 7c 74 0d d8 cd f9 da ee 49\
-a1 cb fd 54
-Ciphertext: \
-98 86 c3 e6 76 4a 8b 9a 84 e8 41 48 eb d8 c3 b1\
-aa 80 50 38 1a 78 f6 68 71 4c 16 d9 cf d2 a6 ed\
-c5 69 79 c5 35 d9 de e3 b4 4b 85 c1 8b e8 92 89\
-92 37 17 11 47 22 16 d9 5d da 98 d2 ee 83 47 c9\
-b1 4d ff df f8 4a a4 8d 25 ac 06 f7 d7 e6 53 98\
-ac 96 7b 1c e9 09 25 f6 7d ce 04 9b 7f 81 2d b0\
-74 29 97 a7 4d 44 fe 81 db e0 e7 a3 fe af 2e 5c\
-40 af 88 8d 55 0d db be 3b c2 06 57 a2 95 43 f8\
-fc 29 13 b9 bd 1a 61 b2 ab 22 56 ec 40 9b bd 7d\
-c0 d1 77 17 ea 25 c4 3f 42 ed 27 df 87 38 bf 4a\
-fc 67 66 ff 7a ff 08 59 55 5e e2 83 92 0f 4c 8a\
-63 c4 a7 34 0c ba fd dc 33 9e cd b4 b0 51 50 02\
-f9 6c 93 2b 5b 79 16 7a f6 99 c0 ad 3f cc fd f0\
-f4 4e 85 a7 02 62 bf 2e 18 fe 34 b8 50 58 99 75\
-e8 67 ff 96 9d 48 ea bf 21 22 71 54 6c dc 05 a6\
-9e cb 52 6e 52 87 0c 83 6f 30 7b d7 98 78 0e de
-Test: DecryptMatch
-Comment:  RSAES-OAEP Encryption Example 10.4
-Plaintext: \
-bc dd 19 0d a3 b7 d3 00 df 9a 06 e2 2c aa e2 a7\
-5f 10 c9 1f f6 67 b7 c1 6b de 8b 53 06 4a 26 49\
-a9 40 45 c9
-Seed: # not used yet\
-5c ac a6 a0 f7 64 16 1a 96 84 f8 5d 92 b6 e0 ef\
-37 ca 8b 65
-Ciphertext: \
-63 18 e9 fb 5c 0d 05 e5 30 7e 16 83 43 6e 90 32\
-93 ac 46 42 35 8a aa 22 3d 71 63 01 3a ba 87 e2\
-df da 8e 60 c6 86 0e 29 a1 e9 26 86 16 3e a0 b9\
-17 5f 32 9c a3 b1 31 a1 ed d3 a7 77 59 a8 b9 7b\
-ad 6a 4f 8f 43 96 f2 8c f6 f3 9c a5 81 12 e4 81\
-60 d6 e2 03 da a5 85 6f 3a ca 5f fe d5 77 af 49\
-94 08 e3 df d2 33 e3 e6 04 db e3 4a 9c 4c 90 82\
-de 65 52 7c ac 63 31 d2 9d c8 0e 05 08 a0 fa 71\
-22 e7 f3 29 f6 cc a5 cf a3 4d 4d 1d a4 17 80 54\
-57 e0 08 be c5 49 e4 78 ff 9e 12 a7 63 c4 77 d1\
-5b bb 78 f5 b6 9b d5 78 30 fc 2c 4e d6 86 d7 9b\
-c7 2a 95 d8 5f 88 13 4c 6b 0a fe 56 a8 cc fb c8\
-55 82 8b b3 39 bd 17 90 9c f1 d7 0d e3 33 5a e0\
-70 39 09 3e 60 6d 65 53 65 de 65 50 b8 72 cd 6d\
-e1 d4 40 ee 03 1b 61 94 5f 62 9a d8 a3 53 b0 d4\
-09 39 e9 6a 3c 45 0d 2a 8d 5e ee 9f 67 80 93 c8
-Test: DecryptMatch
-Comment:  RSAES-OAEP Encryption Example 10.5
-Plaintext: \
-a7 dd 6c 7d c2 4b 46 f9 dd 5f 1e 91 ad a4 c3 b3\
-df 94 7e 87 72 32 a9
-Seed: # not used yet\
-95 bc a9 e3 85 98 94 b3 dd 86 9f a7 ec d5 bb c6\
-40 1b f3 e4
-Ciphertext: \
-75 29 08 72 cc fd 4a 45 05 66 0d 65 1f 56 da 6d\
-aa 09 ca 13 01 d8 90 63 2f 6a 99 2f 3d 56 5c ee\
-46 4a fd ed 40 ed 3b 5b e9 35 67 14 ea 5a a7 65\
-5f 4a 13 66 c2 f1 7c 72 8f 6f 2c 5a 5d 1f 8e 28\
-42 9b c4 e6 f8 f2 cf f8 da 8d c0 e0 a9 80 8e 45\
-fd 09 ea 2f a4 0c b2 b6 ce 6f ff f5 c0 e1 59 d1\
-1b 68 d9 0a 85 f7 b8 4e 10 3b 09 e6 82 66 64 80\
-c6 57 50 5c 09 29 25 94 68 a3 14 78 6d 74 ea b1\
-31 57 3c f2 34 bf 57 db 7d 9e 66 cc 67 48 19 2e\
-00 2d c0 de ea 93 05 85 f0 83 1f dc d9 bc 33 d5\
-1f 79 ed 2f fc 16 bc f4 d5 98 12 fc eb ca a3 f9\
-06 9b 0e 44 56 86 d6 44 c2 5c cf 63 b4 56 ee 5f\
-a6 ff e9 6f 19 cd f7 51 fe d9 ea f3 59 57 75 4d\
-bf 4b fe a5 21 6a a1 84 4d c5 07 cb 2d 08 0e 72\
-2e ba 15 03 08 c2 b5 ff 11 93 62 0f 17 66 ec f4\
-48 1b af b9 43 bd 29 28 77 f2 13 6c a4 94 ab a0
-Test: DecryptMatch
-Comment:  RSAES-OAEP Encryption Example 10.6
-Plaintext: \
-ea f1 a7 3a 1b 0c 46 09 53 7d e6 9c d9 22 8b bc\
-fb 9a 8c a8 c6 c3 ef af 05 6f e4 a7 f4 63 4e d0\
-0b 7c 39 ec 69 22 d7 b8 ea 2c 04 eb ac
-Seed: # not used yet\
-9f 47 dd f4 2e 97 ee a8 56 a9 bd bc 71 4e b3 ac\
-22 f6 eb 32
-Ciphertext: \
-2d 20 7a 73 43 2a 8f b4 c0 30 51 b3 f7 3b 28 a6\
-17 64 09 8d fa 34 c4 7a 20 99 5f 81 15 aa 68 16\
-67 9b 55 7e 82 db ee 58 49 08 c6 e6 97 82 d7 de\
-b3 4d bd 65 af 06 3d 57 fc a7 6a 5f d0 69 49 2f\
-d6 06 8d 99 84 d2 09 35 05 65 a6 2e 5c 77 f2 30\
-38 c1 2c b1 0c 66 34 70 9b 54 7c 46 f6 b4 a7 09\
-bd 85 ca 12 2d 74 46 5e f9 77 62 c2 97 63 e0 6d\
-bc 7a 9e 73 8c 78 bf ca 01 02 dc 5e 79 d6 5b 97\
-3f 28 24 0c aa b2 e1 61 a7 8b 57 d2 62 45 7e d8\
-19 5d 53 e3 c7 ae 9d a0 21 88 3c 6d b7 c2 4a fd\
-d2 32 2e ac 97 2a d3 c3 54 c5 fc ef 1e 14 6c 3a\
-02 90 fb 67 ad f0 07 06 6e 00 42 8d 2c ec 18 ce\
-58 f9 32 86 98 de fe f4 b2 eb 5e c7 69 18 fd e1\
-c1 98 cb b3 8b 7a fc 67 62 6a 9a ef ec 43 22 bf\
-d9 0d 25 63 48 1c 9a 22 1f 78 c8 27 2c 82 d1 b6\
-2a b9 14 e1 c6 9f 6a f6 ef 30 ca 52 60 db 4a 46
-Test: DecryptMatch
diff --git a/src-cryptopp/TestVectors/rsa_pkcs1_1_5.txt b/src-cryptopp/TestVectors/rsa_pkcs1_1_5.txt
deleted file mode 100644
index 47da257..0000000
--- a/src-cryptopp/TestVectors/rsa_pkcs1_1_5.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-AlgorithmType: Signature
-Name: RSA/PKCS1-1.5(MD2)
-KeyFormat: DER
-Source: http://www.rsasecurity.com/rsalabs/pkcs/index.html, \
-	Some Examples of the PKCS Standards
-PrivateKey: \
-	30 82 01 50\
-	   02 01 00                                      #version = 0\
-	   30 0d                       #privateKeyAlgorithmIdentifier\
-		  06 09                        #algorithm = rsaEncryption\
-			 2a 86 48 86 f7 0d 01 01 01\
-		  05 00                                #parameters = NULL\
-	   04 82 01 3a           #privateKey = RSAPrivateKey encoding\
-		  30 82 01 36\
-			 02 01 00                                      #version = 0\
-			 02 40                                         #modulus = n\
-				0a 66 79 1d c6 98 81 68 de 7a b7 74 19 bb 7f b0\
-				c0 01 c6 27 10 27 00 75 14 29 42 e1 9a 8d 8c 51\
-				d0 53 b3 e3 78 2a 1d e5 dc 5a f4 eb e9 94 68 17\
-				01 14 a1 df e6 7c dc 9a 9a f5 5d 65 56 20 bb ab\
-			 02 03 01 00 01                         #publicExponent = e\
-			 02 40                                 #privateExponent = d\
-				01 23 c5 b6 1b a3 6e db 1d 36 79 90 41 99 a8 9e\
-				a8 0c 09 b9 12 2e 14 00 c0 9a dc f7 78 46 76 d0\
-				1d 23 35 6a 7d 44 d6 bd 8b d5 0e 94 bf c7 23 fa\
-				87 d8 86 2b 75 17 76 91 c1 1d 75 76 92 df 88 81\
-			 02 20                                          #prime1 = p\
-				33 d4 84 45 c8 59 e5 23 40 de 70 4b cd da 06 5f\
-				bb 40 58 d7 40 bd 1d 67 d2 9e 9c 14 6c 11 cf 61\
-			 02 20                                          #prime2 = q\
-				33 5e 84 08 86 6b 0f d3 8d c7 00 2d 3f 97 2c 67\
-				38 9a 65 d5 d8 30 65 66 d5 c4 f2 a5 aa 52 62 8b\
-			 02 20                               #exponent1 = d mod p-1\
-				04 5e c9 00 71 52 53 25 d3 d4 6d b7 96 95 e9 af\
-				ac c4 52 39 64 36 0e 02 b1 19 ba a3 66 31 62 41\
-			 02 20                               #exponent2 = d mod q-1\
-				15 eb 32 73 60 c7 b6 0d 12 e5 e2 d1 6b dc d9 79\
-				81 d1 7f ba 6b 70 db 13 b2 0b 43 6e 24 ea da 59\
-			 02 20                             #coefficient = q-1 mod p\
-				2c a6 36 6d 72 78 1d fa 24 d3 4a 9a 24 cb c2 ae\
-				92 7a 99 58 af 42 65 63 ff 63 fb 11 65 8a 46 1d
-PublicKey: \
-   30 5b                                #subjectPublicKeyInfo\
-      30 0d                                        #algorithm\
-         06 09                     #algorithm = rsaEncryption\
-            2a 86 48 86 f7 0d 01 01 01\
-         05 00                             #parameters = NULL\
-      03 4a         #subjectPublicKey = RSAPublicKey encoding\
-         00\
- 		 30 47\
-		    02 40                                         #modulus = n\
-			   0a 66 79 1d c6 98 81 68 de 7a b7 74 19 bb 7f b0\
-			   c0 01 c6 27 10 27 00 75 14 29 42 e1 9a 8d 8c 51\
-			   d0 53 b3 e3 78 2a 1d e5 dc 5a f4 eb e9 94 68 17\
-			   01 14 a1 df e6 7c dc 9a 9a f5 5d 65 56 20 bb ab\
-		    02 03 01 00 01                                #publicExponent = e
-Test: KeyPairValidAndConsistent
-Message: # "Everyone gets Friday off."\
-	45 76 65 72 79 6f 6e 65 20 67 65 74 73 20 46 72 69 64 61 79 20 6f 66 66 2e
-Signature: \
-	05fa6a812fc7df8bf4f2542509e03e84\
-	6e11b9c620be2009efb440efbcc66921\
-	6994ac04f341b57d05202d428fb2a27b\
-	5c77dfd9b15bfc3d559353503410c1e1
-Test: Verify
-Name: RSA/PKCS1-1.5(SHA-1)
-Source: generated by Wei Dai using Crypto++ 5.0
-Signature: 0610761F95FFD1B8F29DA34212947EC2AA0E358866A722F03CC3C41487ADC604A48FF54F5C6BEDB9FB7BD59F82D6E55D8F3174BA361B2214B2D74E8825E04E81
-Test: Verify
-Message: 00
-Test: NotVerify
-
-AlgorithmType: Signature
-Name: RSA/PKCS1-1.5(SHA-1)
-Source: http://islab.oregonstate.edu/emails/pkcs-tng-02/0152
-KeyFormat: Component
-Modulus: A885B6F851A8079AB8A281DB0297148511EE0D8C07C0D4AE6D6FED461488E0D41E3FF8F281B06A3240B5007A5C2AB4FB6BE8AF88F119DB998368DDDC9710ABED
-PublicExponent: 010001
-PrivateExponent: 2B259D2CA3DF851EE891F6F4678BDDFD9A131C95D3305C63D2723B4A5B9C960F5EC8BB7DCDDBEBD8B6A38767D64AD451E9383E0891E4EE7506100481F2B49323
-Prime1: D7103CD676E39824E2BE50B8E6533FE7CB7484348E283802AD2B8D00C80D19DF
-Prime2: C89996DC169CEB3F227958275968804D4BE9FC4012C3219662F1A438C9950BB3
-ModPrime1PrivateExponent: 5D8EA4C8AF83A70634D5920C3DB66D908AC3AF57A597FD75BC9BBB856181C185
-ModPrime2PrivateExponent: C598E54DAEC8ABC1E907769A6C2BD01653ED0C9960E1EDB7E186FDA922883A99
-MultiplicativeInverseOfPrime2ModPrime1: 7C6F27B5B51B78AD80FB36E700990CF307866F2943124CBD93D97C137794C104
-Test: KeyPairValidAndConsistent
-Source: generated by Wei Dai using Crypto++ 5.0
-Message: 74657374 # "test"
-Signature: A7E00CE4391F914D82158D9B732759808E25A1C6383FE87A5199157650D4296CF612E9FF809E686A0AF328238306E79965F6D0138138829D9A1A22764306F6CE
-Test: Verify
diff --git a/src-cryptopp/TestVectors/rsa_pss.txt b/src-cryptopp/TestVectors/rsa_pss.txt
deleted file mode 100644
index 92cfa77..0000000
--- a/src-cryptopp/TestVectors/rsa_pss.txt
+++ /dev/null
@@ -1,2083 +0,0 @@
-AlgorithmType: Signature
-Name: RSA/PSS-MGF1(SHA-1)
-Source: http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/, PKCS #1 test vectors
-KeyFormat: Component
-Comment: Example 1: A 1024-bit RSA Key Pair
-Modulus: \
-a5 6e 4a 0e 70 10 17 58 9a 51 87 dc 7e a8 41 d1\
-56 f2 ec 0e 36 ad 52 a4 4d fe b1 e6 1f 7a d9 91\
-d8 c5 10 56 ff ed b1 62 b4 c0 f2 83 a1 2a 88 a3\
-94 df f5 26 ab 72 91 cb b3 07 ce ab fc e0 b1 df\
-d5 cd 95 08 09 6d 5b 2b 8b 6d f5 d6 71 ef 63 77\
-c0 92 1c b2 3c 27 0a 70 e2 59 8e 6f f8 9d 19 f1\
-05 ac c2 d3 f0 cb 35 f2 92 80 e1 38 6b 6f 64 c4\
-ef 22 e1 e1 f2 0d 0c e8 cf fb 22 49 bd 9a 21 37
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-33 a5 04 2a 90 b2 7d 4f 54 51 ca 9b bb d0 b4 47\
-71 a1 01 af 88 43 40 ae f9 88 5f 2a 4b be 92 e8\
-94 a7 24 ac 3c 56 8c 8f 97 85 3a d0 7c 02 66 c8\
-c6 a3 ca 09 29 f1 e8 f1 12 31 88 44 29 fc 4d 9a\
-e5 5f ee 89 6a 10 ce 70 7c 3e d7 e7 34 e4 47 27\
-a3 95 74 50 1a 53 26 83 10 9c 2a ba ca ba 28 3c\
-31 b4 bd 2f 53 c3 ee 37 e3 52 ce e3 4f 9e 50 3b\
-d8 0c 06 22 ad 79 c6 dc ee 88 35 47 c6 a3 b3 25
-Prime1: \
-e7 e8 94 27 20 a8 77 51 72 73 a3 56 05 3e a2 a1\
-bc 0c 94 aa 72 d5 5c 6e 86 29 6b 2d fc 96 79 48\
-c0 a7 2c bc cc a7 ea cb 35 70 6e 09 a1 df 55 a1\
-53 5b d9 b3 cc 34 16 0b 3b 6d cd 3e da 8e 64 43
-Prime2: \
-b6 9d ca 1c f7 d4 d7 ec 81 e7 5b 90 fc ca 87 4a\
-bc de 12 3f d2 70 01 80 aa 90 47 9b 6e 48 de 8d\
-67 ed 24 f9 f1 9d 85 ba 27 58 74 f5 42 cd 20 dc\
-72 3e 69 63 36 4a 1f 94 25 45 2b 26 9a 67 99 fd
-ModPrime1PrivateExponent: \
-28 fa 13 93 86 55 be 1f 8a 15 9c ba ca 5a 72 ea\
-19 0c 30 08 9e 19 cd 27 4a 55 6f 36 c4 f6 e1 9f\
-55 4b 34 c0 77 79 04 27 bb dd 8d d3 ed e2 44 83\
-28 f3 85 d8 1b 30 e8 e4 3b 2f ff a0 27 86 19 79
-ModPrime2PrivateExponent: \
-1a 8b 38 f3 98 fa 71 20 49 89 8d 7f b7 9e e0 a7\
-76 68 79 12 99 cd fa 09 ef c0 e5 07 ac b2 1e d7\
-43 01 ef 5b fd 48 be 45 5e ae b6 e1 67 82 55 82\
-75 80 a8 e4 e8 e1 41 51 d1 51 0a 82 a3 f2 e7 29
-MultiplicativeInverseOfPrime2ModPrime1: \
-27 15 6a ba 41 26 d2 4a 81 f3 a5 28 cb fb 27 f5\
-68 86 f8 40 a9 f6 e8 6e 17 a4 4b 94 fe 93 19 58\
-4b 8e 22 fd de 1e 5a 2e 3b d8 aa 5b a8 d8 58 41\
-94 eb 21 90 ac f8 32 b8 47 f1 3a 3d 24 a7 9f 4d
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 1.1
-Message: \
-cd c8 7d a2 23 d7 86 df 3b 45 e0 bb bc 72 13 26\
-d1 ee 2a f8 06 cc 31 54 75 cc 6f 0d 9c 66 e1 b6\
-23 71 d4 5c e2 39 2e 1a c9 28 44 c3 10 10 2f 15\
-6a 0d 8d 52 c1 f4 c4 0b a3 aa 65 09 57 86 cb 76\
-97 57 a6 56 3b a9 58 fe d0 bc c9 84 e8 b5 17 a3\
-d5 f5 15 b2 3b 8a 41 e7 4a a8 67 69 3f 90 df b0\
-61 a6 e8 6d fa ae e6 44 72 c0 0e 5f 20 94 57 29\
-cb eb e7 7f 06 ce 78 e0 8f 40 98 fb a4 1f 9d 61\
-93 c0 31 7e 8b 60 d4 b6 08 4a cb 42 d2 9e 38 08\
-a3 bc 37 2d 85 e3 31 17 0f cb f7 cc 72 d0 b7 1c\
-29 66 48 b3 a4 d1 0f 41 62 95 d0 80 7a a6 25 ca\
-b2 74 4f d9 ea 8f d2 23 c4 25 37 02 98 28 bd 16\
-be 02 54 6f 13 0f d2 e3 3b 93 6d 26 76 e0 8a ed\
-1b 73 31 8b 75 0a 01 67 d0
-Salt: \
-de e9 59 c7 e0 64 11 36 14 20 ff 80 18 5e d5 7f\
-3e 67 76 af
-Signature: \
-90 74 30 8f b5 98 e9 70 1b 22 94 38 8e 52 f9 71\
-fa ac 2b 60 a5 14 5a f1 85 df 52 87 b5 ed 28 87\
-e5 7c e7 fd 44 dc 86 34 e4 07 c8 e0 e4 36 0b c2\
-26 f3 ec 22 7f 9d 9e 54 63 8e 8d 31 f5 05 12 15\
-df 6e bb 9c 2f 95 79 aa 77 59 8a 38 f9 14 b5 b9\
-c1 bd 83 c4 e2 f9 f3 82 a0 d0 aa 35 42 ff ee 65\
-98 4a 60 1b c6 9e b2 8d eb 27 dc a1 2c 82 c2 d4\
-c3 f6 6c d5 00 f1 ff 2b 99 4d 8a 4e 30 cb b3 3c
-Test: Verify
-Comment: RSASSA-PSS Signature Example 1.2
-Message: \
-85 13 84 cd fe 81 9c 22 ed 6c 4c cb 30 da eb 5c\
-f0 59 bc 8e 11 66 b7 e3 53 0c 4c 23 3e 2b 5f 8f\
-71 a1 cc a5 82 d4 3e cc 72 b1 bc a1 6d fc 70 13\
-22 6b 9e
-Salt: \
-ef 28 69 fa 40 c3 46 cb 18 3d ab 3d 7b ff c9 8f\
-d5 6d f4 2d
-Signature: \
-3e f7 f4 6e 83 1b f9 2b 32 27 41 42 a5 85 ff ce\
-fb dc a7 b3 2a e9 0d 10 fb 0f 0c 72 99 84 f0 4e\
-f2 9a 9d f0 78 07 75 ce 43 73 9b 97 83 83 90 db\
-0a 55 05 e6 3d e9 27 02 8d 9d 29 b2 19 ca 2c 45\
-17 83 25 58 a5 5d 69 4a 6d 25 b9 da b6 60 03 c4\
-cc cd 90 78 02 19 3b e5 17 0d 26 14 7d 37 b9 35\
-90 24 1b e5 1c 25 05 5f 47 ef 62 75 2c fb e2 14\
-18 fa fe 98 c2 2c 4d 4d 47 72 4f db 56 69 e8 43
-Test: Verify
-Comment: RSASSA-PSS Signature Example 1.3
-Message: \
-a4 b1 59 94 17 61 c4 0c 6a 82 f2 b8 0d 1b 94 f5\
-aa 26 54 fd 17 e1 2d 58 88 64 67 9b 54 cd 04 ef\
-8b d0 30 12 be 8d c3 7f 4b 83 af 79 63 fa ff 0d\
-fa 22 54 77 43 7c 48 01 7f f2 be 81 91 cf 39 55\
-fc 07 35 6e ab 3f 32 2f 7f 62 0e 21 d2 54 e5 db\
-43 24 27 9f e0 67 e0 91 0e 2e 81 ca 2c ab 31 c7\
-45 e6 7a 54 05 8e b5 0d 99 3c db 9e d0 b4 d0 29\
-c0 6d 21 a9 4c a6 61 c3 ce 27 fa e1 d6 cb 20 f4\
-56 4d 66 ce 47 67 58 3d 0e 5f 06 02 15 b5 90 17\
-be 85 ea 84 89 39 12 7b d8 c9 c4 d4 7b 51 05 6c\
-03 1c f3 36 f1 7c 99 80 f3 b8 f5 b9 b6 87 8e 8b\
-79 7a a4 3b 88 26 84 33 3e 17 89 3f e9 ca a6 aa\
-29 9f 7e d1 a1 8e e2 c5 48 64 b7 b2 b9 9b 72 61\
-8f b0 25 74 d1 39 ef 50 f0 19 c9 ee f4 16 97 13\
-38 e7 d4 70
-Salt: \
-71 0b 9c 47 47 d8 00 d4 de 87 f1 2a fd ce 6d f1\
-81 07 cc 77
-Signature: \
-66 60 26 fb a7 1b d3 e7 cf 13 15 7c c2 c5 1a 8e\
-4a a6 84 af 97 78 f9 18 49 f3 43 35 d1 41 c0 01\
-54 c4 19 76 21 f9 62 4a 67 5b 5a bc 22 ee 7d 5b\
-aa ff aa e1 c9 ba ca 2c c3 73 b3 f3 3e 78 e6 14\
-3c 39 5a 91 aa 7f ac a6 64 eb 73 3a fd 14 d8 82\
-72 59 d9 9a 75 50 fa ca 50 1e f2 b0 4e 33 c2 3a\
-a5 1f 4b 9e 82 82 ef db 72 8c c0 ab 09 40 5a 91\
-60 7c 63 69 96 1b c8 27 0d 2d 4f 39 fc e6 12 b1
-Test: Verify
-Comment: RSASSA-PSS Signature Example 1.4
-Message: \
-bc 65 67 47 fa 9e af b3 f0
-Salt: \
-05 6f 00 98 5d e1 4d 8e f5 ce a9 e8 2f 8c 27 be\
-f7 20 33 5e
-Signature: \
-46 09 79 3b 23 e9 d0 93 62 dc 21 bb 47 da 0b 4f\
-3a 76 22 64 9a 47 d4 64 01 9b 9a ea fe 53 35 9c\
-17 8c 91 cd 58 ba 6b cb 78 be 03 46 a7 bc 63 7f\
-4b 87 3d 4b ab 38 ee 66 1f 19 96 34 c5 47 a1 ad\
-84 42 e0 3d a0 15 b1 36 e5 43 f7 ab 07 c0 c1 3e\
-42 25 b8 de 8c ce 25 d4 f6 eb 84 00 f8 1f 7e 18\
-33 b7 ee 6e 33 4d 37 09 64 ca 79 fd b8 72 b4 d7\
-52 23 b5 ee b0 81 01 59 1f b5 32 d1 55 a6 de 87
-Test: Verify
-Comment: RSASSA-PSS Signature Example 1.5
-Message: \
-b4 55 81 54 7e 54 27 77 0c 76 8e 8b 82 b7 55 64\
-e0 ea 4e 9c 32 59 4d 6b ff 70 65 44 de 0a 87 76\
-c7 a8 0b 45 76 55 0e ee 1b 2a ca bc 7e 8b 7d 3e\
-f7 bb 5b 03 e4 62 c1 10 47 ea dd 00 62 9a e5 75\
-48 0a c1 47 0f e0 46 f1 3a 2b f5 af 17 92 1d c4\
-b0 aa 8b 02 be e6 33 49 11 65 1d 7f 85 25 d1 0f\
-32 b5 1d 33 be 52 0d 3d df 5a 70 99 55 a3 df e7\
-82 83 b9 e0 ab 54 04 6d 15 0c 17 7f 03 7f dc cc\
-5b e4 ea 5f 68 b5 e5 a3 8c 9d 7e dc cc c4 97 5f\
-45 5a 69 09 b4
-Salt: \
-80 e7 0f f8 6a 08 de 3e c6 09 72 b3 9b 4f bf dc\
-ea 67 ae 8e
-Signature: \
-1d 2a ad 22 1c a4 d3 1d df 13 50 92 39 01 93 98\
-e3 d1 4b 32 dc 34 dc 5a f4 ae ae a3 c0 95 af 73\
-47 9c f0 a4 5e 56 29 63 5a 53 a0 18 37 76 15 b1\
-6c b9 b1 3b 3e 09 d6 71 eb 71 e3 87 b8 54 5c 59\
-60 da 5a 64 77 6e 76 8e 82 b2 c9 35 83 bf 10 4c\
-3f db 23 51 2b 7b 4e 89 f6 33 dd 00 63 a5 30 db\
-45 24 b0 1c 3f 38 4c 09 31 0e 31 5a 79 dc d3 d6\
-84 02 2a 7f 31 c8 65 a6 64 e3 16 97 8b 75 9f ad
-Test: Verify
-Comment: RSASSA-PSS Signature Example 1.6
-Message: \
-10 aa e9 a0 ab 0b 59 5d 08 41 20 7b 70 0d 48 d7\
-5f ae dd e3 b7 75 cd 6b 4c c8 8a e0 6e 46 94 ec\
-74 ba 18 f8 52 0d 4f 5e a6 9c bb e7 cc 2b eb a4\
-3e fd c1 02 15 ac 4e b3 2d c3 02 a1 f5 3d c6 c4\
-35 22 67 e7 93 6c fe bf 7c 8d 67 03 57 84 a3 90\
-9f a8 59 c7 b7 b5 9b 8e 39 c5 c2 34 9f 18 86 b7\
-05 a3 02 67 d4 02 f7 48 6a b4 f5 8c ad 5d 69 ad\
-b1 7a b8 cd 0c e1 ca f5 02 5a f4 ae 24 b1 fb 87\
-94 c6 07 0c c0 9a 51 e2 f9 91 13 11 e3 87 7d 00\
-44 c7 1c 57 a9 93 39 50 08 80 6b 72 3a c3 83 73\
-d3 95 48 18 18 52 8c 1e 70 53 73 92 82 05 35 29\
-51 0e 93 5c d0 fa 77 b8 fa 53 cc 2d 47 4b d4 fb\
-3c c5 c6 72 d6 ff dc 90 a0 0f 98 48 71 2c 4b cf\
-e4 6c 60 57 36 59 b1 1e 64 57 e8 61 f0 f6 04 b6\
-13 8d 14 4f 8c e4 e2 da 73
-Salt: \
-a8 ab 69 dd 80 1f 00 74 c2 a1 fc 60 64 98 36 c6\
-16 d9 96 81
-Signature: \
-2a 34 f6 12 5e 1f 6b 0b f9 71 e8 4f bd 41 c6 32\
-be 8f 2c 2a ce 7d e8 b6 92 6e 31 ff 93 e9 af 98\
-7f bc 06 e5 1e 9b e1 4f 51 98 f9 1f 3f 95 3b d6\
-7d a6 0a 9d f5 97 64 c3 dc 0f e0 8e 1c be f0 b7\
-5f 86 8d 10 ad 3f ba 74 9f ef 59 fb 6d ac 46 a0\
-d6 e5 04 36 93 31 58 6f 58 e4 62 8f 39 aa 27 89\
-82 54 3b c0 ee b5 37 dc 61 95 80 19 b3 94 fb 27\
-3f 21 58 58 a0 a0 1a c4 d6 50 b9 55 c6 7f 4c 58
-Test: Verify
-Comment: Example 2: A 1025-bit RSA Key Pair
-Modulus: \
-01 d4 0c 1b cf 97 a6 8a e7 cd bd 8a 7b f3 e3 4f\
-a1 9d cc a4 ef 75 a4 74 54 37 5f 94 51 4d 88 fe\
-d0 06 fb 82 9f 84 19 ff 87 d6 31 5d a6 8a 1f f3\
-a0 93 8e 9a bb 34 64 01 1c 30 3a d9 91 99 cf 0c\
-7c 7a 8b 47 7d ce 82 9e 88 44 f6 25 b1 15 e5 e9\
-c4 a5 9c f8 f8 11 3b 68 34 33 6a 2f d2 68 9b 47\
-2c bb 5e 5c ab e6 74 35 0c 59 b6 c1 7e 17 68 74\
-fb 42 f8 fc 3d 17 6a 01 7e dc 61 fd 32 6c 4b 33\
-c9
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-02 7d 14 7e 46 73 05 73 77 fd 1e a2 01 56 57 72\
-17 6a 7d c3 83 58 d3 76 04 56 85 a2 e7 87 c2 3c\
-15 57 6b c1 6b 9f 44 44 02 d6 bf c5 d9 8a 3e 88\
-ea 13 ef 67 c3 53 ec a0 c0 dd ba 92 55 bd 7b 8b\
-b5 0a 64 4a fd fd 1d d5 16 95 b2 52 d2 2e 73 18\
-d1 b6 68 7a 1c 10 ff 75 54 5f 3d b0 fe 60 2d 5f\
-2b 7f 29 4e 36 01 ea b7 b9 d1 ce cd 76 7f 64 69\
-2e 3e 53 6c a2 84 6c b0 c2 dd 48 6a 39 fa 75 b1
-Prime1: \
-01 66 01 e9 26 a0 f8 c9 e2 6e ca b7 69 ea 65 a5\
-e7 c5 2c c9 e0 80 ef 51 94 57 c6 44 da 68 91 c5\
-a1 04 d3 ea 79 55 92 9a 22 e7 c6 8a 7a f9 fc ad\
-77 7c 3c cc 2b 9e 3d 36 50 bc e4 04 39 9b 7e 59\
-d1
-Prime2: \
-01 4e af a1 d4 d0 18 4d a7 e3 1f 87 7d 12 81 dd\
-da 62 56 64 86 9e 83 79 e6 7a d3 b7 5e ae 74 a5\
-80 e9 82 7a bd 6e b7 a0 02 cb 54 11 f5 26 67 97\
-76 8f b8 e9 5a e4 0e 3e 8a 01 f3 5f f8 9e 56 c0\
-79
-ModPrime1PrivateExponent: \
-e2 47 cc e5 04 93 9b 8f 0a 36 09 0d e2 00 93 87\
-55 e2 44 4b 29 53 9a 7d a7 a9 02 f6 05 68 35 c0\
-db 7b 52 55 94 97 cf e2 c6 1a 80 86 d0 21 3c 47\
-2c 78 85 18 00 b1 71 f6 40 1d e2 e9 c2 75 6f 31
-ModPrime2PrivateExponent: \
-b1 2f ba 75 78 55 e5 86 e4 6f 64 c3 8a 70 c6 8b\
-3f 54 8d 93 d7 87 b3 99 99 9d 4c 8f 0b bd 25 81\
-c2 1e 19 ed 00 18 a6 d5 d3 df 86 42 4b 3a bc ad\
-40 19 9d 31 49 5b 61 30 9f 27 c1 bf 55 d4 87 c1
-MultiplicativeInverseOfPrime2ModPrime1: \
-56 4b 1e 1f a0 03 bd a9 1e 89 09 04 25 aa c0 5b\
-91 da 9e e2 50 61 e7 62 8d 5f 51 30 4a 84 99 2f\
-dc 33 76 2b d3 78 a5 9f 03 0a 33 4d 53 2b d0 da\
-e8 f2 98 ea 9e d8 44 63 6a d5 fb 8c bd c0 3c ad
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 2.1
-Message: \
-da ba 03 20 66 26 3f ae db 65 98 48 11 52 78 a5\
-2c 44 fa a3 a7 6f 37 51 5e d3 36 32 10 72 c4 0a\
-9d 9b 53 bc 05 01 40 78 ad f5 20 87 51 46 aa e7\
-0f f0 60 22 6d cb 7b 1f 1f c2 7e 93 60
-Salt: \
-57 bf 16 0b cb 02 bb 1d c7 28 0c f0 45 85 30 b7\
-d2 83 2f f7
-Signature: \
-01 4c 5b a5 33 83 28 cc c6 e7 a9 0b f1 c0 ab 3f\
-d6 06 ff 47 96 d3 c1 2e 4b 63 9e d9 13 6a 5f ec\
-6c 16 d8 88 4b dd 99 cf dc 52 14 56 b0 74 2b 73\
-68 68 cf 90 de 09 9a db 8d 5f fd 1d ef f3 9b a4\
-00 7a b7 46 ce fd b2 2d 7d f0 e2 25 f5 46 27 dc\
-65 46 61 31 72 1b 90 af 44 53 63 a8 35 8b 9f 60\
-76 42 f7 8f ab 0a b0 f4 3b 71 68 d6 4b ae 70 d8\
-82 78 48 d8 ef 1e 42 1c 57 54 dd f4 2c 25 89 b5\
-b3
-Test: Verify
-Comment: RSASSA-PSS Signature Example 2.2
-Message: \
-e4 f8 60 1a 8a 6d a1 be 34 44 7c 09 59 c0 58 57\
-0c 36 68 cf d5 1d d5 f9 cc d6 ad 44 11 fe 82 13\
-48 6d 78 a6 c4 9f 93 ef c2 ca 22 88 ce bc 2b 9b\
-60 bd 04 b1 e2 20 d8 6e 3d 48 48 d7 09 d0 32 d1\
-e8 c6 a0 70 c6 af 9a 49 9f cf 95 35 4b 14 ba 61\
-27 c7 39 de 1b b0 fd 16 43 1e 46 93 8a ec 0c f8\
-ad 9e b7 2e 83 2a 70 35 de 9b 78 07 bd c0 ed 8b\
-68 eb 0f 5a c2 21 6b e4 0c e9 20 c0 db 0e dd d3\
-86 0e d7 88 ef ac ca ca 50 2d 8f 2b d6 d1 a7 c1\
-f4 1f f4 6f 16 81 c8 f1 f8 18 e9 c4 f6 d9 1a 0c\
-78 03 cc c6 3d 76 a6 54 4d 84 3e 08 4e 36 3b 8a\
-cc 55 aa 53 17 33 ed b5 de e5 b5 19 6e 9f 03 e8\
-b7 31 b3 77 64 28 d9 e4 57 fe 3f bc b3 db 72 74\
-44 2d 78 58 90 e9 cb 08 54 b6 44 4d ac e7 91 d7\
-27 3d e1 88 97 19 33 8a 77 fe
-Salt: \
-7f 6d d3 59 e6 04 e6 08 70 e8 98 e4 7b 19 bf 2e\
-5a 7b 2a 90
-Signature: \
-01 09 91 65 6c ca 18 2b 7f 29 d2 db c0 07 e7 ae\
-0f ec 15 8e b6 75 9c b9 c4 5c 5f f8 7c 76 35 dd\
-46 d1 50 88 2f 4d e1 e9 ae 65 e7 f7 d9 01 8f 68\
-36 95 4a 47 c0 a8 1a 8a 6b 6f 83 f2 94 4d 60 81\
-b1 aa 7c 75 9b 25 4b 2c 34 b6 91 da 67 cc 02 26\
-e2 0b 2f 18 b4 22 12 76 1d cd 4b 90 8a 62 b3 71\
-b5 91 8c 57 42 af 4b 53 7e 29 69 17 67 4f b9 14\
-19 47 61 62 1c c1 9a 41 f6 fb 95 3f bc bb 64 9d\
-ea
-Test: Verify
-Comment: RSASSA-PSS Signature Example 2.3
-Message: \
-52 a1 d9 6c 8a c3 9e 41 e4 55 80 98 01 b9 27 a5\
-b4 45 c1 0d 90 2a 0d cd 38 50 d2 2a 66 d2 bb 07\
-03 e6 7d 58 67 11 45 95 aa bf 5a 7a eb 5a 8f 87\
-03 4b bb 30 e1 3c fd 48 17 a9 be 76 23 00 23 60\
-6d 02 86 a3 fa f8 a4 d2 2b 72 8e c5 18 07 9f 9e\
-64 52 6e 3a 0c c7 94 1a a3 38 c4 37 99 7c 68 0c\
-ca c6 7c 66 bf a1
-Salt: \
-fc a8 62 06 8b ce 22 46 72 4b 70 8a 05 19 da 17\
-e6 48 68 8c
-Signature: \
-00 7f 00 30 01 8f 53 cd c7 1f 23 d0 36 59 fd e5\
-4d 42 41 f7 58 a7 50 b4 2f 18 5f 87 57 85 20 c3\
-07 42 af d8 43 59 b6 e6 e8 d3 ed 95 9d c6 fe 48\
-6b ed c8 e2 cf 00 1f 63 a7 ab e1 62 56 a1 b8 4d\
-f0 d2 49 fc 05 d3 19 4c e5 f0 91 27 42 db bf 80\
-dd 17 4f 6c 51 f6 ba d7 f1 6c f3 36 4e ba 09 5a\
-06 26 7d c3 79 38 03 ac 75 26 ae be 0a 47 5d 38\
-b8 c2 24 7a b5 1c 48 98 df 70 47 dc 6a df 52 c6\
-c4
-Test: Verify
-Comment: RSASSA-PSS Signature Example 2.4
-Message: \
-a7 18 2c 83 ac 18 be 65 70 a1 06 aa 9d 5c 4e 3d\
-bb d4 af ae b0 c6 0c 4a 23 e1 96 9d 79 ff
-Salt: \
-80 70 ef 2d e9 45 c0 23 87 68 4b a0 d3 30 96 73\
-22 35 d4 40
-Signature: \
-00 9c d2 f4 ed be 23 e1 23 46 ae 8c 76 dd 9a d3\
-23 0a 62 07 61 41 f1 6c 15 2b a1 85 13 a4 8e f6\
-f0 10 e0 e3 7f d3 df 10 a1 ec 62 9a 0c b5 a3 b5\
-d2 89 30 07 29 8c 30 93 6a 95 90 3b 6b a8 55 55\
-d9 ec 36 73 a0 61 08 fd 62 a2 fd a5 6d 1c e2 e8\
-5c 4d b6 b2 4a 81 ca 3b 49 6c 36 d4 fd 06 eb 7c\
-91 66 d8 e9 48 77 c4 2b ea 62 2b 3b fe 92 51 fd\
-c2 1d 8d 53 71 ba da d7 8a 48 82 14 79 63 35 b4\
-0b
-Test: Verify
-Comment: RSASSA-PSS Signature Example 2.5
-Message: \
-86 a8 3d 4a 72 ee 93 2a 4f 56 30 af 65 79 a3 86\
-b7 8f e8 89 99 e0 ab d2 d4 90 34 a4 bf c8 54 dd\
-94 f1 09 4e 2e 8c d7 a1 79 d1 95 88 e4 ae fc 1b\
-1b d2 5e 95 e3 dd 46 1f
-Salt: \
-17 63 9a 4e 88 d7 22 c4 fc a2 4d 07 9a 8b 29 c3\
-24 33 b0 c9
-Signature: \
-00 ec 43 08 24 93 1e bd 3b aa 43 03 4d ae 98 ba\
-64 6b 8c 36 01 3d 16 71 c3 cf 1c f8 26 0c 37 4b\
-19 f8 e1 cc 8d 96 50 12 40 5e 7e 9b f7 37 86 12\
-df cc 85 fc e1 2c da 11 f9 50 bd 0b a8 87 67 40\
-43 6c 1d 25 95 a6 4a 1b 32 ef cf b7 4a 21 c8 73\
-b3 cc 33 aa f4 e3 dc 39 53 de 67 f0 67 4c 04 53\
-b4 fd 9f 60 44 06 d4 41 b8 16 09 8c b1 06 fe 34\
-72 bc 25 1f 81 5f 59 db 2e 43 78 a3 ad dc 18 1e\
-cf
-Test: Verify
-Comment: RSASSA-PSS Signature Example 2.6
-Message: \
-04 9f 91 54 d8 71 ac 4a 7c 7a b4 53 25 ba 75 45\
-a1 ed 08 f7 05 25 b2 66 7c f1
-Salt: \
-37 81 0d ef 10 55 ed 92 2b 06 3d f7 98 de 5d 0a\
-ab f8 86 ee
-Signature: \
-00 47 5b 16 48 f8 14 a8 dc 0a bd c3 7b 55 27 f5\
-43 b6 66 bb 6e 39 d3 0e 5b 49 d3 b8 76 dc cc 58\
-ea c1 4e 32 a2 d5 5c 26 16 01 44 56 ad 2f 24 6f\
-c8 e3 d5 60 da 3d df 37 9a 1c 0b d2 00 f1 02 21\
-df 07 8c 21 9a 15 1b c8 d4 ec 9d 2f c2 56 44 67\
-81 10 14 ef 15 d8 ea 01 c2 eb bf f8 c2 c8 ef ab\
-38 09 6e 55 fc be 32 85 c7 aa 55 88 51 25 4f af\
-fa 92 c1 c7 2b 78 75 86 63 ef 45 82 84 31 39 d7\
-a6
-Test: Verify
-Comment: Example 3: A 1026-bit RSA Key Pair
-Modulus: \
-02 f2 46 ef 45 1e d3 ee bb 9a 31 02 00 cc 25 85\
-9c 04 8e 4b e7 98 30 29 91 11 2e b6 8c e6 db 67\
-4e 28 0d a2 1f ed ed 1a e7 48 80 ca 52 2b 18 db\
-24 93 85 01 28 27 c5 15 f0 e4 66 a1 ff a6 91 d9\
-81 70 57 4e 9d 0e ad b0 87 58 6c a4 89 33 da 3c\
-c9 53 d9 5b d0 ed 50 de 10 dd cb 67 36 10 7d 6c\
-83 1c 7f 66 3e 83 3c a4 c0 97 e7 00 ce 0f b9 45\
-f8 8f b8 5f e8 e5 a7 73 17 25 65 b9 14 a4 71 a4\
-43
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-65 14 51 73 3b 56 de 5a c0 a6 89 a4 ae b6 e6 89\
-4a 69 01 4e 07 6c 88 dd 7a 66 7e ab 32 32 bb cc\
-d2 fc 44 ba 2f a9 c3 1d b4 6f 21 ed d1 fd b2 3c\
-5c 12 8a 5d a5 ba b9 1e 7f 95 2b 67 75 9c 7c ff\
-70 54 15 ac 9f a0 90 7c 7c a6 17 8f 66 8f b9 48\
-d8 69 da 4c c3 b7 35 6f 40 08 df d5 44 9d 32 ee\
-02 d9 a4 77 eb 69 fc 29 26 6e 5d 90 70 51 23 75\
-a5 0f bb cc 27 e2 38 ad 98 42 5f 6e bb f8 89 91
-Prime1: \
-01 bd 36 e1 8e ce 4b 0f db 2e 9c 9d 54 8b d1 a7\
-d6 e2 c2 1c 6f dc 35 07 4a 1d 05 b1 c6 c8 b3 d5\
-58 ea 26 39 c9 a9 a4 21 68 01 69 31 72 52 55 8b\
-d1 48 ad 21 5a ac 55 0e 2d cf 12 a8 2d 0e bf e8\
-53
-Prime2: \
-01 b1 b6 56 ad 86 d8 e1 9d 5d c8 62 92 b3 a1 92\
-fd f6 e0 dd 37 87 7b ad 14 82 2f a0 01 90 ca b2\
-65 f9 0d 3f 02 05 7b 6f 54 d6 ec b1 44 91 e5 ad\
-ea ce bc 48 bf 0e bd 2a 2a d2 6d 40 2e 54 f6 16\
-51
-ModPrime1PrivateExponent: \
-1f 27 79 fd 2e 3e 5e 6b ae 05 53 95 18 fb a0 cd\
-0e ad 1a a4 51 3a 7c ba 18 f1 cf 10 e3 f6 81 95\
-69 3d 27 8a 0f 0e e7 2f 89 f9 bc 76 0d 80 e2 f9\
-d0 26 1d 51 65 01 c6 ae 39 f1 4a 47 6c e2 cc f5
-ModPrime2PrivateExponent: \
-01 1a 0d 36 79 4b 04 a8 54 aa b4 b2 46 2d 43 9a\
-50 46 c9 1d 94 0b 2b c6 f7 5b 62 95 6f ef 35 a2\
-a6 e6 3c 53 09 81 7f 30 7b bf f9 d5 9e 7e 33 1b\
-d3 63 f6 d6 68 49 b1 83 46 ad ea 16 9f 0a e9 ae\
-c1
-MultiplicativeInverseOfPrime2ModPrime1: \
-0b 30 f0 ec f5 58 75 2f b3 a6 ce 4b a2 b8 c6 75\
-f6 59 eb a6 c3 76 58 5a 1b 39 71 2d 03 8a e3 d2\
-b4 6f cb 41 8a e1 5d 09 05 da 64 40 e1 51 3a 30\
-b9 b7 d6 66 8f bc 5e 88 e5 ab 7a 17 5e 73 ba 35
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 3.1
-Message: \
-59 4b 37 33 3b bb 2c 84 52 4a 87 c1 a0 1f 75 fc\
-ec 0e 32 56 f1 08 e3 8d ca 36 d7 0d 00 57
-Salt: \
-f3 1a d6 c8 cf 89 df 78 ed 77 fe ac bc c2 f8 b0\
-a8 e4 cf aa
-Signature: \
-00 88 b1 35 fb 17 94 b6 b9 6c 4a 3e 67 81 97 f8\
-ca c5 2b 64 b2 fe 90 7d 6f 27 de 76 11 24 96 4a\
-99 a0 1a 88 27 40 ec fa ed 6c 01 a4 74 64 bb 05\
-18 23 13 c0 13 38 a8 cd 09 72 14 cd 68 ca 10 3b\
-d5 7d 3b c9 e8 16 21 3e 61 d7 84 f1 82 46 7a bf\
-8a 01 cf 25 3e 99 a1 56 ea a8 e3 e1 f9 0e 3c 6e\
-4e 3a a2 d8 3e d0 34 5b 89 fa fc 9c 26 07 7c 14\
-b6 ac 51 45 4f a2 6e 44 6e 3a 2f 15 3b 2b 16 79\
-7f
-Test: Verify
-Comment: RSASSA-PSS Signature Example 3.2
-Message: \
-8b 76 95 28 88 4a 0d 1f fd 09 0c f1 02 99 3e 79\
-6d ad cf bd dd 38 e4 4f f6 32 4c a4 51
-Salt: \
-fc f9 f0 e1 f1 99 a3 d1 d0 da 68 1c 5b 86 06 fc\
-64 29 39 f7
-Signature: \
-02 a5 f0 a8 58 a0 86 4a 4f 65 01 7a 7d 69 45 4f\
-3f 97 3a 29 99 83 9b 7b bc 48 bf 78 64 11 69 17\
-95 56 f5 95 fa 41 f6 ff 18 e2 86 c2 78 30 79 bc\
-09 10 ee 9c c3 4f 49 ba 68 11 24 f9 23 df a8 8f\
-42 61 41 a3 68 a5 f5 a9 30 c6 28 c2 c3 c2 00 e1\
-8a 76 44 72 1a 0c be c6 dd 3f 62 79 bd e3 e8 f2\
-be 5e 2d 4e e5 6f 97 e7 ce af 33 05 4b e7 04 2b\
-d9 1a 63 bb 09 f8 97 bd 41 e8 11 97 de e9 9b 11\
-af
-Test: Verify
-Comment: RSASSA-PSS Signature Example 3.3
-Message: \
-1a bd ba 48 9c 5a da 2f 99 5e d1 6f 19 d5 a9 4d\
-9e 6e c3 4a 8d 84 f8 45 57 d2 6e 5e f9 b0 2b 22\
-88 7e 3f 9a 4b 69 0a d1 14 92 09 c2 0c 61 43 1f\
-0c 01 7c 36 c2 65 7b 35 d7 b0 7d 3f 5a d8 70 85\
-07 a9 c1 b8 31 df 83 5a 56 f8 31 07 18 14 ea 5d\
-3d 8d 8f 6a de 40 cb a3 8b 42 db 7a 2d 3d 7a 29\
-c8 f0 a7 9a 78 38 cf 58 a9 75 7f a2 fe 4c 40 df\
-9b aa 19 3b fc 6f 92 b1 23 ad 57 b0 7a ce 3e 6a\
-c0 68 c9 f1 06 af d9 ee b0 3b 4f 37 c2 5d bf bc\
-fb 30 71 f6 f9 77 17 66 d0 72 f3 bb 07 0a f6 60\
-55 32 97 3a e2 50 51
-Salt: \
-98 6e 7c 43 db b6 71 bd 41 b9 a7 f4 b6 af c8 0e\
-80 5f 24 23
-Signature: \
-02 44 bc d1 c8 c1 69 55 73 6c 80 3b e4 01 27 2e\
-18 cb 99 08 11 b1 4f 72 db 96 41 24 d5 fa 76 06\
-49 cb b5 7a fb 87 55 db b6 2b f5 1f 46 6c f2 3a\
-0a 16 07 57 6e 98 3d 77 8f ce ff a9 2d f7 54 8a\
-ea 8e a4 ec ad 2c 29 dd 9f 95 bc 07 fe 91 ec f8\
-be e2 55 bf e8 76 2f d7 69 0a a9 bf a4 fa 08 49\
-ef 72 8c 2c 42 c4 53 23 64 52 2d f2 ab 7f 9f 8a\
-03 b6 3f 7a 49 91 75 82 86 68 f5 ef 5a 29 e3 80\
-2c
-Test: Verify
-Comment: RSASSA-PSS Signature Example 3.4
-Message: \
-8f b4 31 f5 ee 79 2b 6c 2a c7 db 53 cc 42 86 55\
-ae b3 2d 03 f4 e8 89 c5 c2 5d e6 83 c4 61 b5 3a\
-cf 89 f9 f8 d3 aa bd f6 b9 f0 c2 a1 de 12 e1 5b\
-49 ed b3 91 9a 65 2f e9 49 1c 25 a7 fc e1 f7 22\
-c2 54 36 08 b6 9d c3 75 ec
-Salt: \
-f8 31 2d 9c 8e ea 13 ec 0a 4c 7b 98 12 0c 87 50\
-90 87 c4 78
-Signature: \
-01 96 f1 2a 00 5b 98 12 9c 8d f1 3c 4c b1 6f 8a\
-a8 87 d3 c4 0d 96 df 3a 88 e7 53 2e f3 9c d9 92\
-f2 73 ab c3 70 bc 1b e6 f0 97 cf eb bf 01 18 fd\
-9e f4 b9 27 15 5f 3d f2 2b 90 4d 90 70 2d 1f 7b\
-a7 a5 2b ed 8b 89 42 f4 12 cd 7b d6 76 c9 d1 8e\
-17 03 91 dc d3 45 c0 6a 73 09 64 b3 f3 0b cc e0\
-bb 20 ba 10 6f 9a b0 ee b3 9c f8 a6 60 7f 75 c0\
-34 7f 0a f7 9f 16 af a0 81 d2 c9 2d 1e e6 f8 36\
-b8
-Test: Verify
-Comment: RSASSA-PSS Signature Example 3.5
-Message: \
-fe f4 16 1d fa af 9c 52 95 05 1d fc 1f f3 81 0c\
-8c 9e c2 e8 66 f7 07 54 22 c8 ec 42 16 a9 c4 ff\
-49 42 7d 48 3c ae 10 c8 53 4a 41 b2 fd 15 fe e0\
-69 60 ec 6f b3 f7 a7 e9 4a 2f 8a 2e 3e 43 dc 4a\
-40 57 6c 30 97 ac 95 3b 1d e8 6f 0b 4e d3 6d 64\
-4f 23 ae 14 42 55 29 62 24 64 ca 0c bf 0b 17 41\
-34 72 38 15 7f ab 59 e4 de 55 24 09 6d 62 ba ec\
-63 ac 64
-Salt: \
-50 32 7e fe c6 29 2f 98 01 9f c6 7a 2a 66 38 56\
-3e 9b 6e 2d
-Signature: \
-02 1e ca 3a b4 89 22 64 ec 22 41 1a 75 2d 92 22\
-10 76 d4 e0 1c 0e 6f 0d de 9a fd 26 ba 5a cf 6d\
-73 9e f9 87 54 5d 16 68 3e 56 74 c9 e7 0f 1d e6\
-49 d7 e6 1d 48 d0 ca eb 4f b4 d8 b2 4f ba 84 a6\
-e3 10 8f ee 7d 07 05 97 32 66 ac 52 4b 4a d2 80\
-f7 ae 17 dc 59 d9 6d 33 51 58 6b 5a 3b db 89 5d\
-1e 1f 78 20 ac 61 35 d8 75 34 80 99 83 82 ba 32\
-b7 34 95 59 60 8c 38 74 52 90 a8 5e f4 e9 f9 bd\
-83
-Test: Verify
-Comment: RSASSA-PSS Signature Example 3.6
-Message: \
-ef d2 37 bb 09 8a 44 3a ee b2 bf 6c 3f 8c 81 b8\
-c0 1b 7f cb 3f eb
-Salt: \
-b0 de 3f c2 5b 65 f5 af 96 b1 d5 cc 3b 27 d0 c6\
-05 30 87 b3
-Signature: \
-01 2f af ec 86 2f 56 e9 e9 2f 60 ab 0c 77 82 4f\
-42 99 a0 ca 73 4e d2 6e 06 44 d5 d2 22 c7 f0 bd\
-e0 39 64 f8 e7 0a 5c b6 5e d4 4e 44 d5 6a e0 ed\
-f1 ff 86 ca 03 2c c5 dd 44 04 db b7 6a b8 54 58\
-6c 44 ee d8 33 6d 08 d4 57 ce 6c 03 69 3b 45 c0\
-f1 ef ef 93 62 4b 95 b8 ec 16 9c 61 6d 20 e5 53\
-8e bc 0b 67 37 a6 f8 2b 4b c0 57 09 24 fc 6b 35\
-75 9a 33 48 42 62 79 f8 b3 d7 74 4e 2d 22 24 26\
-ce
-Test: Verify
-Comment: Example 4: A 1027-bit RSA Key Pair
-Modulus: \
-05 4a db 78 86 44 7e fe 6f 57 e0 36 8f 06 cf 52\
-b0 a3 37 07 60 d1 61 ce f1 26 b9 1b e7 f8 9c 42\
-1b 62 a6 ec 1d a3 c3 11 d7 5e d5 0e 0a b5 ff f3\
-fd 33 8a cc 3a a8 a4 e7 7e e2 63 69 ac b8 1b a9\
-00 fa 83 f5 30 0c f9 bb 6c 53 ad 1d c8 a1 78 b8\
-15 db 42 35 a9 a9 da 0c 06 de 4e 61 5e a1 27 7c\
-e5 59 e9 c1 08 de 58 c1 4a 81 aa 77 f5 a6 f8 d1\
-33 54 94 49 88 48 c8 b9 59 40 74 0b e7 bf 7c 37\
-05
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-fa 04 1f 8c d9 69 7c ee d3 8e c8 ca a2 75 52 3b\
-4d d7 2b 09 a3 01 d3 54 1d 72 f5 d3 1c 05 cb ce\
-2d 69 83 b3 61 83 af 10 69 0b d4 6c 46 13 1e 35\
-78 94 31 a5 56 77 1d d0 04 9b 57 46 1b f0 60 c1\
-f6 84 72 e8 a6 7c 25 f3 57 e5 b6 b4 73 8f a5 41\
-a7 30 34 6b 4a 07 64 9a 2d fa 80 6a 69 c9 75 b6\
-ab a6 46 78 ac c7 f5 91 3e 89 c6 22 f2 d8 ab b1\
-e3 e3 25 54 e3 9d f9 4b a6 0c 00 2e 38 7d 90 11
-Prime1: \
-02 92 32 33 6d 28 38 94 5d ba 9d d7 72 3f 4e 62\
-4a 05 f7 37 5b 92 7a 87 ab e6 a8 93 a1 65 8f d4\
-9f 47 f6 c7 b0 fa 59 6c 65 fa 68 a2 3f 0a b4 32\
-96 2d 18 d4 34 3b d6 fd 67 1a 5e a8 d1 48 41 39\
-95
-Prime2: \
-02 0e f5 ef e7 c5 39 4a ed 22 72 f7 e8 1a 74 f4\
-c0 2d 14 58 94 cb 1b 3c ab 23 a9 a0 71 0a 2a fc\
-7e 33 29 ac bb 74 3d 01 f6 80 c4 d0 2a fb 4c 8f\
-de 7e 20 93 08 11 bb 2b 99 57 88 b5 e8 72 c2 0b\
-b1
-ModPrime1PrivateExponent: \
-02 6e 7e 28 01 0e cf 24 12 d9 52 3a d7 04 64 7f\
-b4 fe 9b 66 b1 a6 81 58 1b 0e 15 55 3a 89 b1 54\
-28 28 89 8f 27 24 3e ba b4 5f f5 e1 ac b9 d4 df\
-1b 05 1f bc 62 82 4d bc 6f 6c 93 26 1a 78 b9 a7\
-59
-ModPrime2PrivateExponent: \
-01 2d dc c8 6e f6 55 99 8c 39 dd ae 11 71 86 69\
-e5 e4 6c f1 49 5b 07 e1 3b 10 14 cd 69 b3 af 68\
-30 4a d2 a6 b6 43 21 e7 8b f3 bb ca 9b b4 94 e9\
-1d 45 17 17 e2 d9 75 64 c6 54 94 65 d0 20 5c f4\
-21
-MultiplicativeInverseOfPrime2ModPrime1: \
-01 06 00 c4 c2 18 47 45 9f e5 76 70 3e 2e be ca\
-e8 a5 09 4e e6 3f 53 6b f4 ac 68 d3 c1 3e 5e 4f\
-12 ac 5c c1 0a b6 a2 d0 5a 19 92 14 d1 82 47 47\
-d5 51 90 96 36 b7 74 c2 2c ac 0b 83 75 99 ab cc\
-75
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 4.1
-Message: \
-9f b0 3b 82 7c 82 17 d9
-Salt: \
-ed 7c 98 c9 5f 30 97 4f be 4f bd dc f0 f2 8d 60\
-21 c0 e9 1d
-Signature: \
-03 23 d5 b7 bf 20 ba 45 39 28 9a e4 52 ae 42 97\
-08 0f ef f4 51 84 23 ff 48 11 a8 17 83 7e 7d 82\
-f1 83 6c df ab 54 51 4f f0 88 7b dd ee bf 40 bf\
-99 b0 47 ab c3 ec fa 6a 37 a3 ef 00 f4 a0 c4 a8\
-8a ae 09 04 b7 45 c8 46 c4 10 7e 87 97 72 3e 8a\
-c8 10 d9 e3 d9 5d fa 30 ff 49 66 f4 d7 5d 13 76\
-8d 20 85 7f 2b 14 06 f2 64 cf e7 5e 27 d7 65 2f\
-4b 5e d3 57 5f 28 a7 02 f8 c4 ed 9c f9 b2 d4 49\
-48
-Test: Verify
-Comment: RSASSA-PSS Signature Example 4.2
-Message: \
-0c a2 ad 77 79 7e ce 86 de 5b f7 68 75 0d db 5e\
-d6 a3 11 6a d9 9b bd 17 ed f7 f7 82 f0 db 1c d0\
-5b 0f 67 74 68 c5 ea 42 0d c1 16 b1 0e 80 d1 10\
-de 2b 04 61 ea 14 a3 8b e6 86 20 39 2e 7e 89 3c\
-b4 ea 93 93 fb 88 6c 20 ff 79 06 42 30 5b f3 02\
-00 38 92 e5 4d f9 f6 67 50 9d c5 39 20 df 58 3f\
-50 a3 dd 61 ab b6 fa b7 5d 60 03 77 e3 83 e6 ac\
-a6 71 0e ee a2 71 56 e0 67 52 c9 4c e2 5a e9 9f\
-cb f8 59 2d be 2d 7e 27 45 3c b4 4d e0 71 00 eb\
-b1 a2 a1 98 11 a4 78 ad be ab 27 0f 94 e8 fe 36\
-9d 90 b3 ca 61 2f 9f
-Salt: \
-22 d7 1d 54 36 3a 42 17 aa 55 11 3f 05 9b 33 84\
-e3 e5 7e 44
-Signature: \
-04 9d 01 85 84 5a 26 4d 28 fe b1 e6 9e da ec 09\
-06 09 e8 e4 6d 93 ab b3 83 71 ce 51 f4 aa 65 a5\
-99 bd aa a8 1d 24 fb a6 6a 08 a1 16 cb 64 4f 3f\
-1e 65 3d 95 c8 9d b8 bb d5 da ac 27 09 c8 98 40\
-00 17 84 10 a7 c6 aa 86 67 dd c3 8c 74 1f 71 0e\
-c8 66 5a a9 05 2b e9 29 d4 e3 b1 67 82 c1 66 21\
-14 c5 41 4b b0 35 34 55 c3 92 fc 28 f3 db 59 05\
-4b 5f 36 5c 49 e1 d1 56 f8 76 ee 10 cb 4f d7 05\
-98
-Test: Verify
-Comment: RSASSA-PSS Signature Example 4.3
-Message: \
-28 80 62 af c0 8f cd b7 c5 f8 65 0b 29 83 73 00\
-46 1d d5 67 6c 17 a2 0a 3c 8f b5 14 89 49 e3 f7\
-3d 66 b3 ae 82 c7 24 0e 27 c5 b3 ec 43 28 ee 7d\
-6d df 6a 6a 0c 9b 5b 15 bc da 19 6a 9d 0c 76 b1\
-19 d5 34 d8 5a bd 12 39 62 d5 83 b7 6c e9 d1 80\
-bc e1 ca
-Salt: \
-4a f8 70 fb c6 51 60 12 ca 91 6c 70 ba 86 2a c7\
-e8 24 36 17
-Signature: \
-03 fb c4 10 a2 ce d5 95 00 fb 99 f9 e2 af 27 81\
-ad a7 4e 13 14 56 24 60 27 82 e2 99 48 13 ee fc\
-a0 51 9e cd 25 3b 85 5f b6 26 a9 0d 77 1e ae 02\
-8b 0c 47 a1 99 cb d9 f8 e3 26 97 34 af 41 63 59\
-90 90 71 3a 3f a9 10 fa 09 60 65 27 21 43 2b 97\
-10 36 a7 18 1a 2b c0 ca b4 3b 0b 59 8b c6 21 74\
-61 d7 db 30 5f f7 e9 54 c5 b5 bb 23 1c 39 e7 91\
-af 6b cf a7 6b 14 7b 08 13 21 f7 26 41 48 2a 2a\
-ad
-Test: Verify
-Comment: RSASSA-PSS Signature Example 4.4
-Message: \
-6f 4f 9a b9 50 11 99 ce f5 5c 6c f4 08 fe 7b 36\
-c5 57 c4 9d 42 0a 47 63 d2 46 3c 8a d4 4b 3c fc\
-5b e2 74 2c 0e 7d 9b 0f 66 08 f0 8c 7f 47 b6 93\
-ee
-Salt: \
-40 d2 e1 80 fa e1 ea c4 39 c1 90 b5 6c 2c 0e 14\
-dd f9 a2 26
-Signature: \
-04 86 64 4b c6 6b f7 5d 28 33 5a 61 79 b1 08 51\
-f4 3f 09 bd ed 9f ac 1a f3 32 52 bb 99 53 ba 42\
-98 cd 64 66 b2 75 39 a7 0a da a3 f8 9b 3d b3 c7\
-4a b6 35 d1 22 f4 ee 7c e5 57 a6 1e 59 b8 2f fb\
-78 66 30 e5 f9 db 53 c7 7d 9a 0c 12 fa b5 95 8d\
-4c 2c e7 da a8 07 cd 89 ba 2c c7 fc d0 2f f4 70\
-ca 67 b2 29 fc ce 81 4c 85 2c 73 cc 93 be a3 5b\
-e6 84 59 ce 47 8e 9d 46 55 d1 21 c8 47 2f 37 1d\
-4f
-Test: Verify
-Comment: RSASSA-PSS Signature Example 4.5
-Message: \
-e1 7d 20 38 5d 50 19 55 82 3c 3f 66 62 54 c1 d3\
-dd 36 ad 51 68 b8 f1 8d 28 6f dc f6 7a 7d ad 94\
-09 70 85 fa b7 ed 86 fe 21 42 a2 87 71 71 79 97\
-ef 1a 7a 08 88 4e fc 39 35 6d 76 07 7a af 82 45\
-9a 7f ad 45 84 88 75 f2 81 9b 09 89 37 fe 92 3b\
-cc 9d c4 42 d7 2d 75 4d 81 20 25 09 0c 9b c0 3d\
-b3 08 0c 13 8d d6 3b 35 5d 0b 4b 85 d6 68 8a c1\
-9f 4d e1 50 84 a0 ba 4e 37 3b 93 ef 4a 55 50 96\
-69 19 15 dc 23 c0 0e 95 4c de b2 0a 47 cd 55 d1\
-6c 3d 86 81 d4 6e d7 f2 ed 5e a4 27 95 be 17 ba\
-ed 25 f0 f4 d1 13 b3 63 6a dd d5 85 f1 6a 8b 5a\
-ec 0c 8f a9 c5 f0 3c bf 3b 9b 73
-Salt: \
-24 97 dc 2b 46 15 df ae 5a 66 3d 49 ff d5 6b f7\
-ef c1 13 04
-Signature: \
-02 2a 80 04 53 53 90 4c b3 0c bb 54 2d 7d 49 90\
-42 1a 6e ec 16 a8 02 9a 84 22 ad fd 22 d6 af f8\
-c4 cc 02 94 af 11 0a 0c 06 7e c8 6a 7d 36 41 34\
-45 9b b1 ae 8f f8 36 d5 a8 a2 57 98 40 99 6b 32\
-0b 19 f1 3a 13 fa d3 78 d9 31 a6 56 25 da e2 73\
-9f 0c 53 67 0b 35 d9 d3 cb ac 08 e7 33 e4 ec 2b\
-83 af 4b 91 96 d6 3e 7c 4f f1 dd ea e2 a1 22 79\
-1a 12 5b fe a8 de b0 de 8c cf 1f 4f fa f6 e6 fb\
-0a
-Test: Verify
-Comment: RSASSA-PSS Signature Example 4.6
-Message: \
-af bc 19 d4 79 24 90 18 fd f4 e0 9f 61 87 26 44\
-04 95 de 11 dd ee e3 88 72 d7 75 fc ea 74 a2 38\
-96 b5 34 3c 9c 38 d4 6a f0 db a2 24 d0 47 58 0c\
-c6 0a 65 e9 39 1c f9 b5 9b 36 a8 60 59 8d 4e 82\
-16 72 2f 99 3b 91 cf ae 87 bc 25 5a f8 9a 6a 19\
-9b ca 4a 39 1e ad bc 3a 24 90 3c 0b d6 67 36 8f\
-6b e7 8e 3f ea bf b4 ff d4 63 12 27 63 74 0f fb\
-be fe ab 9a 25 56 4b c5 d1 c2 4c 93 e4 22 f7 50\
-73 e2 ad 72 bf 45 b1 0d f0 0b 52 a1 47 12 8e 73\
-fe e3 3f a3 f0 57 7d 77 f8 0f bc 2d f1 be d3 13\
-29 0c 12 77 7f 50
-Salt: \
-a3 34 db 6f ae bf 11 08 1a 04 f8 7c 2d 62 1c de\
-c7 93 0b 9b
-Signature: \
-00 93 8d cb 6d 58 30 46 06 5f 69 c7 8d a7 a1 f1\
-75 70 66 a7 fa 75 12 5a 9d 29 29 f0 b7 9a 60 b6\
-27 b0 82 f1 1f 5b 19 6f 28 eb 9d aa 6f 21 c0 5e\
-51 40 f6 ae f1 73 7d 20 23 07 5c 05 ec f0 4a 02\
-8c 68 6a 2a b3 e7 d5 a0 66 4f 29 5c e1 29 95 e8\
-90 90 8b 6a d2 1f 08 39 eb 65 b7 03 93 a7 b5 af\
-d9 87 1d e0 ca a0 ce de c5 b8 19 62 67 56 20 9d\
-13 ab 1e 7b b9 54 6a 26 ff 37 e9 a5 1a f9 fd 56\
-2e
-Test: Verify
-Comment: Example 5: A 1028-bit RSA Key Pair
-Modulus: \
-0d 10 f6 61 f2 99 40 f5 ed 39 aa 26 09 66 de b4\
-78 43 67 9d 2b 6f b2 5b 3d e3 70 f3 ac 7c 19 91\
-63 91 fd 25 fb 52 7e bf a6 a4 b4 df 45 a1 75 9d\
-99 6c 4b b4 eb d1 88 28 c4 4f c5 2d 01 91 87 17\
-40 52 5f 47 a4 b0 cc 8d a3 25 ed 8a a6 76 b0 d0\
-f6 26 e0 a7 7f 07 69 21 70 ac ac 80 82 f4 2f aa\
-7d c7 cd 12 3e 73 0e 31 a8 79 85 20 4c ab cb e6\
-67 0d 43 a2 dd 2b 2d de f5 e0 53 92 fc 21 3b c5\
-07
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-03 ce 08 b1 04 ff f3 96 a9 79 bd 3e 4e 46 92 5b\
-63 19 dd b6 3a cb cf d8 19 f1 7d 16 b8 07 7b 3a\
-87 10 1f f3 4b 77 fe 48 b8 b2 05 a9 6e 91 51 ba\
-8e ce a6 4d 0c ce 7b 23 c3 e6 a6 b8 30 58 bc 49\
-da e8 16 ae 73 6d b5 a4 70 8e 2a d4 35 23 2b 56\
-7f 90 96 ce 59 ff 28 06 1e 79 ab 1c 02 d7 17 e6\
-b2 3c ea 6d b8 eb 51 92 fa 7c 1e ab 22 7d ba 74\
-62 1c 45 60 18 96 ee f1 37 92 c8 44 0b eb 15 aa\
-c1
-Prime1: \
-03 f2 f3 31 f4 14 2d 4f 24 b4 3a a1 02 79 a8 96\
-52 d4 e7 53 72 21 a1 a7 b2 a2 5d eb 55 1e 5d e9\
-ac 49 74 11 c2 27 a9 4e 45 f9 1c 2d 1c 13 cc 04\
-6c f4 ce 14 e3 2d 05 87 34 21 0d 44 a8 7e e1 b7\
-3f
-Prime2: \
-03 4f 09 0d 73 b5 58 03 03 0c f0 36 1a 5d 80 81\
-bf b7 9f 85 15 23 fe ac 0a 21 24 d0 8d 40 13 ff\
-08 48 77 71 a8 70 d0 47 9d c0 68 6c 62 f7 71 8d\
-fe cf 02 4b 17 c9 26 76 78 05 91 71 33 9c c0 08\
-39
-ModPrime1PrivateExponent: \
-02 aa 66 3a db f5 1a b8 87 a0 18 cb 42 6e 78 bc\
-2f e1 82 dc b2 f7 bc b5 04 41 d1 7f df 0f 06 79\
-8b 50 71 c6 e2 f5 fe b4 d5 4a d8 18 23 11 c1 ef\
-62 d4 c4 9f 18 d1 f5 1f 54 b2 d2 cf fb a4 da 1b\
-e5
-ModPrime2PrivateExponent: \
-02 bb e7 06 07 8b 5c 0b 39 15 12 d4 11 db 1b 19\
-9b 5a 56 64 b8 40 42 ea d3 7f e9 94 ae 72 b9 53\
-2d fb fb 3e 9e 69 81 a0 fb b8 06 51 31 41 b7 c2\
-16 3f e5 6c 39 5e 4b fa ee 57 e3 83 3f 9b 91 8d\
-f9
-MultiplicativeInverseOfPrime2ModPrime1: \
-02 42 b6 cd 00 d3 0a 76 7a ee 9a 89 8e ad 45 3c\
-8e ae a6 3d 50 0b 7d 1e 00 71 3e da e5 1c e3 6b\
-23 b6 64 df 26 e6 3e 26 6e c8 f7 6e 6e 63 ed 1b\
-a4 1e b0 33 b1 20 f7 ea 52 12 ae 21 a9 8f bc 16
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 5.1
-Message: \
-30 c7 d5 57 45 8b 43 6d ec fd c1 4d 06 cb 7b 96\
-b0 67 18 c4 8d 7d e5 74 82 a8 68 ae 7f 06 58 70\
-a6 21 65 06 d1 1b 77 93 23 df df 04 6c f5 77 51\
-29 13 4b 4d 56 89 e4 d9 c0 ce 1e 12 d7 d4 b0 6c\
-b5 fc 58 20 de cf a4 1b af 59 bf 25 7b 32 f0 25\
-b7 67 9b 44 5b 94 99 c9 25 55 14 58 85 99 2f 1b\
-76 f8 48 91 ee 4d 3b e0 f5 15 0f d5 90 1e 3a 4c\
-8e d4 3f d3 6b 61 d0 22 e6 5a d5 00 8d bf 33 29\
-3c 22 bf bf d0 73 21 f0 f1 d5 fa 9f df 00 14 c2\
-fc b0 35 8a ad 0e 35 4b 0d 29
-Salt: \
-08 1b 23 3b 43 56 77 50 bd 6e 78 f3 96 a8 8b 9f\
-6a 44 51 51
-Signature: \
-0b a3 73 f7 6e 09 21 b7 0a 8f bf e6 22 f0 bf 77\
-b2 8a 3d b9 8e 36 10 51 c3 d7 cb 92 ad 04 52 91\
-5a 4d e9 c0 17 22 f6 82 3e eb 6a df 7e 0c a8 29\
-0f 5d e3 e5 49 89 0a c2 a3 c5 95 0a b2 17 ba 58\
-59 08 94 95 2d e9 6f 8d f1 11 b2 57 52 15 da 6c\
-16 15 90 c7 45 be 61 24 76 ee 57 8e d3 84 ab 33\
-e3 ec e9 74 81 a2 52 f5 c7 9a 98 b5 53 2a e0 0c\
-dd 62 f2 ec c0 cd 1b ae fe 80 d8 0b 96 21 93 ec\
-1d
-Test: Verify
-Comment: RSASSA-PSS Signature Example 5.2
-Message: \
-e7 b3 2e 15 56 ea 1b 27 95 04 6a c6 97 39 d2 2a\
-c8 96 6b f1 1c 11 6f 61 4b 16 67 40 e9 6b 90 65\
-3e 57 50 94 5f cf 77 21 86 c0 37 90 a0 7f da 32\
-3e 1a 61 91 6b 06 ee 21 57 db 3d ff 80 d6 7d 5e\
-39 a5 3a e2 68 c8 f0 9e d9 9a 73 20 05 b0 bc 6a\
-04 af 4e 08 d5 7a 00 e7 20 1b 30 60 ef aa db 73\
-11 3b fc 08 7f d8 37 09 3a a2 52 35 b8 c1 49 f5\
-62 15 f0 31 c2 4a d5 bd e7 f2 99 60 df 7d 52 40\
-70 f7 44 9c 6f 78 50 84 be 1a 0f 73 30 47 f3 36\
-f9 15 47 38 67 45 47 db 02 a9 f4 4d fc 6e 60 30\
-10 81 e1 ce 99 84 7f 3b 5b 60 1f f0 6b 4d 57 76\
-a9 74 0b 9a a0 d3 40 58 fd 3b 90 6e 4f 78 59 df\
-b0 7d 71 73 e5 e6 f6 35 0a da c2 1f 27 b2 30 74\
-69
-Salt: \
-bd 0c e1 95 49 d0 70 01 20 cb e5 10 77 db bb b0\
-0a 8d 8b 09
-Signature: \
-08 18 0d e8 25 e4 b8 b0 14 a3 2d a8 ba 76 15 55\
-92 12 04 f2 f9 0d 5f 24 b7 12 90 8f f8 4f 3e 22\
-0a d1 79 97 c0 dd 6e 70 66 30 ba 3e 84 ad d4 d5\
-e7 ab 00 4e 58 07 4b 54 97 09 56 5d 43 ad 9e 97\
-b5 a7 a1 a2 9e 85 b9 f9 0f 4a af cd f5 83 21 de\
-8c 59 74 ef 9a bf 2d 52 6f 33 c0 f2 f8 2e 95 d1\
-58 ea 6b 81 f1 73 6d b8 d1 af 3d 6a c6 a8 3b 32\
-d1 8b ae 0f f1 b2 fe 27 de 4c 76 ed 8c 79 80 a3\
-4e
-Test: Verify
-Comment: RSASSA-PSS Signature Example 5.3
-Message: \
-8d 83 96 e3 65 07 fe 1e f6 a1 90 17 54 8e 0c 71\
-66 74 c2 fe c2 33 ad b2 f7 75 66 5e c4 1f 2b d0\
-ba 39 6b 06 1a 9d aa 7e 86 6f 7c 23 fd 35 31 95\
-43 00 a3 42 f9 24 53 5e a1 49 8c 48 f6 c8 79 93\
-28 65 fc 02 00 0c 52 87 23 b7 ad 03 35 74 5b 51\
-20 9a 0a fe d9 32 af 8f 08 87 c2 19 00 4d 2a bd\
-89 4e a9 25 59 ee 31 98 af 3a 73 4f e9 b9 63 8c\
-26 3a 72 8a d9 5a 5a e8 ce 3e b1 58 39 f3 aa 78\
-52 bb 39 07 06 e7 76 0e 43 a7 12 91 a2 e3 f8 27\
-23 7d ed a8 51 87 4c 51 76 65 f5 45 f2 72 38 df\
-86 55 7f 37 5d 09 cc d8 bd 15 d8 cc f6 1f 5d 78\
-ca 5c 7f 5c de 78 2e 6b f5 d0 05 70 56 d4 ba d9\
-8b 3d 2f 95 75 e8 24 ab 7a 33 ff 57 b0 ac 10 0a\
-b0 d6 ea d7 aa 0b 50 f6 e4 d3 e5 ec 0b 96 6b
-Salt: \
-81 57 79 a9 1b 3a 8b d0 49 bf 2a eb 92 01 42 77\
-22 22 c9 ca
-Signature: \
-05 e0 fd bd f6 f7 56 ef 73 31 85 cc fa 8c ed 2e\
-b6 d0 29 d9 d5 6e 35 56 1b 5d b8 e7 02 57 ee 6f\
-d0 19 d2 f0 bb f6 69 fe 9b 98 21 e7 8d f6 d4 1e\
-31 60 8d 58 28 0f 31 8e e3 4f 55 99 41 c8 df 13\
-28 75 74 ba c0 00 b7 e5 8d c4 f4 14 ba 49 fb 12\
-7f 9d 0f 89 36 63 8c 76 e8 53 56 c9 94 f7 97 50\
-f7 fa 3c f4 fd 48 2d f7 5e 3f b9 97 8c d0 61 f7\
-ab b1 75 72 e6 e6 3e 0b de 12 cb dc f1 8c 68 b9\
-79
-Test: Verify
-Comment: RSASSA-PSS Signature Example 5.4
-Message: \
-32 8c 65 9e 0a 64 37 43 3c ce b7 3c 14
-Salt: \
-9a ec 4a 74 80 d5 bb c4 29 20 d7 ca 23 5d b6 74\
-98 9c 9a ac
-Signature: \
-0b c9 89 85 3b c2 ea 86 87 32 71 ce 18 3a 92 3a\
-b6 5e 8a 53 10 0e 6d f5 d8 7a 24 c4 19 4e b7 97\
-81 3e e2 a1 87 c0 97 dd 87 2d 59 1d a6 0c 56 86\
-05 dd 7e 74 2d 5a f4 e3 3b 11 67 8c cb 63 90 32\
-04 a3 d0 80 b0 90 2c 89 ab a8 86 8f 00 9c 0f 1c\
-0c b8 58 10 bb dd 29 12 1a bb 84 71 ff 2d 39 e4\
-9f d9 2d 56 c6 55 c8 e0 37 ad 18 fa fb dc 92 c9\
-58 63 f7 f6 1e a9 ef a2 8f ea 40 13 69 d1 9d ae\
-a1
-Test: Verify
-Comment: RSASSA-PSS Signature Example 5.5
-Message: \
-f3 7b 96 23 79 a4 7d 41 5a 37 6e ec 89 73 15 0b\
-cb 34 ed d5 ab 65 40 41 b6 14 30 56 0c 21 44 58\
-2b a1 33 c8 67 d8 52 d6 b8 e2 33 21 90 13 02 ec\
-b4 5b 09 ec 88 b1 52 71 78 fa 04 32 63 f3 06 7d\
-9f fe 97 30 32 a9 9f 4c b0 8a d2 c7 e0 a2 45 6c\
-dd 57 a7 df 56 fe 60 53 52 7a 5a eb 67 d7 e5 52\
-06 3c 1c a9 7b 1b ef fa 7b 39 e9 97 ca f2 78 78\
-ea 0f 62 cb eb c8 c2 1d f4 c8 89 a2 02 85 1e 94\
-90 88 49 0c 24 9b 6e 9a cf 1d 80 63 f5 be 23 43\
-98 9b f9 5c 4d a0 1a 2b e7 8b 4a b6 b3 78 01 5b\
-c3 79 57 f7 69 48 b5 e5 8e 44 0c 28 45 3d 40 d7\
-cf d5 7e 7d 69 06 00 47 4a b5 e7 59 73 b1 ea 0c\
-5f 1e 45 d1 41 90 af e2 f4 eb 6d 3b df 71 f1 d2\
-f8 bb 15 6a 1c 29 5d 04 aa eb 9d 68 9d ce 79 ed\
-62 bc 44 3e
-Salt: \
-e2 0c 1e 98 78 51 2c 39 97 0f 58 37 5e 15 49 a6\
-8b 64 f3 1d
-Signature: \
-0a ef a9 43 b6 98 b9 60 9e df 89 8a d2 27 44 ac\
-28 dc 23 94 97 ce a3 69 cb bd 84 f6 5c 95 c0 ad\
-77 6b 59 47 40 16 4b 59 a7 39 c6 ff 7c 2f 07 c7\
-c0 77 a8 6d 95 23 8f e5 1e 1f cf 33 57 4a 4a e0\
-68 4b 42 a3 f6 bf 67 7d 91 82 0c a8 98 74 46 7b\
-2c 23 ad d7 79 69 c8 07 17 43 0d 0e fc 1d 36 95\
-89 2c e8 55 cb 7f 70 11 63 0f 4d f2 6d ef 8d df\
-36 fc 23 90 5f 57 fa 62 43 a4 85 c7 70 d5 68 1f\
-cd
-Test: Verify
-Comment: RSASSA-PSS Signature Example 5.6
-Message: \
-c6 10 3c 33 0c 1e f7 18 c1 41 e4 7b 8f a8 59 be\
-4d 5b 96 25 9e 7d 14 20 70 ec d4 85 83 9d ba 5a\
-83 69 c1 7c 11 14 03 5e 53 2d 19 5c 74 f4 4a 04\
-76 a2 d3 e8 a4 da 21 00 16 ca ce d0 e3 67 cb 86\
-77 10 a4 b5 aa 2d f2 b8 e5 da f5 fd c6 47 80 7d\
-4d 5e bb 6c 56 b9 76 3c cd ae 4d ea 33 08 eb 0a\
-c2 a8 95 01 cb 20 9d 26 39 fa 5b f8 7c e7 90 74\
-7d 3c b2 d2 95 e8 45 64 f2 f6 37 82 4f 0c 13 02\
-81 29 b0 aa 4a 42 2d 16 22 82
-Salt: \
-23 29 1e 4a 33 07 e8 bb b7 76 62 3a b3 4e 4a 5f\
-4c c8 a8 db
-Signature: \
-02 80 2d cc fa 8d fa f5 27 9b f0 b4 a2 9b a1 b1\
-57 61 1f ae aa f4 19 b8 91 9d 15 94 19 00 c1 33\
-9e 7e 92 e6 fa e5 62 c5 3e 6c c8 e8 41 04 b1 10\
-bc e0 3a d1 85 25 e3 c4 9a 0e ad ad 5d 3f 28 f2\
-44 a8 ed 89 ed ba fb b6 86 27 7c fa 8a e9 09 71\
-4d 6b 28 f4 bf 8e 29 3a a0 4c 41 ef e7 c0 a8 12\
-66 d5 c0 61 e2 57 5b e0 32 aa 46 46 74 ff 71 62\
-62 19 bd 74 cc 45 f0 e7 ed 4e 3f f9 6e ee 75 8e\
-8f
-Test: Verify
-Comment: Example 6: A 1029-bit RSA Key Pair
-Modulus: \
-16 4c a3 1c ff 60 9f 3a 0e 71 01 b0 39 f2 e4 fe\
-6d d3 75 19 ab 98 59 8d 17 9e 17 49 96 59 80 71\
-f4 7d 3a 04 55 91 58 d7 be 37 3c f1 aa 53 f0 aa\
-6e f0 90 39 e5 67 8c 2a 4c 63 90 05 14 c8 c4 f8\
-aa ed 5d e1 2a 5f 10 b0 9c 31 1a f8 c0 ff b5 b7\
-a2 97 f2 ef c6 3b 8d 6b 05 10 93 1f 0b 98 e4 8b\
-f5 fc 6e c4 e7 b8 db 1f fa eb 08 c3 8e 02 ad b8\
-f0 3a 48 22 9c 99 e9 69 43 1f 61 cb 8c 4d c6 98\
-d1
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-03 b6 64 ee 3b 75 66 72 3f c6 ea f2 8a bb 43 0a\
-39 80 f1 12 6c 81 de 8a d7 09 ea b3 9a c9 dc d0\
-b1 55 0b 37 29 d8 70 68 e9 52 00 9d f5 44 53 4c\
-1f 50 82 9a 78 f4 59 1e b8 fd 57 14 04 26 a6 bb\
-04 05 b6 a6 f5 1a 57 d9 26 7b 7b bc 65 33 91 a6\
-99 a2 a9 0d ac 8a e2 26 bc c6 0f a8 cd 93 4c 73\
-c7 b0 3b 1f 6b 81 81 58 63 18 38 a8 61 2e 6e 6e\
-a9 2b e2 4f 83 24 fa f5 b1 fd 85 87 22 52 67 ba\
-6f
-Prime1: \
-04 f0 54 8c 96 26 ab 1e bf 12 44 93 47 41 d9 9a\
-06 22 0e fa 2a 58 56 aa 0e 75 73 0b 2e c9 6a dc\
-86 be 89 4f a2 80 3b 53 a5 e8 5d 27 6a cb d2 9a\
-b8 23 f8 0a 73 91 bb 54 a5 05 16 72 fb 04 ee b5\
-43
-Prime2: \
-04 83 e0 ae 47 91 55 87 74 3f f3 45 36 2b 55 5d\
-39 62 d9 8b b6 f1 5f 84 8b 4c 92 b1 77 1c a8 ed\
-10 7d 8d 3e e6 5e c4 45 17 dd 0f aa 48 1a 38 7e\
-90 2f 7a 2e 74 7c 26 9e 7e a4 44 80 bc 53 8b 8e\
-5b
-ModPrime1PrivateExponent: \
-03 a8 e8 ae a9 92 0c 1a a3 b2 f0 d8 46 e4 b8 50\
-d8 1c a3 06 a5 1c 83 54 4f 94 9f 64 f9 0d cf 3f\
-8e 26 61 f0 7e 56 12 20 a1 80 38 8f be 27 3e 70\
-e2 e5 dc a8 3a 0e 13 48 dd 64 90 c7 31 d6 ec e1\
-ab
-ModPrime2PrivateExponent: \
-01 35 bd cd b6 0b f2 19 7c 43 6e d3 4b 32 cd 8b\
-4f c7 77 78 83 2b a7 67 03 55 1f b2 42 b3 01 69\
-95 93 af 77 fd 8f c3 94 a8 52 6a d2 3c c4 1a 03\
-80 6b d8 97 fe 4b 0e a6 46 55 8a ad dc c9 9e 8a\
-25
-MultiplicativeInverseOfPrime2ModPrime1: \
-03 04 c0 3d 9c 73 65 03 a9 84 ab bd 9b a2 23 01\
-40 7c 4a 2a b1 dd 85 76 64 81 b6 0d 45 40 11 52\
-e6 92 be 14 f4 12 1d 9a a3 fd 6e 0b 4d 1d 3a 97\
-35 38 a3 1d 42 ee 6e 1e 5e f6 20 23 1a 2b ba f3\
-5f
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 6.1
-Message: \
-0a 20 b7 74 ad dc 2f a5 12 45 ed 7c b9 da 60 9e\
-50 ca c6 63 6a 52 54 3f 97 45 8e ed 73 40 f8 d5\
-3f fc 64 91 8f 94 90 78 ee 03 ef 60 d4 2b 5f ec\
-24 60 50 bd 55 05 cd 8c b5 97 ba d3 c4 e7 13 b0\
-ef 30 64 4e 76 ad ab b0 de 01 a1 56 1e fb 25 51\
-58 c7 4f c8 01 e6 e9 19 e5 81 b4 6f 0f 0d dd 08\
-e4 f3 4c 78 10 b5 ed 83 18 f9 1d 7c 8c
-Salt: \
-5b 4e a2 ef 62 9c c2 2f 3b 53 8e 01 69 04 b4 7b\
-1e 40 bf d5
-Signature: \
-04 c0 cf ac ec 04 e5 ba db ec e1 59 a5 a1 10 3f\
-69 b3 f3 2b a5 93 cb 4c c4 b1 b7 ab 45 59 16 a9\
-6a 27 cd 26 78 ea 0f 46 ba 37 f7 fc 9c 86 32 5f\
-29 73 3b 38 9f 1d 97 f4 3e 72 01 c0 f3 48 fc 45\
-fe 42 89 23 35 36 2e ee 01 8b 5b 16 1f 2f 93 93\
-03 12 25 c7 13 01 2a 57 6b c8 8e 23 05 24 89 86\
-8d 90 10 cb f0 33 ec c5 68 e8 bc 15 2b dc 59 d5\
-60 e4 12 91 91 5d 28 56 52 08 e2 2a ee c9 ef 85\
-d1
-Test: Verify
-Comment: RSASSA-PSS Signature Example 6.2
-Message: \
-2a af f6 63 1f 62 1c e6 15 76 0a 9e bc e9 4b b3\
-33 07 7a d8 64 88 c8 61 d4 b7 6d 29 c1 f4 87 46\
-c6 11 ae 1e 03 ce d4 44 5d 7c fa 1f e5 f6 2e 1b\
-3f 08 45 2b de 3b 6e f8 19 73 ba fb b5 7f 97 bc\
-ee f8 73 98 53 95 b8 26 05 89 aa 88 cb 7d b5 0a\
-b4 69 26 2e 55 1b dc d9 a5 6f 27 5a 0a c4 fe 48\
-47 00 c3 5f 3d bf 2b 46 9e de 86 47 41 b8 6f a5\
-91 72 a3 60 ba 95 a0 2e 13 9b e5 0d df b7 cf 0b\
-42 fa ea bb fb ba a8 6a 44 97 69 9c 4f 2d fd 5b\
-08 40 6a f7 e1 41 44 42 7c 25 3e c0 ef a2 0e af\
-9a 8b e8 cd 49 ce 1f 1b c4 e9 3e 61 9c f2 aa 8e\
-d4 fb 39 bc 85 90 d0 f7 b9 64 88 f7 31 7a c9 ab\
-f7 be e4 e3 a0 e7 15
-Salt: \
-83 14 6a 9e 78 27 22 c2 8b 01 4f 98 b4 26 7b da\
-2a c9 50 4f
-Signature: \
-0a 23 14 25 0c f5 2b 6e 4e 90 8d e5 b3 56 46 bc\
-aa 24 36 1d a8 16 0f b0 f9 25 75 90 ab 3a ce 42\
-b0 dc 3e 77 ad 2d b7 c2 03 a2 0b d9 52 fb b5 6b\
-15 67 04 6e cf aa 93 3d 7b 10 00 c3 de 9f f0 5b\
-7d 98 9b a4 6f d4 3b c4 c2 d0 a3 98 6b 7f fa 13\
-47 1d 37 eb 5b 47 d6 47 07 bd 29 0c fd 6a 9f 39\
-3a d0 8e c1 e3 bd 71 bb 57 92 61 50 35 cd af 2d\
-89 29 ae d3 be 09 83 79 37 7e 77 7c e7 9a aa 47\
-73
-Test: Verify
-Comment: RSASSA-PSS Signature Example 6.3
-Message: \
-0f 61 95 d0 4a 6e 6f c7 e2 c9 60 0d bf 84 0c 39\
-ea 8d 4d 62 4f d5 35 07 01 6b 0e 26 85 8a 5e 0a\
-ec d7 ad a5 43 ae 5c 0a b3 a6 25 99 cb a0 a5 4e\
-6b f4 46 e2 62 f9 89 97 8f 9d df 5e 9a 41
-Salt: \
-a8 7b 8a ed 07 d7 b8 e2 da f1 4d dc a4 ac 68 c4\
-d0 aa bf f8
-Signature: \
-08 6d f6 b5 00 09 8c 12 0f 24 ff 84 23 f7 27 d9\
-c6 1a 5c 90 07 d3 b6 a3 1c e7 cf 8f 3c be c1 a2\
-6b b2 0e 2b d4 a0 46 79 32 99 e0 3e 37 a2 1b 40\
-19 4f b0 45 f9 0b 18 bf 20 a4 79 92 cc d7 99 cf\
-9c 05 9c 29 9c 05 26 85 49 54 aa de 8a 6a d9 d9\
-7e c9 1a 11 45 38 3f 42 46 8b 23 1f 4d 72 f2 37\
-06 d9 85 3c 3f a4 3c e8 ac e8 bf e7 48 49 87 a1\
-ec 6a 16 c8 da f8 1f 7c 8b f4 27 74 70 7a 9d f4\
-56
-Test: Verify
-Comment: RSASSA-PSS Signature Example 6.4
-Message: \
-33 7d 25 fe 98 10 eb ca 0d e4 d4 65 8d 3c eb 8e\
-0f e4 c0 66 ab a3 bc c4 8b 10 5d 3b f7 e0 25 7d\
-44 fe ce a6 59 6f 4d 0c 59 a0 84 02 83 36 78 f7\
-06 20 f9 13 8d fe b7 de d9 05 e4 a6 d5 f0 5c 47\
-3d 55 93 66 52 e2 a5 df 43 c0 cf da 7b ac af 30\
-87 f4 52 4b 06 cf 42 15 7d 01 53 97 39 f7 fd de\
-c9 d5 81 25 df 31 a3 2e ab 06 c1 9b 71 f1 d5 bf
-Salt: \
-a3 79 32 f8 a7 49 4a 94 2d 6f 76 74 38 e7 24 d6\
-d0 c0 ef 18
-Signature: \
-0b 5b 11 ad 54 98 63 ff a9 c5 1a 14 a1 10 6c 2a\
-72 cc 8b 64 6e 5c 72 62 50 97 86 10 5a 98 47 76\
-53 4c a9 b5 4c 1c c6 4b f2 d5 a4 4f d7 e8 a6 9d\
-b6 99 d5 ea 52 08 7a 47 48 fd 2a bc 1a fe d1 e5\
-d6 f7 c8 90 25 53 0b da a2 21 3d 7e 03 0f a5 5d\
-f6 f3 4b cf 1c e4 6d 2e df 4e 3a e4 f3 b0 18 91\
-a0 68 c9 e3 a4 4b bc 43 13 3e da d6 ec b9 f3 54\
-00 c4 25 2a 57 62 d6 57 44 b9 9c b9 f4 c5 59 32\
-9f
-Test: Verify
-Comment: RSASSA-PSS Signature Example 6.5
-Message: \
-84 ec 50 2b 07 2e 82 87 78 9d 8f 92 35 82 9e a3\
-b1 87 af d4 d4 c7 85 61 1b da 5f 9e b3 cb 96 71\
-7e fa 70 07 22 7f 1c 08 cb cb 97 2e 66 72 35 e0\
-fb 7d 43 1a 65 70 32 6d 2e cc e3 5a db 37 3d c7\
-53 b3 be 5f 82 9b 89 17 54 93 19 3f ab 16 ba db\
-41 37 1b 3a ac 0a e6 70 07 6f 24 be f4 20 c1 35\
-ad d7 ce e8 d3 5f bc 94 4d 79 fa fb 9e 30 7a 13\
-b0 f5 56 cb 65 4a 06 f9 73 ed 22 67 23 30 19 7e\
-f5 a7 48 bf 82 6a 5d b2 38 3a 25 36 4b 68 6b 93\
-72 bb 23 39 ae b1 ac 9e 98 89 32 7d 01 6f 16 70\
-77 6d b0 62 01 ad bd ca f8 a5 e3 b7 4e 10 8b 73
-Salt: \
-7b 79 0c 1d 62 f7 b8 4e 94 df 6a f2 89 17 cf 57\
-10 18 11 0e
-Signature: \
-02 d7 1f a9 b5 3e 46 54 fe fb 7f 08 38 5c f6 b0\
-ae 3a 81 79 42 eb f6 6c 35 ac 67 f0 b0 69 95 2a\
-3c e9 c7 e1 f1 b0 2e 48 0a 95 00 83 6d e5 d6 4c\
-db 7e cd e0 45 42 f7 a7 99 88 78 7e 24 c2 ba 05\
-f5 fd 48 2c 02 3e d5 c3 0e 04 83 9d c4 4b ed 2a\
-3a 3a 4f ee 01 11 3c 89 1a 47 d3 2e b8 02 5c 28\
-cb 05 0b 5c db 57 6c 70 fe 76 ef 52 34 05 c0 84\
-17 fa f3 50 b0 37 a4 3c 37 93 39 fc b1 8d 3a 35\
-6b
-Test: Verify
-Comment: RSASSA-PSS Signature Example 6.6
-Message: \
-99 06 d8 9f 97 a9 fd ed d3 cc d8 24 db 68 73 26\
-f3 0f 00 aa 25 a7 fc a2 af cb 3b 0f 86 cd 41 e7\
-3f 0e 8f f7 d2 d8 3f 59 e2 8e d3 1a 5a 0d 55 15\
-23 37 4d e2 2e 4c 7e 8f f5 68 b3 86 ee 3d c4 11\
-63 f1 0b f6 7b b0 06 26 1c 90 82 f9 af 90 bf 1d\
-90 49 a6 b9 fa e7 1c 7f 84 fb e6 e5 5f 02 78 9d\
-e7 74 f2 30 f1 15 02 6a 4b 4e 96 c5 5b 04 a9 5d\
-a3 aa cb b2 ce ce 8f 81 76 4a 1f 1c 99 51 54 11\
-08 7c f7 d3 4a ed ed 09 32 c1 83
-Salt: \
-fb be 05 90 25 b6 9b 89 fb 14 ae 22 89 e7 aa af\
-e6 0c 0f cd
-Signature: \
-0a 40 a1 6e 2f e2 b3 8d 1d f9 05 46 16 7c f9 46\
-9c 9e 3c 36 81 a3 44 2b 4b 2c 2f 58 1d eb 38 5c\
-e9 9f c6 18 8b b0 2a 84 1d 56 e7 6d 30 18 91 e2\
-45 60 55 0f cc 2a 26 b5 5f 4c cb 26 d8 37 d3 50\
-a1 54 bc ac a8 39 2d 98 fa 67 95 9e 97 27 b7 8c\
-ad 03 26 9f 56 96 8f c5 6b 68 bd 67 99 26 d8 3c\
-c9 cb 21 55 50 64 5c cd a3 1c 76 0f f3 58 88 94\
-3d 2d 8a 1d 35 1e 81 e5 d0 7b 86 18 2e 75 10 81\
-ef
-Test: Verify
-Comment: Example 7: A 1030-bit RSA Key Pair
-Modulus: \
-37 c9 da 4a 66 c8 c4 08 b8 da 27 d0 c9 d7 9f 8c\
-cb 1e af c1 d2 fe 48 74 6d 94 0b 7c 4e f5 de e1\
-8a d1 26 47 ce fa a0 c4 b3 18 8b 22 1c 51 53 86\
-75 9b 93 f0 20 24 b2 5a b9 24 2f 83 57 d8 f3 fd\
-49 64 0e e5 e6 43 ea f6 c6 4d ee fa 70 89 72 7c\
-8f f0 39 93 33 39 15 c6 ef 21 bf 59 75 b6 e5 0d\
-11 8b 51 00 8e c3 3e 9f 01 a0 a5 45 a1 0a 83 6a\
-43 dd bc a9 d8 b5 c5 d3 54 80 22 d7 06 4e a2 9a\
-b3
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-3b ed 99 90 52 d9 57 bc 06 d6 51 ee f6 e3 a9 80\
-94 b1 62 1b d3 8b 54 49 bd 6c 4a ea 3d e7 e0 84\
-67 9a 44 84 de d2 5b e0 f0 82 6c f3 37 78 25 41\
-4b 14 d4 d6 1d b1 4d e6 26 fb b8 0e 5f 4f ae c9\
-56 f9 a0 a2 d2 4f 99 57 63 80 f0 84 eb 62 e4 6a\
-57 d5 54 27 8b 53 56 26 19 3c e0 20 60 57 5e b6\
-6c 57 98 d3 6f 6c 5d 40 fb 00 d8 09 b4 2a 73 10\
-2c 1c 74 ee 95 bd 71 42 0f ff ef 63 18 b5 2c 29
-Prime1: \
-07 ee fb 42 4b 0e 3a 40 e4 20 8e e5 af b2 80 b2\
-23 17 30 81 14 dd e0 b4 b6 4f 73 01 84 ec 68 da\
-6c e2 86 7a 9f 48 ed 77 26 d5 e2 61 4e d0 4a 54\
-10 73 6c 8c 71 4e e7 02 47 42 98 c6 29 2a f0 75\
-35
-Prime2: \
-07 08 30 db f9 47 ea c0 22 8d e2 63 14 b5 9b 66\
-99 4c c6 0e 83 60 e7 5d 38 76 29 8f 8f 8a 7d 14\
-1d a0 64 e5 ca 02 6a 97 3e 28 f2 54 73 8c ee 66\
-9c 72 1b 03 4c b5 f8 e2 44 da dd 7c d1 e1 59 d5\
-47
-ModPrime1PrivateExponent: \
-05 24 d2 0c 3d 95 cf f7 5a f2 31 34 83 22 7d 87\
-02 71 7a a5 76 de 15 5f 96 05 15 50 1a db 1d 70\
-e1 c0 4d e9 1b 75 b1 61 db f0 39 83 56 12 7e de\
-da 7b bc 19 a3 2d c1 62 1c c9 f5 3c 26 5d 0c e3\
-31
-ModPrime2PrivateExponent: \
-05 f9 84 a1 f2 3c 93 8d 6a 0e 89 72 4b cf 3d d9\
-3f 99 46 92 60 37 fe 7c 6b 13 a2 9e 52 84 85 5f\
-89 08 95 91 d4 40 97 56 27 bf 5c 9e 3a 8b 5c a7\
-9c 77 2a d2 73 e4 0d 32 1a f4 a6 c9 7d fd ed 78\
-d3
-MultiplicativeInverseOfPrime2ModPrime1: \
-dd d9 18 ad ad a2 9d ca b9 81 ff 9a cb a4 25 70\
-23 c0 9a 38 01 cc ce 09 8c e2 68 f8 55 d0 df 57\
-0c d6 e7 b9 b1 4b d9 a5 a9 25 4c bc 31 5b e6 f8\
-ba 1e 25 46 dd d5 69 c5 ea 19 ee d8 35 3b de 5e
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 7.1
-Message: \
-9e ad 0e 01 94 56 40 67 4e b4 1c ad 43 5e 23 74\
-ea ef a8 ad 71 97 d9 79 13 c4 49 57 d8 d8 3f 40\
-d7 6e e6 0e 39 bf 9c 0f 9e af 30 21 42 1a 07 4d\
-1a de 96 2c 6e 9d 3d c3 bb 17 4f e4 df e6 52 b0\
-91 15 49 5b 8f d2 79 41 74 02 0a 06 02 b5 ca 51\
-84 8c fc 96 ce 5e b5 7f c0 a2 ad c1 dd a3 6a 7c\
-c4 52 64 1a 14 91 1b 37 e4 5b fa 11 da a5 c7 ec\
-db 74 f6 d0 10 0d 1d 3e 39 e7 52 80 0e 20 33 97\
-de 02 33 07 7b 9a 88 85 55 37 fa e9 27 f9 24 38\
-0d 78 0f 98 e1 8d cf f3 9c 5e a7 41 b1 7d 6f dd\
-18 85 bc 9d 58 14 82 d7 71 ce b5 62 d7 8a 8b f8\
-8f 0c 75 b1 13 63 e5 e3 6c d4 79 ce b0 54 5f 9d\
-a8 42 03 e0 e6 e5 08 37 5c c9 e8 44 b8 8b 7a c7\
-a0 a2 01 ea 0f 1b ee 9a 2c 57 79 20 ca 02 c0 1b\
-9d 83 20 e9 74 a5 6f 4e fb 57 63 b9 62 55 ab bf\
-80 37 bf 18 02 cf 01 8f 56 37 94 93 e5 69 a9
-Salt: \
-b7 86 7a 59 95 8c b5 43 28 f8 77 5e 65 46 ec 06\
-d2 7e aa 50
-Signature: \
-18 7f 39 07 23 c8 90 25 91 f0 15 4b ae 6d 4e cb\
-ff e0 67 f0 e8 b7 95 47 6e a4 f4 d5 1c cc 81 05\
-20 bb 3c a9 bc a7 d0 b1 f2 ea 8a 17 d8 73 fa 27\
-57 0a cd 64 2e 38 08 56 1c b9 e9 75 cc fd 80 b2\
-3d c5 77 1c db 33 06 a5 f2 31 59 da cb d3 aa 2d\
-b9 3d 46 d7 66 e0 9e d1 5d 90 0a d8 97 a8 d2 74\
-dc 26 b4 7e 99 4a 27 e9 7e 22 68 a7 66 53 3a e4\
-b5 e4 2a 2f ca f7 55 c1 c4 79 4b 29 4c 60 55 58\
-23
-Test: Verify
-Comment: RSASSA-PSS Signature Example 7.2
-Message: \
-8d 80 d2 d0 8d bd 19 c1 54 df 3f 14 67 3a 14 bd\
-03 73 52 31 f2 4e 86 bf 15 3d 0e 69 e7 4c bf f7\
-b1 83 6e 66 4d e8 3f 68 01 24 37 0f c0 f9 6c 9b\
-65 c0 7a 36 6b 64 4c 4a b3
-Salt: \
-0c 09 58 22 66 df 08 63 10 82 1b a7 e1 8d f6 4d\
-fe e6 de 09
-Signature: \
-10 fd 89 76 8a 60 a6 77 88 ab b5 85 6a 78 7c 85\
-61 f3 ed cf 9a 83 e8 98 f7 dc 87 ab 8c ce 79 42\
-9b 43 e5 69 06 94 1a 88 61 94 f1 37 e5 91 fe 7c\
-33 95 55 36 1f bb e1 f2 4f eb 2d 4b cd b8 06 01\
-f3 09 6b c9 13 2d ee a6 0a e1 30 82 f4 4f 9a d4\
-1c d6 28 93 6a 4d 51 17 6e 42 fc 59 cb 76 db 81\
-5c e5 ab 4d b9 9a 10 4a af ea 68 f5 d3 30 32 9e\
-bf 25 8d 4e de 16 06 4b d1 d0 03 93 d5 e1 57 0e\
-b8
-Test: Verify
-Comment: RSASSA-PSS Signature Example 7.3
-Message: \
-80 84 05 cd fc 1a 58 b9 bb 03 97 c7 20 72 2a 81\
-ff fb 76 27 8f 33 59 17 ef 9c 47 38 14 b3 e0 16\
-ba 29 73 cd 27 65 f8 f3 f8 2d 6c c3 8a a7 f8 55\
-18 27 fe 8d 1e 38 84 b7 e6 1c 94 68 3b 8f 82 f1\
-84 3b da e2 25 7e ee c9 81 2a d4 c2 cf 28 3c 34\
-e0 b0 ae 0f e3 cb 99 0c f8 8f 2e f9
-Salt: \
-28 03 9d cf e1 06 d3 b8 29 66 11 25 8c 4a 56 65\
-1c 9e 92 dd
-Signature: \
-2b 31 fd e9 98 59 b9 77 aa 09 58 6d 8e 27 46 62\
-b2 5a 2a 64 06 40 b4 57 f5 94 05 1c b1 e7 f7 a9\
-11 86 54 55 24 29 26 cf 88 fe 80 df a3 a7 5b a9\
-68 98 44 a1 1e 63 4a 82 b0 75 af bd 69 c1 2a 0d\
-f9 d2 5f 84 ad 49 45 df 3d c8 fe 90 c3 ce fd f2\
-6e 95 f0 53 43 04 b5 bd ba 20 d3 e5 64 0a 2e bf\
-b8 98 aa c3 5a e4 0f 26 fc e5 56 3c 2f 9f 24 f3\
-04 2a f7 6f 3c 70 72 d6 87 bb fb 95 9a 88 46 0a\
-f1
-Test: Verify
-Comment: RSASSA-PSS Signature Example 7.4
-Message: \
-f3 37 b9 ba d9 37 de 22 a1 a0 52 df f1 11 34 a8\
-ce 26 97 62 02 98 19 39 b9 1e 07 15 ae 5e 60 96\
-49 da 1a df ce f3 f4 cc a5 9b 23 83 60 e7 d1 e4\
-96 c7 bf 4b 20 4b 5a cf f9 bb d6 16 6a 1d 87 a3\
-6e f2 24 73 73 75 10 39 f8 a8 00 b8 39 98 07 b3\
-a8 5f 44 89 34 97 c0 d0 5f b7 01 7b 82 22 81 52\
-de 6f 25 e6 11 6d cc 75 03 c7 86 c8 75 c2 8f 3a\
-a6 07 e9 4a b0 f1 98 63 ab 1b 50 73 77 0b 0c d5\
-f5 33 ac de 30 c6 fb 95 3c f3 da 68 02 64 e3 0f\
-c1 1b ff 9a 19 bf fa b4 77 9b 62 23 c3 fb 3f e0\
-f7 1a ba de 4e b7 c0 9c 41 e2 4c 22 d2 3f a1 48\
-e6 a1 73 fe b6 39 84 d1 bc 6e e3 a0 2d 91 5b 75\
-2c ea f9 2a 30 15 ec eb 38 ca 58 6c 68 01 b3 7c\
-34 ce fb 2c ff 25 ea 23 c0 86 62 dc ab 26 a7 a9\
-3a 28 5d 05 d3 04 4c
-Salt: \
-a7 78 21 eb bb ef 24 62 8e 4e 12 e1 d0 ea 96 de\
-39 8f 7b 0f
-Signature: \
-32 c7 ca 38 ff 26 94 9a 15 00 0c 4b a0 4b 2b 13\
-b3 5a 38 10 e5 68 18 4d 7e ca ba a1 66 b7 ff ab\
-dd f2 b6 cf 4b a0 71 24 92 37 90 f2 e5 b1 a5 be\
-04 0a ea 36 fe 13 2e c1 30 e1 f1 05 67 98 2d 17\
-ac 3e 89 b8 d2 6c 30 94 03 4e 76 2d 2e 03 12 64\
-f0 11 70 be ec b3 d1 43 9e 05 84 6f 25 45 83 67\
-a7 d9 c0 20 60 44 46 72 67 1e 64 e8 77 86 45 59\
-ca 19 b2 07 4d 58 8a 28 1b 58 04 d2 37 72 fb be\
-19
-Test: Verify
-Comment: RSASSA-PSS Signature Example 7.5
-Message: \
-45 01 3c eb af d9 60 b2 55 47 6a 8e 25 98 b9 aa\
-32 ef be 6d c1 f3 4f 4a 49 8d 8c f5 a2 b4 54 8d\
-08 c5 5d 5f 95 f7 bc c9 61 91 63 05 6f 2d 58 b5\
-2f a0 32
-Salt: \
-9d 5a d8 eb 45 21 34 b6 5d c3 a9 8b 6a 73 b5 f7\
-41 60 9c d6
-Signature: \
-07 eb 65 1d 75 f1 b5 2b c2 63 b2 e1 98 33 6e 99\
-fb eb c4 f3 32 04 9a 92 2a 10 81 56 07 ee 2d 98\
-9d b3 a4 49 5b 7d cc d3 8f 58 a2 11 fb 7e 19 31\
-71 a3 d8 91 13 24 37 eb ca 44 f3 18 b2 80 50 9e\
-52 b5 fa 98 fc ce 82 05 d9 69 7c 8e e4 b7 ff 59\
-d4 c5 9c 79 03 8a 19 70 bd 2a 0d 45 1e cd c5 ef\
-11 d9 97 9c 9d 35 f8 c7 0a 61 63 71 76 07 89 0d\
-58 6a 7c 6d c0 1c 79 f8 6a 8f 28 e8 52 35 f8 c2\
-f1
-Test: Verify
-Comment: RSASSA-PSS Signature Example 7.6
-Message: \
-23 58 09 70 86 c8 99 32 3e 75 d9 c9 0d 0c 09 f1\
-2d 9d 54 ed fb df 70 a9 c2 eb 5a 04 d8 f3 6b 9b\
-2b df 2a ab e0 a5 bd a1 96 89 37 f9 d6 eb d3 b6\
-b2 57 ef b3 13 6d 41 31 f9 ac b5 9b 85 e2 60 2c\
-2a 3f cd c8 35 49 4a 1f 4e 5e c1 8b 22 6c 80 23\
-2b 36 a7 5a 45 fd f0 9a 7e a9 e9 8e fb de 14 50\
-d1 19 4b f1 2e 15 a4 c5 f9 eb 5c 0b ce 52 69 e0\
-c3 b2 8c fa b6 55 d8 1a 61 a2 0b 4b e2 f5 44 59\
-bb 25 a0 db 94 c5 22 18 be 10 9a 74 26 de 83 01\
-44 24 78 9a aa 90 e5 05 6e 63 2a 69 81 15 e2 82\
-c1 a5 64 10 f2 6c 20 72 f1 93 48 1a 9d cd 88 05\
-72 00 5e 64 f4 08 2e cf
-Salt: \
-3f 2e fc 59 58 80 a7 d4 7f cf 3c ba 04 98 3e a5\
-4c 4b 73 fb
-Signature: \
-18 da 3c dc fe 79 bf b7 7f d9 c3 2f 37 7a d3 99\
-14 6f 0a 8e 81 06 20 23 32 71 a6 e3 ed 32 48 90\
-3f 5c dc 92 dc 79 b5 5d 3e 11 61 5a a0 56 a7 95\
-85 37 92 a3 99 8c 34 9c a5 c4 57 e8 ca 7d 29 d7\
-96 aa 24 f8 34 91 70 9b ef cf b1 51 0e a5 13 c9\
-28 29 a3 f0 0b 10 4f 65 56 34 f3 20 75 2e 13 0e\
-c0 cc f6 75 4f f8 93 db 30 29 32 bb 02 5e b6 0e\
-87 82 25 98 fc 61 9e 0e 98 17 37 a9 a4 c4 15 2d\
-33
-Test: Verify
-Comment: Example 8: A 1031-bit RSA Key Pair
-Modulus: \
-49 53 70 a1 fb 18 54 3c 16 d3 63 1e 31 63 25 5d\
-f6 2b e6 ee e8 90 d5 f2 55 09 e4 f7 78 a8 ea 6f\
-bb bc df 85 df f6 4e 0d 97 20 03 ab 36 81 fb ba\
-6d d4 1f d5 41 82 9b 2e 58 2d e9 f2 a4 a4 e0 a2\
-d0 90 0b ef 47 53 db 3c ee 0e e0 6c 7d fa e8 b1\
-d5 3b 59 53 21 8f 9c ce ea 69 5b 08 66 8e de aa\
-dc ed 94 63 b1 d7 90 d5 eb f2 7e 91 15 b4 6c ad\
-4d 9a 2b 8e fa b0 56 1b 08 10 34 47 39 ad a0 73\
-3f
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-6c 66 ff e9 89 80 c3 8f cd ea b5 15 98 98 83 61\
-65 f4 b4 b8 17 c4 f6 a8 d4 86 ee 4e a9 13 0f e9\
-b9 09 2b d1 36 d1 84 f9 5f 50 4a 60 7e ac 56 58\
-46 d2 fd d6 59 7a 89 67 c7 39 6e f9 5a 6e ee bb\
-45 78 a6 43 96 6d ca 4d 8e e3 de 84 2d e6 32 79\
-c6 18 15 9c 1a b5 4a 89 43 7b 6a 61 20 e4 93 0a\
-fb 52 a4 ba 6c ed 8a 49 47 ac 64 b3 0a 34 97 cb\
-e7 01 c2 d6 26 6d 51 72 19 ad 0e c6 d3 47 db e9
-Prime1: \
-08 da d7 f1 13 63 fa a6 23 d5 d6 d5 e8 a3 19 32\
-8d 82 19 0d 71 27 d2 84 6c 43 9b 0a b7 26 19 b0\
-a4 3a 95 32 0e 4e c3 4f c3 a9 ce a8 76 42 23 05\
-bd 76 c5 ba 7b e9 e2 f4 10 c8 06 06 45 a1 d2 9e\
-db
-Prime2: \
-08 47 e7 32 37 6f c7 90 0f 89 8e a8 2e b2 b0 fc\
-41 85 65 fd ae 62 f7 d9 ec 4c e2 21 7b 97 99 0d\
-d2 72 db 15 7f 99 f6 3c 0d cb b9 fb ac db d4 c4\
-da db 6d f6 77 56 35 8c a4 17 48 25 b4 8f 49 70\
-6d
-ModPrime1PrivateExponent: \
-05 c2 a8 3c 12 4b 36 21 a2 aa 57 ea 2c 3e fe 03\
-5e ff 45 60 f3 3d de bb 7a da b8 1f ce 69 a0 c8\
-c2 ed c1 65 20 dd a8 3d 59 a2 3b e8 67 96 3a c6\
-5f 2c c7 10 bb cf b9 6e e1 03 de b7 71 d1 05 fd\
-85
-ModPrime2PrivateExponent: \
-04 ca e8 aa 0d 9f aa 16 5c 87 b6 82 ec 14 0b 8e\
-d3 b5 0b 24 59 4b 7a 3b 2c 22 0b 36 69 bb 81 9f\
-98 4f 55 31 0a 1a e7 82 36 51 d4 a0 2e 99 44 79\
-72 59 51 39 36 34 34 e5 e3 0a 7e 7d 24 15 51 e1\
-b9
-MultiplicativeInverseOfPrime2ModPrime1: \
-07 d3 e4 7b f6 86 60 0b 11 ac 28 3c e8 8d bb 3f\
-60 51 e8 ef d0 46 80 e4 4c 17 1e f5 31 b8 0b 2b\
-7c 39 fc 76 63 20 e2 cf 15 d8 d9 98 20 e9 6f f3\
-0d c6 96 91 83 9c 4b 40 d7 b0 6e 45 30 7d c9 1f\
-3f
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 8.1
-Message: \
-81 33 2f 4b e6 29 48 41 5e a1 d8 99 79 2e ea cf\
-6c 6e 1d b1 da 8b e1 3b 5c ea 41 db 2f ed 46 70\
-92 e1 ff 39 89 14 c7 14 25 97 75 f5 95 f8 54 7f\
-73 56 92 a5 75 e6 92 3a f7 8f 22 c6 99 7d db 90\
-fb 6f 72 d7 bb 0d d5 74 4a 31 de cd 3d c3 68 58\
-49 83 6e d3 4a ec 59 63 04 ad 11 84 3c 4f 88 48\
-9f 20 97 35 f5 fb 7f da f7 ce c8 ad dc 58 18 16\
-8f 88 0a cb f4 90 d5 10 05 b7 a8 e8 4e 43 e5 42\
-87 97 75 71 dd 99 ee a4 b1 61 eb 2d f1 f5 10 8f\
-12 a4 14 2a 83 32 2e db 05 a7 54 87 a3 43 5c 9a\
-78 ce 53 ed 93 bc 55 08 57 d7 a9 fb
-Salt: \
-1d 65 49 1d 79 c8 64 b3 73 00 9b e6 f6 f2 46 7b\
-ac 4c 78 fa
-Signature: \
-02 62 ac 25 4b fa 77 f3 c1 ac a2 2c 51 79 f8 f0\
-40 42 2b 3c 5b af d4 0a 8f 21 cf 0f a5 a6 67 cc\
-d5 99 3d 42 db af b4 09 c5 20 e2 5f ce 2b 1e e1\
-e7 16 57 7f 1e fa 17 f3 da 28 05 2f 40 f0 41 9b\
-23 10 6d 78 45 aa f0 11 25 b6 98 e7 a4 df e9 2d\
-39 67 bb 00 c4 d0 d3 5b a3 55 2a b9 a8 b3 ee f0\
-7c 7f ec db c5 42 4a c4 db 1e 20 cb 37 d0 b2 74\
-47 69 94 0e a9 07 e1 7f bb ca 67 3b 20 52 23 80\
-c5
-Test: Verify
-Comment: RSASSA-PSS Signature Example 8.2
-Message: \
-e2 f9 6e af 0e 05 e7 ba 32 6e cc a0 ba 7f d2 f7\
-c0 23 56 f3 ce de 9d 0f aa bf 4f cc 8e 60 a9 73\
-e5 59 5f d9 ea 08
-Salt: \
-43 5c 09 8a a9 90 9e b2 37 7f 12 48 b0 91 b6 89\
-87 ff 18 38
-Signature: \
-27 07 b9 ad 51 15 c5 8c 94 e9 32 e8 ec 0a 28 0f\
-56 33 9e 44 a1 b5 8d 4d dc ff 2f 31 2e 5f 34 dc\
-fe 39 e8 9c 6a 94 dc ee 86 db bd ae 5b 79 ba 4e\
-08 19 a9 e7 bf d9 d9 82 e7 ee 6c 86 ee 68 39 6e\
-8b 3a 14 c9 c8 f3 4b 17 8e b7 41 f9 d3 f1 21 10\
-9b f5 c8 17 2f ad a2 e7 68 f9 ea 14 33 03 2c 00\
-4a 8a a0 7e b9 90 00 0a 48 dc 94 c8 ba c8 aa be\
-2b 09 b1 aa 46 c0 a2 aa 0e 12 f6 3f bb a7 75 ba\
-7e
-Test: Verify
-Comment: RSASSA-PSS Signature Example 8.3
-Message: \
-e3 5c 6e d9 8f 64 a6 d5 a6 48 fc ab 8a db 16 33\
-1d b3 2e 5d 15 c7 4a 40 ed f9 4c 3d c4 a4 de 79\
-2d 19 08 89 f2 0f 1e 24 ed 12 05 4a 6b 28 79 8f\
-cb 42 d1 c5 48 76 9b 73 4c 96 37 31 42 09 2a ed\
-27 76 03 f4 73 8d f4 dc 14 46 58 6d 0e c6 4d a4\
-fb 60 53 6d b2 ae 17 fc 7e 3c 04 bb fb bb d9 07\
-bf 11 7c 08 63 6f a1 6f 95 f5 1a 62 16 93 4d 3e\
-34 f8 50 30 f1 7b bb c5 ba 69 14 40 58 af f0 81\
-e0 b1 9c f0 3c 17 19 5c 5e 88 8b a5 8f 6f e0 a0\
-2e 5c 3b da 97 19 a7
-Salt: \
-c6 eb be 76 df 0c 4a ea 32 c4 74 17 5b 2f 13 68\
-62 d0 45 29
-Signature: \
-2a d2 05 09 d7 8c f2 6d 1b 6c 40 61 46 08 6e 4b\
-0c 91 a9 1c 2b d1 64 c8 7b 96 6b 8f aa 42 aa 0c\
-a4 46 02 23 23 ba 4b 1a 1b 89 70 6d 7f 4c 3b e5\
-7d 7b 69 70 2d 16 8a b5 95 5e e2 90 35 6b 8c 4a\
-29 ed 46 7d 54 7e c2 3c ba df 28 6c cb 58 63 c6\
-67 9d a4 67 fc 93 24 a1 51 c7 ec 55 aa c6 db 40\
-84 f8 27 26 82 5c fe 1a a4 21 bc 64 04 9f b4 2f\
-23 14 8f 9c 25 b2 dc 30 04 37 c3 8d 42 8a a7 5f\
-96
-Test: Verify
-Comment: RSASSA-PSS Signature Example 8.4
-Message: \
-db c5 f7 50 a7 a1 4b e2 b9 3e 83 8d 18 d1 4a 86\
-95 e5 2e 8a dd 9c 0a c7 33 b8 f5 6d 27 47 e5 29\
-a0 cc a5 32 dd 49 b9 02 ae fe d5 14 44 7f 9e 81\
-d1 61 95 c2 85 38 68 cb 9b 30 f7 d0 d4 95 c6 9d\
-01 b5 c5 d5 0b 27 04 5d b3 86 6c 23 24 a4 4a 11\
-0b 17 17 74 6d e4 57 d1 c8 c4 5c 3c d2 a9 29 70\
-c3 d5 96 32 05 5d 4c 98 a4 1d 6e 99 e2 a3 dd d5\
-f7 f9 97 9a b3 cd 18 f3 75 05 d2 51 41 de 2a 1b\
-ff 17 b3 a7 dc e9 41 9e cc 38 5c f1 1d 72 84 0f\
-19 95 3f d0 50 92 51 f6 ca fd e2 89 3d 0e 75 c7\
-81 ba 7a 50 12 ca 40 1a 4f a9 9e 04 b3 c3 24 9f\
-92 6d 5a fe 82 cc 87 da b2 2c 3c 1b 10 5d e4 8e\
-34 ac e9 c9 12 4e 59 59 7a c7 eb f8
-Salt: \
-02 1f dc c6 eb b5 e1 9b 1c b1 6e 9c 67 f2 76 81\
-65 7f e2 0a
-Signature: \
-1e 24 e6 e5 86 28 e5 17 50 44 a9 eb 6d 83 7d 48\
-af 12 60 b0 52 0e 87 32 7d e7 89 7e e4 d5 b9 f0\
-df 0b e3 e0 9e d4 de a8 c1 45 4f f3 42 3b b0 8e\
-17 93 24 5a 9d f8 bf 6a b3 96 8c 8e dd c3 b5 32\
-85 71 c7 7f 09 1c c5 78 57 69 12 df eb d1 64 b9\
-de 54 54 fe 0b e1 c1 f6 38 5b 32 83 60 ce 67 ec\
-7a 05 f6 e3 0e b4 5c 17 c4 8a c7 00 41 d2 ca b6\
-7f 0a 2a e7 aa fd cc 8d 24 5e a3 44 2a 63 00 cc\
-c7
-Test: Verify
-Comment: RSASSA-PSS Signature Example 8.5
-Message: \
-04 dc 25 1b e7 2e 88 e5 72 34 85 b6 38 3a 63 7e\
-2f ef e0 76 60 c5 19 a5 60 b8 bc 18 bd ed b8 6e\
-ae 23 64 ea 53 ba 9d ca 6e b3 d2 e7 d6 b8 06 af\
-42 b3 e8 7f 29 1b 4a 88 81 d5 bf 57 2c c9 a8 5e\
-19 c8 6a cb 28 f0 98 f9 da 03 83 c5 66 d3 c0 f5\
-8c fd 8f 39 5d cf 60 2e 5c d4 0e 8c 71 83 f7 14\
-99 6e 22 97 ef
-Salt: \
-c5 58 d7 16 7c bb 45 08 ad a0 42 97 1e 71 b1 37\
-7e ea 42 69
-Signature: \
-33 34 1b a3 57 6a 13 0a 50 e2 a5 cf 86 79 22 43\
-88 d5 69 3f 5a cc c2 35 ac 95 ad d6 8e 5e b1 ee\
-c3 16 66 d0 ca 7a 1c da 6f 70 a1 aa 76 2c 05 75\
-2a 51 95 0c db 8a f3 c5 37 9f 18 cf e6 b5 bc 55\
-a4 64 82 26 a1 5e 91 2e f1 9a d7 7a de ea 91 1d\
-67 cf ef d6 9b a4 3f a4 11 91 35 ff 64 21 17 ba\
-98 5a 7e 01 00 32 5e 95 19 f1 ca 6a 92 16 bd a0\
-55 b5 78 50 15 29 11 25 e9 0d cd 07 a2 ca 96 73\
-ee
-Test: Verify
-Comment: RSASSA-PSS Signature Example 8.6
-Message: \
-0e a3 7d f9 a6 fe a4 a8 b6 10 37 3c 24 cf 39 0c\
-20 fa 6e 21 35 c4 00 c8 a3 4f 5c 18 3a 7e 8e a4\
-c9 ae 09 0e d3 17 59 f4 2d c7 77 19 cc a4 00 ec\
-dc c5 17 ac fc 7a c6 90 26 75 b2 ef 30 c5 09 66\
-5f 33 21 48 2f c6 9a 9f b5 70 d1 5e 01 c8 45 d0\
-d8 e5 0d 2a 24 cb f1 cf 0e 71 49 75 a5 db 7b 18\
-d9 e9 e9 cb 91 b5 cb 16 86 90 60 ed 18 b7 b5 62\
-45 50 3f 0c af 90 35 2b 8d e8 1c b5 a1 d9 c6 33\
-60 92 f0 cd
-Salt: \
-76 fd 4e 64 fd c9 8e b9 27 a0 40 3e 35 a0 84 e7\
-6b a9 f9 2a
-Signature: \
-1e d1 d8 48 fb 1e db 44 12 9b d9 b3 54 79 5a f9\
-7a 06 9a 7a 00 d0 15 10 48 59 3e 0c 72 c3 51 7f\
-f9 ff 2a 41 d0 cb 5a 0a c8 60 d7 36 a1 99 70 4f\
-7c b6 a5 39 86 a8 8b bd 8a bc c0 07 6a 2c e8 47\
-88 00 31 52 5d 44 9d a2 ac 78 35 63 74 c5 36 e3\
-43 fa a7 cb a4 2a 5a aa 65 06 08 77 91 c0 6a 8e\
-98 93 35 ae d1 9b fa b2 d5 e6 7e 27 fb 0c 28 75\
-af 89 6c 21 b6 e8 e7 30 9d 04 e4 f6 72 7e 69 46\
-3e
-Test: Verify
-Comment: Example 9: A 1536-bit RSA Key Pair
-Modulus: \
-e6 bd 69 2a c9 66 45 79 04 03 fd d0 f5 be b8 b9\
-bf 92 ed 10 00 7f c3 65 04 64 19 dd 06 c0 5c 5b\
-5b 2f 48 ec f9 89 e4 ce 26 91 09 97 9c bb 40 b4\
-a0 ad 24 d2 24 83 d1 ee 31 5a d4 cc b1 53 42 68\
-35 26 91 c5 24 f6 dd 8e 6c 29 d2 24 cf 24 69 73\
-ae c8 6c 5b f6 b1 40 1a 85 0d 1b 9a d1 bb 8c bc\
-ec 47 b0 6f 0f 8c 7f 45 d3 fc 8f 31 92 99 c5 43\
-3d db c2 b3 05 3b 47 de d2 ec d4 a4 ca ef d6 14\
-83 3d c8 bb 62 2f 31 7e d0 76 b8 05 7f e8 de 3f\
-84 48 0a d5 e8 3e 4a 61 90 4a 4f 24 8f b3 97 02\
-73 57 e1 d3 0e 46 31 39 81 5c 6f d4 fd 5a c5 b8\
-17 2a 45 23 0e cb 63 18 a0 4f 14 55 d8 4e 5a 8b
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-6a 7f d8 4f b8 5f ad 07 3b 34 40 6d b7 4f 8d 61\
-a6 ab c1 21 96 a9 61 dd 79 56 5e 9d a6 e5 18 7b\
-ce 2d 98 02 50 f7 35 95 75 35 92 70 d9 15 90 bb\
-0e 42 7c 71 46 0b 55 d5 14 10 b1 91 bc f3 09 fe\
-a1 31 a9 2c 8e 70 27 38 fa 71 9f 1e 00 41 f5 2e\
-40 e9 1f 22 9f 4d 96 a1 e6 f1 72 e1 55 96 b4 51\
-0a 6d ae c2 61 05 f2 be bc 53 31 6b 87 bd f2 13\
-11 66 60 70 e8 df ee 69 d5 2c 71 a9 76 ca ae 79\
-c7 2b 68 d2 85 80 dc 68 6d 9f 51 29 d2 25 f8 2b\
-3d 61 55 13 a8 82 b3 db 91 41 6b 48 ce 08 88 82\
-13 e3 7e eb 9a f8 00 d8 1c ab 32 8c e4 20 68 99\
-03 c0 0c 7b 5f d3 1b 75 50 3a 6d 41 96 84 d6 29
-Prime1: \
-f8 eb 97 e9 8d f1 26 64 ee fd b7 61 59 6a 69 dd\
-cd 0e 76 da ec e6 ed 4b f5 a1 b5 0a c0 86 f7 92\
-8a 4d 2f 87 26 a7 7e 51 5b 74 da 41 98 8f 22 0b\
-1c c8 7a a1 fc 81 0c e9 9a 82 f2 d1 ce 82 1e dc\
-ed 79 4c 69 41 f4 2c 7a 1a 0b 8c 4d 28 c7 5e c6\
-0b 65 22 79 f6 15 4a 76 2a ed 16 5d 47 de e3 67
-Prime2: \
-ed 4d 71 d0 a6 e2 4b 93 c2 e5 f6 b4 bb e0 5f 5f\
-b0 af a0 42 d2 04 fe 33 78 d3 65 c2 f2 88 b6 a8\
-da d7 ef e4 5d 15 3e ef 40 ca cc 7b 81 ff 93 40\
-02 d1 08 99 4b 94 a5 e4 72 8c d9 c9 63 37 5a e4\
-99 65 bd a5 5c bf 0e fe d8 d6 55 3b 40 27 f2 d8\
-62 08 a6 e6 b4 89 c1 76 12 80 92 d6 29 e4 9d 3d
-ModPrime1PrivateExponent: \
-2b b6 8b dd fb 0c 4f 56 c8 55 8b ff af 89 2d 80\
-43 03 78 41 e7 fa 81 cf a6 1a 38 c5 e3 9b 90 1c\
-8e e7 11 22 a5 da 22 27 bd 6c de eb 48 14 52 c1\
-2a d3 d6 1d 5e 4f 77 6a 0a b5 56 59 1b ef e3 e5\
-9e 5a 7f dd b8 34 5e 1f 2f 35 b9 f4 ce e5 7c 32\
-41 4c 08 6a ec 99 3e 93 53 e4 80 d9 ee c6 28 9f
-ModPrime2PrivateExponent: \
-4f f8 97 70 9f ad 07 97 46 49 45 78 e7 0f d8 54\
-61 30 ee ab 56 27 c4 9b 08 0f 05 ee 4a d9 f3 e4\
-b7 cb a9 d6 a5 df f1 13 a4 1c 34 09 33 68 33 f1\
-90 81 6d 8a 6b c4 2e 9b ec 56 b7 56 7d 0f 3c 9c\
-69 6d b6 19 b2 45 d9 01 dd 85 6d b7 c8 09 2e 77\
-e9 a1 cc cd 56 ee 4d ba 42 c5 fd b6 1a ec 26 69
-MultiplicativeInverseOfPrime2ModPrime1: \
-77 b9 d1 13 7b 50 40 4a 98 27 29 31 6e fa fc 7d\
-fe 66 d3 4e 5a 18 26 00 d5 f3 0a 0a 85 12 05 1c\
-56 0d 08 1d 4d 0a 18 35 ec 3d 25 a6 0f 4e 4d 6a\
-a9 48 b2 bf 3d bb 5b 12 4c bb c3 48 92 55 a3 a9\
-48 37 2f 69 78 49 67 45 f9 43 e1 db 4f 18 38 2c\
-ea a5 05 df c6 57 57 bb 3f 85 7a 58 dc e5 21 56
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 9.1
-Message: \
-a8 8e 26 58 55 e9 d7 ca 36 c6 87 95 f0 b3 1b 59\
-1c d6 58 7c 71 d0 60 a0 b3 f7 f3 ea ef 43 79 59\
-22 02 8b c2 b6 ad 46 7c fc 2d 7f 65 9c 53 85 aa\
-70 ba 36 72 cd de 4c fe 49 70 cc 79 04 60 1b 27\
-88 72 bf 51 32 1c 4a 97 2f 3c 95 57 0f 34 45 d4\
-f5 79 80 e0 f2 0d f5 48 46 e6 a5 2c 66 8f 12 88\
-c0 3f 95 00 6e a3 2f 56 2d 40 d5 2a f9 fe b3 2f\
-0f a0 6d b6 5b 58 8a 23 7b 34 e5 92 d5 5c f9 79\
-f9 03 a6 42 ef 64 d2 ed 54 2a a8 c7 7d c1 dd 76\
-2f 45 a5 93 03 ed 75 e5 41 ca 27 1e 2b 60 ca 70\
-9e 44 fa 06 61 13 1e 8d 5d 41 63 fd 8d 39 85 66\
-ce 26 de 87 30 e7 2f 9c ca 73 76 41 c2 44 15 94\
-20 63 70 28 df 0a 18 07 9d 62 08 ea 8b 47 11 a2\
-c7 50 f5
-Salt: \
-c0 a4 25 31 3d f8 d7 56 4b d2 43 4d 31 15 23 d5\
-25 7e ed 80
-Signature: \
-58 61 07 22 6c 3c e0 13 a7 c8 f0 4d 1a 6a 29 59\
-bb 4b 8e 20 5b a4 3a 27 b5 0f 12 41 11 bc 35 ef\
-58 9b 03 9f 59 32 18 7c b6 96 d7 d9 a3 2c 0c 38\
-30 0a 5c dd a4 83 4b 62 d2 eb 24 0a f3 3f 79 d1\
-3d fb f0 95 bf 59 9e 0d 96 86 94 8c 19 64 74 7b\
-67 e8 9c 9a ba 5c d8 50 16 23 6f 56 6c c5 80 2c\
-b1 3e ad 51 bc 7c a6 be f3 b9 4d cb db b1 d5 70\
-46 97 71 df 0e 00 b1 a8 a0 67 77 47 2d 23 16 27\
-9e da e8 64 74 66 8d 4e 1e ff f9 5f 1d e6 1c 60\
-20 da 32 ae 92 bb f1 65 20 fe f3 cf 4d 88 f6 11\
-21 f2 4b bd 9f e9 1b 59 ca f1 23 5b 2a 93 ff 81\
-fc 40 3a dd f4 eb de a8 49 34 a9 cd af 8e 1a 9e
-Test: Verify
-Comment: RSASSA-PSS Signature Example 9.2
-Message: \
-c8 c9 c6 af 04 ac da 41 4d 22 7e f2 3e 08 20 c3\
-73 2c 50 0d c8 72 75 e9 5b 0d 09 54 13 99 3c 26\
-58 bc 1d 98 85 81 ba 87 9c 2d 20 1f 14 cb 88 ce\
-d1 53 a0 19 69 a7 bf 0a 7b e7 9c 84 c1 48 6b c1\
-2b 3f a6 c5 98 71 b6 82 7c 8c e2 53 ca 5f ef a8\
-a8 c6 90 bf 32 6e 8e 37 cd b9 6d 90 a8 2e ba b6\
-9f 86 35 0e 18 22 e8 bd 53 6a 2e
-Salt: \
-b3 07 c4 3b 48 50 a8 da c2 f1 5f 32 e3 78 39 ef\
-8c 5c 0e 91
-Signature: \
-80 b6 d6 43 25 52 09 f0 a4 56 76 38 97 ac 9e d2\
-59 d4 59 b4 9c 28 87 e5 88 2e cb 44 34 cf d6 6d\
-d7 e1 69 93 75 38 1e 51 cd 7f 55 4f 2c 27 17 04\
-b3 99 d4 2b 4b e2 54 0a 0e ca 61 95 1f 55 26 7f\
-7c 28 78 c1 22 84 2d ad b2 8b 01 bd 5f 8c 02 5f\
-7e 22 84 18 a6 73 c0 3d 6b c0 c7 36 d0 a2 95 46\
-bd 67 f7 86 d9 d6 92 cc ea 77 8d 71 d9 8c 20 63\
-b7 a7 10 92 18 7a 4d 35 af 10 81 11 d8 3e 83 ea\
-e4 6c 46 aa 34 27 7e 06 04 45 89 90 37 88 f1 d5\
-e7 ce e2 5f b4 85 e9 29 49 11 88 14 d6 f2 c3 ee\
-36 14 89 01 6f 32 7f b5 bc 51 7e b5 04 70 bf fa\
-1a fa 5f 4c e9 aa 0c e5 b8 ee 19 bf 55 01 b9 58
-Test: Verify
-Comment: RSASSA-PSS Signature Example 9.3
-Message: \
-0a fa d4 2c cd 4f c6 06 54 a5 50 02 d2 28 f5 2a\
-4a 5f e0 3b 8b bb 08 ca 82 da ca 55 8b 44 db e1\
-26 6e 50 c0 e7 45 a3 6d 9d 29 04 e3 40 8a bc d1\
-fd 56 99 94 06 3f 4a 75 cc 72 f2 fe e2 a0 cd 89\
-3a 43 af 1c 5b 8b 48 7d f0 a7 16 10 02 4e 4f 6d\
-df 9f 28 ad 08 13 c1 aa b9 1b cb 3c 90 64 d5 ff\
-74 2d ef fe a6 57 09 41 39 36 9e 5e a6 f4 a9 63\
-19 a5 cc 82 24 14 5b 54 50 62 75 8f ef d1 fe 34\
-09 ae 16 92 59 c6 cd fd 6b 5f 29 58 e3 14 fa ec\
-be 69 d2 ca ce 58 ee 55 17 9a b9 b3 e6 d1 ec c1\
-4a 55 7c 5f eb e9 88 59 52 64 fc 5d a1 c5 71 46\
-2e ca 79 8a 18 a1 a4 94 0c da b4 a3 e9 20 09 cc\
-d4 2e 1e 94 7b 13 14 e3 22 38 a2 de ce 7d 23 a8\
-9b 5b 30 c7 51 fd 0a 4a 43 0d 2c 54 85 94
-Salt: \
-9a 2b 00 7e 80 97 8b bb 19 2c 35 4e b7 da 9a ed\
-fc 74 db f5
-Signature: \
-48 44 08 f3 89 8c d5 f5 34 83 f8 08 19 ef bf 27\
-08 c3 4d 27 a8 b2 a6 fa e8 b3 22 f9 24 02 37 f9\
-81 81 7a ca 18 46 f1 08 4d aa 6d 7c 07 95 f6 e5\
-bf 1a f5 9c 38 e1 85 84 37 ce 1f 7e c4 19 b9 8c\
-87 36 ad f6 dd 9a 00 b1 80 6d 2b d3 ad 0a 73 77\
-5e 05 f5 2d fe f3 a5 9a b4 b0 81 43 f0 df 05 cd\
-1a d9 d0 4b ec ec a6 da a4 a2 12 98 03 e2 00 cb\
-c7 77 87 ca f4 c1 d0 66 3a 6c 59 87 b6 05 95 20\
-19 78 2c af 2e c1 42 6d 68 fb 94 ed 1d 4b e8 16\
-a7 ed 08 1b 77 e6 ab 33 0b 3f fc 07 38 20 fe cd\
-e3 72 7f cb e2 95 ee 61 a0 50 a3 43 65 86 37 c3\
-fd 65 9c fb 63 73 6d e3 2d 9f 90 d3 c2 f6 3e ca
-Test: Verify
-Comment: RSASSA-PSS Signature Example 9.4
-Message: \
-1d fd 43 b4 6c 93 db 82 62 9b da e2 bd 0a 12 b8\
-82 ea 04 c3 b4 65 f5 cf 93 02 3f 01 05 96 26 db\
-be 99 f2 6b b1 be 94 9d dd d1 6d c7 f3 de bb 19\
-a1 94 62 7f 0b 22 44 34 df 7d 87 00 e9 e9 8b 06\
-e3 60 c1 2f db e3 d1 9f 51 c9 68 4e b9 08 9e cb\
-b0 a2 f0 45 03 99 d3 f5 9e ac 72 94 08 5d 04 4f\
-53 93 c6 ce 73 74 23 d8 b8 6c 41 53 70 d3 89 e3\
-0b 9f 0a 3c 02 d2 5d 00 82 e8 ad 6f 3f 1e f2 4a\
-45 c3 cf 82 b3 83 36 70 63 a4 d4 61 3e 42 64 f0\
-1b 2d ac 2e 5a a4 20 43 f8 fb 5f 69 fa 87 1d 14\
-fb 27 3e 76 7a 53 1c 40 f0 2f 34 3b c2 fb 45 a0\
-c7 e0 f6 be 25 61 92 3a 77 21 1d 66 a6 e2 db b4\
-3c 36 63 50 be ae 22 da 3a c2 c1 f5 07 70 96 fc\
-b5 c4 bf 25 5f 75 74 35 1a e0 b1 e1 f0 36 32 81\
-7c 08 56 d4 a8 ba 97 af bd c8 b8 58 55 40 2b c5\
-69 26 fc ec 20 9f 9e a8
-Salt: \
-70 f3 82 bd df 4d 5d 2d d8 8b 3b c7 b7 30 8b e6\
-32 b8 40 45
-Signature: \
-84 eb eb 48 1b e5 98 45 b4 64 68 ba fb 47 1c 01\
-12 e0 2b 23 5d 84 b5 d9 11 cb d1 92 6e e5 07 4a\
-e0 42 44 95 cb 20 e8 23 08 b8 eb b6 5f 41 9a 03\
-fb 40 e7 2b 78 98 1d 88 aa d1 43 05 36 85 17 2c\
-97 b2 9c 8b 7b f0 ae 73 b5 b2 26 3c 40 3d a0 ed\
-2f 80 ff 74 50 af 78 28 eb 8b 86 f0 02 8b d2 a8\
-b1 76 a4 d2 28 cc ce a1 83 94 f2 38 b0 9f f7 58\
-cc 00 bc 04 30 11 52 35 57 42 f2 82 b5 4e 66 3a\
-91 9e 70 9d 8d a2 4a de 55 00 a7 b9 aa 50 22 6e\
-0c a5 29 23 e6 c2 d8 60 ec 50 ff 48 0f a5 74 77\
-e8 2b 05 65 f4 37 9f 79 c7 72 d5 c2 da 80 af 9f\
-bf 32 5e ce 6f c2 0b 00 96 16 14 be e8 9a 18 3e
-Test: Verify
-Comment: RSASSA-PSS Signature Example 9.5
-Message: \
-1b dc 6e 7c 98 fb 8c f5 4e 9b 09 7b 66 a8 31 e9\
-cf e5 2d 9d 48 88 44 8e e4 b0 97 80 93 ba 1d 7d\
-73 ae 78 b3 a6 2b a4 ad 95 cd 28 9c cb 9e 00 52\
-26 bb 3d 17 8b cc aa 82 1f b0 44 a4 e2 1e e9 76\
-96 c1 4d 06 78 c9 4c 2d ae 93 b0 ad 73 92 22 18\
-55 3d aa 7e 44 eb e5 77 25 a7 a4 5c c7 2b 9b 21\
-38 a6 b1 7c 8d b4 11 ce 82 79 ee 12 41 af f0 a8\
-be c6 f7 7f 87 ed b0 c6 9c b2 72 36 e3 43 5a 80\
-0b 19 2e 4f 11 e5 19 e3 fe 30 fc 30 ea cc ca 4f\
-bb 41 76 90 29 bf 70 8e 81 7a 9e 68 38 05 be 67\
-fa 10 09 84 68 3b 74 83 8e 3b cf fa 79 36 6e ed\
-1d 48 1c 76 72 91 18 83 8f 31 ba 8a 04 8a 93 c1\
-be 44 24 59 8e 8d f6 32 8b 7a 77 88 0a 3f 9c 7e\
-2e 8d fc a8 eb 5a 26 fb 86 bd c5 56 d4 2b be 01\
-d9 fa 6e d8 06 46 49 1c 93 41
-Salt: \
-d6 89 25 7a 86 ef fa 68 21 2c 5e 0c 61 9e ca 29\
-5f b9 1b 67
-Signature: \
-82 10 2d f8 cb 91 e7 17 99 19 a0 4d 26 d3 35 d6\
-4f bc 2f 87 2c 44 83 39 43 24 1d e8 45 48 10 27\
-4c df 3d b5 f4 2d 42 3d b1 52 af 71 35 f7 01 42\
-0e 39 b4 94 a6 7c bf d1 9f 91 19 da 23 3a 23 da\
-5c 64 39 b5 ba 0d 2b c3 73 ee e3 50 70 01 37 8d\
-4a 40 73 85 6b 7f e2 ab a0 b5 ee 93 b2 7f 4a fe\
-c7 d4 d1 20 92 1c 83 f6 06 76 5b 02 c1 9e 4d 6a\
-1a 3b 95 fa 4c 42 29 51 be 4f 52 13 10 77 ef 17\
-17 97 29 cd df bd b5 69 50 db ac ee fe 78 cb 16\
-64 0a 09 9e a5 6d 24 38 9e ef 10 f8 fe cb 31 ba\
-3e a3 b2 27 c0 a8 66 98 bb 89 e3 e9 36 39 05 bf\
-22 77 7b 2a 3a a5 21 b6 5b 4c ef 76 d8 3b de 4c
-Test: Verify
-Comment: RSASSA-PSS Signature Example 9.6
-Message: \
-88 c7 a9 f1 36 04 01 d9 0e 53 b1 01 b6 1c 53 25\
-c3 c7 5d b1 b4 11 fb eb 8e 83 0b 75 e9 6b 56 67\
-0a d2 45 40 4e 16 79 35 44 ee 35 4b c6 13 a9 0c\
-c9 84 87 15 a7 3d b5 89 3e 7f 6d 27 98 15 c0 c1\
-de 83 ef 8e 29 56 e3 a5 6e d2 6a 88 8d 7a 9c dc\
-d0 42 f4 b1 6b 7f a5 1e f1 a0 57 36 62 d1 6a 30\
-2d 0e c5 b2 85 d2 e0 3a d9 65 29 c8 7b 3d 37 4d\
-b3 72 d9 5b 24 43 d0 61 b6 b1 a3 50 ba 87 80 7e\
-d0 83 af d1 eb 05 c3 f5 2f 4e ba 5e d2 22 77 14\
-fd b5 0b 9d 9d 9d d6 81 4f 62 f6 27 2f cd 5c db\
-ce 7a 9e f7 97
-Salt: \
-c2 5f 13 bf 67 d0 81 67 1a 04 81 a1 f1 82 0d 61\
-3b ba 22 76
-Signature: \
-a7 fd b0 d2 59 16 5c a2 c8 8d 00 bb f1 02 8a 86\
-7d 33 76 99 d0 61 19 3b 17 a9 64 8e 14 cc bb aa\
-de ac aa cd ec 81 5e 75 71 29 4e bb 8a 11 7a f2\
-05 fa 07 8b 47 b0 71 2c 19 9e 3a d0 51 35 c5 04\
-c2 4b 81 70 51 15 74 08 02 48 79 92 ff d5 11 d4\
-af c6 b8 54 49 1e b3 f0 dd 52 31 39 54 2f f1 5c\
-31 01 ee 85 54 35 17 c6 a3 c7 94 17 c6 7e 2d d9\
-aa 74 1e 9a 29 b0 6d cb 59 3c 23 36 b3 67 0a e3\
-af ba c7 c3 e7 6e 21 54 73 e8 66 e3 38 ca 24 4d\
-e0 0b 62 62 4d 6b 94 26 82 2c ea e9 f8 cc 46 08\
-95 f4 12 50 07 3f d4 5c 5a 1e 7b 42 5c 20 4a 42\
-3a 69 91 59 f6 90 3e 71 0b 37 a7 bb 2b c8 04 9f
-Test: Verify
-Comment: Example 10: A 2048-bit RSA Key Pair
-Modulus: \
-a5 dd 86 7a c4 cb 02 f9 0b 94 57 d4 8c 14 a7 70\
-ef 99 1c 56 c3 9c 0e c6 5f d1 1a fa 89 37 ce a5\
-7b 9b e7 ac 73 b4 5c 00 17 61 5b 82 d6 22 e3 18\
-75 3b 60 27 c0 fd 15 7b e1 2f 80 90 fe e2 a7 ad\
-cd 0e ef 75 9f 88 ba 49 97 c7 a4 2d 58 c9 aa 12\
-cb 99 ae 00 1f e5 21 c1 3b b5 43 14 45 a8 d5 ae\
-4f 5e 4c 7e 94 8a c2 27 d3 60 40 71 f2 0e 57 7e\
-90 5f be b1 5d fa f0 6d 1d e5 ae 62 53 d6 3a 6a\
-21 20 b3 1a 5d a5 da bc 95 50 60 0e 20 f2 7d 37\
-39 e2 62 79 25 fe a3 cc 50 9f 21 df f0 4e 6e ea\
-45 49 c5 40 d6 80 9f f9 30 7e ed e9 1f ff 58 73\
-3d 83 85 a2 37 d6 d3 70 5a 33 e3 91 90 09 92 07\
-0d f7 ad f1 35 7c f7 e3 70 0c e3 66 7d e8 3f 17\
-b8 df 17 78 db 38 1d ce 09 cb 4a d0 58 a5 11 00\
-1a 73 81 98 ee 27 cf 55 a1 3b 75 45 39 90 65 82\
-ec 8b 17 4b d5 8d 5d 1f 3d 76 7c 61 37 21 ae 05
-PublicExponent: \
-01 00 01
-PrivateExponent: \
-2d 2f f5 67 b3 fe 74 e0 61 91 b7 fd ed 6d e1 12\
-29 0c 67 06 92 43 0d 59 69 18 40 47 da 23 4c 96\
-93 de ed 16 73 ed 42 95 39 c9 69 d3 72 c0 4d 6b\
-47 e0 f5 b8 ce e0 84 3e 5c 22 83 5d bd 3b 05 a0\
-99 79 84 ae 60 58 b1 1b c4 90 7c bf 67 ed 84 fa\
-9a e2 52 df b0 d0 cd 49 e6 18 e3 5d fd fe 59 bc\
-a3 dd d6 6c 33 ce bb c7 7a d4 41 aa 69 5e 13 e3\
-24 b5 18 f0 1c 60 f5 a8 5c 99 4a d1 79 f2 a6 b5\
-fb e9 34 02 b1 17 67 be 01 bf 07 34 44 d6 ba 1d\
-d2 bc a5 bd 07 4d 4a 5f ae 35 31 ad 13 03 d8 4b\
-30 d8 97 31 8c bb ba 04 e0 3c 2e 66 de 6d 91 f8\
-2f 96 ea 1d 4b b5 4a 5a ae 10 2d 59 46 57 f5 c9\
-78 95 53 51 2b 29 6d ea 29 d8 02 31 96 35 7e 3e\
-3a 6e 95 8f 39 e3 c2 34 40 38 ea 60 4b 31 ed c6\
-f0 f7 ff 6e 71 81 a5 7c 92 82 6a 26 8f 86 76 8e\
-96 f8 78 56 2f c7 1d 85 d6 9e 44 86 12 f7 04 8f
-Prime1: \
-cf d5 02 83 fe ee b9 7f 6f 08 d7 3c bc 7b 38 36\
-f8 2b bc d4 99 47 9f 5e 6f 76 fd fc b8 b3 8c 4f\
-71 dc 9e 88 bd 6a 6f 76 37 1a fd 65 d2 af 18 62\
-b3 2a fb 34 a9 5f 71 b8 b1 32 04 3f fe be 3a 95\
-2b af 75 92 44 81 48 c0 3f 9c 69 b1 d6 8e 4c e5\
-cf 32 c8 6b af 46 fe d3 01 ca 1a b4 03 06 9b 32\
-f4 56 b9 1f 71 89 8a b0 81 cd 8c 42 52 ef 52 71\
-91 5c 97 94 b8 f2 95 85 1d a7 51 0f 99 cb 73 eb
-Prime2: \
-cc 4e 90 d2 a1 b3 a0 65 d3 b2 d1 f5 a8 fc e3 1b\
-54 44 75 66 4e ab 56 1d 29 71 b9 9f b7 be f8 44\
-e8 ec 1f 36 0b 8c 2a c8 35 96 92 97 1e a6 a3 8f\
-72 3f cc 21 1f 5d bc b1 77 a0 fd ac 51 64 a1 d4\
-ff 7f bb 4e 82 99 86 35 3c b9 83 65 9a 14 8c dd\
-42 0c 7d 31 ba 38 22 ea 90 a3 2b e4 6c 03 0e 8c\
-17 e1 fa 0a d3 78 59 e0 6b 0a a6 fa 3b 21 6d 9c\
-be 6c 0e 22 33 97 69 c0 a6 15 91 3e 5d a7 19 cf
-ModPrime1PrivateExponent: \
-1c 2d 1f c3 2f 6b c4 00 4f d8 5d fd e0 fb bf 9a\
-4c 38 f9 c7 c4 e4 1d ea 1a a8 82 34 a2 01 cd 92\
-f3 b7 da 52 65 83 a9 8a d8 5b b3 60 fb 98 3b 71\
-1e 23 44 9d 56 1d 17 78 d7 a5 15 48 6b cb f4 7b\
-46 c9 e9 e1 a3 a1 f7 70 00 ef be b0 9a 8a fe 47\
-e5 b8 57 cd a9 9c b1 6d 7f ff 9b 71 2e 3b d6 0c\
-a9 6d 9c 79 73 d6 16 d4 69 34 a9 c0 50 28 1c 00\
-43 99 ce ff 1d b7 dd a7 87 66 a8 a9 b9 cb 08 73
-ModPrime2PrivateExponent: \
-cb 3b 3c 04 ca a5 8c 60 be 7d 9b 2d eb b3 e3 96\
-43 f4 f5 73 97 be 08 23 6a 1e 9e af aa 70 65 36\
-e7 1c 3a cf e0 1c c6 51 f2 3c 9e 05 85 8f ee 13\
-bb 6a 8a fc 47 df 4e dc 9a 4b a3 0b ce cb 73 d0\
-15 78 52 32 7e e7 89 01 5c 2e 8d ee 7b 9f 05 a0\
-f3 1a c9 4e b6 17 31 64 74 0c 5c 95 14 7c d5 f3\
-b5 ae 2c b4 a8 37 87 f0 1d 8a b3 1f 27 c2 d0 ee\
-a2 dd 8a 11 ab 90 6a ba 20 7c 43 c6 ee 12 53 31
-MultiplicativeInverseOfPrime2ModPrime1: \
-12 f6 b2 cf 13 74 a7 36 fa d0 56 16 05 0f 96 ab\
-4b 61 d1 17 7c 7f 9d 52 5a 29 f3 d1 80 e7 76 67\
-e9 9d 99 ab f0 52 5d 07 58 66 0f 37 52 65 5b 0f\
-25 b8 df 84 31 d9 a8 ff 77 c1 6c 12 a0 a5 12 2a\
-9f 0b f7 cf d5 a2 66 a3 5c 15 9f 99 12 08 b9 03\
-16 ff 44 4f 3e 0b 6b d0 e9 3b 8a 7a 24 48 e9 57\
-e3 dd a6 cf cf 22 66 b1 06 01 3a c4 68 08 d3 b3\
-88 7b 3b 00 34 4b aa c9 53 0b 4c e7 08 fc 32 b6
-Test: KeyPairValidAndConsistent
-Comment: RSASSA-PSS Signature Example 10.1
-Message: \
-88 31 77 e5 12 6b 9b e2 d9 a9 68 03 27 d5 37 0c\
-6f 26 86 1f 58 20 c4 3d a6 7a 3a d6 09
-Salt: \
-04 e2 15 ee 6f f9 34 b9 da 70 d7 73 0c 87 34 ab\
-fc ec de 89
-Signature: \
-82 c2 b1 60 09 3b 8a a3 c0 f7 52 2b 19 f8 73 54\
-06 6c 77 84 7a bf 2a 9f ce 54 2d 0e 84 e9 20 c5\
-af b4 9f fd fd ac e1 65 60 ee 94 a1 36 96 01 14\
-8e ba d7 a0 e1 51 cf 16 33 17 91 a5 72 7d 05 f2\
-1e 74 e7 eb 81 14 40 20 69 35 d7 44 76 5a 15 e7\
-9f 01 5c b6 6c 53 2c 87 a6 a0 59 61 c8 bf ad 74\
-1a 9a 66 57 02 28 94 39 3e 72 23 73 97 96 c0 2a\
-77 45 5d 0f 55 5b 0e c0 1d df 25 9b 62 07 fd 0f\
-d5 76 14 ce f1 a5 57 3b aa ff 4e c0 00 69 95 16\
-59 b8 5f 24 30 0a 25 16 0c a8 52 2d c6 e6 72 7e\
-57 d0 19 d7 e6 36 29 b8 fe 5e 89 e2 5c c1 5b eb\
-3a 64 75 77 55 92 99 28 0b 9b 28 f7 9b 04 09 00\
-0b e2 5b bd 96 40 8b a3 b4 3c c4 86 18 4d d1 c8\
-e6 25 53 fa 1a f4 04 0f 60 66 3d e7 f5 e4 9c 04\
-38 8e 25 7f 1c e8 9c 95 da b4 8a 31 5d 9b 66 b1\
-b7 62 82 33 87 6f f2 38 52 30 d0 70 d0 7e 16 66
-Comment: RSASSA-PSS Signature Example 10.2
-Message: \
-dd 67 0a 01 46 58 68 ad c9 3f 26 13 19 57 a5 0c\
-52 fb 77 7c db aa 30 89 2c 9e 12 36 11 64 ec 13\
-97 9d 43 04 81 18 e4 44 5d b8 7b ee 58 dd 98 7b\
-34 25 d0 20 71 d8 db ae 80 70 8b 03 9d bb 64 db\
-d1 de 56 57 d9 fe d0 c1 18 a5 41 43 74 2e 0f f3\
-c8 7f 74 e4 58 57 64 7a f3 f7 9e b0 a1 4c 9d 75\
-ea 9a 1a 04 b7 cf 47 8a 89 7a 70 8f d9 88 f4 8e\
-80 1e db 0b 70 39 df 8c 23 bb 3c 56 f4 e8 21 ac
-Salt: \
-8b 2b dd 4b 40 fa f5 45 c7 78 dd f9 bc 1a 49 cb\
-57 f9 b7 1b
-Signature: \
-14 ae 35 d9 dd 06 ba 92 f7 f3 b8 97 97 8a ed 7c\
-d4 bf 5f f0 b5 85 a4 0b d4 6c e1 b4 2c d2 70 30\
-53 bb 90 44 d6 4e 81 3d 8f 96 db 2d d7 00 7d 10\
-11 8f 6f 8f 84 96 09 7a d7 5e 1f f6 92 34 1b 28\
-92 ad 55 a6 33 a1 c5 5e 7f 0a 0a d5 9a 0e 20 3a\
-5b 82 78 ae c5 4d d8 62 2e 28 31 d8 71 74 f8 ca\
-ff 43 ee 6c 46 44 53 45 d8 4a 59 65 9b fb 92 ec\
-d4 c8 18 66 86 95 f3 47 06 f6 68 28 a8 99 59 63\
-7f 2b f3 e3 25 1c 24 bd ba 4d 4b 76 49 da 00 22\
-21 8b 11 9c 84 e7 9a 65 27 ec 5b 8a 5f 86 1c 15\
-99 52 e2 3e c0 5e 1e 71 73 46 fa ef e8 b1 68 68\
-25 bd 2b 26 2f b2 53 10 66 c0 de 09 ac de 2e 42\
-31 69 07 28 b5 d8 5e 11 5a 2f 6b 92 b7 9c 25 ab\
-c9 bd 93 99 ff 8b cf 82 5a 52 ea 1f 56 ea 76 dd\
-26 f4 3b aa fa 18 bf a9 2a 50 4c bd 35 69 9e 26\
-d1 dc c5 a2 88 73 85 f3 c6 32 32 f0 6f 32 44 c3
-Comment: RSASSA-PSS Signature Example 10.3
-Message: \
-48 b2 b6 a5 7a 63 c8 4c ea 85 9d 65 c6 68 28 4b\
-08 d9 6b dc aa be 25 2d b0 e4 a9 6c b1 ba c6 01\
-93 41 db 6f be fb 8d 10 6b 0e 90 ed a6 bc c6 c6\
-26 2f 37 e7 ea 9c 7e 5d 22 6b d7 df 85 ec 5e 71\
-ef ff 2f 54 c5 db 57 7f f7 29 ff 91 b8 42 49 1d\
-e2 74 1d 0c 63 16 07 df 58 6b 90 5b 23 b9 1a f1\
-3d a1 23 04 bf 83 ec a8 a7 3e 87 1f f9 db
-Salt: \
-4e 96 fc 1b 39 8f 92 b4 46 71 01 0c 0d c3 ef d6\
-e2 0c 2d 73
-Signature: \
-6e 3e 4d 7b 6b 15 d2 fb 46 01 3b 89 00 aa 5b bb\
-39 39 cf 2c 09 57 17 98 70 42 02 6e e6 2c 74 c5\
-4c ff d5 d7 d5 7e fb bf 95 0a 0f 5c 57 4f a0 9d\
-3f c1 c9 f5 13 b0 5b 4f f5 0d d8 df 7e df a2 01\
-02 85 4c 35 e5 92 18 01 19 a7 0c e5 b0 85 18 2a\
-a0 2d 9e a2 aa 90 d1 df 03 f2 da ae 88 5b a2 f5\
-d0 5a fd ac 97 47 6f 06 b9 3b 5b c9 4a 1a 80 aa\
-91 16 c4 d6 15 f3 33 b0 98 89 2b 25 ff ac e2 66\
-f5 db 5a 5a 3b cc 10 a8 24 ed 55 aa d3 5b 72 78\
-34 fb 8c 07 da 28 fc f4 16 a5 d9 b2 22 4f 1f 8b\
-44 2b 36 f9 1e 45 6f de a2 d7 cf e3 36 72 68 de\
-03 07 a4 c7 4e 92 41 59 ed 33 39 3d 5e 06 55 53\
-1c 77 32 7b 89 82 1b de df 88 01 61 c7 8c d4 19\
-6b 54 19 f7 ac c3 f1 3e 5e bf 16 1b 6e 7c 67 24\
-71 6c a3 3b 85 c2 e2 56 40 19 2a c2 85 96 51 d5\
-0b de 7e b9 76 e5 1c ec 82 8b 98 b6 56 3b 86 bb
-Comment: RSASSA-PSS Signature Example 10.4
-Message: \
-0b 87 77 c7 f8 39 ba f0 a6 4b bb db c5 ce 79 75\
-5c 57 a2 05 b8 45 c1 74 e2 d2 e9 05 46 a0 89 c4\
-e6 ec 8a df fa 23 a7 ea 97 ba e6 b6 5d 78 2b 82\
-db 5d 2b 5a 56 d2 2a 29 a0 5e 7c 44 33 e2 b8 2a\
-62 1a bb a9 0a dd 05 ce 39 3f c4 8a 84 05 42 45\
-1a
-Salt: \
-c7 cd 69 8d 84 b6 51 28 d8 83 5e 3a 8b 1e b0 e0\
-1c b5 41 ec
-Signature: \
-34 04 7f f9 6c 4d c0 dc 90 b2 d4 ff 59 a1 a3 61\
-a4 75 4b 25 5d 2e e0 af 7d 8b f8 7c 9b c9 e7 dd\
-ee de 33 93 4c 63 ca 1c 0e 3d 26 2c b1 45 ef 93\
-2a 1f 2c 0a 99 7a a6 a3 4f 8e ae e7 47 7d 82 cc\
-f0 90 95 a6 b8 ac ad 38 d4 ee c9 fb 7e ab 7a d0\
-2d a1 d1 1d 8e 54 c1 82 5e 55 bf 58 c2 a2 32 34\
-b9 02 be 12 4f 9e 90 38 a8 f6 8f a4 5d ab 72 f6\
-6e 09 45 bf 1d 8b ac c9 04 4c 6f 07 09 8c 9f ce\
-c5 8a 3a ab 10 0c 80 51 78 15 5f 03 0a 12 4c 45\
-0e 5a cb da 47 d0 e4 f1 0b 80 a2 3f 80 3e 77 4d\
-02 3b 00 15 c2 0b 9f 9b be 7c 91 29 63 38 d5 ec\
-b4 71 ca fb 03 20 07 b6 7a 60 be 5f 69 50 4a 9f\
-01 ab b3 cb 46 7b 26 0e 2b ce 86 0b e8 d9 5b f9\
-2c 0c 8e 14 96 ed 1e 52 85 93 a4 ab b6 df 46 2d\
-de 8a 09 68 df fe 46 83 11 68 57 a2 32 f5 eb f6\
-c8 5b e2 38 74 5a d0 f3 8f 76 7a 5f db f4 86 fb
-Comment: RSASSA-PSS Signature Example 10.5
-Message: \
-f1 03 6e 00 8e 71 e9 64 da dc 92 19 ed 30 e1 7f\
-06 b4 b6 8a 95 5c 16 b3 12 b1 ed df 02 8b 74 97\
-6b ed 6b 3f 6a 63 d4 e7 78 59 24 3c 9c cc dc 98\
-01 65 23 ab b0 24 83 b3 55 91 c3 3a ad 81 21 3b\
-b7 c7 bb 1a 47 0a ab c1 0d 44 25 6c 4d 45 59 d9\
-16
-Salt: \
-ef a8 bf f9 62 12 b2 f4 a3 f3 71 a1 0d 57 41 52\
-65 5f 5d fb
-Signature: \
-7e 09 35 ea 18 f4 d6 c1 d1 7c e8 2e b2 b3 83 6c\
-55 b3 84 58 9c e1 9d fe 74 33 63 ac 99 48 d1 f3\
-46 b7 bf dd fe 92 ef d7 8a db 21 fa ef c8 9a de\
-42 b1 0f 37 40 03 fe 12 2e 67 42 9a 1c b8 cb d1\
-f8 d9 01 45 64 c4 4d 12 01 16 f4 99 0f 1a 6e 38\
-77 4c 19 4b d1 b8 21 32 86 b0 77 b0 49 9d 2e 7b\
-3f 43 4a b1 22 89 c5 56 68 4d ee d7 81 31 93 4b\
-b3 dd 65 37 23 6f 7c 6f 3d cb 09 d4 76 be 07 72\
-1e 37 e1 ce ed 9b 2f 7b 40 68 87 bd 53 15 73 05\
-e1 c8 b4 f8 4d 73 3b c1 e1 86 fe 06 cc 59 b6 ed\
-b8 f4 bd 7f fe fd f4 f7 ba 9c fb 9d 57 06 89 b5\
-a1 a4 10 9a 74 6a 69 08 93 db 37 99 25 5a 0c b9\
-21 5d 2d 1c d4 90 59 0e 95 2e 8c 87 86 aa 00 11\
-26 52 52 47 0c 04 1d fb c3 ee c7 c3 cb f7 1c 24\
-86 9d 11 5c 0c b4 a9 56 f5 6d 53 0b 80 ab 58 9a\
-cf ef c6 90 75 1d df 36 e8 d3 83 f8 3c ed d2 cc
-Comment: RSASSA-PSS Signature Example 10.6
-Message: \
-25 f1 08 95 a8 77 16 c1 37 45 0b b9 51 9d fa a1\
-f2 07 fa a9 42 ea 88 ab f7 1e 9c 17 98 00 85 b5\
-55 ae ba b7 62 64 ae 2a 3a b9 3c 2d 12 98 11 91\
-dd ac 6f b5 94 9e b3 6a ee 3c 5d a9 40 f0 07 52\
-c9 16 d9 46 08 fa 7d 97 ba 6a 29 15 b6 88 f2 03\
-23 d4 e9 d9 68 01 d8 9a 72 ab 58 92 dc 21 17 c0\
-74 34 fc f9 72 e0 58 cf 8c 41 ca 4b 4f f5 54 f7\
-d5 06 8a d3 15 5f ce d0 f3 12 5b c0 4f 91 93 37\
-8a 8f 5c 4c 3b 8c b4 dd 6d 1c c6 9d 30 ec ca 6e\
-aa 51 e3 6a 05 73 0e 9e 34 2e 85 5b af 09 9d ef\
-b8 af d7
-Salt: \
-ad 8b 15 23 70 36 46 22 4b 66 0b 55 08 85 91 7c\
-a2 d1 df 28
-Signature: \
-6d 3b 5b 87 f6 7e a6 57 af 21 f7 54 41 97 7d 21\
-80 f9 1b 2c 5f 69 2d e8 29 55 69 6a 68 67 30 d9\
-b9 77 8d 97 07 58 cc b2 60 71 c2 20 9f fb d6 12\
-5b e2 e9 6e a8 1b 67 cb 9b 93 08 23 9f da 17 f7\
-b2 b6 4e cd a0 96 b6 b9 35 64 0a 5a 1c b4 2a 91\
-55 b1 c9 ef 7a 63 3a 02 c5 9f 0d 6e e5 9b 85 2c\
-43 b3 50 29 e7 3c 94 0f f0 41 0e 8f 11 4e ed 46\
-bb d0 fa e1 65 e4 2b e2 52 8a 40 1c 3b 28 fd 81\
-8e f3 23 2d ca 9f 4d 2a 0f 51 66 ec 59 c4 23 96\
-d6 c1 1d bc 12 15 a5 6f a1 71 69 db 95 75 34 3e\
-f3 4f 9d e3 2a 49 cd c3 17 49 22 f2 29 c2 3e 18\
-e4 5d f9 35 31 19 ec 43 19 ce dc e7 a1 7c 64 08\
-8c 1f 6f 52 be 29 63 41 00 b3 91 9d 38 f3 d1 ed\
-94 e6 89 1e 66 a7 3b 8f b8 49 f5 87 4d f5 94 59\
-e2 98 c7 bb ce 2e ee 78 2a 19 5a a6 6f e2 d0 73\
-2b 25 e5 95 f5 7d 3e 06 1b 1f c3 e4 06 3b f9 8f
-Test: Verify
diff --git a/src-cryptopp/TestVectors/rw.txt b/src-cryptopp/TestVectors/rw.txt
deleted file mode 100644
index 3846c89..0000000
--- a/src-cryptopp/TestVectors/rw.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-AlgorithmType: Signature
-Name: RW/EMSA2(SHA-1)
-Source: generated by Wei Dai using Crypto++ 5.1
-Comment: 1024-bit RW key
-KeyFormat: Component
-Modulus: \
-    e5eb47bc1f82db3001faaeabc5bbe71b7d307b431889ac10255262281ec5f5af\
-    8a790bd7bbec5efffa442cf2c3fd5ca4778763b9d15aeac0b9b71bdb13da8272\
-    7f4967ac685975f8ff05a763c864d100b7cc1142102aa2dd343ea1a0ab530255\
-    195c3a6400ecab7b27eff9b01ef6d37381fa6fb5401347f195354396772e8285
-Prime1: \
-    ef86dd7af3f32cde8a9f6564e43a559a0c9f8bad36cc25330548b347ac158a34\
-    5631fa90f7b873c36effae2f7823227a3f580b5dd18304d5932751e743e9281b
-Prime2: \
-    f5bb4289c389d9019c36f96c6b81fffbf20be0620c6343e2b800aefb1b55a330\
-    8cc1402da7a2a558579a2a5146b30cb08e3f20b501081248f2f1de36cdfce9df
-MultiplicativeInverseOfPrime2ModPrime1: \
-    88813a3d50b7c301948ee1985db19c9fd33a47c78c977024745e10483d9cc4f0\
-    f573597ce564a91421d1d7457bc45a971f7d8b31403298da77799b57cf9a76de
-PublicExponent: 02
-Test: KeyPairValidAndConsistent
-Message: 2CA039854B55688740E3
-Signature: 1AF029CBEC9C692CE5096E73E4E9A52EC9A28D207A5511CCEC7681E5E3D867A4AE2E22DE4909D89196A272F1B50DE6FA3248BCA334D46E0D57171A790B6F4697E7BA7047DB79DECD47BD21995243DEBBF25915DDBC93C45875C14DE953792257C5C6825C905AFF40109C8CC7E793123D47AC1B5B6304A436CFA9BEEC8E0054E7
-Test: Verify
-Message: 2A51DF4AF88613D91A37
-Signature: 6FF18F4471E1A8F850C910A181A9F28E69AACD8E8126969605E000A853197541AF9047E5D17315BF062B9CD8DF91196F0343285D9E31D5C72560C156782B6D0E5AF8F06D7DCDD8CABEC01B2438C168C40C21F6A8794648361BD2AEE13573A49ECA07A7EED97C0B9C5B1E508869E4CFD5FE1771924B1CF5A4BFF7D4379E5CD59F
-Test: Verify
-Message: 1CF8DDD95D780A89D7CF
-Signature: 539C266B0313E0E256ED98EEF13E6AE64CED90C160A4999B3D47CBDA5285DAB0E0678C0E079CE9B8EB23E10EDFACFC19A80EEBB8F38ED5B5D6C8A988AB8CEC40A5A5BA102F75586167EAB6D5BF0CE8FF30C656895800F6F1B37D69FBBAF9055F7505DBEB537C0F986A1B5F0270DC12A640FFCB626F9763FDCFEFA1208C104003
-Test: Verify
-Message: 2119A954F1AC0F3DCDB2
-Signature: 60C3CCF4F086B15B7F850B445F384333F7AE5A4B5EDE2820C7233239E1B86D6E4B4FCA4F50B087CE1DF17DA5D62672A17F2CF87A2875BBD9B138CAF6863821D6A4D553E9EB64C9254A8F9A6B960E57E39069D65E3F561AA1FA91643D42FEEFB9270D34AB0861DEA1E234EA587F580503D46A1989D413DAC2FFE0FC4CA663CE68
-Test: Verify
-Message: F6959926E6D9D37D8BC0
-Signature: 249E1066542618CE0D236A7174708F801E7AB257931E9967A65C483ED66FB58598F99B6664AF0EAE221E2A6B271D7D17875ED02BF7FE35AA0786023858521CB79FEE0D134D9DDA609B0270FC9804BB6BF74AD90AE11EB339353533DC0D5A69E6B8758212B86024ED563767EA5D9B59655E0B8CC21244F720BA4ED663BF668E3A
-Test: Verify
-Message: 7A4C634DE6F16315BD5F
-Signature: 308A5D65224201BED626CC83FB901EC84874EE03B2E7AB4E752EDBDE024C754E3CC9841CA062100A8843DE9183354B4E0596E8C68F1605828287884F0F9BA6968FC7A9F0CA09418A8485B90465E5D3F96CE4995A5FC7A6E5ABD9CC06BB8A2C3C8109F72EAE67FB4C108852C881CA645B3C5586F27F12FF3028ADE56E32AD9434
-Test: Verify
-Comment: 1032-bit RW key
-KeyFormat: Component
-Modulus: \
-    b660eb18786256c993ebc6dcb5892eac342f6d91229b73dc5d04f1afb9bb0dd4\
-    eb0b48895f514b4c9afeaf86e91226f2299126d37528ce374e89cc312c06f47c\
-    81112bf5ca60ffc33b98318e04a17627269f1af461b6cb40f3be03b0113fb2d8\
-    404e154c7191306b36fd3efa73c784ad9189115d0bb1bd82b850d000e7cc8d20\
-    35
-Prime1: \
-    0bc31c063f43b3ade2cd633d554913339071d6ebed5fd665fc5dd7d47b80721a\
-    976c3b14fbd253f0f988c354725289f2897d7fb62c5c74af7d597a1e22aafba1\
-    d3
-Prime2: \
-    0f816bf0add559afda38b008e4087f6a38b575c56fff453056eaaab3381c9552\
-    0969546f954d458d48e44850938b1db471cf4b40afc47e067fb5bce67ba98be8\
-    d7
-MultiplicativeInverseOfPrime2ModPrime1: \
-    0b684eeec75b3e24e2d9947341b3f462258628af6f0b881396c887fe26a3408c\
-    40b13370710c82dd4a021a87bbaab5c0fc96cb1d015a783a764a8ab7b002903d\
-    21
-PublicExponent: 02
-Test: KeyPairValidAndConsistent
-Message: EF0F1D56F4E5D587C212
-Signature: 3E544FEBB6623F5D392003B729FE2BFC20E2CB3ECAC22734DFCA55150254E616A41C5E54CE3B50FBC2FE2363EE9AF9B15C70615497B0A458F8AB6D850992EEEB56D65F87EA1BD6E2B4B7E40A0F5E1635C7DDB17110C61039CF712D3524C9C2C1F35D9163BE5C70276F46634514BE16EC09602782E88FE74EAEB2F50CBB0E3B5C4A
-Test: Verify
-Message: 2C9EA313EACF2C5DA43A
-Signature: 1FEFF88814BB53E447E1E955AC8F1AF597C15C3866033E337AFBAB8627306F2EC1276621FF2176C89323CE32EA20F6AEC2CC271F1ED749408B2A3E43A23A44D6A3F38DCDDCAB696B239110AA7ECF12C6681B0E97E6FFF1B72F4F6D796BF82B9450AB8B3D28CA9D220BDF84ACCEA1DA5EDA0B470C3A82BBDD77B4C2723297608BD4
-Test: Verify
-Message: EC5CC4228C3C70EE8F35
-Signature: 228BAA85062F10DCC9D99A23D340BC4B9E463D8AB86A6781A6D2143564303E2DC78772BF68449BE1E2711A68D5A15CF04A23573FB3870454308F583BBB5F2467069EF1395431E70F91BD56D846DC8DB2E88AB3D26A9770660B87A76D6C3575DE512BAFA8A0B901AD15B7D8E8BE2F176A182D16A9609F19A4298416245873175805
-Test: Verify
-Message: D81F0C6F2D3D60EE19FE
-Signature: 17EAA0C18178CD45A2B9100997F682E5F02BE09FBE4D8F345033951345CE98C8B3F13F2CA2A950CE7BDCBF83DBB700890E1F0B863D04C3ADB298F546A8F09F4DA4EF0DC6E7317207CB3CF691114E55D9EAA11C53BE55F7C214F62E6B0460DFA60C55B16EB55B29C9DBB908266C1BDBB03AD651EFB91905B142D852DCA0C4E3BBEE
-Test: Verify
-Message: FEF5EE07C74118DA30B9
-Signature: 2637E16E2599B6EC2F4728C73D3B29F483C2B881F1E1969C426027605EF080E9B17D258D5E1EBC6472A2501E04CF19C144537FCB38A1DA00D948EBD39FA11322D9230B62E2C12AEDB366BD85A2089588A8D52E941FD986D89828A342B83438A960B6FD87E9AD025AD75A692AA9DFEA873A9467B42D84879E85C5D11EFAB347FBED
-Test: Verify
-Message: 0B9554FFE4F6ADAB2C76
-Signature: 095952F24D9FBEF3A93A932865F4BDBB522CF24EBE153CE4BBB24CF301A1C7B51FE47B94F8F8B211CBC5A926FF6BAF9A6BBF7E15975D2DCCB95EF01AB7E641687870B0D01FC18B6B16FE17D3FC82931FBBCD4FD18C7F9588CEE8491876D72F98F2E7EEA90C12907210D6859053ADC7178B87BF8B4826954D6986FE761E71E1B7EA
-Test: Verify
-Comment: 1536-bit RW key
-KeyFormat: Component
-Modulus: \
-    9f8f8ab78ad635c71c9ef0fce9d4a958a9013ed69fcd67c385722668d4357c32\
-    3732c78179eaa17984531ba570aa0721a1e228957b1008010f1a2d6c42e09847\
-    9ffeaff9bbfeb3c8e101f968fc7ac74cfba210f76a6da160e65934d216368763\
-    8f59e414dc6f0448c0b4052c90f7dc565d32acae5da04e3e157dca184aba8362\
-    bb28a2da6915d51d65f54fbeee69104a5a1b2304b87230c504b126dcf1c377cf\
-    1777b93be6903b50a44f054ae233b7cc24f950ded467cb8ffbdb17e7b6937605
-Prime1: \
-    d0505c510a3b38a139d6d139818b04251d6ca46c2e717cfafbeebcd5fff8ae62\
-    de4698e3241784f05e8c86f0f996db77259ebaac6983f092853639f619b75701\
-    e562408cc1f5c543cada21fc26af36905b10a0df5b111efd754666bb3db4be63
-Prime2: \
-    c41623ccb51e2474eb3dc5c2ef42cfd320a285ef7aefc1d1edcd5f566549cb79\
-    7285f01c89b9f749ca506b717c2a45b708fec2e7d611c5eee6af0a6d61219c7d\
-    cab18961e98eea3b7797c61a75aed21d411de4fcf4a009a8238a832dd6e41277
-MultiplicativeInverseOfPrime2ModPrime1: \
-    bc1ceeed917217387ead12254cfc183f82c79709499f510ce093d6d28bc1bf2b\
-    fabc3d86d64a1c807605bd57f9ec533745d6e359270885c3eb7a36a02dff7137\
-    9bd453bf3fdc282afa2295d5e393f1c2c74edcbd2374c7740e8135ef0b8af258
-PublicExponent: 02
-Test: KeyPairValidAndConsistent
-Message: 400AEF79EDBCEA796D71
-Signature: 15EB5A68CBCB0D6313BB2D14436237A716AC3159B059FBC29931933DB802D6925C01BDC6D90DD0DA25980F1C8199AB9CD3FD105A63D13B5C0101A0430455334492038FBE029BF4EE61F8A2F88D2A6D5424DE7C0CC314B5EA4F867B35224D574463BDE78B71904033C1455484865EB80AE1C2A7D1C229CD0A4D49C0F06A26E264AD42ACAA131F8C0C5EA4DC9EB5BD349D1EE12B3F91F4B9F2DABC3BCF0E216D4A34A3541169955BE45289CECE16DA6BC5352FF31D66538F64308D6FBB9C7DDE72
-Test: Verify
-Message: 63F64BFAD5B830682F44
-Signature: 1003E58A73B018FF9F0F66D3BE9A8DD9D83097A0EB216AEEAA75B63C150AAE9E8BE2A5DE426D18FBC56865F4C9CA51A9BB6E99B70C59B7995246A1F4327C9E4A69517131DA66DDE98AE5D8355527D1C5E4D83CC7ED7B3B1F404F6FDF731DA615974F0777CD22C1E6FAA3569D1141900734C7F3262FE7B9ED291A934DE81A06EBF258F7159DE842737A32DAEC79EFE211C2739D3F5859CB9A633D2A16D78C347790241925C3E776F04B5D5F1900A7B48645DF16DC6F9E8C990AEFEE22FA1DA496
-Test: Verify
-Message: B6AAE87E8D469A16A335
-Signature: 368EE32DDF9D5526E50B1645473DB79CE4B0EF3801F3DF050E8B6B10DFAA600A505FD1C91CAE1CD8CB8FA7BC2F81EDFEE7E74DCF7BDA9ED4FF87C39650E8A473672FD012A6A57C5DC44FFBBDA4A5DECD099A32791CEDC6170C8B367080792713041350D2483B27924822DD886A36EE575A3CD6C097162F758F5628D3EA301050AC848F0ACAEDAB8AD34D436E418AA53618AFAFC3168B7CFA641B1A88C86007FD1EDD8FE1D1A94FCE59B548DA3D8FE313A0A97719E19C857560763EFF1682CC14
-Test: Verify
-Message: DB0F126516E3EDFF3D7C
-Signature: 42076C3F6976EF4BBEAFEF0B4F7A8198CACE6F73436C59DF212474C94D00B0501C359CAB8950EB8937E8458964C817926A3181EED64EAB3A5274A9B3114406F62A62C51F4EDBEEF3BD948C21578996236D6D477B2701DD5A4818B08F5D4740CD23064798C3406133D0758D51717DB4575117DE887733D1E7170AA0845A81535444A962F2003A46361E8A8A1914DA6732C37334320F155E90E18D9E2A921034BEC81395AF69D61E22FEF90BC4F9127914B536BD2477552166C11F139519129864
-Test: Verify
-Message: A58B1E5E98C44A8680BD
-Signature: 100B8692C7A09EFB585A63B5D636EABFE9DDFE50D5235B11BDFD818D1810893B327ACC3B78942900C8F7498BDC1D2FB44330ADD3FEBC709046D8028F38AA7DCC768558E7D6469EDA306C0FCAE001C7B01544C80043864761355888C13960DD53BBD7854F2FBB7D9DE021BAD69769418712B6335A8C63143329363C65CB4170AA0C040559136EA9C19A6793024AF77BCF3EE793CAEDF07FD8A8E2C9C29B5F225F399BBA177D070314E319359394DB999D866A48D591EE8C662BA6394E396300FE
-Test: Verify
-Message: 7AF0498714B0D93AB959
-Signature: 35A959E3717468552590C26FA92009C3866955A1D14405AD33D3FA745D7591521A323BA031070B1FB60A1B6FE0C7198FC14EA41CE62EB6EB060FD073E816C9C85BB6251BF5235567E12951778A61D87F117137C347DE56337FBF9A3360D49330A98248233719FF862F83F772AC887F035820579F406D221191F4535ABA37401FF6E28216EC06AB8832D9AB3EAE4E1D3D780A1FA46883A79B657A7027597BCE4F21744CFC3704A449A204D3790F668E2EB710D5CF031BAA58359D35DDF92455D7
-Test: Verify
-Comment: 2048-bit RW key
-KeyFormat: Component
-Modulus: \
-    b6dee7375bf4385043b3cc2ac5cacbc14ad11a17574738dd2bd84d2d1e6c74e1\
-    6066c2a5c35bc3b87839858afb5ee5e8abfab408f38772866f6f833f39fab248\
-    3a2c34ed55ad7098f9f63d4ec70b7950f02daaaab10781a0008f993c4027e381\
-    6bfd45c52f59452a7b28873513dce415a84fc8bc06601567f91ec41647da2304\
-    5b6e01e24516724acc02947ad5aa2dba4d952bc4f49d18ada0b0f7cc5d488814\
-    b921c0bc2b33d8828d80130df7d79b0992cec40d3bc7217d4a4dff3699345e44\
-    dac968575194845aa7b60dcf3c712d9b0a384824c3579b40dba265457d50f69f\
-    02a140884d89b7fdee9f0a787e76a37c58c92cf2d3818c72097d41b3faa7aa95
-Prime1: \
-    fa880a456f9c205a26e02c3357536531dec150be0ef8747f69ea30d987ff7dd8\
-    9e9a1075ebd39f04fa495bd26d8408a8de69113a9fbb52f20713d1d046a76b47\
-    8cf77c46454a7afda2ef418f63faf67c947d898bca109f3275999e8f2e60e2c0\
-    eec133ff69e71a2d396632670b52d8ea03f7589d8144ab580b1d3e60efa1280b
-Prime2: \
-    badcc718dd2d761c4893c4831d56ada30fc5c7c148d473bedf7615b7e821b92f\
-    319676ce278349f1309fb3d264c1a22bde71b221354c7a4d31117b3ec3c9d480\
-    2e0a26bd8ec05d28b6502c65f35c687af7f8396b963ed029a2c5ae38dd7c5c96\
-    2a953c113c0f590957ab19a6e2afda6db84f22c0c31ae243debd2920fbe9fbdf
-MultiplicativeInverseOfPrime2ModPrime1: \
-    48a56f93e044a8211861da6bde9ab61265c63e168e507b56cd6e6e5f4de57c2f\
-    5c0b626462d6c06790cf561fa12a350dc0c08767f2717914183fac90db36495a\
-    91c0e9c0fbcfef19c85075b3b744fc378a9f2045cd7fd144ecd39bd1a59f1483\
-    10f6982efb3ffe502b279c4c0cb2a7f9ef64ca8f38690c486afb5f659cf7f838
-PublicExponent: 02
-Test: KeyPairValidAndConsistent
-Message: 00AA5515CDAE5CD0F0DC
-Signature: 30EECA6B48D796552F5A6A3C11F28D730FA077422CAAB34FDEB879AE0F71DF21330E2F3BE5BF3A8CA372EBCD3DFA7C81B3398C31B0972D0B857926CB39732351AACEB8276D52B9D82F9C245FA0F1CF49E785A2BC00FF27FBCF777F84D05BEF17FCC0505820B029AC8F0CE17D2469372CE47E1428BB941004FE170EF87163E07298EFFCC1BFA7E7CB1F572C340CAA075A5962A15B69CE937BC7EFB492F501FC88CBF0119C351C8498782091EF6EFB19120195E5FF51DF86F90E90FAEB225AA2EE43AB4E8358101C0348C7E3859B9DEBA19464C74B74AC48A0B73FC8D2E7F8033E86208F0792B6E5B6DE36C99DEF604949811D1671EF6B0A4781B4E7A0A72AD855
-Test: Verify
-Message: B8E2FB9EAE22FB2C0021
-Signature: 416D33F8C213CF81F805F54FC1D4E7C6A588A0965F1C9CAEEA1D41452E20935AAF2D30F957584B56621035430212A428E27A2F687CA9DBB596C19864AE692EF7BBA730F3D70CC2DDE15AB71E1E350C0C316EFA1A831ACD1441598B112482487DF72F58ED318182C7CD0906FE39C5655BF1313F29A15D60A6178CBF600C7FBFF8994840ED649C3C4026A463B3EA39C692B7D112B128BE49E1E32D4A7FF8D4513283D8DCD9CCB8FB7300BE0BDD4C44DAA2F7049B3AD83437093E623442AC69B48911CDA21E95E0775041F67F6E6AE01DCE646AEC20908E7C1B693600FE41ABA85AC0C778641E46C419083E41773C749DB3E1BD8FD764E271860D2D7F8E11BD6AB3
-Test: Verify
-Message: 8C8C306A629373BAE647
-Signature: 0E9A00045FFD399D9DA9D0D7E543CF9FFD098BC23E72DD7763A64F22C7F0479CE866E31438B8F7DE31A18F35AF419BED6C67BE1540614D3310DD24F019E14FCC3AF73743F4C143D4B79CDF35C752A300F0A8251CCFF4AAF18785C533A7DF1A20AFE6770DEBD1B8BA2C83B2E345A04F833CD173E998FF9840C2F8A370FFDCFF5FD95CBD71B25FC9972192470FD145975344F64C2F6D68CB3513F48F9FC070021BEE8F6A4282D098C44DF655CE415E89B97994AE3ABE85986C7EE0AC348EF2A4F52D102EA80836E77E81AD3678803E53C83CF2F30D2D4950FB6B038CCB3F2690A9381EB34D6C09E88C090AB05E28047DC490EB8A1282FEB38E82FB0B18309284C4
-Test: Verify
-Message: 15E7B7B7ED0F176B6799
-Signature: 39FF4B5FA50AE498F3C91A655E6865840D1FC401EE02DBC8460A59DEB8816E6680F712B7BAF8D4DC11A3B54BF906BE698306F0449BB43F3F223B944D930A1A3C718E8A9E2EEDEC5A07AB817C26A80CC2A2EE2846A597EAB8A999D38DB98490166F2574524038BBDF24B4E4622C843210C6B94987638C6976562EA9727385B152614C18349BD54AD95DE33D5354954B505E5259CCDA47E3CECEF3154F6E5481E536BAB568146A0BFCB66573714A7BA7ABE0385115720687F33D9C6EF6BB60272F1272CF349990E3A2FBCCE180B730792101089B164AE5A001F5263F7493AF148D6E0953E311AD12E4202D35F96DD30885663B5101F9B05675FCD2FCC4FCC4DDFF
-Test: Verify
-Message: B36724C92954C38D0288
-Signature: 3C8CD3614555568BBECA99174B7B203D0BC6FABE9E6FFE0C41EB4D9A2C601D2393CA1E01B7D7E99337758AC914C9F151311E5AE6708DAF1D8C825DA471652C6E13A8FE5802D7AE097BFC899A4EC8CA235B5982B9058C53AAD52823ACF692290EB8823C126635AB0BBF101C2B3149AB16183FA2DBB049DDB99C5E83723E4D4693CA3A08588AA868C677D42ABDAA6586EF192391D276C5E5AF0763ACCA6293F06250C51FDC2AD369CD44EB5F654E98761C881DDEC08E795FFB229B20522349B0714059E18B7B23A48875EAB12ED3F0A011D3A985DD7384B0046F39FA6C1A331F3D4C5125100BA58666935C68A7A10849D9C74850BAB82AE15EC950A283F3E7DAD8
-Test: Verify
-Message: FA95400C2B14E064F76A
-Signature: 3F67F9DBEB88E6AD057BEDC3D97030555A908867EC578A6CA572137CB61C21036AADE6DDC5592EC7CCB6B263E51B4C886A51904C858040E493D64B9ACE5BAA50C4A66D04ACCDFE0039D8541C4363DEFFCF93BDF5F5CC1FB64855D956B5EFD42D4C9B96B9CBAA97A32F02AAB307674E53404E6836DB5C96B59572ADBFD1113B87608ACE6D0898CB02E35575CC28D38A9FF8C1C4AD36BAA991DEFAB533F0A6C9C2F0F0815F1D659ED576E5DB18494A54B6817D9E34A134F3B9A0F1E8C77FC204B6EE087C0445A7036C935117E338D092F6E1FF4DF7605525C409456A5195233A176B29B2FD8FB2808D0412FCA0541B2BB6800BD8BB9DC9DC25230166071E8D961E
-Test: Verify
diff --git a/src-cryptopp/TestVectors/salsa.txt b/src-cryptopp/TestVectors/salsa.txt
deleted file mode 100644
index 8f18584..0000000
--- a/src-cryptopp/TestVectors/salsa.txt
+++ /dev/null
@@ -1,463 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: Salsa20
-Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/full/verified.test-vectors?rev=161&view=markup
-Comment: Set 1, vector#  0
-Key: 80000000000000000000000000000000
-IV: 0000000000000000
-Plaintext: r16 00000000
-Seek: 0
-Ciphertext: 4DFA5E481DA23EA09A31022050859936DA52FCEE218005164F267CB65F5CFD7F2B4F97E0FF16924A52DF269515110A07F9E460BC65EF95DA58F740B7D1DBB0AA
-Test: Encrypt
-Seek: 448
-Ciphertext: B375703739DACED4DD4059FD71C3C47FC2F9939670FAD4A46066ADCC6A5645783308B90FFB72BE04A6B147CBE38CC0C3B9267C296A92A7C69873F9F263BE9703
-Test: Encrypt
-Seek: 192
-Plaintext: r32 00000000
-Ciphertext: DA9C1581F429E0A00F7D67E23B730676783B262E8EB43A25F55FB90B3E753AEF8C6713EC66C51881111593CCB3E8CB8F8DE124080501EEEB389C4BCB6977CF95\
-7D5789631EB4554400E1E025935DFA7B3E9039D61BDC58A8697D36815BF1985CEFDF7AE112E5BB81E37ECF0616CE7147FC08A93A367E08631F23C03B00A8DA2F
-Test: Encrypt
-Comment: Set 3, vector#243
-Key: F3F4F5F6F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E0F101112
-IV: 0000000000000000
-Plaintext: r16 00000000
-Seek: 0
-Ciphertext: B4C0AFA503BE7FC29A62058166D56F8F5D27DC246F75B9AD8760C8C39DFD87492D3B76D5D9637F009EADA14458A52DFB09815337E72672681DDDC24633750D83
-Test: Encrypt
-Seek: 448
-Ciphertext: 5A5FB5C8F0AFEA471F0318A4A2792F7AA5C67B6D6E0F0DDB79961C34E3A564BA2EECE78D9AFF45E510FEAB1030B102D39DFCECB77F5798F7D2793C0AB09C7A04
-Test: Encrypt
-Seek: 192
-Plaintext: r32 00000000
-Ciphertext: DBBA0683DF48C335A9802EEF0252256354C9F763C3FDE19131A6BB7B85040624B1D6CD4BF66D16F7482236C8602A6D58505EEDCCA0B77AED574AB583115124B9\
-F0C5F98BAE05E019764EF6B65E0694A904CB9EC9C10C297B1AB1A6052365BB78E55D3C6CB9F06184BA7D425A92E7E987757FC5D9AFD7082418DD64125CA6F2B6
-Test: Encrypt
-Comment: Set 6, vector#  3
-Seek: 0
-Key: 0F62B5085BAE0154A7FA4DA0F34699EC3F92E5388BDE3184D72A7DD02376C91C
-IV: 288FF65DC42B92F9
-Plaintext: r131072 00
-CiphertextXorDigest: E00EBCCD70D69152725F9987982178A2E2E139C7BCBE04CA8A0E99E318D9AB76F988C8549F75ADD790BA4F81C176DA653C1A043F11A958E169B6D2319F4EEC1A
-Test: EncryptXorDigest
-AlgorithmType: SymmetricCipher
-Name: Salsa20
-Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/reduced/12-rounds/verified.test-vectors?rev=210&view=auto
-Comment: Set 1, vector#  0
-Rounds: 12
-Key: 80000000000000000000000000000000
-IV: 0000000000000000
-Plaintext: r64 00
-Seek: 0
-Ciphertext: FC207DBFC76C5E1774961E7A5AAD09069B2225AC1CE0FE7A0CE77003E7E5BDF8B31AF821000813E6C56B8C1771D6EE7039B2FBD0A68E8AD70A3944B677937897
-Test: Encrypt
-Seek: 192
-Ciphertext: 4B62A4881FA1AF9560586510D5527ED48A51ECAFA4DECEEBBDDC10E9918D44AB26B10C0A31ED242F146C72940C6E9C3753F641DA84E9F68B4F9E76B6C48CA5AC
-Test: Encrypt
-Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/reduced/8-rounds/verified.test-vectors?rev=210&view=auto
-Comment: Set 1, vector#  0
-Rounds: 8
-Key: 80000000000000000000000000000000
-IV: 0000000000000000
-Plaintext: r64 00
-Seek: 0
-Ciphertext: A9C9F888AB552A2D1BBFF9F36BEBEB337A8B4B107C75B63BAE26CB9A235BBA9D784F38BEFC3ADF4CD3E266687EA7B9F09BA650AE81EAC6063AE31FF12218DDC5
-Test: Encrypt
-Seek: 192
-Ciphertext: BB5B6BB2CC8B8A0222DCCC1753ED4AEB23377ACCBD5D4C0B69A8A03BB115EF71871BC10559080ACA7C68F0DEF32A80DDBAF497259BB76A3853A7183B51CC4B9F
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: XSalsa20
-Source: created by Wei Dai using naclcrypto-20090308
-Key: 1b27556473e985d462cd51197a9a46c76009549eac6474f206c4ee0844f68389
-IV: 69696ee955b62b73cd62bda875fc73d68219e0036b7a0b37
-Plaintext: r139 00
-Ciphertext: \
-eea6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff880\
-309e645a74e9e0a60d8243acd9177ab51a1beb8d5a2f5d700c093c5e55855796\
-25337bd3ab619d615760d8c5b224a85b1d0efe0eb8a7ee163abb0376529fcc09\
-bab506c618e13ce777d82c3ae9d1a6f972d4160287cbfe60bf2130fc0a6ff604\
-9d0a5c8a82f429231f0080
-Key: a6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff88030
-IV: 9e645a74e9e0a60d8243acd9177ab51a1beb8d5a2f5d700c
-Plaintext: 093c5e5585579625337bd3ab619d615760d8c5b224a85b1d0efe0eb8a7ee163abb0376529fcc09bab506c618e13ce777d82c3ae9d1a6f972d4160287cbfe60bf2130fc0a6ff6049d0a5c8a82f429231f008082e845d7e189d37f9ed2b464e6b919e6523a8c1210bd52a02a4c3fe406d3085f5068d1909eeeca6369abc981a42e87fe665583f0ab85ae71f6f84f528e6b397af86f6917d9754b7320dbdc2fea81496f2732f532ac78c4e9c6cfb18f8e9bdf74622eb126141416776971a84f94d156beaf67aecbf2ad412e76e66e8fad7633f5b6d7f3d64b5c6c69ce29003c6024465ae3b89be78e915d88b4b5621d
-Ciphertext: b2af688e7d8fc4b508c05cc39dd583d6714322c64d7f3e63147aede2d9534934b04ff6f337b031815cd094bdbc6d7a92077dce709412286822ef0737ee47f6b7ffa22f9d53f11dd2b0a3bb9fc01d9a88f9d53c26e9365c2c3c063bc4840bfc812e4b80463e69d179530b25c158f543191cff993106511aa036043bbc75866ab7e34afc57e2cce4934a5faae6eabe4f221770183dd060467827c27a354159a081275a291f69d946d6fe28ed0b9ce08206cf484925a51b9498dbde178ddd3ae91a8581b91682d860f840782f6eea49dbb9bd721501d2c67122dea3b7283848c5f13e0c0de876bd227a856e4de593a3
-Test: Encrypt
-IV: b2af688e7d8fc4b508c05cc39dd583d6714322c64d7f3e63
-Ciphertext: 418078fe843f5984dd3c7975d1ff51af4dceda640999aaa3c28618ae286ca15051cb4d55f9da22a213ef14a2b905b52c99a557854c7f2a6d6ed6f69c1c6649f3fb67b8628468029b3367920c2e1148aa1f3b9c695cb1426f09ce84045842946e0454e41ab1edb32cae4b95669de4e2ccaf00ba86ffeae6a9c5fce4153baddb0d8998a600537a9649939cb7d7a9c4e8cbca0fab77963abd516699879de0b1971dc7328668111ff5b77c253b9e6346d1a2ce6e390cd736156ad7f44b339cfb141f00e7a766c06e130b0c31d88980d2ad8814a2d641599162ab8af25d93067f06a49637eaf6523806b8fa07d56628bb
-Test: Resync
-Key: 9e1da239d155f52ad37f75c7368a536668b051952923ad44f57e75ab588e475a
-IV: af06f17859dffa799891c4288f6635b5c5a45eee9017fd72
-Plaintext: feac9d54fc8c115ae247d9a7e919dd76cfcbc72d32cae4944860817cbdfb8c04e6b1df76a16517cd33ccf1acda9206389e9e318f5966c093cfb3ec2d9ee2de856437ed581f552f26ac2907609df8c613b9e33d44bfc21ff79153e9ef81a9d66cc317857f752cc175fd8891fefebb7d041e6517c3162d197e2112837d3bc4104312ad35b75ea686e7c70d4ec04746b52ff09c421451459fb59f
-Ciphertext: 2c261a2f4e61a62e1b27689916bf03453fcbc97bb2af6f329391ef063b5a219bf984d07d70f602d85f6db61474e9d9f5a2deecb4fcd90184d16f3b5b5e168ee03ea8c93f3933a22bc3d1a5ae8c2d8b02757c87c073409052a2a8a41e7f487e041f9a49a0997b540e18621cad3a24f0a56d9b19227929057ab3ba950f6274b121f193e32e06e5388781a1cb57317c0ba6305e910961d01002f0
-Test: Encrypt
-IV: 2c261a2f4e61a62e1b27689916bf03453fcbc97bb2af6f32
-Ciphertext: 7030af4a9db8a6b95f55f962efefcc60d8ceb0d5d920e808cebd8cf6f31542d227a67c9db8888cfcb9410ae357f8a3da06a608a93b7fd5513978c6b8b837f6ecaafd3366495cdd3ab719d9d4c2ac74d6ea2eb117f30369ea62727fa6dc7982f668fa3bf44c9da8e70ff8c18b07d63aa01afe1311bdafc457d06c69aaea0dfbb1fc89d1574ad1e7be8b459d4cf36bdd88db0363219652089c50
-Test: Resync
-Key: d5c7f6797b7e7e9c1d7fd2610b2abf2bc5a7885fb3ff78092fb3abe8986d35e2
-IV: 744e17312b27969d826444640e9c4a378ae334f185369c95
-Plaintext: 7758298c628eb3a4b6963c5445ef66971222be5d1a4ad839715d1188071739b77cc6e05d5410f963a64167629757
-Ciphertext: 27b8cfe81416a76301fd1eec6a4d99675069b2da2776c360db1bdfea7c0aa613913e10f7a60fec04d11e65f2d64e
-Test: Encrypt
-IV: 27b8cfe81416a76301fd1eec6a4d99675069b2da2776c360
-Ciphertext: ed158a1dd07f4316d403af3e6977afaac8205d678b38fa5928c61e366ff27003143d5d20482a2ea76a50756225a4
-Test: Resync
-Key: 737d7811ce96472efed12258b78122f11deaec8759ccbd71eac6bbefa627785c
-IV: 6fb2ee3dda6dbd12f1274f126701ec75c35c86607adb3edd
-Plaintext: 501325fb2645264864df11faa17bbd58312b77cad3d94ac8fb8542f0eb653ad73d7fce932bb874cb89ac39fc47f8267cf0f0c209f204b2d8578a3bdf461cb6a271a468bebaccd9685014ccbc9a73618c6a5e778a21cc8416c60ad24ddc417a130d53eda6dfbfe47d09170a7be1a708b7b5f3ad464310be36d9a2a95dc39e83d38667e842eb6411e8a23712297b165f690c2d7ca1b1346e3c1fccf5cafd4f8be0
-Ciphertext: 6724c372d2e9074da5e27a6c54b2d703dc1d4c9b1f8d90f00c122e692ace7700eadca942544507f1375b6581d5a8fb39981c1c0e6e1ff2140b082e9ec016fce141d5199647d43b0b68bfd0fea5e00f468962c7384dd6129aea6a3fdfe75abb210ed5607cef8fa0e152833d5ac37d52e557b91098a322e76a45bbbcf4899e790618aa3f4c2e5e0fc3de93269a577d77a5502e8ea02f717b1dd2df1ec69d8b61ca
-Test: Encrypt
-IV: 6724c372d2e9074da5e27a6c54b2d703dc1d4c9b1f8d90f0
-Ciphertext: cfb653dd50a04a8580847d5bb98dc15e27c60f5a70da635718ba6d589f47935ed476fc960ffaf3b8750a59171b1434429a977ba878aea7ace8dd083a9238585112591165d0948a86e89e6118d572aa85667cceffd78a60baa5a152dc5e29bdd93f7389edde1541eec2f3aac38ea2bfc812f73de7e2e7b1322468f823a2c7c16e30fe9283894ac057da5c45a67f4988b4edafeb51c1b4a51a849d188b15838552
-Test: Resync
-Key: 760158da09f89bbab2c99e6997f9523a95fcef10239bcca2573b7105f6898d34
-IV: 43636b2cc346fc8b7c85a19bf507bdc3dafe953b88c69dba
-Plaintext: d30a6d42dff49f0ed039a306bae9dec8d9e88366cc19e8c3642fd58fa0794ebf8029d949730339b0823a51f0f49f0d2c71f1051c1e0e2c86941f172789cdb1b0107413e70f982ff9761877bb526ef1c3eb1106a948d60ef21bd35d32cfd64f89b79ed63ecc5cca56246af736766f285d8e6b0da9cb1cd21020223ffacc5a32
-Ciphertext: c815b6b79b64f9369aec8dce8c753df8a50f2bc97c70ce2f014db33a65ac5816bac9e30ac08bdded308c65cb87e28e2e71b677dc25c5a6499c1553555daf1f55270a56959dffa0c66f24e0af00951ec4bb59ccc3a6c5f52e0981647e53e439313a52c40fa7004c855b6e6eb25b212a138e843a9ba46edb2a039ee82a263abe
-Test: Encrypt
-IV: c815b6b79b64f9369aec8dce8c753df8a50f2bc97c70ce2f
-Ciphertext: ab7204ab4f995c2d87376c3586f0261250907ab2c25e2d232f10f51f0f3a3f11ff704ba188a508301fb9d5f7e4d55070631ecd2e3be5d79d4fa67f4f4acb3879afc2dc18c09446489b79dd3043f74027e9a24a54d8babe757c9a3470a95cb7b7b093331e32534b337d697046f7349bcfa89036b3cf50ecfc6f1e61300a49b6
-Test: Resync
-Key: 27ba7e81e7edd4e71be53c07ce8e633138f287e155c7fa9e84c4ad804b7fa1b9
-IV: ea05f4ebcd2fb6b000da0612861ba54ff5c176fb601391aa
-Plaintext: e09ff5d2cb050d69b2d42494bde5825238c756d6991d99d7a20d1ef0b83c371c89872690b2fc11d5369f4fc4971b6d3d6c078aef9b0f05c0e61ab89c025168054defeb03fef633858700c58b1262ce011300012673e893e44901dc18eee3105699c44c805897bdaf776af1833162a21a
-Ciphertext: a23e7ef93c5d0667c96d9e404dcbe6be62026fa98f7a3ff9ba5d458643a16a1cef7272dc6097a9b52f35983557c77a11b314b4f7d5dc2cca15ee47616f861873cbfed1d32372171a61e38e447f3cf362b3abbb2ed4170d89dcb28187b7bfd206a3e026f084a7e0ed63d319de6bc9afc0
-Test: Encrypt
-IV: a23e7ef93c5d0667c96d9e404dcbe6be62026fa98f7a3ff9
-Ciphertext: 5c77efcb16097df824bd58cd3498e07af1c761740b5539929115e2caf3bc10eed2a16254a4306f4e20827247900276ce887362990c070c0f79e15987473b7ad240e7a9f8e6e3f020fb337438cc3c8b81c4cdbfbdd7b543b13a48a4959744f3efcb99a939c0599ce32f816d12c2b47a2f
-Test: Resync
-Key: 6799d76e5ffb5b4920bc2768bafd3f8c16554e65efcf9a16f4683a7a06927c11
-IV: 61ab951921e54ff06d9b77f313a4e49df7a057d5fd627989
-Plaintext: 472766
-Ciphertext: 8fd7df
-Test: Encrypt
-IV: 8fd7dfcb16097df824bd58cd3498e07af1c761740b553992
-Ciphertext: 85e098
-Test: Resync
-Key: f68238c08365bb293d26980a606488d09c2f109edafa0bbae9937b5cc219a49c
-IV: 5190b51e9b708624820b5abdf4e40fad1fb950ad1adc2d26
-Plaintext: 47ec6b1f73c4b7ff5274a0bfd7f45f864812c85a12fbcb3c2cf8a3e90cf66ccf2eacb521e748363c77f52eb426ae57a0c6c78f75af71284569e79d1a92f949a9d69c4efc0b69902f1e36d7562765543e2d3942d9f6ff5948d8a312cff72c1afd9ea3088aff7640bfd265f7a9946e606abc77bcedae6bddc75a0dba0bd917d73e3bd1268f727e0096345da1ed25cf553ea7a98fea6b6f285732de37431561ee1b3064887fbcbd71935e02
-Ciphertext: 36160e88d3500529ba4edba17bc24d8cfaca9a0680b3b1fc97cf03f3675b7ac301c883a68c071bc54acdd3b63af4a2d72f985e51f9d60a4c7fd481af10b2fc75e252fdee7ea6b6453190617dcc6e2fe1cd56585fc2f0b0e97c5c3f8ad7eb4f31bc4890c03882aac24cc53acc1982296526690a220271c2f6e326750d3fbda5d5b63512c831f67830f59ac49aae330b3e0e02c9ea0091d19841f1b0e13d69c9fbfe8a12d6f30bb734d9d2
-Test: Encrypt
-IV: 36160e88d3500529ba4edba17bc24d8cfaca9a0680b3b1fc
-Ciphertext: f003b213737415a81894a3d3d8fe4e4434d4df2b253d60c44609bdc0414cedf8bae297ecdb1d0b92393dd6dd7027b555388ac8a66308082fc6327ad94ad96223003de15c48a06e9cd99b5561e7fc5949c6ba8cf11d6ba1374ec32062caef541e7252d168781aab4c637793433b3998c5a5013fd35c336600a02765ddbf52b97ae80dbfbbe55e43c6bd5f746a1c2df4c80611c76a90308c47b2807876249d6d3c507a1a96c2bbb8242ccd
-Test: Resync
-Key: 45b2bd0de4ed9293ec3e26c4840faaf64b7d619d51e9d7a2c7e36c83d584c3df
-IV: 546c8c5d6be8f90952cab3f36d7c1957baaa7a59abe3d7e5
-Plaintext: 5007c8cd5b3c40e17d7fe423a87ae0ced86bec1c39dc07a25772f3e96dabd56cd3fd7319f6c9654925f2d87087a700e1b130da796895d1c9b9acd62b266144067d373ed51e787498b03c52faad16bb3826fa511b0ed2a19a8663f5ba2d6ea7c38e7212e9697d91486c49d8a000b9a1935d6a7ff7ef23e720a45855481440463b4ac8c4f6e7062adc1f1e1e25d3d65a31812f58a71160
-Ciphertext: 8eacfba568898b10c0957a7d44100685e8763a71a69a8d16bc7b3f88085bb9a2f09642e4d09a9f0ad09d0aad66b22610c8bd02ff6679bb92c2c026a216bf425c6be35fb8dae7ff0c72b0efd6a18037c70eed0ca90062a49a3c97fdc90a8f9c2ea536bfdc41918a7582c9927fae47efaa3dc87967b7887dee1bf071734c7665901d9105dae2fdf66b4918e51d8f4a48c60d19fbfbbcba
-Test: Encrypt
-IV: 8eacfba568898b10c0957a7d44100685e8763a71a69a8d16
-Ciphertext: f17808cf21dba4762ced5fcc264f615a4619d8d5ee3278dbdacf14a799f8ee5f8a38a7fd9d262b336e51a8790c90fb8f0b63a49edae81f9a200ad73d9ed5ce6257524b506d7a219013e3e44a1f2a264b7f7f121e5d4765d0bdfe4a36fc51e48ee21e9dcbc3dc2541405bbdb90490fd786b942a07786094fc990be21e5b746d522cad26269a76c85134ee654f33485807fc28cf87ac37
-Test: Resync
-Key: fe559c9a282beb40814d016d6bfcb2c0c0d8bf077b1110b8703a3ce39d70e0e1
-IV: b076200cc7011259805e18b304092754002723ebec5d6200
-Plaintext: 6db65b9ec8b114a944137c821fd606be75478d928366d5284096cdef782fcff7e8f59cb8ffcda979757902c5ffa6bc477ceaa4cb5d5ea76f94d91e833f823a6bc78f1055dfa6a97bea8965c1cde67a668e001257334a585727d9e0f7c1a06e88d3d25a4e6d9096c968bf138e116a3ebeffd4bb4808adb1fd698164ba0a35c709a47f16f1f4435a2345a9194a00b95abd51851d505809a6077da9baca5831afff31578c487ee68f2767974a98a7e803aac788da98319c4ea8eaa3d394855651f484cef543f537e35158ee29
-Ciphertext: 4dce9c8f97a028051b0727f34e1b9ef21f06f0760f36e71713204027902090ba2bb6b13436ee778d9f50530efbd7a32b0d41443f58ccaee781c7b716d3a96fdec0e3764ed7959f34c3941278591ea033b5cbadc0f1916032e9bebbd1a8395b83fb63b1454bd775bd20b3a2a96f951246ac14daf68166ba62f6cbff8bd121ac9498ff8852fd2be975df52b5daef3829d18eda42e715022dcbf930d0a789ee6a146c2c7088c35773c63c06b4af4559856ac199ced86863e4294707825337c5857970eb7fddeb263781309011
-Test: Encrypt
-IV: 4dce9c8f97a028051b0727f34e1b9ef21f06f0760f36e717
-Ciphertext: 534f5151319c299d7356be2275ed2137fab66742797370b511e5150dcf7bc75c06d5249e8e8bd7c16e563cc7d99368a7a7f47f811a2ae2b632c73e9f49641bf9954d4df19c2778221d780f799806757738b327e6aeebab6bb22137f8b994c1e08baff75bb2774576bce2deb599817fc7a69860c538efffe91439f4714e4629b00a25b5b1a6be8aa7da2be33bad953481926e0067a70d4ff1a7bd0111e605ef6a2d66fa7af43d746c24a5d464dd6f75773aa9b65bbdfad9b82fe80f182b144cea9211d0b2472de873008509
-Test: Resync
-Key: 0ae10012d7e56614b03dcc89b14bae9242ffe630f3d7e35ce8bbb97bbc2c92c3
-IV: f96b025d6cf46a8a12ac2af1e2aef1fb83590adadaa5c5ea
-Plaintext: ea0f354e96f12bc72bbaa3d12b4a8ed879b042f0689878f46b651cc4116d6f78409b11430b3aaa30b2076891e8e1fa528f2fd169ed93dc9f84e24409eec2101daf4d057be2492d11de640cbd7b355ad29fb70400fffd7cd6d425abeeb732a0eaa4330af4c656252c4173deab653eb85c58462d7ab0f35fd12b613d29d473d330310dc323d3c66348bbdbb68a326324657cae7b77a9e34358f2cec50c85609e73056856796e3be8d62b6e2fe9f953
-Ciphertext: e8abd48924b54e5b80866be7d4ebe5cf4274cafff08b39cb2d40a8f0b472398aedc776e0793812fbf1f60078635d2ed86b15efcdba60411ee23b07233592a44ec31b1013ce8964236675f8f183aef885e864f2a72edf4215b5338fa2b54653dfa1a8c55ce5d95cc605b9b311527f2e3463ffbec78a9d1d65dabad2f338769c9f43f133a791a11c7eca9af0b771a4ac32963dc8f631a2c11217ac6e1b9430c1aae1ceebe22703f429998a8fb8c641
-Test: Encrypt
-IV: e8abd48924b54e5b80866be7d4ebe5cf4274cafff08b39cb
-Ciphertext: e8c59b616dd10474930c432422d23d8df8dee1c626def1278eb6c9828435c0c8a98aea9d350752a78cf0cf1de7973436605f22b0d40b9059d777c55c8fd02cd9dbab6888161ed28979c64b700d7ea48038edf36af21078713f844f5f23a4f271aad3562ed2cd773de622fff2f0b5785672760a7064e5415c76ffec522eb1225868345e89a9fcbb4f12c1176b01550fe7a74f750dc43d6fa4718c33ba99b0084c7a1a8e245c8566056296aabe13af
-Test: Resync
-Key: 082c539bc5b20f97d767cd3f229eda80b2adc4fe49c86329b5cd6250a9877450
-IV: 845543502e8b64912d8f2c8d9fffb3c69365686587c08d0c
-Plaintext: a96bb7e910281a6dfad7c8a9c370674f0ceec1ad8d4f0de32f9ae4a23ed329e3d6bc708f876640a229153ac0e7281a8188dd77695138f01cda5f41d5215fd5c6bdd46d982cb73b1efe2997970a9fdbdb1e768d7e5db712068d8ba1af6067b5753495e23e6e1963af012f9c7ce450bf2de619d3d59542fb55f3
-Ciphertext: 835da74fc6de08cbda277a7966a07c8dcd627e7b17adde6d930b6581e3124b8baad096f693991fedb1572930601fc7709541839b8e3ffd5f033d2060d999c6c6e3048276613e648000acb5212cc632a916afce290e20ebdf612d08a6aa4c79a74b070d3f872a861f8dc6bb07614db515d363349d3a8e3336a3
-Test: Encrypt
-IV: 835da74fc6de08cbda277a7966a07c8dcd627e7b17adde6d
-Ciphertext: a91f3039c37f753857510f121cbbab8f942b41a4d04815729361268c84abed9fd3dd2c0a84ea5dc3cab46245f720d8f0fd81ce4c7837aae561186f66ae70db9e5c2238f1b417b0ab001eada16d1f9bcc2ed74d335fe8da60bebd8b1c4ae4c51d8c46eec7d1fd575a5824bced85b02bfcb1e11d5686471b2791
-Test: Resync
-Key: 3d02bff3375d403027356b94f514203737ee9a85d2052db3e4e5a217c259d18a
-IV: 74216c95031895f48c1dba651555ebfa3ca326a755237025
-Plaintext: 0d4b0f54fd09ae39baa5fa4baccf2e6682e61b257e01f42b8f
-Ciphertext: 16c4006c28365190411eb1593814cf15e74c22238f210afc3d
-Test: Encrypt
-IV: 16c4006c28365190411eb1593814cf15e74c22238f210afc
-Ciphertext: c86458ffa23d50437f3385ea7d3fbae5cdc1df7a14658b8316
-Test: Resync
-Key: ad1a5c47688874e6663a0f3fa16fa7efb7ecadc175c468e5432914bdb480ffc6
-IV: e489eed440f1aae1fac8fb7a9825635454f8f8f1f52e2fcc
-Plaintext: aa6c1e53580f03a9abb73bfdadedfecada4c6b0ebe020ef10db745e54ba861caf65f0e40dfc520203bb54d29e0a8f78f16b3f1aa525d6bfa33c54726e59988cfbec78056
-Ciphertext: 02fe84ce81e178e7aabdd3ba925a766c3c24756eefae33942af75e8b464556b5997e616f3f2dfc7fce91848afd79912d9fb55201b5813a5a074d2c0d4292c1fd441807c5
-Test: Encrypt
-IV: 02fe84ce81e178e7aabdd3ba925a766c3c24756eefae3394
-Ciphertext: 5526b8ff95272e95ad298c30f9f165353ecf0f68aa2943476ec53c386cf07c465b677be13d01279779965dda94d23fe9452dc4934e344c2ee0f6f5e32efc2b3f79630492
-Test: Resync
-Key: 053a02bedd6368c1fb8afc7a1b199f7f7ea2220c9a4b642a6850091c9d20ab9c
-IV: c713eea5c26dad75ad3f52451e003a9cb0d649f917c89dde
-Plaintext: 8f0a8a164760426567e388840276de3f95cb5e3fadc6ed3f3e4fe8bc169d9388804dcb94b6587dbb66cb0bd5f87b8e98b52af37ba290629b858e0e2aa7378047a26602
-Ciphertext: 516710e59843e6fbd4f25d0d8ca0ec0d47d39d125e9dad987e0518d49107014cb0ae405e30c2eb3794750bca142ce95e290cf95abe15e822823e2e7d3ab21bc8fbd445
-Test: Encrypt
-IV: 516710e59843e6fbd4f25d0d8ca0ec0d47d39d125e9dad98
-Ciphertext: aadb7c36647ded09fca7587edfa9bbe81911925fa8996330c8e7b77601075e5f94404db9f82c67e2cd39d1649062d4c30cf23bc28f9ddd6d5b9ec586a7de7f8ef45560
-Test: Resync
-Key: 5b14ab0fbed4c58952548a6cb1e0000cf4481421f41288ea0aa84add9f7deb96
-IV: 54bf52b911231b952ba1a6af8e45b1c5a29d97e2abad7c83
-Plaintext: 37fb44a675978b560ff9a4a87011d6f3ad2d37a2c3815b45a3c0e6d1b1d8b1784cd468927c2ee39e1dccd4765e1c3d676a335be1ccd6900a45f5d41a317648315d8a8c24adc64eb285f6aeba05b9029586353d303f17a807658b9ff790474e1737bd5fdc604aeff8dfcaf1427dcc3aacbb0256badcd183ed75a2dc52452f87d3c1ed2aa583472b0ab91cda20614e9b6fdbda3b49b098c95823cc72d8e5b717f2314b0324e9ce
-Ciphertext: ae6deb5d6ce43d4b09d0e6b1c0e9f46157bcd8ab50eaa3197ff9fa2bf7af649eb52c68544fd3adfe6b1eb316f1f23538d470c30dbfec7e57b60cbcd096c782e7736b669199c8253e70214cf2a098fda8eac5da79a9496a3aae754d03b17c6d70d1027f42bf7f95ce3d1d9c338854e158fcc803e4d6262fb639521e47116ef78a7a437ca9427ba645cd646832feab822a208278e45e93e118d780b988d65397eddfd7a819526e
-Test: Encrypt
-IV: ae6deb5d6ce43d4b09d0e6b1c0e9f46157bcd8ab50eaa319
-Ciphertext: 89e9c51abd31d6156b96c4e82ef0dfe5c376bd6324750fdbc46e5ae63897323c816fb5bb8e6bf4335853e512cc334dbbfecccfe4e5c8fe8289963ee7127f3ac56bc26b7bd4f0d1e0afb06bde930e7587eedf07995d5052bbff5453147c1555a7c8534111295bb5ab9e89645cc330ae3e0d9294c9e7d6d841579e93aefeaed879f8e8299459a3c07e3c9dee497360510668c5246970ad39077e8d8935b0d885f11d2f06dee0d7
-Test: Resync
-Key: d74636e3413a88d85f322ca80fb0bd650bd0bf0134e2329160b69609cd58a4b0
-IV: efb606aa1d9d9f0f465eaa7f8165f1ac09f5cb46fecf2a57
-Plaintext: f85471b75f6ec81abac2799ec09e98e280b2ffd64ca285e5a0109cfb31ffab2d617b2c2952a2a8a788fc0da2af7f530758f74f1ab56391ab5ff2adbcc5be2d6c7f49fbe8118104c6ff9a23c6dfe52f57954e6a69dcee5db06f514f4a0a572a9a8525d961dae72269b987189d465df6107119c7fa790853e063cba0fab7800ca932e258880fd74c33c784675bedad0e7c09e9cc4d63dd5e9713d5d4a0196e6b562226ac31b4f57c04f90a181973737ddc7e80f364112a9fbb435ebdbcabf7d490ce52
-Ciphertext: b2b795fe6c1d4c83c1327e015a67d4465fd8e32813575cbab263e20ef05864d2dc17e0e4eb81436adfe9f638dcc1c8d78f6b0306baf938e5d2ab0b3e05e735cc6fff2d6e02e3d60484bea7c7a8e13e23197fea7b04d47d48f4a4e5944174539492800d3ef51e2ee5e4c8a0bdf050c2dd3dd74fce5e7e5c37364f7547a11480a3063b9a0a157b15b10a5a954de2731ced055aa2e2767f0891d4329c426f3808ee867bed0dc75b5922b7cfb895700fda016105a4c7b7f0bb90f029f6bbcb04ac36ac16
-Test: Encrypt
-IV: b2b795fe6c1d4c83c1327e015a67d4465fd8e32813575cba
-Ciphertext: 0a8a907dc7f30f6f68eec465ead25768383956a304aa32e4ccea6e3756cbb19f2751e3b68339ade1499004a88170e44620529d3c568cb1e014c16548830dfbce1b47a2dcdd28e59bb0daf5908c5ff51817bd119fe33bda07d63e93a3522685eb101d912b02d093780d10884959ae4a49e2fb7fca51b81394f09314879a41f6dc2f4a7dc34e88da4747a5a1fc15dcb207d13222f08f91f079eafbded0d6036325f607ff29ff2fc7635e8c3767d61a3b7814227d6a2798d623bfdf674604e4e9e03529
-Test: Resync
-Key: ea060c72f6e0080fd4a9a2131c9d684902415cab34fce4e52d62273e3c385f37
-IV: 5826043957a27509423fdd82f34935928a4b23a84ede72c8
-Plaintext: 20ae58dbf5c20225c35518711a86a19a61d5ba47ab17e8c5fa9658333d40ed31bffb79cde927c36baf61ed8df37acac330f64471bd91d90bfafa72dc8cdb6ed95ec6610cd6e8f2859255216a3eb4b573410d5644a40e4f0fa785d556304489c0023a1991eb0d01b5
-Ciphertext: 6025c4d5bcc769cc3e67b88340b4101690eb283654c761f8a0af360926313129f16d1c9358ecbaf66acd85787c7c1f52a953bc05e91d43bf3d94d341bffc5913435fb3a8e6264ccd1c355472929a140fe30a22689b055082c70395e0b070a3f0967ab36848cdf3d9
-Test: Encrypt
-IV: 6025c4d5bcc769cc3e67b88340b4101690eb283654c761f8
-Ciphertext: a420fde6c359342819ed9c07853c594c0098fd2a3c8da24713dbd12261b528e43af7dd52ddf1a1b553d08c20b0ab399c38a067fb115368c990d9e839735c8427aa885eacb5c2900d1d04afdd3d35793f11c78dd826c5d09351f39823a13976eaa5a49b0bdb054043
-Test: Resync
-Key: 115aaaa3a3827fb05175412dc6478747d7c128ce2637b6afdfe3213f7b0b6991
-IV: f8cbe32bdb4c8eac3a571f186ef683b9eb902302ff7ac746
-Plaintext: b09472fbdaa3e4bdb7b04c8819fb3257f764154d09cea22e9a67b40f7e601a97c469811773d2733eb4ab0da6249f237d4c063012fd06714a726b24a512daa7e287d39818980a6720abc45f10aab7d71da318244507b5a9d0aeae76ec5efd3b5ce167c38196744d13b07a14805ee49dc4421e0c59d559e8518a9911682ce1d2b307ccba48dd98c003103421ae6253c6a2476dda5d11cb3d5e7d6dc2c02499d5731095ee89f77c7d4ef27231fd6e9e854d1ed84b0b47bc4794e68e055e1d83d75ab527a53ebefa4d363f952562ac1aa47635296d55e2d5d1b8e214c95445bd586c7f82b31839ff78a60f0063
-Ciphertext: 50c5e2584d473a696c797ff1668137e331bcd9a1ecd5c146422a9140de87c10996d407c5eb8335b5bdb7a9b1613ccc198d5157c6f89d409e1ce7958605d68d442e1b10179c13e12ec33f98d676ae4be95ac7a82786402b1491918a6526e9676037d04fa7aebfd9afd39f6d10dc663877ebbb67aa82c6089529218db9622bd0af7e722e72265e25524d827da8eea6d7e0daf94c516ba24ecca2d820959c0dc939252158903d97139f6fcd81752deb3e9108fc62178bf54797c428e0887d1849fb5004c3b76f0d466afffd47f5066d6dfcbe4782319738e90fa19de6b99861bfc9e8112df4573bb38b1b9e35
-Test: Encrypt
-IV: 50c5e2584d473a696c797ff1668137e331bcd9a1ecd5c146
-Ciphertext: 280303c6467f6badc300961c549c33f249c6d2df0596a459383b4c995b296854dea2072d04e46cd47c3380c4be6f6456e8759a5ab2025bd20ae6d116b0bba77b4f03aaa118c73e50f48755a89474c4380e8bbecffc4d6c84514711094ef67c2ed8b81a07c2afa41a19709e69d0bea22067eb3ce3618d80066f9c9f333eea1a624cc4d4dbfb0134004d1d6d295751c7a134cfd29cc85045734e2a4400c261cca16bca4c7e4622837eeed6ddc64c0999347248081aedd3f4d911ad5c92aa491b05510adcb0bcd7c0711a964f176775f11d8b00d9e4264afbb4d6b6a81760d964ca495485895ebba1dd1d2bf9
-Test: Resync
-Key: da4147528d2e7862009aa772051e60e309721eeef4b4bcd7f98ae8d0561960b3
-IV: b625057bd07c1385fc08bdc14d735e5832dce5aa0045d9e4
-Plaintext: 6db3a848beb8a6e9670ed91427364c9b042d000a14eb2ac4c6097625e20b2e8eb367c156f927262d2251974d5953f17d00b4ed6b4d93513a19ee6b4f1a159bec8ff94151a7bdd6074d12d343fd852fa69a26302a11caf57417e950723c5a5e795de4cb6523fede7af6b6cb68f41931a1eebea6079e8018fe4116e7b03df7
-Ciphertext: 399c5bf3b894e3dcb5881fdcd927d8cf4ececa5140b2425df5cb2cb993b6901f736e94fb847de41b7c32ae990510402ce5e99a34b5acbb3b5aefbe55be4707025ffcfd6605b6ebeffca3c1ed3c42cba900eb5f14c195e5c574eae67e7355b780403e44ebc91f81fb04f95759f78999fe619d5b8f9fb2185c0e14cadfa8dd
-Test: Encrypt
-IV: 399c5bf3b894e3dcb5881fdcd927d8cf4ececa5140b2425d
-Ciphertext: ebb1d4ebb394e185fddd72fad5efa8434465a9ce758fbdae25cdc6b1278b2e137f5afa706c5a8e95684fcf6645c6c2f67f698621c7d6c7f1899be12e2f6c9e480315c12f02405b8bcf45f4a715eeb72f12e0fef15740734747764e698ee88d05ab30028c9ee237a48b50c8fc453b7d370daad88e57a572a9cb8091526861
-Test: Resync
-Key: d61f8e75dc9295dc029292764f3ed08dfb6fd725cae4b0e47aceecaefcf654d8
-IV: a6046a92ad15e9f9d8027ff39bfbf534d46fec35bc9cd94f
-Plaintext: c11f014781804645ca22ca213a5558a038090341f3f70aa1df0bf135fb8d0184d77783b519c9c2b2b0b748880a85bab986de7a37a4a11bcbb5c0c87676d7808fd41abbfd0d7a11a7c545405a4ae42f60baa22ccee6de0272e79610c7b885b70ba9bf027657abae393cc8f56735faab9f6fbe36e7a4d99ce15cdac24223880bfb5865ac7acf01ea833098fb148406e6
-Ciphertext: f3b2a1188c33e96124f383b8b75dcacbf782f728eaf436db05551ae2be1a77f09c9ea009d8651329d0a812580d1e11d0f64c44e245bf30dd9c8033b72d0e5049131063c5fc2a3f219e6c1bd993c8961cc174eebb655574dd45b73d0d804f5190f92e385dfd7c2a4ff430ed6dabd41db040aca8ece7f11de796478026f48337f763cf69aef12609384f0ae72ee38c8c
-Test: Encrypt
-IV: f3b2a1188c33e96124f383b8b75dcacbf782f728eaf436db
-Ciphertext: a9b213db6c8e161687e1b63f32a806f15aa8b3ee60cd37d7d437f90b446c3361d37893b702dfe774e5e5ce486399cd408fbf6ca1005768bf7825130c061e43f6077080438514f1a8ecdc6ff7cc264122b1a55c849c76328e833667326f23670590b77f2bfb9a666bcc4c44c16efd6c506c37ec62de8e5365ee894670ac4264b807a8455d8df05ba45af51ff1fee343
-Test: Resync
-Key: 0f2850f98634181f49e53bf49d2f822fbf75e5f77c6cd7487541c514a4101ce7
-IV: d6defb4e74c327d89123bdc1d1c6d2fce6b745079bc2c9ef
-Plaintext: a064bd9bdab0ee26530c2d26be556cd67295180bca445dfc87954bc51b28a21b606a229cf5a41fa104c51c3f32003a65064ff73e66691e4d2b1a22d236232be18677d54aba7ad49edcc9284897a7f88945513460166e5dfd7650959c05328abc0a7e95c352dbc227ca17
-Ciphertext: 51de41664070aec657612a57641c0c83ae14f5b3b25b25d916e0cdfae1c1bd21f7b47d9ab02b6841e115394cad58a568c1d7c2559a1d3fcd9cb4b25529d26e475ae313e6487538d16376a6b24e5cf27d2dbf4c83bd18996594f60549f34a8683b04d05198893a816adbb
-Test: Encrypt
-IV: 51de41664070aec657612a57641c0c83ae14f5b3b25b25d9
-Ciphertext: b5f57b5f00d2bf5f48828a4e793997e6d12b0f14953f5b1634cba91867776f75d2d2d247799a46080372046518416c60a07a65b2aa1318238597c320360a279e7633045bc43cf41bf9d366eafc7613b090a41fd8db3f684afc03d96c82a40b46e2994438febf268020c4
-Test: Resync
-Key: 5cf680e8a11eb005d03fdc3d4ec0e129e6aceb47262dee6c452a5b8b0ef1b450
-IV: 6a6920ddba39b5a2640976ca10c97bf308a8cdd70ea98260
-Plaintext: 1f322b31f5f577a596b0fbe567864c7ce2973b41f924205defe08e2866b7fb5c1814d664d33957614e91668bb15d9848ffb93dc08c1f74c5f5e1f88148d1a1a7ad47395b75834de4988adfbf7e58a38157544c2be5b913152c1d00
-Ciphertext: 64d6c9ca4db201d95afc0dce28f6e47d51c2856ccbbc8f4c2e2bd2d834aca165dedd117b0be9a7dcd21eb22b508f4ecd0236075b064a0ced23e324b18b2bf2cda1c4416f78c740e51ce687cd37842be368fc4e6ba7cb312d89ea7a
-Test: Encrypt
-IV: 64d6c9ca4db201d95afc0dce28f6e47d51c2856ccbbc8f4c
-Ciphertext: 9f4090fc504efc0f6bb5f76ac9881e1379da9f700737d86e9636714debc5c4eb3276fcff90bf71c32a71e06c199b3431475ab77410e83a7eba158723efb383a5437731a136758aaf7d39f0def719b0dd46798d9d53a30cd1b91eb3
-Test: Resync
-Key: 9d27327495159927d0dd93e258908590343a57f6583e0d8aca07070ce41fd37a
-IV: a01d1d7d1d43de5fcd60277f84dd8b93d08d480a77961f71
-Plaintext: e2ce8d1f9ee9329c3599e1880b9e6cb75d52e86f48ca89b829d4d7ca16d3e1b496b8b46097501793cdf6764ffd44b44013c7aadbf0ccfa4eab012529373a9022480f58877332b81f3c703ca80a77f429d944d5a877d89c6f64214c9ea6d3a098d9057d519354cfbb71a4bcddaee65de22e4d782ef0065952b891c9494d8a509e86d08ca31594015d3c31931d417cd048e59945d42ab74983434d14ef4e078f30ec2fe9ceb7e247d557b1d2593ab35896082c1c218dd73a868bc5cae74862b898395681234b20fa1ae9cab6a49b94bcc38a3a4a91cefc7745d094d9d8cab730cda4079705e4afd0f5e401
-Ciphertext: 94e0d546dbdcedd76e26629484ffd9b67b9c15f61b07df7ef0efce41270bdc9039ffad321c5b2d2847f6f4d5d105676fde08b8c47df248850dee1272d51feb42d503e58d67b61fff0a20abd999a5ad5942676aca3f31ce08614106fb692ae230c2a74339eb38c074bb59cf5ab42fcc428a0d629c12fbc3d845e84ed76c3f774e92c1109be12f00aa8ebd2a137a914e655081e6e60176cc98e849165d9d93235c605c8562f51bb407aeb8f330692d6245297817eebd32fa2ee96520b560e37019e9aadaea40f25ac4c5446fe93c5b39fc90152f088a5a936ba4efb10db7f246143f2cd151b1f1155e05a8
-Test: Encrypt
-IV: 94e0d546dbdcedd76e26629484ffd9b67b9c15f61b07df7e
-Ciphertext: 33203e910f56c5e1a63f3a801fdd772dfd1c3b0f3e012772bf0796337d95f4562c349f65557e76dc0aadb982d1aa3a3a865db36418bd1efcae36095fdb3ad68e1df72622d45d5336224caeb237adf9c19b02e23a1b9d4b32a5b6f39595a93d495a74cceeb4254e0b75f54277b80b153f62c8b5bdccae8d3ce24d8ee258f6d4ec6d631f6d1c8e8daa049d33076bea38acc5fda4a8822a16a693c936b340eb7951cd1ab0f7f58206252b0ebe46c77214dc86db136f8e170fc402f31e1c7ef9bc409b19260e4164c145aca28846ead4dc91783bcb1bd914a23d7bdf83745cb74c7ba66eca45457c53f42280
-Test: Resync
-Key: b1a6c9bc9870d808a81612d0f4b335cbfd8b305150a6140627df06d9f8b24c0e
-IV: 7313e9e505147d4a4c2023259ba01197169bac01af0d5bb0
-Plaintext: 479d7baf87a385c781f0dee6e51ee4f94eb2ee3e93bdbb3f402b0252496225d4118511ff893f4ddebcd31149920e259006cc7353ec5a95da4bc61ee6863282edc341afe9541d44958c2855b6714625ed2fde62db387e114fe837bbecee398351d187e0c93e0a0618f9d923504dd662c11e43af794e7ac7c99816c180ccfe1779bd2dd476ed68eb1736f421922fdc6696
-Ciphertext: 30a86c8b6a55670856e6d1b31d59602e05819022f12df1c67294fa138d65d5fd9f5e9192ad09604e08005537832d07ad5f4743bdbf137b7e18b8811066c7e411291fffc6e6ab55744789a225f15086173495279a4c628ffe4b1f8bb4d886bf74ada7d783b143edda1675ca9493ac1da04ae62584ce41c8a2c4f9fae79d94363bcf79c343e51ce5694c639bdbd8405781
-Test: Encrypt
-IV: 30a86c8b6a55670856e6d1b31d59602e05819022f12df1c6
-Ciphertext: 33c313c0da87030169b7da6963644cdd257891b14fc1e4387d35faadc39279cca215e7079ec4272bc259e6499b0cb6dd52c6dff5965c7ddc9e951ac5c0056b4065a6f8eb5cc8e5373633a4aa3aa1736a67be11ef63c3418b1fe57730d6cce0f40e5bf02e61f6aae1404a813fd2a2a870960833be71dc73bff4a98718d64cb146a2ca5d41fcba85a56fa3d0413d0a807b
-Test: Resync
-Key: 4f9f97fd4ba7db6365f5fec9fde4e752c8bbde48a7ea986b878302e4cc8af9d5
-IV: 05788b5db4e3711eca900a2bfe6f78de44e98a70362504d7
-Plaintext: eb50b1e352f3fae6921fa7884c99365411928a2ffa33e3106768a773246c31cb0bca5cc166819b3b05819017f06c8b8932607db6d66d58d6a2f7356e4666ff7bec3a2223c12777fa54d9ed1dc139d9512c52e1e53762badc7e6f8da576afd940fb4a29d89e76fcdc93e515d69a6ca9efe5d053b7600b458b6719852ec4ad3c59d0b0a69971ac6ae53118c186f2d1a57e350ac3c8ad7d4e087c8f32816462f0506122fc01caa8c93aeebf0edf0c8e1cb726bfc861
-Ciphertext: c63f829e84c1c9709c49780a445bbf0dd441acc5304e0433ce0cd70af3fe98d36bd9e6fab17e6e8b50fda157e3ce9d2a928e8c234dd1700999047db4a28ea40a9657172a471f962d872a1d3342c12965aa1f1484e760979181ec8fde5472f509f76748fb4557b9b73fd517f70b20795caa1cd19e4dd5ac65e8f4cdb65a4ad60e0dd64407dc5232a5a893ace71acb35700fe059bb641497a2db63caf083942b7fe530092e90014bc5b6f889710ba3fc50d086fc32
-Test: Encrypt
-IV: c63f829e84c1c9709c49780a445bbf0dd441acc5304e0433
-Ciphertext: 625aa1ac285ed59cb4b17da0ddb32a772eaf95181d0587fa92be22d1f5b65e403de9c0caa3301aa569ef9396c4cd06cffb602d5b5e6d2238712e74de51b0620733e1ba802038de3735b2a08951cbf17759f90cb0c4c4eb6a1acf147b54b7ac7372bafa4377fe7510d06a9c4ed6f972a669e270610a7084b61d4b52d2931803b805440b3d5e333ccdb0f3e7c0d013f068b2b402680a83210d71051da3529299343813150fb0f26ec053a8dac9993568e9b0c703ed
-Test: Resync
-Key: eee68b65fafe9a5bf2f9f92512a716e5af3740efea15e596f4ea0b5aef23550a
-IV: 4d312f84330a107250b68c0b1df417ef713615b704d99b71
-Plaintext: 95ccd08ed2ab0fb87f55786f1f10d33c7713bef4435c3699b13982235ed040c9d9cb1b1f335cac0faf8654812f6874408bf20b129558a2c342c07c7f42a30700b374d18b91d881fc0f153f4ec1a55633a92d637212a11d122a9a1eb085439ea1226ea7124e8bd1c644a1996fa6369dedcacd5c766d7dc9a8c8682c5729ccf4d59433ba8e1569fe826089995414afd576ffb9686a30725fb9e5d7
-Ciphertext: 6c832a8147658a1741af29b0f558fa3773c81429f91a5cef270f7154988f97d4b28549604909f726a8a6e89d625089ea387b2725861963480424d9835d7e2fea93a5bd3bf86c7827fb22e7a68efea1a05c45f9606d4ab7add687d9418ba60517cecb3503287fbc5b2c9f0f9b5faa991337b394dfac7514dc38ffe019a1e7c74e5ad23f4e3bddb74ffc8a81f521d0b6044f98238f7c2a38ab14c0
-Test: Encrypt
-IV: 6c832a8147658a1741af29b0f558fa3773c81429f91a5cef
-Ciphertext: 7e1ef21dad49405e2fc86c50bf045eb14c65e58acb64e210af9ad8ebb5679021721312b96514d8681fa9d52c01c83f7d871401ec345a334648e0fc2ca294ced407ff98f1d1bc4afd83bb325072a5367d9a014092bc99699713bf84587fe2ee998bf8df35aacf61a96be157bddfd52e5b5a1d4a2e3bb109502e608f286aa8f0d5f67b4072ad9b60971ee8cf9fe966015260e61802f19f4bc8a29c
-Test: Resync
-Key: 188fbb5bea95b5101e056b93d8890c68e1328966089ebf424defa1bcb96e88ff
-IV: b51304a0194bbb2490fced46fd0f39c3e87ea5196ca67ce3
-Plaintext: cd78c7c8f308addbd9acb6352d1b5b8a6ddee8a6f51401556e612d4c18960d152e6973381f45b19693e8ab6643424f01e9ab27de29f4ea16465d95674f7c939b
-Ciphertext: 81a468948c618db0de96ad5cdd8b577c8253df097128cea4ffc7044f3eefa1b486b9159545fe135ea8a862fefa015f663febbd9b9527cba516551949013e9601
-Test: Encrypt
-IV: 81a468948c618db0de96ad5cdd8b577c8253df097128cea4
-Ciphertext: 0510193beecfda67addf420e9c52130dbc8883cbe27d3e013207dc0ef3ff4e0b92e9ea2a2b644ffbab55c942acd63ddb7f1cff8d51d27b0a7d2853584dcc0bd5
-Test: Resync
-Key: 2fb88c256a737eacf97ce4e1d13f1e20e8b2426f19076d7901bf6696f38a81b4
-IV: 12a82872b47b2c5b73cbb38904a08d283701eba289c057b0
-Plaintext: 3caae8a0c99f38cb7b2e45ea91dd5dc1331f0efff9f69a5dab0164693e986ba0da48a84321f618cc7e4b4e4d66acd8a71b69e23dbfbc6bca0c4ae279f3583b08705100adb7a4aecc0d72955a7305f4e7e2765b0a1bebea9d7e044e360d44b402f01357dc9a3e83fb46b48a683c1ad450a255bf45fe801db33414d985fd3a337c857d370ddd05c3313ae2eee0c8cb1d12a2fb650ea6e4851f2ca27badaf36dede18a9f8a62a502f6c2ff94d591cc27438e7215ce6e6abf76c22190b7201763cbc8d3a2be1f366f69eca6e5386883f56bd1c
-Ciphertext: d446cbadf5afb1f21d7748a5973e8650d1dbdceaf5b837cdecf972bd091734a71ee1692fca675f4972d1e8db716873a03f9a5516f409982316cdc9f66ca0a8018dd055af0086397a86cf7574253d53fabd3aeefdc54dc2eae48b5b61a31dfb8db6531d2185034b81f745a3b88fa11453df073343de8bbd35a45f9cdff45b52e5352081f1f1a003a58200a4aefe27c87e930b77b8dc5b0882dc848437892e1902d126813e31ee27526d947bad5e8f9cf16a302da1a8f3883e3c9b257091e708ad58f4e716bb49e660cbf1f6fa709d64857f
-Test: Encrypt
-IV: d446cbadf5afb1f21d7748a5973e8650d1dbdceaf5b837cd
-Ciphertext: 4125c6831bd2d39c1b1a2e12c505ca077fede7c553d486ae9a87ca3232d27974fb35c9a18a6315e5feafbffa943e52e9c46aa0eff6bce2f2dbf703c641ac570a92551f8a6e9aee14e8bc433b36e06bbefb0a292279f688e5d06dcdf317eded20f9dab8fab19298b146e1555b772d9f9c95e920356282ae691436a8505051190bd840b234fde486726dabec5e0755f4335b8ff4e30c30bd4f473a6af3fa3e7542f2b720784da760753938a682e86cf7ee18c5b5f7f515ff0380134d375e434934508f7cdd7602ffe2039a376d443c048103
-Test: Resync
-Key: 7066fe1125429407b653fd090262bed2a3f7f3be2fa8f160f3344f327b1e53da
-IV: beec3787c335739fa5d7ad15b85b7e3e7c9438367434872a
-Plaintext: 9dad7f5ca1
-Ciphertext: 014a1f27cc
-Test: Encrypt
-IV: 014a1f27ccd2d39c1b1a2e12c505ca077fede7c553d486ae
-Ciphertext: 20539f2d9f
-Test: Resync
-Key: 3154d3f5bb56b00b34a255425057e99ed9effd1cb0168d16157fd769ddc665ba
-IV: f7f9f18f9648f6dc06ac643ea77f1493a9fea3390a98bb0c
-Plaintext: 80a488703cf316be904ac8394437ea02ae2c027b7880ebec58416429ea060db543839d781d82a0fa209077e4b1
-Ciphertext: a07abc8ef3641cf33179296ca401bb291a9547d3e6d1b0886ac31d26d2f3281a6a568cc042593132a3cc1082be
-Test: Encrypt
-IV: a07abc8ef3641cf33179296ca401bb291a9547d3e6d1b088
-Ciphertext: 27ff7646fa8c6b98b1a732841e1596caba7b87eb40508ef0f8ef390aa5e36c0296ba84b686701d5e3d34b16508
-Test: Resync
-Key: 81426f03ae1578d8ec1407827db18640d9d90d2bb773971f4ef14f859bc19e06
-IV: 479961f75954ed4f8024108cdb149ca3fd53e6a239a01e86
-Plaintext: 9cd08cf58e13e94e02c9a40269875392251353223f5329412e2a5e34328ea18c414d4c730b4e1c0bc140953f4ecf4ffc8aec963e59305d4d
-Ciphertext: db3ea5b5fdc9671ec56b3f1cecbb2a552b0ea4ce9be508863f3dfb3238d4fb91b896727357fe454a08114200ea7226787fd2ab154d53eac8
-Test: Encrypt
-IV: db3ea5b5fdc9671ec56b3f1cecbb2a552b0ea4ce9be50886
-Ciphertext: a887b52b3e97e6c899e1d68e57f283633ec9392438d17fb645702ae3b0ae0aad3a7c6eff0baff9f5357328307f628f470891884c264973fd
-Test: Resync
-Key: b3c260036b79cd3345e04cbee474dfea3a7c773db2ccb29d4c36a1b8c8b252e7
-IV: 1277840fe82046c024e6f4f53b4ff761c7c9bd1fea6c855a
-Plaintext: 6a6dac1bc93b9b5c0dde0d1e6a534914dc2a6d51e6f8af3e9d42b88bedc2173782a2314b33f795cc2e4536829871d77186168f5461d18130581664586256
-Ciphertext: ff5e71022c6522998a2d10843fda170796a70d186e5fca2afcf529c6d075c5212c793fb322c1675d0bd3cc6b18f2715678812e81a8727a2d6ac1158eacf6
-Test: Encrypt
-IV: ff5e71022c6522998a2d10843fda170796a70d186e5fca2a
-Ciphertext: 7e8b5b4d250c13e38b5dcaa5532295e649ab3669fa594cf30eb81a54b25b3fed4f35be97afe4a2a37b7404acb41ad31d737fa9f272e1c57b3754830b4823
-Test: Resync
-Key: 14fabd52e0fff9dae88d54815d82a56c4d4a660db5f214288cec1982e56fae81
-IV: 55b8328a312dff104c7f0720af0b7624f9281731b9f5f4b6
-Plaintext: 71bfc290baeeb0380732aa4312982c0dd0cc06cf2ee53adb0ae61c64228b80c073e7687ad3d3f888151b4066f415b62cf851d2987a3c816255ac40b62f453f350da8c4e1ec6dd0985e721b45a063381e997f629a7fbcd44fead19adc289f58f104fd37ec93a35305ba6fa44844d22e80a853e6db1d466ba2ad09ee2d30b3f47dd01b4d7b5d498cffd934cd3e005dc91e9e951951d5b937b319de0a7ba23c7918b1d74d3551b6500d39e6d626fa9cac8ec4e744713a93d5edc8413e2fba1d3b9b0f70509e38a66a2a2d70c510b57e15ac0c4b2aa7c5d6eb088fcdf6cbfef2c6dad19d7f17437cd261636c6d
-Ciphertext: 7fc8bc27994031b3c35632590a15607ccaf1be15c542eea5b71ea1f7fa3abee79cb1281a00adb05e6fee4e65e8cba616a5789629d8fc617fae9bde9d92f6c8779374b1cd32a8e9277d0cb052c7658b3ab24ee1e55e5dd88a76266e9fb5661f576000968a9af71a3edb59ef3974e76aceb41c3de2fcb204a0022f302316eb01a0a8d74378599a7f72987e9abbd6f1a8af152ee89455840584010da73b01bbd7b01093a8c38049dc7a5ee0ee80daa98de46803ed75d0a97083ca328e7642a07e1c037346a280a856a64bba53b050272b7ba9742ef62aa89e34500f0efd7bce800bcac91981556a878d102ceb
-Test: Encrypt
-IV: 7fc8bc27994031b3c35632590a15607ccaf1be15c542eea5
-Ciphertext: bfd5908a43916afa5e2709b2e43ac62f406a4e677b855d70b216ae92cd444fa47f5568558c3cedece54e8b436e904e927175b455d96672a8cbdb4316b9e48a704216e30e9955ae7107f9f7770768bfd3ce71416bd337710bdf4e8789c8537a37f7c995c616a437ee406ca20c8f333a7c2f84ef87dac8c32f5b9678e344645bd356dbff32089fd195d982d3bb94b06b5b232580b492cb754659df62c9b5186b26bc2485409ff95bdc0c1c4c80bfaae878abebd373b159507b5894c5a9f8402447559b5aa7c3b491b97adf202847d0f74605a2502b193b6440a6b1765d538e38a2206630dfda4123fbbe4da6
-Test: Resync
-Key: 75fe951556aae3d6ee93670241b7adac6907fd9285dbdf165834fa0cbf741b00
-IV: fff3e1ebb2e48520be552d2f0b617291c42a946f38804243
-Plaintext: 2b56b7dfaf5969d84a88aaa10dd12682f15d8a9a942deb6eba04a9a7ff38f2d0a947b414cbf7f1fca82d74b4ef98880368ba58ab7da98e8d6a6c46cc47cf0536961920e46095627b73737ea19e393c2f19d1f252ddd74b8fe050d95d21004b8997678eb565db0e369cb8bd326942e634a20845c61265da8a21448357f3eb
-Ciphertext: 4b3bbef56b4400b130f8df0ab25bb28ece9160c430417060e48e691e6cc4ba119b0c34f5e76d4f1b7963785b4c6a9fb0b42c9f4eed92f8d0989710456c7f8d228fb26359f6e2549439ff5610dacaeb1df4f43a39cb3802ab1c87ce73f731ab1127ea9c2e82fb372be407a8c2b1af40398b33582e842ef0862f120a96c75b
-Test: Encrypt
-IV: 4b3bbef56b4400b130f8df0ab25bb28ece9160c430417060
-Ciphertext: 76c77925fc94b86624decfd2014fa505a6343054ae55c5be6d12c43018944b5d1c2aa08b9c11ae00d0c8779e70f220ffa59847969e54228d89b4351471fcdb9f0f76f18fcb896983d09dc5e8d9ee666f5abcb4d9e7bebbba824092c65646c3bee46d07609057e44b36dedfc02ce576506aa1274d550afc57d973fbd60294
-Test: Resync
-Key: ea7bcb7f8712f9aa149a311d906dbcba443319f68a441a68a263c7bd0fe10fbc
-IV: 620e57a9ce4b3d438c968e603f3c1518ab70be5b7bbecc62
-Plaintext: e40ef8606c72444fd3feeb1873f7ccdd3900760af66c269ad1ee6bf1e4546b1a556d4a90f6397527b270021c226dad5353a142c22963bb818548c3ed504965b2e6eb9744a15ca3c00fef2835d34592b90cc4bef8be904987dfc35e92f835ba15f054ceb760ad903d56c65854fd21f6a03ce9f8f16c04ef7ad9507b5cfa4b373eb544f2bc61bc16e371db087fb7bb749463c16f75
-Ciphertext: a31ae696ac9d66241bf9c826a381c4610de7f6416b153d7f8cc17484f1eeb63b2bc25d7c9b8a486e3e8eed6d34b4604ab5dbca373a80c29d50f416bb4ffb8485bfc6f7b61328f7c708360cf93370b7224b7cba075becafeb5cb62938b396dcc789900d8cb8315ceb460a753f20baabb4c6f61526a012e305c28bcb59fed20565ad1afce39f98b354b67a33daa8425479a07c0dd0
-Test: Encrypt
-IV: a31ae696ac9d66241bf9c826a381c4610de7f6416b153d7f
-Ciphertext: be217c97aca7ee0c1be18f1d93ccdd0f26d751bbbc36ca29f12bbf4afe83bbf7a749d325aad3b6af4913dbb83b09ade5ec79d88b755f7b2ba63df6ec458627c83e28e4742bd49396f19463bd597902de42ac46ba675d2f0c9db8d39dcc56a5e9233264be90cfed284302b965ab0f0748dcadcd02354c1f81d640a359b8ee5aa58a1908de1356031432b6f12e22ae9ee9f847f0a0
-Test: Resync
-Key: 017f97c643425ef0ce5c0a6a0c6dd67aa6181e6aed360adcb103bba88773e1b1
-IV: 8189c8cd17a945196321cb6147cf483d785eacbea352fe3e
-Plaintext: 145a3d3ac4c5b57d68d26a1ddabc71289929b6dbf317acbb3d83313c9e4861fa9d9679de974e4f7eea83129cb8f4221df16cdf545e000e087735cb37cb321d097b7b2f4874b74af6a6da9c429b1e62d418066bdff5ea0ed7c3
-Ciphertext: 90551d5f8ebaa8c1aeb52d893ddec3e9cb95f77b8bd5f6d0b3f8a3fae5fd8d9c1e42a96360e8e7e6cc9b7711ee1d61b4d67e6c2d682215c59a72778756dcc3fa93068889219579b2a1ddd85b0e69880913cd2e9be47b93ea70
-Test: Encrypt
-IV: 90551d5f8ebaa8c1aeb52d893ddec3e9cb95f77b8bd5f6d0
-Ciphertext: ef58a8589c2996e1fd990d7ec412353edcef7dff079ae0ffbf430f3a479818352647fd8640a518575a3210fa45f7df5bd63532273d54c442ff02918aa79176c137cfea1a6ae167464183ae716a0f6057be891537059ac3322b
-Test: Resync
-Key: e9a7e6aba47b1d9c1df629c6920ded6894b85d3e7fd211bbcc7a9335e5cbf7bb
-IV: af86ca3a196464931fd579bff601c9fe7fcc7a10d7778d22
-Plaintext: ee681bb5ecd15201f433a8f89871109aff85ed5a4a16a7ffe032fff60f1acca78cee6532f7740be05438da05933c8d29fc880533d589f6029291cd0a965113e042b27734968784f871f9e9e6c2a7342bc01fba3ef666aa0e018957169f2213f492acd0d2ab82dec47d8afe7a6bedee72d0c5c7ac0d86d0af5238da822ad4e6346cf2ac76faa64d34051a91659009976d140534a4f2a80f2758a912eed692b62bda4a46649fe58563707478746c77d658f481ebf90c2cd5ff3276fa8dc36739084640e319282d74479084a15838b9822056e900f2050d0f48ed52a3a3ffbdfe3a1831
-Ciphertext: b049fa161f19691f3bfa783327d2663eb8b7f188b301b17336f68630d8e001349f659428fd29359c15e95aa3f5a9f46a92d214e0085ab661b511831d00fb6f496e171b8c139def92be2ad8f6d94c2fde48f9d77ea338b920b2d8d6ad380ce761faf170bbc05128e65149b29d32aeec45e2882362dd2d0e3c7cf9634b9f52c578cb2e1d51b5aad6447f4d1860b1a1f1b7e45bcc002a5f4f03dd7116216414b0be23876b35ffb58f466a4087c992340437e89b12151a7d8f1af04aed585f5feee36f60c1b0e19251c7587e8590e7b6bae774f3ba5f3be2d726c8da4da3824debffedc3
-Test: Encrypt
-IV: b049fa161f19691f3bfa783327d2663eb8b7f188b301b173
-Ciphertext: 7cc5bceb953ed1acf44c3a448a15f07c4e4db33f863bbc2368acfe699cd18f0580e3ff8545b946c15dd0f5c15e355fc4a10e340035e91c60b757cb69bbee8d2a22b20066b15929bf3506f2b271326509552b6430f4b82cf9b38ae83124f9b448dbbe049d7b3a98bf25678a72965f9656df149bc068e4cbea8573befef8c70b32d1dae7dc9b74601db95866dc7b5a3b307ac6ab9d09f3c55b6aaeb34c8b0e77c724666a4cea694ee90129568a46bb0f8380d8bac4f6151e84d357f32488ef8d62a08cb02255de04612bec676db471ea2199b9e86fb8ad89b259c0d1ac487cd95a5430
-Test: Resync
-Key: af768581d5e401b02de76e6986de0bedbfb7130b9014727194c1d3f02c747fd0
-IV: c4568db83cf9eed0c05629951afa4fe5b72c055d89421efa
-Plaintext: b34095f5b7660a03edb3e2277dcd3241270c9a7b890cd682214ff979b725148b1d836346ad84bd776ad748f6fb063c15fb763ca5005e9af95840f2677c1904090a19d83dcbf1011a48c23b620eda573b4a61bb8b86fbb7260090ff6f788a9dc27b5c95c3a3ebff1dc6f72446a23740179bf4dcb0169624d1ce2bf17c79dfaa35c7e12e313488919adf7e56f2d61cad070c164797b9d2dbaf5b954b56fd43e15b61f2cddde618bff31ad545ff163f2482024388ec470329835a8deb0f230760
-Ciphertext: 5b132bc08ec5bb09b5c92587a661c25ec54b8f65a581ab5f788c97c959e39cfb93032c6f63a489deac9eacb0b1a40b14ed152077fdc7b8b6dd5f94501d319d1f5cdfac56dbbedf8a5430843ca36507a363d5694e277ad8c0dcd0c0bd729bbe4b64823acff976f39973ae2d3eaa415f32db86a207f3220054306d99558e27ced2a683699a65d13eb67abb38230137de63c5c758a2149a773d403442cb826d70064c57aa4a778cb3e00a36cc4ebba6ec83dc178a7e4a3fb07c22b77a9c00e889
-Test: Encrypt
-IV: 5b132bc08ec5bb09b5c92587a661c25ec54b8f65a581ab5f
-Ciphertext: 907a2c78d9e0064b600c1d20985b6268b48cb8e7af87f615f8c298316b186ef64470b1c3c05f46096697d84ac390a3d2e37cb2306b718e7c48fb624bb1c5b3855951444f83e0433e26bbe2e05d8ad375633447a9f1c0856e35c6996c4fe4a477f503a47818ccd364b099b8d640ff2540f892e6a8e915a90b96b3ec13ec18e81a5c5e9f6054e6c90b49892e22ad1f0911a33740fe0719845f5428b0911b220ccec09a73cd8a790afe1ad4b76480c5e7718755fd2c29ea2f5f3cd7608ecb7bbb
-Test: Resync
-Key: 215f4b041d68a316d29cbea833a9d4170c32c5ea0aa34e90b4381e642f74231b
-IV: 0b9e85d8e3d62b0c5b45ef1ead0b180348c0c82b2325beb2
-Plaintext: 68a7cfb070a3ffbb5a1456ff96703d56f84fbf74d92573368def92bde3b49dc9cf8ea87dd8a51d4c12cd9b4e1d20d5939a20b86bdb9fe5c76a10bef983c871c559741ac89155eb6d1a226c2a371c03f3bdf2b4bc
-Ciphertext: 68d6236f9df3727c9a457609c0b59e393864855160b1e2074257f72d8b122c99fda40d6092cc96c8134823ab93545a6f8b43e8efca9502b5db2ecb86af5798b45639dc41b34df49782388cad7d1826d9d165b79f
-Test: Encrypt
-IV: 68d6236f9df3727c9a457609c0b59e393864855160b1e207
-Ciphertext: ab148bbc10bdb9a086c2c94c641225bdd8bca6f04d11a7cc5ba7eb728f1fd84522d3861a648ccae4e03f34162058f560028680d986c4a71e5369a312af02d135684b348b2cf42df1ab7ca841d474b3b51b8b52bf
-Test: Resync
-Key: 2ecbb5a282ee515b3226952d11d0579607f653a708d18920d18dc5106f76074f
-IV: 53f67a3bada58382426b7d2142c327c7a9fa75a8634463c7
-Plaintext: 0878ed1298af132502bb5144066d26042e4a2990
-Ciphertext: f8ef2dc3ffca9dfa4d006bd9d3c00d7517fe0971
-Test: Encrypt
-IV: f8ef2dc3ffca9dfa4d006bd9d3c00d7517fe09714d11a7cc
-Ciphertext: 488bfbb9058907da6218b81138c26f306b3e214c
-Test: Resync
-Key: 473ee670e4b93e070c69e4c9f9d1a1808aca67c02dc9b8250034b9a19f0a306f
-IV: c7bc3457a0d5b3384ff35ac10c8b09a114b09ad8e3d1ef6b
-Plaintext: 09ba3c2aa122ee53878bf46711922fc946d67085ff68c3c5f07da6749194737b715bdfd4d052366fc6761c5aad4931808033b620f7e47d3c6bb65e355d66f4f577ee42a1881a853acfa6e710673b72ba15cc169333aef8fc63635ae5a7af8154d19409f57121d6580d10796585236812bdee04346084c9a831aea5d4be2ea248a90b9d71fb00823c2fdb522ff00e7482bd9d178766ad26807d963002104d3e42d2
-Ciphertext: 12fa7fe0fa0791d6a1ccb22f025563a9f61b1dbaf825bb59ae7523b531da1d720b816f42c12adeebe8171309aa65a5357d46e719e260af1ed2eb2096ab59a00f08671acf0e3a4ca67843641a5d9be4e2c00f8da7d37349f2560dabd133dab9dfe2ff6f3c087099ebcd2c4420b6485a8e810392310a8dfb61eb850ae70680882e98d8c97c1c922e6358c0ff3a6cb6df77f0ff86f4b2697c698c0440305d3ff03c1e
-Test: Encrypt
-IV: 12fa7fe0fa0791d6a1ccb22f025563a9f61b1dbaf825bb59
-Ciphertext: b069c6b32e99129d65d0e17dc92106edb3949710ea7f84638137073b706d790f4c57db477f4f40161c029f1663ca17fa6ffbe8f6d1e10d94718cc7cb75549307c2e3da305bd33263d7f80d8da26ddeeecb95a241f0d0dd636ca54f7129ee35bd49c707c52aff4a6fb5f520575d693949b8a1ece03cf093663c86b8cf97c89b87fc76cf76d9dce6791c499208fcf7a2b7e868f625a940b5721bee984bf3ba0925cd
-Test: Resync
-Key: 95d049394412ccaaa002264f391f2448837b9a9eaeeec49ae73f21c3bfb83016
-IV: deb9499a1b4043f0c116133700eae22ea61f45ffad305c03
-Plaintext: fba6e561dbb8d9d3dca1b6073d29103b758c463c5ad756920f66dcfe88fe0e4fc21b6aa382b6b96ef5785d51bf4c6b2375f7ca4494e711a34fef708ec09dd10311d312f7aaef6828f112ffa786263f1f9507ecd5fc3a80bc3fa75c17d272ef1c7cac66097a46df791d0d61a22a68dc4217f7ce54abbf7d4fd3fcedfb4d92c4a87657e15aa3417b62
-Ciphertext: a081927e375175dc84df664d824c351c9417614523e0c30d9fc5b6ab5aadcbd9d3a2fc28cfd7c11a807dfbcfdc7d28a54a5c44e52f6e9806a1c08a5fb06f322d22a91f5aa5097b9cb12ac29d5bdbbf8312fcde98b79c6cae3a26c9828874f9c8e2b072b6c1c70f15a1b6464c722fe183fb1367e03bb3991d8de30396aafe160b4669462ace11bf46
-Test: Encrypt
-IV: a081927e375175dc84df664d824c351c9417614523e0c30d
-Ciphertext: 2629e5e9e550bcb2d80ad3134a2ceaa80ebc96a68d4cb9b0bfc1e78b8b9b06b6ee34e242a174f65f2c74688b740aa9d52f14e900436c020c10b860f7cc8063dffa9b5baf2202a8ca05a3b52bea40bf7dc3c9444989f33e2ff0cc841742df284ea75c6dcfc9a2eee78dd9ce6b29255979b4abd333ed1ed92d19661850d42ca425a30d3aaf95a201d3
-Test: Resync
-Key: 9a1831352b9bd922b41cde1ad94b40b3c2f622ffdd633d03f5638d2ca01b892a
-IV: 4539205c887f099743e9ebd3aa4ef88ca7eb0a957a1cf8a2
-Plaintext: b4a37464a37b3691c7fe66a81572f535d780925b3b28dbc85b574edc2b6753278994fbcdac780c6f09e153fcd8a2ffb6e873c440dabcbd081e7bb35098c29dc97248dae7781dbc3b00d7c097c75a2f3cc88bf6dd1989
-Ciphertext: abc902e1dc5c4e5d858597347ebf523cfa233ffa1c38b7d8e8df8cb5dc75f08e74cc7077352efccdd18e39820bf03a39ae1aa56b3f07d92b148b26d6214d710167004b338c1f9868b6932b3d999e60f84ec839dc09cd
-Test: Encrypt
-IV: abc902e1dc5c4e5d858597347ebf523cfa233ffa1c38b7d8
-Ciphertext: 7b2d46034c39cf770b075dbf8eaaa19492e51e451d1ba97a0f4a71c466dea5dfa1d506ff3c7cb90fe276dfd73a6c0ce88e0df56ec0429872dbcae451dd19d2f3e58ac420e83c97909dce9673e7785cf3a11df9a0b062
-Test: Resync
-Key: beed63202b4bb586cadbbb8b6893bc6ca2c07217a3b9275b499245aaace55383
-IV: d22603bfe4fe47187d969fce3aefe24beafb9337ef886980
-Plaintext: 375fe2819168ed3a1bfa7f46e037af06f202f1927b78606a46a35f41e23806817a4151872a5738ba76fc6bc736208124d2da5aaa952276125eb5ee95ab9668a7e773a2c429acf296979436ab21bf8bd77f31ab3023bd7fdbe28b93fe92ddabf0bdb1d990d628bf43942d728cddd330c8b79ab6a270877b789a714095074823637880bb380ad826c3a5ec6fd46c0e2b5887dbcfb101fd84
-Ciphertext: a9b65651c6b7b3a6322c21538d9732f2f31beabe4e94c288aff4cc0bd18dea04f15215343a07e16eda6eb535a04f0fa6100bbafd8fb7e89ed087e662cd5537ed321351d19b56a6dc4a8cf50078f7bc9bb9d2982a0ffc8d24e1814935a9ca38edc6b04105a8ac488437946af107e1bf0838db8ec4066646692fc61b9d94d09a83d63913838c1e88ef6845de6b32e261ae972a6b70e72d6e
-Test: Encrypt
-IV: a9b65651c6b7b3a6322c21538d9732f2f31beabe4e94c288
-Ciphertext: 685c9adf5239c2f521ac91e3a335267b34ce2aad1760f8771c51ac8c48ae1b93938ae2fa2f988b7c87a43c8cd4a97b5e65c2d11aa878c69349308922bf63dff3a5579d549d22c0028a336aac48bdba88cd9654e37746d2728ddf653c7eed0b0404df6f5a4342d0d7e1df8841da0a249313e105e2863d63fbed1ee621ef5e57f48753dbe3d2fc08d15b5244bdf0369c1741fe92fe3b677e
-Test: Resync
-Key: 8d4b9a4e7e3107c54a75a7c74b93ddf9c44adeffb07a503a05d6a5f287244808
-IV: 7abba4d58cf460f394f80bc9a080a355961c4a2511f50947
-Plaintext: ed3eccc8be0e5ae6d90eed3b15357050171716c7ae56bc9ef7224db5740257361b83aec0d8c7dc7a9e1df44e0f3fd1b8275bb6c5d6fb8d172df4918f39bab0323a5fa7c4a98aef3a482394882daf5403767f639c0d651f01b9b294d511876c4c3c471f7b684900c54cbbc1143d8aa690d7ab98a41fd9236c31692b7d2406beab5202e1b617ee43a6b9c8324404c4862e5fc0301ba8ac7d7b65df1eb36bf038c85e51a03f1b38a6fa74b0163657eebe640343b83a94ef09308ea3f98cc30ad9
-Ciphertext: 5cf10e20d44ba83ba4b201c7176846976b1a10a98d37f006a9b1ba01b4c81db6e97514d0dad76855d95483f3765b26ecb5f8403f8bd65a79cdc220bbc39a35538dfc757431c20b22cc825633a9af1be926f1072b38d2e89dcc903f2d257592ca97520c869abd4f2ec41b10adf0a2f7c56296975869dbc3a2e1465d32b7781991747ad3d141fb0c343419b76c5ce4facfc257f666c1dd020bdc8f189aea79d5c77e63f42da60510ba86ec2b1c934b90d77793b5951faf1c94b5e3ce38d869b0
-Test: Encrypt
-IV: 5cf10e20d44ba83ba4b201c7176846976b1a10a98d37f006
-Ciphertext: e23e817a9c4c2740922734bbe3cc5fad938020ed34c0fe401d4da9cee010d4d1056b71d28856ea327d495c643d819d2d4ba6d97820909a7ac222b892aac4ab130610fbe29311f28432303af69d3dbd3a696fb35582aef9b7040a7e85f6c48d31a3d0c3f1cddb5251bc01a5ce0ace8c95882228ddf7c57aaf1890d70b899631a09af5f4130b436a69ab8623e0260cadebad595ba3d27da5df9e62544876d4daa3fe7af8ba8bdbb7246af0289903d69928c43a1c720b948e2d5a0e8b0d062fca
-Test: Resync
-Key: 39efc9016ceab203c0e172a335d7dc2916ff577f168904648dce170abf5d21ba
-IV: e4e0a36fd930f726ff81007cc919ba0da8aacb5abab72394
-Plaintext: c1229356fb463b251270dae5bfe6772135af17b0624454edee3490ae95616c8b4efaab8a6b6f2a83b083d4ef19a86950c6b570d9000e94255087ecaeb56fead57eb8c51ef71fc802f9fd9d14f462fb5568d4206815e7f3473442b5f9ccc730fbf86a45a008f2b784d14791dcda532578e3ba17a0a3733bd518e15d2a65eb6c79a2130d988db4ee07f1f557a9a08aaa77f28744cf928829c940f70ec541a07b2646f4860fbda22f95cd20018deb68159aec40a889e534dd071a076b46d29a3445c8cebdf2ae0ea6ca7ecdfd203e5941581db5a84e66828f2c3e1b
-Ciphertext: c885db1a0c9211392f2cf3cd655170409d53fa559acc66faf0f75766b4501ce80b739f51b985ab10ebcaae7adc2b58c1315ded28b77a2c1c1e3bb65b7d9866827a8b4a39f316222bf0522f3c4cd1ab367c6135cd1b104fcaf4cc746e12d3c72a5cf781d487e1a297d83822c6b68c1b5a9a9505a9b64963d64b2d50ef487057aec172cd070533c400fe0d83f79f4affb1be18fd9429d5dda1ed35c71d674fe98788e3b488bb3b5a781fb6689f8732aa8e4674a5df2643b03a332fdc3d5e10bee7014753a745b4e7bd2b579b8885955d8141fca840204da3eeceef
-Test: Encrypt
-IV: c885db1a0c9211392f2cf3cd655170409d53fa559acc66fa
-Ciphertext: a65f1a87049667811331f8305128b6c06fc3becedae1661dcbac3a627d27cf80429687178b1ff1577cc99bee4b311c480dc3053a74fa523660e9af670d852a032e69b65bb2af61af8a2db4d3aad0a4b27ee74bc2203ac502d188975463f050e3369259d676881b1b318a1cd26094923d2c6fb15c0b522952c176c3cbc01252a4d64f875aea09a9295957be06209ae896410f5665422df60dc4038dc9ad1a45f16350bb433054b9a14061b5eed9cde905ea59f15bd1f58811dd4df49531138431e9d57a8a9adbd4d4fa472077ccf40a2a61affb82242db08f3d27
-Test: Resync
-Key: 3070f0db09c523507d36404dac79038a393e9f0e3cf5f870b16d2a06da68dcd3
-IV: 4afe87bf79eb938d786ba54c26fd6d7e62261eeae8b62202
-Plaintext: f4ea120b47d15466ade07df0f2ff508759d9cb1035ceeab43920e9094fa50b868673b07173557d4b994b1e9d35078c1c7369df6b6adb2ec0e6bfd280fea8ac31db44beb0c2a4ddc6198957bd0592e3e587d304863b893ff8eee0efc70ced5d712651c3e9dd1a0de0480fd8cccbae4c50dccbacb83dcdc3e2cef7dbc645f0af468163fb0e015ef48ad74694dfbce2db8430a6e91645fd16adbb72e21a0fbaedf5ecff829cea9cbc22f82902748aa52da5ce903d9f2bde77efef5fa3970c720e89f25dd05157247bf0de2d2129c3f856238d4fad
-Ciphertext: 46f396f0d2d54189968bf56b5b2f35588c3ad851e00fac6507598f3ea0193a586c00b18677811cc305b0261d9aebbb9c0485a5800c940aa4f09c4fbdede12553824c429c7954e0b8dad889203d292517b98a64e8d7a37c1364eb0934751323d9b9f8498f50d729e977fb742880222f22ac5d7bfebe6905a4c344d82027398a70c334635792deb0f20b83861b05e731f5627aee17df20413c79957556e66a970085e9ad40a73d9a964381584976c6f111619a916fbb5f5d305df862d5a56bac9ff9b436f31c85f34ff890b5ad3299eda2b8642d
-Test: Encrypt
-IV: 46f396f0d2d54189968bf56b5b2f35588c3ad851e00fac65
-Ciphertext: 358a8f5e5c6fe93c3d6d7d2f90f5973ba2c0cf7c4579c92a52d1ce6203ddd90188d3e36ff7cbe94e7adb4ec7596e89edcf3a94dba1fe64eeb24e8bec5fed2ef6faa4f0d16faf5853e8f69ee0ca0e048658507bd155bfa13d487c3b994f3a1b8871996eedc2d899d9d79ecd8ff968000b863337dc04d9ad8d05696659f8a1cae880e471621ea13ec42d163eecfdf9cd07bf0b10d6f4634ff16d26c700c88831efc82ac0abd0269b93e302422cfc2dc4088e28bc22ed6c06c9b51774bf3aa4088a6a18fa3d3608f9927837efc3382b25a7ab873c
-Test: Resync
diff --git a/src-cryptopp/TestVectors/seal.txt b/src-cryptopp/TestVectors/seal.txt
deleted file mode 100644
index af371e5..0000000
--- a/src-cryptopp/TestVectors/seal.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: SEAL-3.0-BE
-Source: generated by Crypto++ 5.2
-Comment: verified against partial ciphertext from 1997 SEAL paper by Rogaway and Coppersmith
-Key: 67452301efcdab8998badcfe10325476c3d2e1f0
-IV: 013577af
-Plaintext: r1024 00000000
-Ciphertext: \
-37a005959b84c49ca4be1e050673530f5fb097fdf6a13fbd6c2cdecd81fdee7c\
-2abdc3e764209aff00a12283ef675085c1634b53289059e6a7ab5ed9480c01eb\
-4c64569a8dce2a23feed0ef58f6f5ac3f74145127dbcaec4bcb6b1a459bdc287\
-58ba0523f721c3e154433dc7353f02ef487b07ad309ef5e44e6cc19026f5fd57\
-07cc32ec12b9c01fe0c58beb2fe73ea79e24093f05911663a76b21beab18cede\
-17275c54d18fcd3e4cf32279347b22f8751119fb56d92f55d511e4ecc1334085\
-e74934455a2daec3f1821c54b4cb809053b8d837de4186600afedf8bd72dd56e\
-223745c19f76edba01e9b5346666d01f677fbd68fa5010fd7db8b06829a90da0\
-e81b84756a70946a6c05e16d225a2e11af586bb1c5b1d21f5349f8e5e3ee41f4\
-232d554954d1bc86064754b86c1dc92d7a9de30086d8eb4a7c86db9c380f13b9\
-52e11c5b89f1be0a6b52c6e7a053da7359c5fd7f50c70232d86aff08c5ff1746\
-d3bd074d79ad6fc657e0cbbe5d02c4fce55d3c31fef4642ed738f751430f2f1c\
-f6e453ef6edeb9540cec52c697d4864201e141e06c3ddf5aaa64a1a984247e96\
-d2cf1e7fb2bc239919369f4a0bf9d111d0d8be64afae86214d5f62e64f25e8f1\
-3e12680ec170ad6234cbbda938df53cc17a12afea1eb4005122a65cb42bedb76\
-edf029db910fc81b81f3dd28341fed4064ce37648548e5852d4aebb7923016f9\
-afcb07ae7bc11800e217a0062f0b53ffa8d471aa78ca6a13b7f5647189106773\
-0a311d6fe4ff57f05f9a58aa742696b6cbb3ec539da0c2aadd6a60d2a33c26d5\
-8a343448ed912aafb98568c6ae1cb1efaeafd81a6e3e7c450f8e2be4c6cc18f9\
-5e8a1c6c59190a2798e912a614c1e7d0f7e74b1baf8e5682f5442f998b24fa86\
-d1e5f673002e2c92db8ebf7abb1c9d267a9763f4bd54f7bbf07c4466dac0bf3f\
-faf5666a43a52f0812e76df5f9d4da8ed1bc6d4ab29b34718facb4bebc11e907\
-fe9b0e3937de7769fc5b0cc52b3e50d57e02b9b4022949aaf3698bc58f696073\
-ec972a425caee9700864d3d166130ee09d51320b9d51bc9b4aa575c789786242\
-0698d9e1f6426fd141a32c9f55c24e5149e274983035ac1c44833b0179aed63e\
-a2b2b61afa54700155e55c7c343412584f7b0fe73d63c5ad88718dde3000ac1d\
-b4050ae2610032e6b389eec48952a1a2ed0016e525ccd9616706caba89ed07d5\
-4f15ecfaabbc91b7c82c5904bc0f83d44888997faa11fe8fa7333cb8c5b16e31\
-52233c80fbc9f71d9ee8fefa50d67a7e45b93d3469ba4078bb1ed5859e7a8e62\
-b26bacf538507fa6bd43e18d67d7aaf27baaa68d233ca392ce33e257d5ddf3fa\
-ef6a951430d686f65ee9afaf6aee0677b41098922b41fba202ef05a27d614612\
-5daebeb147d617c8df42dba0b91dfbf8ab5805ee9877e495881035fbb7342c24\
-e24f3b85c88671184152ab0d395a9a81afab3bf93bea49cb23ee6bd1c9fb84e6\
-4ecd462f60119ceeae7f1d2150bd36fe7ef2782b0fd12b55df119a517103d489\
-0a739b715d3d33e2ae9fe659df4bc0136c0b243538eaa8f9b813043d66ae15c8\
-261c94c0072afc802668b3151ad1c0ab0f034eb3e8f2fce0c9fbc8f68404fb93\
-a1cd11f4eb9a5eeb9117462ea602ae41fbfe0074323e56e15deb04d41f3510cd\
-1df417f759f4c2bee72bab88833e7d3d9837801f16901ee12581588fa7037f74\
-073b2166405d79098098fb196cc4b1733e45796fa7fc977cbd23853e5943b2ad\
-e154856565a455189198f6ba50b9cc6fda0c309a413ccc746bc8261fd6b060f0\
-5cfcc82894125b3f1e0b0c47257fd838cf295aa13102724163a9fc2598fe8572\
-d0bf844518dccc1ee16eb8e4c9935b78fb969b7c3104091079079a7688f1e833\
-0335f63eabfdd3224a506bae4ea3022a8a4959f4fa410ad7111488a39e3c1cd7\
-a28ce83255de2c4477fe62f660af3b7ba049240aa5212e4e9fffd8b66fd51b17\
-0bdf6c7e7214361a7efdceae86878f49716c0859ce2e24979bae82d98025720e\
-06d7904c9646f1b1058b1a7c93ee4fd728c4f19051adf2ca30f4d54cf65be23a\
-7198e5be5765c018bbc1d2344fa8d1aa908cb8f789ea793c6c60d9a7ba9eebcf\
-7aee50a54810cbe3b632144956a157c220e33a232c169cc9ae64d6aa3560a185\
-fc2d94f15b389eebad8d07662c2be6d6349ece8ef88aea27d430ec9512ff1bc0\
-c5560862fa4a833af750d968e9fb545e3879571ec021735761da937e294820c6\
-585ae00e8023f48a4e1f392217df763a09e540ca615188345512179f8889902f\
-38c626ea3a333fc367818b058dbb8d6aa474ff3438b2de2b32822fdb93f77618\
-83b89223e0e616c885fa3414905d098d82a5359f629ed11589974393cfaf4695\
-da7ee36346d088a6ea6ef21ad6245da8de9956fcefc930c4e2759b596e3f98d9\
-2483b2bd82b74269caae2014f796ffcfe5db58759f0cd4e527b16f989d9cbab7\
-f20282ee2e666cc19ad64aa7a36193ff248002c762280a98f3ad2bf07b32f26b\
-eff5a5586d967d844aba69f7297bb1e28075273f39aa6e7c6c7308728da8ad30\
-31a2d20ebe99940732f93d0440b6e3b481774b69eb76179496350983031c2611\
-a27d885d91ac37debc02512edd06e1d10061325c5e04269c0c14942d10f03f83\
-06ef173d645478d79c74990a82df4b13f2754f273227f96988c25bedaf392534\
-69d73d642305f8058ce4713f65a36b822cd98da3fd805c4408d18dde4ee8e794\
-72e38f8683edbbfdce8d085e005407666eefba25d8c3368c6cb656a699b30736\
-31b8024eb6859019feb76bdb5a0d7f17c92a37fe6bcd14630c1a62bdde1e41b5\
-e9ab7306183a16c31554821ad44229ebce2e552f9a09fd1607dec8c92a1e893a\
-b80c331cdc7860093503cedfd44b3403b3501415916303baef0c68d12efa7c54\
-a11af3a7df5d23df98cfba907dafad0a8989c710d4602fc75f663fb16039d94e\
-f860f358bbf05ac9c34865141030513c4cda32e9b777d9fd9e4ebdc1ad0b24f6\
-799f815e29b8e2259f94b0215b94b349938556736d3ed578cdcea9024d71f174\
-376f05b3c203cc56476dd92d07ecf7e283cc181225a2b690eeaf3cffd35bbda9\
-c4ed0456661e2e39f6be537d2446f65cae13a6dea668b04f8f223601629cd3d1\
-1b75180dfea19435bae5e0622c5005371d4198b8dc1e0c40adbbe08d3651d345\
-4d68507f7f0b56d4bf2a328bb68854064699d0a38d7468ef64ddb4139644fabb\
-d21ad79b5f28a5612e445dc5673b2038e3f7dcf17a12ab32da214fb28500ea79\
-00491554da45661a03e2a878d1006d4fba8e22a7e5dded9b02fb8b5e6d166aad\
-43f8ef3eec4a7050a0304d46cc0be3ec97f0bdd137eea7c001bd8519101ff3af\
-76d1d7710c22c5b0a69c10df3493283254f5afa2ce4b3959d3be512e6ddb78da\
-30cc0a338d675c8fc3fcbbd313b696c660a85fa13ec9fa13ac8e8dbce8335575\
-608d5962ecb516b9ac186206e1ffb971924e9301e6fc220d0769ea1cd954e2fd\
-dc591ea026e369509d427ad062b81ca5e8873432a0d7a031b7f26702840fbb5e\
-5e9e6c8794dbec841822ca92aea2a22709182a3cda136b7b3569d85be6213817\
-06b2852b7de3e20907739958726334ad0c2c3b7327d0060b3f6cd319bf6666e0\
-9de3ee588abb948a6df37d5ac2b18c82d63ca0a0dcc6f1c1e2ae609999f60738\
-714df767fbf14b12b7a002ce0dad86f8adf777ff7ccc9b08180faa0d96b44023\
-3ca5398525eaaa9afba9e0ea4f2cfbf5a3e868f99ddc1a86ee36baf2ab56f9b0\
-b1ff1ff591033e579847267b9557217e0991d2c90e61f7e58321d9bdaba96c9c\
-63e9d3924f0a8c7ac6d4fc94d74d7bc1a96aafad76fca0fa4017d76f00f5cb5e\
-96058fafb57caf07cbcf665fea359cfa2cd4084796e3ea2ccf30bbe6e8f7efea\
-60190fcf2700d1d27b80ff53d8071aeee1ed8708617c92d821f83c9a7ea90c72\
-f19a58e9179cbed5f4f86a80c28e0fbc3fac50d5eea3117df747ab076044f1ef\
-61c7bb95ab31ca2f4f6e61d19e906230694158df40a72fb748dd79d0fd0617b7\
-24b23c6d0569d170731ee07dfd637820f10fbe860a179f2a24775b1f27a2e528\
-a5808d13cc3f995d2cf0c4a832915e19bd6293bfae8eeabcf85de223c4dea84f\
-0d095815cd34ab885d6c50816bf8fd07d4e58aa8c8fbf34344fc3279c1efa142\
-68471ff263f121bc501439c9fe1ae45c946b348a00535ae451d17f3edcecea67\
-5a7dde387813246bb8312147163f813159413fd550e00204c441b0eaf4d12c79\
-520a3d3bd75b00e20a5284457fc3999ac7ce1f1202e5bd651047c74eac7ff92d\
-7f214d6583304f6dda309a01230198b1e656c9707f2f27663c1855771af7f449\
-0e3f3f8da53f0492654a3c40d15620e2fd2a68658ecaa8fb5601775a393878a3\
-110d75e6b968db8eb81c2ecba5852b2eaf7f9b8967b60f92ee4af138a5e777b7\
-aad802e39d7237a17b4a79d9a467a4be1be5121de907400ee5586f0f94bed1db\
-35dcd7995ec93b49b0f6dc7a1e3e4cc0ad1945e60dbe0d24948eb94ddbc45e20\
-fe0bea593df4e6d38647fb623df65f6fbd1e36f318decf77824abd6bdf95eb8f\
-a5f29b650f36b77a305bf9c15b034a7ce1f482ccba079171a6476863a70bf49f\
-cc488177e461837c64d5f5419ae0a344010df2d6edb170b1461ef27024199b15\
-44144dc327eb225f1ee99ab4f07bf2f934042f2df86252c4058212b2e5cf35dd\
-14df206c1dba5445d41f211911e1053813a09e7fea3d5de5cac92acfe36b3ef6\
-8d4767c52a31c8ccba0eaa85874892d813ae601db1ffd5cd42ec1e98534056e2\
-753b5fa30f993016b787de9620a1242986370e005ff4495315c2b1aedb59a32e\
-47be953ea41f15fbe7a115d10328f67e59c538948ceef3f4a338a030ad198b2f\
-c89f067b336f28085a4ca061a38ae6190de48981de1c942ea83a9143b1faf94c\
-2f462a9de5d14b915bfc52e916d16f11cf59a28a3d933fedb48ac06b7cdd29a0\
-720ed851863bafe7a149f403881afe46b940ca37c29b7e49a730b28404179449\
-73274553b70fb11da65acc1c5420677288c624e67542f230da340d1e9b8dc5a1\
-90b69bf5e67e77929250a802f07cdf0716db567209774367aae32e0c1e90928f\
-61c43eaa372f1e9ec70aa0dd506734d23825213edaf184a24a1bb128811db664\
-783cb27cac1edd074d79d1259f84da9e0e5c75923a4dbfaa8a6283dd2279ba69\
-bcd1d78970d7a54a0d31c44071cbf05527010e2ff808cadefd74d906a8ad8c32\
-a01845d3ad78bc6ed96a688dfff171d80d931409d94c83da2bc54ad9790e9a6b\
-a5093384850090a961572f6fdb929a1a6baa98c015e95b0a6da10de04b8471c1\
-aeac19b6c887c1c81dad641d55ab1a29250d14dc41a042f83eb8a6bddcb662a9\
-3e00cf6adaed95cb52b36692f43a8e9b85ba7723d70e5ada851a16fe102ee1c6\
-d3bf8be1634ade9fa6b44626c734788b3aed0c287ab7e80ae5fc1451ddb037c0\
-f729309209226022f13e6f8aa592445db33bb1f29101e0df15db15df0bab6411\
-5bc12f0bbf430551473dbd274db2eea9905eab75f290ecbd903b675f1ad9ac2f\
-2196d00139e7671ac8b95a8cc8e244511d481863b509e5bb7573b6ce49cf0fc9\
-53de75523ca31a64012d11bb7f60f1f67b199a4f2013f6ea3808e2639eb5f263\
-1c19568bcf36071235de8ae7b2d5815e2e0a2e81098a6b4d6179e29ed0a92bdf\
-585a2905f0496ba58eb3d740efa54b664d1a6134fed9fede636504aa691e08e4
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/seed.txt b/src-cryptopp/TestVectors/seed.txt
deleted file mode 100644
index a08a102..0000000
--- a/src-cryptopp/TestVectors/seed.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: SEED/ECB
-Source: RFC 4269
-Key:        00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-Plaintext:  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
-Ciphertext: 5E BA C6 E0 05 4E 16 68 19 AF F1 CC 6D 34 6C DB
-Test: Encrypt
-Key:        00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
-Plaintext:  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-Ciphertext: C1 1F 22 F2 01 40 50 50 84 48 35 97 E4 37 0F 43
-Test: Encrypt
-Key:        47 06 48 08 51 E6 1B E8 5D 74 BF B3 FD 95 61 85
-Plaintext:  83 A2 F8 A2 88 64 1F B9 A4 E9 A5 CC 2F 13 1C 7D
-Ciphertext: EE 54 D1 3E BC AE 70 6D 22 6B C3 14 2C D4 0D 4A
-Test: Encrypt
-Key:        28 DB C3 BC 49 FF D8 7D CF A5 09 B1 1D 42 2B E7
-Plaintext:  B4 1E 6B E2 EB A8 4A 14 8E 2E ED 84 59 3C 5E C7
-Ciphertext: 9B 9B 7B FC D1 81 3C B9 5D 0B 36 18 F4 0F 51 22
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/sha.txt b/src-cryptopp/TestVectors/sha.txt
deleted file mode 100644
index cdb1ea6..0000000
--- a/src-cryptopp/TestVectors/sha.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-AlgorithmType: MessageDigest
-Name: SHA-1
-Message: "abc"
-Digest: A9993E364706816ABA3E25717850C26C9CD0D89D
-Test: Verify
-Message: "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-Digest: 84983E441C3BD26EBAAE4AA1F95129E5E54670F1
-Test: Verify
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-Digest: 34AA973CD4C4DAA4F61EEB2BDBAD27316534016F
-Test: Verify
-
-AlgorithmType: MessageDigest
-Name: SHA-224
-Message: "abc"
-Digest: 23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7
-Test: Verify
-Message: "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-Digest: 75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525
-Test: Verify
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-Digest: 20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67
-Test: Verify
-
-AlgorithmType: MessageDigest
-Name: SHA-256
-Message: "abc"
-Digest: ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad
-Test: Verify
-Message: "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-Digest: 248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1
-Test: Verify
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-Digest: cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0
-Test: Verify
-
-AlgorithmType: MessageDigest
-Name: SHA-384
-Message: "abc"
-Digest: cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7
-Test: Verify
-Message: "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
-Digest: 09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039
-Test: Verify
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-Digest: 9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985
-Test: Verify
-
-AlgorithmType: MessageDigest
-Name: SHA-512
-Message: "abc"
-Digest: ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f
-Test: Verify
-Message: "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
-Digest: 8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909
-Test: Verify
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-Digest: e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973ebde0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b
-Test: Verify
diff --git a/src-cryptopp/TestVectors/shacal2.txt b/src-cryptopp/TestVectors/shacal2.txt
deleted file mode 100644
index a970c46..0000000
--- a/src-cryptopp/TestVectors/shacal2.txt
+++ /dev/null
@@ -1,5123 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: SHACAL-2/ECB
-Source: NESSIE submission
-Comment:    Set 1, vector 0
-Key:        80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 361AB6322FA9E7A7BB23818D839E01BDDAFDF47305426EDD297AEDB9F6202BAE
-Test: Encrypt
-Comment:    Set 1, vector 1
-Key:        40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F3BAF53E5301E08813F8BE6F651BB19E9722151FF15063BA42A6FEF7CF3BF3D7
-Test: Encrypt
-Comment:    Set 1, vector 2
-Key:        20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E485005217441B60EE5B48EE8AF924B268B6B952D7F593E6102AC83D7DA72838
-Test: Encrypt
-Comment:    Set 1, vector 3
-Key:        10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AE70E355CB7E26FF12421F46CDAD5CB98367FE0E86CC234EDF97481765CD1AD9
-Test: Encrypt
-Comment:    Set 1, vector 4
-Key:        08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 00CECD0B01311F881018E7A20BCE169766C089D91FF161346C4E1BD122EA199F
-Test: Encrypt
-Comment:    Set 1, vector 5
-Key:        04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 47A879CB6785AD37119C450CD50E9A36FE318FA8E7B6C6E0FA963430122F33CD
-Test: Encrypt
-Comment:    Set 1, vector 6
-Key:        02000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CF3D53B9F9F7CA2C66738A4C09CEA9212C056F525BDC26F263FBA1B482EDF503
-Test: Encrypt
-Comment:    Set 1, vector 7
-Key:        01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A274D404E83E82817389A2CB7B528C792A0E80DE879A5A67DE633B0B7DD57B7B
-Test: Encrypt
-Comment:    Set 1, vector 8
-Key:        00800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 09B3AB9332301D4E3C239D192A4221AFD43F6829A705D396FA96BDE1E716BC38
-Test: Encrypt
-Comment:    Set 1, vector 9
-Key:        00400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D3B9AB867A6868C4400D200979055C8F9E3A6BFB40D1F9E376B9EC89223D7050
-Test: Encrypt
-Comment:    Set 1, vector 10
-Key:        00200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4F27041481DCF574586CD6D5B72F2E806B0DBC351FEEA624112897A8A64CDBA9
-Test: Encrypt
-Comment:    Set 1, vector 11
-Key:        00100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 77CEC8EA64BB7FAE966D030FE4CF318C318DBEBAEB896F31FAA3C9CBA0AE125D
-Test: Encrypt
-Comment:    Set 1, vector 12
-Key:        00080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E6F96E0217B8BDC6BBF30CB91C05325F493EB076E505FC6469AAA2BBB3A8A60B
-Test: Encrypt
-Comment:    Set 1, vector 13
-Key:        00040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: ED949C1CFC555EC7192464AE86EC0334AD1198C2DBA36DB38CDF7160C950D474
-Test: Encrypt
-Comment:    Set 1, vector 14
-Key:        00020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 41EB01CC3875F31A6C8D7008C958BBB164813C59435B01879199979FC4762B26
-Test: Encrypt
-Comment:    Set 1, vector 15
-Key:        00010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CCE7C4F96A665DDD23F39A78A3C7898E5F945FE908F1707DBED08BA6BCA3A58E
-Test: Encrypt
-Comment:    Set 1, vector 16
-Key:        00008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5FDBD5741AB5BC53E8C75F4497E37D5BE92B89D2424A11BBF189449AE005E2E8
-Test: Encrypt
-Comment:    Set 1, vector 17
-Key:        00004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E6C00B21A5B89F4FE9251E53E7AFE30D6C8721678BF842575EEE185E85632778
-Test: Encrypt
-Comment:    Set 1, vector 18
-Key:        00002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FC19871F6E933014D92721D77BDF4E0EF528A325D5DC979536D6C46457CA066F
-Test: Encrypt
-Comment:    Set 1, vector 19
-Key:        00001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A195202A93364212B989EB2C667EE05881657AD95FB6B3EE62DD21EB73347E56
-Test: Encrypt
-Comment:    Set 1, vector 20
-Key:        00000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A25B4FB9B4F8418514A1A04078DFBDF73B83B936A887AD6B1B672F1C2AF128CF
-Test: Encrypt
-Comment:    Set 1, vector 21
-Key:        00000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: ACB2AB0F22068D36C160D668ED300DCF32C66FB8447594878DE1B1A83B414E13
-Test: Encrypt
-Comment:    Set 1, vector 22
-Key:        00000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A5AD217E39C9B40A921B4E52B1B47649C72631E7A99FE4897A92CD1A65BF8BFF
-Test: Encrypt
-Comment:    Set 1, vector 23
-Key:        00000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1185C198ABA5AD97F5DF7850284CD5E34BBE5E0EEC3CE4ACC4FC0A3CE3FA3BEE
-Test: Encrypt
-Comment:    Set 1, vector 24
-Key:        00000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7AC85AA2C5A9A219B8E437C65913738628EE442F56BD57292C8A1B36026B6664
-Test: Encrypt
-Comment:    Set 1, vector 25
-Key:        00000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6140F926FA90F091603D23A4876A3A5598890CB1F2FDE64E43C50630BE4101D2
-Test: Encrypt
-Comment:    Set 1, vector 26
-Key:        00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 365135682290CB40D83228B3F26FD63266EED9C72DAC991510FEFA9B56466E8F
-Test: Encrypt
-Comment:    Set 1, vector 27
-Key:        00000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 928EED2E262D9E398ADA06151ADFB35F34018114E97414C75E390C8EDA8D2440
-Test: Encrypt
-Comment:    Set 1, vector 28
-Key:        00000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E362280E66204F47E8FB782D18522AA3E1D527C15EBA88E76DB5AF44E156BB45
-Test: Encrypt
-Comment:    Set 1, vector 29
-Key:        00000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 807E3938AF9C9F0233FDA70B0E26028B390101F238ECFBD53EAE8E2D86552DBF
-Test: Encrypt
-Comment:    Set 1, vector 30
-Key:        00000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E7D3FA388C4E07ADD32E188BD09264A2BD19F0F7EC5712AC05C47B49C7FD6651
-Test: Encrypt
-Comment:    Set 1, vector 31
-Key:        00000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 891CFD4A18F35239FD4463DE95FE9CAF4569AC82766E457315C123FB5FE6A397
-Test: Encrypt
-Comment:    Set 1, vector 32
-Key:        00000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5C8E12B2572ED949494B324383806FD61B7CF0479DEB5D62028E83B7091BB039
-Test: Encrypt
-Comment:    Set 1, vector 33
-Key:        00000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6F071D68C107B19B9949A6B7AF2C79EDC40FBA9BD07674AB3B1DB8CDE0A9637D
-Test: Encrypt
-Comment:    Set 1, vector 34
-Key:        00000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FD720D4ECFB7B68BA48C52E2F69FE268773D73B41723AA51127895B14C516F34
-Test: Encrypt
-Comment:    Set 1, vector 35
-Key:        00000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0D3D7DEB1F8742BB22C4A3FB88C7C07CDCC8165ECF624C95FD8838D90D465B0D
-Test: Encrypt
-Comment:    Set 1, vector 36
-Key:        00000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 06A524998D1FEA6AF6E4015B9A16B7A447F50AE0A8902E6E3308D3B47E98C4F1
-Test: Encrypt
-Comment:    Set 1, vector 37
-Key:        00000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9FBDF43AB1294164BC968E113673BB11195AE39267BF2537F0E429E3C10B5D2F
-Test: Encrypt
-Comment:    Set 1, vector 38
-Key:        00000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 81C4C7F2144555C888D876787EE62BC03EBB57093DB3DDE806918707684C8C52
-Test: Encrypt
-Comment:    Set 1, vector 39
-Key:        00000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F62E7B237C98C5727D4F267AE17932AAC4DAEF0CAF4C02176B4CBB902ED164D1
-Test: Encrypt
-Comment:    Set 1, vector 40
-Key:        00000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 99CAD86B7E78D9B2ED9DA56F27C9AECB49CBFFC287930CEBC1BF06EA94541E9B
-Test: Encrypt
-Comment:    Set 1, vector 41
-Key:        00000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: ED1F4429D5C36B2C16D598A2CE52D9C84E9DE7CD0B4899E47ADCB999CAEDB0CA
-Test: Encrypt
-Comment:    Set 1, vector 42
-Key:        00000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3FEF41084D9CFF6111C40F9656C46D3892323465630B0C1D082255222847D9D0
-Test: Encrypt
-Comment:    Set 1, vector 43
-Key:        00000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AB7D2B41135ED54EC7AB11C67D20BC35F0C8652D209D675AAB3A33FA264C9380
-Test: Encrypt
-Comment:    Set 1, vector 44
-Key:        00000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1208F63F213F1A55127900FFBFEB0569B693376D9310C9A9E36EA1DE22CB5A59
-Test: Encrypt
-Comment:    Set 1, vector 45
-Key:        00000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 10C38678BC2465923063E41B4339D96F3DC5A64CA77A9C9C132D75BC4EC517F1
-Test: Encrypt
-Comment:    Set 1, vector 46
-Key:        00000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5342519F1181700EDC380133226AE072971AC1AC6DF72440FD817C9ACB862E68
-Test: Encrypt
-Comment:    Set 1, vector 47
-Key:        00000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 09D02729C71C6E5E852272B853E87C1BAB5E522875E5D8063501ECE10315B4D6
-Test: Encrypt
-Comment:    Set 1, vector 48
-Key:        00000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 33D7D4F58BDD14244621A960A076573892ABDDBEF36109289A3E8A4EC536E95F
-Test: Encrypt
-Comment:    Set 1, vector 49
-Key:        00000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 81A4590D64E2140414B913AC73BECEC19CAC798C313196007E39EF4F75C7DDB5
-Test: Encrypt
-Comment:    Set 1, vector 50
-Key:        00000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 942ED16EC4A9D72D74ABFB7E79CDE840997DD2AD83C9DDFAD02528A9A7E0AAC3
-Test: Encrypt
-Comment:    Set 1, vector 51
-Key:        00000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8376BF03EAE71EF035E18903AC0CC2CCC93610C48050DB096BE758743234CD63
-Test: Encrypt
-Comment:    Set 1, vector 52
-Key:        00000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B5613234B5F9D1201A9A581D59BD744B8E59728E5E330B74CBF03B9E81C950E0
-Test: Encrypt
-Comment:    Set 1, vector 53
-Key:        00000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4750E864B881A2764EC508D0DD4AF06B7B1B123FDCCCA141A74DEAF28070B408
-Test: Encrypt
-Comment:    Set 1, vector 54
-Key:        00000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B3F29EE6BDF09A16C4EA8C1539CD033B17706436FC40DEBD95DA70BF05BF1856
-Test: Encrypt
-Comment:    Set 1, vector 55
-Key:        00000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3A91B7730E3FE044B75E75B9BB09BC1550AD5AC9F495AFFB524FAD90A51112D5
-Test: Encrypt
-Comment:    Set 1, vector 56
-Key:        00000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D262DF12E3D8DA99A9F7F011D607905DCBE9AB03C317E81E4BCD076F3C55EBB2
-Test: Encrypt
-Comment:    Set 1, vector 57
-Key:        00000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 827BD4A79FD82594F645A02F9546906ADCBFF47E2F2D0D0DAF89A200389A5E00
-Test: Encrypt
-Comment:    Set 1, vector 58
-Key:        00000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E83B866B294780E36058CBCB62BC3C509604F9EB9A44F1CFAFD50F248359A106
-Test: Encrypt
-Comment:    Set 1, vector 59
-Key:        00000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8695B4BC5DC6528183B94D5257DC668DCAA0E5A855B76555B65FCCF941A8CCAC
-Test: Encrypt
-Comment:    Set 1, vector 60
-Key:        00000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3B5D549F736D15CFD0F39A42CB1ACBEA370ADAA9EBC7C012AF2E30463DF98E03
-Test: Encrypt
-Comment:    Set 1, vector 61
-Key:        00000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1C29F7919784BDF30E566B75DBA4C911FC48C1CD7F845406B86DA540B71C572E
-Test: Encrypt
-Comment:    Set 1, vector 62
-Key:        00000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D530E5B30338589A6AE67E0C1E2C57AF02CCEFF84705BC4AAD0D93375E7F2DAB
-Test: Encrypt
-Comment:    Set 1, vector 63
-Key:        00000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AE92CD3DA2022DC9C91E381DA62D8FFA646FD02A1A5A3249AEAD35B729C48329
-Test: Encrypt
-Comment:    Set 1, vector 64
-Key:        00000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 111318C5C6DAE45DF4FAFF404AE2140300DBBF9361E926900F3ED7F731385A52
-Test: Encrypt
-Comment:    Set 1, vector 65
-Key:        00000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AA0DAA9A0025B5B3243367C7FC22F56F65A52B3CEEA060825C1FD2813953BEF8
-Test: Encrypt
-Comment:    Set 1, vector 66
-Key:        00000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 11EA951B966D0B3DF0D6AA00059281E6944CBB9921F84209265938CCE91F4910
-Test: Encrypt
-Comment:    Set 1, vector 67
-Key:        00000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DFDE0D41A657B700DADED5F9CB341481A0183AC1BB51291E8719F77251B478F6
-Test: Encrypt
-Comment:    Set 1, vector 68
-Key:        00000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A8A42F8E3C2BD71D415EF9FBDBB9DA86B32CFC24EBDADC656B7BFF17FC8BE365
-Test: Encrypt
-Comment:    Set 1, vector 69
-Key:        00000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1755CB48D8057669C488DF3A2296651F3FB64AA173DC6FCBD2C1113A084679C1
-Test: Encrypt
-Comment:    Set 1, vector 70
-Key:        00000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CEFD04E10B318145993C0AF4B4A64F623BCE0E04CE04E6D3DDE14EC6DFC0CDEE
-Test: Encrypt
-Comment:    Set 1, vector 71
-Key:        00000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D9C83924493AE365C6369317A4393F904D530C1D30B2FD1A2E4126D0A532A743
-Test: Encrypt
-Comment:    Set 1, vector 72
-Key:        00000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9B8FC0A924382EBD28AA3F6871B17E1BA9C94418FC3533B446C2DE8C188EABB6
-Test: Encrypt
-Comment:    Set 1, vector 73
-Key:        00000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F91346BFBC0E05A4076B8CD5640E9DD278D4A7755A6D870565AC2A7E60A7F5AE
-Test: Encrypt
-Comment:    Set 1, vector 74
-Key:        00000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 58D205808D4A580FF8111B9EF06BEE613D51E3B2E026B296F5E9F8520C7319FE
-Test: Encrypt
-Comment:    Set 1, vector 75
-Key:        00000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 15D0C54FC35621B206A4A50EC3DADCEDFE4CCA17C9C5396A18901099A3389086
-Test: Encrypt
-Comment:    Set 1, vector 76
-Key:        00000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 48DE43EC8F644BCCFF61A52D93BEDEEBA38C71C196203A4A5AD9145416EFF31E
-Test: Encrypt
-Comment:    Set 1, vector 77
-Key:        00000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 253057DA247A8D7A1B4A23E87B67D49669ADE1FE5EF32E08058F2DA6E82D1C25
-Test: Encrypt
-Comment:    Set 1, vector 78
-Key:        00000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6494B08A0B0CE628E34EC6D7EFBC436687D242131974789ECF20911C0CF16839
-Test: Encrypt
-Comment:    Set 1, vector 79
-Key:        00000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5088AC91D68173FE292A64D04D9A8083535649D44D7F00F23F389810F5F2528E
-Test: Encrypt
-Comment:    Set 1, vector 80
-Key:        00000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FFF5D0D5296B0C3553DD43C429F51AF844EB6100E373A6A7A16B79A73392AC58
-Test: Encrypt
-Comment:    Set 1, vector 81
-Key:        00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4A805BF70CBBAC2FACF405789FE96C4EF097D36F6982B843246C353E77539863
-Test: Encrypt
-Comment:    Set 1, vector 82
-Key:        00000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5F5F6828D3D2FDF24B4AC2F1F4080F40E9564CD8F9BAFC34E5567F96E2F057BA
-Test: Encrypt
-Comment:    Set 1, vector 83
-Key:        00000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5BFAD855773EF036BAE365C18B6C5784E8BD4673514B0499E7ACFA38F7832927
-Test: Encrypt
-Comment:    Set 1, vector 84
-Key:        00000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B38604950FA73165F940D4DB527D09CD0B233276CD3808B5CADCCB9FA859AEEB
-Test: Encrypt
-Comment:    Set 1, vector 85
-Key:        00000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B96570996489A74726A70C02CD55FB9D4C3ADE0B69FAE7C37899E3D560A5132F
-Test: Encrypt
-Comment:    Set 1, vector 86
-Key:        00000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0B8612F83912A9EF1082E9D08C772738908BCCD20DE47D64ACA1500633163479
-Test: Encrypt
-Comment:    Set 1, vector 87
-Key:        00000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CCC75B4A84D08B14495AA8349B0AF79480FF6D0695561710AA16739A54504E58
-Test: Encrypt
-Comment:    Set 1, vector 88
-Key:        00000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BC3F95A0CB0DCAEDB78E3D6E855267E34F3168C436774E28035D144406E803DA
-Test: Encrypt
-Comment:    Set 1, vector 89
-Key:        00000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BD0A34B0509EFA39D9D091577FC4296F563AF5F3AF9E030FCC3661C0BD82738E
-Test: Encrypt
-Comment:    Set 1, vector 90
-Key:        00000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: EC82DA0C15A50EB98E97532C509DBAC9C392DB79ADDC139F9ADC6091708CD726
-Test: Encrypt
-Comment:    Set 1, vector 91
-Key:        00000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7F164D165F7585E8306E38D44211325D0C6C177C523F13F69DB39DFEDF5BFD3F
-Test: Encrypt
-Comment:    Set 1, vector 92
-Key:        00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 73F36AF678E74D413BE851E77F5E55DE1DD92D5237DBAE75E3AB6364D1F181DF
-Test: Encrypt
-Comment:    Set 1, vector 93
-Key:        00000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BE25140C4E7804B22390822501718BE09E7F494594EBD2BCB35A36AC2F0CA095
-Test: Encrypt
-Comment:    Set 1, vector 94
-Key:        00000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 33171A271100D5CC5CF651ABF60977CD15B718863213DC243CAFA6CA86041094
-Test: Encrypt
-Comment:    Set 1, vector 95
-Key:        00000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 323FF7A80198298E438C833032CE609D4E6C5C107C9069E8B216080DE5C0880D
-Test: Encrypt
-Comment:    Set 1, vector 96
-Key:        00000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D8FB3E266B96E48524159A3BE04CC85B3DB70F2FE649A01259E4FCCBCD3E7BAF
-Test: Encrypt
-Comment:    Set 1, vector 97
-Key:        00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 88B2171E37F3E861B6A69397BCC46044EABBC424E3359D11C96A62CB33F6C56C
-Test: Encrypt
-Comment:    Set 1, vector 98
-Key:        00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 96168ED95200986AFF506D3C2F043DFE03356345C52AD205BDC91423C6079824
-Test: Encrypt
-Comment:    Set 1, vector 99
-Key:        00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4FDE2AD110847B5F4F2BD20CE5047913B12A682D119D9A8C8395B9958771FC22
-Test: Encrypt
-Comment:    Set 1, vector 100
-Key:        00000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F703282E54592A5617E10618027BB67F639E43A90767150D8B7F5E83054B3CBD
-Test: Encrypt
-Comment:    Set 1, vector 101
-Key:        00000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6673138D1A64DD26CDD2F62CAB0BAB2318DE17507BAA307A189EC4997F9C3F89
-Test: Encrypt
-Comment:    Set 1, vector 102
-Key:        00000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 328B2F4069F398422D78E359F19938B8BFBC9E073C2162A0829265CFD48B89CA
-Test: Encrypt
-Comment:    Set 1, vector 103
-Key:        00000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 02B14A28344C4164DDF0EDB594D581AE847FC0090EE6B933B8B8B91EAE90F5B3
-Test: Encrypt
-Comment:    Set 1, vector 104
-Key:        00000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 506221E93DBCBA6787757CCBBB0D5CDE9D06CFE3A23A8942A13C5B3849B2D2B9
-Test: Encrypt
-Comment:    Set 1, vector 105
-Key:        00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 53A01AD91AE1C7F0DCBE19CF701A895E03FD866F77ABC7B174B327A0576D7719
-Test: Encrypt
-Comment:    Set 1, vector 106
-Key:        00000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B27AB67ACB784CB231A76D05B2539F0146F5C2F330987DE2C91AEAF8511DB9D1
-Test: Encrypt
-Comment:    Set 1, vector 107
-Key:        00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 682263AAD3FF0B227983D20CB8A8B572427A2EE1B85A7FBB0961C722A7DE70CE
-Test: Encrypt
-Comment:    Set 1, vector 108
-Key:        00000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E8AA0C754FBFB2BAF1025C8C13101552FA32E4031843E3DC56D2D819476CBFA6
-Test: Encrypt
-Comment:    Set 1, vector 109
-Key:        00000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7952391AEB6094458B28B543B9A5AC1DDB0CB18AEB431BE7CC7A4D45CCBEBEB0
-Test: Encrypt
-Comment:    Set 1, vector 110
-Key:        00000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 138599B1B9406E932D6229A4FFD959EE02E626022342FF233269A00DA1F58384
-Test: Encrypt
-Comment:    Set 1, vector 111
-Key:        00000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 87FA25FEBEFB539BFA46F9FAF8D62DB8E3C126D7409813A3B2FFC760FF19D390
-Test: Encrypt
-Comment:    Set 1, vector 112
-Key:        00000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 943B778E6053E3CBC59E9423A6D8AE678D369D5E27AB56D668DAD944D0A238F4
-Test: Encrypt
-Comment:    Set 1, vector 113
-Key:        00000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 00D31AA7620BEE29169C62966C53058F05709CD7C6A6584AFA80D7B2B7D9414C
-Test: Encrypt
-Comment:    Set 1, vector 114
-Key:        00000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9A6DD9EAE3286D48A7548C0A8A4CE8FFFB61B362C95C897DCD1CB1D8BBF76DEB
-Test: Encrypt
-Comment:    Set 1, vector 115
-Key:        00000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8231E89C8C74641DA6CD862B98B5DE749D6751B44361B763DF888F3D2312FAD5
-Test: Encrypt
-Comment:    Set 1, vector 116
-Key:        00000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AEE13BA9322E1089262CEB199FD96E8A3C1E29142C6542961CA0B70782A4FD65
-Test: Encrypt
-Comment:    Set 1, vector 117
-Key:        00000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 89EEFABFFF030B563CAA5965CFF0372E0518BA1BF9A6E07D279C20AF3D52B9E5
-Test: Encrypt
-Comment:    Set 1, vector 118
-Key:        00000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9EB46332AE8F271D9613A5FD1D6E1B06ED7A553C874A44A6F3A0615D46AA079D
-Test: Encrypt
-Comment:    Set 1, vector 119
-Key:        00000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FDB79EB3D755AC9338093917F84742BB1D62197D9730AEFCBAA9B3A4CEEC0B5E
-Test: Encrypt
-Comment:    Set 1, vector 120
-Key:        00000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 64D439442C3FB4B580E0C7BC212F5589B395F6D100AA8165E4599A34F288D31D
-Test: Encrypt
-Comment:    Set 1, vector 121
-Key:        00000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 09F8A382936078076F496A14B7BFD77CF4E549171FBDD8106AD0C2F87FD9C151
-Test: Encrypt
-Comment:    Set 1, vector 122
-Key:        00000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AEB59849B6291FC1B8917642088608C4B9EE364C8C1FAE502F1ECD5BFACBC96A
-Test: Encrypt
-Comment:    Set 1, vector 123
-Key:        00000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 006136B68224BF8BF47C0298FE7E2A4B72964A6C9F36EB709C452F0319B6A104
-Test: Encrypt
-Comment:    Set 1, vector 124
-Key:        00000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 55912F44A9A3493CF0A4DEF2F77978ECE0868ABF30BBAB15A96AFE15575AA90A
-Test: Encrypt
-Comment:    Set 1, vector 125
-Key:        00000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 81BA612B664481588AB16246226CC1B59A08A7FE0FD64B0111C67C4BF344D2C7
-Test: Encrypt
-Comment:    Set 1, vector 126
-Key:        00000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6B7930B1609C35095BE581F8F73709A65781DC1D49381411F6474CEBE6D16182
-Test: Encrypt
-Comment:    Set 1, vector 127
-Key:        00000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7308AEC23D25A231B26448AFE78D5047804C5011B9B5F95C16DF2670551F0001
-Test: Encrypt
-Comment:    Set 1, vector 128
-Key:        00000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FBE855BD6540594E2D90566E7A30F57516EE170817B66C2468615D5D3D5DF03B
-Test: Encrypt
-Comment:    Set 1, vector 129
-Key:        00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B072D598869D6EFCC8856A2B4686EF05A37DDB3F26DFEDA2F9C406B7250801F5
-Test: Encrypt
-Comment:    Set 1, vector 130
-Key:        00000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0CF58B2665B889C06836E699DC2B4C615106541987229D686D43614D3BFC290B
-Test: Encrypt
-Comment:    Set 1, vector 131
-Key:        00000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F591E78CE6A8A375CBF821D222A49C862A461DC52C74065BA6349598CC7CB6EC
-Test: Encrypt
-Comment:    Set 1, vector 132
-Key:        00000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A32B883113DE96B7AFD4ABE8E1703C8D724397542527E27F0CA32C89332980D9
-Test: Encrypt
-Comment:    Set 1, vector 133
-Key:        00000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9B2C992F4CA0E70E0DDB03400AD24C4F20AD5F32940537B33F375C7979968537
-Test: Encrypt
-Comment:    Set 1, vector 134
-Key:        00000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0DDEEEBC428F117B094FD27B614F6BDFEC0D71D61F8F93F9A09E0443F2FEB659
-Test: Encrypt
-Comment:    Set 1, vector 135
-Key:        00000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D58740E259B1C9A5DADD2FA5FFB768ACECD0DA6FE40D7D59F3CF6FCD4838FEDA
-Test: Encrypt
-Comment:    Set 1, vector 136
-Key:        00000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E6F318C17501C28164BE9CA692E92D4CF4835E2778B126E9841CA0F132CCAA61
-Test: Encrypt
-Comment:    Set 1, vector 137
-Key:        00000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3776A0BB5880EB65386F20D11BCF308C2DA3B010F7E2DAF3FB8B55B523E7CBC3
-Test: Encrypt
-Comment:    Set 1, vector 138
-Key:        00000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3926539CFD76BB79E50A571D75AA51B94864A79CA5DCAF6CE451FC068E487625
-Test: Encrypt
-Comment:    Set 1, vector 139
-Key:        00000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A8D9B6254BCD0BC32CA3ECF7A7A80882DDC178F47D8E91F760883D589D94F45C
-Test: Encrypt
-Comment:    Set 1, vector 140
-Key:        00000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A2C3810606AD6AAAA571C8A783A686E9F713D0A1238C3E621347622C569C7BB6
-Test: Encrypt
-Comment:    Set 1, vector 141
-Key:        00000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 902FF7C8DA5B1D171603F48C02E72B611C40E4B15F06BF4A7DB914AAA7E63036
-Test: Encrypt
-Comment:    Set 1, vector 142
-Key:        00000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 55AAAB17A700544B1384EA512146F65A2F871C30F8EF7AB84DD96E004E924403
-Test: Encrypt
-Comment:    Set 1, vector 143
-Key:        00000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E9F049D8DD032202BC5E16F061B0449AEFD91845A4786A045E35739826E283AE
-Test: Encrypt
-Comment:    Set 1, vector 144
-Key:        00000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6347929B2B5B6634C2674CC4AD3B04B321F7404101E79259A35053E552369548
-Test: Encrypt
-Comment:    Set 1, vector 145
-Key:        00000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3C8D318014177555818122F69A95BED7A175464310A9B53DD4AF3C5887970D39
-Test: Encrypt
-Comment:    Set 1, vector 146
-Key:        00000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A3CE794DEA39A03EB4337395E3713ACA02E15148CC9302083E9F2FD55A921BF5
-Test: Encrypt
-Comment:    Set 1, vector 147
-Key:        00000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2EE444D85842D41D9AEFBB7ECE34EEB71720AFB04498F9B4CFB87C10AC842D3A
-Test: Encrypt
-Comment:    Set 1, vector 148
-Key:        00000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0050EF8A2E0EAC79CD1BCC82F52F04410DA08263A320DA47B500DD72FBAA3487
-Test: Encrypt
-Comment:    Set 1, vector 149
-Key:        00000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 51721D61A2032DB004C8B83F7509B045A5190892FBC5AEB9BAA4B27D7969C791
-Test: Encrypt
-Comment:    Set 1, vector 150
-Key:        00000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 016D3D0A0C9B1EA97A12AB7BFA23BD4A973D5F10C06581A6DA92668BF3B4026E
-Test: Encrypt
-Comment:    Set 1, vector 151
-Key:        00000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 687DAF7B782EB92EE2F8812ABA81A1F8EC353797544602A8EF2D2D6C1AC7EB48
-Test: Encrypt
-Comment:    Set 1, vector 152
-Key:        00000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 538008D0A4465A705313E0A03DE02BDFF7D9F0F0226F630DAFEA5434D9ADD7EE
-Test: Encrypt
-Comment:    Set 1, vector 153
-Key:        00000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2F65E608EF3E4C202C347ADDB9733132350A7AC9E544C5D7D76F9527DB3640AE
-Test: Encrypt
-Comment:    Set 1, vector 154
-Key:        00000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1EF33EF878790A6E16E18377C474700E6AF64C0C56F5FE8E7A1A83D990BB7B9B
-Test: Encrypt
-Comment:    Set 1, vector 155
-Key:        00000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3369751D8735C5B82164E9FDFAA8B224AA4BD3FC2CD3DC48C60A1C290AE189BD
-Test: Encrypt
-Comment:    Set 1, vector 156
-Key:        00000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 428F02228A58756A94871F5DCB37F54AD21345ABEDECB6D12630E51ADF4D6128
-Test: Encrypt
-Comment:    Set 1, vector 157
-Key:        00000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 521221AE0F51055948753BAC7A30394DA0F3DCB485364AB512E62D9CDC24FE48
-Test: Encrypt
-Comment:    Set 1, vector 158
-Key:        00000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7E44783F40C4A3EBB40E5D4E22A9BECAD3008D8B1AE64929B666664D8D8680D9
-Test: Encrypt
-Comment:    Set 1, vector 159
-Key:        00000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 48F54AE18072D2E58922EB0B14E4C32CD72807BF436A01164B0B5027ADCE6121
-Test: Encrypt
-Comment:    Set 1, vector 160
-Key:        00000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 671E9014ABC8FBBA21A307FAFF3FC7C89231ACA932F58C2D79DA323F80B3F87B
-Test: Encrypt
-Comment:    Set 1, vector 161
-Key:        00000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4473A8EF3585DDC8AB5858DB58FD87FA42E724D2374D7888FCFA66D82B30145A
-Test: Encrypt
-Comment:    Set 1, vector 162
-Key:        00000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A4AD8D6A847FF420E96E1E592852FC7B362F1E0DBBE417B0CFC80C1200C5BB97
-Test: Encrypt
-Comment:    Set 1, vector 163
-Key:        00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B10D378FB56687BDDE7462A91FD0C42C773097765AC4C332B5007D1D47670EE0
-Test: Encrypt
-Comment:    Set 1, vector 164
-Key:        00000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 788D00A54C0A6FB10067E08B8F2C60B4DBA05B58D3C8CEEABE49C2FD2FD7D6C2
-Test: Encrypt
-Comment:    Set 1, vector 165
-Key:        00000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CC54D8465F9529077237703DF4DC136FCD7A9D2FF3B89FF0D226EA3B234B6113
-Test: Encrypt
-Comment:    Set 1, vector 166
-Key:        00000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A0DAF3D3568FA9134C9C1B6EC5137B72715271DEC644F1268FDFA88A89989371
-Test: Encrypt
-Comment:    Set 1, vector 167
-Key:        00000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0BBCCB3D83D7B6D3AA96AD5687C4895CD990146E293733A649B4D7EC48E9A93C
-Test: Encrypt
-Comment:    Set 1, vector 168
-Key:        00000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DDF8388BA3EA8FDC869D54D38D6BFE47FB7C5B6D81B3D80AE8B7DE00F4581EC1
-Test: Encrypt
-Comment:    Set 1, vector 169
-Key:        00000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FF4F175CADFA435B31D5766FE6FE73B88B33BF5A87D79A2B47FCEB6BFE6E39AF
-Test: Encrypt
-Comment:    Set 1, vector 170
-Key:        00000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9B28804310814CF3C9782CB23FAB7FE19D5BDA5E9553F23E7876A6426316365C
-Test: Encrypt
-Comment:    Set 1, vector 171
-Key:        00000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 94831F56AC794746628AF8A0684ABFE6A1113EB5B95939A8223D5C0C08BF52FD
-Test: Encrypt
-Comment:    Set 1, vector 172
-Key:        00000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 689C2CAC1FC6999B8BA48B767A995871D80AB561FADF20D8613274CFFD00BF32
-Test: Encrypt
-Comment:    Set 1, vector 173
-Key:        00000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4CC4412727B69CE43E6B85D89F03DAC6982CF867FB98801DA1F0E8720123699E
-Test: Encrypt
-Comment:    Set 1, vector 174
-Key:        00000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8160A24A68E81E4A839E1C16086983BE98652856CC621B3F7612A8B1324FA33E
-Test: Encrypt
-Comment:    Set 1, vector 175
-Key:        00000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 024B19F8BE7203D9E5589AB96B86BD68A488D7994813D0231C835637B9E59A64
-Test: Encrypt
-Comment:    Set 1, vector 176
-Key:        00000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 954714BFD736CB391604E77367C2875EF291C02EED35B6DD6A20D58FBADAFB84
-Test: Encrypt
-Comment:    Set 1, vector 177
-Key:        00000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6E95756FEA083B4AB4E624B5CFB00E31CAEA9C03CE4A1F51104BF6E7A86495F3
-Test: Encrypt
-Comment:    Set 1, vector 178
-Key:        00000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 93176B234B0A25F30649FD3172F75F181CD47C75D795FCFD5A537F18B101B24D
-Test: Encrypt
-Comment:    Set 1, vector 179
-Key:        00000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 51637CD02F79DA935C5A317C1F8AC79E47E255E4A83F3F04DBA2998DF5118D39
-Test: Encrypt
-Comment:    Set 1, vector 180
-Key:        00000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 15C15F38B0CDEC62A426CF4AED25096DCCF1B2C7CF49A223F4D3ED7E06CAD2D7
-Test: Encrypt
-Comment:    Set 1, vector 181
-Key:        00000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 14520B3D7B8734A8D4E07CAB93744560D60FE7C9122C97F2ADB97D811074D225
-Test: Encrypt
-Comment:    Set 1, vector 182
-Key:        00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F16ED0E9813C694563BF3557D73085C8761642B6B003291B31C681D3A9421E73
-Test: Encrypt
-Comment:    Set 1, vector 183
-Key:        00000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BD3B03B8DF1994DDD3BE4509BB2B4AED0F7D0F7638102C58B15ED9DC9FAD5261
-Test: Encrypt
-Comment:    Set 1, vector 184
-Key:        00000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 45813D3ABF443D14B8519A10BA667F16C2EC757B309B978E26FFE56EE0BA00B1
-Test: Encrypt
-Comment:    Set 1, vector 185
-Key:        00000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A13D32CA09C34BBA16813BE8F4D56AF772B67327C7CDE0756B3D5CECEF2BCD2D
-Test: Encrypt
-Comment:    Set 1, vector 186
-Key:        00000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: EC7D07D6F3AD0351131F15816F8044CBB1592324F62903B9DD6180D88E09EF07
-Test: Encrypt
-Comment:    Set 1, vector 187
-Key:        00000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 873F46936C8CC3A23CCA3EA3288CA070CC41F128296FCE6E7AAD2B7381BBAEBB
-Test: Encrypt
-Comment:    Set 1, vector 188
-Key:        00000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0AF0BB23EFCF86B273A27D84435F53F9984183E4C0D2F69945E79BAC8674C3A5
-Test: Encrypt
-Comment:    Set 1, vector 189
-Key:        00000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7B9A8CD1942564414FE5C1237B680970A306CCB0CF73F1123D2E823D084F3126
-Test: Encrypt
-Comment:    Set 1, vector 190
-Key:        00000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C21A4ABA37069F7173A704B16C2DB945301BD4B08D3202BCBCA4AF8E5BA8A963
-Test: Encrypt
-Comment:    Set 1, vector 191
-Key:        00000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5B2F725ECF531E569AC6B69408259547B9B054CAAA20B6727FE7654FAE4386D2
-Test: Encrypt
-Comment:    Set 1, vector 192
-Key:        00000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 58E6E58AD73C9DA9A19CBCBCB6E89B44951781A027D5C5CBEAABD95D55BE1CDF
-Test: Encrypt
-Comment:    Set 1, vector 193
-Key:        00000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8F076E12AB23D9CABFD006D16E1D554AB367CE88B3FDD44717824387DC9D4B43
-Test: Encrypt
-Comment:    Set 1, vector 194
-Key:        00000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C5A351191F18886099542CE6B3025D6F0F4EF8A9A1C804803166BC2699D4B3C2
-Test: Encrypt
-Comment:    Set 1, vector 195
-Key:        00000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 39BF10576DBE0BA332EF36C38CD96F4F0043B8A0C6CCCCD3521F169821CC4C0E
-Test: Encrypt
-Comment:    Set 1, vector 196
-Key:        00000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 12EC53C9420154F7D5334D4BF94BE3B4CCB044FDF56B4A92E245F016BBE9C057
-Test: Encrypt
-Comment:    Set 1, vector 197
-Key:        00000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 569D436AFFBB65451ECFDDDC7BABD5608BC183E9437F30B5058C505158BCE7EE
-Test: Encrypt
-Comment:    Set 1, vector 198
-Key:        00000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4E53AA49C4A8E0A00FA51E3DBE4D6BD6ABC1505C2E3FDADAC282BBDF5987E075
-Test: Encrypt
-Comment:    Set 1, vector 199
-Key:        00000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E0BF45509232C9F66517F057FB01C2E0E08906842B59DA4980413F629388C088
-Test: Encrypt
-Comment:    Set 1, vector 200
-Key:        00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CC5A42F9BBCD1A5BE0D8EAC69A184E1693AE5F1C9FDAA05B8CB5330D5D63A2C0
-Test: Encrypt
-Comment:    Set 1, vector 201
-Key:        00000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4247A5AA925AEAF29EA9FCC3C942DC47FB1A13213B302FE0C6F33243C631D2A0
-Test: Encrypt
-Comment:    Set 1, vector 202
-Key:        00000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DAC043890BB61728CFC30E3A860BFF9474DE05CA104C242BAF498344470319B5
-Test: Encrypt
-Comment:    Set 1, vector 203
-Key:        00000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 214703F986092730BDF01020A825628FD06CD22C9F385CE14BBB2738A38A1E94
-Test: Encrypt
-Comment:    Set 1, vector 204
-Key:        00000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AD3EED667396E27E4EF749BE1BC2D222380AA5C070B7246EB3A8249D9003BE1E
-Test: Encrypt
-Comment:    Set 1, vector 205
-Key:        00000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 57B33C626E776BAAB8D655DD93125D49BFE92177BB63AA9902A44E4CC6F90666
-Test: Encrypt
-Comment:    Set 1, vector 206
-Key:        00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3ABEB777D6240D198677B50B14545714D71D2F46885513688406B201F689C3BD
-Test: Encrypt
-Comment:    Set 1, vector 207
-Key:        00000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0B9E5A4358BCD0CA1AF306274CA676B515499878D2ACA0AD7865139D36910018
-Test: Encrypt
-Comment:    Set 1, vector 208
-Key:        00000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9EAB0FE92E1B83FAE87EF6369BD0EED91D10DCFC5810FA0188D06929CF927422
-Test: Encrypt
-Comment:    Set 1, vector 209
-Key:        00000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BC205D90F13A69AA6C45979861B1E5737A69C61F726D252F773E528276B9F1B7
-Test: Encrypt
-Comment:    Set 1, vector 210
-Key:        00000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CEB885427DF7C988804E7C2401BD703CBB8F3D3D50AFD6CE9F56D32F802F8219
-Test: Encrypt
-Comment:    Set 1, vector 211
-Key:        00000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C61CE53D0A5E771E6AC98830D496079A34ECE8967D737D0EBE393E7549679BA3
-Test: Encrypt
-Comment:    Set 1, vector 212
-Key:        00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 842F934F9C3E9690F3AABC753B6C27F7F3EF7B199ABFDA287686F35E2884A2F5
-Test: Encrypt
-Comment:    Set 1, vector 213
-Key:        00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: EE357FEC92355A11FDCE30B089E4F5918A90025832DB3562C762A8421F3B6625
-Test: Encrypt
-Comment:    Set 1, vector 214
-Key:        00000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C9CC50B7CB29557DCDC64C995B24D2E0E8AD8FBB4906A8DF06D67A69B1AAB8A6
-Test: Encrypt
-Comment:    Set 1, vector 215
-Key:        00000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D6DE0F6B51BCBDA8D44D7EEA5F91C85B78F42B6612A35662CE3AB3043E87701D
-Test: Encrypt
-Comment:    Set 1, vector 216
-Key:        00000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E3F3E3A5317DCBE044E1A97CAD714449DF0F8E9C319F5C12C19917B2F47F1FD7
-Test: Encrypt
-Comment:    Set 1, vector 217
-Key:        00000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3A1A26993055B3B30BA84236212646D2622680117D2813316223EDFFA1BBB22B
-Test: Encrypt
-Comment:    Set 1, vector 218
-Key:        00000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 192EE13F6909D98437E8F424DE7DC873D82330DE64B379F3F8985658B00033DA
-Test: Encrypt
-Comment:    Set 1, vector 219
-Key:        00000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DEB92C0159D40548317AEAF996819352F43CB1E487885A0851234A43E4C5CB2F
-Test: Encrypt
-Comment:    Set 1, vector 220
-Key:        00000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C671DF68881157258EF58E7C7E712351FC9D743A2C4ECAAC9D3ABE98F9701B3C
-Test: Encrypt
-Comment:    Set 1, vector 221
-Key:        00000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7A8BA935035DFE8F1DE34EA373FB60E147E6D5572686212BF95B6E0C115D15B8
-Test: Encrypt
-Comment:    Set 1, vector 222
-Key:        00000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AA95483043360A3CCD5E98C8D5088F9F7154DA3E36F517C459F03B94EA8B5DCF
-Test: Encrypt
-Comment:    Set 1, vector 223
-Key:        00000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F716EF1B45585282C50AD6EB1EAD2D19AFBF57235E5D56A015882C55EECC2044
-Test: Encrypt
-Comment:    Set 1, vector 224
-Key:        00000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CECA215484E90CE7AF49BED4B5F84543D05CE120973EE8510E0A410FA391BE3F
-Test: Encrypt
-Comment:    Set 1, vector 225
-Key:        00000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5AF45DB110A67D0CC49D1A1BB5765ACDDD6482BD88664A4A511BEB8DCDDC08B3
-Test: Encrypt
-Comment:    Set 1, vector 226
-Key:        00000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E0AFCA91B3CCF0A0C4E332C4F75BC17E5956B0F3A438F0B0ACA0E9B08DA9A1C0
-Test: Encrypt
-Comment:    Set 1, vector 227
-Key:        00000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C559C00EB5C49F2321975A264F855C291DB8FF942FC4617193236318D55DA27A
-Test: Encrypt
-Comment:    Set 1, vector 228
-Key:        00000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 88BCDD04989FE085F888A57176463662C57DC70DD3888F427B68BD5A36C3297A
-Test: Encrypt
-Comment:    Set 1, vector 229
-Key:        00000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3C6302F9C2C8997C41FA0F0187B9E19D14FC2196A001D39F56BF5200E76D4F66
-Test: Encrypt
-Comment:    Set 1, vector 230
-Key:        00000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 641DA3FF9CC2C5AD625FD131D91E1AE5AD3088DF404384BD885917FD1AFDB9AB
-Test: Encrypt
-Comment:    Set 1, vector 231
-Key:        00000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1A05DEF28E631857C796D665FA66F8A4743F9A340904EC1C084AB022E63E3A0A
-Test: Encrypt
-Comment:    Set 1, vector 232
-Key:        00000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 04DF8F3469AFEA2F63ECA1FA64FC18F1E42B42F7666BDCBFE6CC1C68614D85A7
-Test: Encrypt
-Comment:    Set 1, vector 233
-Key:        00000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 21AA974CF45CF84383024A8E7D3427BCD9A0A4F4B2AA83FA44911615B2D9A27E
-Test: Encrypt
-Comment:    Set 1, vector 234
-Key:        00000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 74533E9973B565E0B7F9DB65A63B70BC5840EE4E1B6D927033CC1F733BD78AD1
-Test: Encrypt
-Comment:    Set 1, vector 235
-Key:        00000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E818E22E590974A00FBF40C1A1DD100F5C2E3A76C594D129DDE0C9119CC1A836
-Test: Encrypt
-Comment:    Set 1, vector 236
-Key:        00000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 00BEF3BB9263863455A8736A114E7DF13C903D6D9FE065FED48E6634EE9B9156
-Test: Encrypt
-Comment:    Set 1, vector 237
-Key:        00000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A0D418EAA61D8B6234D8B07D4652F61EDA48B00764E124DE5D7545973E4BFB0D
-Test: Encrypt
-Comment:    Set 1, vector 238
-Key:        00000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 21472EDC58EB9D2EDE5D8A24DE18784500420820C388408E2D09C8935D3208CA
-Test: Encrypt
-Comment:    Set 1, vector 239
-Key:        00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 278849105940CFDF61AB8DF9A37427A24BD452C244988E7CE85B8FF94A913F71
-Test: Encrypt
-Comment:    Set 1, vector 240
-Key:        00000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7B35DC73EBA6408C2486D59ADA0A17B89ADC10E405E029E51B8FA7096704DF23
-Test: Encrypt
-Comment:    Set 1, vector 241
-Key:        00000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D81FC2305382B4110925F4EEEE6C93C3356B30F4E083B47C0FFB429DC8A317A5
-Test: Encrypt
-Comment:    Set 1, vector 242
-Key:        00000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B1CC26F822DAA8B4EF2DC5C08792C21A985D285697C9BC49E038331996F2DE35
-Test: Encrypt
-Comment:    Set 1, vector 243
-Key:        00000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 565635B8CF39652AD3F94F9658FBF2310A08DC25975102D9E0A658574E5437C6
-Test: Encrypt
-Comment:    Set 1, vector 244
-Key:        00000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3A9E77725182484E375528415C99C9BB2795A0841FD9F7E7D2DDE20A6CD71C04
-Test: Encrypt
-Comment:    Set 1, vector 245
-Key:        00000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BD3F45893A96EF8C218B3C22079E64BF847F3C41D87F1AC68E62B32E5A59D350
-Test: Encrypt
-Comment:    Set 1, vector 246
-Key:        00000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 44BBB67723B8FC5778D18FFA60F1A7DF16F2A4583BA07E3B2A9A4286765AF743
-Test: Encrypt
-Comment:    Set 1, vector 247
-Key:        00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 06198963CE32DC41A3869CB3893E1602D21EA64DD206C2DEA9FA79F756260BF8
-Test: Encrypt
-Comment:    Set 1, vector 248
-Key:        00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 82EA3EC56648E3152D541EA5EA76F9C1D12A373D5183CFFDBC49C0FCE25AC9BA
-Test: Encrypt
-Comment:    Set 1, vector 249
-Key:        00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2D6F44E5104C9A6B28DA5731FE95AD5ED73051B4D405FCB77D2845A3306CD9EA
-Test: Encrypt
-Comment:    Set 1, vector 250
-Key:        00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 360DF8BA5BA3F245E4751C6B1D81CCCC7160D6DE8CB12B496DEF04A78B0D3DD6
-Test: Encrypt
-Comment:    Set 1, vector 251
-Key:        00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BE0B2DE97E0528C5A135A81F2DA7431C8BF01A456411CB826F1205A9E57A44D2
-Test: Encrypt
-Comment:    Set 1, vector 252
-Key:        00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4CC729EFC23033F244182FBAE629ABF4386CDB279C6394C7CC914724604D8736
-Test: Encrypt
-Comment:    Set 1, vector 253
-Key:        00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BA44E9372A4EDC847FE6601F0DDBCF40864B2BB5C4EFF9B3038F7EAD6672907B
-Test: Encrypt
-Comment:    Set 1, vector 254
-Key:        00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DF3109ACA9E8546F5140E6705EDD69EB5512F0C5B3567D6EE132700820839B77
-Test: Encrypt
-Comment:    Set 1, vector 255
-Key:        00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D909866F49103120A46CD4F2A98B2A2169E3E9AE7BB5AD36CEBD675F62B73018
-Test: Encrypt
-Comment:    Set 1, vector 256
-Key:        00000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 63081A9DE55FA28CFF0089A3D4A52568BFC0D3A172B1750180A91BA12EC3E38A
-Test: Encrypt
-Comment:    Set 1, vector 257
-Key:        00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7FBD9ADE476739C69CF906B611639D554ECF25BA26AC87A11EF30856DE890D28
-Test: Encrypt
-Comment:    Set 1, vector 258
-Key:        00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 495FB031327D3AE9CCA3F449E73571539EF9FD88589B5C3142F5A4461CAFF9F1
-Test: Encrypt
-Comment:    Set 1, vector 259
-Key:        00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1E958BF17F89DD463B49BDE9B05D01DC2557DC4CE072C24D0527E45BA1C8026C
-Test: Encrypt
-Comment:    Set 1, vector 260
-Key:        00000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 92093F21E7CFDCD81765E71ED960121F84C6FE1CDA50B00592ED0DB9A8808FFA
-Test: Encrypt
-Comment:    Set 1, vector 261
-Key:        00000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 122E0C5E19B0636ADE10F1A14FF4CA69EC426B4F311C109F6B137BEE274B1912
-Test: Encrypt
-Comment:    Set 1, vector 262
-Key:        00000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2CE82AD1BF9BDA86355188CF5605CEAB73E98BC617CDC3D5C8598F11BA96F6A5
-Test: Encrypt
-Comment:    Set 1, vector 263
-Key:        00000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B14A656DB71E54DF9D443E899417FF4F79E033106AA34D8669EEF0E9918FF4C7
-Test: Encrypt
-Comment:    Set 1, vector 264
-Key:        00000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 47ECD5C02C3D702FC36817981781B1A4593E240773121F763EB788D46E990C5C
-Test: Encrypt
-Comment:    Set 1, vector 265
-Key:        00000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 91B74FC5E6FC8C6C30F33CE83BC0055190373FC589C0516F248227531C6B853F
-Test: Encrypt
-Comment:    Set 1, vector 266
-Key:        00000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AC8F0393E6D8881EFF753E7CE47EC441106AFE1315E712BB439F2F2DD4318670
-Test: Encrypt
-Comment:    Set 1, vector 267
-Key:        00000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5765316B484E3091FB5135ECD4A5356293BD87512688EF14C719B61857767E1C
-Test: Encrypt
-Comment:    Set 1, vector 268
-Key:        00000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FAD76A9798E8DD194095DACF92F83779DEDA70C413033DADEE55B4C94B98B426
-Test: Encrypt
-Comment:    Set 1, vector 269
-Key:        00000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 87F337C9D5763F38C679C5EB9A67F72B4581487ABC5ADCD5BABF4C71B5EB6F7C
-Test: Encrypt
-Comment:    Set 1, vector 270
-Key:        00000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 526B4C3E3FE096F47D32A403A7D20EE269A42F68939B2FA8254A1812D9EC6069
-Test: Encrypt
-Comment:    Set 1, vector 271
-Key:        00000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 342C0D2D0A5048DC98F2E8CDBB84CC610E30BEBC12F7572CB416CBFCFA24039D
-Test: Encrypt
-Comment:    Set 1, vector 272
-Key:        00000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 47D03635744E2D917F799F77A7E09E6F064CE224A4A1D507090DBE200DBD022A
-Test: Encrypt
-Comment:    Set 1, vector 273
-Key:        00000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0DCE2CCCD9628DD4F6552A020B9447D35DEEFCFE5D8CDD8223AB3BA9090D8141
-Test: Encrypt
-Comment:    Set 1, vector 274
-Key:        00000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AC5622C3DDECDB0A46F796596ED595926B2783E6A884D18517F7344CCAB3A2C0
-Test: Encrypt
-Comment:    Set 1, vector 275
-Key:        00000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 80E59C358DC6F0B5749FEAF45A9BE7F884842839EE6B47024083F52A8636C2A6
-Test: Encrypt
-Comment:    Set 1, vector 276
-Key:        00000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8E57504AD8F6DA6D8633D413362E961A6D69B18FA1B501DB846080A5A9C9C700
-Test: Encrypt
-Comment:    Set 1, vector 277
-Key:        00000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4956C679E9B58DDE2185BB018A7D6C61C918FA0AA9D6102E7DEF1183DB768FB1
-Test: Encrypt
-Comment:    Set 1, vector 278
-Key:        00000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2C25F9CD0DB2444EE43D0AD2C3AF0303D1487528F45AFD346617D164F80635B9
-Test: Encrypt
-Comment:    Set 1, vector 279
-Key:        00000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5292E96CB2110AD3FD231C5B2BCD1A8986333787664D1A551B9B750B2AA39A11
-Test: Encrypt
-Comment:    Set 1, vector 280
-Key:        00000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D189129077C79106AEACA4E3463FD0650AC493ED981DC252531C072F18E1E292
-Test: Encrypt
-Comment:    Set 1, vector 281
-Key:        00000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F9490DB8BAE36E28E73419D1D57869D760D772DC8752D1DE948262755B4ED503
-Test: Encrypt
-Comment:    Set 1, vector 282
-Key:        00000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 994EB2D9BE7C9FD547426F295F15DE3BC8F4A2B3955C7028ED890B1DE0FBE21C
-Test: Encrypt
-Comment:    Set 1, vector 283
-Key:        00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 464BFD1EB42B595AEF9700C7C4C184A2132B5F1E85625592E48A233FA7840EC3
-Test: Encrypt
-Comment:    Set 1, vector 284
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A097C32D58D5A932AC9DBEE942DCCE547222E37E97DC3B29A63AAF118D5B01CF
-Test: Encrypt
-Comment:    Set 1, vector 285
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D3D13CC4379D2817B8CF8E06312FC727A3BA3C58F96E478E4EC5BC7BAEDDCDE4
-Test: Encrypt
-Comment:    Set 1, vector 286
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 577C709C26BD52547BD7C0D3F9CDEBEC0F266178905C4C067B75A01D799EF910
-Test: Encrypt
-Comment:    Set 1, vector 287
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 08FCEF6A263916C53AEBB6CCD2623E7BA3C38C871C5A8B64106308B74A7AE1B6
-Test: Encrypt
-Comment:    Set 1, vector 288
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A22F794F4913B2B1CD930FA26EC219081F297DE4EC808771C9B375782F891D67
-Test: Encrypt
-Comment:    Set 1, vector 289
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 52F2C9714DAD06FCF5FD8962131D33952A6D68C2A90B8C08C3AB86B09A2C77C5
-Test: Encrypt
-Comment:    Set 1, vector 290
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 60BDED5533E692A9F073AAED43A5D5A81378E73A953514ACD5B0997B61848E3E
-Test: Encrypt
-Comment:    Set 1, vector 291
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 38921BE2443A8101FBB44BCB4C5B87AB5026AA34C78B7FCDE07E102E142B6162
-Test: Encrypt
-Comment:    Set 1, vector 292
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D49C075CC20268EE889A10E27F2D4EAA99A1764F765621FE97687ECB6067E5AA
-Test: Encrypt
-Comment:    Set 1, vector 293
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 50FC6782B3285D35117C0FA81039A7F264FC4EB492F3B86A233D45F2834F153A
-Test: Encrypt
-Comment:    Set 1, vector 294
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1CC0B39D670A88D424F5D40B2F9256AF3736689BD82F0EB315AC9056F7EC63A0
-Test: Encrypt
-Comment:    Set 1, vector 295
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CF66C3CD4B08CB0E4D25186BF84BE3AAAB1C435F07D12593AD001F70894030FE
-Test: Encrypt
-Comment:    Set 1, vector 296
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 352572656D0EB6E0CE604C1A913ED733D465A480504B61B0F9BBA77122FD20D3
-Test: Encrypt
-Comment:    Set 1, vector 297
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 096E9F34E6E277EDB994954C3705F6904452001D3A3E799A1D0230D430E207D7
-Test: Encrypt
-Comment:    Set 1, vector 298
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 277BC612F90A6D0735B86168C021098F134D1627D0FEF38607038415D1BADF84
-Test: Encrypt
-Comment:    Set 1, vector 299
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2376E2CE884AEC093E22A3C119D573609225FD5DC9B3EB7602C340D1AB51BDF2
-Test: Encrypt
-Comment:    Set 1, vector 300
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3EE2E39ADB49F92D09D55ACC817B5B2F22FB202951AEFB6DE8998D2932145669
-Test: Encrypt
-Comment:    Set 1, vector 301
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E508313113570BBB5A1E63F46AB52B57ED0676A061936F093961D34409F1B962
-Test: Encrypt
-Comment:    Set 1, vector 302
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 198A9A0A5B04AE936CB19E02A5B2A254A2DD5A4D71F6C676C0A826CD261CE8C0
-Test: Encrypt
-Comment:    Set 1, vector 303
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: EFEB9C3D34865B89275EFB9DCE1929697FC9E68ED9E9E32E2CF267DE57388E77
-Test: Encrypt
-Comment:    Set 1, vector 304
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 61016E27DF83D9DE642AE01D7D56C4BFE881C8BDEDD15C503BDC28D3F7107754
-Test: Encrypt
-Comment:    Set 1, vector 305
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2FB5FDEC05BD94EF5A7F0DEA7A368F7C2B26ABC5789FEAE7B7B6A5E6C364041C
-Test: Encrypt
-Comment:    Set 1, vector 306
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F765AE08A03CF705D4BE6A6AF8A34CDE7A14F599B2CB7E2FCF2770F0CFD4F7AC
-Test: Encrypt
-Comment:    Set 1, vector 307
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D38105C4DE4742F16E6AE7C1C3C85A515DA8BC758456E4B5D64C0539B76D473B
-Test: Encrypt
-Comment:    Set 1, vector 308
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BFE3A705729C82DDE1297DF492A8F8ABAFBF2F436830B3716FC206D6931BBFEF
-Test: Encrypt
-Comment:    Set 1, vector 309
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B81E7CB312AC5FF0A1795FCD4AD8B3D84FE6C8B796584DE794B7E230823E6AF0
-Test: Encrypt
-Comment:    Set 1, vector 310
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 605C8D477420CF7D8218CB8A6B3624700BADE8D1384B04995F3C942DE38ABA6D
-Test: Encrypt
-Comment:    Set 1, vector 311
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 87A3F6DC69A7675F27CD00D7A84251366CCCA92775D680EBEBB48B92A5781D7E
-Test: Encrypt
-Comment:    Set 1, vector 312
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 71625BD75BF6A89C643553D382B325EDACCFB4BF5F1617DED0C44BAB96A9F72D
-Test: Encrypt
-Comment:    Set 1, vector 313
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: ADF64E64C1A8D854C421F5AA8CCBE789F3643B0D769A2CDC68D7C3AC85FDB634
-Test: Encrypt
-Comment:    Set 1, vector 314
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3C1AB3A3A85B1EEAA057557DBB59FC28479B38BEE67F4CDA0CD49880DC15ED0F
-Test: Encrypt
-Comment:    Set 1, vector 315
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 026071B93A8B85F000539539626BBF664273EA701B63D487208962F8CC14F1DA
-Test: Encrypt
-Comment:    Set 1, vector 316
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 61EC580BC31488BD8993C9B9D6B430BEBAE04F9807F199808CF05B0B4F083F9A
-Test: Encrypt
-Comment:    Set 1, vector 317
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DF9093A33937B0B3ACAEAC1840C8E1358CC90FB0B6C0834D4CE4F442830127B7
-Test: Encrypt
-Comment:    Set 1, vector 318
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5683A2E768F9E105E9ABF7B71DE48833367D19E961D9D95577D2C4E48716EE9E
-Test: Encrypt
-Comment:    Set 1, vector 319
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1D33978B4B75C10ACB850BBD98BB2CCB31F7D6F561E34AABAEB929C2F7762219
-Test: Encrypt
-Comment:    Set 1, vector 320
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6197C557619E4B791888DFD695B4BF55B7F72258968E26B9B74A6A3814267DD2
-Test: Encrypt
-Comment:    Set 1, vector 321
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9AD5C65433732C4ABF08BAE9015692F509775FC0450677CB1E76A060974B8807
-Test: Encrypt
-Comment:    Set 1, vector 322
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 44AA2FB88757EA695083CE00105D5B77C2DCE04EE1315D99040A1495E97EEB42
-Test: Encrypt
-Comment:    Set 1, vector 323
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9C637BA9B011A62B15BE522D6C514092358222CDB01A2A35B895B1E57DF1303B
-Test: Encrypt
-Comment:    Set 1, vector 324
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 21774A71C07FC295C4BF477A512445B2AC9AFD6619DCF0124CBD735BC823F945
-Test: Encrypt
-Comment:    Set 1, vector 325
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3D74A1E781FEE340DD9D912F6A681F85C0EF78BAE81D3E50A5DB8A311057DCB3
-Test: Encrypt
-Comment:    Set 1, vector 326
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5B851E24E32EEB5BFAB09D26E86BBE4DA23C43C8E88635413516825D1F56DC43
-Test: Encrypt
-Comment:    Set 1, vector 327
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E79FAFD3076C0F879222F86A0671104F350B115A6AC107F5C66BB673CB047948
-Test: Encrypt
-Comment:    Set 1, vector 328
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5E8EBDFCEF4F70640695CF76FE7912F5E77F55095F0A3EC15CE692AED2C7312E
-Test: Encrypt
-Comment:    Set 1, vector 329
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 99EC9D6724631EBC582C22B1B002C8F63B386EF1A96A9E4D162F698F3EC13944
-Test: Encrypt
-Comment:    Set 1, vector 330
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9DCF4937F7E089B09AF8F441538E2577E315212AA56EB20209F040BE602509C3
-Test: Encrypt
-Comment:    Set 1, vector 331
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 063CE595D4EEC463726FDB74E5254B5AFB965D2729D02F1890E70E33C4C7AE49
-Test: Encrypt
-Comment:    Set 1, vector 332
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 18F5B3F2F2B54FF37C354F3181228FBAA7D337791671988801C19333165EAD35
-Test: Encrypt
-Comment:    Set 1, vector 333
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 912671C8099032B1C0AE139D8F029B153B22B999DC30170DAAE3904CBDEFF083
-Test: Encrypt
-Comment:    Set 1, vector 334
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CAE46BA93F81E1AD26A8FACE45566E162B8F4CAE831B4B80F93D2A809D3C557D
-Test: Encrypt
-Comment:    Set 1, vector 335
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 31708CCF07D82433A61053273FBC5543BAA1A73B836624FF092361E55631531D
-Test: Encrypt
-Comment:    Set 1, vector 336
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B5F46BFA7B367DCE7998428525483F775D8F5F1A8DB9F7E3EB848F887283028A
-Test: Encrypt
-Comment:    Set 1, vector 337
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1D1B9489F66B8FDC1902C02CE15E94727352C2F6A302C12A6F9672BC44014F6F
-Test: Encrypt
-Comment:    Set 1, vector 338
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8EDD86FA2225D954B3F9F57A0433ED692E99F7ED55EF0A8D112468AEA58717A2
-Test: Encrypt
-Comment:    Set 1, vector 339
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6F1414CBA350BB5DF73F7B23FCC0859BC2F081374BD4FBA7571DEC9343BD939A
-Test: Encrypt
-Comment:    Set 1, vector 340
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 84535A21BFDE843B9E70AEEC9E5EB915FCEFF57449B7872142AA0669EFF250BF
-Test: Encrypt
-Comment:    Set 1, vector 341
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C4CC653F5CFA6C13C4693967D4CD1398B8808982F0C1D6D9B4CC9A6FCAF41E8B
-Test: Encrypt
-Comment:    Set 1, vector 342
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0949688EEF8CFBB88589CAB3EF58912A2C413E413EF122BB7F4C0E17BF723E71
-Test: Encrypt
-Comment:    Set 1, vector 343
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AFF2976C45A69940BB88C71381DAEDD767BAF454331FCC5666624EB052CE05CD
-Test: Encrypt
-Comment:    Set 1, vector 344
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A7D73428AA840EFCBFF0C856409C9B19CBDC19BE376EBC75DFC008A6BC9EAB37
-Test: Encrypt
-Comment:    Set 1, vector 345
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3C59AA18035D96933FB938DE0331DBE42DA57B539A77D660DBFA12B62611760A
-Test: Encrypt
-Comment:    Set 1, vector 346
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1F982024A86CEBEF27F0D19765907131C5EA1385761E92C7432D55A118AF2FD0
-Test: Encrypt
-Comment:    Set 1, vector 347
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5D5CE5B2BCEC679BEE0B894E4E0FD2E5ABD345D8F8061A02BD4B1873C3A9B612
-Test: Encrypt
-Comment:    Set 1, vector 348
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 54C62940FC9BD4D96A0D19CE92F6880B5F45A422DF0400E868020ED5B42BC287
-Test: Encrypt
-Comment:    Set 1, vector 349
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6A7B7E894CB7FE3A0153B5CC6E78351A07AEC726CCAF93A2C426C83760974035
-Test: Encrypt
-Comment:    Set 1, vector 350
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D2DAC7485B1818A7A2976F164C80AB5FE47B7CBDA4048000D09DAC65857A8387
-Test: Encrypt
-Comment:    Set 1, vector 351
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7C545CC73456F1C1B06C5B5A05A9659F5D30A4D78E9D85C29A38735BEF098E0E
-Test: Encrypt
-Comment:    Set 1, vector 352
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7E3FA28ABB96C7CFAC0DFAFA5BF2E469D75ECF690FA876F3307D851D3CF0AAC4
-Test: Encrypt
-Comment:    Set 1, vector 353
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 46FFBA6995D7D6A2B58AB5F995AE3A305CB0385242428FD092FE777556AB05B5
-Test: Encrypt
-Comment:    Set 1, vector 354
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 052E5126AEDA420CC39EEF255B816BD475DBD36635B090D04C43410F40236BE2
-Test: Encrypt
-Comment:    Set 1, vector 355
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 80BBBFF3EB0CE3976503A85240226D7FE177B4F30C753F081D7E1F3F8F0FC176
-Test: Encrypt
-Comment:    Set 1, vector 356
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4A748837D0A7950876ABC89127A6D6FE5B646C7FE9DF8005CBBC3832DFE488EF
-Test: Encrypt
-Comment:    Set 1, vector 357
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 84F35DFA249674C24E6DFB3947E3F3475817DF9548B301D4741B79EF9D26629A
-Test: Encrypt
-Comment:    Set 1, vector 358
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BEC48DE878DD3533F3614B3A0A4BDF5FB34DBA96AE94508FC0D3927032CC6E61
-Test: Encrypt
-Comment:    Set 1, vector 359
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 80DDDED6AF53DB0459359FE311F32C5DFE85F281C45365BEA7A2D6BA8A2D5EA9
-Test: Encrypt
-Comment:    Set 1, vector 360
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 43BA1E833A673FB760B13DA40C509EBB7170CA05E7BD2728A7FDA0EB8E3020B8
-Test: Encrypt
-Comment:    Set 1, vector 361
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 917FDDD2206E751DBAD9BD2EAA3E1FDD7C6CFC7782367B563DE6E116D0E4A3B9
-Test: Encrypt
-Comment:    Set 1, vector 362
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3AD03FD2841A7C8E8BA49100FCA794DAAF29995A9CDCC6D4F868914C890C3BFC
-Test: Encrypt
-Comment:    Set 1, vector 363
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 79A9305A48A10F739B06EBD24DAACBF5289ED6A83415021DB1CAAB542E417DDB
-Test: Encrypt
-Comment:    Set 1, vector 364
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 195DA96825A0F6B94A71E2EDD934FB184F375EEF66411567815A4A6E966CAC0C
-Test: Encrypt
-Comment:    Set 1, vector 365
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 513239A738978DE007138E83F5CD13A0A9BE374CF61B09021767CAE284D5510E
-Test: Encrypt
-Comment:    Set 1, vector 366
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6BC70608C85D884873CDE727CF2B8A4E9563DA58242C907A3E87C2608AC0F1F7
-Test: Encrypt
-Comment:    Set 1, vector 367
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F47D47E5D0013BF10141C7BF92642E4CCCF8020347B59F1FAB145849EEF0A2E1
-Test: Encrypt
-Comment:    Set 1, vector 368
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 879D4097A300F6575BC2021F218E9AE9FED113AF9B4FC9179C621244A9E2A090
-Test: Encrypt
-Comment:    Set 1, vector 369
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 91EF2BE82D9080A366AC7C4344E457E5F46DA5BD54DD50C97D2910D1478BFA21
-Test: Encrypt
-Comment:    Set 1, vector 370
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0EED2315EF9B9278CCAD8EE2E33493F5A4FDAE31EC1DA863C017E8AEB77C2867
-Test: Encrypt
-Comment:    Set 1, vector 371
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FE80FF0F839BE1F911A21C97B36D439ED66F9965293890D98D8A3A98F2CFAE1D
-Test: Encrypt
-Comment:    Set 1, vector 372
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4E241C22B26385E268F868E37873C36B173625048DAAE4ADE3C2E09D856A8AE9
-Test: Encrypt
-Comment:    Set 1, vector 373
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 71DA83DEC321D3160433BD8E2C2345921A6505444C9B1949B4D6CE400F1FBDBB
-Test: Encrypt
-Comment:    Set 1, vector 374
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 21FF7AA748E96269211F129671E4F7A25BC55D92A144B7BEEB75F445FDCCDDB3
-Test: Encrypt
-Comment:    Set 1, vector 375
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 070290F0A10324414DCFD323822ABD2256ADDA0913FEDC70EA53F3F88EEB7AB2
-Test: Encrypt
-Comment:    Set 1, vector 376
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A112192AEDC7824247A9239BE92E45928416D086FEA09D4370DDFE862493AF4E
-Test: Encrypt
-Comment:    Set 1, vector 377
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B0CD1E1BF87C1C63C455C8A285DF739A85706A587CDF0726C4615590DD25BDDE
-Test: Encrypt
-Comment:    Set 1, vector 378
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F5EBFED2EF7706C5DEF09E94641FDA500100F500E431C601C879CC65CE260DF6
-Test: Encrypt
-Comment:    Set 1, vector 379
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 02CA5B7EAA7F906B706DD5B13A6C121927EAE22FB51C7259A781A916C5906E7D
-Test: Encrypt
-Comment:    Set 1, vector 380
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 10569B20052606FEEB9956C2882702477F1D48F82B09C0BE1C97C3150F5F7D1F
-Test: Encrypt
-Comment:    Set 1, vector 381
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 95C649C5B1ADCE59BE93F701C01D815D7A32D151179FC1B6610B3A2A98EE1295
-Test: Encrypt
-Comment:    Set 1, vector 382
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7E1DD644C151A0C1055E0AEB7A9DBE80BE09CCDE6C69797D00E7B391A6311D1D
-Test: Encrypt
-Comment:    Set 1, vector 383
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6A82511AEBE5A82B6392CCA180B10F77FF0C14A7CF8CED894E1C8EDF9BAB29DA
-Test: Encrypt
-Comment:    Set 1, vector 384
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AD05B4B2F644469BCCD1BE1D028B1FB26F270088E56D8B73364F958730B0C9D7
-Test: Encrypt
-Comment:    Set 1, vector 385
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8B4110E53906CBD07EC61AC8DC8C97C475085AE6AE6418C45CAD7495B2C2F4A9
-Test: Encrypt
-Comment:    Set 1, vector 386
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FC44F97B9B3791B98D941B460C585BC7A485024F2B15370605FA64BEB36F10F6
-Test: Encrypt
-Comment:    Set 1, vector 387
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 95E1B79F255E9E477D756B0123F22397C723D63F3D6AC710A1647E5D6229AC25
-Test: Encrypt
-Comment:    Set 1, vector 388
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 523D59EEA567CAE613403BE8C8769E9E375F290D7FA2DFF64C9B41120E96F0C0
-Test: Encrypt
-Comment:    Set 1, vector 389
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DCD843BF9123A86C9938CB833C815217E37325B4ECF9A43E8E878ED2CDB257E3
-Test: Encrypt
-Comment:    Set 1, vector 390
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4D737BB7B6B2EA155FA64CAA9124588594AD9D3239B03A0B5F1A1670EF37C309
-Test: Encrypt
-Comment:    Set 1, vector 391
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D884858B07B3ADC2AB0067E24CEF443AF6D3CB691C7D3EDDFAF672763DF6991F
-Test: Encrypt
-Comment:    Set 1, vector 392
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 24923E668BA92F02D0545738A1F3A81AD3EACC6F3E65A3C6879FEB3D55C3BEF5
-Test: Encrypt
-Comment:    Set 1, vector 393
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 98006EC6FFEE6DC3FE9D53FC632D1D82E8DC5BCB0BE0BBF1782701F858934432
-Test: Encrypt
-Comment:    Set 1, vector 394
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1C7CD45E2FDF746F2F6B7FCE3510DD14CAC7420FDA6BC9C6D3287E894D2B9EF5
-Test: Encrypt
-Comment:    Set 1, vector 395
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DF1B2CD5A9A7ADC85A257882E53150F9B3BAD4B5EFEEE8B4B212F8FB08F11194
-Test: Encrypt
-Comment:    Set 1, vector 396
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5DF3202330B96E2C8D45284BC1D8CC34C076B18600495EC43F847D09B9AB08C2
-Test: Encrypt
-Comment:    Set 1, vector 397
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CEE878EA6317D3B4E2CC695FCCC5EE04B7415B735F2D11B9A8891293D5D5E818
-Test: Encrypt
-Comment:    Set 1, vector 398
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3753BC3550155B6880CF1AAE6365FA5EA4F277B4E01FD26133A5C69F5620AC9F
-Test: Encrypt
-Comment:    Set 1, vector 399
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8FF623E4246D8B7D14904BFB478256CA55EBD9E383B672A91D512AFD606BA629
-Test: Encrypt
-Comment:    Set 1, vector 400
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C823B856B5E462FAD71A1D9C8F02CE1FE48650BD53BD620D021ADB1C53C21B84
-Test: Encrypt
-Comment:    Set 1, vector 401
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 22D0CD94534D8DCC359095D77008069E57851298103A13ACB50BF6FA778CB9A3
-Test: Encrypt
-Comment:    Set 1, vector 402
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 413F7657C9E46D928AE307FE794D1B10FEEB433D7F829C66118E155227F811BD
-Test: Encrypt
-Comment:    Set 1, vector 403
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 12A9E9ABCC1916594307C982852A6750FFD5D9DCFDA261EC54C2D465BBB0FB64
-Test: Encrypt
-Comment:    Set 1, vector 404
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: EEB4897AEABADA871D368A00748CB437801933D78A14687EDDB3D526BBC2BFF7
-Test: Encrypt
-Comment:    Set 1, vector 405
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2444A95492348F7AB5C8EFE89839C6491833EF227637640F8199262DA70E5406
-Test: Encrypt
-Comment:    Set 1, vector 406
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CD0F1C806CE40D9901A04A23B52BBCFF51D20E964BA2ADCFE9AEE7CC8FE4A3B5
-Test: Encrypt
-Comment:    Set 1, vector 407
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 30E58CD115B75139A5D2ECC5253F6467FDEF4DFA307D11132570F90E657BC254
-Test: Encrypt
-Comment:    Set 1, vector 408
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 563FF22D971BDFACD7A90EDE80F076126CB16A759FDE6DB83E0DEE71CA48F33F
-Test: Encrypt
-Comment:    Set 1, vector 409
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D235A2277B7D3A772C3D092D2E3D92248865EFED8C2577D3D087C5BE84891667
-Test: Encrypt
-Comment:    Set 1, vector 410
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3CD74A025D1C2044875FE1D97351608E0203CE65F2EB283633505AFDC3C6393B
-Test: Encrypt
-Comment:    Set 1, vector 411
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FDAAE4CA8FD698D4330AD8217D40C8368AE9A825BE3359CB881FA74315ADA4DD
-Test: Encrypt
-Comment:    Set 1, vector 412
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A9BBBED3051D1EB40AA806CF6505EBB4A0D3BAE671AFA03BD2586B01ECC6B9AD
-Test: Encrypt
-Comment:    Set 1, vector 413
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 468AC86525069F4A9F1F7036BB2FC3D042296707B9FE8328C9514DA52FCBBCC2
-Test: Encrypt
-Comment:    Set 1, vector 414
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 96498A45E45E26AA2A1DD58E7374BCDA71420627B332F94FE98E045251B432C0
-Test: Encrypt
-Comment:    Set 1, vector 415
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 36FB6B4DAE5EDE9971BC2F5A353A3D5954961D9C8F7D38063A9F8556881F1E1B
-Test: Encrypt
-Comment:    Set 1, vector 416
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4206BEA972707980637FCD2B990F2B8EAE3243C9178487047B1A9BE2C7F6225C
-Test: Encrypt
-Comment:    Set 1, vector 417
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BF2763F46F4EF8CF40E42B6E4F161785D3478BDD1EA0BFAB30763B98BBC64720
-Test: Encrypt
-Comment:    Set 1, vector 418
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E7B97A297B534B1842528055982B7C382CFFDD161D69725789BF0CC35339D0A8
-Test: Encrypt
-Comment:    Set 1, vector 419
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F8E68E206729EDF06C9379DC6F87891FFB6D5DD75A040D4F0E17BDF28308E6E0
-Test: Encrypt
-Comment:    Set 1, vector 420
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DA69958998715C7517B9864E3A81F5960A48E9071FEB047084683D95A8532751
-Test: Encrypt
-Comment:    Set 1, vector 421
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 99456A498166535817F3DD3B47696CC74777ADE25DFA5CB5A3DF1A47DBCF0F17
-Test: Encrypt
-Comment:    Set 1, vector 422
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: D2D061B7FEDCA0663FE8F738042D1CE7D0EFB3BCED73977087FAB06192A361C1
-Test: Encrypt
-Comment:    Set 1, vector 423
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: ABF4E053FD99A777A5C95F057A1D8D3BC433D212220FE2BD5074C7E7B4AAA636
-Test: Encrypt
-Comment:    Set 1, vector 424
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 335F971AF070B59191F61547DC555F2AD86B263B23AAD53A80D6DA0C8A73C6BB
-Test: Encrypt
-Comment:    Set 1, vector 425
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C2EE398458AD869FCFB5DBAD16CB66F2CDEBE8D9D2C0FC4B258553D7D648E281
-Test: Encrypt
-Comment:    Set 1, vector 426
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 659BDB67C3BB43D43CF53EF14411F9B5B2B3C8C9B961087622BF1F0412596D81
-Test: Encrypt
-Comment:    Set 1, vector 427
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 21E2DA7422F753B1B625D95BFE5FD1C52CB5DFEDF0F2662EF17416E44F671525
-Test: Encrypt
-Comment:    Set 1, vector 428
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C14725058665DCF8D701BB4A3DD5490DDA85E2754D9B233C008B5FC3559837B0
-Test: Encrypt
-Comment:    Set 1, vector 429
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BF0D7F94DF1C7CA59CAF588BEDB316CB4E31A578B76C1E5213EB663C0E850F97
-Test: Encrypt
-Comment:    Set 1, vector 430
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C81ABCB56C58DB2D5A329C6777091857DA4A5CBCB9D05AD6B0D4A2D4E915A7F4
-Test: Encrypt
-Comment:    Set 1, vector 431
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F9D7611F502D0CED242909E032173BAF5A43DAF7009F53E25E109D7F4FEF9981
-Test: Encrypt
-Comment:    Set 1, vector 432
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4EC0E7F808A10BFD4676E5CCA67E1D48806F346B702B2827810487EE56907C71
-Test: Encrypt
-Comment:    Set 1, vector 433
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 34C183C96FE5D9D2B4ED564EE9726551B27E1AF24848B5D711503E88BECBE458
-Test: Encrypt
-Comment:    Set 1, vector 434
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3E5EA6B326751B501C91C4A575B0ED6AEA9D60A14908187ACB3FC145B5468131
-Test: Encrypt
-Comment:    Set 1, vector 435
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DA3904568BC8844CB594F44FE13F5D663B55EE6995D2232A999D591F2FCE7812
-Test: Encrypt
-Comment:    Set 1, vector 436
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9293ED1C3C5B1A91B54A43BC63603F2EAD345EF9A7D3E69BD955EF1B8D36FD13
-Test: Encrypt
-Comment:    Set 1, vector 437
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 65C5CE0CC96FA6085A23EF00299B6D8518673DC9B8BF764DB595A8A7F8E940C7
-Test: Encrypt
-Comment:    Set 1, vector 438
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: EF95E25669CF4079F8BA728F41BD115F2913D8CFE0116C86032CD133E4787011
-Test: Encrypt
-Comment:    Set 1, vector 439
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7860315B44671B93718FEAB94BBCEE6B1006354914A90C3BF2DA1B6FA62F48AB
-Test: Encrypt
-Comment:    Set 1, vector 440
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2AA9968D7011FB1F33B97DAD01C2708A6826C030AFCCA35B222B2E47C89F14E1
-Test: Encrypt
-Comment:    Set 1, vector 441
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CA9DD4F0771447B9AD0664DDA2921192568C2012246CCF5E95CD6CF3FBC44DCA
-Test: Encrypt
-Comment:    Set 1, vector 442
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 38D51B18372FD7E7A617D7BCBCC658CB16014B05ECA242AF52B40AEDF6952DE4
-Test: Encrypt
-Comment:    Set 1, vector 443
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 640D035CFD65FE70D089866A53F21D00F86FDB1CEE2880F9FA7D382D424978A1
-Test: Encrypt
-Comment:    Set 1, vector 444
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B41B62EC90FA9CC037F1BC74AEED25226917DD3B2B2E5C11EC6AE7601CF3F0E2
-Test: Encrypt
-Comment:    Set 1, vector 445
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A4340A36C7E640C83D2401AAE6F9F103BC9B568EF5B7F67663E64B820974B235
-Test: Encrypt
-Comment:    Set 1, vector 446
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CAEF6FE59B0C05DDFE4F233412A185038077B7138EE9BA5FF4815C63C2BE84D2
-Test: Encrypt
-Comment:    Set 1, vector 447
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F5D76FAAF12F566711DAAAC0E1F71260354FBA7BC0DBC34D7A2B6FE8E19DC672
-Test: Encrypt
-Comment:    Set 1, vector 448
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DB1B22D80BD5BEA8D3F5F445E296FF3506C98C6FAE617D6C8DD943BC535AF864
-Test: Encrypt
-Comment:    Set 1, vector 449
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DA02BA2C706095D3EB008EFFEB5E501FFF78B59EC34CBCAF0D7CE82268CCAFBA
-Test: Encrypt
-Comment:    Set 1, vector 450
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F878759262E5C2BA6CBC2091406D4045F876767C475582965B185DC9437ADD1E
-Test: Encrypt
-Comment:    Set 1, vector 451
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: CA268715277F1CABC2062D4EDFD667759829782F793715199EE172917DA35C5D
-Test: Encrypt
-Comment:    Set 1, vector 452
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 01BACD8388BF42064C8E927B3629C0DA82A0FEC4883EC068DC48483C43512BC5
-Test: Encrypt
-Comment:    Set 1, vector 453
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3D782388FD4ECBFEBBD49F2FBCF80A687E4CC0B8FEF51F097DEB679F49CB8B06
-Test: Encrypt
-Comment:    Set 1, vector 454
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 392E11AF1FD4A97ED260B680930C95DF26679260EAE0C025C405CDCDBC8E810D
-Test: Encrypt
-Comment:    Set 1, vector 455
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 10E6AA6CAA90220E6D8963837D9EC3D46F8E9679379345282573753F2093E0F2
-Test: Encrypt
-Comment:    Set 1, vector 456
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E3EF5E9644294206A5707EF83C54E5EF5F4DB9841383C3EB767DEA722E9B7D0E
-Test: Encrypt
-Comment:    Set 1, vector 457
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0EDD01B5FE46475139F14371B548B58C5E33830D6EA6864BFBAB36D25345F8F3
-Test: Encrypt
-Comment:    Set 1, vector 458
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7DB72BFBC00A04E38DD4B9F2EA5C0114D19B2956EB959BEAD3E29DFB9BFC9A2A
-Test: Encrypt
-Comment:    Set 1, vector 459
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7DB561AF481CC8B010BFD18A0216E2554888BBDD4E90B00476809B48601C9306
-Test: Encrypt
-Comment:    Set 1, vector 460
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 4EAB74E6D12574BCDEF95BC0CAD67C7E04B24472431607EBAD5F915F1116C9CB
-Test: Encrypt
-Comment:    Set 1, vector 461
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5A48DE560FA1ABF0F85BFF9A0A1928020A6C51AD3FE7C1392C2A875401DE62F0
-Test: Encrypt
-Comment:    Set 1, vector 462
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 074956F37AF065DBEDB2D68C602A4B65B7D614F8A0B284539E234B307CFDC495
-Test: Encrypt
-Comment:    Set 1, vector 463
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9BB4837A582A5CB30579DABEEC41ACCB3786AA9BE52DDC88065BE0FFD33917EC
-Test: Encrypt
-Comment:    Set 1, vector 464
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E1E690D74FC254D1D2A8238096285CC100013E8A8BB55FE92F6DF69DB217773E
-Test: Encrypt
-Comment:    Set 1, vector 465
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: DFE35C2BC6ADFEBE4D9E8F84160AD6315CA43F0F022DDC629106E008F29C81AE
-Test: Encrypt
-Comment:    Set 1, vector 466
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 8106B2FE206F9F8738BEC324B531E6943F00B20EC35DEADCB508197EEEBA5473
-Test: Encrypt
-Comment:    Set 1, vector 467
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E46E36293B659E73FAA1722AF29651621598FF2E92694C99F7BB0C792B93BAB2
-Test: Encrypt
-Comment:    Set 1, vector 468
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F3CAB9F84AF81A06F9F350C345B44E053C8F1EE36D62159B4993950BB76D0948
-Test: Encrypt
-Comment:    Set 1, vector 469
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E3381C1644BBBB29290D30F15C96956BF4AEFE443FBDA0DB3EF2CEE7081D1DB3
-Test: Encrypt
-Comment:    Set 1, vector 470
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A4DD97D2710285907527C4FAE5676774D937FEC609F8489A16384568FAAA699F
-Test: Encrypt
-Comment:    Set 1, vector 471
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 43C608E43584C631E620672EB0A92707C396ACC12CBCE0810A28F7EA3491E0A3
-Test: Encrypt
-Comment:    Set 1, vector 472
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A1DC3C2AE54BB2FA291913562F05E021AF361E422D39C89D8CFDBE4B672B63ED
-Test: Encrypt
-Comment:    Set 1, vector 473
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 890CB43DA15A1D69A10EA9322B8C14D61AD537462439A735472CEF9428C8A2D9
-Test: Encrypt
-Comment:    Set 1, vector 474
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9119548582EB7EA7F4AA1B224A6825B786F316EAA7AAA18B61B56D64AA4CBA29
-Test: Encrypt
-Comment:    Set 1, vector 475
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 574DD7CA20662ECBC730FA7CE314094E427FB8250E0F636894B650DA35A7F0CE
-Test: Encrypt
-Comment:    Set 1, vector 476
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 3575DEA861D0F97DA32438DB834020996820BE85EAE5ED15A7983A31C7669C70
-Test: Encrypt
-Comment:    Set 1, vector 477
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 27EA06CBD196073357F1F790191D14796FE2BEFBE18B8C48D7566528B3DDA4C6
-Test: Encrypt
-Comment:    Set 1, vector 478
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 11B190730F6EDE90C8B3FEE01E722ADDD21BEB4324A358F86F524E4B7F7AF975
-Test: Encrypt
-Comment:    Set 1, vector 479
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 07E3CDB5130D8FF7A2A31335AD478FEF10805E266C00646CFBBEE81F2B3C1711
-Test: Encrypt
-Comment:    Set 1, vector 480
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A0ED0FFEEBCBF4066EE550E63065B08569B92BCC938002A5469ABD1C397233A0
-Test: Encrypt
-Comment:    Set 1, vector 481
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2C9CDE299A4C507EC03C617EACE2358E76BC1AD338FE5A66A9105F18788A8836
-Test: Encrypt
-Comment:    Set 1, vector 482
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5163F9C4ECECD047E83BDF1D6EE233487646A96FE43B4B08C41324FD8ECB271B
-Test: Encrypt
-Comment:    Set 1, vector 483
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: AA2AE4BF506AB3D7607A29C3EF90B4C7933EE58ED3AB3720817FE3C611A850AC
-Test: Encrypt
-Comment:    Set 1, vector 484
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B04B4C802D91D9ADE76EBAFCDBA0A96A8A83DAEB7069370D6E901A42291EB8C6
-Test: Encrypt
-Comment:    Set 1, vector 485
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 91A99BC40CF38388B4AA77798D720653492CCED5230382ED587A305A2A1A6BCF
-Test: Encrypt
-Comment:    Set 1, vector 486
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 91FB386F3B9AF82F93836005CBD9ED6727B9BBF1F669EAE6D06DA6D04D1AC082
-Test: Encrypt
-Comment:    Set 1, vector 487
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 01F8956120BF068AE7241BB96FF086C2D67547B549A8743FC0569978F201678E
-Test: Encrypt
-Comment:    Set 1, vector 488
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A8C562A616F918A669A29C0724B76E3D04B125E0AB5A09E8CE60F54E4816EC90
-Test: Encrypt
-Comment:    Set 1, vector 489
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B41D3BC188419DC929D611197D17FB4D29B78CD7FBC03B904219DD8A2FEE210C
-Test: Encrypt
-Comment:    Set 1, vector 490
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B119861B67AFE45C0134E2336CAC90BAFD1EB94C557EBA6DFDCBE69367B37981
-Test: Encrypt
-Comment:    Set 1, vector 491
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A2317FD4C041AF4D87C46FC684FBEE8DB65E4D43E5EA74237988A7EB67404656
-Test: Encrypt
-Comment:    Set 1, vector 492
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 641794C292A1A590F909D01F175E012671AEBF1E432295AED662E74C1EEA5DD4
-Test: Encrypt
-Comment:    Set 1, vector 493
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7984AC47362281DF446BE46AEC5D9A94B842F6F5BCCB01FD564318A49F94042C
-Test: Encrypt
-Comment:    Set 1, vector 494
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 74F84174C9E2EBBEE396727DBB1C9CFAE2809D802F7E7CF8F7515FA3A629ED98
-Test: Encrypt
-Comment:    Set 1, vector 495
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7A9E862E27444A492C91CA2EE5E93369FEB74BB881AAC74F895D97E61500FA99
-Test: Encrypt
-Comment:    Set 1, vector 496
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 638E347CEC7121A668AF985E56F7F3934D852FCF53283B767BAC213337AAE99A
-Test: Encrypt
-Comment:    Set 1, vector 497
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 45DC398895DA1B415708B4BC8B7EF133849E0E8E99945AE4D9C894FDF6D2815D
-Test: Encrypt
-Comment:    Set 1, vector 498
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 1ACF1203B698FE2E3375E251EBBC05D387FECABDE6A9194DF5195F3FBF1E3502
-Test: Encrypt
-Comment:    Set 1, vector 499
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F6A064BDC6EE0777B09CC1A0154F28AD282D4D6E48F9DE11CA083B8A9F454891
-Test: Encrypt
-Comment:    Set 1, vector 500
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: FE68FB721E181EA8A62CDD3CA0278C6EB1344DF07E73676D3F0DC501D99721C3
-Test: Encrypt
-Comment:    Set 1, vector 501
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 72923AD92EF01BDB90B9639DD411E4540CE0F531A0AE401547FBA03CB850B63A
-Test: Encrypt
-Comment:    Set 1, vector 502
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0B1D0F485A4DE59658FE61F1F0010D9EF5A2BA97624CC3687D94EE4335777138
-Test: Encrypt
-Comment:    Set 1, vector 503
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7423264FBF5EA94BA461BD80B2518B1CAF3757CF5BAB4511144637F5DC917168
-Test: Encrypt
-Comment:    Set 1, vector 504
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 589FADA29BEA438C12CA96241AA492FCFED48C1C1C05C16C88CD7A8B46E16A0D
-Test: Encrypt
-Comment:    Set 1, vector 505
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 319B5D23945A98C9480E6460CBCB86A8B36038A28500A36182B228060713F58B
-Test: Encrypt
-Comment:    Set 1, vector 506
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: B81B723D3E18A074078B7D041E55B9B130953ECF70BF773273A28E11238651A5
-Test: Encrypt
-Comment:    Set 1, vector 507
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E660AC40BC4700D4CE85AA43A2A39A24D0F255E64A9251D7442AEFB6EDFD43A8
-Test: Encrypt
-Comment:    Set 1, vector 508
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: C27914CB70EA29C06B321E4F61730CE6679A342733738BE72C97EED40802EC17
-Test: Encrypt
-Comment:    Set 1, vector 509
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 764B78FA0EC12E017D9F7C69FF53FA8FA00E7185888F36DBC3CA9A10A6122FBA
-Test: Encrypt
-Comment:    Set 1, vector 510
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E2F9F554823B38D2099DD27E0AD6AD69BE137626840B41B7CF081D7881C47CC7
-Test: Encrypt
-Comment:    Set 1, vector 511
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 403E453BBAF997A75C4517B588431C75BCF01208B378A4F4FBB138217A9CA4A2
-Test: Encrypt
-Comment:    Set 2, vector 0
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  8000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2CAE7C0460EE2FC3200923A1B6C2ABEEA746C8B44F6C3FB941BD3AF02A3E6E3E
-Test: Encrypt
-Comment:    Set 2, vector 1
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  4000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 45FAAFBEE792EA704EE3D08CFA9D9F5CF93FEB3443E0049DE5898A48F5A3D92B
-Test: Encrypt
-Comment:    Set 2, vector 2
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  2000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 720F072E7796310AC1BDDD3714581EB95896723DA3E61E0892B43F65A4153965
-Test: Encrypt
-Comment:    Set 2, vector 3
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  1000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5E6671D1F792673D63940E69D78A3471B3C150707DA72E6C25CBD2C4DA2B9778
-Test: Encrypt
-Comment:    Set 2, vector 4
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0800000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 2E96F027C2B62ED2D2EE692A992ACAB827D16FDA71DD98109A645E4094923D3B
-Test: Encrypt
-Comment:    Set 2, vector 5
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0400000000000000000000000000000000000000000000000000000000000000
-Ciphertext: A38D7F334B21394B28A29FC9CBC68AD9F2AE85E7434D1C2F57AAA4C1A49DB759
-Test: Encrypt
-Comment:    Set 2, vector 6
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0200000000000000000000000000000000000000000000000000000000000000
-Ciphertext: F67B5037CE9193023095D43DE312523F99E6CBCDF43EC00A947284496E311DD6
-Test: Encrypt
-Comment:    Set 2, vector 7
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0100000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7DC030A91C39EC8558AC10044AF79D4CCA92BBC8093B3A2456E26350E35EEBDA
-Test: Encrypt
-Comment:    Set 2, vector 8
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0080000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 99260425AA126953E04A3D959F9153404521EC64C3B35E61EEBA67AAD2C1295A
-Test: Encrypt
-Comment:    Set 2, vector 9
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0040000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 65C380354899581B2B40EDDF40A0695FB608DCDD11C6B0C2CA6BB427DB1D2A9D
-Test: Encrypt
-Comment:    Set 2, vector 10
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0020000000000000000000000000000000000000000000000000000000000000
-Ciphertext: BBD1C4488D41FB1B096E835AD29FC3DC5B97496BA638625D78B99C5ABBDFA13A
-Test: Encrypt
-Comment:    Set 2, vector 11
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0010000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7AFDEE496D690233ED0717E2D92DE3A102FDF902E51E69FFCE244B84A69CA826
-Test: Encrypt
-Comment:    Set 2, vector 12
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0008000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 06D8C3E7AAC698D143013B364BD7ABC4E4EB6BA82BBAB2A4A0B486E70E24592C
-Test: Encrypt
-Comment:    Set 2, vector 13
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0004000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 727A8BF64932039C3409ED31CFC0171651BA69D551E8073A4BD1D35F31F52336
-Test: Encrypt
-Comment:    Set 2, vector 14
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0002000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 9EE7CA05C4161860014BEA89FB2DED90B4F0B362AD67789C6045C9C71310A8AA
-Test: Encrypt
-Comment:    Set 2, vector 15
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0001000000000000000000000000000000000000000000000000000000000000
-Ciphertext: E924224559E43960EC44165CAD471CFED381B279B3EA4AF96BDB071BE987DA0D
-Test: Encrypt
-Comment:    Set 2, vector 16
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000800000000000000000000000000000000000000000000000000000000000
-Ciphertext: FF189222046B5F4FB491CDC9A98130D772629F3EF44A06894268C507C25061AF
-Test: Encrypt
-Comment:    Set 2, vector 17
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000400000000000000000000000000000000000000000000000000000000000
-Ciphertext: 6B053BA7765F2A62595A1E83444B52FCF16C8BBBEB21B437E6FC8C5F03B3673F
-Test: Encrypt
-Comment:    Set 2, vector 18
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000200000000000000000000000000000000000000000000000000000000000
-Ciphertext: 0FB836DC6BCDA1C2955CC7A6F25E72C5FFFDE1075D820217157051FB5BD3D3EF
-Test: Encrypt
-Comment:    Set 2, vector 19
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000100000000000000000000000000000000000000000000000000000000000
-Ciphertext: 200EBC8B8217D9A6895253F9366543027E5F493DBA1A5AD4FC7AB66FB806308E
-Test: Encrypt
-Comment:    Set 2, vector 20
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000080000000000000000000000000000000000000000000000000000000000
-Ciphertext: 45B33F2465C674941B7E26C5986E42F6814A71323B420E401DCC8DA200FC3C08
-Test: Encrypt
-Comment:    Set 2, vector 21
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000040000000000000000000000000000000000000000000000000000000000
-Ciphertext: D2BF0A074053A01A227DC439311BF8BD696203995285A3A2CD3674A0CC6A65B2
-Test: Encrypt
-Comment:    Set 2, vector 22
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000020000000000000000000000000000000000000000000000000000000000
-Ciphertext: 5FFFAB58BA2CB27AE92E10F36F99A8EFEDF9DE2446A9C2E82E48F22FB1ED8C5D
-Test: Encrypt
-Comment:    Set 2, vector 23
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000010000000000000000000000000000000000000000000000000000000000
-Ciphertext: 835A1BD7A3688BA0F7C572417A06FCCBCE0A69C7FCDF10C8BCF4469AE80DF11E
-Test: Encrypt
-Comment:    Set 2, vector 24
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000008000000000000000000000000000000000000000000000000000000000
-Ciphertext: 559D1BECB3DBBE40A7E31C66D97D292821B934818172553FC1CE68AD8E6A741F
-Test: Encrypt
-Comment:    Set 2, vector 25
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000004000000000000000000000000000000000000000000000000000000000
-Ciphertext: D962BE9A9C4F8DDA6F0EC42DB8B48FA14A1E91E639BD85FF26A2543D9FDFA9A9
-Test: Encrypt
-Comment:    Set 2, vector 26
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000002000000000000000000000000000000000000000000000000000000000
-Ciphertext: 588B2319C62ED25ECEAB7C327B212F5FCD5D89DE8A85AA3713BF332CF5F715DF
-Test: Encrypt
-Comment:    Set 2, vector 27
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000001000000000000000000000000000000000000000000000000000000000
-Ciphertext: 67EDE571C64AFF87D7AE5294E64F1709F920A10D278E1629FC8B2BE7EF5ABE0D
-Test: Encrypt
-Comment:    Set 2, vector 28
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000800000000000000000000000000000000000000000000000000000000
-Ciphertext: 60D9E58A6828847F9644DC165EB508B5A2BC67219B969B605B3CFAE109C9CE47
-Test: Encrypt
-Comment:    Set 2, vector 29
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000400000000000000000000000000000000000000000000000000000000
-Ciphertext: 5A0C538CB78F13404BF8D8AF5C43A17F04AD0D35DAD45F88E26B9D1C204B5AFB
-Test: Encrypt
-Comment:    Set 2, vector 30
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000200000000000000000000000000000000000000000000000000000000
-Ciphertext: 724EE8B7D7BCAC2587C42D92FFCDF7EDFF91F06AD43ED353F332E1FAC3B70F5F
-Test: Encrypt
-Comment:    Set 2, vector 31
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000100000000000000000000000000000000000000000000000000000000
-Ciphertext: D50F11DACBF340C1315419D1983028DCED83F8350FE50DA4F9554DFA641E99E1
-Test: Encrypt
-Comment:    Set 2, vector 32
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000080000000000000000000000000000000000000000000000000000000
-Ciphertext: 9460ACD1B739015ED197B2659353AAC465339FAD9D1AFB845A337630332C1C55
-Test: Encrypt
-Comment:    Set 2, vector 33
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000040000000000000000000000000000000000000000000000000000000
-Ciphertext: 7D7A56F8A89463C4CE519B96854200C6E05703651CE3ACD5549B59D0B9788B93
-Test: Encrypt
-Comment:    Set 2, vector 34
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000020000000000000000000000000000000000000000000000000000000
-Ciphertext: D07E4F830ADF1DE4886C614CDB6B3D988884293AE65A63B3E9886A8727C022B2
-Test: Encrypt
-Comment:    Set 2, vector 35
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000010000000000000000000000000000000000000000000000000000000
-Ciphertext: 56CCEC1812B3B83086208DBF0C98119DC1CAE316E91B09F4F6F36BDCF73F8873
-Test: Encrypt
-Comment:    Set 2, vector 36
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000008000000000000000000000000000000000000000000000000000000
-Ciphertext: E8C3012B0EEB2D18DEA4C06BAC2906DF858BFB8A4D86D6841C02A9E45B2D0455
-Test: Encrypt
-Comment:    Set 2, vector 37
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000004000000000000000000000000000000000000000000000000000000
-Ciphertext: E10FB90CB2F5F830763FCEFA386A8E70052AB8994A55DC95FEDF8B71E11D2636
-Test: Encrypt
-Comment:    Set 2, vector 38
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000002000000000000000000000000000000000000000000000000000000
-Ciphertext: 848DFB81A0D4D13A40F9119AB77A3B6D2B96E76396B39984739FDF31ADBC376F
-Test: Encrypt
-Comment:    Set 2, vector 39
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000001000000000000000000000000000000000000000000000000000000
-Ciphertext: 61068A490E20E07686D8A77B81718A3214508E3FE3DA6A6BBAA8ABD67B98623F
-Test: Encrypt
-Comment:    Set 2, vector 40
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000800000000000000000000000000000000000000000000000000000
-Ciphertext: 9197E2A5212260324CA6E6FA0BBA56B4E5D9934C8B9E42D9F43E901C0994082C
-Test: Encrypt
-Comment:    Set 2, vector 41
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000400000000000000000000000000000000000000000000000000000
-Ciphertext: E9DC3C1445CBFF1B863CF3FB6B338B4EC29F2C083E65A4BBCC2F1FAC22CCA8DD
-Test: Encrypt
-Comment:    Set 2, vector 42
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000200000000000000000000000000000000000000000000000000000
-Ciphertext: 80039358C99E64A255D5E4E334C830FFEC8E0CBF2EB6030DE7DCE1A938821938
-Test: Encrypt
-Comment:    Set 2, vector 43
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000100000000000000000000000000000000000000000000000000000
-Ciphertext: E508D93429BBE95EE38672A2F653841701F391C68235391367F16415C2C84ADC
-Test: Encrypt
-Comment:    Set 2, vector 44
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000080000000000000000000000000000000000000000000000000000
-Ciphertext: 710463874DF68B8930CC5CD6A00ABA2BCE27352997F2582EF472ED5F5AFE75A8
-Test: Encrypt
-Comment:    Set 2, vector 45
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000040000000000000000000000000000000000000000000000000000
-Ciphertext: E90AD04D26F4FF6D25D193CD2C34A2E1C6A1E570CCC705B873CACC94E61F79A7
-Test: Encrypt
-Comment:    Set 2, vector 46
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000020000000000000000000000000000000000000000000000000000
-Ciphertext: 8E19B69D55C9A2B2CCEACB50EC8007F39C81A0F261A8568D1298967C132BB790
-Test: Encrypt
-Comment:    Set 2, vector 47
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000010000000000000000000000000000000000000000000000000000
-Ciphertext: 4051E2FA9032676DC6E11CE947C64C9A0C0FC262AA41F40FA0C4093D1E4FA924
-Test: Encrypt
-Comment:    Set 2, vector 48
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000008000000000000000000000000000000000000000000000000000
-Ciphertext: 5DA6F415CCDF1A2D3335A0BEBB879D88CB9C871744111004C0E5AA6D27EB0311
-Test: Encrypt
-Comment:    Set 2, vector 49
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000004000000000000000000000000000000000000000000000000000
-Ciphertext: 684C24EC1DD06F6B565890190BE1F8BC7F4537CF5F9CF038ECB6D1D86164503A
-Test: Encrypt
-Comment:    Set 2, vector 50
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000002000000000000000000000000000000000000000000000000000
-Ciphertext: 6D259C132726524987D4FD96C1ECD943D6B87BB98C61C4FFE41E282EC82F246A
-Test: Encrypt
-Comment:    Set 2, vector 51
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000001000000000000000000000000000000000000000000000000000
-Ciphertext: 14707F80CC43E4E6321362B0ACFF84FE57E9D477B56637D01CAA09B232D726C5
-Test: Encrypt
-Comment:    Set 2, vector 52
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000800000000000000000000000000000000000000000000000000
-Ciphertext: FE98609B71F9CD65CD377C98BC4117EC8708E58D15361F9CAC02C64F0452B80D
-Test: Encrypt
-Comment:    Set 2, vector 53
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000400000000000000000000000000000000000000000000000000
-Ciphertext: 1B78E77F935EBA86B28C9B37818245E2865AF84A73C9DAA735E42E6009AA07F3
-Test: Encrypt
-Comment:    Set 2, vector 54
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000200000000000000000000000000000000000000000000000000
-Ciphertext: F354ADD75ED9E121B1BFAD9483C6825AEF57BAA2DF08B519640E022E196B313F
-Test: Encrypt
-Comment:    Set 2, vector 55
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000100000000000000000000000000000000000000000000000000
-Ciphertext: 7E0D7DCC0642CD5BF0C39460C4C183E5F321BCAB5EEA0AC7021E1AECE423E2A9
-Test: Encrypt
-Comment:    Set 2, vector 56
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000080000000000000000000000000000000000000000000000000
-Ciphertext: D1CCBD3EEA6ACF918569BEC2C900723B4359CA19C58E32ED65FDCBAA30A41C98
-Test: Encrypt
-Comment:    Set 2, vector 57
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000040000000000000000000000000000000000000000000000000
-Ciphertext: 361246D37645483C6D13C6500326694A0D577604CDF7CD36586B6C7F96FBE077
-Test: Encrypt
-Comment:    Set 2, vector 58
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000020000000000000000000000000000000000000000000000000
-Ciphertext: 0BC890CF369C233EDB99A51CEC75BFF60FB36BFB3EC15F253054F8865CB16DFF
-Test: Encrypt
-Comment:    Set 2, vector 59
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000010000000000000000000000000000000000000000000000000
-Ciphertext: B5ED5183A00C882F8D213AFCE35C14E940407B7C2A8C9A5A19F289AED42DFAD7
-Test: Encrypt
-Comment:    Set 2, vector 60
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000008000000000000000000000000000000000000000000000000
-Ciphertext: 22B4EA3A5718D6CEE4EA78725F5BAC735C539C343D7B45121EDDA22CA39D9413
-Test: Encrypt
-Comment:    Set 2, vector 61
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000004000000000000000000000000000000000000000000000000
-Ciphertext: 94ECEC21BC3426C7214F266B6442F85B6AE765BD6206A951B2AA14505D19FBCA
-Test: Encrypt
-Comment:    Set 2, vector 62
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000002000000000000000000000000000000000000000000000000
-Ciphertext: EF77932A5749126D65BD88330C18D91EDBB7FB53D7B3B675EE148EFC893559B9
-Test: Encrypt
-Comment:    Set 2, vector 63
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000001000000000000000000000000000000000000000000000000
-Ciphertext: BB9E132DC5DE8035433FBEAC46395E861BDA17A4892FFE6BD1B10D6B4D6AE0F3
-Test: Encrypt
-Comment:    Set 2, vector 64
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000800000000000000000000000000000000000000000000000
-Ciphertext: 7B536CF871F7FF406AD640683F405F0E14D72E77CDD2AB091D9A8E169155CE24
-Test: Encrypt
-Comment:    Set 2, vector 65
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000400000000000000000000000000000000000000000000000
-Ciphertext: 2417835AB4BD0A1D3439310480224C52796F3DB3536419F51A09551DFD4A6799
-Test: Encrypt
-Comment:    Set 2, vector 66
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000200000000000000000000000000000000000000000000000
-Ciphertext: 8E49C9819DFF2DEFCD8DF3E9EA910F79A9A932F43E4B763D6988CC0924C20544
-Test: Encrypt
-Comment:    Set 2, vector 67
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000100000000000000000000000000000000000000000000000
-Ciphertext: 1D364FDEFCB51560E4408CF25FC05E7698235D271E725590533CE24E3F3EC1EE
-Test: Encrypt
-Comment:    Set 2, vector 68
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000080000000000000000000000000000000000000000000000
-Ciphertext: F1C0422AC64E4D566E799ADA6CE33B59C31051C55ED2212841460CE330F2763E
-Test: Encrypt
-Comment:    Set 2, vector 69
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000040000000000000000000000000000000000000000000000
-Ciphertext: FA90883588183011F2748ADBC5217BA38CF6787FFD8BFCBEA06ADE193B1313C5
-Test: Encrypt
-Comment:    Set 2, vector 70
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000020000000000000000000000000000000000000000000000
-Ciphertext: 84EE69F947AEAAA0F1F2DA8C1508733D31F62FEBCF7085C68DEA5A602A566EBF
-Test: Encrypt
-Comment:    Set 2, vector 71
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000010000000000000000000000000000000000000000000000
-Ciphertext: 260C06AB73B581E29C34FEE05363F532D4C693B5E8025291FC99C48F9CFCEFF8
-Test: Encrypt
-Comment:    Set 2, vector 72
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000008000000000000000000000000000000000000000000000
-Ciphertext: 98184C744C6A24B329A7827CE0F5B30AE709493A22F9064D1C3F7FED046D1C2A
-Test: Encrypt
-Comment:    Set 2, vector 73
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000004000000000000000000000000000000000000000000000
-Ciphertext: 3CCDF1C3103B356E7A460410D91F1F00F749EB96F3E89F91248FB5E0949806EF
-Test: Encrypt
-Comment:    Set 2, vector 74
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000002000000000000000000000000000000000000000000000
-Ciphertext: 49AB6245E93A6CF84BF66A7451D134535362CB8A8CE2E47012BF8B4EF02894D4
-Test: Encrypt
-Comment:    Set 2, vector 75
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000001000000000000000000000000000000000000000000000
-Ciphertext: 7A92C7BB97CB99AD15EA9DA3A629031901840D23EA4227C699944882E2E8F3CC
-Test: Encrypt
-Comment:    Set 2, vector 76
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000800000000000000000000000000000000000000000000
-Ciphertext: 00FC7EBE56FCB696D9606FBBEEA6955871B7A03CDCAAE25DFC47D06145371AD3
-Test: Encrypt
-Comment:    Set 2, vector 77
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000400000000000000000000000000000000000000000000
-Ciphertext: FFF7327A979B527486052C1B99DECCFCC5E680D39613DE4107E8A04980DDFD70
-Test: Encrypt
-Comment:    Set 2, vector 78
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000200000000000000000000000000000000000000000000
-Ciphertext: 1E950B49D7D446867ED48272D220BCCC35B104A76A107880FB37D8AE55E69F58
-Test: Encrypt
-Comment:    Set 2, vector 79
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000100000000000000000000000000000000000000000000
-Ciphertext: 3B97EDED4E70497DAE02FD51E10AB26888096D2D182A7BC7EE55B6F3243E0144
-Test: Encrypt
-Comment:    Set 2, vector 80
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000080000000000000000000000000000000000000000000
-Ciphertext: 94414A0116665FFD8D1589B050A1663DBA15463206DA4E6A735B58FA7B4AA7ED
-Test: Encrypt
-Comment:    Set 2, vector 81
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000040000000000000000000000000000000000000000000
-Ciphertext: D586FFCBBF32561B9659306068DD31C2A1FBC8DDF99CF0BDAB3DCC0664B403C7
-Test: Encrypt
-Comment:    Set 2, vector 82
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000020000000000000000000000000000000000000000000
-Ciphertext: 061E17DB1EAF9884C940B8C72E884C8D9D46819FDDF6724239168DDBEE170B9B
-Test: Encrypt
-Comment:    Set 2, vector 83
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000010000000000000000000000000000000000000000000
-Ciphertext: D70F322E45E1D64B3D91249E9DE766DB7EF9084120C13D0215F31A6DE2E791C6
-Test: Encrypt
-Comment:    Set 2, vector 84
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000008000000000000000000000000000000000000000000
-Ciphertext: 5018967FCA5E67F24DCCE2190D24CD3E24A0B709B70DC38F1A4B4FE39CDCD2E5
-Test: Encrypt
-Comment:    Set 2, vector 85
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000004000000000000000000000000000000000000000000
-Ciphertext: 9108A0540D8D02658268185F06DFF6F2248681D0D9F9F4C6658942FC27C68246
-Test: Encrypt
-Comment:    Set 2, vector 86
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000002000000000000000000000000000000000000000000
-Ciphertext: 6595E74A5943DFE1A3FC19ADEBF190CDEC4C2EA0B7CCC6364E0AF7222CCEAA46
-Test: Encrypt
-Comment:    Set 2, vector 87
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000001000000000000000000000000000000000000000000
-Ciphertext: 5F156FB20AFD4BC0E4E4B2BA7700A38FFCAF9229E3CBA8C99915B692A76ACDEA
-Test: Encrypt
-Comment:    Set 2, vector 88
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000800000000000000000000000000000000000000000
-Ciphertext: F0584D66033584791BED0EB67D2A73AA918E0F88F08683DC1F67DB7DD3375326
-Test: Encrypt
-Comment:    Set 2, vector 89
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000400000000000000000000000000000000000000000
-Ciphertext: 5EB0956E3DA8ECFC571D5BD1C4EF430FBB10117C6684B8530B6552B812780EBF
-Test: Encrypt
-Comment:    Set 2, vector 90
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000200000000000000000000000000000000000000000
-Ciphertext: E8C8CB56ED63B5BA16DD833CC9C7AC77E425C284FFD547E8F9FE10410CA02FF3
-Test: Encrypt
-Comment:    Set 2, vector 91
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000100000000000000000000000000000000000000000
-Ciphertext: 68704A278A231ED468C1F0CFF43A4FC61253EACBE2BDCE1ED86D89F43263016D
-Test: Encrypt
-Comment:    Set 2, vector 92
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000080000000000000000000000000000000000000000
-Ciphertext: CA16F899842EE79CBAC4D7CD67172C7DD537E6EA21D48C15B0B34B29BF87E79B
-Test: Encrypt
-Comment:    Set 2, vector 93
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000040000000000000000000000000000000000000000
-Ciphertext: 9E6E7B31FF5D4D5C7D1C264273A27DA542BFCC6116B7DFDEF6332690B7304BDD
-Test: Encrypt
-Comment:    Set 2, vector 94
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000020000000000000000000000000000000000000000
-Ciphertext: FE466983DED41AFB1908DF12A5532054C6DB320F0ECBDCE7610BBE2A07AA7F68
-Test: Encrypt
-Comment:    Set 2, vector 95
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000010000000000000000000000000000000000000000
-Ciphertext: D2D93C1B66FD710F8B72564A44ACA93995938FEE7C38DE482C9586E3413EB40C
-Test: Encrypt
-Comment:    Set 2, vector 96
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000008000000000000000000000000000000000000000
-Ciphertext: 6623F853780833A60B60E6467CFA3D3D000228F2C8334F8B00CFE119133D41C7
-Test: Encrypt
-Comment:    Set 2, vector 97
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000004000000000000000000000000000000000000000
-Ciphertext: 1CED4727527E1C3107A89E77645241D240F3F113AC2BF8319E5D8EFF68997595
-Test: Encrypt
-Comment:    Set 2, vector 98
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000002000000000000000000000000000000000000000
-Ciphertext: FA450B3D8A7C03B643DF6EC70867D0502AE20235335AF5932A7016D71A6059A4
-Test: Encrypt
-Comment:    Set 2, vector 99
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000001000000000000000000000000000000000000000
-Ciphertext: A6F76AB74CE44538579369F5367B826C4EA72EB6EE08A0CFE1272EB435FDFEFC
-Test: Encrypt
-Comment:    Set 2, vector 100
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000800000000000000000000000000000000000000
-Ciphertext: 8108B48A62A0E0CD58B066C10613E2B589CFB0BCEF4EB58BBF8C88E84A2CD258
-Test: Encrypt
-Comment:    Set 2, vector 101
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000400000000000000000000000000000000000000
-Ciphertext: F335D10835B018414786D30923663B77B2E0CA65423B96BFA885B9797138CF4F
-Test: Encrypt
-Comment:    Set 2, vector 102
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000200000000000000000000000000000000000000
-Ciphertext: 87D8E75FEDA12025B9517BBF8421E837872E8978E48DA51BB8B8574C04731091
-Test: Encrypt
-Comment:    Set 2, vector 103
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000100000000000000000000000000000000000000
-Ciphertext: B8A50E6EDFF9711C6064812423F5DC5D77970BE65B545C042A02BACB30A4CD6F
-Test: Encrypt
-Comment:    Set 2, vector 104
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000080000000000000000000000000000000000000
-Ciphertext: EB98815E5A9337DF35F98D7CF27183EC8423D5F9D145326638B864E0F994DD7D
-Test: Encrypt
-Comment:    Set 2, vector 105
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000040000000000000000000000000000000000000
-Ciphertext: 3E5DDB36ABD739986483DE7A9EEF2468461A02B55CAA24100394442F0946F337
-Test: Encrypt
-Comment:    Set 2, vector 106
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000020000000000000000000000000000000000000
-Ciphertext: 809F726C3BB19BD09D4412B64777085D968ED4E612286008C4BAC69F671E7E31
-Test: Encrypt
-Comment:    Set 2, vector 107
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000010000000000000000000000000000000000000
-Ciphertext: 28F2EE8D382DF1AB0CF82B93C7A09B87180E8D19C35657302EFE1B1C4CA11ED4
-Test: Encrypt
-Comment:    Set 2, vector 108
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000008000000000000000000000000000000000000
-Ciphertext: 76E6887FC464215C9576BB233F5A3A7D98CA73F9B2D06E3BB81BC34AF02C8CE9
-Test: Encrypt
-Comment:    Set 2, vector 109
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000004000000000000000000000000000000000000
-Ciphertext: E8CEF712D7AF841C4FE7800CB04C27E25BDB41BECFA894588F73776CAAE2A0FA
-Test: Encrypt
-Comment:    Set 2, vector 110
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000002000000000000000000000000000000000000
-Ciphertext: 868D3A678A216D01A765046E2991A21F9626493063AFE771E3369E5DA2BA7E9B
-Test: Encrypt
-Comment:    Set 2, vector 111
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000001000000000000000000000000000000000000
-Ciphertext: D6465061FA1B143E1F6A3FCC1601D2D9FAEEF995C457E9EE301A27E8139D1AFE
-Test: Encrypt
-Comment:    Set 2, vector 112
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000800000000000000000000000000000000000
-Ciphertext: B42BB57D2F25612AAB33EF3213D6D210D9831502A1C4D51C4E72148CBB9893D1
-Test: Encrypt
-Comment:    Set 2, vector 113
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000400000000000000000000000000000000000
-Ciphertext: CE0EC3C44BFAABE6E18B3506E01199B0F2E0BCA4EA6C29D367EDDD0E83A1C65F
-Test: Encrypt
-Comment:    Set 2, vector 114
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000200000000000000000000000000000000000
-Ciphertext: 627101F50E134D6F33EF70AF0E32A3AF7C3237E3A5D99319719F175DD0392383
-Test: Encrypt
-Comment:    Set 2, vector 115
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000100000000000000000000000000000000000
-Ciphertext: CBCC83BE624059BD8B950BCF486AFBC342CF3575EBA6950FB39C03DB4822EDD9
-Test: Encrypt
-Comment:    Set 2, vector 116
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000080000000000000000000000000000000000
-Ciphertext: 5EAD7961798903C315DD89BE57105FEA164CA06A4ECDBB5CB10B76711C3E49A0
-Test: Encrypt
-Comment:    Set 2, vector 117
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000040000000000000000000000000000000000
-Ciphertext: 69169E6E11EAC935E12E6E30EFCEDD7236EAED9C5E1E3B215CD7167AB88B199D
-Test: Encrypt
-Comment:    Set 2, vector 118
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000020000000000000000000000000000000000
-Ciphertext: 5B08F07728399920CA30DC57CE94CAE85A44530033B2AE6BB7F8E29D7934C437
-Test: Encrypt
-Comment:    Set 2, vector 119
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000010000000000000000000000000000000000
-Ciphertext: 8FAD35B4FBC3BBAB2F4BF00D8A1651BE3FD77085AC5E6C7F6E2EDF5048F86068
-Test: Encrypt
-Comment:    Set 2, vector 120
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000008000000000000000000000000000000000
-Ciphertext: 71B22D911D9E754A76EC052CD7DC503CDE9A16E9043A04CFA244D8EB19FC21AA
-Test: Encrypt
-Comment:    Set 2, vector 121
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000004000000000000000000000000000000000
-Ciphertext: 062A10B7F5E3E8D7F3FC2C14E10EC9CA947A8FDC0EBC01E3A127BAFE689D6577
-Test: Encrypt
-Comment:    Set 2, vector 122
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000002000000000000000000000000000000000
-Ciphertext: 0FC375F0F68567F1827C7218132B434E84DA6377DB50AB330E8D9BD2754BD1B8
-Test: Encrypt
-Comment:    Set 2, vector 123
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000001000000000000000000000000000000000
-Ciphertext: 0E4C1117D462EEBCF5FCD7AC9807AF40C403910421CD19A4634B1C86113EB387
-Test: Encrypt
-Comment:    Set 2, vector 124
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000800000000000000000000000000000000
-Ciphertext: A9DB2CD2A23780D8BC5A2567961BCA24A41531157D4A229046B47DE48CAE0FDD
-Test: Encrypt
-Comment:    Set 2, vector 125
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000400000000000000000000000000000000
-Ciphertext: 7195678F00F98B00706E7C497E5FA2BC648EDA00B4B7DFAC6234C8232DF8E071
-Test: Encrypt
-Comment:    Set 2, vector 126
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000200000000000000000000000000000000
-Ciphertext: E5C1970C7C0B8E7E1BF871219486359C2E5037BE6E8E637BDB9F11051FB36A16
-Test: Encrypt
-Comment:    Set 2, vector 127
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000100000000000000000000000000000000
-Ciphertext: 2426496DC3B09404B609157E2273D526C3E6909B82F65527B42ABDD6348CF602
-Test: Encrypt
-Comment:    Set 2, vector 128
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000080000000000000000000000000000000
-Ciphertext: F9870238947E1575AF11D14D12E593163B98BA12E79F05563CBFFBCFB23FDC38
-Test: Encrypt
-Comment:    Set 2, vector 129
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000040000000000000000000000000000000
-Ciphertext: 2B1E410ACE9E8875F965A29D90773B68CAC452AE98CEB5922B7BAD936ACC421B
-Test: Encrypt
-Comment:    Set 2, vector 130
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000020000000000000000000000000000000
-Ciphertext: 180285A7AD7DD8FFD619970804F0FDB9706D5F5C467F815D0B1A455DED9D9300
-Test: Encrypt
-Comment:    Set 2, vector 131
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000010000000000000000000000000000000
-Ciphertext: BAEB5C1C68D72F1AE4735F6B75CDF9265E4F6F55DA934C4F118A3728AA2BC0D5
-Test: Encrypt
-Comment:    Set 2, vector 132
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000008000000000000000000000000000000
-Ciphertext: 9DEBFCC984F55E97C0064335C8A4B7489B7BDD75560EA51982114FCE4D481032
-Test: Encrypt
-Comment:    Set 2, vector 133
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000004000000000000000000000000000000
-Ciphertext: DF3B0B54DF4D1814A6F46B8F8B37E27AE8B9EC54B97BF9C523F1EC713EDDFFEE
-Test: Encrypt
-Comment:    Set 2, vector 134
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000002000000000000000000000000000000
-Ciphertext: 37AA04C74A1E8ED165BC1B4C97265A32B5579D9B2A7B7C883A98B616D5C24FAE
-Test: Encrypt
-Comment:    Set 2, vector 135
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000001000000000000000000000000000000
-Ciphertext: 83815356746186AE4CC327AB3A8CE04EF66ABD32D44D7089F1D7E301BFE006D6
-Test: Encrypt
-Comment:    Set 2, vector 136
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000800000000000000000000000000000
-Ciphertext: 2C6C7878E099F55653CA784A0BE4C9EC6201AFDCF99CDDC1ED862D4FE88CFDC8
-Test: Encrypt
-Comment:    Set 2, vector 137
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000400000000000000000000000000000
-Ciphertext: 424804513D38537C024955F2CCB29BECFD801FC06CD8EC5DE353872F0B50616F
-Test: Encrypt
-Comment:    Set 2, vector 138
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000200000000000000000000000000000
-Ciphertext: 48C31A55ED4716825D43FF671C01A86CDD792AABF78703ADC58F5FD65B3C0DE1
-Test: Encrypt
-Comment:    Set 2, vector 139
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000100000000000000000000000000000
-Ciphertext: BF99E4263F2C512CDE33A91E04FACA55052444E40FF79F09716FC06D24FDDE1D
-Test: Encrypt
-Comment:    Set 2, vector 140
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000080000000000000000000000000000
-Ciphertext: 1A40488BA16A5D0AE6381018F15ABF95C78FB05867E3D7E213CAD7BA3DC9EA3B
-Test: Encrypt
-Comment:    Set 2, vector 141
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000040000000000000000000000000000
-Ciphertext: BEAD8979A1A485959C3E9C8BF9CCF7CF850EB205296E1E8FF8BCAFBB011FF21D
-Test: Encrypt
-Comment:    Set 2, vector 142
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000020000000000000000000000000000
-Ciphertext: A8EDCC85F5A941B4434BD4DAD5E39EEAD102DA25BBB2C3D143572AC7425ED819
-Test: Encrypt
-Comment:    Set 2, vector 143
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000010000000000000000000000000000
-Ciphertext: 631126B3A837AA4C999EFE6A687BBA58751464A6395670213C8445CC8409C33F
-Test: Encrypt
-Comment:    Set 2, vector 144
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000008000000000000000000000000000
-Ciphertext: CA4A5FD3A3D2DA973E16C0A849E374C5A293351A66415B45107BD228CB842B19
-Test: Encrypt
-Comment:    Set 2, vector 145
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000004000000000000000000000000000
-Ciphertext: A61FDF733DDEC4C3AE51BE778BDD6E34BED64449ABCA7A718EAA513A2A5A9014
-Test: Encrypt
-Comment:    Set 2, vector 146
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000002000000000000000000000000000
-Ciphertext: 2C632530E7FCD550B5F9D14E21409AFD07C7E1FBF04B3B3FEC8C61AC8A1591ED
-Test: Encrypt
-Comment:    Set 2, vector 147
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000001000000000000000000000000000
-Ciphertext: B2D97A1D343D3D5E1A7E444BA6E57D2E5ED42E02F719ECA22BA47E796AB37B18
-Test: Encrypt
-Comment:    Set 2, vector 148
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000800000000000000000000000000
-Ciphertext: AC515AAC675C2C3E46A8F77578189149327413CF40B48E16BF83D3500C2B1355
-Test: Encrypt
-Comment:    Set 2, vector 149
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000400000000000000000000000000
-Ciphertext: C8ADC6079B92459A8E975FFFE2352A90629CF9E8D53630536D9EBC7DAC4C467E
-Test: Encrypt
-Comment:    Set 2, vector 150
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000200000000000000000000000000
-Ciphertext: 97B2C40964B25AE5CBD092E36B37A3BB4520570A9920034C584C66600D3857D9
-Test: Encrypt
-Comment:    Set 2, vector 151
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000100000000000000000000000000
-Ciphertext: 99A017D3829CEFE10DDD33D33F53EA470A2A74A35ED3BED8B7E9D6EF3B790153
-Test: Encrypt
-Comment:    Set 2, vector 152
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000080000000000000000000000000
-Ciphertext: 6141854199F9E01CFE4A35DF918B805985ACC8F8A7456FFBF91D27D4E85E4C49
-Test: Encrypt
-Comment:    Set 2, vector 153
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000040000000000000000000000000
-Ciphertext: 28BC7571E7C921B31BC2D7BF55853C2CC5B815B39471907DAE152F685791378B
-Test: Encrypt
-Comment:    Set 2, vector 154
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000020000000000000000000000000
-Ciphertext: AD751D4D9D635900C22B6166328ECD85FB4A1610D055793BF04A83CB6F5F02DB
-Test: Encrypt
-Comment:    Set 2, vector 155
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000010000000000000000000000000
-Ciphertext: 8670009356A0A3BD402CF218664826C05BE1651C6E606C011967F8F9C3835017
-Test: Encrypt
-Comment:    Set 2, vector 156
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000008000000000000000000000000
-Ciphertext: 6CE35F565BC4F38D73116267C49D345B7B19D57D5C90136CAF512F76AF47FAAD
-Test: Encrypt
-Comment:    Set 2, vector 157
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000004000000000000000000000000
-Ciphertext: FD0DF28AFE47414F99219AD120F33DCA6F8756B2264349911041B0AEC9D77A43
-Test: Encrypt
-Comment:    Set 2, vector 158
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000002000000000000000000000000
-Ciphertext: 49CE284D7A18A0608E5E3768286E919DE97DD81B369AB0A012AD7BDC491DED1A
-Test: Encrypt
-Comment:    Set 2, vector 159
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000001000000000000000000000000
-Ciphertext: 12B27FEC757A809C68F670698E5CB40E762855022FC12DE2332DB9814FC6E5E2
-Test: Encrypt
-Comment:    Set 2, vector 160
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000800000000000000000000000
-Ciphertext: 53074884476D09C729F35C3906046C2DCBA7F12BF59CDD3CE73ABF91847C6369
-Test: Encrypt
-Comment:    Set 2, vector 161
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000400000000000000000000000
-Ciphertext: D29E3C55DD3D867D7263D2C961FDB6A97B8D827AB73A20479ACB06DF992AEC24
-Test: Encrypt
-Comment:    Set 2, vector 162
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000200000000000000000000000
-Ciphertext: 4BE421463C6F2CC8118A50684EB5FC98323EA27F03D4B98EC05727BA0FFA40E8
-Test: Encrypt
-Comment:    Set 2, vector 163
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000100000000000000000000000
-Ciphertext: A96EC7F07298F9D86A811D0110D60E65C80F3E913B575831A5E8533932196B24
-Test: Encrypt
-Comment:    Set 2, vector 164
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000080000000000000000000000
-Ciphertext: F12B579997BA4203D8A0FF36181E4C1B50C703FE32CF18D9BF84355BC404D135
-Test: Encrypt
-Comment:    Set 2, vector 165
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000040000000000000000000000
-Ciphertext: 35EBB3FE5FACC9B9D321E82A73C344CA05D0E73372579349A1F365DEA0105292
-Test: Encrypt
-Comment:    Set 2, vector 166
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000020000000000000000000000
-Ciphertext: 0F1F0518D57ADC91D810B5899EB7EE7900D05AD8AD2960FE07893F30859B636F
-Test: Encrypt
-Comment:    Set 2, vector 167
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000010000000000000000000000
-Ciphertext: A6CAF97EF17BEFDCF3412D7F45F72C1F1726198ED3B5CD905DF9078DCD70F882
-Test: Encrypt
-Comment:    Set 2, vector 168
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000008000000000000000000000
-Ciphertext: E287019353E8C71C62178B3AF7A3ECA210D79F803F43C09B6C08F295367A30CA
-Test: Encrypt
-Comment:    Set 2, vector 169
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000004000000000000000000000
-Ciphertext: CF7A7ECEA347875A7B9191BF9FFDC3FB53512052FA42370E39BF5D906EE82D4E
-Test: Encrypt
-Comment:    Set 2, vector 170
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000002000000000000000000000
-Ciphertext: 7E362B5B5ED5CAB9A518320E498FDB915BFD72BB5C588495AC49FC2D5CEC2134
-Test: Encrypt
-Comment:    Set 2, vector 171
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000001000000000000000000000
-Ciphertext: 69254195C6A9A4D334F8F0558A6C9635EB8A397E5AB672E81DC194AFA5C3A8B7
-Test: Encrypt
-Comment:    Set 2, vector 172
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000800000000000000000000
-Ciphertext: 3934A6BA3DE9885771111CBA59D50EC684F8F612AAAE3E511C0A211D972723C4
-Test: Encrypt
-Comment:    Set 2, vector 173
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000400000000000000000000
-Ciphertext: BCEE40ADD3CFDE924F58786640A56A68FE83615EDD82873DF6908057AF39F74A
-Test: Encrypt
-Comment:    Set 2, vector 174
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000200000000000000000000
-Ciphertext: 70F4E0381A989C486A45FAE5B108373E950843EE48DC2A43E7AA625BF3AC9838
-Test: Encrypt
-Comment:    Set 2, vector 175
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000100000000000000000000
-Ciphertext: FAED24C44DE7F447CD1169F4D8D734E55154B73F79B31AD1CD310C7F5529433A
-Test: Encrypt
-Comment:    Set 2, vector 176
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000080000000000000000000
-Ciphertext: 887BA60DED98C75DADDC1CD0824E7E6C76D947617A919A3B870B489CD1B7F6B2
-Test: Encrypt
-Comment:    Set 2, vector 177
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000040000000000000000000
-Ciphertext: 33D833FFDB7BEB6BBAB4DDACA6784B88C4B76A49641AA01BC980AB31084F4351
-Test: Encrypt
-Comment:    Set 2, vector 178
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000020000000000000000000
-Ciphertext: 8CDEF08AB44C2CB2AB5EC94437E501A96999B30C045A79DE99E220595B95DA2F
-Test: Encrypt
-Comment:    Set 2, vector 179
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000010000000000000000000
-Ciphertext: 029247C8EC0610E7F5B49FA4191E99CDECBC1E44DF123270901A57DE8ED64850
-Test: Encrypt
-Comment:    Set 2, vector 180
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000008000000000000000000
-Ciphertext: 08487E1E53C677CA34640459BDBF7C53247DD54624B9C2156A59F24A818A258E
-Test: Encrypt
-Comment:    Set 2, vector 181
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000004000000000000000000
-Ciphertext: 2C7C0444738DB202D9236CF00E1B75F579E18CAD4341093675F66732746F8060
-Test: Encrypt
-Comment:    Set 2, vector 182
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000002000000000000000000
-Ciphertext: F493AF90C19A9EA6460AE35418D4857236D678B570352665092854CFF9FB684E
-Test: Encrypt
-Comment:    Set 2, vector 183
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000001000000000000000000
-Ciphertext: 4575CF8865954F9FDCC9C2F7A41BFD52B1C770E2C7609151E41D9B1D0489500C
-Test: Encrypt
-Comment:    Set 2, vector 184
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000800000000000000000
-Ciphertext: BA0606FA831D4EF759CF457F88B0EEDFDF13BD3ABF72547456052C877B9E3A3B
-Test: Encrypt
-Comment:    Set 2, vector 185
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000400000000000000000
-Ciphertext: 10E979D310CAD332AA3DC860EF69B2BBD96E817BFB93393AD4D8B141C0A301E4
-Test: Encrypt
-Comment:    Set 2, vector 186
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000200000000000000000
-Ciphertext: B46DE2A7729FAF7CEE978353D4392EA23FE1BB36732D101377C603125125FE62
-Test: Encrypt
-Comment:    Set 2, vector 187
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000100000000000000000
-Ciphertext: F03E1B911C1EDD769CAD59A744FAD47CB5E19502C1E7F4F0B3197101F3B673C1
-Test: Encrypt
-Comment:    Set 2, vector 188
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000080000000000000000
-Ciphertext: A9128F8B0C1809095597110471DD7F10040AE71626E8C694BA529B4C9E1353A2
-Test: Encrypt
-Comment:    Set 2, vector 189
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000040000000000000000
-Ciphertext: B9EDCD81B2CFB461C1FC554ED71CCC958AF4B2B726C011173F4058C40211C496
-Test: Encrypt
-Comment:    Set 2, vector 190
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000020000000000000000
-Ciphertext: 400F0635E34B796116E3752A0EDA47C3ABC19641DDD60427B4CE3AA8700CEA8E
-Test: Encrypt
-Comment:    Set 2, vector 191
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000010000000000000000
-Ciphertext: 0E526F1012B80F22F946FD51D776187DEFD554B1F5806102E7DD9277FE06B826
-Test: Encrypt
-Comment:    Set 2, vector 192
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000008000000000000000
-Ciphertext: 1FC0DA71F72D08CDD0F59120C4A88E793869A2C598BAB97C92D6C63C0FAEADA9
-Test: Encrypt
-Comment:    Set 2, vector 193
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000004000000000000000
-Ciphertext: C493FDECD4D49D5FC6D8590C70BEAAD97EB7694244201CA4CF1732E03D7A4251
-Test: Encrypt
-Comment:    Set 2, vector 194
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000002000000000000000
-Ciphertext: C532BFE04C6CA7E8B4ABFF9E8BD9C676CBC9AA78FEF4A2DC5CC907742B3ED64F
-Test: Encrypt
-Comment:    Set 2, vector 195
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000001000000000000000
-Ciphertext: 5C8F3ECB07F0264162A9C01A6BB2BC5CF3C7B9ED315803BF86A72406C2655242
-Test: Encrypt
-Comment:    Set 2, vector 196
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000800000000000000
-Ciphertext: 8C13C039C13DF9C8D821D33E85AFE93EEAFCFC2A2F06D85B3BDE2743FC37AD3F
-Test: Encrypt
-Comment:    Set 2, vector 197
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000400000000000000
-Ciphertext: 3D990835001730714D0880420F57041E37A7FAF1FCA991AA38C409C80F2DC61F
-Test: Encrypt
-Comment:    Set 2, vector 198
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000200000000000000
-Ciphertext: EC44357D4F18EBE148B47AB546D6A5F3E08F8F6C9E2B8B6B99FF303814BF43BA
-Test: Encrypt
-Comment:    Set 2, vector 199
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000100000000000000
-Ciphertext: 00C3B30C81FBC65B9E12C8D6429104FDF40D322D47A59E637FC8CE749725BDCC
-Test: Encrypt
-Comment:    Set 2, vector 200
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000080000000000000
-Ciphertext: 6136C065D96E7F18AB296F86AF04BB264A6DA61DEA7C5413C9131B7EBE551B88
-Test: Encrypt
-Comment:    Set 2, vector 201
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000040000000000000
-Ciphertext: 2A363A08CAD79DF6A3F2DF5D842B14935C5D09C9D6C78C4989ADCB018A735A5D
-Test: Encrypt
-Comment:    Set 2, vector 202
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000020000000000000
-Ciphertext: B25955B31CC449A42502D1AB61D699DE558BA2C7825BA06B17B239851E575880
-Test: Encrypt
-Comment:    Set 2, vector 203
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000010000000000000
-Ciphertext: CBE2FD81D74436E167D6A5CF8F7DC07338885146351483E4474CD213D853A6FE
-Test: Encrypt
-Comment:    Set 2, vector 204
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000008000000000000
-Ciphertext: 66DE9DCBF2B85FF944EDD40B3D81F5F8699DB1982C045667FDE9A499A7777DD6
-Test: Encrypt
-Comment:    Set 2, vector 205
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000004000000000000
-Ciphertext: D940E3F69C42E847312E473E362FD609BE7780D99DAC30F8F095D58EFDC58D59
-Test: Encrypt
-Comment:    Set 2, vector 206
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000002000000000000
-Ciphertext: 60FBA04239A8C312E10C7773673E94678CB1E13B069759AF304C56CCA6F490DD
-Test: Encrypt
-Comment:    Set 2, vector 207
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000001000000000000
-Ciphertext: D67E081F763F322BA82FA01E184C355A65DE8028E47BF0DB5FCAEDA8C2593F02
-Test: Encrypt
-Comment:    Set 2, vector 208
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000800000000000
-Ciphertext: 434868F9A6086D0F9218E02CB9534E9EEE88B90C6174A4306B0D0843A35CFDFD
-Test: Encrypt
-Comment:    Set 2, vector 209
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000400000000000
-Ciphertext: B6CCB5899745E29FEE7870B22C2F989D84C98C4510DEA892666E187CDEF77E1A
-Test: Encrypt
-Comment:    Set 2, vector 210
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000200000000000
-Ciphertext: E798F9255A21E0ECDC4BA638F0BF03BAA0AD7810844837582193D7FB3E11B5DF
-Test: Encrypt
-Comment:    Set 2, vector 211
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000100000000000
-Ciphertext: 9BAE51C5C4DF9E55570EF0FE5F2C6AC0CF9FD953E65CD07ED12378BD5A0F2911
-Test: Encrypt
-Comment:    Set 2, vector 212
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000080000000000
-Ciphertext: 95ECC45EEDD4537D6A7D54D60A64CBFB6728982441C7EE10B7A84A80B51EE171
-Test: Encrypt
-Comment:    Set 2, vector 213
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000040000000000
-Ciphertext: D8D77750B38E522216DA0A1A9DB7C56788E504708A2048B66946FB83C1981FCB
-Test: Encrypt
-Comment:    Set 2, vector 214
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000020000000000
-Ciphertext: 0CAA8435D051798DB289708EC6CC4C98F0018AB7F068FA0E40443A1F227002CD
-Test: Encrypt
-Comment:    Set 2, vector 215
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000010000000000
-Ciphertext: 5410408C0306460E6033543669A26A63F7C7BBDFEF4273C9BAD8AC472EDAFB67
-Test: Encrypt
-Comment:    Set 2, vector 216
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000008000000000
-Ciphertext: DD3A0F7B61D056015B54A329882E942ECA3C5C3F64ACFE71E3255A8F53E1AD73
-Test: Encrypt
-Comment:    Set 2, vector 217
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000004000000000
-Ciphertext: 80A70BE4CC4C61C0F7F501E8068C75CEA78DC11A224D0C47C09D20361C99CF00
-Test: Encrypt
-Comment:    Set 2, vector 218
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000002000000000
-Ciphertext: BEF3417464A46BBD2B7E9FB967F4FBF406C2B5B9C8B076B770C199C003786A40
-Test: Encrypt
-Comment:    Set 2, vector 219
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000001000000000
-Ciphertext: C1756ADF6EEF9837B43C4B032B17A79C3A583EE37981CC495CA95893F34218A6
-Test: Encrypt
-Comment:    Set 2, vector 220
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000800000000
-Ciphertext: 90273FCA31968871BE3D5C76AFCB47D9ECC31A48B87988FD359E93AFF6815F4D
-Test: Encrypt
-Comment:    Set 2, vector 221
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000400000000
-Ciphertext: D0A5F666F7A819EF8BA114C1872158179731F6989997E13AFD73DB252E5CD2A2
-Test: Encrypt
-Comment:    Set 2, vector 222
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000200000000
-Ciphertext: D4E3DA34C47E5A86A723ED5B9F615B283E4CD54E9F2ED9EAA98A7AB8DE41B14C
-Test: Encrypt
-Comment:    Set 2, vector 223
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000100000000
-Ciphertext: 547227D086EBB538F5836B8E1E65601209AEB6DFD1C450C014C559D879D71862
-Test: Encrypt
-Comment:    Set 2, vector 224
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000080000000
-Ciphertext: 9E52F033EFE0762ED108095BDF6CD8A89F8E1028F0D3D9B39B601C1084F95F74
-Test: Encrypt
-Comment:    Set 2, vector 225
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000040000000
-Ciphertext: A049C5B9BD63EBEB23B34EA2F27813D29EDC044E2486D709AC7D2C731557066B
-Test: Encrypt
-Comment:    Set 2, vector 226
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000020000000
-Ciphertext: 1A9CDD2A99C5ED7FB2A6A1870230B0BD6890567E0E4439E248548DF25CB6126E
-Test: Encrypt
-Comment:    Set 2, vector 227
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000010000000
-Ciphertext: 41F2CDA0EFE97BCE8689CF33201B4E57E0600BBB1F274DF3D589915F8EA5C372
-Test: Encrypt
-Comment:    Set 2, vector 228
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000008000000
-Ciphertext: 1F4712D7AB6D127ABDA90DA977CFC60B44F84859AE4B705851CF687E01E1E250
-Test: Encrypt
-Comment:    Set 2, vector 229
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000004000000
-Ciphertext: DC93D915CBBC140EDB08B34406F71B4CD38274E92DE8FAF355D274AE7929BC28
-Test: Encrypt
-Comment:    Set 2, vector 230
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000002000000
-Ciphertext: D2D9A648EDAF9339D7EE52419CC33C42E4CA91AA670D14B78952F41F889122E5
-Test: Encrypt
-Comment:    Set 2, vector 231
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000001000000
-Ciphertext: F34BA77405D00CAFC3E6786CDB26263C10CDC4D6AFAEDF4C26566A51DB82F5F9
-Test: Encrypt
-Comment:    Set 2, vector 232
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000800000
-Ciphertext: 21A7EAD6D95FC7AB788206CEA15A25CC4AEB69BAA96C78D5E2851DDBA25523F0
-Test: Encrypt
-Comment:    Set 2, vector 233
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000400000
-Ciphertext: 822BC3900195E6F224805E77B2460A65FA1A11CFD473F1DFA65351CBB4EFDFEB
-Test: Encrypt
-Comment:    Set 2, vector 234
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000200000
-Ciphertext: 648A71BE1E77866181F980B37690D5C8A37DF29BB2EBC3A41665CD0CCC2E8EF8
-Test: Encrypt
-Comment:    Set 2, vector 235
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000100000
-Ciphertext: 808E32C933955FF7C8D6F1A4C6754CB3B7311612CFF846D02C81B712C78EB63E
-Test: Encrypt
-Comment:    Set 2, vector 236
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000080000
-Ciphertext: E074251CC7C5BFFCE2CA45933206B2EE8864156A4626C03EA030B71F8BD454BE
-Test: Encrypt
-Comment:    Set 2, vector 237
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000040000
-Ciphertext: 72EBE213A06F63603B49A750808F348FF7C9E4EC72884FDA7C58968EC5A25EED
-Test: Encrypt
-Comment:    Set 2, vector 238
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000020000
-Ciphertext: 20618612C2AF418DE3E185AF7973D508DC31DE1E9D9FB4FDF9E95FD592F567EF
-Test: Encrypt
-Comment:    Set 2, vector 239
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000010000
-Ciphertext: F94C66D4884A657BF0A6A6EA31A90A07F193F55465575FF1BF8DE68F3441BF4E
-Test: Encrypt
-Comment:    Set 2, vector 240
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000008000
-Ciphertext: 9636DCAB40FB991FC330D8EFD671FF83BAA0C9E33D7A146D5E7ADC53592B605F
-Test: Encrypt
-Comment:    Set 2, vector 241
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000004000
-Ciphertext: FC21689B5F46A011ECFE1E314E03ED7105BAC620193714B2290087C17FB763B6
-Test: Encrypt
-Comment:    Set 2, vector 242
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000002000
-Ciphertext: ABD2583E0FCC95122FDC700AF9B1FDA50D91E752E19BE9D2EE4F5E22033D53C6
-Test: Encrypt
-Comment:    Set 2, vector 243
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000001000
-Ciphertext: 3501CD56EE5EA39AB32F38371E5C2CF6EEEB9DA82D210A8D88AE8F29917AE9F4
-Test: Encrypt
-Comment:    Set 2, vector 244
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000800
-Ciphertext: 7559A2AA6CBFA8A181565EDDDE323DB80CE740545FFEE13B4851980AD2451E24
-Test: Encrypt
-Comment:    Set 2, vector 245
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000400
-Ciphertext: CEF6DBFD1FBCCBB587BD748D6CC992F8EF671A829E2D6AD73D1DC1C1B2A9E8DD
-Test: Encrypt
-Comment:    Set 2, vector 246
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000200
-Ciphertext: 46FBBCD26A1F879746BDF4FF7804A5C105F621837ABCF94F17123B700A58A08A
-Test: Encrypt
-Comment:    Set 2, vector 247
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000100
-Ciphertext: 0B10D2DA0E0FB6F067D641FF7F8C9C8FF4E2D689450787B7136ADF38DC1F2948
-Test: Encrypt
-Comment:    Set 2, vector 248
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000080
-Ciphertext: 4492E09E73459BF74417FC0D7190DA719A891C9CAE14801944FFB24912E377A8
-Test: Encrypt
-Comment:    Set 2, vector 249
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000040
-Ciphertext: 76D72C3D3AF6F2FF6AFBC0C1A553E6F8171D81D6BB1CB3C3A6C43ED826A88FAA
-Test: Encrypt
-Comment:    Set 2, vector 250
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000020
-Ciphertext: D912041134584B69AC01938EC88913DBCFF7CDBE93CDF7443BD465F1B2E3F7F5
-Test: Encrypt
-Comment:    Set 2, vector 251
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000010
-Ciphertext: F0883EB64A5345CC9A0055D4E882D199EFFC334C05B53BC4132AC1A51BA39A9F
-Test: Encrypt
-Comment:    Set 2, vector 252
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000008
-Ciphertext: 276246B0D93A4E6FF05832F51D2BF60641B63594EB90A1E08A7D98C6DDAE1461
-Test: Encrypt
-Comment:    Set 2, vector 253
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000004
-Ciphertext: 6AA2B04BF65F4213583CED5347537123DC3BE0703209170D1D34B0B8A66C1C58
-Test: Encrypt
-Comment:    Set 2, vector 254
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000002
-Ciphertext: DC438414927E453DBFD91DC60C635EE4273A9921A134DB513AB2BBDBAE64A9AD
-Test: Encrypt
-Comment:    Set 2, vector 255
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000001
-Ciphertext: 45D43E9288738C5AD1A683D8DE59CEDD22D666A2B7078EB1301B532A272D570B
-Test: Encrypt
-Comment:    Set 3, vector 0
-Key:        00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Plaintext:  0000000000000000000000000000000000000000000000000000000000000000
-Ciphertext: 7CA51614425C3BA8CE54DD2FC2020AE7B6E574D198136D0FAE7E26CCBF0BE7A6
-Test: Encrypt
-Comment:    Set 3, vector 1
-Key:        01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101
-Plaintext:  0101010101010101010101010101010101010101010101010101010101010101
-Ciphertext: C4B7C6A9738C77EE28F7E685C8358E0AF88FB6D23955EE6DF49FE3F5DA16F826
-Test: Encrypt
-Comment:    Set 3, vector 2
-Key:        02020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202
-Plaintext:  0202020202020202020202020202020202020202020202020202020202020202
-Ciphertext: CD108DD9EC1000B79C75AA3DCC88F913E6F52773853035A5C44F3245B134CBFF
-Test: Encrypt
-Comment:    Set 3, vector 3
-Key:        03030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303
-Plaintext:  0303030303030303030303030303030303030303030303030303030303030303
-Ciphertext: E8F9DE8F066B675AE90C919FC4981603485BBB92382D8C844CAF707973D5276D
-Test: Encrypt
-Comment:    Set 3, vector 4
-Key:        04040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404
-Plaintext:  0404040404040404040404040404040404040404040404040404040404040404
-Ciphertext: 6AA777340200C1B65AB25193A8BB267C233DAC7E1B3C523D406FC5B567B7B586
-Test: Encrypt
-Comment:    Set 3, vector 5
-Key:        05050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505
-Plaintext:  0505050505050505050505050505050505050505050505050505050505050505
-Ciphertext: 6B14A9C454143376DBDC3C93FB8096B09C01456B0B55412FD9692CD7CB587069
-Test: Encrypt
-Comment:    Set 3, vector 6
-Key:        06060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606
-Plaintext:  0606060606060606060606060606060606060606060606060606060606060606
-Ciphertext: 3FED53DEF4FBC1D012B36562132AB40049818DA4E62E86716DE5EF70790B0D6A
-Test: Encrypt
-Comment:    Set 3, vector 7
-Key:        07070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707
-Plaintext:  0707070707070707070707070707070707070707070707070707070707070707
-Ciphertext: 7A428F7A6841BC8F0E99335C5021C413D2639321DC8D9F280A2F0EF4B420A212
-Test: Encrypt
-Comment:    Set 3, vector 8
-Key:        08080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808
-Plaintext:  0808080808080808080808080808080808080808080808080808080808080808
-Ciphertext: A23BE32D37FA4054EC45D6A9CC643AF9124EDAA4AD9ABC7FAAB449D39D11B128
-Test: Encrypt
-Comment:    Set 3, vector 9
-Key:        09090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909
-Plaintext:  0909090909090909090909090909090909090909090909090909090909090909
-Ciphertext: 972195D6756F7D3A4D13BF49BFBCE7D164460355150C297A41CCC6AA9F31C5D6
-Test: Encrypt
-Comment:    Set 3, vector 10
-Key:        0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-Plaintext:  0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A
-Ciphertext: 2AA722C58EBDB7701225BA9C3B1F7C946D57DEDC74FEDDB637EB14E27A0F0CC9
-Test: Encrypt
-Comment:    Set 3, vector 11
-Key:        0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-Plaintext:  0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B
-Ciphertext: 1C9A0420B9F6EF013FB3ADB4F20C862B61702BA479276E3187322B33D4B128C2
-Test: Encrypt
-Comment:    Set 3, vector 12
-Key:        0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-Plaintext:  0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C
-Ciphertext: 666CC3862BAACADA4D35A9079D52438FB3B4416C9938397E61D48066B6476068
-Test: Encrypt
-Comment:    Set 3, vector 13
-Key:        0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-Plaintext:  0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D
-Ciphertext: DB94504EF884901FAA5778199329A2DCC9AA50A4453172CE8ADE11BFE54234E9
-Test: Encrypt
-Comment:    Set 3, vector 14
-Key:        0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-Plaintext:  0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E
-Ciphertext: DF0B4204DB7E0924BD2931C131E6DFEB013A5844F717DF7A2DEF86FBC2125DA6
-Test: Encrypt
-Comment:    Set 3, vector 15
-Key:        0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-Plaintext:  0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
-Ciphertext: D7C2D4257254E7A05657047B43B65AB778C9E6ACDE53F14000FDFC346CEE4BA6
-Test: Encrypt
-Comment:    Set 3, vector 16
-Key:        10101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
-Plaintext:  1010101010101010101010101010101010101010101010101010101010101010
-Ciphertext: F64819DFBEBE0A6DB650E7072CE28EA606586418B317785FF0AD44212A84C82C
-Test: Encrypt
-Comment:    Set 3, vector 17
-Key:        11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
-Plaintext:  1111111111111111111111111111111111111111111111111111111111111111
-Ciphertext: 155B7E6FFCC0AA874E22494545374E97C08A3D1B1045A0F35FFC54B2842D02A4
-Test: Encrypt
-Comment:    Set 3, vector 18
-Key:        12121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212
-Plaintext:  1212121212121212121212121212121212121212121212121212121212121212
-Ciphertext: FEE12FD9E87DCB4FE5C5249E3EAEDA0514F6A4826C1A5ABC87E22B95D4A84851
-Test: Encrypt
-Comment:    Set 3, vector 19
-Key:        13131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313
-Plaintext:  1313131313131313131313131313131313131313131313131313131313131313
-Ciphertext: 1DA785C2A2CEFED459474EE5401F5B795F6ED468DBB924CFFCF65EF465DE9534
-Test: Encrypt
-Comment:    Set 3, vector 20
-Key:        14141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414
-Plaintext:  1414141414141414141414141414141414141414141414141414141414141414
-Ciphertext: 4434A4D83273B06B64AF4ED1D70EEAD50DBFC44C5931A7B7B98FF9F514B229E9
-Test: Encrypt
-Comment:    Set 3, vector 21
-Key:        15151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515
-Plaintext:  1515151515151515151515151515151515151515151515151515151515151515
-Ciphertext: 1AB982A6C64C2C42D05F9FB8ED9BE0EEB5B48CEE8EAB0250D98D43157E999EDC
-Test: Encrypt
-Comment:    Set 3, vector 22
-Key:        16161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616
-Plaintext:  1616161616161616161616161616161616161616161616161616161616161616
-Ciphertext: 83291A3265ACAB71E5CCCF0281A433579F39AE6C2FB7CB7528D7F820158177FF
-Test: Encrypt
-Comment:    Set 3, vector 23
-Key:        17171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717
-Plaintext:  1717171717171717171717171717171717171717171717171717171717171717
-Ciphertext: 90F1FF9F69854321CFC6D0A4541CCDF73C1A1DC737D96FB76F0DDD0BB0097BBA
-Test: Encrypt
-Comment:    Set 3, vector 24
-Key:        18181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818
-Plaintext:  1818181818181818181818181818181818181818181818181818181818181818
-Ciphertext: ABF9813765AFBEA9BF26026716294D5C5B309243339ECC9F21CEADE6E7083266
-Test: Encrypt
-Comment:    Set 3, vector 25
-Key:        19191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919
-Plaintext:  1919191919191919191919191919191919191919191919191919191919191919
-Ciphertext: 7B5C8222D85392E82E703ADFB0FF02DBD2297791B84E26A3A1ED12309247D064
-Test: Encrypt
-Comment:    Set 3, vector 26
-Key:        1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-Plaintext:  1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A
-Ciphertext: 227355246FCC9106FA5572475E8C466F1140CD75A8A84DFCD2B0908392914FD7
-Test: Encrypt
-Comment:    Set 3, vector 27
-Key:        1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-Plaintext:  1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B
-Ciphertext: E5E5A887FA888691FF93014C2E368DC10775A447A5EF4B632A089DA82D245BE3
-Test: Encrypt
-Comment:    Set 3, vector 28
-Key:        1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-Plaintext:  1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C
-Ciphertext: BA417FC94107761C0969EF6EA7DDC74E5F85CAB61E2271CEB6D9C98B139F4576
-Test: Encrypt
-Comment:    Set 3, vector 29
-Key:        1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-Plaintext:  1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D
-Ciphertext: F3B85912DF6950B9AE28CE08E456D494E0C949A36FA102540C51827AEC9168AB
-Test: Encrypt
-Comment:    Set 3, vector 30
-Key:        1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-Plaintext:  1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E
-Ciphertext: 1AC0ED993D24366380522B05F97B6FC64B199241A1D556B992632AEE400F0494
-Test: Encrypt
-Comment:    Set 3, vector 31
-Key:        1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-Plaintext:  1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F
-Ciphertext: 3550CD591130231B0F01F6860B699715B98B9497B4035C7323000D67C5F0B1B7
-Test: Encrypt
-Comment:    Set 3, vector 32
-Key:        20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020
-Plaintext:  2020202020202020202020202020202020202020202020202020202020202020
-Ciphertext: E267D6113C27170A3EE6DF496E801A6131BBD3444365D7C03791E25610F1A0E4
-Test: Encrypt
-Comment:    Set 3, vector 33
-Key:        21212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121
-Plaintext:  2121212121212121212121212121212121212121212121212121212121212121
-Ciphertext: 3D71B778381E70BCC1A7B8411208225FC922857E862FC17312E3782CEA289B15
-Test: Encrypt
-Comment:    Set 3, vector 34
-Key:        22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
-Plaintext:  2222222222222222222222222222222222222222222222222222222222222222
-Ciphertext: 16B41DE00DBF29B96CC59E246DE3188B786E097394E9EEE2250169AE00306FD8
-Test: Encrypt
-Comment:    Set 3, vector 35
-Key:        23232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323
-Plaintext:  2323232323232323232323232323232323232323232323232323232323232323
-Ciphertext: 99DDE88C9F26D270B3C507A25FE49955A0FEA6C8FEBAD133842DA1CE730EEB7F
-Test: Encrypt
-Comment:    Set 3, vector 36
-Key:        24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424
-Plaintext:  2424242424242424242424242424242424242424242424242424242424242424
-Ciphertext: 9766D3F9E73987EE10A20605C8338C0759A7024CF2DF549DE5084EC4902C550A
-Test: Encrypt
-Comment:    Set 3, vector 37
-Key:        25252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525
-Plaintext:  2525252525252525252525252525252525252525252525252525252525252525
-Ciphertext: 0FFD89849C8EC5A46B8F43C799ED305AF602C73E810FC729A8C9BB0F5C55CD54
-Test: Encrypt
-Comment:    Set 3, vector 38
-Key:        26262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626
-Plaintext:  2626262626262626262626262626262626262626262626262626262626262626
-Ciphertext: 91956E101CE4546623A5BE49811F167476CB568972CEBF7A59EB27DA524A0C6B
-Test: Encrypt
-Comment:    Set 3, vector 39
-Key:        27272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727
-Plaintext:  2727272727272727272727272727272727272727272727272727272727272727
-Ciphertext: 7DEC5ECE0D590EE3E099C07F2DD6A6A9C71632D277803FD007275B93369ABED0
-Test: Encrypt
-Comment:    Set 3, vector 40
-Key:        28282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828
-Plaintext:  2828282828282828282828282828282828282828282828282828282828282828
-Ciphertext: 039C192AFC54EFDE1ED3610B0E9F95AA08D7CDC6AE71A66B5C508E4D14C038CF
-Test: Encrypt
-Comment:    Set 3, vector 41
-Key:        29292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929
-Plaintext:  2929292929292929292929292929292929292929292929292929292929292929
-Ciphertext: D558F8F4562BD8FE816FABF621556C8416C6FD00209028DF978F8915CC093E16
-Test: Encrypt
-Comment:    Set 3, vector 42
-Key:        2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A
-Plaintext:  2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A
-Ciphertext: 1AE21791ED4B610DD693012518759D6E9C1BBF206482EEA43470F02B493CFFB8
-Test: Encrypt
-Comment:    Set 3, vector 43
-Key:        2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
-Plaintext:  2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B
-Ciphertext: 34F2112E8FBD1B373BA8400B05321F658FDFE0DC87C1304C36766DE71840A4DF
-Test: Encrypt
-Comment:    Set 3, vector 44
-Key:        2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-Plaintext:  2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-Ciphertext: DBF9B56BBF2E50DF321CA687F8BE0E6222E7DF52B4A142174058CC119D9EC0DA
-Test: Encrypt
-Comment:    Set 3, vector 45
-Key:        2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
-Plaintext:  2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
-Ciphertext: 8B2757374F778FE0B30D11AD7116CE37E2AB858A4E1C50D1115B6E328F3635F5
-Test: Encrypt
-Comment:    Set 3, vector 46
-Key:        2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-Plaintext:  2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-Ciphertext: 06588A873366FAA47323C9A098A759718DFB0E310C91A4E38B42CC56A0757811
-Test: Encrypt
-Comment:    Set 3, vector 47
-Key:        2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F
-Plaintext:  2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F
-Ciphertext: 7B861B18E3F322D8000BDDCBCE3B50405AA923375568F16AE84411E91DB879C3
-Test: Encrypt
-Comment:    Set 3, vector 48
-Key:        30303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030
-Plaintext:  3030303030303030303030303030303030303030303030303030303030303030
-Ciphertext: 170F74A4D692C302551EE17CD544D65185112D2A5E812D203B36FC39BF1DA9C7
-Test: Encrypt
-Comment:    Set 3, vector 49
-Key:        31313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131
-Plaintext:  3131313131313131313131313131313131313131313131313131313131313131
-Ciphertext: 0178F59DDAB05A4DFAF66FD406170E08227096EF9712CB481A26EBD82F470D7A
-Test: Encrypt
-Comment:    Set 3, vector 50
-Key:        32323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232
-Plaintext:  3232323232323232323232323232323232323232323232323232323232323232
-Ciphertext: 8BAC479F3A92DF71F973AA457E19D75FB0F1A0FE68FF440A86154721BCC345D4
-Test: Encrypt
-Comment:    Set 3, vector 51
-Key:        33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333
-Plaintext:  3333333333333333333333333333333333333333333333333333333333333333
-Ciphertext: EB50A10C7A0ED9960CDE0C3EDB899A6B67324B1EE23DE4BB13F60D187C3CBA35
-Test: Encrypt
-Comment:    Set 3, vector 52
-Key:        34343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434
-Plaintext:  3434343434343434343434343434343434343434343434343434343434343434
-Ciphertext: 00AA782AC61FD06DC781E3C5662C65BD1043EC28D056C98F07074DA7C11C1E1F
-Test: Encrypt
-Comment:    Set 3, vector 53
-Key:        35353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535
-Plaintext:  3535353535353535353535353535353535353535353535353535353535353535
-Ciphertext: 23B9F2F26CFC51ECC6DD1AFE614C2DAE8348DA033F9B67AEAA87B71F5377D95D
-Test: Encrypt
-Comment:    Set 3, vector 54
-Key:        36363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636
-Plaintext:  3636363636363636363636363636363636363636363636363636363636363636
-Ciphertext: 9655D4B1CBEF855401274C3339C16DB9B5A9651F60579CFE8554B6EE25DCCA0E
-Test: Encrypt
-Comment:    Set 3, vector 55
-Key:        37373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737
-Plaintext:  3737373737373737373737373737373737373737373737373737373737373737
-Ciphertext: E072ED2DAD79B07C48B50ED31E02FD9705562525D49DBF45DACCFDF35D5A6965
-Test: Encrypt
-Comment:    Set 3, vector 56
-Key:        38383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838
-Plaintext:  3838383838383838383838383838383838383838383838383838383838383838
-Ciphertext: 287638BAE945B88A95029155BC47D033B5C5C4C191F079C234C6E97683FFABA0
-Test: Encrypt
-Comment:    Set 3, vector 57
-Key:        39393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939
-Plaintext:  3939393939393939393939393939393939393939393939393939393939393939
-Ciphertext: 500CD3B02BF6FA8C66D1ADE0CE43B325A759CD3426096084A261F054D798F885
-Test: Encrypt
-Comment:    Set 3, vector 58
-Key:        3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
-Plaintext:  3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
-Ciphertext: 17614BAB583F2DCF809A2AEE973A4875251B571525521B3A8C47303450B6301F
-Test: Encrypt
-Comment:    Set 3, vector 59
-Key:        3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
-Plaintext:  3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
-Ciphertext: 978C8DFD9AC74FF670CC8B31EDC8EC15DDBC2854375ED9BA07BB0F7B96C70BB3
-Test: Encrypt
-Comment:    Set 3, vector 60
-Key:        3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
-Plaintext:  3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
-Ciphertext: 994CA36F6230C7DB63CAD61342FAB3F155C361DAD458FC457AD09ACCAB2EB43F
-Test: Encrypt
-Comment:    Set 3, vector 61
-Key:        3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
-Plaintext:  3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
-Ciphertext: AC06659932208AC1DD5F07448A7407232F1410CDAC92F7C5305C4043C559345F
-Test: Encrypt
-Comment:    Set 3, vector 62
-Key:        3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
-Plaintext:  3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
-Ciphertext: B55616F0743A29655FEC468CD30C8C65F7925327665670BA9E41A2E09C05C63B
-Test: Encrypt
-Comment:    Set 3, vector 63
-Key:        3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
-Plaintext:  3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
-Ciphertext: 78F4852712C3547547A114E73F52C6128EDD3F29E0B2C938D6F9F69AF2303FD2
-Test: Encrypt
-Comment:    Set 3, vector 64
-Key:        40404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040
-Plaintext:  4040404040404040404040404040404040404040404040404040404040404040
-Ciphertext: C97909916EE86FFDCE8A92903046109B53F788A53039434DF1A394DAD6F697A2
-Test: Encrypt
-Comment:    Set 3, vector 65
-Key:        41414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141
-Plaintext:  4141414141414141414141414141414141414141414141414141414141414141
-Ciphertext: C3FD3C59D37D44AF9EE6B87AC0939A4A4B2FBAAC23E80E72B1CAC352FE30A8E2
-Test: Encrypt
-Comment:    Set 3, vector 66
-Key:        42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242
-Plaintext:  4242424242424242424242424242424242424242424242424242424242424242
-Ciphertext: 94C70F7654479BC9DA9854129F57F3E69C31B63900A404F577AF1C83CD96E5D6
-Test: Encrypt
-Comment:    Set 3, vector 67
-Key:        43434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343
-Plaintext:  4343434343434343434343434343434343434343434343434343434343434343
-Ciphertext: 71DD024E9CE700B373A275AA870A68B5DAD9E47D38BC18F34073319041A1CADF
-Test: Encrypt
-Comment:    Set 3, vector 68
-Key:        44444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444
-Plaintext:  4444444444444444444444444444444444444444444444444444444444444444
-Ciphertext: 274D101B2BD0E7CAFC9E5559DC68567DC8975056B84573C4294D78513B7406D8
-Test: Encrypt
-Comment:    Set 3, vector 69
-Key:        45454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545
-Plaintext:  4545454545454545454545454545454545454545454545454545454545454545
-Ciphertext: 8DCE5B5C376E42F11A322D8CBCEB8C0AE1EC24F3C65D72B326708FEAF13E3B51
-Test: Encrypt
-Comment:    Set 3, vector 70
-Key:        46464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646
-Plaintext:  4646464646464646464646464646464646464646464646464646464646464646
-Ciphertext: D62D3BA9BBD23F4424EB929AE7A4CD83A70FA7EFD2E6CCFED23E1176AFDB69CD
-Test: Encrypt
-Comment:    Set 3, vector 71
-Key:        47474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747
-Plaintext:  4747474747474747474747474747474747474747474747474747474747474747
-Ciphertext: FE7670925FEA3AAE1F039590EA230C094C3E434BF1350B12D4EA26E48A6EF7F0
-Test: Encrypt
-Comment:    Set 3, vector 72
-Key:        48484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848
-Plaintext:  4848484848484848484848484848484848484848484848484848484848484848
-Ciphertext: 3A57E728BFA31AA36C8E4ED38A34B465BA233AD066225F31651C93B870AAFE6D
-Test: Encrypt
-Comment:    Set 3, vector 73
-Key:        49494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949
-Plaintext:  4949494949494949494949494949494949494949494949494949494949494949
-Ciphertext: 3B56014035A28EA6F2F2B09429FED7FC0F5B76D5458F1EB4F3AAA7E7F6610C65
-Test: Encrypt
-Comment:    Set 3, vector 74
-Key:        4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A
-Plaintext:  4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A
-Ciphertext: 2D28A28ECABAC61B540CD933BE43AF16F11429EDE8E7B62121CD853054363730
-Test: Encrypt
-Comment:    Set 3, vector 75
-Key:        4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B
-Plaintext:  4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B
-Ciphertext: D8A892E3C24C6A2EB8446B3737A0E3AA1478811B819FFD3440B5307185906518
-Test: Encrypt
-Comment:    Set 3, vector 76
-Key:        4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C
-Plaintext:  4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C
-Ciphertext: 798AD5E43127299B61247059F508268CDBA78B46D4FD28C200AE1052C52294E7
-Test: Encrypt
-Comment:    Set 3, vector 77
-Key:        4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
-Plaintext:  4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D
-Ciphertext: 63F43065BA1F262D950219D71B9CD5FA78D6798BCAA981FE3391FF8EA735E4C7
-Test: Encrypt
-Comment:    Set 3, vector 78
-Key:        4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E
-Plaintext:  4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E
-Ciphertext: E8E461EB5FD98011A37765ECA336B080D58B35C636AD6F423893EE768913255C
-Test: Encrypt
-Comment:    Set 3, vector 79
-Key:        4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F
-Plaintext:  4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F
-Ciphertext: 7348E30FFC0C4F5569B6490622A34FB015C364944553582355887BC472279E8D
-Test: Encrypt
-Comment:    Set 3, vector 80
-Key:        50505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050
-Plaintext:  5050505050505050505050505050505050505050505050505050505050505050
-Ciphertext: BE28CB05EEEEDA8FD8971E9970ECBCA25856F66E95AC8B987C69F04BE3276CD7
-Test: Encrypt
-Comment:    Set 3, vector 81
-Key:        51515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151
-Plaintext:  5151515151515151515151515151515151515151515151515151515151515151
-Ciphertext: 5D336C5E34D4EB95CFAB87C542C72A748AA45E7F77D841A738017927C7908804
-Test: Encrypt
-Comment:    Set 3, vector 82
-Key:        52525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252
-Plaintext:  5252525252525252525252525252525252525252525252525252525252525252
-Ciphertext: 2942A594A7964F41460EB6037DDE2C28FFBFFB3C21F7EFF43F06632DA980ED8B
-Test: Encrypt
-Comment:    Set 3, vector 83
-Key:        53535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353535353
-Plaintext:  5353535353535353535353535353535353535353535353535353535353535353
-Ciphertext: 1C0F7A4E3147BC7F8150D8144ED31D0054FF15414E5DBF289BFEC160D22684AC
-Test: Encrypt
-Comment:    Set 3, vector 84
-Key:        54545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454
-Plaintext:  5454545454545454545454545454545454545454545454545454545454545454
-Ciphertext: 7931C7B9D78CB50610B1BEF596268B94446FCDA44C3EE7CEE53121AC519C4001
-Test: Encrypt
-Comment:    Set 3, vector 85
-Key:        55555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
-Plaintext:  5555555555555555555555555555555555555555555555555555555555555555
-Ciphertext: F4E331C357C603EE5ED5547D75B54631A68D7CD74C5075198D0FC38E5661F556
-Test: Encrypt
-Comment:    Set 3, vector 86
-Key:        56565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656
-Plaintext:  5656565656565656565656565656565656565656565656565656565656565656
-Ciphertext: 378C2887958E31971E8F59C882730E48407E4DA9C26D4C76B672CD53202AB1B8
-Test: Encrypt
-Comment:    Set 3, vector 87
-Key:        57575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757
-Plaintext:  5757575757575757575757575757575757575757575757575757575757575757
-Ciphertext: DBE68FE249F4A8D36E1CB49DBE20ED58649CCC502F85895875C1FE82269219DA
-Test: Encrypt
-Comment:    Set 3, vector 88
-Key:        58585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858
-Plaintext:  5858585858585858585858585858585858585858585858585858585858585858
-Ciphertext: 103BD780F3B382C4B28E6E1CB41CBEE22CC1BB64E4A0147D658EDA96A6E7FEAB
-Test: Encrypt
-Comment:    Set 3, vector 89
-Key:        59595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959
-Plaintext:  5959595959595959595959595959595959595959595959595959595959595959
-Ciphertext: 382EF838282E0F4BA729083542BB8CB48AB874FF568DFDA56AFC4ED266DD3243
-Test: Encrypt
-Comment:    Set 3, vector 90
-Key:        5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A
-Plaintext:  5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A
-Ciphertext: 088665DE8F9DC9298DEF4164C12526597F56859AAC2C96A95645A06014BA689A
-Test: Encrypt
-Comment:    Set 3, vector 91
-Key:        5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-Plaintext:  5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-Ciphertext: EC988946646A1B2DCC7EDEC4FCAB11BF29055A226F4C75D28F9DFB8D2EB5C9B6
-Test: Encrypt
-Comment:    Set 3, vector 92
-Key:        5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C
-Plaintext:  5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C
-Ciphertext: B77221CE7F68292BD4E3A55E8EC7BD1FC68B1B6B02F1008586248833C1089F5C
-Test: Encrypt
-Comment:    Set 3, vector 93
-Key:        5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D
-Plaintext:  5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D
-Ciphertext: B3E4AA5DE6D25A6237FDD97540191D669C64E54A7D3C544E949489355AFC82B5
-Test: Encrypt
-Comment:    Set 3, vector 94
-Key:        5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E
-Plaintext:  5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E
-Ciphertext: AAA6FA046AC4270B22A742C4C29445EB38511E5048414886EBF39523B7EAF76A
-Test: Encrypt
-Comment:    Set 3, vector 95
-Key:        5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F
-Plaintext:  5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F
-Ciphertext: 4D23440171778573BE7B515C68FA99D0426A32111CA493337E7C55280A90F697
-Test: Encrypt
-Comment:    Set 3, vector 96
-Key:        60606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060606060
-Plaintext:  6060606060606060606060606060606060606060606060606060606060606060
-Ciphertext: 8EE711FB281CBAA99917C85F0623B68E2EDAFEFCC3B1B841883D71BA6683568A
-Test: Encrypt
-Comment:    Set 3, vector 97
-Key:        61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161
-Plaintext:  6161616161616161616161616161616161616161616161616161616161616161
-Ciphertext: EC29DAE53DB4475F8900311F425FE60CB834A82F2A6A2DB4810F95F4D6991B84
-Test: Encrypt
-Comment:    Set 3, vector 98
-Key:        62626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262
-Plaintext:  6262626262626262626262626262626262626262626262626262626262626262
-Ciphertext: 91E58DDE741553572B5D6F3DAD25953906424FF217497226746A25C0CE1C7D0F
-Test: Encrypt
-Comment:    Set 3, vector 99
-Key:        63636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363
-Plaintext:  6363636363636363636363636363636363636363636363636363636363636363
-Ciphertext: B6EC4D9421AB011D4EEDBC32B289E45AC44CAEB1DC5FAEA752DFFA0137325067
-Test: Encrypt
-Comment:    Set 3, vector 100
-Key:        64646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464646464
-Plaintext:  6464646464646464646464646464646464646464646464646464646464646464
-Ciphertext: D9CB13EA06CADF09AC446F9B09553FFE3BF4F1152997B171C03E609D4BD60ADB
-Test: Encrypt
-Comment:    Set 3, vector 101
-Key:        65656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565
-Plaintext:  6565656565656565656565656565656565656565656565656565656565656565
-Ciphertext: 2D07CA161326ED154D9E3FF650963557EC369A91ABB0D49FC1F32AEF39A3B12E
-Test: Encrypt
-Comment:    Set 3, vector 102
-Key:        66666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666
-Plaintext:  6666666666666666666666666666666666666666666666666666666666666666
-Ciphertext: 28E8B606EE621D2C5B865B8208C7BD40C3596931CE3FF8FA5AD7EB8EE4480E95
-Test: Encrypt
-Comment:    Set 3, vector 103
-Key:        67676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767
-Plaintext:  6767676767676767676767676767676767676767676767676767676767676767
-Ciphertext: 9B9B3A23DA29539DA1E9BAA20449750EC192CE14A5063E1A2FFAF5039A665754
-Test: Encrypt
-Comment:    Set 3, vector 104
-Key:        68686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868
-Plaintext:  6868686868686868686868686868686868686868686868686868686868686868
-Ciphertext: D770E305A9C2D257759D8AE9E70C408D1CB090F976BBAFF3A56730A78BA8BF4F
-Test: Encrypt
-Comment:    Set 3, vector 105
-Key:        69696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969
-Plaintext:  6969696969696969696969696969696969696969696969696969696969696969
-Ciphertext: 453988B10DFD852D1AFD11E96C50024571CCB0F19E7C3C4981F8B8BDCD11F720
-Test: Encrypt
-Comment:    Set 3, vector 106
-Key:        6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A
-Plaintext:  6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A
-Ciphertext: 17DFD98CB5C24610DD631C4E2749A679D68F854F21AABE8BF67605A256452AD8
-Test: Encrypt
-Comment:    Set 3, vector 107
-Key:        6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B
-Plaintext:  6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B
-Ciphertext: DA260145EC80E19C18685540AC71FA460DD4427168E37BC6E0F967D90C306FBB
-Test: Encrypt
-Comment:    Set 3, vector 108
-Key:        6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C
-Plaintext:  6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C
-Ciphertext: 2AC246E2E384ECCC4BC69CE82EDB51C05DD864642F1E9A572DA6043DD1D56DF0
-Test: Encrypt
-Comment:    Set 3, vector 109
-Key:        6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D
-Plaintext:  6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D
-Ciphertext: D1A06B820071CC4122F0B0797A294F31922E26703CDEF15A6D8F511CDBD8BD3F
-Test: Encrypt
-Comment:    Set 3, vector 110
-Key:        6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E
-Plaintext:  6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E
-Ciphertext: C8D23274A1FF6AEBDF0BA70FBA7A895277B1CC8040F8FB2814195E3A7E85BD01
-Test: Encrypt
-Comment:    Set 3, vector 111
-Key:        6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F
-Plaintext:  6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F
-Ciphertext: E0133DC7960953BABC7BFBA52E88DCF86EBD979D6D63EB19466EEADEDEDEEBB3
-Test: Encrypt
-Comment:    Set 3, vector 112
-Key:        70707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070707070
-Plaintext:  7070707070707070707070707070707070707070707070707070707070707070
-Ciphertext: A1A9527766EE54D566D97E7A0763A5AECE86F2816411AC2066439D6BDF02FEA7
-Test: Encrypt
-Comment:    Set 3, vector 113
-Key:        71717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171
-Plaintext:  7171717171717171717171717171717171717171717171717171717171717171
-Ciphertext: E1833EF5C2BA2EF192642164F0F2C02A7334EF5AEA37E9DD56D17AE6CB031004
-Test: Encrypt
-Comment:    Set 3, vector 114
-Key:        72727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272
-Plaintext:  7272727272727272727272727272727272727272727272727272727272727272
-Ciphertext: DD2CC0EECAA7E5364376FA73E12C64A0C42FB9FC7E94EFF0B22A051D6EDFE905
-Test: Encrypt
-Comment:    Set 3, vector 115
-Key:        73737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373737373
-Plaintext:  7373737373737373737373737373737373737373737373737373737373737373
-Ciphertext: 9A72F15B911E6A50A32EEEDF83B62B628E37ED403085180571DEBEA2F37CF49F
-Test: Encrypt
-Comment:    Set 3, vector 116
-Key:        74747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474747474
-Plaintext:  7474747474747474747474747474747474747474747474747474747474747474
-Ciphertext: CD83CE7861EE8259A9C29BC3870EA1BF629ECD31F2E18F0BC12221F239207457
-Test: Encrypt
-Comment:    Set 3, vector 117
-Key:        75757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575757575
-Plaintext:  7575757575757575757575757575757575757575757575757575757575757575
-Ciphertext: 7B4218C5AEA4EEFE17E2AB110D8B63A947F21D5210162F6283EDDF00900CEE27
-Test: Encrypt
-Comment:    Set 3, vector 118
-Key:        76767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676
-Plaintext:  7676767676767676767676767676767676767676767676767676767676767676
-Ciphertext: 935DE2010B112937A233E7CB1023FB9D3C46D7C688A478A94F86AD3919FD2728
-Test: Encrypt
-Comment:    Set 3, vector 119
-Key:        77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777
-Plaintext:  7777777777777777777777777777777777777777777777777777777777777777
-Ciphertext: 416A91A68A520732E672ACB5A36599D9A99901F013CC460D9C2FB16AAB45996E
-Test: Encrypt
-Comment:    Set 3, vector 120
-Key:        78787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878
-Plaintext:  7878787878787878787878787878787878787878787878787878787878787878
-Ciphertext: FD066F9C65CD3D61B43F5DA44F7B94C85541DC5E09D52B044DA963699C39FDA0
-Test: Encrypt
-Comment:    Set 3, vector 121
-Key:        79797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979
-Plaintext:  7979797979797979797979797979797979797979797979797979797979797979
-Ciphertext: 63937A7953E453B6E48539FACBD1BC489E03D209DB188837C5A09BA458FFFB92
-Test: Encrypt
-Comment:    Set 3, vector 122
-Key:        7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A
-Plaintext:  7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A
-Ciphertext: 68F9EA0F87112633611052A45BBF32B7069079EDB16A928CD2AA16BE464178E3
-Test: Encrypt
-Comment:    Set 3, vector 123
-Key:        7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B
-Plaintext:  7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B
-Ciphertext: 874D5ED6C8052C3B4AB830626A195F508DDA15388BA75B3D957B26BC134C9B30
-Test: Encrypt
-Comment:    Set 3, vector 124
-Key:        7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C
-Plaintext:  7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C
-Ciphertext: EC3EA8DC433E39B85E4C4D68AC6A854A1B943D99EB2E9A018EA27DC1874CA867
-Test: Encrypt
-Comment:    Set 3, vector 125
-Key:        7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D
-Plaintext:  7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D
-Ciphertext: 9CE2298362F1F234A73BECA011EC31B4BC7E143D87B4F118CDADE6AB8D1ED783
-Test: Encrypt
-Comment:    Set 3, vector 126
-Key:        7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E
-Plaintext:  7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E
-Ciphertext: 27973D9B510ED9C612CC770FC1AE25EE21B1A9616CB64617EDA477939BE98D04
-Test: Encrypt
-Comment:    Set 3, vector 127
-Key:        7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
-Plaintext:  7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
-Ciphertext: 82A0EB8C058E727EBD6032F0F77EE693342C97BD44E9538032652B1CA10403DE
-Test: Encrypt
-Comment:    Set 3, vector 128
-Key:        80808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080
-Plaintext:  8080808080808080808080808080808080808080808080808080808080808080
-Ciphertext: C3C1CD5F3060B3EC4E6ABC0818B68449E1750FB482368C8F3305270E16F98735
-Test: Encrypt
-Comment:    Set 3, vector 129
-Key:        81818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181
-Plaintext:  8181818181818181818181818181818181818181818181818181818181818181
-Ciphertext: 26381852C68B646D80E53C958855293BDC6FAAA85C5F9CAAACABE7B8077E4F7A
-Test: Encrypt
-Comment:    Set 3, vector 130
-Key:        82828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282
-Plaintext:  8282828282828282828282828282828282828282828282828282828282828282
-Ciphertext: E2EA924898ED40FBD8C633706AD7D698392DF1EF33A10FDFCBE51B58C3AE0668
-Test: Encrypt
-Comment:    Set 3, vector 131
-Key:        83838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383
-Plaintext:  8383838383838383838383838383838383838383838383838383838383838383
-Ciphertext: 15CBDDA36707819D0C7694AAD46B2345BDEFC9D4F26F03A4BF860CE46F7BB53A
-Test: Encrypt
-Comment:    Set 3, vector 132
-Key:        84848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484
-Plaintext:  8484848484848484848484848484848484848484848484848484848484848484
-Ciphertext: F96318A42737AB884FAA82BBB7025063E9A25C5957F52A7342E0C03A1A64273C
-Test: Encrypt
-Comment:    Set 3, vector 133
-Key:        85858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585
-Plaintext:  8585858585858585858585858585858585858585858585858585858585858585
-Ciphertext: 7813FEB148D103075C80ACDFC95E2437A560D9B2E6C910E3A59805338E498907
-Test: Encrypt
-Comment:    Set 3, vector 134
-Key:        86868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686
-Plaintext:  8686868686868686868686868686868686868686868686868686868686868686
-Ciphertext: C7E9D5FE3BA11096AB77E715DFF0D2EB67E9136F0393CD004A7E994B3F994FA4
-Test: Encrypt
-Comment:    Set 3, vector 135
-Key:        87878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787
-Plaintext:  8787878787878787878787878787878787878787878787878787878787878787
-Ciphertext: F7D2DD8DF86A0E985CF6E83AA5922A548C83856D88C2C9D49EA962C9E6497949
-Test: Encrypt
-Comment:    Set 3, vector 136
-Key:        88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-Plaintext:  8888888888888888888888888888888888888888888888888888888888888888
-Ciphertext: C64887C6573E3D7F286C0353188FC93F05321C0C949ACDCB0237725576BCF77B
-Test: Encrypt
-Comment:    Set 3, vector 137
-Key:        89898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989
-Plaintext:  8989898989898989898989898989898989898989898989898989898989898989
-Ciphertext: 77FB97C9C953BE6BD58044FB1E095BB5E3F4B3A51DAFE6F2F7ADED0FB707921F
-Test: Encrypt
-Comment:    Set 3, vector 138
-Key:        8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A
-Plaintext:  8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A
-Ciphertext: 22DE5F20955357BA1BF70E4D6DA436CCDE28C228031E4A413882C918EF8082D1
-Test: Encrypt
-Comment:    Set 3, vector 139
-Key:        8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B
-Plaintext:  8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B
-Ciphertext: 146FF5907A3C58593C3FD3EB7498C4426CCE04DD0DA9138954BB97AAC821D87F
-Test: Encrypt
-Comment:    Set 3, vector 140
-Key:        8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-Plaintext:  8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-Ciphertext: 474ADC5855C87504A7C859409E25154D94B05A925F1D9989AE653B5511710BD7
-Test: Encrypt
-Comment:    Set 3, vector 141
-Key:        8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D
-Plaintext:  8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D
-Ciphertext: 959B1090C1FF59998C100814E95E40EF94C6F2B7ED0425C78391192CFFFFA465
-Test: Encrypt
-Comment:    Set 3, vector 142
-Key:        8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E
-Plaintext:  8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E
-Ciphertext: 9DA473108FFCECB228F8809860CDA316F4E1FAC5ADC39BB0373F01DCEBCBF271
-Test: Encrypt
-Comment:    Set 3, vector 143
-Key:        8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F
-Plaintext:  8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F
-Ciphertext: 905FD0302F9F3C4296E15F94EDD72A8F9F4E9E4068F068099CAAE7247235847E
-Test: Encrypt
-Comment:    Set 3, vector 144
-Key:        90909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090909090
-Plaintext:  9090909090909090909090909090909090909090909090909090909090909090
-Ciphertext: B63B82FB4B4961E4800FD13CAF145BEBF3625822AF7F5D3ACF2A4506471C636D
-Test: Encrypt
-Comment:    Set 3, vector 145
-Key:        91919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191919191
-Plaintext:  9191919191919191919191919191919191919191919191919191919191919191
-Ciphertext: 63AA9822C7A5A6777D03F901E3BAF91FD566553C88835EF06DB9A983212288BF
-Test: Encrypt
-Comment:    Set 3, vector 146
-Key:        92929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292929292
-Plaintext:  9292929292929292929292929292929292929292929292929292929292929292
-Ciphertext: 5417F10E4028BDE0F741114632E2090A1E6C83ACB1D03EA98D18D003838B4F0A
-Test: Encrypt
-Comment:    Set 3, vector 147
-Key:        93939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393939393
-Plaintext:  9393939393939393939393939393939393939393939393939393939393939393
-Ciphertext: FD2C478FB17EE8520149E8A242BB07E0B32929536B191AC6DBCE05891C5E4BFC
-Test: Encrypt
-Comment:    Set 3, vector 148
-Key:        94949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494949494
-Plaintext:  9494949494949494949494949494949494949494949494949494949494949494
-Ciphertext: 6A36A092BC0F029B60D40440F141EF0DC21A241547359FB618E9243C39AE3D7C
-Test: Encrypt
-Comment:    Set 3, vector 149
-Key:        95959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595
-Plaintext:  9595959595959595959595959595959595959595959595959595959595959595
-Ciphertext: 605BC400A0FEE12092D369142E4D20C3A4F3D7623254BF9E242766946FC47ED1
-Test: Encrypt
-Comment:    Set 3, vector 150
-Key:        96969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696969696
-Plaintext:  9696969696969696969696969696969696969696969696969696969696969696
-Ciphertext: 6A5FA33652F946D7C93A56D15B5D3807401C667A9757495341F78526D58659D2
-Test: Encrypt
-Comment:    Set 3, vector 151
-Key:        97979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797979797
-Plaintext:  9797979797979797979797979797979797979797979797979797979797979797
-Ciphertext: 5C6AC175B74B9F7F7D6371A90B1F35E1276628DF6A82B0ECE38590C88B7B8DCA
-Test: Encrypt
-Comment:    Set 3, vector 152
-Key:        98989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898
-Plaintext:  9898989898989898989898989898989898989898989898989898989898989898
-Ciphertext: 67BB4E7818FBE6CFAB113C1B2EC797E3164432BFF708450312422D5AEC70A8A8
-Test: Encrypt
-Comment:    Set 3, vector 153
-Key:        99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
-Plaintext:  9999999999999999999999999999999999999999999999999999999999999999
-Ciphertext: BFDA13CA82E73FBF62B6F1BB7181916CE7FD7DC7608EB958A8246346DFBB04E9
-Test: Encrypt
-Comment:    Set 3, vector 154
-Key:        9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A
-Plaintext:  9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A
-Ciphertext: C30F3EF137BF7718F76C7E4D2366A48E7C3CE53735BBF8B56CD51609A23AC06C
-Test: Encrypt
-Comment:    Set 3, vector 155
-Key:        9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B
-Plaintext:  9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B
-Ciphertext: D73795A681B4FBE858703C15D60299682F64C800E691D223C4BE51012DA4D3DA
-Test: Encrypt
-Comment:    Set 3, vector 156
-Key:        9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C
-Plaintext:  9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C
-Ciphertext: 885A096C820E01E48E1A5F75DB0A007C2A96B66FCAB38AE80CF92DD8B6A35F6F
-Test: Encrypt
-Comment:    Set 3, vector 157
-Key:        9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D
-Plaintext:  9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D
-Ciphertext: 8FBDD4939C31026305C575F1FDCED3DBAE320C56CF064E9F19B44A43898BFD5C
-Test: Encrypt
-Comment:    Set 3, vector 158
-Key:        9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E
-Plaintext:  9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E
-Ciphertext: 2D9EC00B081BC1512EC11A0B8B898639415AEEA3270C4B49E4B47C601AB85875
-Test: Encrypt
-Comment:    Set 3, vector 159
-Key:        9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
-Plaintext:  9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
-Ciphertext: 59565FB9888519C77E9C4E86D72AD86205AB55488D5ED0B9A388FB2D301C4400
-Test: Encrypt
-Comment:    Set 3, vector 160
-Key:        A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0
-Plaintext:  A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0
-Ciphertext: 32D6CAA3D5E0A5D3CCD0FD8F2105CFF662FC4052FE348C2DFD0BC3EEFF3AB700
-Test: Encrypt
-Comment:    Set 3, vector 161
-Key:        A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1
-Plaintext:  A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1A1
-Ciphertext: 7C3276EA6BB6FDDDEC8B901C45978B7D4D34AACE9F2D02F7D7F5826A89809DE9
-Test: Encrypt
-Comment:    Set 3, vector 162
-Key:        A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2
-Plaintext:  A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2
-Ciphertext: C5ABC33559D828DD1464264F94D46A8519B4CE47EAA0EC9BF0504C876AC85451
-Test: Encrypt
-Comment:    Set 3, vector 163
-Key:        A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3
-Plaintext:  A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3
-Ciphertext: E63050ADB9F2789F91A192E089883D7346DD42DE4C654E1D4B72C77D6C09FDB0
-Test: Encrypt
-Comment:    Set 3, vector 164
-Key:        A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4
-Plaintext:  A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4
-Ciphertext: E7C58AF118E1DFD2A279DE640EDEF02FB4F3C78D778D145ECC6B2C4CCD065229
-Test: Encrypt
-Comment:    Set 3, vector 165
-Key:        A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5
-Plaintext:  A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5
-Ciphertext: 278D8C11ACFDB851131432B3E19C409F940F93E0F6CB49D076C62E70B9C27095
-Test: Encrypt
-Comment:    Set 3, vector 166
-Key:        A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6
-Plaintext:  A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6A6
-Ciphertext: D4839B5679FCA83189BB8C3681E83BAC871A02F297578855034E915F4EF04C12
-Test: Encrypt
-Comment:    Set 3, vector 167
-Key:        A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7
-Plaintext:  A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7A7
-Ciphertext: 91AFF6474168F1D113E3DC66E620CF2F7283CE84F5FDDECC7E79CC005859C1BA
-Test: Encrypt
-Comment:    Set 3, vector 168
-Key:        A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
-Plaintext:  A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8A8
-Ciphertext: 1374026DD442B1C1E0BA34570240F6A9E99781C8307A1544A9D3C91857C7E6E1
-Test: Encrypt
-Comment:    Set 3, vector 169
-Key:        A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9
-Plaintext:  A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9A9
-Ciphertext: C95E8163D47755E25E8A4BA1FDFF46E016F080F13A794FD21251CE238F28C52E
-Test: Encrypt
-Comment:    Set 3, vector 170
-Key:        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Plaintext:  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Ciphertext: 5DA751854BEEDB19D767A09E2BD9C12D15E51A4409A1F70574496D0A0DA767F9
-Test: Encrypt
-Comment:    Set 3, vector 171
-Key:        ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB
-Plaintext:  ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB
-Ciphertext: C1A0ADDB98DA358D8F40CDB8FA427770D6BD5705D81A804A9BA27FFAE8790BD1
-Test: Encrypt
-Comment:    Set 3, vector 172
-Key:        ACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACAC
-Plaintext:  ACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACAC
-Ciphertext: 604830D513CB29E0E89A36EAB97FFDFC0855AE212F9DDAB62ABE7572CBCEBFC5
-Test: Encrypt
-Comment:    Set 3, vector 173
-Key:        ADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADAD
-Plaintext:  ADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADAD
-Ciphertext: 0DB5075E0B9727D439ED88030D31B532B61556D206220CAE70A7B42EE4C5F72E
-Test: Encrypt
-Comment:    Set 3, vector 174
-Key:        AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE
-Plaintext:  AEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAE
-Ciphertext: A5167DC20ED3B1894B10C6AA754FDCF9FC1418439D9CA80C40974E9CB7630A12
-Test: Encrypt
-Comment:    Set 3, vector 175
-Key:        AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF
-Plaintext:  AFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAF
-Ciphertext: 1A90CCEA061A2FB58E4D1F363B6CEEC26BFB55F4F140A18991C8EF50E8DFB306
-Test: Encrypt
-Comment:    Set 3, vector 176
-Key:        B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0
-Plaintext:  B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0
-Ciphertext: 5CED17D75543C21AA1E020D4B084DB86A77BC445C7E77DA54DC6D786A0976A09
-Test: Encrypt
-Comment:    Set 3, vector 177
-Key:        B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1
-Plaintext:  B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1
-Ciphertext: BB28F1F9496ED578276F99F3A2D4657566DC2CDDDCF00AE44555DA614C64E54E
-Test: Encrypt
-Comment:    Set 3, vector 178
-Key:        B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2
-Plaintext:  B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2
-Ciphertext: 30C28BF86BEAEBB25F4A667FB2B9C183B85B456527EB49B44AA4EA825A44E026
-Test: Encrypt
-Comment:    Set 3, vector 179
-Key:        B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3
-Plaintext:  B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3
-Ciphertext: C2B0DEB4BC6C28869675FB75D2C2081396601B1FA823185D2D9EDE0730BBEAEA
-Test: Encrypt
-Comment:    Set 3, vector 180
-Key:        B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4
-Plaintext:  B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4B4
-Ciphertext: B3EDC667C3FD03CE50D05877C8A78C330F809DF5F8F7FB11968A3664C77CA78B
-Test: Encrypt
-Comment:    Set 3, vector 181
-Key:        B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5
-Plaintext:  B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5
-Ciphertext: BC2FCF90C52B883CAC3F0A673FA093EEB48952F4DE50A9288464B84A920A1316
-Test: Encrypt
-Comment:    Set 3, vector 182
-Key:        B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6
-Plaintext:  B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6B6
-Ciphertext: 30BCF4063A59823CE94B14B6B65F1B4DBEED8FB30832765B5186F4B834DBEA89
-Test: Encrypt
-Comment:    Set 3, vector 183
-Key:        B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7
-Plaintext:  B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7
-Ciphertext: 51B4C7E8F697FACC24294A2CEB404C4BEC0CA41C76A6B50A824800EA4464C796
-Test: Encrypt
-Comment:    Set 3, vector 184
-Key:        B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8
-Plaintext:  B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8B8
-Ciphertext: 2CCFF61604C0881CCC6A69B885878D6D07CEA7DAB31719D89DC4ECB0063DF5D2
-Test: Encrypt
-Comment:    Set 3, vector 185
-Key:        B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9
-Plaintext:  B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9
-Ciphertext: 87998D9F16DC018B5DBD42A2E0C26D3774C2A41986E2D0A1504CE37B6EE71688
-Test: Encrypt
-Comment:    Set 3, vector 186
-Key:        BABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABA
-Plaintext:  BABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABA
-Ciphertext: D774451BB82A62A4C7708D0194F6C129C483CEFD182BAADF5A35EB77892F317A
-Test: Encrypt
-Comment:    Set 3, vector 187
-Key:        BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-Plaintext:  BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-Ciphertext: B88CE3DF52572A1A1C8253E05D789BBF204E2CFC7A00389429F4C6B428EF8CD6
-Test: Encrypt
-Comment:    Set 3, vector 188
-Key:        BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC
-Plaintext:  BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC
-Ciphertext: B854E538E6674A1831F635AA6650A0A4D0730A9A4B12511509EFD49E34D57D62
-Test: Encrypt
-Comment:    Set 3, vector 189
-Key:        BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD
-Plaintext:  BDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBD
-Ciphertext: A69EF2348FEEF1EA09A2B29A6D977092ECD522A62EE906FA47624C92A872EB17
-Test: Encrypt
-Comment:    Set 3, vector 190
-Key:        BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE
-Plaintext:  BEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE
-Ciphertext: A1AE0CBC3B5200F1D8AE165EE42D45F6CE8C4FF448F8127B6D9AB4936FC76CA8
-Test: Encrypt
-Comment:    Set 3, vector 191
-Key:        BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF
-Plaintext:  BFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBF
-Ciphertext: 91948E36B83E21FF8A5EEDAA48E50E3A292A3B68D20657FA7E11F50BC7A12205
-Test: Encrypt
-Comment:    Set 3, vector 192
-Key:        C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
-Plaintext:  C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
-Ciphertext: 56CD17219224C3103E3E3E5CABAB6C1E78DEA9AD27613E8D62901FFA31500BFF
-Test: Encrypt
-Comment:    Set 3, vector 193
-Key:        C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1
-Plaintext:  C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1C1
-Ciphertext: 2E8FE5CAB2448B194387B160E9141E7D1B879BA1580B3D393B55436608EA2735
-Test: Encrypt
-Comment:    Set 3, vector 194
-Key:        C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2
-Plaintext:  C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2
-Ciphertext: 5DD74E1155DD90840C702145DF6912754FB74B47625EA4C5382326681DB3390E
-Test: Encrypt
-Comment:    Set 3, vector 195
-Key:        C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3
-Plaintext:  C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3
-Ciphertext: 3A9F5962554037DCB1FA2AD04BFC0BF79699941500D5F9841320C6D8601310A2
-Test: Encrypt
-Comment:    Set 3, vector 196
-Key:        C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4
-Plaintext:  C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4C4
-Ciphertext: BB0F5B68087BBA51DBB700BA1860CC3D0A587E54D57F4014DE4E48E58E529F87
-Test: Encrypt
-Comment:    Set 3, vector 197
-Key:        C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5
-Plaintext:  C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5C5
-Ciphertext: 8384025D801AB8EC4D4416F5B7E862B6D9AC9E4AEE334C35FD0296B1402E4975
-Test: Encrypt
-Comment:    Set 3, vector 198
-Key:        C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6
-Plaintext:  C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6C6
-Ciphertext: BE3057511C5D0E51315D89671BB4E57E7B590EC3ECE8A14D728248ED8F5107BB
-Test: Encrypt
-Comment:    Set 3, vector 199
-Key:        C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7
-Plaintext:  C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7C7
-Ciphertext: 18882618837D15B0B6BD77E1F37470EC58155A2788BDD9D91AEBD16B29A92A1B
-Test: Encrypt
-Comment:    Set 3, vector 200
-Key:        C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8
-Plaintext:  C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8
-Ciphertext: 8FAFDDC7E04C1AF3BBE8428222DCA59D2EF8C9E0213430492ECAB7B414987FEF
-Test: Encrypt
-Comment:    Set 3, vector 201
-Key:        C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9
-Plaintext:  C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9C9
-Ciphertext: 4D687992D4F9F515FE451AC967CBF75F906D637C3C261758E263A0DA0DEF69C2
-Test: Encrypt
-Comment:    Set 3, vector 202
-Key:        CACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACA
-Plaintext:  CACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACACA
-Ciphertext: 9DDC94BFF87FDBAFDB0AB9DC17D3649231300E5E6270600856722324DC9CA39A
-Test: Encrypt
-Comment:    Set 3, vector 203
-Key:        CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB
-Plaintext:  CBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCB
-Ciphertext: 86E9CCD90D7B902D23D82C085B1F886402DBD2D19C5A81A32F318C98C6E2A98A
-Test: Encrypt
-Comment:    Set 3, vector 204
-Key:        CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-Plaintext:  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-Ciphertext: 164FCD7D1FFE12FF1FDEE6384145EF546A5CD98C22817A5205FF2C2E18339779
-Test: Encrypt
-Comment:    Set 3, vector 205
-Key:        CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD
-Plaintext:  CDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCD
-Ciphertext: 4579935A483BAC6B4CCD8C25BCC9E6DEAF46EA8B53F8B5E37CC436EAB85A1330
-Test: Encrypt
-Comment:    Set 3, vector 206
-Key:        CECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECE
-Plaintext:  CECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECE
-Ciphertext: E5F810DF5B215F559E76EF925F2B795915A7B03A6F7019FAC8E9127A7CE93F09
-Test: Encrypt
-Comment:    Set 3, vector 207
-Key:        CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF
-Plaintext:  CFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCF
-Ciphertext: 2EA0892E2B2F29A63526B37DECD18E31DC970A60E60A4D8414A5BD0D2D5491EF
-Test: Encrypt
-Comment:    Set 3, vector 208
-Key:        D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0
-Plaintext:  D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0
-Ciphertext: 900F155E80A716199EB062827CDDDC4DA857550BA1C265A46D47BE4024706F40
-Test: Encrypt
-Comment:    Set 3, vector 209
-Key:        D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1
-Plaintext:  D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1D1
-Ciphertext: 5B495546838A97D8DF4B9CA95EF8350210A3ECAB81469678EBDE1E5846C1F42D
-Test: Encrypt
-Comment:    Set 3, vector 210
-Key:        D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2
-Plaintext:  D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2
-Ciphertext: 60E7E367347BC3F4091CE34CCA288C8AFC6375ED8F4394D904FD8489280D50F1
-Test: Encrypt
-Comment:    Set 3, vector 211
-Key:        D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3
-Plaintext:  D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3
-Ciphertext: F215EED91D35B7BA649F05C3D1E2B254CB1215588AB78DF54F3CA221AB4A3F1B
-Test: Encrypt
-Comment:    Set 3, vector 212
-Key:        D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4
-Plaintext:  D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4D4
-Ciphertext: 6441A445D808842C6185B81ACBC5AF86386C54C79026BFC21C1DB5111362AA15
-Test: Encrypt
-Comment:    Set 3, vector 213
-Key:        D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5
-Plaintext:  D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5
-Ciphertext: 4EE459EDAC1FE0CB08E80C8C13FCE8C44CBFECF7A7F9F14C15B5A92BB7F34E71
-Test: Encrypt
-Comment:    Set 3, vector 214
-Key:        D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6
-Plaintext:  D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6D6
-Ciphertext: 78826499B0F2F402E6DA3CACA36EA35492B7BD2A4D84575D0432E16368E78808
-Test: Encrypt
-Comment:    Set 3, vector 215
-Key:        D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
-Plaintext:  D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7
-Ciphertext: BDFBCAE2761BEF6A411156AE01A63F9321EE969C56043F2A44C5D3D4BB017BC0
-Test: Encrypt
-Comment:    Set 3, vector 216
-Key:        D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8
-Plaintext:  D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8D8
-Ciphertext: 926F2CD84035F9070C3506E6D7245FEA9A845F2D355785BB17E1D3C34FA81228
-Test: Encrypt
-Comment:    Set 3, vector 217
-Key:        D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9
-Plaintext:  D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9D9
-Ciphertext: 6C5F6B1C746967142D55FA3769A9417D5A44875D364DB4412B4F9EB254D9BB89
-Test: Encrypt
-Comment:    Set 3, vector 218
-Key:        DADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADA
-Plaintext:  DADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADA
-Ciphertext: 8329A1E54D9F45DB4E8CE6F1B481C3EE00D5511B52B3CDADCBD562A9F1B35770
-Test: Encrypt
-Comment:    Set 3, vector 219
-Key:        DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB
-Plaintext:  DBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDBDB
-Ciphertext: 7A7FEEDEF1950F1A60529743163406CAF167097358377E0650CF0BB35CD783F6
-Test: Encrypt
-Comment:    Set 3, vector 220
-Key:        DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
-Plaintext:  DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
-Ciphertext: C52CFB15D2F53156701AE4951AA46BCFC872252447BB14E1CE19CAC074926984
-Test: Encrypt
-Comment:    Set 3, vector 221
-Key:        DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-Plaintext:  DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-Ciphertext: 79DFF8DC12ABCEC71E7FAE55ABC8C374135ECE2D52834BC77B860252B756D54A
-Test: Encrypt
-Comment:    Set 3, vector 222
-Key:        DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE
-Plaintext:  DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE
-Ciphertext: 62963B66E680BD5602EC86DB7267E15CB1FF6EA698B54EBA661D125400C7F2DD
-Test: Encrypt
-Comment:    Set 3, vector 223
-Key:        DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF
-Plaintext:  DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF
-Ciphertext: 0C2E76743ACC9CC0525D6E2C519D12C369CFA9E27F13068F98D2F32FAD7220CB
-Test: Encrypt
-Comment:    Set 3, vector 224
-Key:        E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0
-Plaintext:  E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0
-Ciphertext: B464640E72C30DF092A5BB00F34568A7C04B8620265EDA53F19F3A06164AF980
-Test: Encrypt
-Comment:    Set 3, vector 225
-Key:        E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1
-Plaintext:  E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1
-Ciphertext: 3725215E79F1FE3DC64B4316449FF98EB52D03330BFC848CD83A407475AADA3A
-Test: Encrypt
-Comment:    Set 3, vector 226
-Key:        E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
-Plaintext:  E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
-Ciphertext: BA273F544C5076D523CC75F90E315A39E465D2B25434E6577FE629F27061BBA4
-Test: Encrypt
-Comment:    Set 3, vector 227
-Key:        E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3
-Plaintext:  E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3
-Ciphertext: 472161A0F42E64BD0FE6D448996C370E2C3A56BDE16B378EAA31740551121B4E
-Test: Encrypt
-Comment:    Set 3, vector 228
-Key:        E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4
-Plaintext:  E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4E4
-Ciphertext: EA089A10A597504D057E1F03064C9465C1A707C9472A7C0DBAD6978F5BB83A46
-Test: Encrypt
-Comment:    Set 3, vector 229
-Key:        E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
-Plaintext:  E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5E5
-Ciphertext: E91B3433426F88FA31A05E17906E55EA1D803ADFE080C51FBD98290CBF427BEF
-Test: Encrypt
-Comment:    Set 3, vector 230
-Key:        E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6
-Plaintext:  E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6E6
-Ciphertext: 747C4999D0256384349A5FB132DE1AAD4D7FC48507FEC206B80ED429AF7FDBDB
-Test: Encrypt
-Comment:    Set 3, vector 231
-Key:        E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7
-Plaintext:  E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7E7
-Ciphertext: 3F8058A1A9B7B0A9C31B4670EEAA6988BF2D41E9B3417EF899EF12CBBC9C77DE
-Test: Encrypt
-Comment:    Set 3, vector 232
-Key:        E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8
-Plaintext:  E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8
-Ciphertext: 9DA431EC0DADDEC4A76B3830B20AA03D346AD09691FB98FC0E9A8987F7B70EDF
-Test: Encrypt
-Comment:    Set 3, vector 233
-Key:        E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9
-Plaintext:  E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9E9
-Ciphertext: 63BF528E184A43EF807DC9169BDB9CD7B63EE144478A4735EC2EE3A5A7EE460A
-Test: Encrypt
-Comment:    Set 3, vector 234
-Key:        EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA
-Plaintext:  EAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEAEA
-Ciphertext: 73DC5F8AFA9493AD7767D15A36E7741044EFC225136B4972DC5294E80071A64D
-Test: Encrypt
-Comment:    Set 3, vector 235
-Key:        EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB
-Plaintext:  EBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEB
-Ciphertext: 7EEE75D690458A604D20CD21ED64B228F0C3563DB8FB925341FC02845B6E06BA
-Test: Encrypt
-Comment:    Set 3, vector 236
-Key:        ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC
-Plaintext:  ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC
-Ciphertext: AA4D9E1A0157AC347DC7A1997718944427BD579DC18B94F181390E8C36A1305C
-Test: Encrypt
-Comment:    Set 3, vector 237
-Key:        EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED
-Plaintext:  EDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDED
-Ciphertext: 1695BC5C3D63F4B0E0BC3225F00BB0B8E8D29F3DC09584353E11510002E2BE53
-Test: Encrypt
-Comment:    Set 3, vector 238
-Key:        EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-Plaintext:  EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-Ciphertext: C68C7A2FBDA419A515AE816480490BFB2A72A4B6534A19A8D8C6C85FAA949567
-Test: Encrypt
-Comment:    Set 3, vector 239
-Key:        EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF
-Plaintext:  EFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEF
-Ciphertext: 5F45E7F72A64C66269F83714A88A0701561C3E7AF33BB48887D4439F5DE4A82D
-Test: Encrypt
-Comment:    Set 3, vector 240
-Key:        F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
-Plaintext:  F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
-Ciphertext: AD49A5C8EB06256147F02301FB47710E915B5A8FC3219C0D56A19382977119FC
-Test: Encrypt
-Comment:    Set 3, vector 241
-Key:        F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-Plaintext:  F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-Ciphertext: 2387AF70EE04E7F25277E81081B044EA24090D503CE8F64997BB610C762D8F6F
-Test: Encrypt
-Comment:    Set 3, vector 242
-Key:        F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
-Plaintext:  F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
-Ciphertext: B5D496DD36BA0B47832C170A53760CE5E47B1FF5C28848F5F7A1827E94BC73CB
-Test: Encrypt
-Comment:    Set 3, vector 243
-Key:        F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
-Plaintext:  F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
-Ciphertext: 77978F2EAB7E8B6B32C9293B83F51419785A0CD276276CB417ACA806A456A6AE
-Test: Encrypt
-Comment:    Set 3, vector 244
-Key:        F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
-Plaintext:  F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
-Ciphertext: E3CBD41F80B27C9A684D7C7C27BBCA9FD59E5E81E93B7BC5BFDF66722EF68EEE
-Test: Encrypt
-Comment:    Set 3, vector 245
-Key:        F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5
-Plaintext:  F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5
-Ciphertext: 4482F0C362CB423104CAA26E1415B0B7519E1189624D313E65D324C6DC95F516
-Test: Encrypt
-Comment:    Set 3, vector 246
-Key:        F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6
-Plaintext:  F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6F6
-Ciphertext: CD72EE9A6919348595286348C7E488DB3648458688F72BAD994B26FE6999E676
-Test: Encrypt
-Comment:    Set 3, vector 247
-Key:        F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7
-Plaintext:  F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7
-Ciphertext: 03EF38F91710AE8BCC8B9193F6A55A7C90C66300D20EDCF5B4946F3B38BEF6C5
-Test: Encrypt
-Comment:    Set 3, vector 248
-Key:        F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8
-Plaintext:  F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8
-Ciphertext: B67638D30578AB2319FE275D0B833B50D7ABF01E8760F566D0D441D8EAFDF8AA
-Test: Encrypt
-Comment:    Set 3, vector 249
-Key:        F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9
-Plaintext:  F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9
-Ciphertext: 98B05FF6042436505C7163415E187E09F10C3B1A86FA4B458CE1EF31022F5D16
-Test: Encrypt
-Comment:    Set 3, vector 250
-Key:        FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA
-Plaintext:  FAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFAFA
-Ciphertext: B670A350A2CF0478412307EF00F97F8B30175CDB7593FF4686BD614B41444342
-Test: Encrypt
-Comment:    Set 3, vector 251
-Key:        FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB
-Plaintext:  FBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFBFB
-Ciphertext: D7FD492E6302265C24FAB910AA1335C29D53406147E853F7604F4AF1A9407E83
-Test: Encrypt
-Comment:    Set 3, vector 252
-Key:        FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
-Plaintext:  FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
-Ciphertext: 28926789363A4306E2C75FD1D8FDF0FE6B62FDB2AFAEDDA6F47A565C2781968B
-Test: Encrypt
-Comment:    Set 3, vector 253
-Key:        FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
-Plaintext:  FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD
-Ciphertext: 813C816CD4B18F20BD06E2E93CFAA717EBB6554B556CC33D67530608A9BF100F
-Test: Encrypt
-Comment:    Set 3, vector 254
-Key:        FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
-Plaintext:  FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
-Ciphertext: 5DC15C83E7C4F5AAF8D8482ED1E443271B28B59288783DBCDDEC3544E3368A6E
-Test: Encrypt
-Comment:    Set 3, vector 255
-Key:        FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-Plaintext:  FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-Ciphertext: 0598127BAF11706F77402000D730C54A0B84C868A98C6CA4D7F3C0FA06A78B7A
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/sosemanuk.txt b/src-cryptopp/TestVectors/sosemanuk.txt
deleted file mode 100644
index 9b8313e..0000000
--- a/src-cryptopp/TestVectors/sosemanuk.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-AlgorithmType: SymmetricCipher
-Source: Sosemanuk reference implementation, compiled with -DSOSEMANUK_VECTOR
-Key: A7C083FEB7
-IV: 00112233445566778899AABBCCDDEEFF
-Name: Sosemanuk
-Plaintext: r160 00
-Ciphertext: \
- FE 81 D2 16 2C 9A 10 0D 04 89 5C 45 4A 77 51 5B\
- BE 6A 43 1A 93 5C B9 0E 22 21 EB B7 EF 50 23 28\
- 94 35 39 49 2E FF 63 10 C8 71 05 4C 28 89 CC 72\
- 8F 82 E8 6B 1A FF F4 33 4B 61 27 A1 3A 15 5C 75\
- 15 16 30 BD 48 2E B6 73 FF 5D B4 77 FA 6C 53 EB\
- E1 A4 EC 38 C2 3C 54 00 C3 15 45 5D 93 A2 AC ED\
- 95 98 60 47 27 FA 34 0D 5F 2A 8B D7 57 B7 78 33\
- F7 4B D2 BC 04 93 13 C8 06 16 B4 A0 62 68 AE 35\
- 0D B9 2E EC 4F A5 6C 17 13 74 A6 7A 80 C0 06 D0\
- EA D0 48 CE 7B 64 0F 17 D3 D5 A6 2D 1F 25 1C 21
-Test: Encrypt
-Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/sosemanuk/unverified.test-vectors?rev=189&view=auto
-Comment: Set 6, vector#  3
-Key: 0F62B5085BAE0154A7FA4DA0F34699EC3F92E5388BDE3184D72A7DD02376C91C
-IV: 288FF65DC42B92F960C72E95FC63CA31
-Plaintext: r131072 00
-CiphertextXorDigest: CC09FB7405DD54BBF09407B1D2033FBBAC53F388DD387A46F2B8FCFF692A7838353523A621A55D08DA0CA5348AE96D8B0D6A028F309982EF6628054D01B9A368
-Test: EncryptXorDigest
diff --git a/src-cryptopp/TestVectors/tea.txt b/src-cryptopp/TestVectors/tea.txt
deleted file mode 100644
index dfa6b02..0000000
--- a/src-cryptopp/TestVectors/tea.txt
+++ /dev/null
@@ -1,711 +0,0 @@
-AlgorithmType: SymmetricCipher
-Name: TEA/ECB
-Source: http://www.cix.co.uk/~klockstone/teavect.htm
-Comment: test   1
-Plaintext: 00000000 00000000
-Key: 00000000 00000000 00000000 00000000
-Ciphertext: 41ea3a0a 94baa940
-Test: Encrypt
-Comment: test   2
-Plaintext: 94baa940 00000000
-Key: 00000000 00000000 00000000 41ea3a0a
-Ciphertext: 4e8e7829 7d8236d8
-Test: Encrypt
-Comment: test   3
-Plaintext: 7d8236d8 00000000
-Key: 00000000 00000000 41ea3a0a 4e8e7829
-Ciphertext: c88ba95e e7edac02
-Test: Encrypt
-Comment: test   4
-Plaintext: e7edac02 00000000
-Key: 00000000 41ea3a0a 4e8e7829 c88ba95e
-Ciphertext: b84e28af b6b62088
-Test: Encrypt
-Comment: test   5
-Plaintext: b6b62088 00000000
-Key: 41ea3a0a 4e8e7829 c88ba95e b84e28af
-Ciphertext: a0a47295 8fadf3b3
-Test: Encrypt
-Comment: test   6
-Plaintext: 8fadf3b3 41ea3a0a
-Key: 4e8e7829 c88ba95e b84e28af a0a47295
-Ciphertext: ed650698 cf9f2b79
-Test: Encrypt
-Comment: test   7
-Plaintext: cf9f2b79 4e8e7829
-Key: c88ba95e b84e28af a0a47295 ed650698
-Ciphertext: 1024eea0 6220ae1c
-Test: Encrypt
-Comment: test   8
-Plaintext: 6220ae1c c88ba95e
-Key: b84e28af a0a47295 ed650698 1024eea0
-Ciphertext: 5ddf75d9 7a4ce68f
-Test: Encrypt
-Comment: test   9
-Plaintext: 7a4ce68f b84e28af
-Key: a0a47295 ed650698 1024eea0 5ddf75d9
-Ciphertext: f1be9d1e 8dd4a984
-Test: Encrypt
-Comment: test  10
-Plaintext: 8dd4a984 a0a47295
-Key: ed650698 1024eea0 5ddf75d9 f1be9d1e
-Ciphertext: d32c758c 092dabad
-Test: Encrypt
-Comment: test  11
-Plaintext: 092dabad ed650698
-Key: 1024eea0 5ddf75d9 f1be9d1e d32c758c
-Ciphertext: bdb43728 f7183fc0
-Test: Encrypt
-Comment: test  12
-Plaintext: f7183fc0 1024eea0
-Key: 5ddf75d9 f1be9d1e d32c758c bdb43728
-Ciphertext: a9c3801a d9dcfb4e
-Test: Encrypt
-Comment: test  13
-Plaintext: d9dcfb4e 5ddf75d9
-Key: f1be9d1e d32c758c bdb43728 a9c3801a
-Ciphertext: 32a1e654 a9df917c
-Test: Encrypt
-Comment: test  14
-Plaintext: a9df917c f1be9d1e
-Key: d32c758c bdb43728 a9c3801a 32a1e654
-Ciphertext: 08b63bb9 b20bd3e8
-Test: Encrypt
-Comment: test  15
-Plaintext: b20bd3e8 d32c758c
-Key: bdb43728 a9c3801a 32a1e654 08b63bb9
-Ciphertext: 21410574 cc4264c6
-Test: Encrypt
-Comment: test  16
-Plaintext: cc4264c6 bdb43728
-Key: a9c3801a 32a1e654 08b63bb9 21410574
-Ciphertext: 4ec5d2e2 5ada1d89
-Test: Encrypt
-Comment: test  17
-Plaintext: 5ada1d89 a9c3801a
-Key: 32a1e654 08b63bb9 21410574 4ec5d2e2
-Ciphertext: dd46249e 28aa0b4b
-Test: Encrypt
-Comment: test  18
-Plaintext: 28aa0b4b 32a1e654
-Key: 08b63bb9 21410574 4ec5d2e2 dd46249e
-Ciphertext: 2486dcba a713df03
-Test: Encrypt
-Comment: test  19
-Plaintext: a713df03 08b63bb9
-Key: 21410574 4ec5d2e2 dd46249e 2486dcba
-Ciphertext: b7c7af9d 1acb6cab
-Test: Encrypt
-Comment: test  20
-Plaintext: 1acb6cab 21410574
-Key: 4ec5d2e2 dd46249e 2486dcba b7c7af9d
-Ciphertext: 8cc0400a 9aa49fbb
-Test: Encrypt
-Comment: test  21
-Plaintext: 9aa49fbb 4ec5d2e2
-Key: dd46249e 2486dcba b7c7af9d 8cc0400a
-Ciphertext: 9c241876 6cbc8c66
-Test: Encrypt
-Comment: test  22
-Plaintext: 6cbc8c66 dd46249e
-Key: 2486dcba b7c7af9d 8cc0400a 9c241876
-Ciphertext: b59c5d45 a90066f9
-Test: Encrypt
-Comment: test  23
-Plaintext: a90066f9 2486dcba
-Key: b7c7af9d 8cc0400a 9c241876 b59c5d45
-Ciphertext: b765a1b3 64b37eb0
-Test: Encrypt
-Comment: test  24
-Plaintext: 64b37eb0 b7c7af9d
-Key: 8cc0400a 9c241876 b59c5d45 b765a1b3
-Ciphertext: 7b172fac f5ab4933
-Test: Encrypt
-Comment: test  25
-Plaintext: f5ab4933 8cc0400a
-Key: 9c241876 b59c5d45 b765a1b3 7b172fac
-Ciphertext: fe48f4fb ada404b1
-Test: Encrypt
-Comment: test  26
-Plaintext: ada404b1 9c241876
-Key: b59c5d45 b765a1b3 7b172fac fe48f4fb
-Ciphertext: c5294093 c1d53e3d
-Test: Encrypt
-Comment: test  27
-Plaintext: c1d53e3d b59c5d45
-Key: b765a1b3 7b172fac fe48f4fb c5294093
-Ciphertext: 759ca8e2 77a96649
-Test: Encrypt
-Comment: test  28
-Plaintext: 77a96649 b765a1b3
-Key: 7b172fac fe48f4fb c5294093 759ca8e2
-Ciphertext: 69c53e0f 3e979807
-Test: Encrypt
-Comment: test  29
-Plaintext: 3e979807 7b172fac
-Key: fe48f4fb c5294093 759ca8e2 69c53e0f
-Ciphertext: 60388ada a21fa8e8
-Test: Encrypt
-Comment: test  30
-Plaintext: a21fa8e8 fe48f4fb
-Key: c5294093 759ca8e2 69c53e0f 60388ada
-Ciphertext: df70a1f5 ac4aa407
-Test: Encrypt
-Comment: test  31
-Plaintext: ac4aa407 c5294093
-Key: 759ca8e2 69c53e0f 60388ada df70a1f5
-Ciphertext: d9cb4e09 92636233
-Test: Encrypt
-Comment: test  32
-Plaintext: 92636233 759ca8e2
-Key: 69c53e0f 60388ada df70a1f5 d9cb4e09
-Ciphertext: 7d2c6c57 7a6adb4d
-Test: Encrypt
-Comment: test  33
-Plaintext: 7a6adb4d 69c53e0f
-Key: 60388ada df70a1f5 d9cb4e09 7d2c6c57
-Ciphertext: 44b71215 cf25368a
-Test: Encrypt
-Comment: test  34
-Plaintext: cf25368a 60388ada
-Key: df70a1f5 d9cb4e09 7d2c6c57 44b71215
-Ciphertext: c10105a1 ef781a18
-Test: Encrypt
-Comment: test  35
-Plaintext: ef781a18 df70a1f5
-Key: d9cb4e09 7d2c6c57 44b71215 c10105a1
-Ciphertext: bfdb29fa 9ece39b6
-Test: Encrypt
-Comment: test  36
-Plaintext: 9ece39b6 d9cb4e09
-Key: 7d2c6c57 44b71215 c10105a1 bfdb29fa
-Ciphertext: 9b0b256d dc04574c
-Test: Encrypt
-Comment: test  37
-Plaintext: dc04574c 7d2c6c57
-Key: 44b71215 c10105a1 bfdb29fa 9b0b256d
-Ciphertext: f8295142 8c022711
-Test: Encrypt
-Comment: test  38
-Plaintext: 8c022711 44b71215
-Key: c10105a1 bfdb29fa 9b0b256d f8295142
-Ciphertext: 61341d1c 3a85f2f0
-Test: Encrypt
-Comment: test  39
-Plaintext: 3a85f2f0 c10105a1
-Key: bfdb29fa 9b0b256d f8295142 61341d1c
-Ciphertext: f6a0d30c ad230209
-Test: Encrypt
-Comment: test  40
-Plaintext: ad230209 bfdb29fa
-Key: 9b0b256d f8295142 61341d1c f6a0d30c
-Ciphertext: 3de21a3f aa0cf5c9
-Test: Encrypt
-Comment: test  41
-Plaintext: aa0cf5c9 9b0b256d
-Key: f8295142 61341d1c f6a0d30c 3de21a3f
-Ciphertext: a7e307c6 bd52d939
-Test: Encrypt
-Comment: test  42
-Plaintext: bd52d939 f8295142
-Key: 61341d1c f6a0d30c 3de21a3f a7e307c6
-Ciphertext: 017bc3a7 66fd8c77
-Test: Encrypt
-Comment: test  43
-Plaintext: 66fd8c77 61341d1c
-Key: f6a0d30c 3de21a3f a7e307c6 017bc3a7
-Ciphertext: d8f8fc86 d01b5761
-Test: Encrypt
-Comment: test  44
-Plaintext: d01b5761 f6a0d30c
-Key: 3de21a3f a7e307c6 017bc3a7 d8f8fc86
-Ciphertext: e186c41a 5e6e5a4d
-Test: Encrypt
-Comment: test  45
-Plaintext: 5e6e5a4d 3de21a3f
-Key: a7e307c6 017bc3a7 d8f8fc86 e186c41a
-Ciphertext: 4368d224 dbb4e677
-Test: Encrypt
-Comment: test  46
-Plaintext: dbb4e677 a7e307c6
-Key: 017bc3a7 d8f8fc86 e186c41a 4368d224
-Ciphertext: 9bd0321e 84096523
-Test: Encrypt
-Comment: test  47
-Plaintext: 84096523 017bc3a7
-Key: d8f8fc86 e186c41a 4368d224 9bd0321e
-Ciphertext: b7c56d5b 97c65866
-Test: Encrypt
-Comment: test  48
-Plaintext: 97c65866 d8f8fc86
-Key: e186c41a 4368d224 9bd0321e b7c56d5b
-Ciphertext: 63a1bfac 5a5d7ca2
-Test: Encrypt
-Comment: test  49
-Plaintext: 5a5d7ca2 e186c41a
-Key: 4368d224 9bd0321e b7c56d5b 63a1bfac
-Ciphertext: 91f56dff 7281794f
-Test: Encrypt
-Comment: test  50
-Plaintext: 7281794f 4368d224
-Key: 9bd0321e b7c56d5b 63a1bfac 91f56dff
-Ciphertext: e4c63780 019aedf7
-Test: Encrypt
-Comment: test  51
-Plaintext: 019aedf7 9bd0321e
-Key: b7c56d5b 63a1bfac 91f56dff e4c63780
-Ciphertext: a9fb56e7 35f4aeca
-Test: Encrypt
-Comment: test  52
-Plaintext: 35f4aeca b7c56d5b
-Key: 63a1bfac 91f56dff e4c63780 a9fb56e7
-Ciphertext: a6537187 f0f1ba93
-Test: Encrypt
-Comment: test  53
-Plaintext: f0f1ba93 63a1bfac
-Key: 91f56dff e4c63780 a9fb56e7 a6537187
-Ciphertext: cc960eda e44c6b8f
-Test: Encrypt
-Comment: test  54
-Plaintext: e44c6b8f 91f56dff
-Key: e4c63780 a9fb56e7 a6537187 cc960eda
-Ciphertext: e12f106d 4f1152d0
-Test: Encrypt
-Comment: test  55
-Plaintext: 4f1152d0 e4c63780
-Key: a9fb56e7 a6537187 cc960eda e12f106d
-Ciphertext: 556ad853 f79992fd
-Test: Encrypt
-Comment: test  56
-Plaintext: f79992fd a9fb56e7
-Key: a6537187 cc960eda e12f106d 556ad853
-Ciphertext: 78e8e265 128df6ad
-Test: Encrypt
-Comment: test  57
-Plaintext: 128df6ad a6537187
-Key: cc960eda e12f106d 556ad853 78e8e265
-Ciphertext: f23892aa 288cb926
-Test: Encrypt
-Comment: test  58
-Plaintext: 288cb926 cc960eda
-Key: e12f106d 556ad853 78e8e265 f23892aa
-Ciphertext: 1d115839 6a117fca
-Test: Encrypt
-Comment: test  59
-Plaintext: 6a117fca e12f106d
-Key: 556ad853 78e8e265 f23892aa 1d115839
-Ciphertext: cf899635 5b087e34
-Test: Encrypt
-Comment: test  60
-Plaintext: 5b087e34 556ad853
-Key: 78e8e265 f23892aa 1d115839 cf899635
-Ciphertext: 5c60bff2 e68d88c2
-Test: Encrypt
-Comment: test  61
-Plaintext: e68d88c2 78e8e265
-Key: f23892aa 1d115839 cf899635 5c60bff2
-Ciphertext: 7072d01c bffeb50a
-Test: Encrypt
-Comment: test  62
-Plaintext: bffeb50a f23892aa
-Key: 1d115839 cf899635 5c60bff2 7072d01c
-Ciphertext: 4513c5eb 9c99ae9e
-Test: Encrypt
-Comment: test  63
-Plaintext: 9c99ae9e 1d115839
-Key: cf899635 5c60bff2 7072d01c 4513c5eb
-Ciphertext: 8f3a38ab 80d9c4ad
-Test: Encrypt
-Comment: test  64
-Plaintext: 80d9c4ad cf899635
-Key: 5c60bff2 7072d01c 4513c5eb 8f3a38ab
-Ciphertext: 2bb0f1b3 c023ed11
-Test: Encrypt
-
-AlgorithmType: SymmetricCipher
-Name: XTEA/ECB
-Source: http://www.cix.co.uk/~klockstone/teavect.htm
-Comment: test   1
-Plaintext: 00000000 00000000
-Key: 00000000 00000000 00000000 00000000
-Rounds: 1
-Ciphertext: 00000000 9e3779b9
-Test: Encrypt
-Comment: test   2
-Plaintext: 9e3779b9 00000000
-Key: 00000000 00000000 00000000 00000000
-Rounds: 2
-Ciphertext: ec01a1de aaa0256d
-Test: Encrypt
-Comment: test   3
-Plaintext: aaa0256d 00000000
-Key: 00000000 00000000 00000000 ec01a1de
-Rounds: 3
-Ciphertext: 114f6d74 a39e590c
-Test: Encrypt
-Comment: test   4
-Plaintext: a39e590c 00000000
-Key: 00000000 00000000 ec01a1de 114f6d74
-Rounds: 4
-Ciphertext: bc3a7de2 4e238eb9
-Test: Encrypt
-Comment: test   5
-Plaintext: 4e238eb9 00000000
-Key: 00000000 ec01a1de 114f6d74 bc3a7de2
-Rounds: 5
-Ciphertext: 845846cf 2f36d07f
-Test: Encrypt
-Comment: test   6
-Plaintext: 2f36d07f 00000000
-Key: ec01a1de 114f6d74 bc3a7de2 845846cf
-Rounds: 6
-Ciphertext: 2794a127 4f3e4b6a
-Test: Encrypt
-Comment: test   7
-Plaintext: 4f3e4b6a ec01a1de
-Key: 114f6d74 bc3a7de2 845846cf 2794a127
-Rounds: 7
-Ciphertext: 6b8ea8b8 d99e66c3
-Test: Encrypt
-Comment: test   8
-Plaintext: d99e66c3 114f6d74
-Key: bc3a7de2 845846cf 2794a127 6b8ea8b8
-Rounds: 8
-Ciphertext: 31c5fa6c 241756d6
-Test: Encrypt
-Comment: test   9
-Plaintext: 241756d6 bc3a7de2
-Key: 845846cf 2794a127 6b8ea8b8 31c5fa6c
-Rounds: 9
-Ciphertext: 4a581696 1fd58a6b
-Test: Encrypt
-Comment: test  10
-Plaintext: 1fd58a6b 845846cf
-Key: 2794a127 6b8ea8b8 31c5fa6c 4a581696
-Rounds: 10
-Ciphertext: dfcd0451 df8822cd
-Test: Encrypt
-Comment: test  11
-Plaintext: df8822cd 2794a127
-Key: 6b8ea8b8 31c5fa6c 4a581696 dfcd0451
-Rounds: 11
-Ciphertext: 3ad1ff17 f465776c
-Test: Encrypt
-Comment: test  12
-Plaintext: f465776c 6b8ea8b8
-Key: 31c5fa6c 4a581696 dfcd0451 3ad1ff17
-Rounds: 12
-Ciphertext: 6a1d78c8 4d30bdb9
-Test: Encrypt
-Comment: test  13
-Plaintext: 4d30bdb9 31c5fa6c
-Key: 4a581696 dfcd0451 3ad1ff17 6a1d78c8
-Rounds: 13
-Ciphertext: 08c86d67 f6ef939b
-Test: Encrypt
-Comment: test  14
-Plaintext: f6ef939b 4a581696
-Key: dfcd0451 3ad1ff17 6a1d78c8 08c86d67
-Rounds: 14
-Ciphertext: 2a65bfbe f733428c
-Test: Encrypt
-Comment: test  15
-Plaintext: f733428c dfcd0451
-Key: 3ad1ff17 6a1d78c8 08c86d67 2a65bfbe
-Rounds: 15
-Ciphertext: b4bd6e46 40672bcc
-Test: Encrypt
-Comment: test  16
-Plaintext: 40672bcc 3ad1ff17
-Key: 6a1d78c8 08c86d67 2a65bfbe b4bd6e46
-Rounds: 16
-Ciphertext: 1d8e6992 9a478905
-Test: Encrypt
-Comment: test  17
-Plaintext: 9a478905 6a1d78c8
-Key: 08c86d67 2a65bfbe b4bd6e46 1d8e6992
-Rounds: 17
-Ciphertext: f8994ada 80dee76a
-Test: Encrypt
-Comment: test  18
-Plaintext: 80dee76a 08c86d67
-Key: 2a65bfbe b4bd6e46 1d8e6992 f8994ada
-Rounds: 18
-Ciphertext: 0997e6ed cdfef370
-Test: Encrypt
-Comment: test  19
-Plaintext: cdfef370 2a65bfbe
-Key: b4bd6e46 1d8e6992 f8994ada 0997e6ed
-Rounds: 19
-Ciphertext: ece50553 10b76c66
-Test: Encrypt
-Comment: test  20
-Plaintext: 10b76c66 b4bd6e46
-Key: 1d8e6992 f8994ada 0997e6ed ece50553
-Rounds: 20
-Ciphertext: a6d39c7b dce1a473
-Test: Encrypt
-Comment: test  21
-Plaintext: dce1a473 1d8e6992
-Key: f8994ada 0997e6ed ece50553 a6d39c7b
-Rounds: 21
-Ciphertext: 21d06fb7 fbb98544
-Test: Encrypt
-Comment: test  22
-Plaintext: fbb98544 f8994ada
-Key: 0997e6ed ece50553 a6d39c7b 21d06fb7
-Rounds: 22
-Ciphertext: 72cdd36c e1115fb6
-Test: Encrypt
-Comment: test  23
-Plaintext: e1115fb6 0997e6ed
-Key: ece50553 a6d39c7b 21d06fb7 72cdd36c
-Rounds: 23
-Ciphertext: 25bc6eb3 e4c28ab7
-Test: Encrypt
-Comment: test  24
-Plaintext: e4c28ab7 ece50553
-Key: a6d39c7b 21d06fb7 72cdd36c 25bc6eb3
-Rounds: 24
-Ciphertext: 4932a288 78020b9e
-Test: Encrypt
-Comment: test  25
-Plaintext: 78020b9e a6d39c7b
-Key: 21d06fb7 72cdd36c 25bc6eb3 4932a288
-Rounds: 25
-Ciphertext: 25285da1 b66c4459
-Test: Encrypt
-Comment: test  26
-Plaintext: b66c4459 21d06fb7
-Key: 72cdd36c 25bc6eb3 4932a288 25285da1
-Rounds: 26
-Ciphertext: 39b0155c f227ab20
-Test: Encrypt
-Comment: test  27
-Plaintext: f227ab20 72cdd36c
-Key: 25bc6eb3 4932a288 25285da1 39b0155c
-Rounds: 27
-Ciphertext: 547571aa f38f1e39
-Test: Encrypt
-Comment: test  28
-Plaintext: f38f1e39 25bc6eb3
-Key: 4932a288 25285da1 39b0155c 547571aa
-Rounds: 28
-Ciphertext: 27f917b1 e5796aee
-Test: Encrypt
-Comment: test  29
-Plaintext: e5796aee 4932a288
-Key: 25285da1 39b0155c 547571aa 27f917b1
-Rounds: 29
-Ciphertext: c1da8993 670f9fd2
-Test: Encrypt
-Comment: test  30
-Plaintext: 670f9fd2 25285da1
-Key: 39b0155c 547571aa 27f917b1 c1da8993
-Rounds: 30
-Ciphertext: 60e2acaa d0a60db4
-Test: Encrypt
-Comment: test  31
-Plaintext: d0a60db4 39b0155c
-Key: 547571aa 27f917b1 c1da8993 60e2acaa
-Rounds: 31
-Ciphertext: a6eb923d af20a390
-Test: Encrypt
-Comment: test  32
-Plaintext: af20a390 547571aa
-Key: 27f917b1 c1da8993 60e2acaa a6eb923d
-Rounds: 32
-Ciphertext: d26428af 0a202283
-Test: Encrypt
-Comment: test  33
-Plaintext: 0a202283 27f917b1
-Key: c1da8993 60e2acaa a6eb923d d26428af
-Rounds: 33
-Ciphertext: 1c03ceb9 96e9f2d3
-Test: Encrypt
-Comment: test  34
-Plaintext: 96e9f2d3 c1da8993
-Key: 60e2acaa a6eb923d d26428af 1c03ceb9
-Rounds: 34
-Ciphertext: e260b3c1 bbd7dff0
-Test: Encrypt
-Comment: test  35
-Plaintext: bbd7dff0 60e2acaa
-Key: a6eb923d d26428af 1c03ceb9 e260b3c1
-Rounds: 35
-Ciphertext: d33073f9 12841b97
-Test: Encrypt
-Comment: test  36
-Plaintext: 12841b97 a6eb923d
-Key: d26428af 1c03ceb9 e260b3c1 d33073f9
-Rounds: 36
-Ciphertext: 17b7ea05 1d723f18
-Test: Encrypt
-Comment: test  37
-Plaintext: 1d723f18 d26428af
-Key: 1c03ceb9 e260b3c1 d33073f9 17b7ea05
-Rounds: 37
-Ciphertext: 9f571045 31e849b9
-Test: Encrypt
-Comment: test  38
-Plaintext: 31e849b9 1c03ceb9
-Key: e260b3c1 d33073f9 17b7ea05 9f571045
-Rounds: 38
-Ciphertext: 288351d2 bd0a0054
-Test: Encrypt
-Comment: test  39
-Plaintext: bd0a0054 e260b3c1
-Key: d33073f9 17b7ea05 9f571045 288351d2
-Rounds: 39
-Ciphertext: 9236883a 2bd13143
-Test: Encrypt
-Comment: test  40
-Plaintext: 2bd13143 d33073f9
-Key: 17b7ea05 9f571045 288351d2 9236883a
-Rounds: 40
-Ciphertext: e91dcf23 7c3fd716
-Test: Encrypt
-Comment: test  41
-Plaintext: 7c3fd716 17b7ea05
-Key: 9f571045 288351d2 9236883a e91dcf23
-Rounds: 41
-Ciphertext: 5c8ff51e c3abe43d
-Test: Encrypt
-Comment: test  42
-Plaintext: c3abe43d 9f571045
-Key: 288351d2 9236883a e91dcf23 5c8ff51e
-Rounds: 42
-Ciphertext: 446e9f7c ecb0eb4d
-Test: Encrypt
-Comment: test  43
-Plaintext: ecb0eb4d 288351d2
-Key: 9236883a e91dcf23 5c8ff51e 446e9f7c
-Rounds: 43
-Ciphertext: 86455f77 ffc74050
-Test: Encrypt
-Comment: test  44
-Plaintext: ffc74050 9236883a
-Key: e91dcf23 5c8ff51e 446e9f7c 86455f77
-Rounds: 44
-Ciphertext: ae85d873 e21ef8d3
-Test: Encrypt
-Comment: test  45
-Plaintext: e21ef8d3 e91dcf23
-Key: 5c8ff51e 446e9f7c 86455f77 ae85d873
-Rounds: 45
-Ciphertext: cf411a68 18dce768
-Test: Encrypt
-Comment: test  46
-Plaintext: 18dce768 5c8ff51e
-Key: 446e9f7c 86455f77 ae85d873 cf411a68
-Rounds: 46
-Ciphertext: 4ef68794 07d2b1b3
-Test: Encrypt
-Comment: test  47
-Plaintext: 07d2b1b3 446e9f7c
-Key: 86455f77 ae85d873 cf411a68 4ef68794
-Rounds: 47
-Ciphertext: d75a1925 07476976
-Test: Encrypt
-Comment: test  48
-Plaintext: 07476976 86455f77
-Key: ae85d873 cf411a68 4ef68794 d75a1925
-Rounds: 48
-Ciphertext: 909d29cb 16b37e1b
-Test: Encrypt
-Comment: test  49
-Plaintext: 16b37e1b ae85d873
-Key: cf411a68 4ef68794 d75a1925 909d29cb
-Rounds: 49
-Ciphertext: e05578cd bd40cd0c
-Test: Encrypt
-Comment: test  50
-Plaintext: bd40cd0c cf411a68
-Key: 4ef68794 d75a1925 909d29cb e05578cd
-Rounds: 50
-Ciphertext: 988b50e5 adf1b74c
-Test: Encrypt
-Comment: test  51
-Plaintext: adf1b74c 4ef68794
-Key: d75a1925 909d29cb e05578cd 988b50e5
-Rounds: 51
-Ciphertext: 90699d3d d2333c19
-Test: Encrypt
-Comment: test  52
-Plaintext: d2333c19 d75a1925
-Key: 909d29cb e05578cd 988b50e5 90699d3d
-Rounds: 52
-Ciphertext: a119eb2e 3488c65b
-Test: Encrypt
-Comment: test  53
-Plaintext: 3488c65b 909d29cb
-Key: e05578cd 988b50e5 90699d3d a119eb2e
-Rounds: 53
-Ciphertext: e4c43e62 e9c4894b
-Test: Encrypt
-Comment: test  54
-Plaintext: e9c4894b e05578cd
-Key: 988b50e5 90699d3d a119eb2e e4c43e62
-Rounds: 54
-Ciphertext: e1aec3f2 1976c384
-Test: Encrypt
-Comment: test  55
-Plaintext: 1976c384 988b50e5
-Key: 90699d3d a119eb2e e4c43e62 e1aec3f2
-Rounds: 55
-Ciphertext: 1b7b0e2b 0b392b46
-Test: Encrypt
-Comment: test  56
-Plaintext: 0b392b46 90699d3d
-Key: a119eb2e e4c43e62 e1aec3f2 1b7b0e2b
-Rounds: 56
-Ciphertext: 1a6ffc0c 600f2ee0
-Test: Encrypt
-Comment: test  57
-Plaintext: 600f2ee0 a119eb2e
-Key: e4c43e62 e1aec3f2 1b7b0e2b 1a6ffc0c
-Rounds: 57
-Ciphertext: 82ccc9d3 94ba3d77
-Test: Encrypt
-Comment: test  58
-Plaintext: 94ba3d77 e4c43e62
-Key: e1aec3f2 1b7b0e2b 1a6ffc0c 82ccc9d3
-Rounds: 58
-Ciphertext: 38b5ebd1 c56af77e
-Test: Encrypt
-Comment: test  59
-Plaintext: c56af77e e1aec3f2
-Key: 1b7b0e2b 1a6ffc0c 82ccc9d3 38b5ebd1
-Rounds: 59
-Ciphertext: f5571f9d fe136a04
-Test: Encrypt
-Comment: test  60
-Plaintext: fe136a04 1b7b0e2b
-Key: 1a6ffc0c 82ccc9d3 38b5ebd1 f5571f9d
-Rounds: 60
-Ciphertext: 62ee209f 08550367
-Test: Encrypt
-Comment: test  61
-Plaintext: 08550367 1a6ffc0c
-Key: 82ccc9d3 38b5ebd1 f5571f9d 62ee209f
-Rounds: 61
-Ciphertext: 069b7afc b0fcde91
-Test: Encrypt
-Comment: test  62
-Plaintext: b0fcde91 82ccc9d3
-Key: 38b5ebd1 f5571f9d 62ee209f 069b7afc
-Rounds: 62
-Ciphertext: 376a8936 11b9c087
-Test: Encrypt
-Comment: test  63
-Plaintext: 11b9c087 38b5ebd1
-Key: f5571f9d 62ee209f 069b7afc 376a8936
-Rounds: 63
-Ciphertext: cdc9e923 2e6c1fe7
-Test: Encrypt
-Comment: test  64
-Plaintext: 2e6c1fe7 f5571f9d
-Key: 62ee209f 069b7afc 376a8936 cdc9e923
-Rounds: 64
-Ciphertext: 7a01cbc9 b03d6068
-Test: Encrypt
diff --git a/src-cryptopp/TestVectors/ttmac.txt b/src-cryptopp/TestVectors/ttmac.txt
deleted file mode 100644
index 0bf3391..0000000
--- a/src-cryptopp/TestVectors/ttmac.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-AlgorithmType: MAC
-Name: Two-Track-MAC
-Source: NESSIE submission
-Comment: Key for all test cases
-Key: 00112233445566778899aabbccddeeff01234567
-Comment: Test Case 1
-Message: ""
-MAC: 2dec8ed4a0fd712ed9fbf2ab466ec2df21215e4a
-Test: Verify
-Comment: Test Case 2
-Message: "a"
-MAC: 5893e3e6e306704dd77ad6e6ed432cde321a7756
-Test: Verify
-Comment: Test Case 3
-Message: "abc"
-MAC: 70bfd1029797a5c16da5b557a1f0b2779b78497e
-Test: Verify
-Comment: Test Case 4
-Message: "message digest"
-MAC: 8289f4f19ffe4f2af737de4bd71c829d93a972fa
-Test: Verify
-Comment: Test Case 5
-Message: "abcdefghijklmnopqrstuvwxyz"
-MAC: 2186ca09c5533198b7371f245273504ca92bae60
-Test: Verify
-Comment: Test Case 6
-Message: "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-MAC: 8a7bf77aef62a2578497a27c0d6518a429e7c14d
-Test: Verify
-Comment: Test Case 7
-Message: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-MAC: 54bac392a886806d169556fcbb6789b54fb364fb
-Test: Verify
-Comment: Test Case 8
-Message: r8 "1234567890"
-MAC: 0ced2c9f8f0d9d03981ab5c8184bac43dd54c484
-Test: Verify
-Comment: Test Case 9
-Message: r15625 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-MAC: 27b3aedb5df8b629f0142194daa3846e1895f3d2
diff --git a/src-cryptopp/TestVectors/vmac.txt b/src-cryptopp/TestVectors/vmac.txt
deleted file mode 100644
index ae450c0..0000000
--- a/src-cryptopp/TestVectors/vmac.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-AlgorithmType: MAC
-Name: VMAC(AES)-64
-Source: http://www.fastcrypto.org/vmac/draft-krovetz-vmac-01.txt
-Key: "abcdefghijklmnop"
-IV: "bcdefghi"
-Message: ""
-MAC: 2576BE1C56D8B81B
-Test: Verify
-Message: "abc"
-MAC: 2D376CF5B1813CE5
-Test: Verify
-Message: r16 "abc"
-MAC: E8421F61D573D298
-Test: Verify
-Message: r100 "abc"
-MAC: 4492DF6C5CAC1BBE
-Test: Verify
-Message: r1000000 "abc"
-MAC: 09BA597DD7601113
-Test: Verify
-Message: r42 "abc" "ab"
-MAC: D638B73921F184DE
-Test: Verify
-Message: r170 "abc" "ab"
-MAC: 9DA310281E6FD0A0
-Test: Verify
-Message: r65 "a"
-MAC: 90 ea 57 cb 51 bc 92 a3
-Test: Verify
-Message: r129 "a"
-MAC: 86 34 83 87 d1 3d 82 33
-Test: Verify
-Message: r65 "abc"
-MAC: E86A86EC77A8BF61
-Test: Verify
-Message: "abc"
-MAC: 2D376CF5B1813CE0
-Test: NotVerify
-
-AlgorithmType: MAC
-Name: VMAC(AES)-128
-Source: http://www.fastcrypto.org/vmac/draft-krovetz-vmac-01.txt
-Key: "abcdefghijklmnop"
-IV: "bcdefghi"
-Message: ""
-MAC: 472766C70F74ED23481D6D7DE4E80DAC
-Test: Verify
-Message: "abc"
-MAC: 4EE815A06A1D71EDD36FC75D51188A42
-Test: Verify
-Message: r16 "abc"
-MAC: 09F2C80C8E1007A0C12FAE19FE4504AE
-Test: Verify
-Message: r100 "abc"
-MAC: 66438817154850C61D8A412164803BCB
-Test: Verify
-Message: r1000000 "abc"
-MAC: 2B6B02288FFC461B75485DE893C629DC
-Test: Verify
-Message: r42 "abc" "ab"
-MAC: F7E95FE3DA8DB9E6BB973E65D0B4CEA5
-Test: Verify
-Message: r170 "abc" "ab"
-MAC: BF53B8D2D70C05A85880C2E21CAF1299
-Test: Verify
-Message: r65 "a"
-MAC: b2 9b 00 76 0a 58 c7 ab 92 d6 60 24 d6 9c 1b 92
-Test: Verify
-Message: r129 "a"
-MAC: a7 e5 2c 32 89 d9 b7 3b 53 57 6f 05 95 85 ee 79
-Test: Verify
-Message: r65 "abc"
-MAC: 0A1B2F973044F469F405917E45010334
-Test: Verify
-Message: "abc"
-MAC: 4EE815A06A1D71EDD36FC75D51188A40
-Test: NotVerify
diff --git a/src-cryptopp/TestVectors/whrlpool.txt b/src-cryptopp/TestVectors/whrlpool.txt
deleted file mode 100644
index e2f16f1..0000000
--- a/src-cryptopp/TestVectors/whrlpool.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-AlgorithmType: MessageDigest
-Name: Whirlpool
-Source: ISO test vectors in http://planeta.terra.com.br/informatica/paulobarreto/whirlpool.zip
-Message: ""
-Digest:   19FA61D75522A466 9B44E39C1D2E1726 C530232130D407F8 9AFEE0964997F7A7\
- 3E83BE698B288FEB CF88E3E03C4F0757 EA8964E59B63D937 08B138CC42A66EB3
-Test: Verify
-Message: "a"
-Digest:   8ACA2602792AEC6F 11A67206531FB7D7 F0DFF59413145E69 73C45001D0087B42\
- D11BC645413AEFF6 3A42391A39145A59 1A92200D560195E5 3B478584FDAE231A
-Test: Verify
-Message: "abc"
-Digest: 4E2448A4C6F486BB 16B6562C73B4020B F3043E3A731BCE72 1AE1B303D97E6D4C\
- 7181EEBDB6C57E27 7D0E34957114CBD6 C797FC9D95D8B582 D225292076D4EEF5
-Test: Verify
-Message: "message digest"
-Digest: 378C84A4126E2DC6 E56DCC7458377AAC 838D00032230F53C E1F5700C0FFB4D3B\
- 8421557659EF55C1 06B4B52AC5A4AAA6 92ED920052838F33 62E86DBD37A8903E
-Test: Verify
-Message: "abcdefghijklmnopqrstuvwxyz"
-Digest: F1D754662636FFE9 2C82EBB9212A484A 8D38631EAD4238F5 442EE13B8054E41B\
- 08BF2A9251C30B6A 0B8AAE86177AB4A6 F68F673E7207865D 5D9819A3DBA4EB3B
-Test: Verify
-Message: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-Digest: DC37E008CF9EE69B F11F00ED9ABA2690 1DD7C28CDEC066CC 6AF42E40F82F3A1E\
- 08EBA26629129D8F B7CB57211B9281A6 5517CC879D7B9621 42C65F5A7AF01467
-Test: Verify
-Message: r8 "1234567890"
-Digest: 466EF18BABB0154D 25B9D38A6414F5C0 8784372BCCB204D6 549C4AFADB601429\
- 4D5BD8DF2A6C44E5 38CD047B2681A51A 2C60481E88C5A20B 2C2A80CF3A9A083B
-Test: Verify
-Message: "abcdbcdecdefdefgefghfghighijhijk"
-Digest:  2A987EA40F917061 F5D6F0A0E4644F48 8A7A5A52DEEE6562 07C562F988E95C69\
- 16BDC8031BC5BE1B 7B947639FE050B56 939BAAA0ADFF9AE6 745B7B181C3BE3FD
-Test: Verify
-Message: r1000000 "a"
-Digest:  0C99005BEB57EFF5 0A7CF005560DDF5D 29057FD86B20BFD6 2DECA0F1CCEA4AF5\
- 1FC15490EDDC47AF 32BB2B66C34FF9AD 8C6008AD677F7712 6953B226E4ED8B01
-Test: Verify
diff --git a/src-cryptopp/adhoc.cpp.proto b/src-cryptopp/adhoc.cpp.proto
deleted file mode 100644
index f150126..0000000
--- a/src-cryptopp/adhoc.cpp.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "config.h"
-#include <iosfwd>
-#include <string>
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4100 4189 4996)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic ignored "-Wunused-variable"
-#endif
-
-USING_NAMESPACE(CryptoPP)
-USING_NAMESPACE(std)
-
-#ifndef CRYPTOPP_UNUSED
-# define CRYPTOPP_UNUSED(x) (void(x))
-#endif
-
-// Used for testing the compiler and linker in cryptest.sh
-#if defined(CRYPTOPP_ADHOC_MAIN)
-
-int main(int argc, char *argv[])
-{
-	CRYPTOPP_UNUSED(argc), CRYPTOPP_UNUSED(argv);
-	return 0;
-}
-
-// Classic use of adhoc to setup calling convention
-#else
-
-extern int (*AdhocTest)(int argc, char *argv[]);
-
-int MyAdhocTest(int argc, char *argv[])
-{
-	CRYPTOPP_UNUSED(argc), CRYPTOPP_UNUSED(argv);
-	return 0;
-}
-
-static int s_i = (AdhocTest = &MyAdhocTest, 0);
-
-#endif
diff --git a/src-cryptopp/aes.h b/src-cryptopp/aes.h
deleted file mode 100644
index 217738b..0000000
--- a/src-cryptopp/aes.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// aes.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \brief Class file for the AES cipher (Rijndael)
-
-#ifndef CRYPTOPP_AES_H
-#define CRYPTOPP_AES_H
-
-#include "rijndael.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class AES
-//! \brief AES block cipher (Rijndael)
-//! \sa <a href="http://www.cryptolounge.org/wiki/AES">AES</a> winner, announced on 10/2/2000
-DOCUMENTED_TYPEDEF(Rijndael, AES);
-
-typedef RijndaelEncryption AESEncryption;
-typedef RijndaelDecryption AESDecryption;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/algebra.cpp b/src-cryptopp/algebra.cpp
deleted file mode 100644
index c40e900..0000000
--- a/src-cryptopp/algebra.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-// algebra.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_ALGEBRA_CPP	// SunCC workaround: compiler could cause this file to be included twice
-#define CRYPTOPP_ALGEBRA_CPP
-
-#include "algebra.h"
-#include "integer.h"
-
-#include <vector>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-template <class T> const T& AbstractGroup<T>::Double(const Element &a) const
-{
-	return this->Add(a, a);
-}
-
-template <class T> const T& AbstractGroup<T>::Subtract(const Element &a, const Element &b) const
-{
-	// make copy of a in case Inverse() overwrites it
-	Element a1(a);
-	return this->Add(a1, Inverse(b));
-}
-
-template <class T> T& AbstractGroup<T>::Accumulate(Element &a, const Element &b) const
-{
-	return a = this->Add(a, b);
-}
-
-template <class T> T& AbstractGroup<T>::Reduce(Element &a, const Element &b) const
-{
-	return a = this->Subtract(a, b);
-}
-
-template <class T> const T& AbstractRing<T>::Square(const Element &a) const
-{
-	return this->Multiply(a, a);
-}
-
-template <class T> const T& AbstractRing<T>::Divide(const Element &a, const Element &b) const
-{
-	// make copy of a in case MultiplicativeInverse() overwrites it
-	Element a1(a);
-	return this->Multiply(a1, this->MultiplicativeInverse(b));
-}
-
-template <class T> const T& AbstractEuclideanDomain<T>::Mod(const Element &a, const Element &b) const
-{
-	Element q;
-	this->DivisionAlgorithm(result, q, a, b);
-	return result;
-}
-
-template <class T> const T& AbstractEuclideanDomain<T>::Gcd(const Element &a, const Element &b) const
-{
-	Element g[3]={b, a};
-	unsigned int i0=0, i1=1, i2=2;
-
-	while (!this->Equal(g[i1], this->Identity()))
-	{
-		g[i2] = this->Mod(g[i0], g[i1]);
-		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
-	}
-
-	return result = g[i0];
-}
-
-template <class T> const typename QuotientRing<T>::Element& QuotientRing<T>::MultiplicativeInverse(const Element &a) const
-{
-	Element g[3]={m_modulus, a};
-	Element v[3]={m_domain.Identity(), m_domain.MultiplicativeIdentity()};
-	Element y;
-	unsigned int i0=0, i1=1, i2=2;
-
-	while (!this->Equal(g[i1], this->Identity()))
-	{
-		// y = g[i0] / g[i1];
-		// g[i2] = g[i0] % g[i1];
-		m_domain.DivisionAlgorithm(g[i2], y, g[i0], g[i1]);
-		// v[i2] = v[i0] - (v[i1] * y);
-		v[i2] = m_domain.Subtract(v[i0], m_domain.Multiply(v[i1], y));
-		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
-	}
-
-	return m_domain.IsUnit(g[i0]) ? m_domain.Divide(v[i0], g[i0]) : m_domain.Identity();
-}
-
-template <class T> T AbstractGroup<T>::ScalarMultiply(const Element &base, const Integer &exponent) const
-{
-	Element result;
-	this->SimultaneousMultiply(&result, base, &exponent, 1);
-	return result;
-}
-
-template <class T> T AbstractGroup<T>::CascadeScalarMultiply(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const
-{
-	const unsigned expLen = STDMAX(e1.BitCount(), e2.BitCount());
-	if (expLen==0)
-		return this->Identity();
-
-	const unsigned w = (expLen <= 46 ? 1 : (expLen <= 260 ? 2 : 3));
-	const unsigned tableSize = 1<<w;
-	std::vector<Element> powerTable(tableSize << w);
-
-	powerTable[1] = x;
-	powerTable[tableSize] = y;
-	if (w==1)
-		powerTable[3] = this->Add(x,y);
-	else
-	{
-		powerTable[2] = this->Double(x);
-		powerTable[2*tableSize] = this->Double(y);
-
-		unsigned i, j;
-
-		for (i=3; i<tableSize; i+=2)
-			powerTable[i] = Add(powerTable[i-2], powerTable[2]);
-		for (i=1; i<tableSize; i+=2)
-			for (j=i+tableSize; j<(tableSize<<w); j+=tableSize)
-				powerTable[j] = Add(powerTable[j-tableSize], y);
-
-		for (i=3*tableSize; i<(tableSize<<w); i+=2*tableSize)
-			powerTable[i] = Add(powerTable[i-2*tableSize], powerTable[2*tableSize]);
-		for (i=tableSize; i<(tableSize<<w); i+=2*tableSize)
-			for (j=i+2; j<i+tableSize; j+=2)
-				powerTable[j] = Add(powerTable[j-1], x);
-	}
-
-	Element result;
-	unsigned power1 = 0, power2 = 0, prevPosition = expLen-1;
-	bool firstTime = true;
-
-	for (int i = expLen-1; i>=0; i--)
-	{
-		power1 = 2*power1 + e1.GetBit(i);
-		power2 = 2*power2 + e2.GetBit(i);
-
-		if (i==0 || 2*power1 >= tableSize || 2*power2 >= tableSize)
-		{
-			unsigned squaresBefore = prevPosition-i;
-			unsigned squaresAfter = 0;
-			prevPosition = i;
-			while ((power1 || power2) && power1%2 == 0 && power2%2==0)
-			{
-				power1 /= 2;
-				power2 /= 2;
-				squaresBefore--;
-				squaresAfter++;
-			}
-			if (firstTime)
-			{
-				result = powerTable[(power2<<w) + power1];
-				firstTime = false;
-			}
-			else
-			{
-				while (squaresBefore--)
-					result = this->Double(result);
-				if (power1 || power2)
-					Accumulate(result, powerTable[(power2<<w) + power1]);
-			}
-			while (squaresAfter--)
-				result = this->Double(result);
-			power1 = power2 = 0;
-		}
-	}
-	return result;
-}
-
-template <class Element, class Iterator> Element GeneralCascadeMultiplication(const AbstractGroup<Element> &group, Iterator begin, Iterator end)
-{
-	if (end-begin == 1)
-		return group.ScalarMultiply(begin->base, begin->exponent);
-	else if (end-begin == 2)
-		return group.CascadeScalarMultiply(begin->base, begin->exponent, (begin+1)->base, (begin+1)->exponent);
-	else
-	{
-		Integer q, t;
-		Iterator last = end;
-		--last;
-
-		std::make_heap(begin, end);
-		std::pop_heap(begin, end);
-
-		while (!!begin->exponent)
-		{
-			// last->exponent is largest exponent, begin->exponent is next largest
-			t = last->exponent;
-			Integer::Divide(last->exponent, q, t, begin->exponent);
-
-			if (q == Integer::One())
-				group.Accumulate(begin->base, last->base);	// avoid overhead of ScalarMultiply()
-			else
-				group.Accumulate(begin->base, group.ScalarMultiply(last->base, q));
-
-			std::push_heap(begin, end);
-			std::pop_heap(begin, end);
-		}
-
-		return group.ScalarMultiply(last->base, last->exponent);
-	}
-}
-
-struct WindowSlider
-{
-	WindowSlider(const Integer &expIn, bool fastNegate, unsigned int windowSizeIn=0)
-		: exp(expIn), windowModulus(Integer::One()), windowSize(windowSizeIn), windowBegin(0), expWindow(0)
-		, fastNegate(fastNegate), negateNext(false), firstTime(true), finished(false)
-	{
-		if (windowSize == 0)
-		{
-			unsigned int expLen = exp.BitCount();
-			windowSize = expLen <= 17 ? 1 : (expLen <= 24 ? 2 : (expLen <= 70 ? 3 : (expLen <= 197 ? 4 : (expLen <= 539 ? 5 : (expLen <= 1434 ? 6 : 7)))));
-		}
-		windowModulus <<= windowSize;
-	}
-
-	void FindNextWindow()
-	{
-		unsigned int expLen = exp.WordCount() * WORD_BITS;
-		unsigned int skipCount = firstTime ? 0 : windowSize;
-		firstTime = false;
-		while (!exp.GetBit(skipCount))
-		{
-			if (skipCount >= expLen)
-			{
-				finished = true;
-				return;
-			}
-			skipCount++;
-		}
-
-		exp >>= skipCount;
-		windowBegin += skipCount;
-		expWindow = word32(exp % (word(1) << windowSize));
-
-		if (fastNegate && exp.GetBit(windowSize))
-		{
-			negateNext = true;
-			expWindow = (word32(1) << windowSize) - expWindow;
-			exp += windowModulus;
-		}
-		else
-			negateNext = false;
-	}
-
-	Integer exp, windowModulus;
-	unsigned int windowSize, windowBegin;
-	word32 expWindow;
-	bool fastNegate, negateNext, firstTime, finished;
-};
-
-template <class T>
-void AbstractGroup<T>::SimultaneousMultiply(T *results, const T &base, const Integer *expBegin, unsigned int expCount) const
-{
-	std::vector<std::vector<Element> > buckets(expCount);
-	std::vector<WindowSlider> exponents;
-	exponents.reserve(expCount);
-	unsigned int i;
-
-	for (i=0; i<expCount; i++)
-	{
-		CRYPTOPP_ASSERT(expBegin->NotNegative());
-		exponents.push_back(WindowSlider(*expBegin++, InversionIsFast(), 0));
-		exponents[i].FindNextWindow();
-		buckets[i].resize(((size_t) 1) << (exponents[i].windowSize-1), Identity());
-	}
-
-	unsigned int expBitPosition = 0;
-	Element g = base;
-	bool notDone = true;
-
-	while (notDone)
-	{
-		notDone = false;
-		for (i=0; i<expCount; i++)
-		{
-			if (!exponents[i].finished && expBitPosition == exponents[i].windowBegin)
-			{
-				Element &bucket = buckets[i][exponents[i].expWindow/2];
-				if (exponents[i].negateNext)
-					Accumulate(bucket, Inverse(g));
-				else
-					Accumulate(bucket, g);
-				exponents[i].FindNextWindow();
-			}
-			notDone = notDone || !exponents[i].finished;
-		}
-
-		if (notDone)
-		{
-			g = Double(g);
-			expBitPosition++;
-		}
-	}
-
-	for (i=0; i<expCount; i++)
-	{
-		Element &r = *results++;
-		r = buckets[i][buckets[i].size()-1];
-		if (buckets[i].size() > 1)
-		{
-			for (int j = (int)buckets[i].size()-2; j >= 1; j--)
-			{
-				Accumulate(buckets[i][j], buckets[i][j+1]);
-				Accumulate(r, buckets[i][j]);
-			}
-			Accumulate(buckets[i][0], buckets[i][1]);
-			r = Add(Double(r), buckets[i][0]);
-		}
-	}
-}
-
-template <class T> T AbstractRing<T>::Exponentiate(const Element &base, const Integer &exponent) const
-{
-	Element result;
-	SimultaneousExponentiate(&result, base, &exponent, 1);
-	return result;
-}
-
-template <class T> T AbstractRing<T>::CascadeExponentiate(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const
-{
-	return MultiplicativeGroup().AbstractGroup<T>::CascadeScalarMultiply(x, e1, y, e2);
-}
-
-template <class Element, class Iterator> Element GeneralCascadeExponentiation(const AbstractRing<Element> &ring, Iterator begin, Iterator end)
-{
-	return GeneralCascadeMultiplication<Element>(ring.MultiplicativeGroup(), begin, end);
-}
-
-template <class T>
-void AbstractRing<T>::SimultaneousExponentiate(T *results, const T &base, const Integer *exponents, unsigned int expCount) const
-{
-	MultiplicativeGroup().AbstractGroup<T>::SimultaneousMultiply(results, base, exponents, expCount);
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/algebra.h b/src-cryptopp/algebra.h
deleted file mode 100644
index 1559cb4..0000000
--- a/src-cryptopp/algebra.h
+++ /dev/null
@@ -1,453 +0,0 @@
-// algebra.h - written and placed in the public domain by Wei Dai
-
-//! \file algebra.h
-//! \brief Classes for performing mathematics over different fields
-
-#ifndef CRYPTOPP_ALGEBRA_H
-#define CRYPTOPP_ALGEBRA_H
-
-#include "config.h"
-#include "misc.h"
-#include "integer.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-class Integer;
-
-//! \brief Abstract group
-//! \tparam T element class or type
-//! \details <tt>const Element&</tt> returned by member functions are references
-//!   to internal data members. Since each object may have only
-//!   one such data member for holding results, the following code
-//!   will produce incorrect results:
-//!   <pre>    abcd = group.Add(group.Add(a,b), group.Add(c,d));</pre>
-//!   But this should be fine:
-//!   <pre>    abcd = group.Add(a, group.Add(b, group.Add(c,d));</pre>
-template <class T> class CRYPTOPP_NO_VTABLE AbstractGroup
-{
-public:
-	typedef T Element;
-
-	virtual ~AbstractGroup() {}
-
-	//! \brief Compare two elements for equality
-	//! \param a first element
-	//! \param b second element
-	//! \returns true if the elements are equal, false otherwise
-	//! \details Equal() tests the elements for equality using <tt>a==b</tt>
-	virtual bool Equal(const Element &a, const Element &b) const =0;
-
-	//! \brief Provides the Identity element
-	//! \returns the Identity element
-	virtual const Element& Identity() const =0;
-
-	//! \brief Adds elements in the group
-	//! \param a first element
-	//! \param b second element
-	//! \returns the sum of <tt>a</tt> and <tt>b</tt>
-	virtual const Element& Add(const Element &a, const Element &b) const =0;
-
-	//! \brief Inverts the element in the group
-	//! \param a first element
-	//! \returns the inverse of the element
-	virtual const Element& Inverse(const Element &a) const =0;
-
-	//! \brief Determine if inversion is fast
-	//! \returns true if inversion is fast, false otherwise
-	virtual bool InversionIsFast() const {return false;}
-
-	//! \brief Doubles an element in the group
-	//! \param a the element
-	//! \returns the element doubled
-	virtual const Element& Double(const Element &a) const;
-
-	//! \brief Subtracts elements in the group
-	//! \param a first element
-	//! \param b second element
-	//! \returns the difference of <tt>a</tt> and <tt>b</tt>. The element <tt>a</tt> must provide a Subtract member function.
-	virtual const Element& Subtract(const Element &a, const Element &b) const;
-
-	//! \brief TODO
-	//! \param a first element
-	//! \param b second element
-	//! \returns TODO
-	virtual Element& Accumulate(Element &a, const Element &b) const;
-
-	//! \brief Reduces an element in the congruence class
-	//! \param a element to reduce
-	//! \param b the congruence class
-	//! \returns the reduced element
-	virtual Element& Reduce(Element &a, const Element &b) const;
-
-	//! \brief Performs a scalar multiplication
-	//! \param a multiplicand
-	//! \param e multiplier
-	//! \returns the product
-	virtual Element ScalarMultiply(const Element &a, const Integer &e) const;
-
-	//! \brief TODO
-	//! \param x first multiplicand
-	//! \param e1 the first multiplier
-	//! \param y second multiplicand
-	//! \param e2 the second multiplier
-	//! \returns TODO
-	virtual Element CascadeScalarMultiply(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const;
-
-	//! \brief Multiplies a base to multiple exponents in a group
-	//! \param results an array of Elements
-	//! \param base the base to raise to the exponents
-	//! \param exponents an array of exponents
-	//! \param exponentsCount the number of exponents in the array
-	//! \details SimultaneousMultiply() multiplies the base to each exponent in the exponents array and stores the
-	//!   result at the respective position in the results array.
-	//! \details SimultaneousMultiply() must be implemented in a derived class.
-	//! \pre <tt>COUNTOF(results) == exponentsCount</tt>
-	//! \pre <tt>COUNTOF(exponents) == exponentsCount</tt>
-	virtual void SimultaneousMultiply(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const;
-};
-
-//! \brief Abstract ring
-//! \tparam T element class or type
-//! \details <tt>const Element&</tt> returned by member functions are references
-//!   to internal data members. Since each object may have only
-//!   one such data member for holding results, the following code
-//!   will produce incorrect results:
-//!   <pre>    abcd = group.Add(group.Add(a,b), group.Add(c,d));</pre>
-//!   But this should be fine:
-//!   <pre>    abcd = group.Add(a, group.Add(b, group.Add(c,d));</pre>
-template <class T> class CRYPTOPP_NO_VTABLE AbstractRing : public AbstractGroup<T>
-{
-public:
-	typedef T Element;
-
-	//! \brief Construct an AbstractRing
-	AbstractRing() {m_mg.m_pRing = this;}
-
-	//! \brief Copy construct an AbstractRing
-	//! \param source other AbstractRing
-	AbstractRing(const AbstractRing &source)
-		{CRYPTOPP_UNUSED(source); m_mg.m_pRing = this;}
-
-	//! \brief Assign an AbstractRing
-	//! \param source other AbstractRing
-	AbstractRing& operator=(const AbstractRing &source)
-		{CRYPTOPP_UNUSED(source); return *this;}
-
-	//! \brief Determines whether an element is a unit in the group
-	//! \param a the element
-	//! \returns true if the element is a unit after reduction, false otherwise.
-	virtual bool IsUnit(const Element &a) const =0;
-
-	//! \brief Retrieves the multiplicative identity
-	//! \returns the multiplicative identity
-	virtual const Element& MultiplicativeIdentity() const =0;
-
-	//! \brief Multiplies elements in the group
-	//! \param a the multiplicand
-	//! \param b the multiplier
-	//! \returns the product of a and b
-	virtual const Element& Multiply(const Element &a, const Element &b) const =0;
-
-	//! \brief Calculate the multiplicative inverse of an element in the group
-	//! \param a the element
-	virtual const Element& MultiplicativeInverse(const Element &a) const =0;
-
-	//! \brief Square an element in the group
-	//! \param a the element
-	//! \returns the element squared
-	virtual const Element& Square(const Element &a) const;
-
-	//! \brief Divides elements in the group
-	//! \param a the dividend
-	//! \param b the divisor
-	//! \returns the quotient
-	virtual const Element& Divide(const Element &a, const Element &b) const;
-
-	//! \brief Raises a base to an exponent in the group
-	//! \param a the base
-	//! \param e the exponent
-	//! \returns the exponentiation
-	virtual Element Exponentiate(const Element &a, const Integer &e) const;
-
-	//! \brief TODO
-	//! \param x first element
-	//! \param e1 first exponent
-	//! \param y second element
-	//! \param e2 second exponent
-	//! \returns TODO
-	virtual Element CascadeExponentiate(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const;
-
-	//! \brief Exponentiates a base to multiple exponents in the Ring
-	//! \param results an array of Elements
-	//! \param base the base to raise to the exponents
-	//! \param exponents an array of exponents
-	//! \param exponentsCount the number of exponents in the array
-	//! \details SimultaneousExponentiate() raises the base to each exponent in the exponents array and stores the
-	//!   result at the respective position in the results array.
-	//! \details SimultaneousExponentiate() must be implemented in a derived class.
-	//! \pre <tt>COUNTOF(results) == exponentsCount</tt>
-	//! \pre <tt>COUNTOF(exponents) == exponentsCount</tt>
-	virtual void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const;
-
-	//! \brief Retrieves the multiplicative group
-	//! \returns the multiplicative group
-	virtual const AbstractGroup<T>& MultiplicativeGroup() const
-		{return m_mg;}
-
-private:
-	class MultiplicativeGroupT : public AbstractGroup<T>
-	{
-	public:
-		const AbstractRing<T>& GetRing() const
-			{return *m_pRing;}
-
-		bool Equal(const Element &a, const Element &b) const
-			{return GetRing().Equal(a, b);}
-
-		const Element& Identity() const
-			{return GetRing().MultiplicativeIdentity();}
-
-		const Element& Add(const Element &a, const Element &b) const
-			{return GetRing().Multiply(a, b);}
-
-		Element& Accumulate(Element &a, const Element &b) const
-			{return a = GetRing().Multiply(a, b);}
-
-		const Element& Inverse(const Element &a) const
-			{return GetRing().MultiplicativeInverse(a);}
-
-		const Element& Subtract(const Element &a, const Element &b) const
-			{return GetRing().Divide(a, b);}
-
-		Element& Reduce(Element &a, const Element &b) const
-			{return a = GetRing().Divide(a, b);}
-
-		const Element& Double(const Element &a) const
-			{return GetRing().Square(a);}
-
-		Element ScalarMultiply(const Element &a, const Integer &e) const
-			{return GetRing().Exponentiate(a, e);}
-
-		Element CascadeScalarMultiply(const Element &x, const Integer &e1, const Element &y, const Integer &e2) const
-			{return GetRing().CascadeExponentiate(x, e1, y, e2);}
-
-		void SimultaneousMultiply(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const
-			{GetRing().SimultaneousExponentiate(results, base, exponents, exponentsCount);}
-
-		const AbstractRing<T> *m_pRing;
-	};
-
-	MultiplicativeGroupT m_mg;
-};
-
-// ********************************************************
-
-//! \brief Base and exponent
-//! \tparam T base class or type
-//! \tparam T exponent class or type
-template <class T, class E = Integer>
-struct BaseAndExponent
-{
-public:
-	BaseAndExponent() {}
-	BaseAndExponent(const T &base, const E &exponent) : base(base), exponent(exponent) {}
-	bool operator<(const BaseAndExponent<T, E> &rhs) const {return exponent < rhs.exponent;}
-	T base;
-	E exponent;
-};
-
-// VC60 workaround: incomplete member template support
-template <class Element, class Iterator>
-	Element GeneralCascadeMultiplication(const AbstractGroup<Element> &group, Iterator begin, Iterator end);
-template <class Element, class Iterator>
-	Element GeneralCascadeExponentiation(const AbstractRing<Element> &ring, Iterator begin, Iterator end);
-
-// ********************************************************
-
-//! \brief Abstract Euclidean domain
-//! \tparam T element class or type
-//! \details <tt>const Element&</tt> returned by member functions are references
-//!   to internal data members. Since each object may have only
-//!   one such data member for holding results, the following code
-//!   will produce incorrect results:
-//!   <pre>    abcd = group.Add(group.Add(a,b), group.Add(c,d));</pre>
-//!   But this should be fine:
-//!   <pre>    abcd = group.Add(a, group.Add(b, group.Add(c,d));</pre>
-template <class T> class CRYPTOPP_NO_VTABLE AbstractEuclideanDomain : public AbstractRing<T>
-{
-public:
-	typedef T Element;
-
-	//! \brief Performs the division algorithm on two elements in the ring
-	//! \param r the remainder
-	//! \param q the quotient
-	//! \param a the dividend
-	//! \param d the divisor
-	virtual void DivisionAlgorithm(Element &r, Element &q, const Element &a, const Element &d) const =0;
-
-	//! \brief Performs a modular reduction in the ring
-	//! \param a the element
-	//! \param b the modulus
-	//! \returns the result of <tt>a%b</tt>.
-	virtual const Element& Mod(const Element &a, const Element &b) const =0;
-
-	//! \brief Calculates the greatest common denominator in the ring
-	//! \param a the first element
-	//! \param b the second element
-	//! \returns the the greatest common denominator of a and b.
-	virtual const Element& Gcd(const Element &a, const Element &b) const;
-
-protected:
-	mutable Element result;
-};
-
-// ********************************************************
-
-//! \brief Euclidean domain
-//! \tparam T element class or type
-//! \details <tt>const Element&</tt> returned by member functions are references
-//!   to internal data members. Since each object may have only
-//!   one such data member for holding results, the following code
-//!   will produce incorrect results:
-//!   <pre>    abcd = group.Add(group.Add(a,b), group.Add(c,d));</pre>
-//!   But this should be fine:
-//!   <pre>    abcd = group.Add(a, group.Add(b, group.Add(c,d));</pre>
-template <class T> class EuclideanDomainOf : public AbstractEuclideanDomain<T>
-{
-public:
-	typedef T Element;
-
-	EuclideanDomainOf() {}
-
-	bool Equal(const Element &a, const Element &b) const
-		{return a==b;}
-
-	const Element& Identity() const
-		{return Element::Zero();}
-
-	const Element& Add(const Element &a, const Element &b) const
-		{return result = a+b;}
-
-	Element& Accumulate(Element &a, const Element &b) const
-		{return a+=b;}
-
-	const Element& Inverse(const Element &a) const
-		{return result = -a;}
-
-	const Element& Subtract(const Element &a, const Element &b) const
-		{return result = a-b;}
-
-	Element& Reduce(Element &a, const Element &b) const
-		{return a-=b;}
-
-	const Element& Double(const Element &a) const
-		{return result = a.Doubled();}
-
-	const Element& MultiplicativeIdentity() const
-		{return Element::One();}
-
-	const Element& Multiply(const Element &a, const Element &b) const
-		{return result = a*b;}
-
-	const Element& Square(const Element &a) const
-		{return result = a.Squared();}
-
-	bool IsUnit(const Element &a) const
-		{return a.IsUnit();}
-
-	const Element& MultiplicativeInverse(const Element &a) const
-		{return result = a.MultiplicativeInverse();}
-
-	const Element& Divide(const Element &a, const Element &b) const
-		{return result = a/b;}
-
-	const Element& Mod(const Element &a, const Element &b) const
-		{return result = a%b;}
-
-	void DivisionAlgorithm(Element &r, Element &q, const Element &a, const Element &d) const
-		{Element::Divide(r, q, a, d);}
-
-	bool operator==(const EuclideanDomainOf<T> &rhs) const
-		{CRYPTOPP_UNUSED(rhs); return true;}
-
-private:
-	mutable Element result;
-};
-
-//! \brief Quotient ring
-//! \tparam T element class or type
-//! \details <tt>const Element&</tt> returned by member functions are references
-//!   to internal data members. Since each object may have only
-//!   one such data member for holding results, the following code
-//!   will produce incorrect results:
-//!   <pre>    abcd = group.Add(group.Add(a,b), group.Add(c,d));</pre>
-//!   But this should be fine:
-//!   <pre>    abcd = group.Add(a, group.Add(b, group.Add(c,d));</pre>
-template <class T> class QuotientRing : public AbstractRing<typename T::Element>
-{
-public:
-	typedef T EuclideanDomain;
-	typedef typename T::Element Element;
-
-	QuotientRing(const EuclideanDomain &domain, const Element &modulus)
-		: m_domain(domain), m_modulus(modulus) {}
-
-	const EuclideanDomain & GetDomain() const
-		{return m_domain;}
-
-	const Element& GetModulus() const
-		{return m_modulus;}
-
-	bool Equal(const Element &a, const Element &b) const
-		{return m_domain.Equal(m_domain.Mod(m_domain.Subtract(a, b), m_modulus), m_domain.Identity());}
-
-	const Element& Identity() const
-		{return m_domain.Identity();}
-
-	const Element& Add(const Element &a, const Element &b) const
-		{return m_domain.Add(a, b);}
-
-	Element& Accumulate(Element &a, const Element &b) const
-		{return m_domain.Accumulate(a, b);}
-
-	const Element& Inverse(const Element &a) const
-		{return m_domain.Inverse(a);}
-
-	const Element& Subtract(const Element &a, const Element &b) const
-		{return m_domain.Subtract(a, b);}
-
-	Element& Reduce(Element &a, const Element &b) const
-		{return m_domain.Reduce(a, b);}
-
-	const Element& Double(const Element &a) const
-		{return m_domain.Double(a);}
-
-	bool IsUnit(const Element &a) const
-		{return m_domain.IsUnit(m_domain.Gcd(a, m_modulus));}
-
-	const Element& MultiplicativeIdentity() const
-		{return m_domain.MultiplicativeIdentity();}
-
-	const Element& Multiply(const Element &a, const Element &b) const
-		{return m_domain.Mod(m_domain.Multiply(a, b), m_modulus);}
-
-	const Element& Square(const Element &a) const
-		{return m_domain.Mod(m_domain.Square(a), m_modulus);}
-
-	const Element& MultiplicativeInverse(const Element &a) const;
-
-	bool operator==(const QuotientRing<T> &rhs) const
-		{return m_domain == rhs.m_domain && m_modulus == rhs.m_modulus;}
-
-protected:
-	EuclideanDomain m_domain;
-	Element m_modulus;
-};
-
-NAMESPACE_END
-
-#ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
-#include "algebra.cpp"
-#endif
-
-#endif
diff --git a/src-cryptopp/algparam.cpp b/src-cryptopp/algparam.cpp
deleted file mode 100644
index 5ef155f..0000000
--- a/src-cryptopp/algparam.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// algparam.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "algparam.h"
-#include "integer.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-PAssignIntToInteger g_pAssignIntToInteger = NULL;
-
-bool CombinedNameValuePairs::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-{
-	if (strcmp(name, "ValueNames") == 0)
-		return m_pairs1.GetVoidValue(name, valueType, pValue) && m_pairs2.GetVoidValue(name, valueType, pValue);
-	else
-		return m_pairs1.GetVoidValue(name, valueType, pValue) || m_pairs2.GetVoidValue(name, valueType, pValue);
-}
-
-void AlgorithmParametersBase::operator=(const AlgorithmParametersBase &rhs)
-{
-	CRYPTOPP_UNUSED(rhs);
-	CRYPTOPP_ASSERT(false);
-}
-
-bool AlgorithmParametersBase::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-{
-	if (strcmp(name, "ValueNames") == 0)
-	{
-		NameValuePairs::ThrowIfTypeMismatch(name, typeid(std::string), valueType);
-		if (m_next.get())
-		    m_next->GetVoidValue(name, valueType, pValue);
-		(*reinterpret_cast<std::string *>(pValue) += m_name) += ";";
-		return true;
-	}
-	else if (strcmp(name, m_name) == 0)
-	{
-		AssignValue(name, valueType, pValue);
-		m_used = true;
-		return true;
-	}
-	else if (m_next.get())
-		return m_next->GetVoidValue(name, valueType, pValue);
-	else
-	    return false;
-}
-
-AlgorithmParameters::AlgorithmParameters()
-	: m_defaultThrowIfNotUsed(true)
-{
-}
-
-AlgorithmParameters::AlgorithmParameters(const AlgorithmParameters &x)
-	: m_defaultThrowIfNotUsed(x.m_defaultThrowIfNotUsed)
-{
-	m_next.reset(const_cast<AlgorithmParameters &>(x).m_next.release());
-}
-
-AlgorithmParameters & AlgorithmParameters::operator=(const AlgorithmParameters &x)
-{
-	m_next.reset(const_cast<AlgorithmParameters &>(x).m_next.release());
-	return *this;
-}
-
-bool AlgorithmParameters::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-{
-	if (m_next.get())
-		return m_next->GetVoidValue(name, valueType, pValue);
-	else
-		return false;
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/algparam.h b/src-cryptopp/algparam.h
deleted file mode 100644
index 635aaaf..0000000
--- a/src-cryptopp/algparam.h
+++ /dev/null
@@ -1,580 +0,0 @@
-// algparam.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile algparam.h
-//! \brief Classes for working with NameValuePairs
-
-
-#ifndef CRYPTOPP_ALGPARAM_H
-#define CRYPTOPP_ALGPARAM_H
-
-#include "config.h"
-#include "cryptlib.h"
-
-// TODO: fix 6011 when the API/ABI can change
-#if (CRYPTOPP_MSC_VERSION >= 1400)
-# pragma warning(push)
-# pragma warning(disable: 6011 28193)
-#endif
-
-#include "smartptr.h"
-#include "secblock.h"
-#include "integer.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class ConstByteArrayParameter
-//! \brief Used to pass byte array input as part of a NameValuePairs object
-class ConstByteArrayParameter
-{
-public:
-	//! \brief Construct a ConstByteArrayParameter
-	//! \param data a C-String
-	//! \param deepCopy flag indicating whether the data should be copied
-	//! \details The deepCopy option is used when the NameValuePairs object can't
-	//!   keep a copy of the data available
-	ConstByteArrayParameter(const char *data = NULL, bool deepCopy = false)
-		: m_deepCopy(false), m_data(NULL), m_size(0)
-	{
-		Assign((const byte *)data, data ? strlen(data) : 0, deepCopy);
-	}
-
-	//! \brief Construct a ConstByteArrayParameter
-	//! \param data a memory buffer
-	//! \param size the length of the memory buffer
-	//! \param deepCopy flag indicating whether the data should be copied
-	//! \details The deepCopy option is used when the NameValuePairs object can't
-	//!   keep a copy of the data available
-	ConstByteArrayParameter(const byte *data, size_t size, bool deepCopy = false)
-		: m_deepCopy(false), m_data(NULL), m_size(0)
-	{
-		Assign(data, size, deepCopy);
-	}
-
-	//! \brief Construct a ConstByteArrayParameter
-	//! \tparam T a std::basic_string<char> class
-	//! \param string a std::basic_string<char> class
-	//! \param deepCopy flag indicating whether the data should be copied
-	//! \details The deepCopy option is used when the NameValuePairs object can't
-	//!   keep a copy of the data available
-	template <class T> ConstByteArrayParameter(const T &string, bool deepCopy = false)
-		: m_deepCopy(false), m_data(NULL), m_size(0)
-	{
-		CRYPTOPP_COMPILE_ASSERT(sizeof(CPP_TYPENAME T::value_type) == 1);
-		Assign((const byte *)string.data(), string.size(), deepCopy);
-	}
-
-	//! \brief Assign contents from a memory buffer
-	//! \param data a memory buffer
-	//! \param size the length of the memory buffer
-	//! \param deepCopy flag indicating whether the data should be copied
-	//! \details The deepCopy option is used when the NameValuePairs object can't
-	//!   keep a copy of the data available
-	void Assign(const byte *data, size_t size, bool deepCopy)
-	{
-		// This fires, which means: no data with a size, or data with no size.
-		// CRYPTOPP_ASSERT((data && size) || !(data || size));
-		if (deepCopy)
-			m_block.Assign(data, size);
-		else
-		{
-			m_data = data;
-			m_size = size;
-		}
-		m_deepCopy = deepCopy;
-	}
-
-	//! \brief Pointer to the first byte in the memory block
-	const byte *begin() const {return m_deepCopy ? m_block.begin() : m_data;}
-	//! \brief Pointer beyond the last byte in the memory block
-	const byte *end() const {return m_deepCopy ? m_block.end() : m_data + m_size;}
-	//! \brief Length of the memory block
-	size_t size() const {return m_deepCopy ? m_block.size() : m_size;}
-
-private:
-	bool m_deepCopy;
-	const byte *m_data;
-	size_t m_size;
-	SecByteBlock m_block;
-};
-
-//! \class ByteArrayParameter
-//! \brief Used to pass byte array input as part of a NameValuePairs object
-class ByteArrayParameter
-{
-public:
-	//! \brief Construct a ByteArrayParameter
-	//! \param data a memory buffer
-	//! \param size the length of the memory buffer
-	ByteArrayParameter(byte *data = NULL, unsigned int size = 0)
-		: m_data(data), m_size(size) {}
-
-	//! \brief Construct a ByteArrayParameter
-	//! \param block a SecByteBlock
-	ByteArrayParameter(SecByteBlock &block)
-		: m_data(block.begin()), m_size(block.size()) {}
-
-	//! \brief Pointer to the first byte in the memory block
-	byte *begin() const {return m_data;}
-	//! \brief Pointer beyond the last byte in the memory block
-	byte *end() const {return m_data + m_size;}
-	//! \brief Length of the memory block
-	size_t size() const {return m_size;}
-
-private:
-	byte *m_data;
-	size_t m_size;
-};
-
-//! \class CombinedNameValuePairs
-//! \brief Combines two sets of NameValuePairs
-//! \details CombinedNameValuePairs allows you to provide two sets of of NameValuePairs.
-//!   If a name is not found in the first set, then the second set is searched for the
-//!   name and value pair. The second set of NameValuePairs often provides default values.
-class CRYPTOPP_DLL CombinedNameValuePairs : public NameValuePairs
-{
-public:
-	//! \brief Construct a CombinedNameValuePairs
-	//! \param pairs1 reference to the first set of NameValuePairs
-	//! \param pairs2 reference to the second set of NameValuePairs
-	CombinedNameValuePairs(const NameValuePairs &pairs1, const NameValuePairs &pairs2)
-		: m_pairs1(pairs1), m_pairs2(pairs2) {}
-
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-
-private:
-	const NameValuePairs &m_pairs1, &m_pairs2;
-};
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-template <class T, class BASE>
-class GetValueHelperClass
-{
-public:
-	GetValueHelperClass(const T *pObject, const char *name, const std::type_info &valueType, void *pValue, const NameValuePairs *searchFirst)
-		: m_pObject(pObject), m_name(name), m_valueType(&valueType), m_pValue(pValue), m_found(false), m_getValueNames(false)
-	{
-		if (strcmp(m_name, "ValueNames") == 0)
-		{
-			m_found = m_getValueNames = true;
-			NameValuePairs::ThrowIfTypeMismatch(m_name, typeid(std::string), *m_valueType);
-			if (searchFirst)
-				searchFirst->GetVoidValue(m_name, valueType, pValue);
-			if (typeid(T) != typeid(BASE))
-				pObject->BASE::GetVoidValue(m_name, valueType, pValue);
-			((*reinterpret_cast<std::string *>(m_pValue) += "ThisPointer:") += typeid(T).name()) += ';';
-		}
-
-		if (!m_found && strncmp(m_name, "ThisPointer:", 12) == 0 && strcmp(m_name+12, typeid(T).name()) == 0)
-		{
-			NameValuePairs::ThrowIfTypeMismatch(m_name, typeid(T *), *m_valueType);
-			*reinterpret_cast<const T **>(pValue) = pObject;
-			m_found = true;
-			return;
-		}
-
-		if (!m_found && searchFirst)
-			m_found = searchFirst->GetVoidValue(m_name, valueType, pValue);
-
-		if (!m_found && typeid(T) != typeid(BASE))
-			m_found = pObject->BASE::GetVoidValue(m_name, valueType, pValue);
-	}
-
-	operator bool() const {return m_found;}
-
-	template <class R>
-	GetValueHelperClass<T,BASE> & operator()(const char *name, const R & (T::*pm)() const)
-	{
-		if (m_getValueNames)
-			(*reinterpret_cast<std::string *>(m_pValue) += name) += ";";
-		if (!m_found && strcmp(name, m_name) == 0)
-		{
-			NameValuePairs::ThrowIfTypeMismatch(name, typeid(R), *m_valueType);
-			*reinterpret_cast<R *>(m_pValue) = (m_pObject->*pm)();
-			m_found = true;
-		}
-		return *this;
-	}
-
-	GetValueHelperClass<T,BASE> &Assignable()
-	{
-#ifndef __INTEL_COMPILER	// ICL 9.1 workaround: Intel compiler copies the vTable pointer for some reason
-		if (m_getValueNames)
-			((*reinterpret_cast<std::string *>(m_pValue) += "ThisObject:") += typeid(T).name()) += ';';
-		if (!m_found && strncmp(m_name, "ThisObject:", 11) == 0 && strcmp(m_name+11, typeid(T).name()) == 0)
-		{
-			NameValuePairs::ThrowIfTypeMismatch(m_name, typeid(T), *m_valueType);
-			*reinterpret_cast<T *>(m_pValue) = *m_pObject;
-			m_found = true;
-		}
-#endif
-		return *this;
-	}
-
-private:
-	const T *m_pObject;
-	const char *m_name;
-	const std::type_info *m_valueType;
-	void *m_pValue;
-	bool m_found, m_getValueNames;
-};
-
-template <class BASE, class T>
-GetValueHelperClass<T, BASE> GetValueHelper(const T *pObject, const char *name, const std::type_info &valueType, void *pValue, const NameValuePairs *searchFirst=NULL, BASE *dummy=NULL)
-{
-	CRYPTOPP_UNUSED(dummy);
-	return GetValueHelperClass<T, BASE>(pObject, name, valueType, pValue, searchFirst);
-}
-
-template <class T>
-GetValueHelperClass<T, T> GetValueHelper(const T *pObject, const char *name, const std::type_info &valueType, void *pValue, const NameValuePairs *searchFirst=NULL)
-{
-	return GetValueHelperClass<T, T>(pObject, name, valueType, pValue, searchFirst);
-}
-
-// ********************************************************
-
-// VC60 workaround
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-template <class R>
-R Hack_DefaultValueFromConstReferenceType(const R &)
-{
-	return R();
-}
-
-template <class R>
-bool Hack_GetValueIntoConstReference(const NameValuePairs &source, const char *name, const R &value)
-{
-	return source.GetValue(name, const_cast<R &>(value));
-}
-
-template <class T, class BASE>
-class AssignFromHelperClass
-{
-public:
-	AssignFromHelperClass(T *pObject, const NameValuePairs &source)
-		: m_pObject(pObject), m_source(source), m_done(false)
-	{
-		if (source.GetThisObject(*pObject))
-			m_done = true;
-		else if (typeid(BASE) != typeid(T))
-			pObject->BASE::AssignFrom(source);
-	}
-
-	template <class R>
-	AssignFromHelperClass & operator()(const char *name, void (T::*pm)(R))	// VC60 workaround: "const R &" here causes compiler error
-	{
-		if (!m_done)
-		{
-			R value = Hack_DefaultValueFromConstReferenceType(reinterpret_cast<R>(*(int *)NULL));
-			if (!Hack_GetValueIntoConstReference(m_source, name, value))
-				throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name + "'");
-			(m_pObject->*pm)(value);
-		}
-		return *this;
-	}
-
-	template <class R, class S>
-	AssignFromHelperClass & operator()(const char *name1, const char *name2, void (T::*pm)(R, S))	// VC60 workaround: "const R &" here causes compiler error
-	{
-		if (!m_done)
-		{
-			R value1 = Hack_DefaultValueFromConstReferenceType(reinterpret_cast<R>(*(int *)NULL));
-			if (!Hack_GetValueIntoConstReference(m_source, name1, value1))
-				throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name1 + "'");
-			S value2 = Hack_DefaultValueFromConstReferenceType(reinterpret_cast<S>(*(int *)NULL));
-			if (!Hack_GetValueIntoConstReference(m_source, name2, value2))
-				throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name2 + "'");
-			(m_pObject->*pm)(value1, value2);
-		}
-		return *this;
-	}
-
-private:
-	T *m_pObject;
-	const NameValuePairs &m_source;
-	bool m_done;
-};
-#else
-template <class T, class BASE>
-class AssignFromHelperClass
-{
-public:
-	AssignFromHelperClass(T *pObject, const NameValuePairs &source)
-		: m_pObject(pObject), m_source(source), m_done(false)
-	{
-		if (source.GetThisObject(*pObject))
-			m_done = true;
-		else if (typeid(BASE) != typeid(T))
-			pObject->BASE::AssignFrom(source);
-	}
-
-	template <class R>
-	AssignFromHelperClass & operator()(const char *name, void (T::*pm)(const R&))
-	{
-		if (!m_done)
-		{
-			R value;
-			if (!m_source.GetValue(name, value))
-				throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name + "'");
-			(m_pObject->*pm)(value);
-		}
-		return *this;
-	}
-
-	template <class R, class S>
-	AssignFromHelperClass & operator()(const char *name1, const char *name2, void (T::*pm)(const R&, const S&))
-	{
-		if (!m_done)
-		{
-			R value1;
-			if (!m_source.GetValue(name1, value1))
-				throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name1 + "'");
-			S value2;
-			if (!m_source.GetValue(name2, value2))
-				throw InvalidArgument(std::string(typeid(T).name()) + ": Missing required parameter '" + name2 + "'");
-			(m_pObject->*pm)(value1, value2);
-		}
-		return *this;
-	}
-
-private:
-	T *m_pObject;
-	const NameValuePairs &m_source;
-	bool m_done;
-};
-#endif
-
-template <class BASE, class T>
-AssignFromHelperClass<T, BASE> AssignFromHelper(T *pObject, const NameValuePairs &source, BASE *dummy=NULL)
-{
-	CRYPTOPP_UNUSED(dummy);
-	return AssignFromHelperClass<T, BASE>(pObject, source);
-}
-
-template <class T>
-AssignFromHelperClass<T, T> AssignFromHelper(T *pObject, const NameValuePairs &source)
-{
-	return AssignFromHelperClass<T, T>(pObject, source);
-}
-
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-// ********************************************************
-
-// to allow the linker to discard Integer code if not needed.
-typedef bool (CRYPTOPP_API * PAssignIntToInteger)(const std::type_info &valueType, void *pInteger, const void *pInt);
-CRYPTOPP_DLL extern PAssignIntToInteger g_pAssignIntToInteger;
-
-CRYPTOPP_DLL const std::type_info & CRYPTOPP_API IntegerTypeId();
-
-//! \class AlgorithmParametersBase
-//! \brief Base class for AlgorithmParameters
-class CRYPTOPP_DLL AlgorithmParametersBase
-{
-public:
-	//! \class ParameterNotUsed
-	//! \brief Exception thrown when an AlgorithmParameter is unused
-	class ParameterNotUsed : public Exception
-	{
-	public:
-		ParameterNotUsed(const char *name) : Exception(OTHER_ERROR, std::string("AlgorithmParametersBase: parameter \"") + name + "\" not used") {}
-	};
-
-	// this is actually a move, not a copy
-	AlgorithmParametersBase(const AlgorithmParametersBase &x)
-		: m_name(x.m_name), m_throwIfNotUsed(x.m_throwIfNotUsed), m_used(x.m_used)
-	{
-		m_next.reset(const_cast<AlgorithmParametersBase &>(x).m_next.release());
-		x.m_used = true;
-	}
-
-	//! \brief Construct a AlgorithmParametersBase
-	//! \param name the parameter name
-	//! \param throwIfNotUsed flags indicating whether an exception should be thrown
-	//! \details If throwIfNotUsed is true, then a ParameterNotUsed exception
-	//!   will be thrown in the destructor if the parameter is not not retrieved.
-	AlgorithmParametersBase(const char *name, bool throwIfNotUsed)
-		: m_name(name), m_throwIfNotUsed(throwIfNotUsed), m_used(false) {}
-
-	virtual ~AlgorithmParametersBase() CRYPTOPP_THROW
-	{
-#ifdef CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE
-		if (!std::uncaught_exception())
-#else
-		try
-#endif
-		{
-			if (m_throwIfNotUsed && !m_used)
-				throw ParameterNotUsed(m_name);
-		}
-#ifndef CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE
-		catch(const Exception&)
-		{
-		}
-#endif
-	}
-
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-
-protected:
-	friend class AlgorithmParameters;
-	void operator=(const AlgorithmParametersBase& rhs);	// assignment not allowed, declare this for VC60
-
-	virtual void AssignValue(const char *name, const std::type_info &valueType, void *pValue) const =0;
-	virtual void MoveInto(void *p) const =0;	// not really const
-
-	const char *m_name;
-	bool m_throwIfNotUsed;
-	mutable bool m_used;
-	member_ptr<AlgorithmParametersBase> m_next;
-};
-
-//! \class AlgorithmParametersTemplate
-//! \brief Template base class for AlgorithmParameters
-//! \tparam T the class or type
-template <class T>
-class AlgorithmParametersTemplate : public AlgorithmParametersBase
-{
-public:
-	//! \brief Construct an AlgorithmParametersTemplate
-	//! \param name the name of the value
-	//! \param value a reference to the value
-	//! \param throwIfNotUsed flags indicating whether an exception should be thrown
-	//! \details If throwIfNotUsed is true, then a ParameterNotUsed exception
-	//!   will be thrown in the destructor if the parameter is not not retrieved.
-	AlgorithmParametersTemplate(const char *name, const T &value, bool throwIfNotUsed)
-		: AlgorithmParametersBase(name, throwIfNotUsed), m_value(value)
-	{
-	}
-
-	void AssignValue(const char *name, const std::type_info &valueType, void *pValue) const
-	{
-		// special case for retrieving an Integer parameter when an int was passed in
-		if (!(g_pAssignIntToInteger != NULL && typeid(T) == typeid(int) && g_pAssignIntToInteger(valueType, pValue, &m_value)))
-		{
-			NameValuePairs::ThrowIfTypeMismatch(name, typeid(T), valueType);
-			*reinterpret_cast<T *>(pValue) = m_value;
-		}
-	}
-
-#if defined(DEBUG_NEW) && (_MSC_VER >= 1300)
-# pragma push_macro("new")
-# undef new
-#endif
-
-	void MoveInto(void *buffer) const
-	{
-		AlgorithmParametersTemplate<T>* p = new(buffer) AlgorithmParametersTemplate<T>(*this);
-		CRYPTOPP_UNUSED(p);	// silence warning
-	}
-
-#if defined(DEBUG_NEW) && (_MSC_VER >= 1300)
-# pragma pop_macro("new")
-#endif
-
-protected:
-	T m_value;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS AlgorithmParametersTemplate<bool>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AlgorithmParametersTemplate<int>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AlgorithmParametersTemplate<ConstByteArrayParameter>;
-
-//! \class AlgorithmParameters
-//! \brief An object that implements NameValuePairs
-//! \tparam T the class or type
-//! \param name the name of the object or value to retrieve
-//! \param value reference to a variable that receives the value
-//! \param throwIfNotUsed if true, the object will throw an exception if the value is not accessed
-//! \note throwIfNotUsed is ignored if using a compiler that does not support std::uncaught_exception(),
-//!   such as MSVC 7.0 and earlier.
-//! \note A NameValuePairs object containing an arbitrary number of name value pairs may be constructed by
-//!   repeatedly using operator() on the object returned by MakeParameters, for example:
-//!   <pre>
-//!     AlgorithmParameters parameters = MakeParameters(name1, value1)(name2, value2)(name3, value3);
-//!   </pre>
-class CRYPTOPP_DLL AlgorithmParameters : public NameValuePairs
-{
-public:
-	AlgorithmParameters();
-
-#ifdef __BORLANDC__
-	template <class T>
-	AlgorithmParameters(const char *name, const T &value, bool throwIfNotUsed=true)
-		: m_next(new AlgorithmParametersTemplate<T>(name, value, throwIfNotUsed))
-		, m_defaultThrowIfNotUsed(throwIfNotUsed)
-	{
-	}
-#endif
-
-	AlgorithmParameters(const AlgorithmParameters &x);
-
-	AlgorithmParameters & operator=(const AlgorithmParameters &x);
-
-	//! \tparam T the class or type
-	//! \param name the name of the object or value to retrieve
-	//! \param value reference to a variable that receives the value
-	//! \param throwIfNotUsed if true, the object will throw an exception if the value is not accessed
-	template <class T>
-	AlgorithmParameters & operator()(const char *name, const T &value, bool throwIfNotUsed)
-	{
-		member_ptr<AlgorithmParametersBase> p(new AlgorithmParametersTemplate<T>(name, value, throwIfNotUsed));
-		p->m_next.reset(m_next.release());
-		m_next.reset(p.release());
-		m_defaultThrowIfNotUsed = throwIfNotUsed;
-		return *this;
-	}
-
-	//! \brief Appends a NameValuePair to a collection of NameValuePairs
-	//! \tparam T the class or type
-	//! \param name the name of the object or value to retrieve
-	//! \param value reference to a variable that receives the value
-	template <class T>
-	AlgorithmParameters & operator()(const char *name, const T &value)
-	{
-		return operator()(name, value, m_defaultThrowIfNotUsed);
-	}
-
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-
-protected:
-	member_ptr<AlgorithmParametersBase> m_next;
-	bool m_defaultThrowIfNotUsed;
-};
-
-//! \brief Create an object that implements NameValuePairs
-//! \tparam T the class or type
-//! \param name the name of the object or value to retrieve
-//! \param value reference to a variable that receives the value
-//! \param throwIfNotUsed if true, the object will throw an exception if the value is not accessed
-//! \note throwIfNotUsed is ignored if using a compiler that does not support std::uncaught_exception(),
-//!   such as MSVC 7.0 and earlier.
-//! \note A NameValuePairs object containing an arbitrary number of name value pairs may be constructed by
-//!   repeatedly using \p operator() on the object returned by \p MakeParameters, for example:
-//!   <pre>
-//!     AlgorithmParameters parameters = MakeParameters(name1, value1)(name2, value2)(name3, value3);
-//!   </pre>
-#ifdef __BORLANDC__
-typedef AlgorithmParameters MakeParameters;
-#else
-template <class T>
-AlgorithmParameters MakeParameters(const char *name, const T &value, bool throwIfNotUsed = true)
-{
-	return AlgorithmParameters()(name, value, throwIfNotUsed);
-}
-#endif
-
-#define CRYPTOPP_GET_FUNCTION_ENTRY(name)		(Name::name(), &ThisClass::Get##name)
-#define CRYPTOPP_SET_FUNCTION_ENTRY(name)		(Name::name(), &ThisClass::Set##name)
-#define CRYPTOPP_SET_FUNCTION_ENTRY2(name1, name2)	(Name::name1(), Name::name2(), &ThisClass::Set##name1##And##name2)
-
-// TODO: fix 6011 when the API/ABI can change
-#if (CRYPTOPP_MSC_VERSION >= 1400)
-# pragma warning(pop)
-#endif
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/argnames.h b/src-cryptopp/argnames.h
deleted file mode 100644
index 9d8c161..0000000
--- a/src-cryptopp/argnames.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// argnames.h - written and placed in the public domain by Wei Dai
-
-//! \file argnames.h
-//! \brief Standard names for retrieving values by name when working with \p NameValuePairs
-
-#ifndef CRYPTOPP_ARGNAMES_H
-#define CRYPTOPP_ARGNAMES_H
-
-#include "cryptlib.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-DOCUMENTED_NAMESPACE_BEGIN(Name)
-
-#define CRYPTOPP_DEFINE_NAME_STRING(name)	inline const char *name() {return #name;}
-
-CRYPTOPP_DEFINE_NAME_STRING(ValueNames)			//!< string, a list of value names with a semicolon (';') after each name
-CRYPTOPP_DEFINE_NAME_STRING(Version)			//!< int
-CRYPTOPP_DEFINE_NAME_STRING(Seed)				//!< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(Key)				//!< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(IV)					//!< ConstByteArrayParameter, also accepts const byte * for backwards compatibility
-CRYPTOPP_DEFINE_NAME_STRING(StolenIV)			//!< byte *
-CRYPTOPP_DEFINE_NAME_STRING(Rounds)				//!< int
-CRYPTOPP_DEFINE_NAME_STRING(FeedbackSize)		//!< int
-CRYPTOPP_DEFINE_NAME_STRING(WordSize)			//!< int, in bytes
-CRYPTOPP_DEFINE_NAME_STRING(BlockSize)			//!< int, in bytes
-CRYPTOPP_DEFINE_NAME_STRING(EffectiveKeyLength)	//!< int, in bits
-CRYPTOPP_DEFINE_NAME_STRING(KeySize)			//!< int, in bits
-CRYPTOPP_DEFINE_NAME_STRING(ModulusSize)		//!< int, in bits
-CRYPTOPP_DEFINE_NAME_STRING(SubgroupOrderSize)	//!< int, in bits
-CRYPTOPP_DEFINE_NAME_STRING(PrivateExponentSize)//!< int, in bits
-CRYPTOPP_DEFINE_NAME_STRING(Modulus)			//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(PublicExponent)		//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(PrivateExponent)	//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(PublicElement)		//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(SubgroupOrder)		//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(Cofactor)			//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(SubgroupGenerator)	//!< Integer, ECP::Point, or EC2N::Point
-CRYPTOPP_DEFINE_NAME_STRING(Curve)				//!< ECP or EC2N
-CRYPTOPP_DEFINE_NAME_STRING(GroupOID)			//!< OID
-CRYPTOPP_DEFINE_NAME_STRING(PointerToPrimeSelector)		//!< const PrimeSelector *
-CRYPTOPP_DEFINE_NAME_STRING(Prime1)				//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(Prime2)				//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(ModPrime1PrivateExponent)	//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(ModPrime2PrivateExponent)	//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(MultiplicativeInverseOfPrime2ModPrime1)	//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(QuadraticResidueModPrime1)	//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(QuadraticResidueModPrime2)	//!< Integer
-CRYPTOPP_DEFINE_NAME_STRING(PutMessage)			//!< bool
-CRYPTOPP_DEFINE_NAME_STRING(TruncatedDigestSize)	//!< int
-CRYPTOPP_DEFINE_NAME_STRING(BlockPaddingScheme)	//!< StreamTransformationFilter::BlockPaddingScheme
-CRYPTOPP_DEFINE_NAME_STRING(HashVerificationFilterFlags)		//!< word32
-CRYPTOPP_DEFINE_NAME_STRING(AuthenticatedDecryptionFilterFlags)	//!< word32
-CRYPTOPP_DEFINE_NAME_STRING(SignatureVerificationFilterFlags)	//!< word32
-CRYPTOPP_DEFINE_NAME_STRING(InputBuffer)		//!< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(OutputBuffer)		//!< ByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(InputFileName)		//!< const char *
-CRYPTOPP_DEFINE_NAME_STRING(InputFileNameWide)	//!< const wchar_t *
-CRYPTOPP_DEFINE_NAME_STRING(InputStreamPointer)	//!< std::istream *
-CRYPTOPP_DEFINE_NAME_STRING(InputBinaryMode)	//!< bool
-CRYPTOPP_DEFINE_NAME_STRING(OutputFileName)		//!< const char *
-CRYPTOPP_DEFINE_NAME_STRING(OutputFileNameWide)	//!< const wchar_t *
-CRYPTOPP_DEFINE_NAME_STRING(OutputStreamPointer)	//!< std::ostream *
-CRYPTOPP_DEFINE_NAME_STRING(OutputBinaryMode)	//!< bool
-CRYPTOPP_DEFINE_NAME_STRING(EncodingParameters)	//!< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(KeyDerivationParameters)	//!< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(Separator)			//< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(Terminator)			//< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(Uppercase)			//< bool
-CRYPTOPP_DEFINE_NAME_STRING(GroupSize)			//< int
-CRYPTOPP_DEFINE_NAME_STRING(Pad)				//< bool
-CRYPTOPP_DEFINE_NAME_STRING(PaddingByte)		//< byte
-CRYPTOPP_DEFINE_NAME_STRING(Log2Base)			//< int
-CRYPTOPP_DEFINE_NAME_STRING(EncodingLookupArray)	//< const byte *
-CRYPTOPP_DEFINE_NAME_STRING(DecodingLookupArray)	//< const byte *
-CRYPTOPP_DEFINE_NAME_STRING(InsertLineBreaks)	//< bool
-CRYPTOPP_DEFINE_NAME_STRING(MaxLineLength)		//< int
-CRYPTOPP_DEFINE_NAME_STRING(DigestSize)			//!< int, in bytes
-CRYPTOPP_DEFINE_NAME_STRING(L1KeyLength)		//!< int, in bytes
-CRYPTOPP_DEFINE_NAME_STRING(TableSize)			//!< int, in bytes
-CRYPTOPP_DEFINE_NAME_STRING(Blinding)			//!< bool, timing attack mitigations, ON by default
-CRYPTOPP_DEFINE_NAME_STRING(DerivedKey)			//!< ByteArrayParameter, key derivation, derived key
-CRYPTOPP_DEFINE_NAME_STRING(DerivedKeyLength)	//!< int, key derivation, derived key length in bytes
-CRYPTOPP_DEFINE_NAME_STRING(Personalization)	//!< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(PersonalizationSize)	//!< int, in bytes
-CRYPTOPP_DEFINE_NAME_STRING(Salt)				//!< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(Tweak)				//!< ConstByteArrayParameter
-CRYPTOPP_DEFINE_NAME_STRING(SaltSize)			//!< int, in bytes
-CRYPTOPP_DEFINE_NAME_STRING(TreeMode)			//< byte
-DOCUMENTED_NAMESPACE_END
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/asn.cpp b/src-cryptopp/asn.cpp
deleted file mode 100644
index 297ff01..0000000
--- a/src-cryptopp/asn.cpp
+++ /dev/null
@@ -1,606 +0,0 @@
-// asn.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "asn.h"
-
-#include <iomanip>
-#include <time.h>
-
-NAMESPACE_BEGIN(CryptoPP)
-USING_NAMESPACE(std)
-
-/// DER Length
-size_t DERLengthEncode(BufferedTransformation &bt, lword length)
-{
-	size_t i=0;
-	if (length <= 0x7f)
-	{
-		bt.Put(byte(length));
-		i++;
-	}
-	else
-	{
-		bt.Put(byte(BytePrecision(length) | 0x80));
-		i++;
-		for (int j=BytePrecision(length); j; --j)
-		{
-			bt.Put(byte(length >> (j-1)*8));
-			i++;
-		}
-	}
-	return i;
-}
-
-bool BERLengthDecode(BufferedTransformation &bt, lword &length, bool &definiteLength)
-{
-	byte b;
-
-	if (!bt.Get(b))
-		return false;
-
-	if (!(b & 0x80))
-	{
-		definiteLength = true;
-		length = b;
-	}
-	else
-	{
-		unsigned int lengthBytes = b & 0x7f;
-
-		if (lengthBytes == 0)
-		{
-			definiteLength = false;
-			return true;
-		}
-
-		definiteLength = true;
-		length = 0;
-		while (lengthBytes--)
-		{
-			if (length >> (8*(sizeof(length)-1)))
-				BERDecodeError();	// length about to overflow
-
-			if (!bt.Get(b))
-				return false;
-
-			length = (length << 8) | b;
-		}
-	}
-	return true;
-}
-
-bool BERLengthDecode(BufferedTransformation &bt, size_t &length)
-{
-	lword lw = 0;
-	bool definiteLength;
-	if (!BERLengthDecode(bt, lw, definiteLength))
-		BERDecodeError();
-	if (!SafeConvert(lw, length))
-		BERDecodeError();
-	return definiteLength;
-}
-
-void DEREncodeNull(BufferedTransformation &out)
-{
-	out.Put(TAG_NULL);
-	out.Put(0);
-}
-
-void BERDecodeNull(BufferedTransformation &in)
-{
-	byte b;
-	if (!in.Get(b) || b != TAG_NULL)
-		BERDecodeError();
-	size_t length;
-	if (!BERLengthDecode(in, length) || length != 0)
-		BERDecodeError();
-}
-
-/// ASN Strings
-size_t DEREncodeOctetString(BufferedTransformation &bt, const byte *str, size_t strLen)
-{
-	bt.Put(OCTET_STRING);
-	size_t lengthBytes = DERLengthEncode(bt, strLen);
-	bt.Put(str, strLen);
-	return 1+lengthBytes+strLen;
-}
-
-size_t DEREncodeOctetString(BufferedTransformation &bt, const SecByteBlock &str)
-{
-	return DEREncodeOctetString(bt, str.begin(), str.size());
-}
-
-size_t BERDecodeOctetString(BufferedTransformation &bt, SecByteBlock &str)
-{
-	byte b;
-	if (!bt.Get(b) || b != OCTET_STRING)
-		BERDecodeError();
-
-	size_t bc;
-	if (!BERLengthDecode(bt, bc))
-		BERDecodeError();
-
-	str.New(bc);
-	if (bc != bt.Get(str, bc))
-		BERDecodeError();
-	return bc;
-}
-
-size_t BERDecodeOctetString(BufferedTransformation &bt, BufferedTransformation &str)
-{
-	byte b;
-	if (!bt.Get(b) || b != OCTET_STRING)
-		BERDecodeError();
-
-	size_t bc;
-	if (!BERLengthDecode(bt, bc))
-		BERDecodeError();
-
-	bt.TransferTo(str, bc);
-	return bc;
-}
-
-size_t DEREncodeTextString(BufferedTransformation &bt, const std::string &str, byte asnTag)
-{
-	bt.Put(asnTag);
-	size_t lengthBytes = DERLengthEncode(bt, str.size());
-	bt.Put((const byte *)str.data(), str.size());
-	return 1+lengthBytes+str.size();
-}
-
-size_t BERDecodeTextString(BufferedTransformation &bt, std::string &str, byte asnTag)
-{
-	byte b;
-	if (!bt.Get(b) || b != asnTag)
-		BERDecodeError();
-
-	size_t bc;
-	if (!BERLengthDecode(bt, bc))
-		BERDecodeError();
-
-	SecByteBlock temp(bc);
-	if (bc != bt.Get(temp, bc))
-		BERDecodeError();
-	str.assign((char *)temp.begin(), bc);
-	return bc;
-}
-
-/// ASN BitString
-size_t DEREncodeBitString(BufferedTransformation &bt, const byte *str, size_t strLen, unsigned int unusedBits)
-{
-	bt.Put(BIT_STRING);
-	size_t lengthBytes = DERLengthEncode(bt, strLen+1);
-	bt.Put((byte)unusedBits);
-	bt.Put(str, strLen);
-	return 2+lengthBytes+strLen;
-}
-
-size_t BERDecodeBitString(BufferedTransformation &bt, SecByteBlock &str, unsigned int &unusedBits)
-{
-	byte b;
-	if (!bt.Get(b) || b != BIT_STRING)
-		BERDecodeError();
-
-	size_t bc;
-	if (!BERLengthDecode(bt, bc))
-		BERDecodeError();
-
-	byte unused;
-	if (!bt.Get(unused))
-		BERDecodeError();
-	unusedBits = unused;
-	str.resize(bc-1);
-	if ((bc-1) != bt.Get(str, bc-1))
-		BERDecodeError();
-	return bc-1;
-}
-
-void DERReencode(BufferedTransformation &source, BufferedTransformation &dest)
-{
-	byte tag;
-	source.Peek(tag);
-	BERGeneralDecoder decoder(source, tag);
-	DERGeneralEncoder encoder(dest, tag);
-	if (decoder.IsDefiniteLength())
-		decoder.TransferTo(encoder, decoder.RemainingLength());
-	else
-	{
-		while (!decoder.EndReached())
-			DERReencode(decoder, encoder);
-	}
-	decoder.MessageEnd();
-	encoder.MessageEnd();
-}
-
-void OID::EncodeValue(BufferedTransformation &bt, word32 v)
-{
-	for (unsigned int i=RoundUpToMultipleOf(STDMAX(7U,BitPrecision(v)), 7U)-7; i != 0; i-=7)
-		bt.Put((byte)(0x80 | ((v >> i) & 0x7f)));
-	bt.Put((byte)(v & 0x7f));
-}
-
-size_t OID::DecodeValue(BufferedTransformation &bt, word32 &v)
-{
-	byte b;
-	size_t i=0;
-	v = 0;
-	while (true)
-	{
-		if (!bt.Get(b))
-			BERDecodeError();
-		i++;
-		if (v >> (8*sizeof(v)-7))	// v about to overflow
-			BERDecodeError();
-		v <<= 7;
-		v += b & 0x7f;
-		if (!(b & 0x80))
-			return i;
-	}
-}
-
-void OID::DEREncode(BufferedTransformation &bt) const
-{
-	CRYPTOPP_ASSERT(m_values.size() >= 2);
-	ByteQueue temp;
-	temp.Put(byte(m_values[0] * 40 + m_values[1]));
-	for (size_t i=2; i<m_values.size(); i++)
-		EncodeValue(temp, m_values[i]);
-	bt.Put(OBJECT_IDENTIFIER);
-	DERLengthEncode(bt, temp.CurrentSize());
-	temp.TransferTo(bt);
-}
-
-void OID::BERDecode(BufferedTransformation &bt)
-{
-	byte b;
-	if (!bt.Get(b) || b != OBJECT_IDENTIFIER)
-		BERDecodeError();
-
-	size_t length;
-	if (!BERLengthDecode(bt, length) || length < 1)
-		BERDecodeError();
-
-	if (!bt.Get(b))
-		BERDecodeError();
-
-	length--;
-	m_values.resize(2);
-	m_values[0] = b / 40;
-	m_values[1] = b % 40;
-
-	while (length > 0)
-	{
-		word32 v;
-		size_t valueLen = DecodeValue(bt, v);
-		if (valueLen > length)
-			BERDecodeError();
-		m_values.push_back(v);
-		length -= valueLen;
-	}
-}
-
-void OID::BERDecodeAndCheck(BufferedTransformation &bt) const
-{
-	OID oid(bt);
-	if (*this != oid)
-		BERDecodeError();
-}
-
-inline BufferedTransformation & EncodedObjectFilter::CurrentTarget()
-{
-	if (m_flags & PUT_OBJECTS)
-		return *AttachedTransformation();
-	else
-		return TheBitBucket();
-}
-
-void EncodedObjectFilter::Put(const byte *inString, size_t length)
-{
-	if (m_nCurrentObject == m_nObjects)
-	{
-		AttachedTransformation()->Put(inString, length);
-		return;
-	}
-
-	LazyPutter lazyPutter(m_queue, inString, length);
-
-	while (m_queue.AnyRetrievable())
-	{
-		switch (m_state)
-		{
-		case IDENTIFIER:
-			if (!m_queue.Get(m_id))
-				return;
-			m_queue.TransferTo(CurrentTarget(), 1);
-			m_state = LENGTH;	// fall through
-		case LENGTH:
-		{
-			byte b;
-			if (m_level > 0 && m_id == 0 && m_queue.Peek(b) && b == 0)
-			{
-				m_queue.TransferTo(CurrentTarget(), 1);
-				m_level--;
-				m_state = IDENTIFIER;
-				break;
-			}
-			ByteQueue::Walker walker(m_queue);
-			bool definiteLength;
-			if (!BERLengthDecode(walker, m_lengthRemaining, definiteLength))
-				return;
-			m_queue.TransferTo(CurrentTarget(), walker.GetCurrentPosition());
-			if (!((m_id & CONSTRUCTED) || definiteLength))
-				BERDecodeError();
-			if (!definiteLength)
-			{
-				if (!(m_id & CONSTRUCTED))
-					BERDecodeError();
-				m_level++;
-				m_state = IDENTIFIER;
-				break;
-			}
-			m_state = BODY;		// fall through
-		}
-		case BODY:
-			m_lengthRemaining -= m_queue.TransferTo(CurrentTarget(), m_lengthRemaining);
-
-			if (m_lengthRemaining == 0)
-				m_state = IDENTIFIER;
-
-		case TAIL:			// silence warnings
-		case ALL_DONE:
-		default: ;;
-		}
-
-		if (m_state == IDENTIFIER && m_level == 0)
-		{
-			// just finished processing a level 0 object
-			++m_nCurrentObject;
-
-			if (m_flags & PUT_MESSANGE_END_AFTER_EACH_OBJECT)
-				AttachedTransformation()->MessageEnd();
-
-			if (m_nCurrentObject == m_nObjects)
-			{
-				if (m_flags & PUT_MESSANGE_END_AFTER_ALL_OBJECTS)
-					AttachedTransformation()->MessageEnd();
-
-				if (m_flags & PUT_MESSANGE_SERIES_END_AFTER_ALL_OBJECTS)
-					AttachedTransformation()->MessageSeriesEnd();
-
-				m_queue.TransferAllTo(*AttachedTransformation());
-				return;
-			}
-		}
-	}
-}
-
-BERGeneralDecoder::BERGeneralDecoder(BufferedTransformation &inQueue, byte asnTag)
-	: m_inQueue(inQueue), m_finished(false)
-{
-	Init(asnTag);
-}
-
-BERGeneralDecoder::BERGeneralDecoder(BERGeneralDecoder &inQueue, byte asnTag)
-	: m_inQueue(inQueue), m_finished(false)
-{
-	Init(asnTag);
-}
-
-void BERGeneralDecoder::Init(byte asnTag)
-{
-	byte b;
-	if (!m_inQueue.Get(b) || b != asnTag)
-		BERDecodeError();
-
-	if (!BERLengthDecode(m_inQueue, m_length, m_definiteLength))
-		BERDecodeError();
-
-	if (!m_definiteLength && !(asnTag & CONSTRUCTED))
-		BERDecodeError();	// cannot be primitive and have indefinite length
-}
-
-BERGeneralDecoder::~BERGeneralDecoder()
-{
-	try	// avoid throwing in destructor
-	{
-		if (!m_finished)
-			MessageEnd();
-	}
-	catch (const Exception&)
-	{
-		// CRYPTOPP_ASSERT(0);
-	}
-}
-
-bool BERGeneralDecoder::EndReached() const
-{
-	if (m_definiteLength)
-		return m_length == 0;
-	else
-	{	// check end-of-content octets
-		word16 i;
-		return (m_inQueue.PeekWord16(i)==2 && i==0);
-	}
-}
-
-byte BERGeneralDecoder::PeekByte() const
-{
-	byte b;
-	if (!Peek(b))
-		BERDecodeError();
-	return b;
-}
-
-void BERGeneralDecoder::CheckByte(byte check)
-{
-	byte b;
-	if (!Get(b) || b != check)
-		BERDecodeError();
-}
-
-void BERGeneralDecoder::MessageEnd()
-{
-	m_finished = true;
-	if (m_definiteLength)
-	{
-		if (m_length != 0)
-			BERDecodeError();
-	}
-	else
-	{	// remove end-of-content octets
-		word16 i;
-		if (m_inQueue.GetWord16(i) != 2 || i != 0)
-			BERDecodeError();
-	}
-}
-
-size_t BERGeneralDecoder::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking)
-{
-	if (m_definiteLength && transferBytes > m_length)
-		transferBytes = m_length;
-	size_t blockedBytes = m_inQueue.TransferTo2(target, transferBytes, channel, blocking);
-	ReduceLength(transferBytes);
-	return blockedBytes;
-}
-
-size_t BERGeneralDecoder::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const
-{
-	if (m_definiteLength)
-		end = STDMIN(m_length, end);
-	return m_inQueue.CopyRangeTo2(target, begin, end, channel, blocking);
-}
-
-lword BERGeneralDecoder::ReduceLength(lword delta)
-{
-	if (m_definiteLength)
-	{
-		if (m_length < delta)
-			BERDecodeError();
-		m_length -= delta;
-	}
-	return delta;
-}
-
-DERGeneralEncoder::DERGeneralEncoder(BufferedTransformation &outQueue, byte asnTag)
-	: ByteQueue(), m_outQueue(outQueue), m_finished(false), m_asnTag(asnTag)
-{
-}
-
-// TODO: GCC (and likely other compilers) identify this as a copy constructor; and not a constructor.
-//   We have to wait until Crypto++ 6.0 to fix it becuase the signature change breaks versioning.
-DERGeneralEncoder::DERGeneralEncoder(DERGeneralEncoder &outQueue, byte asnTag)
-	: ByteQueue(), m_outQueue(outQueue), m_finished(false), m_asnTag(asnTag)
-{
-}
-
-DERGeneralEncoder::~DERGeneralEncoder()
-{
-	try	// avoid throwing in constructor
-	{
-		if (!m_finished)
-			MessageEnd();
-	}
-	catch (const Exception&)
-	{
-		CRYPTOPP_ASSERT(0);
-	}
-}
-
-void DERGeneralEncoder::MessageEnd()
-{
-	m_finished = true;
-	lword length = CurrentSize();
-	m_outQueue.Put(m_asnTag);
-	DERLengthEncode(m_outQueue, length);
-	TransferTo(m_outQueue);
-}
-
-// *************************************************************
-
-void X509PublicKey::BERDecode(BufferedTransformation &bt)
-{
-	BERSequenceDecoder subjectPublicKeyInfo(bt);
-		BERSequenceDecoder algorithm(subjectPublicKeyInfo);
-			GetAlgorithmID().BERDecodeAndCheck(algorithm);
-			bool parametersPresent = algorithm.EndReached() ? false : BERDecodeAlgorithmParameters(algorithm);
-		algorithm.MessageEnd();
-
-		BERGeneralDecoder subjectPublicKey(subjectPublicKeyInfo, BIT_STRING);
-			subjectPublicKey.CheckByte(0);	// unused bits
-			BERDecodePublicKey(subjectPublicKey, parametersPresent, (size_t)subjectPublicKey.RemainingLength());
-		subjectPublicKey.MessageEnd();
-	subjectPublicKeyInfo.MessageEnd();
-}
-
-void X509PublicKey::DEREncode(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder subjectPublicKeyInfo(bt);
-
-		DERSequenceEncoder algorithm(subjectPublicKeyInfo);
-			GetAlgorithmID().DEREncode(algorithm);
-			DEREncodeAlgorithmParameters(algorithm);
-		algorithm.MessageEnd();
-
-		DERGeneralEncoder subjectPublicKey(subjectPublicKeyInfo, BIT_STRING);
-			subjectPublicKey.Put(0);	// unused bits
-			DEREncodePublicKey(subjectPublicKey);
-		subjectPublicKey.MessageEnd();
-
-	subjectPublicKeyInfo.MessageEnd();
-}
-
-void PKCS8PrivateKey::BERDecode(BufferedTransformation &bt)
-{
-	BERSequenceDecoder privateKeyInfo(bt);
-		word32 version;
-		BERDecodeUnsigned<word32>(privateKeyInfo, version, INTEGER, 0, 0);	// check version
-
-		BERSequenceDecoder algorithm(privateKeyInfo);
-			GetAlgorithmID().BERDecodeAndCheck(algorithm);
-			bool parametersPresent = algorithm.EndReached() ? false : BERDecodeAlgorithmParameters(algorithm);
-		algorithm.MessageEnd();
-
-		BERGeneralDecoder octetString(privateKeyInfo, OCTET_STRING);
-			BERDecodePrivateKey(octetString, parametersPresent, (size_t)privateKeyInfo.RemainingLength());
-		octetString.MessageEnd();
-
-		if (!privateKeyInfo.EndReached())
-			BERDecodeOptionalAttributes(privateKeyInfo);
-	privateKeyInfo.MessageEnd();
-}
-
-void PKCS8PrivateKey::DEREncode(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder privateKeyInfo(bt);
-		DEREncodeUnsigned<word32>(privateKeyInfo, 0);	// version
-
-		DERSequenceEncoder algorithm(privateKeyInfo);
-			GetAlgorithmID().DEREncode(algorithm);
-			DEREncodeAlgorithmParameters(algorithm);
-		algorithm.MessageEnd();
-
-		DERGeneralEncoder octetString(privateKeyInfo, OCTET_STRING);
-			DEREncodePrivateKey(octetString);
-		octetString.MessageEnd();
-
-		DEREncodeOptionalAttributes(privateKeyInfo);
-	privateKeyInfo.MessageEnd();
-}
-
-void PKCS8PrivateKey::BERDecodeOptionalAttributes(BufferedTransformation &bt)
-{
-	DERReencode(bt, m_optionalAttributes);
-}
-
-void PKCS8PrivateKey::DEREncodeOptionalAttributes(BufferedTransformation &bt) const
-{
-	m_optionalAttributes.CopyTo(bt);
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/asn.h b/src-cryptopp/asn.h
deleted file mode 100644
index 52a184c..0000000
--- a/src-cryptopp/asn.h
+++ /dev/null
@@ -1,546 +0,0 @@
-// asn.h - written and placed in the public domain by Wei Dai
-
-//! \file asn.h
-//! \brief Classes and functions for working with ANS.1 objects
-
-#ifndef CRYPTOPP_ASN_H
-#define CRYPTOPP_ASN_H
-
-#include "cryptlib.h"
-#include "filters.h"
-#include "smartptr.h"
-#include "stdcpp.h"
-#include "queue.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief ASN.1 types
-//! \note These tags and flags are not complete
-enum ASNTag
-{
-	BOOLEAN 			= 0x01,
-	INTEGER 			= 0x02,
-	BIT_STRING			= 0x03,
-	OCTET_STRING		= 0x04,
-	TAG_NULL			= 0x05,
-	OBJECT_IDENTIFIER	= 0x06,
-	OBJECT_DESCRIPTOR	= 0x07,
-	EXTERNAL			= 0x08,
-	REAL				= 0x09,
-	ENUMERATED			= 0x0a,
-	UTF8_STRING			= 0x0c,
-	SEQUENCE			= 0x10,
-	SET 				= 0x11,
-	NUMERIC_STRING		= 0x12,
-	PRINTABLE_STRING 	= 0x13,
-	T61_STRING			= 0x14,
-	VIDEOTEXT_STRING 	= 0x15,
-	IA5_STRING			= 0x16,
-	UTC_TIME 			= 0x17,
-	GENERALIZED_TIME 	= 0x18,
-	GRAPHIC_STRING		= 0x19,
-	VISIBLE_STRING		= 0x1a,
-	GENERAL_STRING		= 0x1b
-};
-
-//! \brief ASN.1 flags
-//! \note These tags and flags are not complete
-enum ASNIdFlag
-{
-	UNIVERSAL			= 0x00,
-//	DATA				= 0x01,
-//	HEADER				= 0x02,
-	CONSTRUCTED 		= 0x20,
-	APPLICATION 		= 0x40,
-	CONTEXT_SPECIFIC	= 0x80,
-	PRIVATE 			= 0xc0
-};
-
-//! \brief Raises a BERDecodeErr
-inline void BERDecodeError() {throw BERDecodeErr();}
-
-//! \brief Exception thrown when an unknown object identifier is encountered
-class CRYPTOPP_DLL UnknownOID : public BERDecodeErr
-{
-public:
-	//! \brief Construct an UnknownOID
-	UnknownOID() : BERDecodeErr("BER decode error: unknown object identifier") {}
-	//! \brief Construct an UnknownOID
-	//! \param err error message to use for the execption
-	UnknownOID(const char *err) : BERDecodeErr(err) {}
-};
-
-// unsigned int DERLengthEncode(unsigned int length, byte *output=0);
-
-//! \brief DER encode a length
-//! \param bt BufferedTransformation object for writing
-//! \param length the size to encode
-//! \returns the number of octets used for the encoding
-CRYPTOPP_DLL size_t CRYPTOPP_API DERLengthEncode(BufferedTransformation &bt, lword length);
-
-//! \brief BER decode a length
-//! \param bt BufferedTransformation object for reading
-//! \param length the decoded size
-//! \returns true if the value was decoded
-//! \throws BERDecodeError if the value fails to decode or is too large for size_t
-//! \details BERLengthDecode() returns false if the encoding is indefinite length.
-CRYPTOPP_DLL bool CRYPTOPP_API BERLengthDecode(BufferedTransformation &bt, size_t &length);
-
-//! \brief DER encode NULL
-//! \param bt BufferedTransformation object for writing
-CRYPTOPP_DLL void CRYPTOPP_API DEREncodeNull(BufferedTransformation &bt);
-
-//! \brief BER decode NULL
-//! \param bt BufferedTransformation object for reading
-CRYPTOPP_DLL void CRYPTOPP_API BERDecodeNull(BufferedTransformation &bt);
-
-//! \brief DER encode octet string
-//! \param bt BufferedTransformation object for writing
-//! \param str the string to encode
-//! \param strLen the length of the string
-//! \returns the number of octets used for the encoding
-CRYPTOPP_DLL size_t CRYPTOPP_API DEREncodeOctetString(BufferedTransformation &bt, const byte *str, size_t strLen);
-
-//! \brief DER encode octet string
-//! \param bt BufferedTransformation object for reading
-//! \param str the string to encode
-//! \returns the number of octets used for the encoding
-CRYPTOPP_DLL size_t CRYPTOPP_API DEREncodeOctetString(BufferedTransformation &bt, const SecByteBlock &str);
-
-//! \brief BER decode octet string
-//! \param bt BufferedTransformation object for reading
-//! \param str the decoded string
-//! \returns the number of octets used for the encoding
-CRYPTOPP_DLL size_t CRYPTOPP_API BERDecodeOctetString(BufferedTransformation &bt, SecByteBlock &str);
-
-//! \brief BER decode octet string
-//! \param bt BufferedTransformation object for reading
-//! \param str the decoded string
-//! \returns the number of octets used for the encoding
-CRYPTOPP_DLL size_t CRYPTOPP_API BERDecodeOctetString(BufferedTransformation &bt, BufferedTransformation &str);
-
-//! \brief DER encode text string
-//! \param bt BufferedTransformation object for writing
-//! \param str the string to encode
-//! \param asnTag the ASN.1 type
-//! \returns the number of octets used for the encoding
-//! \details DEREncodeTextString() can be used for UTF8_STRING, PRINTABLE_STRING, and IA5_STRING
-CRYPTOPP_DLL size_t CRYPTOPP_API DEREncodeTextString(BufferedTransformation &bt, const std::string &str, byte asnTag);
-
-//! \brief BER decode text string
-//! \param bt BufferedTransformation object for reading
-//! \param str the string to encode
-//! \param asnTag the ASN.1 type
-//! \details DEREncodeTextString() can be used for UTF8_STRING, PRINTABLE_STRING, and IA5_STRING
-CRYPTOPP_DLL size_t CRYPTOPP_API BERDecodeTextString(BufferedTransformation &bt, std::string &str, byte asnTag);
-
-//! \brief DER encode bit string
-//! \param bt BufferedTransformation object for writing
-//! \param str the string to encode
-//! \param strLen the length of the string
-//! \param unusedBits the number of unused bits
-//! \returns the number of octets used for the encoding
-CRYPTOPP_DLL size_t CRYPTOPP_API DEREncodeBitString(BufferedTransformation &bt, const byte *str, size_t strLen, unsigned int unusedBits=0);
-
-//! \brief DER decode bit string
-//! \param bt BufferedTransformation object for reading
-//! \param str the decoded string
-//! \param unusedBits the number of unused bits
-CRYPTOPP_DLL size_t CRYPTOPP_API BERDecodeBitString(BufferedTransformation &bt, SecByteBlock &str, unsigned int &unusedBits);
-
-//! \brief BER decode and DER re-encode
-//! \param bt BufferedTransformation object for writing
-//! \param dest BufferedTransformation object
-CRYPTOPP_DLL void CRYPTOPP_API DERReencode(BufferedTransformation &bt, BufferedTransformation &dest);
-
-//! \brief Object Identifier
-class CRYPTOPP_DLL OID
-{
-public:
-	//! \brief Construct an OID
-	OID() {}
-	//! \brief Construct an OID
-	//! \param v value to initialize the OID
-	OID(word32 v) : m_values(1, v) {}
-	//! \brief Construct an OID
-	//! \param bt BufferedTransformation object
-	OID(BufferedTransformation &bt) {BERDecode(bt);}
-
-	//! \brief Append a value to an OID
-	//! \param rhs the value to append
-	inline OID & operator+=(word32 rhs) {m_values.push_back(rhs); return *this;}
-
-	//! \brief DER encode this OID
-	//! \param bt BufferedTransformation object
-	void DEREncode(BufferedTransformation &bt) const;
-
-	//! \brief BER decode an OID
-	//! \param bt BufferedTransformation object
-	void BERDecode(BufferedTransformation &bt);
-
-	//! \brief BER decode an OID
-	//! \param bt BufferedTransformation object
-	//! \throws BERDecodeErr() if decoded value doesn't match an expected OID
-	//! \details BERDecodeAndCheck() can be used to parse an OID and verify it matches an expected.
-	//! <pre>
-	//!   BERSequenceDecoder key(bt);
-	//!   ...
-	//!   BERSequenceDecoder algorithm(key);
-	//!   GetAlgorithmID().BERDecodeAndCheck(algorithm);
-	//! </pre>
-	void BERDecodeAndCheck(BufferedTransformation &bt) const;
-
-	std::vector<word32> m_values;
-
-private:
-	static void EncodeValue(BufferedTransformation &bt, word32 v);
-	static size_t DecodeValue(BufferedTransformation &bt, word32 &v);
-};
-
-//! \brief ASN.1 encoded object filter
-class EncodedObjectFilter : public Filter
-{
-public:
-	enum Flag {PUT_OBJECTS=1, PUT_MESSANGE_END_AFTER_EACH_OBJECT=2, PUT_MESSANGE_END_AFTER_ALL_OBJECTS=4, PUT_MESSANGE_SERIES_END_AFTER_ALL_OBJECTS=8};
-
-	//! \brief Construct an EncodedObjectFilter
-	//! \param attachment a BufferedTrasformation to attach to this object
-	//! \param nObjects
-	//! \param flags bitwise OR of EncodedObjectFilter::Flag
-	EncodedObjectFilter(BufferedTransformation *attachment = NULL, unsigned int nObjects = 1, word32 flags = 0);
-
-	//! \brief Input a byte buffer for processing
-	//! \param inString the byte buffer to process
-	//! \param length the size of the string, in bytes
-	void Put(const byte *inString, size_t length);
-
-	unsigned int GetNumberOfCompletedObjects() const {return m_nCurrentObject;}
-	unsigned long GetPositionOfObject(unsigned int i) const {return m_positions[i];}
-
-private:
-	BufferedTransformation & CurrentTarget();
-
-	word32 m_flags;
-	unsigned int m_nObjects, m_nCurrentObject, m_level;
-	std::vector<unsigned int> m_positions;
-	ByteQueue m_queue;
-	enum State {IDENTIFIER, LENGTH, BODY, TAIL, ALL_DONE} m_state;
-	byte m_id;
-	lword m_lengthRemaining;
-};
-
-//! \brief BER General Decoder
-class CRYPTOPP_DLL BERGeneralDecoder : public Store
-{
-public:
-	explicit BERGeneralDecoder(BufferedTransformation &inQueue, byte asnTag);
-	explicit BERGeneralDecoder(BERGeneralDecoder &inQueue, byte asnTag);
-	~BERGeneralDecoder();
-
-	bool IsDefiniteLength() const {return m_definiteLength;}
-	lword RemainingLength() const {CRYPTOPP_ASSERT(m_definiteLength); return m_length;}
-	bool EndReached() const;
-	byte PeekByte() const;
-	void CheckByte(byte b);
-
-	size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const;
-
-	// call this to denote end of sequence
-	void MessageEnd();
-
-protected:
-	BufferedTransformation &m_inQueue;
-	bool m_finished, m_definiteLength;
-	lword m_length;
-
-private:
-	void Init(byte asnTag);
-	void StoreInitialize(const NameValuePairs &parameters)
-		{CRYPTOPP_UNUSED(parameters); CRYPTOPP_ASSERT(false);}
-	lword ReduceLength(lword delta);
-};
-
-// GCC (and likely other compilers) identify the explicit DERGeneralEncoder as a copy constructor;
-// and not a constructor. We had to remove the default asnTag value to point the compiler in the
-// proper direction. We did not break the library or versioning based on the output of
-// `nm --demangle libcryptopp.a | grep DERGeneralEncoder::DERGeneralEncoder | grep -v " U "`.
-
-//! \brief DER General Encoder
-class CRYPTOPP_DLL DERGeneralEncoder : public ByteQueue
-{
-public:
-#if defined(CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562)
-	explicit DERGeneralEncoder(BufferedTransformation &outQueue, byte asnTag = SEQUENCE | CONSTRUCTED);
-	explicit DERGeneralEncoder(DERGeneralEncoder &outQueue, byte asnTag = SEQUENCE | CONSTRUCTED);
-#else
-	explicit DERGeneralEncoder(BufferedTransformation &outQueue, byte asnTag /*= SEQUENCE | CONSTRUCTED*/);
-	explicit DERGeneralEncoder(DERGeneralEncoder &outQueue, byte asnTag /*= SEQUENCE | CONSTRUCTED*/);
-#endif
-	~DERGeneralEncoder();
-
-	// call this to denote end of sequence
-	void MessageEnd();
-
-private:
-	BufferedTransformation &m_outQueue;
-	bool m_finished;
-
-	byte m_asnTag;
-};
-
-//! \brief BER Sequence Decoder
-class CRYPTOPP_DLL BERSequenceDecoder : public BERGeneralDecoder
-{
-public:
-	explicit BERSequenceDecoder(BufferedTransformation &inQueue, byte asnTag = SEQUENCE | CONSTRUCTED)
-		: BERGeneralDecoder(inQueue, asnTag) {}
-	explicit BERSequenceDecoder(BERSequenceDecoder &inQueue, byte asnTag = SEQUENCE | CONSTRUCTED)
-		: BERGeneralDecoder(inQueue, asnTag) {}
-};
-
-//! \brief DER Sequence Encoder
-class CRYPTOPP_DLL DERSequenceEncoder : public DERGeneralEncoder
-{
-public:
-	explicit DERSequenceEncoder(BufferedTransformation &outQueue, byte asnTag = SEQUENCE | CONSTRUCTED)
-		: DERGeneralEncoder(outQueue, asnTag) {}
-	explicit DERSequenceEncoder(DERSequenceEncoder &outQueue, byte asnTag = SEQUENCE | CONSTRUCTED)
-		: DERGeneralEncoder(outQueue, asnTag) {}
-};
-
-//! \brief BER Set Decoder
-class CRYPTOPP_DLL BERSetDecoder : public BERGeneralDecoder
-{
-public:
-	explicit BERSetDecoder(BufferedTransformation &inQueue, byte asnTag = SET | CONSTRUCTED)
-		: BERGeneralDecoder(inQueue, asnTag) {}
-	explicit BERSetDecoder(BERSetDecoder &inQueue, byte asnTag = SET | CONSTRUCTED)
-		: BERGeneralDecoder(inQueue, asnTag) {}
-};
-
-//! \brief DER Set Encoder
-class CRYPTOPP_DLL DERSetEncoder : public DERGeneralEncoder
-{
-public:
-	explicit DERSetEncoder(BufferedTransformation &outQueue, byte asnTag = SET | CONSTRUCTED)
-		: DERGeneralEncoder(outQueue, asnTag) {}
-	explicit DERSetEncoder(DERSetEncoder &outQueue, byte asnTag = SET | CONSTRUCTED)
-		: DERGeneralEncoder(outQueue, asnTag) {}
-};
-
-//! \brief Optional data encoder and decoder
-//! \tparam T class or type
-template <class T>
-class ASNOptional : public member_ptr<T>
-{
-public:
-	//! \brief BER decode optional data
-	//! \param seqDecoder sequence with the optional ASN.1 data
-	//! \param tag ASN.1 tag to match as optional data
-	//! \param mask the mask to apply when matching the tag
-	//! \sa ASNTag and ASNIdFlag
-	void BERDecode(BERSequenceDecoder &seqDecoder, byte tag, byte mask = ~CONSTRUCTED)
-	{
-		byte b;
-		if (seqDecoder.Peek(b) && (b & mask) == tag)
-			reset(new T(seqDecoder));
-	}
-
-	//! \brief DER encode optional data
-	//! \param out BufferedTransformation object
-	void DEREncode(BufferedTransformation &out)
-	{
-		if (this->get() != NULL)
-			this->get()->DEREncode(out);
-	}
-};
-
-//! \brief Encode and decode ASN.1 objects with additional information
-//! \tparam BASE base class or type
-//! \details Encodes and decodes public keys, private keys and group
-//!   parameters with OID identifying the algorithm or scheme.
-template <class BASE>
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE ASN1CryptoMaterial : public ASN1Object, public BASE
-{
-public:
-	//! \brief DER encode ASN.1 object
-	//! \param bt BufferedTransformation object
-	//! \details Save() will write the OID associated with algorithm or scheme.
-	//!   In the case of public and private keys, this function writes the
-	//!   subjectPubicKeyInfo and privateKeyInfo parts.
-	void Save(BufferedTransformation &bt) const
-		{BEREncode(bt);}
-
-	//! \brief BER decode ASN.1 object
-	//! \param bt BufferedTransformation object
-	void Load(BufferedTransformation &bt)
-		{BERDecode(bt);}
-};
-
-//! \brief Encodes and decodes subjectPublicKeyInfo
-class CRYPTOPP_DLL X509PublicKey : public ASN1CryptoMaterial<PublicKey>
-{
-public:
-	void BERDecode(BufferedTransformation &bt);
-	void DEREncode(BufferedTransformation &bt) const;
-
-	//! \brief Retrieves the OID of the algorithm
-	//! \returns OID of the algorithm
-	virtual OID GetAlgorithmID() const =0;
-	virtual bool BERDecodeAlgorithmParameters(BufferedTransformation &bt)
-		{BERDecodeNull(bt); return false;}
-	virtual bool DEREncodeAlgorithmParameters(BufferedTransformation &bt) const
-		{DEREncodeNull(bt); return false;}	// see RFC 2459, section 7.3.1
-
-	//! decode subjectPublicKey part of subjectPublicKeyInfo, without the BIT STRING header
-	virtual void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size) =0;
-	//! encode subjectPublicKey part of subjectPublicKeyInfo, without the BIT STRING header
-	virtual void DEREncodePublicKey(BufferedTransformation &bt) const =0;
-};
-
-//! \brief Encodes and decodesprivateKeyInfo
-class CRYPTOPP_DLL PKCS8PrivateKey : public ASN1CryptoMaterial<PrivateKey>
-{
-public:
-	void BERDecode(BufferedTransformation &bt);
-	void DEREncode(BufferedTransformation &bt) const;
-
-	//! \brief Retrieves the OID of the algorithm
-	//! \returns OID of the algorithm
-	virtual OID GetAlgorithmID() const =0;
-	virtual bool BERDecodeAlgorithmParameters(BufferedTransformation &bt)
-		{BERDecodeNull(bt); return false;}
-	virtual bool DEREncodeAlgorithmParameters(BufferedTransformation &bt) const
-		{DEREncodeNull(bt); return false;}	// see RFC 2459, section 7.3.1
-
-	//! decode privateKey part of privateKeyInfo, without the OCTET STRING header
-	virtual void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size) =0;
-	//! encode privateKey part of privateKeyInfo, without the OCTET STRING header
-	virtual void DEREncodePrivateKey(BufferedTransformation &bt) const =0;
-
-	//! decode optional attributes including context-specific tag
-	/*! /note default implementation stores attributes to be output in DEREncodeOptionalAttributes */
-	virtual void BERDecodeOptionalAttributes(BufferedTransformation &bt);
-	//! encode optional attributes including context-specific tag
-	virtual void DEREncodeOptionalAttributes(BufferedTransformation &bt) const;
-
-protected:
-	ByteQueue m_optionalAttributes;
-};
-
-// ********************************************************
-
-//! \brief DER Encode unsigned value
-//! \tparam T class or type
-//! \param out BufferedTransformation object
-//! \param w unsigned value to encode
-//! \param asnTag the ASN.1 type
-//! \details DEREncodeUnsigned() can be used with INTEGER, BOOLEAN, and ENUM
-template <class T>
-size_t DEREncodeUnsigned(BufferedTransformation &out, T w, byte asnTag = INTEGER)
-{
-	byte buf[sizeof(w)+1];
-	unsigned int bc;
-	if (asnTag == BOOLEAN)
-	{
-		buf[sizeof(w)] = w ? 0xff : 0;
-		bc = 1;
-	}
-	else
-	{
-		buf[0] = 0;
-		for (unsigned int i=0; i<sizeof(w); i++)
-			buf[i+1] = byte(w >> (sizeof(w)-1-i)*8);
-		bc = sizeof(w);
-		while (bc > 1 && buf[sizeof(w)+1-bc] == 0)
-			--bc;
-		if (buf[sizeof(w)+1-bc] & 0x80)
-			++bc;
-	}
-	out.Put(asnTag);
-	size_t lengthBytes = DERLengthEncode(out, bc);
-	out.Put(buf+sizeof(w)+1-bc, bc);
-	return 1+lengthBytes+bc;
-}
-
-//! \brief BER Decode unsigned value
-//! \tparam T class or type
-//! \param in BufferedTransformation object
-//! \param w unsigned value to encode
-//! \param asnTag the ASN.1 type
-//! \param minValue the minimum expected value
-//! \param maxValue the maximum expected value
-//! \throws BERDecodeErr() if the value cannot be parsed or the decoded value is not within range.
-//! \details DEREncodeUnsigned() can be used with INTEGER, BOOLEAN, and ENUM
-template <class T>
-void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = INTEGER,
-					   T minValue = 0, T maxValue = ((std::numeric_limits<T>::max)()))
-{
-	byte b;
-	if (!in.Get(b) || b != asnTag)
-		BERDecodeError();
-
-	size_t bc;
-	bool definite = BERLengthDecode(in, bc);
-	if (!definite)
-		BERDecodeError();
-
-	SecByteBlock buf(bc);
-
-	if (bc != in.Get(buf, bc))
-		BERDecodeError();
-
-	const byte *ptr = buf;
-	while (bc > sizeof(w) && *ptr == 0)
-	{
-		bc--;
-		ptr++;
-	}
-	if (bc > sizeof(w))
-		BERDecodeError();
-
-	w = 0;
-	for (unsigned int i=0; i<bc; i++)
-		w = (w << 8) | ptr[i];
-
-	if (w < minValue || w > maxValue)
-		BERDecodeError();
-}
-
-#ifdef CRYPTOPP_DOXYGEN_PROCESSING
-//! \brief Compare two OIDs for equality
-//! \param lhs the first OID
-//! \param rhs the second OID
-//! \returns true if the OIDs are equal, false otherwise
-inline bool operator==(const OID &lhs, const OID &rhs);
-//! \brief Compare two OIDs for inequality
-//! \param lhs the first OID
-//! \param rhs the second OID
-//! \returns true if the OIDs are not equal, false otherwise
-inline bool operator!=(const OID &lhs, const OID &rhs);
-//! \brief Compare two OIDs for ordering
-//! \param lhs the first OID
-//! \param rhs the second OID
-//! \returns true if the first OID is less than the second OID, false otherwise
-//! \details operator<() calls std::lexicographical_compare() on each element in the array of values.
-inline bool operator<(const OID &lhs, const OID &rhs);
-//! \brief Append a value to an OID
-//! \param lhs the OID
-//! \param rhs the value to append
-inline OID operator+(const OID &lhs, unsigned long rhs);
-#else
-inline bool operator==(const ::CryptoPP::OID &lhs, const ::CryptoPP::OID &rhs)
-	{return lhs.m_values == rhs.m_values;}
-inline bool operator!=(const ::CryptoPP::OID &lhs, const ::CryptoPP::OID &rhs)
-	{return lhs.m_values != rhs.m_values;}
-inline bool operator<(const ::CryptoPP::OID &lhs, const ::CryptoPP::OID &rhs)
-	{return std::lexicographical_compare(lhs.m_values.begin(), lhs.m_values.end(), rhs.m_values.begin(), rhs.m_values.end());}
-inline ::CryptoPP::OID operator+(const ::CryptoPP::OID &lhs, unsigned long rhs)
-	{return ::CryptoPP::OID(lhs)+=rhs;}
-#endif
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/authenc.h b/src-cryptopp/authenc.h
deleted file mode 100644
index 5882c74..0000000
--- a/src-cryptopp/authenc.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// authenc.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile authenc.h
-//! \brief Base classes for working with authenticated encryption modes of encryption
-//! \since Crypto++ 5.6.0
-
-#ifndef CRYPTOPP_AUTHENC_H
-#define CRYPTOPP_AUTHENC_H
-
-#include "cryptlib.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class AuthenticatedSymmetricCipherBase
-//! \brief Base implementation for one direction (encryption or decryption) of a stream cipher or block cipher mode with authentication
-//! \since Crypto++ 5.6.0
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AuthenticatedSymmetricCipherBase : public AuthenticatedSymmetricCipher
-{
-public:
-	AuthenticatedSymmetricCipherBase() : m_state(State_Start), m_bufferedDataLength(0),
-		m_totalHeaderLength(0), m_totalMessageLength(0), m_totalFooterLength(0) {}
-
-	bool IsRandomAccess() const {return false;}
-	bool IsSelfInverting() const {return true;}
-
-	//! \brief Sets the key for this object without performing parameter validation
-	//! \param key a byte buffer used to key the cipher
-	//! \param length the length of the byte buffer
-	//! \param params additional parameters passed as  NameValuePairs
-	//! \details key must be at least DEFAULT_KEYLENGTH in length.
-	void UncheckedSetKey(const byte * key, unsigned int length,const CryptoPP::NameValuePairs &params)
-		{CRYPTOPP_UNUSED(key), CRYPTOPP_UNUSED(length), CRYPTOPP_UNUSED(params); CRYPTOPP_ASSERT(false);}
-
-	void SetKey(const byte *userKey, size_t keylength, const NameValuePairs &params);
-	void Restart() {if (m_state > State_KeySet) m_state = State_KeySet;}
-	void Resynchronize(const byte *iv, int length=-1);
-	void Update(const byte *input, size_t length);
-	void ProcessData(byte *outString, const byte *inString, size_t length);
-	void TruncatedFinal(byte *mac, size_t macSize);
-
-protected:
-	void AuthenticateData(const byte *data, size_t len);
-	const SymmetricCipher & GetSymmetricCipher() const {return const_cast<AuthenticatedSymmetricCipherBase *>(this)->AccessSymmetricCipher();};
-
-	virtual SymmetricCipher & AccessSymmetricCipher() =0;
-	virtual bool AuthenticationIsOnPlaintext() const =0;
-	virtual unsigned int AuthenticationBlockSize() const =0;
-	virtual void SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs &params) =0;
-	virtual void Resync(const byte *iv, size_t len) =0;
-	virtual size_t AuthenticateBlocks(const byte *data, size_t len) =0;
-	virtual void AuthenticateLastHeaderBlock() =0;
-	virtual void AuthenticateLastConfidentialBlock() {}
-	virtual void AuthenticateLastFooterBlock(byte *mac, size_t macSize) =0;
-
-	enum State {State_Start, State_KeySet, State_IVSet, State_AuthUntransformed, State_AuthTransformed, State_AuthFooter};
-	State m_state;
-	unsigned int m_bufferedDataLength;
-	lword m_totalHeaderLength, m_totalMessageLength, m_totalFooterLength;
-	AlignedSecByteBlock m_buffer;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/basecode.cpp b/src-cryptopp/basecode.cpp
deleted file mode 100644
index 954d11c..0000000
--- a/src-cryptopp/basecode.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-// basecode.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4100)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic ignored "-Wunused-value"
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "basecode.h"
-#include "fltrimpl.h"
-#include <ctype.h>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-void BaseN_Encoder::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	parameters.GetRequiredParameter("BaseN_Encoder", Name::EncodingLookupArray(), m_alphabet);
-
-	parameters.GetRequiredIntParameter("BaseN_Encoder", Name::Log2Base(), m_bitsPerChar);
-	if (m_bitsPerChar <= 0 || m_bitsPerChar >= 8)
-		throw InvalidArgument("BaseN_Encoder: Log2Base must be between 1 and 7 inclusive");
-
-	byte padding;
-	bool pad;
-	if (parameters.GetValue(Name::PaddingByte(), padding))
-		pad = parameters.GetValueWithDefault(Name::Pad(), true);
-	else
-		pad = false;
-	m_padding = pad ? padding : -1;
-
-	m_bytePos = m_bitPos = 0;
-
-	int i = 8;
-	while (i%m_bitsPerChar != 0)
-		i += 8;
-	m_outputBlockSize = i/m_bitsPerChar;
-
-	m_outBuf.New(m_outputBlockSize);
-}
-
-size_t BaseN_Encoder::Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	FILTER_BEGIN;
-	while (m_inputPosition < length)
-	{
-		if (m_bytePos == 0)
-			memset(m_outBuf, 0, m_outputBlockSize);
-
-		{
-		unsigned int b = begin[m_inputPosition++], bitsLeftInSource = 8;
-		while (true)
-		{
-			CRYPTOPP_ASSERT(m_bitsPerChar-m_bitPos >= 0);
-			unsigned int bitsLeftInTarget = (unsigned int)(m_bitsPerChar-m_bitPos);
-			m_outBuf[m_bytePos] |= b >> (8-bitsLeftInTarget);
-			if (bitsLeftInSource >= bitsLeftInTarget)
-			{
-				m_bitPos = 0;
-				++m_bytePos;
-				bitsLeftInSource -= bitsLeftInTarget;
-				if (bitsLeftInSource == 0)
-					break;
-				b <<= bitsLeftInTarget;
-				b &= 0xff;
-			}
-			else
-			{
-				m_bitPos += bitsLeftInSource;
-				break;
-			}
-		}
-		}
-
-		CRYPTOPP_ASSERT(m_bytePos <= m_outputBlockSize);
-		if (m_bytePos == m_outputBlockSize)
-		{
-			int i;
-			for (i=0; i<m_bytePos; i++)
-			{
-				CRYPTOPP_ASSERT(m_outBuf[i] < (1 << m_bitsPerChar));
-				m_outBuf[i] = m_alphabet[m_outBuf[i]];
-			}
-			FILTER_OUTPUT(1, m_outBuf, m_outputBlockSize, 0);
-
-			m_bytePos = m_bitPos = 0;
-		}
-	}
-	if (messageEnd)
-	{
-		if (m_bitPos > 0)
-			++m_bytePos;
-
-		int i;
-		for (i=0; i<m_bytePos; i++)
-			m_outBuf[i] = m_alphabet[m_outBuf[i]];
-
-		if (m_padding != -1 && m_bytePos > 0)
-		{
-			memset(m_outBuf+m_bytePos, m_padding, m_outputBlockSize-m_bytePos);
-			m_bytePos = m_outputBlockSize;
-		}
-		FILTER_OUTPUT(2, m_outBuf, m_bytePos, messageEnd);
-		m_bytePos = m_bitPos = 0;
-	}
-	FILTER_END_NO_MESSAGE_END;
-}
-
-void BaseN_Decoder::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	parameters.GetRequiredParameter("BaseN_Decoder", Name::DecodingLookupArray(), m_lookup);
-
-	parameters.GetRequiredIntParameter("BaseN_Decoder", Name::Log2Base(), m_bitsPerChar);
-	if (m_bitsPerChar <= 0 || m_bitsPerChar >= 8)
-		throw InvalidArgument("BaseN_Decoder: Log2Base must be between 1 and 7 inclusive");
-
-	m_bytePos = m_bitPos = 0;
-
-	int i = m_bitsPerChar;
-	while (i%8 != 0)
-		i += m_bitsPerChar;
-	m_outputBlockSize = i/8;
-
-	m_outBuf.New(m_outputBlockSize);
-}
-
-size_t BaseN_Decoder::Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	FILTER_BEGIN;
-	while (m_inputPosition < length)
-	{
-		unsigned int value;
-		value = m_lookup[begin[m_inputPosition++]];
-		if (value >= 256)
-			continue;
-
-		if (m_bytePos == 0 && m_bitPos == 0)
-			memset(m_outBuf, 0, m_outputBlockSize);
-
-		{
-			int newBitPos = m_bitPos + m_bitsPerChar;
-			if (newBitPos <= 8)
-				m_outBuf[m_bytePos] |= value << (8-newBitPos);
-			else
-			{
-				m_outBuf[m_bytePos] |= value >> (newBitPos-8);
-				m_outBuf[m_bytePos+1] |= value << (16-newBitPos);
-			}
-
-			m_bitPos = newBitPos;
-			while (m_bitPos >= 8)
-			{
-				m_bitPos -= 8;
-				++m_bytePos;
-			}
-		}
-
-		if (m_bytePos == m_outputBlockSize)
-		{
-			FILTER_OUTPUT(1, m_outBuf, m_outputBlockSize, 0);
-			m_bytePos = m_bitPos = 0;
-		}
-	}
-	if (messageEnd)
-	{
-		FILTER_OUTPUT(2, m_outBuf, m_bytePos, messageEnd);
-		m_bytePos = m_bitPos = 0;
-	}
-	FILTER_END_NO_MESSAGE_END;
-}
-
-void BaseN_Decoder::InitializeDecodingLookupArray(int *lookup, const byte *alphabet, unsigned int base, bool caseInsensitive)
-{
-	std::fill(lookup, lookup+256, -1);
-
-	for (unsigned int i=0; i<base; i++)
-	{
-		if (caseInsensitive && isalpha(alphabet[i]))
-		{
-			CRYPTOPP_ASSERT(lookup[toupper(alphabet[i])] == -1);
-			lookup[toupper(alphabet[i])] = i;
-			CRYPTOPP_ASSERT(lookup[tolower(alphabet[i])] == -1);
-			lookup[tolower(alphabet[i])] = i;
-		}
-		else
-		{
-			CRYPTOPP_ASSERT(lookup[alphabet[i]] == -1);
-			lookup[alphabet[i]] = i;
-		}
-	}
-}
-
-void Grouper::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	m_groupSize = parameters.GetIntValueWithDefault(Name::GroupSize(), 0);
-	ConstByteArrayParameter separator, terminator;
-	if (m_groupSize)
-		parameters.GetRequiredParameter("Grouper", Name::Separator(), separator);
-	else
-		parameters.GetValue(Name::Separator(), separator);
-	parameters.GetValue(Name::Terminator(), terminator);
-
-	m_separator.Assign(separator.begin(), separator.size());
-	m_terminator.Assign(terminator.begin(), terminator.size());
-	m_counter = 0;
-}
-
-size_t Grouper::Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	FILTER_BEGIN;
-	if (m_groupSize)
-	{
-		while (m_inputPosition < length)
-		{
-			if (m_counter == m_groupSize)
-			{
-				FILTER_OUTPUT(1, m_separator, m_separator.size(), 0);
-				m_counter = 0;
-			}
-
-			size_t len;
-			FILTER_OUTPUT2(2, len = STDMIN(length-m_inputPosition, m_groupSize-m_counter),
-				begin+m_inputPosition, len, 0);
-			m_inputPosition += len;
-			m_counter += len;
-		}
-	}
-	else
-		FILTER_OUTPUT(3, begin, length, 0);
-
-	if (messageEnd)
-	{
-		FILTER_OUTPUT(4, m_terminator, m_terminator.size(), messageEnd);
-		m_counter = 0;
-	}
-	FILTER_END_NO_MESSAGE_END
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/basecode.h b/src-cryptopp/basecode.h
deleted file mode 100644
index 02e27fc..0000000
--- a/src-cryptopp/basecode.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// basecode.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \brief Base classes for working with encoders and decoders.
-
-#ifndef CRYPTOPP_BASECODE_H
-#define CRYPTOPP_BASECODE_H
-
-#include "cryptlib.h"
-#include "filters.h"
-#include "algparam.h"
-#include "argnames.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class BaseN_Encoder
-//! \brief Encoder for bases that are a power of 2
-class CRYPTOPP_DLL BaseN_Encoder : public Unflushable<Filter>
-{
-public:
-	//! \brief Construct a BaseN_Encoder
-	//! \param attachment a BufferedTransformation to attach to this object
-	BaseN_Encoder(BufferedTransformation *attachment=NULL)
-		: m_alphabet(NULL), m_padding(0), m_bitsPerChar(0)
-		, m_outputBlockSize(0), m_bytePos(0), m_bitPos(0)
-			{Detach(attachment);}
-
-	//! \brief Construct a BaseN_Encoder
-	//! \param alphabet table of ASCII characters to use as the alphabet
-	//! \param log2base the log<sub>2</sub>base
-	//! \param attachment a BufferedTransformation to attach to this object
-	//! \param padding the character to use as padding
-	//! \pre log2base must be between 1 and 7 inclusive
-	//! \throws InvalidArgument if log2base is not between 1 and 7
-	BaseN_Encoder(const byte *alphabet, int log2base, BufferedTransformation *attachment=NULL, int padding=-1)
-		: m_alphabet(NULL), m_padding(0), m_bitsPerChar(0)
-		, m_outputBlockSize(0), m_bytePos(0), m_bitPos(0)
-	{
-		Detach(attachment);
-		IsolatedInitialize(MakeParameters(Name::EncodingLookupArray(), alphabet)
-			(Name::Log2Base(), log2base)
-			(Name::Pad(), padding != -1)
-			(Name::PaddingByte(), byte(padding)));
-	}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking);
-
-private:
-	const byte *m_alphabet;
-	int m_padding, m_bitsPerChar, m_outputBlockSize;
-	int m_bytePos, m_bitPos;
-	SecByteBlock m_outBuf;
-};
-
-//! \class BaseN_Decoder
-//! \brief Decoder for bases that are a power of 2
-class CRYPTOPP_DLL BaseN_Decoder : public Unflushable<Filter>
-{
-public:
-	//! \brief Construct a BaseN_Decoder
-	//! \param attachment a BufferedTransformation to attach to this object
-	//! \details padding is set to -1, which means use default padding. If not
-	//!   required, then the value must be set via IsolatedInitialize().
-	BaseN_Decoder(BufferedTransformation *attachment=NULL)
-		: m_lookup(0), m_padding(0), m_bitsPerChar(0)
-		, m_outputBlockSize(0), m_bytePos(0), m_bitPos(0)
-			{Detach(attachment);}
-
-	//! \brief Construct a BaseN_Decoder
-	//! \param lookup table of values
-	//! \param log2base the log<sub>2</sub>base
-	//! \param attachment a BufferedTransformation to attach to this object
-	//! \details log2base is the exponent (like 5 in 2<sup>5</sup>), and not
-	//!   the number of elements (like 32).
-	//! \details padding is set to -1, which means use default padding. If not
-	//!   required, then the value must be set via IsolatedInitialize().
-	BaseN_Decoder(const int *lookup, int log2base, BufferedTransformation *attachment=NULL)
-		: m_lookup(0), m_padding(0), m_bitsPerChar(0)
-		, m_outputBlockSize(0), m_bytePos(0), m_bitPos(0)
-	{
-		Detach(attachment);
-		IsolatedInitialize(MakeParameters(Name::DecodingLookupArray(), lookup)(Name::Log2Base(), log2base));
-	}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking);
-
-	//! \brief Intializes BaseN lookup array
-	//! \param lookup table of values
-	//! \param alphabet table of ASCII characters
-	//! \param base the base for the encoder
-	//! \param caseInsensitive flag indicating whether the alpabet is case sensitivie
-	//! \pre COUNTOF(lookup) == 256
-	//! \pre COUNTOF(alphabet) == base
-	//! \details Internally, the function sets the first 256 elements in the lookup table to
-	//!  their value from the alphabet array or -1. base is the number of element (like 32),
-	//!  and not an exponent (like 5 in 2<sup>5</sup>)
-	static void CRYPTOPP_API InitializeDecodingLookupArray(int *lookup, const byte *alphabet, unsigned int base, bool caseInsensitive);
-
-private:
-	const int *m_lookup;
-	int m_padding, m_bitsPerChar, m_outputBlockSize;
-	int m_bytePos, m_bitPos;
-	SecByteBlock m_outBuf;
-};
-
-//! \class Grouper
-//! \brief Filter that breaks input stream into groups of fixed size
-class CRYPTOPP_DLL Grouper : public Bufferless<Filter>
-{
-public:
-	//! \brief Construct a Grouper
-	//! \param attachment a BufferedTransformation to attach to this object
-	Grouper(BufferedTransformation *attachment=NULL)
-		: m_groupSize(0), m_counter(0) {Detach(attachment);}
-
-	//! \brief Construct a Grouper
-	//! \param groupSize the size of the grouping
-	//! \param separator the separator to use between groups
-	//! \param terminator the terminator appeand after processing
-	//! \param attachment a BufferedTransformation to attach to this object
-	Grouper(int groupSize, const std::string &separator, const std::string &terminator, BufferedTransformation *attachment=NULL)
-		: m_groupSize(0), m_counter(0)
-	{
-		Detach(attachment);
-		IsolatedInitialize(MakeParameters(Name::GroupSize(), groupSize)
-			(Name::Separator(), ConstByteArrayParameter(separator))
-			(Name::Terminator(), ConstByteArrayParameter(terminator)));
-	}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking);
-
-private:
-	SecByteBlock m_separator, m_terminator;
-	size_t m_groupSize, m_counter;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/blake2.cpp b/src-cryptopp/blake2.cpp
deleted file mode 100644
index 931a35b..0000000
--- a/src-cryptopp/blake2.cpp
+++ /dev/null
@@ -1,5074 +0,0 @@
-// blake2.cpp - written and placed in the public domain by Jeffrey Walton and Zooko
-//              Wilcox-O'Hearn. Copyright assigned to the Crypto++ project.
-//              Based on Aumasson, Neves, Wilcox-O'Hearn and Winnerlein's reference BLAKE2
-//              implementation at http://github.com/BLAKE2/BLAKE2.
-
-#include "pch.h"
-#include "config.h"
-#include "cryptlib.h"
-#include "argnames.h"
-#include "algparam.h"
-#include "blake2.h"
-#include "cpu.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// Uncomment for benchmarking C++ against SSE2 or NEON
-// #undef CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-// #undef CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-
-// Apple Clang 6.0/Clang 3.5 does not have SSSE3 intrinsics
-//   http://llvm.org/bugs/show_bug.cgi?id=20213
-#if (defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION <= 60000)) || (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION <= 30500))
-# undef CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-#endif
-
-// Sun Studio 12.3 and earlier lack SSE2's _mm_set_epi64x. Win32 lacks _mm_set_epi64x (Win64 supplies it except for VS2008).
-// Also see http://stackoverflow.com/a/38547909/608639
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && ((__SUNPRO_CC >= 0x5100 && __SUNPRO_CC < 0x5130) || (_MSC_VER >= 1200 && _MSC_VER < 1600) || (defined(_M_IX86) && _MSC_VER >= 1600))
-inline __m128i _mm_set_epi64x(const word64 a, const word64 b)
-{
-	const word64 t[2] = {b,a}; __m128i r;
-	memcpy(&r, &t, sizeof(r));
-	return r;
-}
-#endif
-
-// C/C++ implementation
-static void BLAKE2_CXX_Compress32(const byte* input, BLAKE2_State<word32, false>& state);
-static void BLAKE2_CXX_Compress64(const byte* input, BLAKE2_State<word64, true>& state);
-
-// Also see http://github.com/weidai11/cryptopp/issues/247 for singling out SunCC 5.12
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-static void BLAKE2_SSE2_Compress32(const byte* input, BLAKE2_State<word32, false>& state);
-# if (__SUNPRO_CC != 0x5120)
-static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>& state);
-# endif
-#endif
-
-#if CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-static void BLAKE2_SSE4_Compress32(const byte* input, BLAKE2_State<word32, false>& state);
-static void BLAKE2_SSE4_Compress64(const byte* input, BLAKE2_State<word64, true>& state);
-#endif
-
-#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-static void BLAKE2_NEON_Compress32(const byte* input, BLAKE2_State<word32, false>& state);
-static void BLAKE2_NEON_Compress64(const byte* input, BLAKE2_State<word64, true>& state);
-#endif
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-
-// IV and Sigma are a better fit as part of BLAKE2_Base, but that places
-//   the constants out of reach for the NEON, SSE2 and SSE4 implementations.
-template<bool T_64bit>
-struct CRYPTOPP_NO_VTABLE BLAKE2_IV {};
-
-//! \brief BLAKE2s initialization vector specialization
-template<>
-struct CRYPTOPP_NO_VTABLE BLAKE2_IV<false>
-{
-	CRYPTOPP_CONSTANT(IVSIZE = 8)
-	// Always align for NEON and SSE
-	CRYPTOPP_ALIGN_DATA(16) static const word32 iv[8];
-};
-
-CRYPTOPP_ALIGN_DATA(16)
-const word32 BLAKE2_IV<false>::iv[8] = {
-	0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,
-	0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL
-};
-
-#define BLAKE2S_IV(n) BLAKE2_IV<false>::iv[n]
-
-template<>
-struct CRYPTOPP_NO_VTABLE BLAKE2_IV<true>
-{
-	CRYPTOPP_CONSTANT(IVSIZE = 8)
-	// Always align for NEON and SSE
-	CRYPTOPP_ALIGN_DATA(16) static const word64 iv[8];
-};
-
-CRYPTOPP_ALIGN_DATA(16)
-const word64 BLAKE2_IV<true>::iv[8] = {
-	W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b),
-	W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1),
-	W64LIT(0x510e527fade682d1), W64LIT(0x9b05688c2b3e6c1f),
-	W64LIT(0x1f83d9abfb41bd6b), W64LIT(0x5be0cd19137e2179)
-};
-
-#define BLAKE2B_IV(n) BLAKE2_IV<true>::iv[n]
-
-// IV and Sigma are a better fit as part of BLAKE2_Base, but that places
-//   the constants out of reach for the NEON, SSE2 and SSE4 implementations.
-template<bool T_64bit>
-struct CRYPTOPP_NO_VTABLE BLAKE2_Sigma {};
-
-template<>
-struct CRYPTOPP_NO_VTABLE BLAKE2_Sigma<false>
-{
-	// Always align for NEON and SSE
-	CRYPTOPP_ALIGN_DATA(16) static const byte sigma[10][16];
-};
-
-CRYPTOPP_ALIGN_DATA(16)
-const byte BLAKE2_Sigma<false>::sigma[10][16] = {
-	{  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
-	{ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 },
-	{ 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 },
-	{  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 },
-	{  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 },
-	{  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 },
-	{ 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 },
-	{ 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 },
-	{  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 },
-	{ 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 },
-};
-
-//! \brief BLAKE2b sigma table specialization
-template<>
-struct CRYPTOPP_NO_VTABLE BLAKE2_Sigma<true>
-{
-	// Always align for NEON and SSE
-	CRYPTOPP_ALIGN_DATA(16) static const byte sigma[12][16];
-};
-
-CRYPTOPP_ALIGN_DATA(16)
-const byte BLAKE2_Sigma<true>::sigma[12][16] = {
-	{  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
-	{ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 },
-	{ 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 },
-	{  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 },
-	{  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 },
-	{  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 },
-	{ 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 },
-	{ 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 },
-	{  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 },
-	{ 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 },
-	{  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
-	{ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
-};
-
-typedef void (*pfnCompress32)(const byte*, BLAKE2_State<word32, false>&);
-typedef void (*pfnCompress64)(const byte*, BLAKE2_State<word64, true>&);
-
-pfnCompress64 InitializeCompress64Fn()
-{
-#if CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-	if (HasSSE4())
-		return &BLAKE2_SSE4_Compress64;
-	else
-#endif
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-# if (__SUNPRO_CC != 0x5120)
-	if (HasSSE2())
-		return &BLAKE2_SSE2_Compress64;
-	else
-# endif
-#endif
-#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-	if (HasNEON())
-		return &BLAKE2_NEON_Compress64;
-	else
-#endif
-	return &BLAKE2_CXX_Compress64;
-}
-
-pfnCompress32 InitializeCompress32Fn()
-{
-#if CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-	if (HasSSE4())
-		return &BLAKE2_SSE4_Compress32;
-	else
-#endif
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-	if (HasSSE2())
-		return &BLAKE2_SSE2_Compress32;
-	else
-#endif
-#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-	if (HasNEON())
-		return &BLAKE2_NEON_Compress32;
-	else
-#endif
-	return &BLAKE2_CXX_Compress32;
-}
-
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-BLAKE2_ParameterBlock<false>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyLen,
-		const byte* saltStr, size_t saltLen,
-		const byte* personalizationStr, size_t personalizationLen)
-{
-	// Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
-	digestLength = (byte)digestLen;
-	keyLength = (byte)keyLen;
-	fanout = depth = 1;
-	nodeDepth = innerLength = 0;
-
-	memset(leafLength, 0x00, COUNTOF(leafLength));
-	memset(nodeOffset, 0x00, COUNTOF(nodeOffset));
-
-	if (saltStr && saltLen)
-	{
-		memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
-		const size_t rem = COUNTOF(salt) - saltLen;
-		const size_t off = COUNTOF(salt) - rem;
-		if (rem)
-			memset(salt+off, 0x00, rem);
-	}
-	else
-	{
-		memset(salt, 0x00, COUNTOF(salt));
-	}
-
-	if (personalizationStr && personalizationLen)
-	{
-		memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
-		const size_t rem = COUNTOF(personalization) - personalizationLen;
-		const size_t off = COUNTOF(personalization) - rem;
-		if (rem)
-			memset(personalization+off, 0x00, rem);
-	}
-	else
-	{
-		memset(personalization, 0x00, COUNTOF(personalization));
-	}
-}
-
-BLAKE2_ParameterBlock<true>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyLen,
-		const byte* saltStr, size_t saltLen,
-		const byte* personalizationStr, size_t personalizationLen)
-{
-	// Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
-	digestLength = (byte)digestLen;
-	keyLength = (byte)keyLen;
-	fanout = depth = 1;
-	nodeDepth = innerLength = 0;
-
-	memset(rfu, 0x00, COUNTOF(rfu));
-	memset(leafLength, 0x00, COUNTOF(leafLength));
-	memset(nodeOffset, 0x00, COUNTOF(nodeOffset));
-
-	if (saltStr && saltLen)
-	{
-		memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
-		const size_t rem = COUNTOF(salt) - saltLen;
-		const size_t off = COUNTOF(salt) - rem;
-		if (rem)
-			memset(salt+off, 0x00, rem);
-	}
-	else
-	{
-		memset(salt, 0x00, COUNTOF(salt));
-	}
-
-	if (personalizationStr && personalizationLen)
-	{
-		memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
-		const size_t rem = COUNTOF(personalization) - personalizationLen;
-		const size_t off = COUNTOF(personalization) - rem;
-		if (rem)
-			memset(personalization+off, 0x00, rem);
-	}
-	else
-	{
-		memset(personalization, 0x00, COUNTOF(personalization));
-	}
-}
-
-template <class W, bool T_64bit>
-void BLAKE2_Base<W, T_64bit>::UncheckedSetKey(const byte *key, unsigned int length, const CryptoPP::NameValuePairs& params)
-{
-	if (key && length)
-	{
-		AlignedSecByteBlock temp(BLOCKSIZE);
-		memcpy_s(temp, BLOCKSIZE, key, length);
-
-		const size_t rem = BLOCKSIZE - length;
-		if (rem)
-			memset(temp+length, 0x00, rem);
-
-		m_key.swap(temp);
-	}
-	else
-	{
-		m_key.resize(0);
-	}
-
-#if defined(__COVERITY__)
-	// Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
-	ParameterBlock& block = *m_block.data();
-	memset(m_block.data(), 0x00, sizeof(ParameterBlock));
-#else
-	// Set Head bytes; Tail bytes are set below
-	ParameterBlock& block = *m_block.data();
-	memset(m_block.data(), 0x00, T_64bit ? 32 : 16);
-#endif
-
-	block.keyLength = (byte)length;
-	block.digestLength = (byte)params.GetIntValueWithDefault(Name::DigestSize(), DIGESTSIZE);
-	block.fanout = block.depth = 1;
-
-	ConstByteArrayParameter t;
-	if (params.GetValue(Name::Salt(), t) && t.begin() && t.size())
-	{
-		memcpy_s(block.salt, COUNTOF(block.salt), t.begin(), t.size());
-		const size_t rem = COUNTOF(block.salt) - t.size();
-		const size_t off = COUNTOF(block.salt) - rem;
-		if (rem)
-			memset(block.salt+off, 0x00, rem);
-	}
-	else
-	{
-		memset(block.salt, 0x00, COUNTOF(block.salt));
-	}
-
-	if (params.GetValue(Name::Personalization(), t) && t.begin() && t.size())
-	{
-		memcpy_s(block.personalization, COUNTOF(block.personalization), t.begin(), t.size());
-		const size_t rem = COUNTOF(block.personalization) - t.size();
-		const size_t off = COUNTOF(block.personalization) - rem;
-		if (rem)
-			memset(block.personalization+off, 0x00, rem);
-	}
-	else
-	{
-		memset(block.personalization, 0x00, COUNTOF(block.personalization));
-	}
-}
-
-template <class W, bool T_64bit>
-BLAKE2_Base<W, T_64bit>::BLAKE2_Base() : m_state(1), m_block(1), m_digestSize(DIGESTSIZE), m_treeMode(false)
-{
-	UncheckedSetKey(NULL, 0, g_nullNameValuePairs);
-	Restart();
-}
-
-template <class W, bool T_64bit>
-BLAKE2_Base<W, T_64bit>::BLAKE2_Base(bool treeMode, unsigned int digestSize) : m_state(1), m_block(1), m_digestSize(digestSize), m_treeMode(treeMode)
-{
-	CRYPTOPP_ASSERT(digestSize <= DIGESTSIZE);
-
-	UncheckedSetKey(NULL, 0, g_nullNameValuePairs);
-	Restart();
-}
-
-template <class W, bool T_64bit>
-BLAKE2_Base<W, T_64bit>::BLAKE2_Base(const byte *key, size_t keyLength, const byte* salt, size_t saltLength,
-	const byte* personalization, size_t personalizationLength, bool treeMode, unsigned int digestSize)
-	: m_state(1), m_block(1), m_digestSize(digestSize), m_treeMode(treeMode)
-{
-	CRYPTOPP_ASSERT(keyLength <= MAX_KEYLENGTH);
-	CRYPTOPP_ASSERT(digestSize <= DIGESTSIZE);
-	CRYPTOPP_ASSERT(saltLength <= SALTSIZE);
-	CRYPTOPP_ASSERT(personalizationLength <= PERSONALIZATIONSIZE);
-
-	UncheckedSetKey(key, static_cast<unsigned int>(keyLength), MakeParameters(Name::DigestSize(),(int)digestSize)(Name::TreeMode(),treeMode, false)
-		(Name::Salt(), ConstByteArrayParameter(salt, saltLength))(Name::Personalization(), ConstByteArrayParameter(personalization, personalizationLength)));
-	Restart();
-}
-
-template <class W, bool T_64bit>
-void BLAKE2_Base<W, T_64bit>::Restart()
-{
-	static const W zero[2] = {0,0};
-	Restart(*m_block.data(), zero);
-}
-
-template <class W, bool T_64bit>
-void BLAKE2_Base<W, T_64bit>::Restart(const BLAKE2_ParameterBlock<T_64bit>& block, const W counter[2])
-{
-	// We take a parameter block as a parameter to allow customized state.
-	// Avoid the copy of the parameter block when we are passing our own block.
-	if (&block != m_block.data())
-	{
-		memcpy_s(m_block.data(), sizeof(ParameterBlock), &block, sizeof(ParameterBlock));
-		m_block.data()->digestLength = (byte)m_digestSize;
-		m_block.data()->keyLength = (byte)m_key.size();
-	}
-
-	State& state = *m_state.data();
-	state.t[0] = state.t[1] = 0, state.f[0] = state.f[1] = 0, state.length = 0;
-
-	if (counter != NULL)
-	{
-		state.t[0] = counter[0];
-		state.t[1] = counter[1];
-	}
-
-	PutBlock<W, LittleEndian, true> put(m_block.data(), &state.h[0]);
-	put(BLAKE2_IV<T_64bit>::iv[0])(BLAKE2_IV<T_64bit>::iv[1])(BLAKE2_IV<T_64bit>::iv[2])(BLAKE2_IV<T_64bit>::iv[3]);
-	put(BLAKE2_IV<T_64bit>::iv[4])(BLAKE2_IV<T_64bit>::iv[5])(BLAKE2_IV<T_64bit>::iv[6])(BLAKE2_IV<T_64bit>::iv[7]);
-
-	// When BLAKE2 is keyed, the input stream is simply {key||message}. Key it
-	// during Restart to avoid FirstPut and friends. Key size == 0 means no key.
-	if (m_key.size())
-		Update(m_key, m_key.size());
-}
-
-template <class W, bool T_64bit>
-void BLAKE2_Base<W, T_64bit>::Update(const byte *input, size_t length)
-{
-	State& state = *m_state.data();
-	if (state.length + length > BLOCKSIZE)
-	{
-		// Complete current block
-		const size_t fill = BLOCKSIZE - state.length;
-		memcpy_s(&state.buffer[state.length], fill, input, fill);
-
-		IncrementCounter();
-		Compress(state.buffer);
-		state.length = 0;
-
-		length -= fill, input += fill;
-
-		// Compress in-place to avoid copies
-		while (length > BLOCKSIZE)
-		{
-			IncrementCounter();
-			Compress(input);
-			length -= BLOCKSIZE, input += BLOCKSIZE;
-		}
-	}
-
-	// Copy tail bytes
-	if (input && length)
-	{
-		CRYPTOPP_ASSERT(length <= BLOCKSIZE - state.length);
-		memcpy_s(&state.buffer[state.length], length, input, length);
-		state.length += static_cast<unsigned int>(length);
-	}
-}
-
-template <class W, bool T_64bit>
-void BLAKE2_Base<W, T_64bit>::TruncatedFinal(byte *hash, size_t size)
-{
-	this->ThrowIfInvalidTruncatedSize(size);
-
-	// Set last block unconditionally
-	State& state = *m_state.data();
-	state.f[0] = static_cast<W>(-1);
-
-	// Set last node if tree mode
-	if (m_treeMode)
-		state.f[1] = static_cast<W>(-1);
-
-	// Increment counter for tail bytes only
-	IncrementCounter(state.length);
-
-	memset(state.buffer + state.length, 0x00, BLOCKSIZE - state.length);
-	Compress(state.buffer);
-
-	// Copy to caller buffer
-	memcpy_s(hash, size, &state.h[0], size);
-
-	Restart();
-}
-
-template <class W, bool T_64bit>
-void BLAKE2_Base<W, T_64bit>::IncrementCounter(size_t count)
-{
-	State& state = *m_state.data();
-	state.t[0] += static_cast<W>(count);
-	state.t[1] += !!(state.t[0] < count);
-}
-
-template <>
-void BLAKE2_Base<word64, true>::Compress(const byte *input)
-{
-	// Selects the most advanced implmentation at runtime
-	static const pfnCompress64 s_pfn = InitializeCompress64Fn();
-	s_pfn(input, *m_state.data());
-}
-
-template <>
-void BLAKE2_Base<word32, false>::Compress(const byte *input)
-{
-	// Selects the most advanced implmentation at runtime
-	static const pfnCompress32 s_pfn = InitializeCompress32Fn();
-	s_pfn(input, *m_state.data());
-}
-
-void BLAKE2_CXX_Compress64(const byte* input, BLAKE2_State<word64, true>& state)
-{
-	#undef BLAKE2_G
-	#undef BLAKE2_ROUND
-
-	#define BLAKE2_G(r,i,a,b,c,d) \
-	  do { \
-	    a = a + b + m[BLAKE2_Sigma<true>::sigma[r][2*i+0]]; \
-	    d = rotrVariable<word64>(d ^ a, 32); \
-	    c = c + d; \
-	    b = rotrVariable<word64>(b ^ c, 24); \
-	    a = a + b + m[BLAKE2_Sigma<true>::sigma[r][2*i+1]]; \
-	    d = rotrVariable<word64>(d ^ a, 16); \
-	    c = c + d; \
-	    b = rotrVariable<word64>(b ^ c, 63); \
-	  } while(0)
-
-	#define BLAKE2_ROUND(r)  \
-	  do { \
-	    BLAKE2_G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-	    BLAKE2_G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-	    BLAKE2_G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-	    BLAKE2_G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-	    BLAKE2_G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-	    BLAKE2_G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-	    BLAKE2_G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-	    BLAKE2_G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-	  } while(0)
-
-	word64 m[16], v[16];
-
-	GetBlock<word64, LittleEndian, true> get1(input);
-	get1(m[0])(m[1])(m[2])(m[3])(m[4])(m[5])(m[6])(m[7])(m[8])(m[9])(m[10])(m[11])(m[12])(m[13])(m[14])(m[15]);
-
-	GetBlock<word64, LittleEndian, true> get2(&state.h[0]);
-	get2(v[0])(v[1])(v[2])(v[3])(v[4])(v[5])(v[6])(v[7]);
-
-	v[ 8] = BLAKE2B_IV(0);
-	v[ 9] = BLAKE2B_IV(1);
-	v[10] = BLAKE2B_IV(2);
-	v[11] = BLAKE2B_IV(3);
-	v[12] = state.t[0] ^ BLAKE2B_IV(4);
-	v[13] = state.t[1] ^ BLAKE2B_IV(5);
-	v[14] = state.f[0] ^ BLAKE2B_IV(6);
-	v[15] = state.f[1] ^ BLAKE2B_IV(7);
-
-	BLAKE2_ROUND( 0 );
-	BLAKE2_ROUND( 1 );
-	BLAKE2_ROUND( 2 );
-	BLAKE2_ROUND( 3 );
-	BLAKE2_ROUND( 4 );
-	BLAKE2_ROUND( 5 );
-	BLAKE2_ROUND( 6 );
-	BLAKE2_ROUND( 7 );
-	BLAKE2_ROUND( 8 );
-	BLAKE2_ROUND( 9 );
-	BLAKE2_ROUND( 10 );
-	BLAKE2_ROUND( 11 );
-
-	for(unsigned int i = 0; i < 8; ++i)
-		state.h[i] = state.h[i] ^ ConditionalByteReverse(LittleEndian::ToEnum(), v[i] ^ v[i + 8]);
-}
-
-void BLAKE2_CXX_Compress32(const byte* input, BLAKE2_State<word32, false>& state)
-{
-	#undef BLAKE2_G
-	#undef BLAKE2_ROUND
-
-	#define BLAKE2_G(r,i,a,b,c,d) \
-	  do { \
-	    a = a + b + m[BLAKE2_Sigma<false>::sigma[r][2*i+0]]; \
-	    d = rotrVariable<word32>(d ^ a, 16); \
-	    c = c + d; \
-	    b = rotrVariable<word32>(b ^ c, 12); \
-	    a = a + b + m[BLAKE2_Sigma<false>::sigma[r][2*i+1]]; \
-	    d = rotrVariable<word32>(d ^ a, 8); \
-	    c = c + d; \
-	    b = rotrVariable<word32>(b ^ c, 7); \
-	  } while(0)
-
-	#define BLAKE2_ROUND(r)  \
-	  do { \
-	    BLAKE2_G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-	    BLAKE2_G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-	    BLAKE2_G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-	    BLAKE2_G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-	    BLAKE2_G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-	    BLAKE2_G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-	    BLAKE2_G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-	    BLAKE2_G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-	  } while(0)
-
-	word32 m[16], v[16];
-
-	GetBlock<word32, LittleEndian, true> get1(input);
-	get1(m[0])(m[1])(m[2])(m[3])(m[4])(m[5])(m[6])(m[7])(m[8])(m[9])(m[10])(m[11])(m[12])(m[13])(m[14])(m[15]);
-
-	GetBlock<word32, LittleEndian, true> get2(&state.h[0]);
-	get2(v[0])(v[1])(v[2])(v[3])(v[4])(v[5])(v[6])(v[7]);
-
-	v[ 8] = BLAKE2S_IV(0);
-	v[ 9] = BLAKE2S_IV(1);
-	v[10] = BLAKE2S_IV(2);
-	v[11] = BLAKE2S_IV(3);
-	v[12] = state.t[0] ^ BLAKE2S_IV(4);
-	v[13] = state.t[1] ^ BLAKE2S_IV(5);
-	v[14] = state.f[0] ^ BLAKE2S_IV(6);
-	v[15] = state.f[1] ^ BLAKE2S_IV(7);
-
-	BLAKE2_ROUND( 0 );
-	BLAKE2_ROUND( 1 );
-	BLAKE2_ROUND( 2 );
-	BLAKE2_ROUND( 3 );
-	BLAKE2_ROUND( 4 );
-	BLAKE2_ROUND( 5 );
-	BLAKE2_ROUND( 6 );
-	BLAKE2_ROUND( 7 );
-	BLAKE2_ROUND( 8 );
-	BLAKE2_ROUND( 9 );
-
-	for(unsigned int i = 0; i < 8; ++i)
-		state.h[i] = state.h[i] ^ ConditionalByteReverse(LittleEndian::ToEnum(), v[i] ^ v[i + 8]);
-}
-
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-static void BLAKE2_SSE2_Compress32(const byte* input, BLAKE2_State<word32, false>& state)
-{
-  word32 m0, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15;
-  GetBlock<word32, LittleEndian, true> get(input);
-  get(m0)(m1)(m2)(m3)(m4)(m5)(m6)(m7)(m8)(m9)(m10)(m11)(m12)(m13)(m14)(m15);
-
-  __m128i row1,row2,row3,row4;
-  __m128i buf1,buf2,buf3,buf4;
-  __m128i ff0,ff1;
-
-  row1 = ff0 = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[0]));
-  row2 = ff1 = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[4]));
-  row3 = _mm_setr_epi32(BLAKE2S_IV(0),BLAKE2S_IV(1),BLAKE2S_IV(2),BLAKE2S_IV(3));
-  row4 = _mm_xor_si128(_mm_setr_epi32(BLAKE2S_IV(4),BLAKE2S_IV(5),BLAKE2S_IV(6),BLAKE2S_IV(7)),_mm_loadu_si128((const __m128i*)(const void*)(&state.t[0])));
-  buf1 = _mm_set_epi32(m6,m4,m2,m0);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m7,m5,m3,m1);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m14,m12,m10,m8);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m15,m13,m11,m9);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m13,m9,m4,m14);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m6,m15,m8,m10);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m5,m11,m0,m1);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m3,m7,m2,m12);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m15,m5,m12,m11);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m13,m2,m0,m8);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m9,m7,m3,m10);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m4,m1,m6,m14);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m11,m13,m3,m7);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m14,m12,m1,m9);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m15,m4,m5,m2);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m8,m0,m10,m6);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m10,m2,m5,m9);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m15,m4,m7,m0);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m3,m6,m11,m14);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m13,m8,m12,m1);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m8,m0,m6,m2);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m3,m11,m10,m12);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m1,m15,m7,m4);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m9,m14,m5,m13);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m4,m14,m1,m12);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m10,m13,m15,m5);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m8,m9,m6,m0);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m11,m2,m3,m7);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m3,m12,m7,m13);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m9,m1,m14,m11);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m2,m8,m15,m5);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m10,m6,m4,m0);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m0,m11,m14,m6);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m8,m3,m9,m15);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m10,m1,m13,m12);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m5,m4,m7,m2);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  buf1 = _mm_set_epi32(m1,m7,m8,m10);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf1),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf2 = _mm_set_epi32(m5,m6,m4,m2);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf2),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_set_epi32(m13,m3,m9,m15);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf3),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,16),_mm_slli_epi32(row4,16));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,12),_mm_slli_epi32(row2,20));
-
-  buf4 = _mm_set_epi32(m0,m12,m14,m11);
-  row1 = _mm_add_epi32(_mm_add_epi32(row1,buf4),row2);
-  row4 = _mm_xor_si128(row4,row1);
-  row4 = _mm_xor_si128(_mm_srli_epi32(row4,8),_mm_slli_epi32(row4,24));
-  row3 = _mm_add_epi32(row3,row4);
-  row2 = _mm_xor_si128(row2,row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2,7),_mm_slli_epi32(row2,25));
-
-  row4 = _mm_shuffle_epi32(row4,_MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3,_MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2,_MM_SHUFFLE(2,1,0,3));
-
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[0]),_mm_xor_si128(ff0,_mm_xor_si128(row1,row3)));
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[4]),_mm_xor_si128(ff1,_mm_xor_si128(row2,row4)));
-}
-
-# if (__SUNPRO_CC != 0x5120)
-static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>& state)
-{
-  word64 m0, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15;
-  GetBlock<word64, LittleEndian, true> get(input);
-  get(m0)(m1)(m2)(m3)(m4)(m5)(m6)(m7)(m8)(m9)(m10)(m11)(m12)(m13)(m14)(m15);
-
-  __m128i row1l, row1h, row2l, row2h;
-  __m128i row3l, row3h, row4l, row4h;
-  __m128i b0, b1, t0, t1;
-
-  row1l = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[0]));
-  row1h = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[2]));
-  row2l = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[4]));
-  row2h = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[6]));
-  row3l = _mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(0)));
-  row3h = _mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(2)));
-  row4l = _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(4))), _mm_loadu_si128((const __m128i*)(const void*)(&state.t[0])));
-  row4h = _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(6))), _mm_loadu_si128((const __m128i*)(const void*)(&state.f[0])));
-
-  b0 = _mm_set_epi64x(m2, m0);
-  b1 = _mm_set_epi64x(m6, m4);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l, 40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h, 40));
-
-  b0 = _mm_set_epi64x(m3, m1);
-  b1 = _mm_set_epi64x(m7, m5);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m10, m8);
-  b1 = _mm_set_epi64x(m14, m12);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m11, m9);
-  b1 = _mm_set_epi64x(m15, m13);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m4, m14);
-  b1 = _mm_set_epi64x(m13, m9);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m8, m10);
-  b1 = _mm_set_epi64x(m6, m15);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m0, m1);
-  b1 = _mm_set_epi64x(m5, m11);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m2, m12);
-  b1 = _mm_set_epi64x(m3, m7);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m12, m11);
-  b1 = _mm_set_epi64x(m15, m5);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m0, m8);
-  b1 = _mm_set_epi64x(m13, m2);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m3, m10);
-  b1 = _mm_set_epi64x(m9, m7);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m6, m14);
-  b1 = _mm_set_epi64x(m4, m1);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m3, m7);
-  b1 = _mm_set_epi64x(m11, m13);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m1, m9);
-  b1 = _mm_set_epi64x(m14, m12);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m5, m2);
-  b1 = _mm_set_epi64x(m15, m4);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m10, m6);
-  b1 = _mm_set_epi64x(m8, m0);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m5, m9);
-  b1 = _mm_set_epi64x(m10, m2);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m7, m0);
-  b1 = _mm_set_epi64x(m15, m4);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m11, m14);
-  b1 = _mm_set_epi64x(m3, m6);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-
-  b0 = _mm_set_epi64x(m12, m1);
-  b1 = _mm_set_epi64x(m13, m8);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m6, m2);
-  b1 = _mm_set_epi64x(m8, m0);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m10, m12);
-  b1 = _mm_set_epi64x(m3, m11);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m7, m4);
-  b1 = _mm_set_epi64x(m1, m15);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m5, m13);
-  b1 = _mm_set_epi64x(m9, m14);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m1, m12);
-  b1 = _mm_set_epi64x(m4, m14);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m15, m5);
-  b1 = _mm_set_epi64x(m10, m13);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m6, m0);
-  b1 = _mm_set_epi64x(m8, m9);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m3, m7);
-  b1 = _mm_set_epi64x(m11, m2);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m7, m13);
-  b1 = _mm_set_epi64x(m3, m12);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m14, m11);
-  b1 = _mm_set_epi64x(m9, m1);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m15, m5);
-  b1 = _mm_set_epi64x(m2, m8);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m4, m0);
-  b1 = _mm_set_epi64x(m10, m6);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m14, m6);
-  b1 = _mm_set_epi64x(m0, m11);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m9, m15);
-  b1 = _mm_set_epi64x(m8, m3);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m13, m12);
-  b1 = _mm_set_epi64x(m10, m1);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m7, m2);
-  b1 = _mm_set_epi64x(m5, m4);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m8, m10);
-  b1 = _mm_set_epi64x(m1, m7);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m4, m2);
-  b1 = _mm_set_epi64x(m5, m6);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m9, m15);
-  b1 = _mm_set_epi64x(m13, m3);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m14, m11);
-  b1 = _mm_set_epi64x(m0, m12);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m2, m0);
-  b1 = _mm_set_epi64x(m6, m4);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m3, m1);
-  b1 = _mm_set_epi64x(m7, m5);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m10, m8);
-  b1 = _mm_set_epi64x(m14, m12);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m11, m9);
-  b1 = _mm_set_epi64x(m15, m13);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  b0 = _mm_set_epi64x(m4, m14);
-  b1 = _mm_set_epi64x(m13, m9);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m8, m10);
-  b1 = _mm_set_epi64x(m6, m15);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0));
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m0, m1);
-  b1 = _mm_set_epi64x(m5, m11);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,32),_mm_slli_epi64(row4l,32));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,32),_mm_slli_epi64(row4h,32));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
-
-  b0 = _mm_set_epi64x(m2, m12);
-  b1 = _mm_set_epi64x(m3, m7);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_xor_si128(_mm_srli_epi64(row4l,16),_mm_slli_epi64(row4l,48));
-  row4h = _mm_xor_si128(_mm_srli_epi64(row4h,16),_mm_slli_epi64(row4h,48));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l,63),_mm_slli_epi64(row2l,1));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h,63),_mm_slli_epi64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l));
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h));
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
-
-  row1l = _mm_xor_si128(row3l, row1l);
-  row1h = _mm_xor_si128(row3h, row1h);
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[0]), _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&state.h[0])), row1l));
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[2]), _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&state.h[2])), row1h));
-
-  row2l = _mm_xor_si128(row4l, row2l);
-  row2h = _mm_xor_si128(row4h, row2h);
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[4]), _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&state.h[4])), row2l));
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[6]), _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&state.h[6])), row2h));
-}
-# endif // (__SUNPRO_CC != 0x5120)
-#endif  // CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-
-#if CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-static void BLAKE2_SSE4_Compress32(const byte* input, BLAKE2_State<word32, false>& state)
-{
-  __m128i row1, row2, row3, row4;
-  __m128i buf1, buf2, buf3, buf4;
-
-  __m128i t0, t1, t2;
-  __m128i ff0, ff1;
-
-  const __m128i r8 = _mm_set_epi8(12, 15, 14, 13, 8, 11, 10, 9, 4, 7, 6, 5, 0, 3, 2, 1);
-  const __m128i r16 = _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
-
-  const __m128i m0 = _mm_loadu_si128((const __m128i*)(const void*)(input + 00));
-  const __m128i m1 = _mm_loadu_si128((const __m128i*)(const void*)(input + 16));
-  const __m128i m2 = _mm_loadu_si128((const __m128i*)(const void*)(input + 32));
-  const __m128i m3 = _mm_loadu_si128((const __m128i*)(const void*)(input + 48));
-
-  row1 = ff0 = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[0]));
-  row2 = ff1 = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[4]));
-  row3 = _mm_setr_epi32(BLAKE2S_IV(0), BLAKE2S_IV(1), BLAKE2S_IV(2), BLAKE2S_IV(3));
-  row4 = _mm_xor_si128(_mm_setr_epi32(BLAKE2S_IV(4), BLAKE2S_IV(5), BLAKE2S_IV(6), BLAKE2S_IV(7)), _mm_loadu_si128((const __m128i*)(const void*)(&state.t[0])));
-  buf1 = _mm_castps_si128((_mm_shuffle_ps(_mm_castsi128_ps((m0)), _mm_castsi128_ps((m1)), _MM_SHUFFLE(2,0,2,0))));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  buf2 = _mm_castps_si128((_mm_shuffle_ps(_mm_castsi128_ps((m0)), _mm_castsi128_ps((m1)), _MM_SHUFFLE(3,1,3,1))));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  buf3 = _mm_castps_si128((_mm_shuffle_ps(_mm_castsi128_ps((m2)), _mm_castsi128_ps((m3)), _MM_SHUFFLE(2,0,2,0))));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  buf4 = _mm_castps_si128((_mm_shuffle_ps(_mm_castsi128_ps((m2)), _mm_castsi128_ps((m3)), _MM_SHUFFLE(3,1,3,1))));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_blend_epi16(m1, m2, 0x0C);
-  t1 = _mm_slli_si128(m3, 4);
-  t2 = _mm_blend_epi16(t0, t1, 0xF0);
-  buf1 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,1,0,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_shuffle_epi32(m2,_MM_SHUFFLE(0,0,2,0));
-  t1 = _mm_blend_epi16(m1,m3,0xC0);
-  t2 = _mm_blend_epi16(t0, t1, 0xF0);
-  buf2 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,3,0,1));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_slli_si128(m1, 4);
-  t1 = _mm_blend_epi16(m2, t0, 0x30);
-  t2 = _mm_blend_epi16(m0, t1, 0xF0);
-  buf3 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,3,0,1));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_unpackhi_epi32(m0,m1);
-  t1 = _mm_slli_si128(m3, 4);
-  t2 = _mm_blend_epi16(t0, t1, 0x0C);
-  buf4 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,3,0,1));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_unpackhi_epi32(m2,m3);
-  t1 = _mm_blend_epi16(m3,m1,0x0C);
-  t2 = _mm_blend_epi16(t0, t1, 0x0F);
-  buf1 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(3,1,0,2));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_unpacklo_epi32(m2,m0);
-  t1 = _mm_blend_epi16(t0, m0, 0xF0);
-  t2 = _mm_slli_si128(m3, 8);
-  buf2 = _mm_blend_epi16(t1, t2, 0xC0);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_blend_epi16(m0, m2, 0x3C);
-  t1 = _mm_srli_si128(m1, 12);
-  t2 = _mm_blend_epi16(t0,t1,0x03);
-  buf3 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(1,0,3,2));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_slli_si128(m3, 4);
-  t1 = _mm_blend_epi16(m0, m1, 0x33);
-  t2 = _mm_blend_epi16(t1, t0, 0xC0);
-  buf4 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(0,1,2,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_unpackhi_epi32(m0,m1);
-  t1 = _mm_unpackhi_epi32(t0, m2);
-  t2 = _mm_blend_epi16(t1, m3, 0x0C);
-  buf1 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(3,1,0,2));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_slli_si128(m2, 8);
-  t1 = _mm_blend_epi16(m3,m0,0x0C);
-  t2 = _mm_blend_epi16(t1, t0, 0xC0);
-  buf2 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,0,1,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_blend_epi16(m0,m1,0x0F);
-  t1 = _mm_blend_epi16(t0, m3, 0xC0);
-  buf3 = _mm_shuffle_epi32(t1, _MM_SHUFFLE(3,0,1,2));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_unpacklo_epi32(m0,m2);
-  t1 = _mm_unpackhi_epi32(m1,m2);
-  buf4 = _mm_unpacklo_epi64(t1,t0);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_unpacklo_epi64(m1,m2);
-  t1 = _mm_unpackhi_epi64(m0,m2);
-  t2 = _mm_blend_epi16(t0,t1,0x33);
-  buf1 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,0,1,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_unpackhi_epi64(m1,m3);
-  t1 = _mm_unpacklo_epi64(m0,m1);
-  buf2 = _mm_blend_epi16(t0,t1,0x33);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_unpackhi_epi64(m3,m1);
-  t1 = _mm_unpackhi_epi64(m2,m0);
-  buf3 = _mm_blend_epi16(t1,t0,0x33);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_blend_epi16(m0,m2,0x03);
-  t1 = _mm_slli_si128(t0, 8);
-  t2 = _mm_blend_epi16(t1,m3,0x0F);
-  buf4 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(1,2,0,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_unpackhi_epi32(m0,m1);
-  t1 = _mm_unpacklo_epi32(m0,m2);
-  buf1 = _mm_unpacklo_epi64(t0,t1);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_srli_si128(m2, 4);
-  t1 = _mm_blend_epi16(m0,m3,0x03);
-  buf2 = _mm_blend_epi16(t1,t0,0x3C);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_blend_epi16(m1,m0,0x0C);
-  t1 = _mm_srli_si128(m3, 4);
-  t2 = _mm_blend_epi16(t0,t1,0x30);
-  buf3 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(1,2,3,0));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_unpacklo_epi64(m1,m2);
-  t1= _mm_shuffle_epi32(m3, _MM_SHUFFLE(0,2,0,1));
-  buf4 = _mm_blend_epi16(t0,t1,0x33);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_slli_si128(m1, 12);
-  t1 = _mm_blend_epi16(m0,m3,0x33);
-  buf1 = _mm_blend_epi16(t1,t0,0xC0);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_blend_epi16(m3,m2,0x30);
-  t1 = _mm_srli_si128(m1, 4);
-  t2 = _mm_blend_epi16(t0,t1,0x03);
-  buf2 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,1,3,0));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_unpacklo_epi64(m0,m2);
-  t1 = _mm_srli_si128(m1, 4);
-  buf3 = _mm_shuffle_epi32(_mm_blend_epi16(t0,t1,0x0C), _MM_SHUFFLE(2,3,1,0));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_unpackhi_epi32(m1,m2);
-  t1 = _mm_unpackhi_epi64(m0,t0);
-  buf4 = _mm_shuffle_epi32(t1, _MM_SHUFFLE(3,0,1,2));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_unpackhi_epi32(m0,m1);
-  t1 = _mm_blend_epi16(t0,m3,0x0F);
-  buf1 = _mm_shuffle_epi32(t1,_MM_SHUFFLE(2,0,3,1));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_blend_epi16(m2,m3,0x30);
-  t1 = _mm_srli_si128(m0,4);
-  t2 = _mm_blend_epi16(t0,t1,0x03);
-  buf2 = _mm_shuffle_epi32(t2, _MM_SHUFFLE(1,0,2,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_unpackhi_epi64(m0,m3);
-  t1 = _mm_unpacklo_epi64(m1,m2);
-  t2 = _mm_blend_epi16(t0,t1,0x3C);
-  buf3 = _mm_shuffle_epi32(t2,_MM_SHUFFLE(0,2,3,1));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_unpacklo_epi32(m0,m1);
-  t1 = _mm_unpackhi_epi32(m1,m2);
-  buf4 = _mm_unpacklo_epi64(t0,t1);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_unpackhi_epi32(m1,m3);
-  t1 = _mm_unpacklo_epi64(t0,m0);
-  t2 = _mm_blend_epi16(t1,m2,0xC0);
-  buf1 = _mm_shufflehi_epi16(t2,_MM_SHUFFLE(1,0,3,2));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_unpackhi_epi32(m0,m3);
-  t1 = _mm_blend_epi16(m2,t0,0xF0);
-  buf2 = _mm_shuffle_epi32(t1,_MM_SHUFFLE(0,2,1,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_blend_epi16(m2,m0,0x0C);
-  t1 = _mm_slli_si128(t0,4);
-  buf3 = _mm_blend_epi16(t1,m3,0x0F);
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_blend_epi16(m1,m0,0x30);
-  buf4 = _mm_shuffle_epi32(t0,_MM_SHUFFLE(1,0,3,2));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  t0 = _mm_blend_epi16(m0,m2,0x03);
-  t1 = _mm_blend_epi16(m1,m2,0x30);
-  t2 = _mm_blend_epi16(t1,t0,0x0F);
-  buf1 = _mm_shuffle_epi32(t2,_MM_SHUFFLE(1,3,0,2));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf1), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_slli_si128(m0,4);
-  t1 = _mm_blend_epi16(m1,t0,0xC0);
-  buf2 = _mm_shuffle_epi32(t1,_MM_SHUFFLE(1,2,0,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf2), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(2,1,0,3));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(0,3,2,1));
-
-  t0 = _mm_unpackhi_epi32(m0,m3);
-  t1 = _mm_unpacklo_epi32(m2,m3);
-  t2 = _mm_unpackhi_epi64(t0,t1);
-  buf3 = _mm_shuffle_epi32(t2,_MM_SHUFFLE(3,0,2,1));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf3), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r16);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 12),_mm_slli_epi32(row2, 20));
-
-  t0 = _mm_blend_epi16(m3,m2,0xC0);
-  t1 = _mm_unpacklo_epi32(m0,m3);
-  t2 = _mm_blend_epi16(t0,t1,0x0F);
-  buf4 = _mm_shuffle_epi32(t2,_MM_SHUFFLE(0,1,2,3));
-
-  row1 = _mm_add_epi32(_mm_add_epi32(row1, buf4), row2);
-  row4 = _mm_xor_si128(row4, row1);
-  row4 = _mm_shuffle_epi8(row4,r8);
-  row3 = _mm_add_epi32(row3, row4);
-  row2 = _mm_xor_si128(row2, row3);
-  row2 = _mm_xor_si128(_mm_srli_epi32(row2, 7),_mm_slli_epi32(row2, 25));
-
-  row4 = _mm_shuffle_epi32(row4, _MM_SHUFFLE(0,3,2,1));
-  row3 = _mm_shuffle_epi32(row3, _MM_SHUFFLE(1,0,3,2));
-  row2 = _mm_shuffle_epi32(row2, _MM_SHUFFLE(2,1,0,3));
-
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[0]), _mm_xor_si128(ff0, _mm_xor_si128(row1, row3)));
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[4]), _mm_xor_si128(ff1, _mm_xor_si128(row2, row4)));
-}
-
-static void BLAKE2_SSE4_Compress64(const byte* input, BLAKE2_State<word64, true>& state)
-{
-  __m128i row1l, row1h;
-  __m128i row2l, row2h;
-  __m128i row3l, row3h;
-  __m128i row4l, row4h;
-  __m128i b0, b1, t0, t1;
-
-  const __m128i r16 = _mm_setr_epi8(2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9);
-  const __m128i r24 = _mm_setr_epi8(3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10);
-
-  const __m128i m0 = _mm_loadu_si128((const __m128i*)(const void*)(input + 00));
-  const __m128i m1 = _mm_loadu_si128((const __m128i*)(const void*)(input + 16));
-  const __m128i m2 = _mm_loadu_si128((const __m128i*)(const void*)(input + 32));
-  const __m128i m3 = _mm_loadu_si128((const __m128i*)(const void*)(input + 48));
-  const __m128i m4 = _mm_loadu_si128((const __m128i*)(const void*)(input + 64));
-  const __m128i m5 = _mm_loadu_si128((const __m128i*)(const void*)(input + 80));
-  const __m128i m6 = _mm_loadu_si128((const __m128i*)(const void*)(input + 96));
-  const __m128i m7 = _mm_loadu_si128((const __m128i*)(const void*)(input + 112));
-
-  row1l = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[0]));
-  row1h = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[2]));
-  row2l = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[4]));
-  row2h = _mm_loadu_si128((const __m128i*)(const void*)(&state.h[6]));
-  row3l = _mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(0)));
-  row3h = _mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(2)));
-  row4l = _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(4))), _mm_loadu_si128((const __m128i*)(const void*)(&state.t[0])));
-  row4h = _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(6))), _mm_loadu_si128((const __m128i*)(const void*)(&state.f[0])));
-
-  b0 = _mm_unpacklo_epi64(m0, m1);
-  b1 = _mm_unpacklo_epi64(m2, m3);
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m0, m1);
-  b1 = _mm_unpackhi_epi64(m2, m3);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m4, m5);
-  b1 = _mm_unpacklo_epi64(m6, m7);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m4, m5);
-  b1 = _mm_unpackhi_epi64(m6, m7);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m7, m2);
-  b1 = _mm_unpackhi_epi64(m4, m6);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m5, m4);
-  b1 = _mm_alignr_epi8(m3, m7, 8);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_shuffle_epi32(m0, _MM_SHUFFLE(1,0,3,2));
-  b1 = _mm_unpackhi_epi64(m5, m2);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m6, m1);
-  b1 = _mm_unpackhi_epi64(m3, m1);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_alignr_epi8(m6, m5, 8);
-  b1 = _mm_unpackhi_epi64(m2, m7);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m4, m0);
-  b1 = _mm_blend_epi16(m1, m6, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_blend_epi16(m5, m1, 0xF0);
-  b1 = _mm_unpackhi_epi64(m3, m4);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m7, m3);
-  b1 = _mm_alignr_epi8(m2, m0, 8);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpackhi_epi64(m3, m1);
-  b1 = _mm_unpackhi_epi64(m6, m5);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m4, m0);
-  b1 = _mm_unpacklo_epi64(m6, m7);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_blend_epi16(m1, m2, 0xF0);
-  b1 = _mm_blend_epi16(m2, m7, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m3, m5);
-  b1 = _mm_unpacklo_epi64(m0, m4);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpackhi_epi64(m4, m2);
-  b1 = _mm_unpacklo_epi64(m1, m5);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_blend_epi16(m0, m3, 0xF0);
-  b1 = _mm_blend_epi16(m2, m7, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_blend_epi16(m7, m5, 0xF0);
-  b1 = _mm_blend_epi16(m3, m1, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_alignr_epi8(m6, m0, 8);
-  b1 = _mm_blend_epi16(m4, m6, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m1, m3);
-  b1 = _mm_unpacklo_epi64(m0, m4);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m6, m5);
-  b1 = _mm_unpackhi_epi64(m5, m1);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_blend_epi16(m2, m3, 0xF0);
-  b1 = _mm_unpackhi_epi64(m7, m0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m6, m2);
-  b1 = _mm_blend_epi16(m7, m4, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_blend_epi16(m6, m0, 0xF0);
-  b1 = _mm_unpacklo_epi64(m7, m2);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m2, m7);
-  b1 = _mm_alignr_epi8(m5, m6, 8);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m0, m3);
-  b1 = _mm_shuffle_epi32(m4, _MM_SHUFFLE(1,0,3,2));
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m3, m1);
-  b1 = _mm_blend_epi16(m1, m5, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpackhi_epi64(m6, m3);
-  b1 = _mm_blend_epi16(m6, m1, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_alignr_epi8(m7, m5, 8);
-  b1 = _mm_unpackhi_epi64(m0, m4);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpackhi_epi64(m2, m7);
-  b1 = _mm_unpacklo_epi64(m4, m1);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m0, m2);
-  b1 = _mm_unpacklo_epi64(m3, m5);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m3, m7);
-  b1 = _mm_alignr_epi8(m0, m5, 8);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m7, m4);
-  b1 = _mm_alignr_epi8(m4, m1, 8);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = m6;
-  b1 = _mm_alignr_epi8(m5, m0, 8);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_blend_epi16(m1, m3, 0xF0);
-  b1 = m2;
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m5, m4);
-  b1 = _mm_unpackhi_epi64(m3, m0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m1, m2);
-  b1 = _mm_blend_epi16(m3, m2, 0xF0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpackhi_epi64(m7, m4);
-  b1 = _mm_unpackhi_epi64(m1, m6);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_alignr_epi8(m7, m5, 8);
-  b1 = _mm_unpacklo_epi64(m6, m0);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m0, m1);
-  b1 = _mm_unpacklo_epi64(m2, m3);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m0, m1);
-  b1 = _mm_unpackhi_epi64(m2, m3);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m4, m5);
-  b1 = _mm_unpacklo_epi64(m6, m7);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpackhi_epi64(m4, m5);
-  b1 = _mm_unpackhi_epi64(m6, m7);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_unpacklo_epi64(m7, m2);
-  b1 = _mm_unpackhi_epi64(m4, m6);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m5, m4);
-  b1 = _mm_alignr_epi8(m3, m7, 8);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2h, row2l, 8);
-  t1 = _mm_alignr_epi8(row2l, row2h, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4h, row4l, 8);
-  t1 = _mm_alignr_epi8(row4l, row4h, 8);
-  row4l = t1, row4h = t0;
-
-  b0 = _mm_shuffle_epi32(m0, _MM_SHUFFLE(1,0,3,2));
-  b1 = _mm_unpackhi_epi64(m5, m2);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi32(row4l, _MM_SHUFFLE(2,3,0,1));
-  row4h = _mm_shuffle_epi32(row4h, _MM_SHUFFLE(2,3,0,1));
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_shuffle_epi8(row2l, r24);
-  row2h = _mm_shuffle_epi8(row2h, r24);
-
-  b0 = _mm_unpacklo_epi64(m6, m1);
-  b1 = _mm_unpackhi_epi64(m3, m1);
-
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
-  row4l = _mm_xor_si128(row4l, row1l);
-  row4h = _mm_xor_si128(row4h, row1h);
-  row4l = _mm_shuffle_epi8(row4l, r16);
-  row4h = _mm_shuffle_epi8(row4h, r16);
-  row3l = _mm_add_epi64(row3l, row4l);
-  row3h = _mm_add_epi64(row3h, row4h);
-  row2l = _mm_xor_si128(row2l, row3l);
-  row2h = _mm_xor_si128(row2h, row3h);
-  row2l = _mm_xor_si128(_mm_srli_epi64(row2l, 63), _mm_add_epi64(row2l, row2l));
-  row2h = _mm_xor_si128(_mm_srli_epi64(row2h, 63), _mm_add_epi64(row2h, row2h));
-
-  t0 = _mm_alignr_epi8(row2l, row2h, 8);
-  t1 = _mm_alignr_epi8(row2h, row2l, 8);
-  row2l = t0, row2h = t1, t0 = row3l, row3l = row3h, row3h = t0;
-  t0 = _mm_alignr_epi8(row4l, row4h, 8);
-  t1 = _mm_alignr_epi8(row4h, row4l, 8);
-  row4l = t1, row4h = t0;
-
-  row1l = _mm_xor_si128(row3l, row1l);
-  row1h = _mm_xor_si128(row3h, row1h);
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[0]), _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&state.h[0])), row1l));
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[2]), _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&state.h[2])), row1h));
-
-  row2l = _mm_xor_si128(row4l, row2l);
-  row2h = _mm_xor_si128(row4h, row2h);
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[4]), _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&state.h[4])), row2l));
-  _mm_storeu_si128((__m128i *)(void*)(&state.h[6]), _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&state.h[6])), row2h));
-}
-#endif  // CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-
-#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-
-// Reverse words for ARM (use arguments to _mm_set_epi32 without reversing them).
-#define vld1q_u32_rev(x, a,b,c,d) d[1]=c[0],d[2]=b[0],d[3]=a[0]; x = vld1q_u32(d);
-
-// Keep things straight due to swapping. For a 128-bit vector, H64 denotes
-//   the high 64-bit vector, and L64 denotes the low 64-bit vector. The
-//   vectors are the same as returned by vget_high_u64 and vget_low_u64.
-static const int LANE_H64 = 1;
-static const int LANE_L64 = 0;
-
-static void BLAKE2_NEON_Compress32(const byte* input, BLAKE2_State<word32, false>& state)
-{
-  //CRYPTOPP_ASSERT(IsAlignedOn(input,GetAlignmentOf<uint8_t*>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.h[0],GetAlignmentOf<uint32x4_t>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.h[4],GetAlignmentOf<uint32x4_t>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.t[0],GetAlignmentOf<uint32x4_t>()));
-
-  CRYPTOPP_ALIGN_DATA(16) uint32_t m0[4], m1[4], m2[4], m3[4], m4[4], m5[4], m6[4], m7[4];
-  CRYPTOPP_ALIGN_DATA(16) uint32_t m8[4], m9[4], m10[4], m11[4], m12[4], m13[4], m14[4], m15[4];
-
-  GetBlock<word32, LittleEndian, true> get(input);
-  get(m0[0])(m1[0])(m2[0])(m3[0])(m4[0])(m5[0])(m6[0])(m7[0])(m8[0])(m9[0])(m10[0])(m11[0])(m12[0])(m13[0])(m14[0])(m15[0]);
-
-  uint32x4_t row1,row2,row3,row4;
-  uint32x4_t buf1,buf2,buf3,buf4;
-  uint32x4_t ff0,ff1;
-
-  row1 = ff0 = vld1q_u32((const uint32_t*)&state.h[0]);
-  row2 = ff1 = vld1q_u32((const uint32_t*)&state.h[4]);
-  row3 = vld1q_u32((const uint32_t*)&BLAKE2S_IV(0));
-  row4 = veorq_u32(vld1q_u32((const uint32_t*)&BLAKE2S_IV(4)), vld1q_u32((const uint32_t*)&state.t[0]));
-
-  // buf1 = vld1q_u32(m6,m4,m2,m0);
-  vld1q_u32_rev(buf1, m6,m4,m2,m0);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m7,m5,m3,m1);
-  vld1q_u32_rev(buf2, m7,m5,m3,m1);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m14,m12,m10,m8);
-  vld1q_u32_rev(buf3, m14,m12,m10,m8);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m15,m13,m11,m9);
-  vld1q_u32_rev(buf4, m15,m13,m11,m9);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m13,m9,m4,m14);
-  vld1q_u32_rev(buf1, m13,m9,m4,m14);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m6,m15,m8,m10);
-  vld1q_u32_rev(buf2, m6,m15,m8,m10);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m5,m11,m0,m1);
-  vld1q_u32_rev(buf3, m5,m11,m0,m1);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m3,m7,m2,m12);
-  vld1q_u32_rev(buf4, m3,m7,m2,m12);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m15,m5,m12,m11);
-  vld1q_u32_rev(buf1, m15,m5,m12,m11);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m13,m2,m0,m8);
-  vld1q_u32_rev(buf2, m13,m2,m0,m8);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m9,m7,m3,m10);
-  vld1q_u32_rev(buf3, m9,m7,m3,m10);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m4,m1,m6,m14);
-  vld1q_u32_rev(buf4, m4,m1,m6,m14);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m11,m13,m3,m7);
-  vld1q_u32_rev(buf1, m11,m13,m3,m7);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m14,m12,m1,m9);
-  vld1q_u32_rev(buf2, m14,m12,m1,m9);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m15,m4,m5,m2);
-  vld1q_u32_rev(buf3, m15,m4,m5,m2);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m8,m0,m10,m6);
-  vld1q_u32_rev(buf4, m8,m0,m10,m6);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m10,m2,m5,m9);
-  vld1q_u32_rev(buf1, m10,m2,m5,m9);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m15,m4,m7,m0);
-  vld1q_u32_rev(buf2, m15,m4,m7,m0);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m3,m6,m11,m14);
-  vld1q_u32_rev(buf3, m3,m6,m11,m14);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m13,m8,m12,m1);
-  vld1q_u32_rev(buf4, m13,m8,m12,m1);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m8,m0,m6,m2);
-  vld1q_u32_rev(buf1, m8,m0,m6,m2);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m3,m11,m10,m12);
-  vld1q_u32_rev(buf2, m3,m11,m10,m12);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m1,m15,m7,m4);
-  vld1q_u32_rev(buf3, m1,m15,m7,m4);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m9,m14,m5,m13);
-  vld1q_u32_rev(buf4, m9,m14,m5,m13);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m4,m14,m1,m12);
-  vld1q_u32_rev(buf1, m4,m14,m1,m12);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m10,m13,m15,m5);
-  vld1q_u32_rev(buf2, m10,m13,m15,m5);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m8,m9,m6,m0);
-  vld1q_u32_rev(buf3, m8,m9,m6,m0);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m11,m2,m3,m7);
-  vld1q_u32_rev(buf4, m11,m2,m3,m7);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m3,m12,m7,m13);
-  vld1q_u32_rev(buf1, m3,m12,m7,m13);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m9,m1,m14,m11);
-  vld1q_u32_rev(buf2, m9,m1,m14,m11);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m2,m8,m15,m5);
-  vld1q_u32_rev(buf3, m2,m8,m15,m5);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m10,m6,m4,m0);
-  vld1q_u32_rev(buf4, m10,m6,m4,m0);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m0,m11,m14,m6);
-  vld1q_u32_rev(buf1, m0,m11,m14,m6);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m8,m3,m9,m15);
-  vld1q_u32_rev(buf2, m8,m3,m9,m15);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m10,m1,m13,m12);
-  vld1q_u32_rev(buf3, m10,m1,m13,m12);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m5,m4,m7,m2);
-  vld1q_u32_rev(buf4, m5,m4,m7,m2);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m1,m7,m8,m10);
-  vld1q_u32_rev(buf1, m1,m7,m8,m10);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m5,m6,m4,m2);
-  vld1q_u32_rev(buf2, m5,m6,m4,m2);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m13,m3,m9,m15);
-  vld1q_u32_rev(buf3, m13,m3,m9,m15);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m0,m12,m14,m11);
-  vld1q_u32_rev(buf4, m0,m12,m14,m11);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  vst1q_u32((uint32_t*)&state.h[0],veorq_u32(ff0,veorq_u32(row1,row3)));
-  vst1q_u32((uint32_t*)&state.h[4],veorq_u32(ff1,veorq_u32(row2,row4)));
-}
-
-static void BLAKE2_NEON_Compress64(const byte* input, BLAKE2_State<word64, true>& state)
-{
-  //CRYPTOPP_ASSERT(IsAlignedOn(input,GetAlignmentOf<uint8_t*>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.h[0],GetAlignmentOf<uint64x2_t>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.h[4],GetAlignmentOf<uint64x2_t>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.t[0],GetAlignmentOf<uint64x2_t>()));
-
-  uint64x2_t m0m1,m2m3,m4m5,m6m7,m8m9,m10m11,m12m13,m14m15;
-
-    m0m1 = vreinterpretq_u64_u8(vld1q_u8(input+  0));
-    m2m3 = vreinterpretq_u64_u8(vld1q_u8(input+ 16));
-    m4m5 = vreinterpretq_u64_u8(vld1q_u8(input+ 32));
-    m6m7 = vreinterpretq_u64_u8(vld1q_u8(input+ 48));
-    m8m9 = vreinterpretq_u64_u8(vld1q_u8(input+ 64));
-  m10m11 = vreinterpretq_u64_u8(vld1q_u8(input+ 80));
-  m12m13 = vreinterpretq_u64_u8(vld1q_u8(input+ 96));
-  m14m15 = vreinterpretq_u64_u8(vld1q_u8(input+112));
-
-  uint64x2_t row1l, row1h, row2l, row2h;
-  uint64x2_t row3l, row3h, row4l, row4h;
-  uint64x2_t b0 = {0,0}, b1 = {0,0}, t0, t1;
-
-  row1l = vld1q_u64((const uint64_t *)&state.h[0]);
-  row1h = vld1q_u64((const uint64_t *)&state.h[2]);
-  row2l = vld1q_u64((const uint64_t *)&state.h[4]);
-  row2h = vld1q_u64((const uint64_t *)&state.h[6]);
-  row3l = vld1q_u64((const uint64_t *)&BLAKE2B_IV(0));
-  row3h = vld1q_u64((const uint64_t *)&BLAKE2B_IV(2));
-  row4l = veorq_u64(vld1q_u64((const uint64_t *)&BLAKE2B_IV(4)), vld1q_u64((const uint64_t*)&state.t[0]));
-  row4h = veorq_u64(vld1q_u64((const uint64_t *)&BLAKE2B_IV(6)), vld1q_u64((const uint64_t*)&state.f[0]));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  row1l = veorq_u64(row3l, row1l);
-  row1h = veorq_u64(row3h, row1h);
-  vst1q_u64((uint64_t*)&state.h[0], veorq_u64(vld1q_u64((const uint64_t*)&state.h[0]), row1l));
-  vst1q_u64((uint64_t*)&state.h[2], veorq_u64(vld1q_u64((const uint64_t*)&state.h[2]), row1h));
-
-  row2l = veorq_u64(row4l, row2l);
-  row2h = veorq_u64(row4h, row2h);
-  vst1q_u64((uint64_t*)&state.h[4], veorq_u64(vld1q_u64((const uint64_t*)&state.h[4]), row2l));
-  vst1q_u64((uint64_t*)&state.h[6], veorq_u64(vld1q_u64((const uint64_t*)&state.h[6]), row2h));
-}
-#endif  // CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-
-template class BLAKE2_Base<word32, false>;
-template class BLAKE2_Base<word64, true>;
-
-NAMESPACE_END
diff --git a/src-cryptopp/blake2.h b/src-cryptopp/blake2.h
deleted file mode 100644
index 8743996..0000000
--- a/src-cryptopp/blake2.h
+++ /dev/null
@@ -1,314 +0,0 @@
-// blake2.h - written and placed in the public domain by Jeffrey Walton and Zooko
-//            Wilcox-O'Hearn. Copyright assigned to the Crypto++ project.
-//            Based on Aumasson, Neves, Wilcox-O'Hearn and Winnerlein's reference BLAKE2
-//            implementation at http://github.com/BLAKE2/BLAKE2.
-
-//! \file blake2.h
-//! \brief Classes for BLAKE2b and BLAKE2s message digests and keyed message digests
-//! \details This implmentation follows Aumasson, Neves, Wilcox-O'Hearn and Winnerlein's
-//!   <A HREF="http://blake2.net/blake2.pdf">BLAKE2: simpler, smaller, fast as MD5</A> (2013.01.29).
-//!   Static algorithm name return either "BLAKE2b" or "BLAKE2s". An object algorithm name follows
-//!   the naming described in <A HREF="http://tools.ietf.org/html/rfc7693#section-4">RFC 7693, The
-//!   BLAKE2 Cryptographic Hash and Message Authentication Code (MAC)</A>.
-//! \details The library provides specialized SSE2, SSE4 and NEON version of the BLAKE2 compression
-//!   function. For best results under ARM NEON, specify both an architecture and cpu. For example:
-//!   <pre>CXXFLAGS="-DNDEBUG -march=armv8-a+crc -mcpu=cortex-a53 ..."</pre>
-//! \since Crypto++ 5.6.4
-
-#ifndef CRYPTOPP_BLAKE2_H
-#define CRYPTOPP_BLAKE2_H
-
-#include "cryptlib.h"
-#include "secblock.h"
-#include "seckey.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class BLAKE2_Info
-//! \brief BLAKE2 hash information
-//! \tparam T_64bit flag indicating 64-bit
-//! \since Crypto++ 5.6.4
-template <bool T_64bit>
-struct BLAKE2_Info : public VariableKeyLength<(T_64bit ? 64 : 32),0,(T_64bit ? 64 : 32),1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE>
-{
-	typedef VariableKeyLength<(T_64bit ? 64 : 32),0,(T_64bit ? 64 : 32),1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE> KeyBase;
-	CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH)
-	CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH)
-	CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH)
-
-	CRYPTOPP_CONSTANT(BLOCKSIZE = (T_64bit ? 128 : 64))
-	CRYPTOPP_CONSTANT(DIGESTSIZE = (T_64bit ? 64 : 32))
-	CRYPTOPP_CONSTANT(SALTSIZE = (T_64bit ? 16 : 8))
-	CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = (T_64bit ? 16 : 8))
-
-	CRYPTOPP_CONSTEXPR static const	char *StaticAlgorithmName() {return (T_64bit ? "BLAKE2b" : "BLAKE2s");}
-};
-
-//! \class BLAKE2_ParameterBlock
-//! \brief BLAKE2 parameter block
-//! \tparam T_64bit flag indicating 64-bit
-//! \details BLAKE2b uses BLAKE2_ParameterBlock<true>, while BLAKE2s
-//!   uses BLAKE2_ParameterBlock<false>.
-//! \since Crypto++ 5.6.4
-template <bool T_64bit>
-struct CRYPTOPP_NO_VTABLE BLAKE2_ParameterBlock
-{
-};
-
-//! \brief BLAKE2b parameter block specialization
-template<>
-struct CRYPTOPP_NO_VTABLE BLAKE2_ParameterBlock<true>
-{
-	CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2_Info<true>::SALTSIZE)
-	CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2_Info<true>::DIGESTSIZE)
-	CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2_Info<true>::PERSONALIZATIONSIZE)
-
-	BLAKE2_ParameterBlock()
-	{
-		memset(this, 0x00, sizeof(*this));
-		digestLength = DIGESTSIZE;
-		fanout = depth = 1;
-	}
-
-	BLAKE2_ParameterBlock(size_t digestSize)
-	{
-		CRYPTOPP_ASSERT(digestSize <= DIGESTSIZE);
-		memset(this, 0x00, sizeof(*this));
-		digestLength = (byte)digestSize;
-		fanout = depth = 1;
-	}
-
-	BLAKE2_ParameterBlock(size_t digestSize, size_t keyLength, const byte* salt, size_t saltLength,
-		const byte* personalization, size_t personalizationLength);
-
-	byte digestLength;
-	byte keyLength, fanout, depth;
-	byte leafLength[4];
-	byte nodeOffset[8];
-	byte nodeDepth, innerLength, rfu[14];
-	byte salt[SALTSIZE];
-	byte personalization[PERSONALIZATIONSIZE];
-};
-
-//! \brief BLAKE2s parameter block specialization
-template<>
-struct CRYPTOPP_NO_VTABLE BLAKE2_ParameterBlock<false>
-{
-	CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2_Info<false>::SALTSIZE)
-	CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2_Info<false>::DIGESTSIZE)
-	CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2_Info<false>::PERSONALIZATIONSIZE)
-
-	BLAKE2_ParameterBlock()
-	{
-		memset(this, 0x00, sizeof(*this));
-		digestLength = DIGESTSIZE;
-		fanout = depth = 1;
-	}
-
-	BLAKE2_ParameterBlock(size_t digestSize)
-	{
-		CRYPTOPP_ASSERT(digestSize <= DIGESTSIZE);
-		memset(this, 0x00, sizeof(*this));
-		digestLength = (byte)digestSize;
-		fanout = depth = 1;
-	}
-
-	BLAKE2_ParameterBlock(size_t digestSize, size_t keyLength, const byte* salt, size_t saltLength,
-		const byte* personalization, size_t personalizationLength);
-
-	byte digestLength;
-	byte keyLength, fanout, depth;
-	byte leafLength[4];
-	byte nodeOffset[6];
-	byte nodeDepth, innerLength;
-	byte salt[SALTSIZE];
-	byte personalization[PERSONALIZATIONSIZE];
-};
-
-//! \class BLAKE2_State
-//! \brief BLAKE2 state information
-//! \tparam W word type
-//! \tparam T_64bit flag indicating 64-bit
-//! \details BLAKE2b uses BLAKE2_State<word64, true>, while BLAKE2s
-//!   uses BLAKE2_State<word32, false>.
-//! \since Crypto++ 5.6.4
-template <class W, bool T_64bit>
-struct CRYPTOPP_NO_VTABLE BLAKE2_State
-{
-	CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2_Info<T_64bit>::BLOCKSIZE)
-
-	BLAKE2_State()
-	{
-		// Set all members except scratch buffer[]
-		h[0]=h[1]=h[2]=h[3]=h[4]=h[5]=h[6]=h[7] = 0;
-		t[0]=t[1]=f[0]=f[1] = 0;
-		length = 0;
-	}
-
-	// SSE2, SSE4 and NEON depend upon t[] and f[] being side-by-side
-	W h[8], t[2], f[2];
-	byte  buffer[BLOCKSIZE];
-	size_t length;
-};
-
-//! \class BLAKE2_Base
-//! \brief BLAKE2 hash implementation
-//! \tparam W word type
-//! \tparam T_64bit flag indicating 64-bit
-//! \details BLAKE2b uses BLAKE2_Base<word64, true>, while BLAKE2s
-//!   uses BLAKE2_Base<word32, false>.
-//! \since Crypto++ 5.6.4
-template <class W, bool T_64bit>
-class BLAKE2_Base : public SimpleKeyingInterfaceImpl<MessageAuthenticationCode, BLAKE2_Info<T_64bit> >
-{
-public:
-	CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2_Info<T_64bit>::DEFAULT_KEYLENGTH)
-	CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2_Info<T_64bit>::MIN_KEYLENGTH)
-	CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2_Info<T_64bit>::MAX_KEYLENGTH)
-
-	CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2_Info<T_64bit>::DIGESTSIZE)
-	CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2_Info<T_64bit>::BLOCKSIZE)
-	CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2_Info<T_64bit>::SALTSIZE)
-	CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2_Info<T_64bit>::PERSONALIZATIONSIZE)
-
-	typedef BLAKE2_State<W, T_64bit> State;
-	typedef BLAKE2_ParameterBlock<T_64bit> ParameterBlock;
-	typedef SecBlock<State, AllocatorWithCleanup<State, true> > AlignedState;
-	typedef SecBlock<ParameterBlock, AllocatorWithCleanup<ParameterBlock, true> > AlignedParameterBlock;
-
-	virtual ~BLAKE2_Base() {}
-
-	//! \brief Retrieve the static algorithm name
-	//! \returns the algorithm name (BLAKE2s or BLAKE2b)
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return BLAKE2_Info<T_64bit>::StaticAlgorithmName();}
-
-	//! \brief Retrieve the object's name
-	//! \returns the object's algorithm name following RFC 7693
-	//! \details Object algorithm name follows the naming described in
-	//!   <A HREF="http://tools.ietf.org/html/rfc7693#section-4">RFC 7693, The BLAKE2 Cryptographic Hash and
-	//! Message Authentication Code (MAC)</A>. For example, "BLAKE2b-512" and "BLAKE2s-256".
-	std::string AlgorithmName() const {return std::string(StaticAlgorithmName()) + "-" + IntToString(this->DigestSize()*8);}
-
-	unsigned int DigestSize() const {return m_digestSize;}
-	unsigned int OptimalDataAlignment() const {return (CRYPTOPP_BOOL_ALIGN16 ? 16 : GetAlignmentOf<W>());}
-
-	void Update(const byte *input, size_t length);
-	void Restart();
-
-	//! \brief Restart a hash with parameter block and counter
-	//! \param block paramter block
-	//! \param counter counter array
-	//! \details Parameter block is persisted across calls to Restart().
-	void Restart(const BLAKE2_ParameterBlock<T_64bit>& block, const W counter[2]);
-
-	//! \brief Set tree mode
-	//! \param mode the new tree mode
-	//! \details BLAKE2 has two finalization flags, called State::f[0] and State::f[1].
-	//!   If <tt>treeMode=false</tt> (default), then State::f[1] is never set. If
-	//!   <tt>treeMode=true</tt>, then State::f[1] is set when State::f[0] is set.
-	//!   Tree mode is persisted across calls to Restart().
-	void SetTreeMode(bool mode) {m_treeMode=mode;}
-
-	//! \brief Get tree mode
-	//! \returns the current tree mode
-	//! \details Tree mode is persisted across calls to Restart().
-	bool GetTreeMode() const {return m_treeMode;}
-
-	void TruncatedFinal(byte *hash, size_t size);
-
-protected:
-	BLAKE2_Base();
-	BLAKE2_Base(bool treeMode, unsigned int digestSize);
-	BLAKE2_Base(const byte *key, size_t keyLength, const byte* salt, size_t saltLength,
-		const byte* personalization, size_t personalizationLength,
-		bool treeMode, unsigned int digestSize);
-
-	// Operates on state buffer and/or input. Must be BLOCKSIZE, final block will pad with 0's.
-	void Compress(const byte *input);
-	inline void IncrementCounter(size_t count=BLOCKSIZE);
-
-	void UncheckedSetKey(const byte* key, unsigned int length, const CryptoPP::NameValuePairs& params);
-
-private:
-	AlignedState m_state;
-	AlignedParameterBlock m_block;
-	AlignedSecByteBlock m_key;
-	word32 m_digestSize;
-	bool m_treeMode;
-};
-
-//! \brief The BLAKE2b cryptographic hash function
-//! \details BLAKE2b can function as both a hash and keyed hash. If you want only the hash,
-//!   then use the BLAKE2b constructor that accepts no parameters or digest size. If you
-//!   want a keyed hash, then use the constuctor that accpts the key as a parameter.
-//!   Once a key and digest size are selected, its effectively immutable. The Restart()
-//!   method that accepts a ParameterBlock does not allow you to change it.
-//! \sa Aumasson, Neves, Wilcox-O'Hearn and Winnerlein's
-//!   <A HREF="http://blake2.net/blake2.pdf">BLAKE2: simpler, smaller, fast as MD5</A> (2013.01.29).
-//! \since Crypto++ 5.6.4
-class BLAKE2b : public BLAKE2_Base<word64, true>
-{
-public:
-	typedef BLAKE2_Base<word64, true> ThisBase; // Early Visual Studio workaround
-	typedef BLAKE2_ParameterBlock<true> ParameterBlock;
-	CRYPTOPP_COMPILE_ASSERT(sizeof(ParameterBlock) == 64);
-
-	//! \brief Construct a BLAKE2b hash
-	//! \param digestSize the digest size, in bytes
-	//! \param treeMode flag indicating tree mode
-	BLAKE2b(bool treeMode=false, unsigned int digestSize = DIGESTSIZE) : ThisBase(treeMode, digestSize) {}
-
-	//! \brief Construct a BLAKE2b hash
-	//! \param key a byte array used to key the cipher
-	//! \param keyLength the size of the byte array
-	//! \param salt a byte array used as salt
-	//! \param saltLength the size of the byte array
-	//! \param personalization a byte array used as prsonalization string
-	//! \param personalizationLength the size of the byte array
-	//! \param treeMode flag indicating tree mode
-	//! \param digestSize the digest size, in bytes
-	BLAKE2b(const byte *key, size_t keyLength, const byte* salt = NULL, size_t saltLength = 0,
-		const byte* personalization = NULL, size_t personalizationLength = 0,
-		bool treeMode=false, unsigned int digestSize = DIGESTSIZE)
-		: ThisBase(key, keyLength, salt, saltLength, personalization, personalizationLength, treeMode, digestSize) {}
-};
-
-//! \brief The BLAKE2s cryptographic hash function
-//! \details BLAKE2s can function as both a hash and keyed hash. If you want only the hash,
-//!   then use the BLAKE2s constructor that accepts no parameters or digest size. If you
-//!   want a keyed hash, then use the constuctor that accpts the key as a parameter.
-//!   Once a key and digest size are selected, its effectively immutable. The Restart()
-//!   method that accepts a ParameterBlock does not allow you to change it.
-//! \sa Aumasson, Neves, Wilcox-O'Hearn and Winnerlein's
-//!   <A HREF="http://blake2.net/blake2.pdf">BLAKE2: simpler, smaller, fast as MD5</A> (2013.01.29).
-//! \since Crypto++ 5.6.4
-class BLAKE2s : public BLAKE2_Base<word32, false>
-{
-public:
-	typedef BLAKE2_Base<word32, false> ThisBase; // Early Visual Studio workaround
-	typedef BLAKE2_ParameterBlock<false> ParameterBlock;
-	CRYPTOPP_COMPILE_ASSERT(sizeof(ParameterBlock) == 32);
-
-	//! \brief Construct a BLAKE2s hash
-	//! \param digestSize the digest size, in bytes
-	//! \param treeMode flag indicating tree mode
-	BLAKE2s(bool treeMode=false, unsigned int digestSize = DIGESTSIZE) : ThisBase(treeMode, digestSize) {}
-
-	//! \brief Construct a BLAKE2s hash
-	//! \param key a byte array used to key the cipher
-	//! \param keyLength the size of the byte array
-	//! \param salt a byte array used as salt
-	//! \param saltLength the size of the byte array
-	//! \param personalization a byte array used as prsonalization string
-	//! \param personalizationLength the size of the byte array
-	//! \param treeMode flag indicating tree mode
-	//! \param digestSize the digest size, in bytes
-	BLAKE2s(const byte *key, size_t keyLength, const byte* salt = NULL, size_t saltLength = 0,
-		const byte* personalization = NULL, size_t personalizationLength = 0,
-		bool treeMode=false, unsigned int digestSize = DIGESTSIZE)
-		: ThisBase(key, keyLength, salt, saltLength, personalization, personalizationLength, treeMode, digestSize) {}
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/cbcmac.h b/src-cryptopp/cbcmac.h
deleted file mode 100644
index d4745b6..0000000
--- a/src-cryptopp/cbcmac.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// cbcmac.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile cbcmac.h
-//! \brief Classes for CBC MAC
-
-#ifndef CRYPTOPP_CBCMAC_H
-#define CRYPTOPP_CBCMAC_H
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! _
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_MAC_Base : public MessageAuthenticationCode
-{
-public:
-	CBC_MAC_Base() : m_counter(0) {}
-
-	void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
-	void Update(const byte *input, size_t length);
-	void TruncatedFinal(byte *mac, size_t size);
-	unsigned int DigestSize() const {return const_cast<CBC_MAC_Base*>(this)->AccessCipher().BlockSize();}
-
-protected:
-	virtual BlockCipher & AccessCipher() =0;
-
-private:
-	void ProcessBuf();
-	SecByteBlock m_reg;
-	unsigned int m_counter;
-};
-
-//! <a href="http://www.weidai.com/scan-mirror/mac.html#CBC-MAC">CBC-MAC</a>
-/*! Compatible with FIPS 113. T should be a class derived from BlockCipherDocumentation.
-	Secure only for fixed length messages. For variable length messages use CMAC or DMAC.
-*/
-template <class T>
-class CBC_MAC : public MessageAuthenticationCodeImpl<CBC_MAC_Base, CBC_MAC<T> >, public SameKeyLengthAs<T>
-{
-public:
-	CBC_MAC() {}
-	CBC_MAC(const byte *key, size_t length=SameKeyLengthAs<T>::DEFAULT_KEYLENGTH)
-		{this->SetKey(key, length);}
-
-	static std::string StaticAlgorithmName() {return std::string("CBC-MAC(") + T::StaticAlgorithmName() + ")";}
-
-private:
-	BlockCipher & AccessCipher() {return m_cipher;}
-	typename T::Encryption m_cipher;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/ccm.h b/src-cryptopp/ccm.h
deleted file mode 100644
index 56815f8..0000000
--- a/src-cryptopp/ccm.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// ccm.h - written and placed in the public domain by Wei Dai
-
-//! \file ccm.h
-//! \brief CCM block cipher mode of operation
-//! \since Crypto++ 5.6.0
-
-#ifndef CRYPTOPP_CCM_H
-#define CRYPTOPP_CCM_H
-
-#include "authenc.h"
-#include "modes.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class CCM_Base
-//! \brief CCM block cipher base implementation
-//! \details Base implementation of the AuthenticatedSymmetricCipher interface
-//! \since Crypto++ 5.6.0
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CCM_Base : public AuthenticatedSymmetricCipherBase
-{
-public:
-	CCM_Base()
-		: m_digestSize(0), m_L(0), m_messageLength(0), m_aadLength(0) {}
-
-	// AuthenticatedSymmetricCipher
-	std::string AlgorithmName() const
-		{return GetBlockCipher().AlgorithmName() + std::string("/CCM");}
-	size_t MinKeyLength() const
-		{return GetBlockCipher().MinKeyLength();}
-	size_t MaxKeyLength() const
-		{return GetBlockCipher().MaxKeyLength();}
-	size_t DefaultKeyLength() const
-		{return GetBlockCipher().DefaultKeyLength();}
-	size_t GetValidKeyLength(size_t n) const
-		{return GetBlockCipher().GetValidKeyLength(n);}
-	bool IsValidKeyLength(size_t n) const
-		{return GetBlockCipher().IsValidKeyLength(n);}
-	unsigned int OptimalDataAlignment() const
-		{return GetBlockCipher().OptimalDataAlignment();}
-	IV_Requirement IVRequirement() const
-		{return UNIQUE_IV;}
-	unsigned int IVSize() const
-		{return 8;}
-	unsigned int MinIVLength() const
-		{return 7;}
-	unsigned int MaxIVLength() const
-		{return 13;}
-	unsigned int DigestSize() const
-		{return m_digestSize;}
-	lword MaxHeaderLength() const
-		{return W64LIT(0)-1;}
-	lword MaxMessageLength() const
-		{return m_L<8 ? (W64LIT(1)<<(8*m_L))-1 : W64LIT(0)-1;}
-	bool NeedsPrespecifiedDataLengths() const
-		{return true;}
-	void UncheckedSpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength);
-
-protected:
-	// AuthenticatedSymmetricCipherBase
-	bool AuthenticationIsOnPlaintext() const
-		{return true;}
-	unsigned int AuthenticationBlockSize() const
-		{return GetBlockCipher().BlockSize();}
-	void SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs &params);
-	void Resync(const byte *iv, size_t len);
-	size_t AuthenticateBlocks(const byte *data, size_t len);
-	void AuthenticateLastHeaderBlock();
-	void AuthenticateLastConfidentialBlock();
-	void AuthenticateLastFooterBlock(byte *mac, size_t macSize);
-	SymmetricCipher & AccessSymmetricCipher() {return m_ctr;}
-
-	virtual BlockCipher & AccessBlockCipher() =0;
-	virtual int DefaultDigestSize() const =0;
-
-	const BlockCipher & GetBlockCipher() const {return const_cast<CCM_Base *>(this)->AccessBlockCipher();};
-	byte *CBC_Buffer() {return m_buffer+REQUIRED_BLOCKSIZE;}
-
-	enum {REQUIRED_BLOCKSIZE = 16};
-	int m_digestSize, m_L;
-	word64 m_messageLength, m_aadLength;
-	CTR_Mode_ExternalCipher::Encryption m_ctr;
-};
-
-//! \class CCM_Final
-//! \brief CCM block cipher final implementation
-//! \tparam T_BlockCipher block cipher
-//! \tparam T_DefaultDigestSize default digest size, in bytes
-//! \tparam T_IsEncryption direction in which to operate the cipher
-//! \since Crypto++ 5.6.0
-template <class T_BlockCipher, int T_DefaultDigestSize, bool T_IsEncryption>
-class CCM_Final : public CCM_Base
-{
-public:
-	static std::string StaticAlgorithmName()
-		{return T_BlockCipher::StaticAlgorithmName() + std::string("/CCM");}
-	bool IsForwardTransformation() const
-		{return T_IsEncryption;}
-
-private:
-	BlockCipher & AccessBlockCipher() {return m_cipher;}
-	int DefaultDigestSize() const {return T_DefaultDigestSize;}
-	typename T_BlockCipher::Encryption m_cipher;
-};
-
-//! \class CCM
-//! \brief CCM block cipher mode of operation
-//! \tparam T_BlockCipher block cipher
-//! \tparam T_DefaultDigestSize default digest size, in bytes
-//! \details \p CCM provides the \p Encryption and \p Decryption typedef. See GCM_Base
-//!   and GCM_Final for the AuthenticatedSymmetricCipher implementation.
-//! \sa <a href="http://www.cryptolounge.org/wiki/CCM">CCM</a> at the Crypto Lounge
-//! \since Crypto++ 5.6.0
-template <class T_BlockCipher, int T_DefaultDigestSize = 16>
-struct CCM : public AuthenticatedSymmetricCipherDocumentation
-{
-	typedef CCM_Final<T_BlockCipher, T_DefaultDigestSize, true> Encryption;
-	typedef CCM_Final<T_BlockCipher, T_DefaultDigestSize, false> Decryption;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/chacha.cpp b/src-cryptopp/chacha.cpp
deleted file mode 100644
index 2ed7111..0000000
--- a/src-cryptopp/chacha.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// chacha.cpp - written and placed in the public domain by Jeffrey Walton.
-//              Copyright assigned to the Crypto++ project.
-//              Based on Wei Dai's Salsa20 and Bernstein's reference ChaCha
-//              family implementation at http://cr.yp.to/chacha.html.
-
-#include "pch.h"
-#include "config.h"
-#include "chacha.h"
-#include "argnames.h"
-#include "misc.h"
-#include "cpu.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#define CHACHA_QUARTER_ROUND(a,b,c,d) \
-    a += b; d ^= a; d = rotlFixed<word32>(d,16); \
-    c += d; b ^= c; b = rotlFixed<word32>(b,12); \
-    a += b; d ^= a; d = rotlFixed<word32>(d, 8); \
-    c += d; b ^= c; b = rotlFixed<word32>(b, 7);
-
-#if CRYPTOPP_DEBUG && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
-void ChaCha_TestInstantiations()
-{
-	 ChaCha8::Encryption x1;
-	ChaCha12::Encryption x2;
-	ChaCha20::Encryption x3;
-}
-#endif
-
-template <unsigned int R>
-void ChaCha_Policy<R>::CipherSetKey(const NameValuePairs &params, const byte *key, size_t length)
-{
-	CRYPTOPP_UNUSED(params);
-	CRYPTOPP_ASSERT(length == 16 || length == 32);
-
-	// "expand 16-byte k" or "expand 32-byte k"
-	m_state[0] = 0x61707865;
-	m_state[1] = (length == 16) ? 0x3120646e : 0x3320646e;
-	m_state[2] = (length == 16) ? 0x79622d36 : 0x79622d32;
-	m_state[3] = 0x6b206574;
-
-	GetBlock<word32, LittleEndian> get1(key);
-	get1(m_state[4])(m_state[5])(m_state[6])(m_state[7]);
-
-	GetBlock<word32, LittleEndian> get2(key + ((length == 32) ? 16 : 0));
-	get2(m_state[8])(m_state[9])(m_state[10])(m_state[11]);
-}
-
-template <unsigned int R>
-void ChaCha_Policy<R>::CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length)
-{
-	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(length);
-	CRYPTOPP_ASSERT(length==8);
-
-	GetBlock<word32, LittleEndian> get(IV);
-	m_state[12] = m_state[13] = 0;
-	get(m_state[14])(m_state[15]);
-}
-
-template<unsigned int R>
-void ChaCha_Policy<R>::SeekToIteration(lword iterationCount)
-{
-	CRYPTOPP_UNUSED(iterationCount);
-	throw NotImplemented(std::string(ChaCha_Info<R>::StaticAlgorithmName()) + ":  SeekToIteration is not yet implemented");
-
-	// TODO: these were Salsa20, and Wei re-arranged the state array for SSE2 operations.
-	// If we can generate some out-of-band test vectors, then test and implement. Also
-	//  see the test vectors in salsa.txt and the use of Seek test argument.
-	// m_state[8] = (word32)iterationCount;
-	// m_state[5] = (word32)SafeRightShift<32>(iterationCount);
-}
-
-template<unsigned int R>
-unsigned int ChaCha_Policy<R>::GetAlignment() const
-{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && 0
-	if (HasSSE2())
-		return 16;
-	else
-#endif
-		return GetAlignmentOf<word32>();
-}
-
-template<unsigned int R>
-unsigned int ChaCha_Policy<R>::GetOptimalBlockSize() const
-{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && 0
-	if (HasSSE2())
-		return 4*BYTES_PER_ITERATION;
-	else
-#endif
-		return BYTES_PER_ITERATION;
-}
-
-template<unsigned int R>
-void ChaCha_Policy<R>::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount)
-{
-	word32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
-
-	while (iterationCount--)
-	{
-		x0 = m_state[0];	x1 = m_state[1];	x2 = m_state[2];	x3 = m_state[3];
-		x4 = m_state[4];	x5 = m_state[5];	x6 = m_state[6];	x7 = m_state[7];
-		x8 = m_state[8];	x9 = m_state[9];	x10 = m_state[10];	x11 = m_state[11];
-		x12 = m_state[12];	x13 = m_state[13];	x14 = m_state[14];	x15 = m_state[15];
-
-		for (int i = static_cast<int>(ROUNDS); i > 0; i -= 2)
-		{
-			CHACHA_QUARTER_ROUND(x0, x4,  x8, x12);
-			CHACHA_QUARTER_ROUND(x1, x5,  x9, x13);
-			CHACHA_QUARTER_ROUND(x2, x6, x10, x14);
-			CHACHA_QUARTER_ROUND(x3, x7, x11, x15);
-
-			CHACHA_QUARTER_ROUND(x0, x5, x10, x15);
-			CHACHA_QUARTER_ROUND(x1, x6, x11, x12);
-			CHACHA_QUARTER_ROUND(x2, x7,  x8, x13);
-			CHACHA_QUARTER_ROUND(x3, x4,  x9, x14);
-		}
-
-		#undef CHACHA_OUTPUT
-		#define CHACHA_OUTPUT(x){\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 0, x0 + m_state[0]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 1, x1 + m_state[1]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 2, x2 + m_state[2]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 3, x3 + m_state[3]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 4, x4 + m_state[4]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 5, x5 + m_state[5]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 6, x6 + m_state[6]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 7, x7 + m_state[7]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 8, x8 + m_state[8]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 9, x9 + m_state[9]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 10, x10 + m_state[10]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 11, x11 + m_state[11]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 12, x12 + m_state[12]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 13, x13 + m_state[13]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 14, x14 + m_state[14]);\
-			CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 15, x15 + m_state[15]);}
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-		CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(CHACHA_OUTPUT, BYTES_PER_ITERATION);
-#endif
-
-		++m_state[12];
-		m_state[13] += static_cast<word32>(m_state[12] == 0);
-	}
-}
-
-template class ChaCha_Policy<8>;
-template class ChaCha_Policy<12>;
-template class ChaCha_Policy<20>;
-
-NAMESPACE_END
-
diff --git a/src-cryptopp/chacha.h b/src-cryptopp/chacha.h
deleted file mode 100644
index a126b56..0000000
--- a/src-cryptopp/chacha.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// chacha.h - written and placed in the public domain by Jeffrey Walton.
-//            Copyright assigned to the Crypto++ project.
-//            Based on Wei Dai's Salsa20 and Bernstein's reference ChaCha
-//            family implementation at http://cr.yp.to/chacha.html.
-
-//! \file chacha.h
-//! \brief Classes for ChaCha8, ChaCha12 and ChaCha20 stream ciphers
-//! \details Crypto++ provides Bernstein and ECRYPT's ChaCha from <a href="http://cr.yp.to/chacha/chacha-20080128.pdf">ChaCha,
-//!   a variant of Salsa20</a> (2008.01.28). Bernstein's implementation is _slightly_ different from the TLS working group's
-//!   implementation for cipher suites <tt>TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</tt>,
-//!   <tt>TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</tt>, and <tt>TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256</tt>.
-//! \since Crypto++ 5.6.4
-
-#ifndef CRYPTOPP_CHACHA_H
-#define CRYPTOPP_CHACHA_H
-
-#include "strciphr.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class ChaCha_Info
-//! \brief ChaCha stream cipher information
-//! \since Crypto++ 5.6.4
-template <unsigned int R>
-struct ChaCha_Info : public VariableKeyLength<32, 16, 32, 16, SimpleKeyingInterface::UNIQUE_IV, 8>, public FixedRounds<R>
-{
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {
-		return (R==8?"ChaCha8":(R==12?"ChaCha12":(R==20?"ChaCha20":"ChaCha")));
-	}
-};
-
-//! \class ChaCha_Policy
-//! \brief ChaCha stream cipher implementation
-//! \since Crypto++ 5.6.4
-template <unsigned int R>
-class CRYPTOPP_NO_VTABLE ChaCha_Policy : public AdditiveCipherConcretePolicy<word32, 16>
-{
-protected:
-	CRYPTOPP_CONSTANT(ROUNDS=FixedRounds<R>::ROUNDS)
-
-	void CipherSetKey(const NameValuePairs &params, const byte *key, size_t length);
-	void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount);
-	void CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length);
-	bool CipherIsRandomAccess() const {return false;} // TODO
-	void SeekToIteration(lword iterationCount);
-	unsigned int GetAlignment() const;
-	unsigned int GetOptimalBlockSize() const;
-
-	FixedSizeAlignedSecBlock<word32, 16> m_state;
-};
-
-//! \class ChaCha8
-//! \brief ChaCha8 stream cipher
-//! \sa <a href="http://cr.yp.to/chacha/chacha-20080128.pdf">ChaCha, a variant of Salsa20</a> (2008.01.28).
-//! \since Crypto++ 5.6.4
-struct ChaCha8 : public ChaCha_Info<8>, public SymmetricCipherDocumentation
-{
-	typedef SymmetricCipherFinal<ConcretePolicyHolder<ChaCha_Policy<8>, AdditiveCipherTemplate<> >, ChaCha_Info<8> > Encryption;
-	typedef Encryption Decryption;
-};
-
-//! \class ChaCha12
-//! \brief ChaCha12 stream cipher
-//! \details Bernstein and ECRYPT's ChaCha is _slightly_ different from the TLS working group's implementation for
-//!   cipher suites <tt>TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</tt>,
-//!   <tt>TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</tt>, and <tt>TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256</tt>.
-//! \sa <a href="http://cr.yp.to/chacha/chacha-20080128.pdf">ChaCha, a variant of Salsa20</a> (2008.01.28).
-//! \since Crypto++ 5.6.4
-struct ChaCha12 : public ChaCha_Info<12>, public SymmetricCipherDocumentation
-{
-	typedef SymmetricCipherFinal<ConcretePolicyHolder<ChaCha_Policy<12>, AdditiveCipherTemplate<> >, ChaCha_Info<12> > Encryption;
-	typedef Encryption Decryption;
-};
-
-//! \class ChaCha20
-//! \brief ChaCha20 stream cipher
-//! \sa <a href="http://cr.yp.to/chacha/chacha-20080128.pdf">ChaCha, a variant of Salsa20</a> (2008.01.28).
-//! \details Bernstein and ECRYPT's ChaCha is _slightly_ different from the TLS working group's implementation for
-//!   cipher suites <tt>TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</tt>,
-//!   <tt>TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</tt>, and <tt>TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256</tt>.
-//! \since Crypto++ 5.6.4
-struct ChaCha20 : public ChaCha_Info<20>, public SymmetricCipherDocumentation
-{
-	typedef SymmetricCipherFinal<ConcretePolicyHolder<ChaCha_Policy<20>, AdditiveCipherTemplate<> >, ChaCha_Info<20> > Encryption;
-	typedef Encryption Decryption;
-};
-
-NAMESPACE_END
-
-#endif  // CRYPTOPP_CHACHA_H
diff --git a/src-cryptopp/channels.h b/src-cryptopp/channels.h
deleted file mode 100644
index 93eb440..0000000
--- a/src-cryptopp/channels.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// channels.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile channels.h
-//! \brief Classes for multiple named channels
-
-#ifndef CRYPTOPP_CHANNELS_H
-#define CRYPTOPP_CHANNELS_H
-
-#include "cryptlib.h"
-#include "simple.h"
-#include "smartptr.h"
-#include "stdcpp.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#if 0
-//! Route input on default channel to different and/or multiple channels based on message sequence number
-class MessageSwitch : public Sink
-{
-public:
-	void AddDefaultRoute(BufferedTransformation &destination, const std::string &channel);
-	void AddRoute(unsigned int begin, unsigned int end, BufferedTransformation &destination, const std::string &channel);
-
-	void Put(byte inByte);
-	void Put(const byte *inString, unsigned int length);
-
-	void Flush(bool completeFlush, int propagation=-1);
-	void MessageEnd(int propagation=-1);
-	void PutMessageEnd(const byte *inString, unsigned int length, int propagation=-1);
-	void MessageSeriesEnd(int propagation=-1);
-
-private:
-	typedef std::pair<BufferedTransformation *, std::string> Route;
-	struct RangeRoute
-	{
-		RangeRoute(unsigned int begin, unsigned int end, const Route &route)
-			: begin(begin), end(end), route(route) {}
-		bool operator<(const RangeRoute &rhs) const {return begin < rhs.begin;}
-		unsigned int begin, end;
-		Route route;
-	};
-
-	typedef std::list<RangeRoute> RouteList;
-	typedef std::list<Route> DefaultRouteList;
-
-	RouteList m_routes;
-	DefaultRouteList m_defaultRoutes;
-	unsigned int m_nCurrentMessage;
-};
-#endif
-
-class ChannelSwitchTypedefs
-{
-public:
-	typedef std::pair<BufferedTransformation *, std::string> Route;
-	typedef std::multimap<std::string, Route> RouteMap;
-
-	typedef std::pair<BufferedTransformation *, value_ptr<std::string> > DefaultRoute;
-	typedef std::list<DefaultRoute> DefaultRouteList;
-
-	// SunCC workaround: can't use const_iterator here
-	typedef RouteMap::iterator MapIterator;
-	typedef DefaultRouteList::iterator ListIterator;
-};
-
-class ChannelSwitch;
-
-class ChannelRouteIterator : public ChannelSwitchTypedefs
-{
-public:
-	ChannelRouteIterator(ChannelSwitch &cs) : m_cs(cs), m_useDefault(false) {}
-
-	void Reset(const std::string &channel);
-	bool End() const;
-	void Next();
-	BufferedTransformation & Destination();
-	const std::string & Channel();
-
-	ChannelSwitch& m_cs;
-	std::string m_channel;
-	bool m_useDefault;
-	MapIterator m_itMapCurrent, m_itMapEnd;
-	ListIterator m_itListCurrent, m_itListEnd;
-
-protected:
-	// Hide this to see if we break something...
-	ChannelRouteIterator();
-};
-
-//! Route input to different and/or multiple channels based on channel ID
-class CRYPTOPP_DLL ChannelSwitch : public Multichannel<Sink>, public ChannelSwitchTypedefs
-{
-public:
-	ChannelSwitch() : m_it(*this), m_blocked(false) {}
-	ChannelSwitch(BufferedTransformation &destination) : m_it(*this), m_blocked(false)
-	{
-		AddDefaultRoute(destination);
-	}
-	ChannelSwitch(BufferedTransformation &destination, const std::string &outChannel) : m_it(*this), m_blocked(false)
-	{
-		AddDefaultRoute(destination, outChannel);
-	}
-
-	void IsolatedInitialize(const NameValuePairs &parameters=g_nullNameValuePairs);
-
-	size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking);
-	size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking);
-
-	bool ChannelFlush(const std::string &channel, bool completeFlush, int propagation=-1, bool blocking=true);
-	bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true);
-
-	byte * ChannelCreatePutSpace(const std::string &channel, size_t &size);
-
-	void AddDefaultRoute(BufferedTransformation &destination);
-	void RemoveDefaultRoute(BufferedTransformation &destination);
-	void AddDefaultRoute(BufferedTransformation &destination, const std::string &outChannel);
-	void RemoveDefaultRoute(BufferedTransformation &destination, const std::string &outChannel);
-	void AddRoute(const std::string &inChannel, BufferedTransformation &destination, const std::string &outChannel);
-	void RemoveRoute(const std::string &inChannel, BufferedTransformation &destination, const std::string &outChannel);
-
-private:
-	RouteMap m_routeMap;
-	DefaultRouteList m_defaultRoutes;
-
-	ChannelRouteIterator m_it;
-	bool m_blocked;
-
-	friend class ChannelRouteIterator;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/cmac.h b/src-cryptopp/cmac.h
deleted file mode 100644
index 169eda9..0000000
--- a/src-cryptopp/cmac.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// cmac.h - written and placed in the public domain by Wei Dai
-
-//! \file cmac.h
-//! \brief Classes for CMAC message authentication code
-//! \since Crypto++ 5.6.0
-
-#ifndef CRYPTOPP_CMAC_H
-#define CRYPTOPP_CMAC_H
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class CMAC_Base
-//! \brief CMAC base implementation
-//! \since Crypto++ 5.6.0
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CMAC_Base : public MessageAuthenticationCode
-{
-public:
-	CMAC_Base() : m_counter(0) {}
-
-	void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
-	void Update(const byte *input, size_t length);
-	void TruncatedFinal(byte *mac, size_t size);
-	unsigned int DigestSize() const {return GetCipher().BlockSize();}
-	unsigned int OptimalBlockSize() const {return GetCipher().BlockSize();}
-	unsigned int OptimalDataAlignment() const {return GetCipher().OptimalDataAlignment();}
-
-protected:
-	friend class EAX_Base;
-
-	const BlockCipher & GetCipher() const {return const_cast<CMAC_Base*>(this)->AccessCipher();}
-	virtual BlockCipher & AccessCipher() =0;
-
-	void ProcessBuf();
-	SecByteBlock m_reg;
-	unsigned int m_counter;
-};
-
-//! \brief CMAC message authentication code
-//! \tparam T block cipher
-//! \details Template parameter T should be a class derived from BlockCipherDocumentation, for example AES, with a block size of 8, 16, or 32.
-//! \sa <a href="http://www.cryptolounge.org/wiki/CMAC">CMAC</a>
-//! \since Crypto++ 5.6.0
-template <class T>
-class CMAC : public MessageAuthenticationCodeImpl<CMAC_Base, CMAC<T> >, public SameKeyLengthAs<T>
-{
-public:
-	//! \brief Construct a CMAC
-	CMAC() {}
-	//! \brief Construct a CMAC
-	//! \param key the MAC key
-	//! \param length the key size, in bytes
-	CMAC(const byte *key, size_t length=SameKeyLengthAs<T>::DEFAULT_KEYLENGTH)
-		{this->SetKey(key, length);}
-
-	static std::string StaticAlgorithmName() {return std::string("CMAC(") + T::StaticAlgorithmName() + ")";}
-
-private:
-	BlockCipher & AccessCipher() {return m_cipher;}
-	typename T::Encryption m_cipher;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/config.h b/src-cryptopp/config.h
deleted file mode 100644
index 6dcdbad..0000000
--- a/src-cryptopp/config.h
+++ /dev/null
@@ -1,947 +0,0 @@
-// config.h - written and placed in the public domain by Wei Dai
-
-//! \file config.h
-//! \brief Library configuration file
-
-#ifndef CRYPTOPP_CONFIG_H
-#define CRYPTOPP_CONFIG_H
-
-extern const char*cryptopp_extra_version;
-
-// ***************** Important Settings ********************
-
-// define this if running on a big-endian CPU
-#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || (defined(__m68k__) || defined(__MC68K__)) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))
-#	define IS_BIG_ENDIAN
-#endif
-
-// define this if running on a little-endian CPU
-// big endian will be assumed if IS_LITTLE_ENDIAN is not defined
-#ifndef IS_BIG_ENDIAN
-#	define IS_LITTLE_ENDIAN
-#endif
-
-// Sanity checks. Some processors have more than big-, little- and bi-endian modes. PDP mode, where order results in "4312", should
-//   raise red flags immediately. Additionally, mis-classified machines, like (previosuly) S/390, should raise red flags immediately.
-#if defined(IS_BIG_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
-# error "IS_BIG_ENDIAN is set, but __BYTE_ORDER__  does not equal __ORDER_BIG_ENDIAN__"
-#endif
-#if defined(IS_LITTLE_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
-# error "IS_LITTLE_ENDIAN is set, but __BYTE_ORDER__  does not equal __ORDER_LITTLE_ENDIAN__"
-#endif
-
-// Define this if you want to disable all OS-dependent features,
-// such as sockets and OS-provided random number generators
-// #define NO_OS_DEPENDENCE
-
-// Define this to use features provided by Microsoft's CryptoAPI.
-// Currently the only feature used is Windows random number generation.
-// This macro will be ignored if NO_OS_DEPENDENCE is defined.
-// #define USE_MS_CRYPTOAPI
-
-// Define this to use features provided by Microsoft's CryptoNG API.
-// CryptoNG API is available in Vista and above and its cross platform,
-// including desktop apps and store apps. Currently the only feature
-// used is Windows random number generation.
-// This macro will be ignored if NO_OS_DEPENDENCE is defined.
-// #define USE_MS_CNGAPI
-
-// If the user did not make a choice, then select CryptoNG if either
-// Visual Studio 2015 is available, or Windows 10 or above is available.
-#if !defined(USE_MS_CRYPTOAPI) && !defined(USE_MS_CNGAPI)
-# if (_MSC_VER >= 1900) || ((WINVER >= 0x0A00 /*_WIN32_WINNT_WIN10*/) || (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/))
-#  define USE_MS_CNGAPI
-# else
-#  define USE_MS_CRYPTOAPI
-# endif
-#endif
-
-// Define this to ensure C/C++ standard compliance and respect for GCC aliasing rules and other alignment fodder. If you
-// experience a break with GCC at -O3, you should try this first. Guard it in case its set on the command line (and it differs).
-#ifndef CRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-# define CRYPTOPP_NO_UNALIGNED_DATA_ACCESS
-#endif
-
-// ***************** Less Important Settings ***************
-
-// Library version
-#define CRYPTOPP_VERSION 565
-
-// Define this if you want to set a prefix for TestData/ and TestVectors/
-//   Be mindful of the trailing slash since its simple concatenation.
-//   g++ ... -DCRYPTOPP_DATA_DIR='"/tmp/cryptopp_test/share/"'
-#ifndef CRYPTOPP_DATA_DIR
-# define CRYPTOPP_DATA_DIR ""
-#endif
-
-// define this to retain (as much as possible) old deprecated function and class names
-// #define CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-
-// Define this to retain (as much as possible) ABI and binary compatibility with Crypto++ 5.6.2.
-// Also see https://cryptopp.com/wiki/Config.h#Avoid_MAINTAIN_BACKWARDS_COMPATIBILITY
-// #define CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-
-// Define this if you want or need the library's memcpy_s and memmove_s.
-//   See http://github.com/weidai11/cryptopp/issues/28.
-// #if !defined(CRYPTOPP_WANT_SECURE_LIB)
-// # define CRYPTOPP_WANT_SECURE_LIB
-// #endif
-
-// File system code to write to GZIP archive.
-#if !defined(GZIP_OS_CODE)
-# define GZIP_OS_CODE 0
-#endif
-
-// Try this if your CPU has 256K internal cache or a slow multiply instruction
-// and you want a (possibly) faster IDEA implementation using log tables
-// #define IDEA_LARGECACHE
-
-// Define this if, for the linear congruential RNG, you want to use
-// the original constants as specified in S.K. Park and K.W. Miller's
-// CACM paper.
-// #define LCRNG_ORIGINAL_NUMBERS
-
-// Define this if you want Integer's operator<< to honor std::showbase (and
-// std::noshowbase). If defined, Integer will use a suffix of 'b', 'o', 'h'
-// or '.' (the last for decimal) when std::showbase is in effect. If
-// std::noshowbase is set, then the suffix is not added to the Integer. If
-// not defined, existing behavior is preserved and Integer will use a suffix
-// of 'b', 'o', 'h' or '.' (the last for decimal).
-// #define CRYPTOPP_USE_STD_SHOWBASE
-
-// choose which style of sockets to wrap (mostly useful for MinGW which has both)
-#if !defined(NO_BERKELEY_STYLE_SOCKETS) && !defined(PREFER_BERKELEY_STYLE_SOCKETS)
-# define PREFER_BERKELEY_STYLE_SOCKETS
-#endif
-
-// #if !defined(NO_WINDOWS_STYLE_SOCKETS) && !defined(PREFER_WINDOWS_STYLE_SOCKETS)
-// # define PREFER_WINDOWS_STYLE_SOCKETS
-// #endif
-
-// set the name of Rijndael cipher, was "Rijndael" before version 5.3
-#define CRYPTOPP_RIJNDAEL_NAME "AES"
-
-// CRYPTOPP_DEBUG enables the library's CRYPTOPP_ASSERT. CRYPTOPP_ASSERT
-//   raises a SIGTRAP (Unix) or calls DebugBreak() (Windows). CRYPTOPP_ASSERT
-//   is only in effect when CRYPTOPP_DEBUG, DEBUG or _DEBUG is defined. Unlike
-//   Posix assert, CRYPTOPP_ASSERT is not affected by NDEBUG (or failure to
-//   define it).
-//   Also see http://github.com/weidai11/cryptopp/issues/277, CVE-2016-7420
-#if (defined(DEBUG) || defined(_DEBUG)) && !defined(CRYPTOPP_DEBUG)
-# define CRYPTOPP_DEBUG 1
-#endif
-
-// ***************** Initialization and Constructor priorities ********************
-
-// MacPorts/GCC and Solaris/GCC does not provide constructor(priority). Apple/GCC and Fink/GCC do provide it.
-// See http://cryptopp.com/wiki/Static_Initialization_Order_Fiasco
-
-// CRYPTOPP_INIT_PRIORITY attempts to manage initialization of C++ static objects.
-// Under GCC, the library uses init_priority attribute in the range
-// [CRYPTOPP_INIT_PRIORITY, CRYPTOPP_INIT_PRIORITY+100]. Under Windows,
-// CRYPTOPP_INIT_PRIORITY enlists "#pragma init_seg(lib)".
-#ifndef CRYPTOPP_INIT_PRIORITY
-# define CRYPTOPP_INIT_PRIORITY 250
-#endif
-
-// CRYPTOPP_USER_PRIORITY is for other libraries and user code that is using Crypto++
-// and managing C++ static object creation. It is guaranteed not to conflict with
-// values used by (or would be used by) the Crypto++ library.
-#if defined(CRYPTOPP_INIT_PRIORITY) && (CRYPTOPP_INIT_PRIORITY > 0)
-# define CRYPTOPP_USER_PRIORITY (CRYPTOPP_INIT_PRIORITY + 101)
-#else
-# define CRYPTOPP_USER_PRIORITY 350
-#endif
-
-// __attribute__(init_priority(250)) is supported
-#if (__GNUC__ && (CRYPTOPP_INIT_PRIORITY > 0) && ((CRYPTOPP_GCC_VERSION >= 40300) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20900) || (_INTEL_COMPILER >= 300)) && !(MACPORTS_GCC_COMPILER > 0) && !defined(__sun__))
-# define HAVE_GCC_CONSTRUCTOR1 1
-#endif
-
-// __attribute__(init_priority()) is supported
-#if (__GNUC__ && (CRYPTOPP_INIT_PRIORITY > 0) && !HAVE_GCC_CONSTRUCTOR1 && !(MACPORTS_GCC_COMPILER > 0) && !defined(__sun__))
-# define HAVE_GCC_CONSTRUCTOR0 1
-#endif
-
-#if (_MSC_VER && (CRYPTOPP_INIT_PRIORITY > 0))
-# define HAVE_MSC_INIT_PRIORITY 1
-#endif
-
-// ***************** Important Settings Again ********************
-// But the defaults should be ok.
-
-// namespace support is now required
-#ifdef NO_NAMESPACE
-#	error namespace support is now required
-#endif
-
-// Define this to workaround a Microsoft CryptoAPI bug where
-// each call to CryptAcquireContext causes a 100 KB memory leak.
-// Defining this will cause Crypto++ to make only one call to CryptAcquireContext.
-#define WORKAROUND_MS_BUG_Q258000
-
-#ifdef CRYPTOPP_DOXYGEN_PROCESSING
-// Document the namespce exists. Put it here before CryptoPP is undefined below.
-//! \namespace CryptoPP
-//! \brief Crypto++ library namespace
-//! \details Nearly all classes are located in the CryptoPP namespace. Within
-//!   the namespace, there are two additional namespaces.
-//!   <ul>
-//!     <li>Name - namespace for names used with \p NameValuePairs and documented in argnames.h
-//!     <li>Weak - namespace for weak and wounded algorithms, like ARC4, MD5 and Pananma
-//!   </ul>
-namespace CryptoPP { }
-// Bring in the symbols fund in the weak namespace; and fold Weak1 into Weak
-#		define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
-#		define Weak1 Weak
-// Avoid putting "CryptoPP::" in front of everything in Doxygen output
-#       define CryptoPP
-#       define NAMESPACE_BEGIN(x)
-#       define NAMESPACE_END
-// Get Doxygen to generate better documentation for these typedefs
-#       define DOCUMENTED_TYPEDEF(x, y) class y : public x {};
-// Make "protected" "private" so the functions and members are not documented
-#		define protected private
-#else
-#       define NAMESPACE_BEGIN(x) namespace x {
-#       define NAMESPACE_END }
-#       define DOCUMENTED_TYPEDEF(x, y) typedef x y;
-#endif
-#define ANONYMOUS_NAMESPACE_BEGIN namespace {
-#define ANONYMOUS_NAMESPACE_END }
-#define USING_NAMESPACE(x) using namespace x;
-#define DOCUMENTED_NAMESPACE_BEGIN(x) namespace x {
-#define DOCUMENTED_NAMESPACE_END }
-
-// What is the type of the third parameter to bind?
-// For Unix, the new standard is ::socklen_t (typically unsigned int), and the old standard is int.
-// Unfortunately there is no way to tell whether or not socklen_t is defined.
-// To work around this, TYPE_OF_SOCKLEN_T is a macro so that you can change it from the makefile.
-#ifndef TYPE_OF_SOCKLEN_T
-#	if defined(_WIN32) || defined(__CYGWIN__)
-#		define TYPE_OF_SOCKLEN_T int
-#	else
-#		define TYPE_OF_SOCKLEN_T ::socklen_t
-#	endif
-#endif
-
-#if defined(__CYGWIN__) && defined(PREFER_WINDOWS_STYLE_SOCKETS)
-#	define __USE_W32_SOCKETS
-#endif
-
-typedef unsigned char byte;		// put in global namespace to avoid ambiguity with other byte typedefs
-
-NAMESPACE_BEGIN(CryptoPP)
-
-typedef unsigned short word16;
-typedef unsigned int word32;
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-	typedef unsigned __int64 word64;
-	#define W64LIT(x) x##ui64
-#elif (_LP64 || __LP64__)
-	typedef unsigned long word64;
-	#define W64LIT(x) x##UL
-#else
-	typedef unsigned long long word64;
-	#define W64LIT(x) x##ULL
-#endif
-
-// define large word type, used for file offsets and such
-typedef word64 lword;
-const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
-
-// Clang pretends to be VC++, too.
-//   See http://github.com/weidai11/cryptopp/issues/147
-#if defined(_MSC_VER) && defined(__clang__)
-# error: "Unsupported configuration"
-#endif
-
-#ifdef __GNUC__
-	#define CRYPTOPP_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#endif
-
-// Apple and LLVM's Clang. Apple Clang version 7.0 roughly equals LLVM Clang version 3.7
-#if defined(__clang__ ) && !defined(__apple_build_version__)
-	#define CRYPTOPP_LLVM_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
-	#define CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER 1
-#elif defined(__clang__ ) && defined(__apple_build_version__)
-	#define CRYPTOPP_APPLE_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
-	#define CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER 1
-#endif
-
-#ifdef _MSC_VER
-	#define CRYPTOPP_MSC_VERSION (_MSC_VER)
-#endif
-
-// Need GCC 4.6/Clang 1.7/Apple Clang 2.0 or above due to "GCC diagnostic {push|pop}"
-#if (CRYPTOPP_GCC_VERSION >= 40600) || (CRYPTOPP_LLVM_CLANG_VERSION >= 10700) || (CRYPTOPP_APPLE_CLANG_VERSION >= 20000)
-	#define CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE 1
-#endif
-
-// Clang due to "Inline assembly operands don't work with .intel_syntax", http://llvm.org/bugs/show_bug.cgi?id=24232
-//   TODO: supply the upper version when LLVM fixes it. We set it to 20.0 for compilation purposes.
-#if (defined(CRYPTOPP_LLVM_CLANG_VERSION) && CRYPTOPP_LLVM_CLANG_VERSION <= 200000) || (defined(CRYPTOPP_APPLE_CLANG_VERSION) && CRYPTOPP_APPLE_CLANG_VERSION <= 200000) || defined(CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER)
-	#define CRYPTOPP_DISABLE_INTEL_ASM 1
-#endif
-
-// define hword, word, and dword. these are used for multiprecision integer arithmetic
-// Intel compiler won't have _umul128 until version 10.0. See http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30231625.aspx
-#if (defined(_MSC_VER) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1000) && (defined(_M_X64) || defined(_M_IA64))) || (defined(__DECCXX) && defined(__alpha__)) || (defined(__INTEL_COMPILER) && defined(__x86_64__)) || (defined(__SUNPRO_CC) && defined(__x86_64__))
-	typedef word32 hword;
-	typedef word64 word;
-#else
-	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
-	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
-		#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
-			// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
-			// mode(TI) division broken on amd64 with GCC earlier than GCC 3.4
-			typedef word32 hword;
-			typedef word64 word;
-			typedef __uint128_t dword;
-			typedef __uint128_t word128;
-			#define CRYPTOPP_WORD128_AVAILABLE 1
-		#else
-			// if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
-			typedef word16 hword;
-			typedef word32 word;
-			typedef word64 dword;
-		#endif
-	#else
-		// being here means the native register size is probably 32 bits or less
-		#define CRYPTOPP_BOOL_SLOW_WORD64 1
-		typedef word16 hword;
-		typedef word32 word;
-		typedef word64 dword;
-	#endif
-#endif
-#ifndef CRYPTOPP_BOOL_SLOW_WORD64
-	#define CRYPTOPP_BOOL_SLOW_WORD64 0
-#endif
-
-const unsigned int WORD_SIZE = sizeof(word);
-const unsigned int WORD_BITS = WORD_SIZE * 8;
-
-NAMESPACE_END
-
-#ifndef CRYPTOPP_L1_CACHE_LINE_SIZE
-	// This should be a lower bound on the L1 cache line size. It's used for defense against timing attacks.
-	// Also see http://stackoverflow.com/questions/794632/programmatically-get-the-cache-line-size.
-	#if defined(_M_X64) || defined(__x86_64__) || (__arm64__) || (__aarch64__)
-		#define CRYPTOPP_L1_CACHE_LINE_SIZE 64
-	#else
-		// L1 cache line size is 32 on Pentium III and earlier
-		#define CRYPTOPP_L1_CACHE_LINE_SIZE 32
-	#endif
-#endif
-
-#if defined(_MSC_VER)
-	#if _MSC_VER == 1200
-		#include <malloc.h>
-	#endif
-	#if _MSC_VER > 1200 || defined(_mm_free)
-		#define CRYPTOPP_MSVC6PP_OR_LATER		// VC 6 processor pack or later
-	#else
-		#define CRYPTOPP_MSVC6_NO_PP			// VC 6 without processor pack
-	#endif
-#endif
-
-#ifndef CRYPTOPP_ALIGN_DATA
-	#if defined(CRYPTOPP_MSVC6PP_OR_LATER)
-		#define CRYPTOPP_ALIGN_DATA(x) __declspec(align(x))
-	#elif defined(__GNUC__)
-		#define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x)))
-	#else
-		#define CRYPTOPP_ALIGN_DATA(x)
-	#endif
-#endif
-
-#ifndef CRYPTOPP_SECTION_ALIGN16
-#if defined(__GNUC__) && !defined(__APPLE__)
-		// the alignment attribute doesn't seem to work without this section attribute when -fdata-sections is turned on
-		#define CRYPTOPP_SECTION_ALIGN16 __attribute__((section ("CryptoPP_Align16")))
-	#else
-		#define CRYPTOPP_SECTION_ALIGN16
-	#endif
-#endif
-
-// The section attribute attempts to initialize CPU flags to avoid Valgrind findings above -O1
-#if ((__MACH__ >= 1) && ((CRYPTOPP_LLVM_CLANG_VERSION >= 30600) || (CRYPTOPP_APPLE_CLANG_VERSION >= 70100) || (CRYPTOPP_GCC_VERSION >= 40300)))
-	#define CRYPTOPP_SECTION_INIT __attribute__((section ("__DATA,__data")))
-#elif ((__ELF__ >= 1) && (CRYPTOPP_GCC_VERSION >= 40300))
-	#define CRYPTOPP_SECTION_INIT __attribute__((section ("nocommon")))
-#else
-	#define CRYPTOPP_SECTION_INIT
-#endif
-
-#if defined(_MSC_VER) || defined(__fastcall)
-	#define CRYPTOPP_FASTCALL __fastcall
-#else
-	#define CRYPTOPP_FASTCALL
-#endif
-
-// VC60 workaround: it doesn't allow typename in some places
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-#define CPP_TYPENAME
-#else
-#define CPP_TYPENAME typename
-#endif
-
-// VC60 workaround: can't cast unsigned __int64 to float or double
-#if defined(_MSC_VER) && !defined(CRYPTOPP_MSVC6PP_OR_LATER)
-#define CRYPTOPP_VC6_INT64 (__int64)
-#else
-#define CRYPTOPP_VC6_INT64
-#endif
-
-#ifdef _MSC_VER
-#define CRYPTOPP_NO_VTABLE __declspec(novtable)
-#else
-#define CRYPTOPP_NO_VTABLE
-#endif
-
-#ifdef _MSC_VER
-	// 4127: conditional expression is constant
-	// 4231: nonstandard extension used : 'extern' before template explicit instantiation
-	// 4250: dominance
-	// 4251: member needs to have dll-interface
-	// 4275: base needs to have dll-interface
-	// 4505: unreferenced local function
-	// 4512: assignment operator not generated
-	// 4660: explicitly instantiating a class that's already implicitly instantiated
-	// 4661: no suitable definition provided for explicit template instantiation request
-	// 4786: identifer was truncated in debug information
-	// 4355: 'this' : used in base member initializer list
-	// 4910: '__declspec(dllexport)' and 'extern' are incompatible on an explicit instantiation
-#	pragma warning(disable: 4127 4231 4250 4251 4275 4505 4512 4660 4661 4786 4355 4910)
-	// Security related, possible defects
-	// http://blogs.msdn.com/b/vcblog/archive/2010/12/14/off-by-default-compiler-warnings-in-visual-c.aspx
-#	pragma warning(once: 4191 4242 4263 4264 4266 4302 4826 4905 4906 4928)
-#endif
-
-#ifdef __BORLANDC__
-// 8037: non-const function called for const object. needed to work around BCB2006 bug
-#	pragma warn -8037
-#endif
-
-// [GCC Bug 53431] "C++ preprocessor ignores #pragma GCC diagnostic". Clang honors it.
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic ignored "-Wunknown-pragmas"
-# pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-// You may need to force include a C++ header on Android when using STLPort to ensure
-// _STLPORT_VERSION is defined: CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 -include iosfwd"
-// TODO: Figure out C++17 and lack of std::uncaught_exception
-#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || (defined(_STLPORT_VERSION) && ((_STLPORT_VERSION < 0x450) || defined(_STLP_NO_UNCAUGHT_EXCEPT_SUPPORT)))
-#define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
-#endif
-
-#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
-#define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE
-#endif
-
-#ifdef CRYPTOPP_DISABLE_X86ASM		// for backwards compatibility: this macro had both meanings
-#define CRYPTOPP_DISABLE_ASM
-#define CRYPTOPP_DISABLE_SSE2
-#endif
-
-// Apple's Clang prior to 5.0 cannot handle SSE2 (and Apple does not use LLVM Clang numbering...)
-#if defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION < 50000)
-# define CRYPTOPP_DISABLE_ASM
-#endif
-
-// Sun Studio 12 provides GCC inline assembly, http://blogs.oracle.com/x86be/entry/gcc_style_asm_inlining_support
-// We can enable SSE2 for Sun Studio in the makefile with -D__SSE2__, but users may not compile with it.
-#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(__SSE2__) && defined(__x86_64__) && (__SUNPRO_CC >= 0x5100)
-# define __SSE2__ 1
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(_MSC_VER) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))))
-	// C++Builder 2010 does not allow "call label" where label is defined within inline assembly
-	#define CRYPTOPP_X86_ASM_AVAILABLE
-
-	#if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__))
-		#define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 1
-	#else
-		#define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0
-	#endif
-
-	#if !defined(CRYPTOPP_DISABLE_SSE3) && (_MSC_VER >= 1500 || (defined(__SSE3__) && defined(__SSSE3__)))
-		#define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1
-	#else
-		#define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
-	#endif
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_ASM) && defined(_MSC_VER) && defined(_M_X64)
-	#define CRYPTOPP_X64_MASM_AVAILABLE
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__GNUC__) && defined(__x86_64__)
-	#define CRYPTOPP_X64_ASM_AVAILABLE
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_ASM) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) && !defined(_M_ARM)
-	#define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 1
-#else
-	#define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0
-#endif
-
-// Intrinsics availible in GCC 4.3 (http://gcc.gnu.org/gcc-4.3/changes.html) and
-//   MSVC 2008 (http://msdn.microsoft.com/en-us/library/bb892950%28v=vs.90%29.aspx)
-//   SunCC could generate SSE4 at 12.1, but the intrinsics are missing until 12.4.
-#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSE4) && !defined(_M_ARM) && ((_MSC_VER >= 1500) || (defined(__SSE4_1__) && defined(__SSE4_2__)))
-	#define CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE 1
-#else
-	#define CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE 0
-#endif
-
-// Don't disgorge AES-NI from CLMUL. There will be two to four subtle breaks
-#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_AESNI) && !defined(_M_ARM) && (_MSC_FULL_VER >= 150030729 || __INTEL_COMPILER >= 1110 || (defined(__AES__) && defined(__PCLMUL__)))
-	#define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 1
-#else
-	#define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0
-#endif
-
-// AVX2 in MSC 18.00
-#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_AVX) && !defined(_M_ARM) && ((_MSC_VER >= 1600) || (defined(__RDRND__) || defined(__RDSEED__) || defined(__AVX__)))
-	#define CRYPTOPP_BOOL_AVX_AVAILABLE 1
-#else
-	#define CRYPTOPP_BOOL_AVX_AVAILABLE 0
-#endif
-
-// Requires ARMv7 and ACLE 1.0. Testing shows ARMv7 is really ARMv7a under most toolchains.
-#if !defined(CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__ARM_NEON__) || defined(__ARM_NEON) || defined(_M_ARM)
-#  define CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE 1
-# endif
-#endif
-
-// Requires ARMv8 and ACLE 2.0. For GCC, requires 4.8 and above.
-// Microsoft plans to support ARM-64, but its not clear how to detect it.
-// TODO: Add MSC_VER and ARM-64 platform define when available
-#if !defined(CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__ARM_FEATURE_CRC32) || defined(_M_ARM64)
-#  define CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE 1
-# endif
-#endif
-
-// Requires ARMv8 and ACLE 2.0. For GCC, requires 4.8 and above.
-// Microsoft plans to support ARM-64, but its not clear how to detect it.
-// TODO: Add MSC_VER and ARM-64 platform define when available
-#if !defined(CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__ARM_FEATURE_CRYPTO) || defined(_M_ARM64)
-#  define CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE 1
-# endif
-#endif
-
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
-	#define CRYPTOPP_BOOL_ALIGN16 1
-#else
-	#define CRYPTOPP_BOOL_ALIGN16 0
-#endif
-
-// how to allocate 16-byte aligned memory (for SSE2)
-#if defined(CRYPTOPP_MSVC6PP_OR_LATER)
-	#define CRYPTOPP_MM_MALLOC_AVAILABLE
-#elif defined(__APPLE__)
-	#define CRYPTOPP_APPLE_MALLOC_AVAILABLE
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-	#define CRYPTOPP_MALLOC_ALIGNMENT_IS_16
-#elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__)
-	#define CRYPTOPP_MEMALIGN_AVAILABLE
-#else
-	#define CRYPTOPP_NO_ALIGNED_ALLOC
-#endif
-
-// Apple always provides 16-byte aligned, and tells us to use calloc
-// http://developer.apple.com/library/mac/documentation/Performance/Conceptual/ManagingMemory/Articles/MemoryAlloc.html
-
-// how to disable inlining
-#if defined(_MSC_VER) && _MSC_VER >= 1300
-#	define CRYPTOPP_NOINLINE_DOTDOTDOT
-#	define CRYPTOPP_NOINLINE __declspec(noinline)
-#elif defined(__GNUC__)
-#	define CRYPTOPP_NOINLINE_DOTDOTDOT
-#	define CRYPTOPP_NOINLINE __attribute__((noinline))
-#else
-#	define CRYPTOPP_NOINLINE_DOTDOTDOT ...
-#	define CRYPTOPP_NOINLINE
-#endif
-
-// How to declare class constants
-// Use enum for OS X 10.5 ld, http://github.com/weidai11/cryptopp/issues/255
-#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__INTEL_COMPILER) || defined(__BORLANDC__)
-#	define CRYPTOPP_CONSTANT(x) enum {x};
-#else
-#	define CRYPTOPP_CONSTANT(x) static const int x;
-#endif
-
-// Linux provides X32, which is 32-bit integers, longs and pointers on x86_64 using the full x86_64 register set.
-// Detect via __ILP32__ (http://wiki.debian.org/X32Port). However, __ILP32__ shows up in more places than
-// the System V ABI specs calls out, like on just about any 32-bit system with Clang.
-#if ((__ILP32__ >= 1) || (_ILP32 >= 1)) && defined(__x86_64__)
-	#define CRYPTOPP_BOOL_X32 1
-#else
-	#define CRYPTOPP_BOOL_X32 0
-#endif
-
-// see http://predef.sourceforge.net/prearch.html
-#if (defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(_X86_) || defined(__I86__) || defined(__INTEL__)) && !CRYPTOPP_BOOL_X32
-	#define CRYPTOPP_BOOL_X86 1
-#else
-	#define CRYPTOPP_BOOL_X86 0
-#endif
-
-#if (defined(_M_X64) || defined(__x86_64__)) && !CRYPTOPP_BOOL_X32
-	#define CRYPTOPP_BOOL_X64 1
-#else
-	#define CRYPTOPP_BOOL_X64 0
-#endif
-
-// Undo the ASM and Intrinsic related defines due to X32.
-#if CRYPTOPP_BOOL_X32
-# undef CRYPTOPP_BOOL_X64
-# undef CRYPTOPP_X64_ASM_AVAILABLE
-# undef CRYPTOPP_X64_MASM_AVAILABLE
-#endif
-
-#if defined(__arm__) || defined(__aarch32__) || defined(_M_ARM)
-	#define CRYPTOPP_BOOL_ARM32 1
-#else
-	#define CRYPTOPP_BOOL_ARM32 0
-#endif
-
-// Microsoft plans to support ARM-64, but its not clear how to detect it.
-// TODO: Add MSC_VER and ARM-64 platform define when available
-#if defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
-	#define CRYPTOPP_BOOL_ARM64 1
-#else
-	#define CRYPTOPP_BOOL_ARM64 0
-#endif
-
-#if !defined(CRYPTOPP_NO_UNALIGNED_DATA_ACCESS) && !defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)
-#if (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || defined(__powerpc__) || (__ARM_FEATURE_UNALIGNED >= 1))
-	#define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-#endif
-#endif
-
-// ***************** determine availability of OS features ********************
-
-#ifndef NO_OS_DEPENDENCE
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#define CRYPTOPP_WIN32_AVAILABLE
-#endif
-
-#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun)
-#define CRYPTOPP_UNIX_AVAILABLE
-#endif
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#define CRYPTOPP_BSD_AVAILABLE
-#endif
-
-#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE)
-#	define HIGHRES_TIMER_AVAILABLE
-#endif
-
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-# if !defined(WINAPI_FAMILY)
-#	define THREAD_TIMER_AVAILABLE
-# elif defined(WINAPI_FAMILY)
-#   if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
-#	  define THREAD_TIMER_AVAILABLE
-#  endif
-# endif
-#endif
-
-#ifdef CRYPTOPP_UNIX_AVAILABLE
-#	define HAS_BERKELEY_STYLE_SOCKETS
-#	define SOCKETS_AVAILABLE
-#endif
-
-// Sockets are only available under Windows Runtime desktop partition apps (despite the MSDN literature)
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-# define HAS_WINDOWS_STYLE_SOCKETS
-# if !defined(WINAPI_FAMILY)
-#	define SOCKETS_AVAILABLE
-# elif defined(WINAPI_FAMILY)
-#   if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
-#	  define SOCKETS_AVAILABLE
-#   endif
-# endif
-#endif
-
-#if defined(HAS_WINDOWS_STYLE_SOCKETS) && (!defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(PREFER_WINDOWS_STYLE_SOCKETS))
-#	define USE_WINDOWS_STYLE_SOCKETS
-#else
-#	define USE_BERKELEY_STYLE_SOCKETS
-#endif
-
-#if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(SOCKETS_AVAILABLE) && !defined(USE_BERKELEY_STYLE_SOCKETS)
-#	define WINDOWS_PIPES_AVAILABLE
-#endif
-
-#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
-#	define NONBLOCKING_RNG_AVAILABLE
-#	define BLOCKING_RNG_AVAILABLE
-#	define OS_RNG_AVAILABLE
-#	define HAS_PTHREADS
-#	define THREADS_AVAILABLE
-#endif
-
-#if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) || defined(__CYGWIN__)
-# define UNIX_SIGNALS_AVAILABLE 1
-#endif
-
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-# if !defined(WINAPI_FAMILY)
-#	define HAS_WINTHREADS
-#	define THREADS_AVAILABLE
-#	define NONBLOCKING_RNG_AVAILABLE
-#	define OS_RNG_AVAILABLE
-# elif defined(WINAPI_FAMILY)
-#   if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
-#	  define HAS_WINTHREADS
-#	  define THREADS_AVAILABLE
-#	  define NONBLOCKING_RNG_AVAILABLE
-#	  define OS_RNG_AVAILABLE
-#   elif !(WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
-#     if ((WINVER >= 0x0A00 /*_WIN32_WINNT_WIN10*/) || (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/))
-#	    define NONBLOCKING_RNG_AVAILABLE
-#	    define OS_RNG_AVAILABLE
-#     endif
-#   endif
-# endif
-#endif
-
-#endif	// NO_OS_DEPENDENCE
-
-// ***************** DLL related ********************
-
-#if defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
-
-#ifdef CRYPTOPP_EXPORTS
-#define CRYPTOPP_IS_DLL
-#define CRYPTOPP_DLL __declspec(dllexport)
-#elif defined(CRYPTOPP_IMPORTS)
-#define CRYPTOPP_IS_DLL
-#define CRYPTOPP_DLL __declspec(dllimport)
-#else
-#define CRYPTOPP_DLL
-#endif
-
-#define CRYPTOPP_API __cdecl
-
-#else	// not CRYPTOPP_WIN32_AVAILABLE
-
-#define CRYPTOPP_DLL
-#define CRYPTOPP_API
-
-#endif	// CRYPTOPP_WIN32_AVAILABLE
-
-#if defined(__MWERKS__)
-#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL
-#elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
-#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
-#else
-#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL
-#endif
-
-#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_IMPORTS)
-#define CRYPTOPP_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
-#else
-#define CRYPTOPP_DLL_TEMPLATE_CLASS CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS
-#endif
-
-#if defined(__MWERKS__)
-#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class
-#elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
-#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class
-#else
-#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class
-#endif
-
-#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_EXPORTS)
-#define CRYPTOPP_STATIC_TEMPLATE_CLASS template class
-#else
-#define CRYPTOPP_STATIC_TEMPLATE_CLASS CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS
-#endif
-
-// ************** Unused variable ***************
-
-// Portable way to suppress warnings.
-//   Moved from misc.h due to circular depenedencies.
-#define CRYPTOPP_UNUSED(x) ((void)(x))
-
-// ************** Deprecated ***************
-
-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800)
-# define CRYPTOPP_DEPRECATED(msg) __attribute__((deprecated (msg)));
-#elif (CRYPTOPP_GCC_VERSION)
-# define CRYPTOPP_DEPRECATED(msg) __attribute__((deprecated));
-#else
-# define CRYPTOPP_DEPRECATED(msg)
-#endif
-
-// ***************** C++11 related ********************
-
-// Visual Studio began at VS2010, http://msdn.microsoft.com/en-us/library/hh567368%28v=vs.110%29.aspx.
-// Intel and C++11 language features, http://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler
-// GCC and C++11 language features, http://gcc.gnu.org/projects/cxx0x.html
-// Clang and C++11 language features, http://clang.llvm.org/cxx_status.html
-#if ((_MSC_VER >= 1600) || (__cplusplus >= 201103L)) && !defined(_STLPORT_VERSION)
-# define CRYPTOPP_CXX11 1
-#endif
-
-// Hack ahead. Apple's standard library does not have C++'s unique_ptr in C++11. We can't
-//   test for unique_ptr directly because some of the non-Apple Clangs on OS X fail the same
-//   way. However, modern standard libraries have <forward_list>, so we test for it instead.
-//   Thanks to Jonathan Wakely for devising the clever test for modern/ancient versions.
-// TODO: test under Xcode 3, where g++ is really g++.
-#if defined(__APPLE__) && defined(__clang__)
-#  if !(defined(__has_include) && __has_include(<forward_list>))
-#    undef CRYPTOPP_CXX11
-#  endif
-#endif
-
-// C++11 or C++14 is available
-#if defined(CRYPTOPP_CXX11)
-
-// atomics: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.1/3.2; Intel 13.0; SunCC 12.5.
-#if (CRYPTOPP_MSC_VERSION >= 1700)
-#  define CRYPTOPP_CXX11_ATOMICS 1
-#elif (__INTEL_COMPILER >= 1300)
-#  define CRYPTOPP_CXX11_ATOMICS 1
-#elif defined(__clang__)
-#  if __has_feature(cxx_atomic)
-#    define CRYPTOPP_CXX11_ATOMICS 1
-#  endif
-#elif (CRYPTOPP_GCC_VERSION >= 40400)
-#  define CRYPTOPP_CXX11_ATOMICS 1
-#elif (__SUNPRO_CC >= 0x5140)
-#  define CRYPTOPP_CXX11_ATOMICS 1
-#endif // atomics
-
-// synchronization: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.3; Xcode 5.0; Intel 12.0; SunCC 12.4.
-// TODO: verify Clang and Intel versions; find __has_feature(x) extension for Clang
-#if (CRYPTOPP_MSC_VERSION >= 1700)
-#  define CRYPTOPP_CXX11_SYNCHRONIZATION 1
-#elif (__INTEL_COMPILER >= 1200)
-#  define CRYPTOPP_CXX11_SYNCHRONIZATION 1
-#elif (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50000)
-#  define CRYPTOPP_CXX11_SYNCHRONIZATION 1
-#elif (CRYPTOPP_GCC_VERSION >= 40400)
-#  define CRYPTOPP_CXX11_SYNCHRONIZATION 1
-#elif (__SUNPRO_CC >= 0x5130)
-#  define CRYPTOPP_CXX11_SYNCHRONIZATION 1
-#endif // synchronization
-
-// alignof/alignas: MS at VS2015 (19.00); GCC at 4.8; Clang at 3.3; Intel 15.0; SunCC 12.4.
-#if (CRYPTOPP_MSC_VERSION >= 1900)
-#  define CRYPTOPP_CXX11_ALIGNAS 1
-#  define CRYPTOPP_CXX11_ALIGNOF 1
-#elif (__INTEL_COMPILER >= 1500)
-#  define CRYPTOPP_CXX11_ALIGNAS 1
-#  define CRYPTOPP_CXX11_ALIGNOF 1
-#elif defined(__clang__)
-#  if __has_feature(cxx_alignas)
-#  define CRYPTOPP_CXX11_ALIGNAS 1
-#  endif
-#  if __has_feature(cxx_alignof)
-#  define CRYPTOPP_CXX11_ALIGNOF 1
-#  endif
-#elif (CRYPTOPP_GCC_VERSION >= 40800)
-#  define CRYPTOPP_CXX11_ALIGNAS 1
-#  define CRYPTOPP_CXX11_ALIGNOF 1
-#elif (__SUNPRO_CC >= 0x5130)
-#  define CRYPTOPP_CXX11_ALIGNAS 1
-#  define CRYPTOPP_CXX11_ALIGNOF 1
-#endif // alignof/alignas
-
-// noexcept: MS at VS2015 (19.00); GCC at 4.6; Clang at 3.0; Intel 14.0; SunCC 12.4.
-#if (CRYPTOPP_MSC_VERSION >= 1900)
-#  define CRYPTOPP_CXX11_NOEXCEPT 1
-#elif (__INTEL_COMPILER >= 1400)
-#  define CRYPTOPP_CXX11_NOEXCEPT 1
-#elif defined(__clang__)
-#  if __has_feature(cxx_noexcept)
-#    define CRYPTOPP_CXX11_NOEXCEPT 1
-#  endif
-#elif (CRYPTOPP_GCC_VERSION >= 40600)
-#  define CRYPTOPP_CXX11_NOEXCEPT 1
-#elif (__SUNPRO_CC >= 0x5130)
-#  define CRYPTOPP_CXX11_NOEXCEPT 1
-#endif // noexcept compilers
-
-// variadic templates: MS at VS2013 (18.00); GCC at 4.3; Clang at 2.9; Intel 12.1; SunCC 12.4.
-#if (CRYPTOPP_MSC_VERSION >= 1800)
-#  define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1
-#elif (__INTEL_COMPILER >= 1210)
-#  define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1
-#elif defined(__clang__)
-#  if __has_feature(cxx_variadic_templates)
-#    define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1
-#  endif
-#elif (CRYPTOPP_GCC_VERSION >= 40300)
-#  define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1
-#elif (__SUNPRO_CC >= 0x5130)
-#  define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1
-#endif // variadic templates
-
-// constexpr: MS at VS2015 (19.00); GCC at 4.6; Clang at 3.0; Intel 16.0; SunCC 12.4.
-// Intel has mis-supported the feature since at least ICPC 13.00
-#if (CRYPTOPP_MSC_VERSION >= 1900)
-#  define CRYPTOPP_CXX11_CONSTEXPR 1
-#elif (__INTEL_COMPILER >= 1600)
-#  define CRYPTOPP_CXX11_CONSTEXPR 1
-#elif defined(__clang__)
-#  if __has_feature(cxx_constexpr)
-#    define CRYPTOPP_CXX11_CONSTEXPR 1
-#  endif
-#elif (CRYPTOPP_GCC_VERSION >= 40600)
-#  define CRYPTOPP_CXX11_CONSTEXPR 1
-#elif (__SUNPRO_CC >= 0x5130)
-#  define CRYPTOPP_CXX11_CONSTEXPR 1
-#endif // constexpr compilers
-
-// TODO: Emplacement, R-values and Move semantics
-// Needed because we are catching warnings with GCC and MSC
-
-#endif // CRYPTOPP_CXX11
-
-#if defined(CRYPTOPP_CXX11_NOEXCEPT)
-#  define CRYPTOPP_THROW noexcept(false)
-#  define CRYPTOPP_NO_THROW noexcept(true)
-#else
-#  define CRYPTOPP_THROW
-#  define CRYPTOPP_NO_THROW
-#endif // CRYPTOPP_CXX11_NOEXCEPT
-
-#if defined(CRYPTOPP_CXX11_CONSTEXPR)
-#  define CRYPTOPP_CONSTEXPR constexpr
-#else
-#  define CRYPTOPP_CONSTEXPR
-#endif // CRYPTOPP_CXX11_CONSTEXPR
-
-// Hack... CRYPTOPP_ALIGN_DATA is defined earlier, before C++11 alignas availability is determined
-#if defined(CRYPTOPP_CXX11_ALIGNAS)
-# undef CRYPTOPP_ALIGN_DATA
-# define CRYPTOPP_ALIGN_DATA(x) alignas(x)
-#endif  // CRYPTOPP_CXX11_ALIGNAS
-
-// Hack... CRYPTOPP_CONSTANT is defined earlier, before C++11 constexpr availability is determined
-#if defined(CRYPTOPP_CXX11_CONSTEXPR)
-# undef CRYPTOPP_CONSTANT
-# define CRYPTOPP_CONSTANT(x) constexpr static int x;
-#endif
-
-// OK to comment the following out, but please report it so we can fix it.
-// C++17 value taken from http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4567.pdf.
-#if (defined(__cplusplus) && (__cplusplus >= 199711L) && (__cplusplus < 201402L)) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
-# error "std::uncaught_exception is not available. This is likely a configuration error."
-#endif
-
-#endif
diff --git a/src-cryptopp/cpu.cpp b/src-cryptopp/cpu.cpp
deleted file mode 100644
index 42831c1..0000000
--- a/src-cryptopp/cpu.cpp
+++ /dev/null
@@ -1,758 +0,0 @@
-// cpu.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#ifndef EXCEPTION_EXECUTE_HANDLER
-# define EXCEPTION_EXECUTE_HANDLER 1
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "cpu.h"
-#include "misc.h"
-#include <algorithm>
-
-#ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-#include <signal.h>
-#include <setjmp.h>
-#endif
-
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-#include <emmintrin.h>
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-extern "C" {
-    typedef void (*SigHandler)(int);
-};
-#endif  // Not CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-
-#ifdef CRYPTOPP_CPUID_AVAILABLE
-
-#if _MSC_VER >= 1400 && CRYPTOPP_BOOL_X64
-
-bool CpuId(word32 input, word32 output[4])
-{
-	__cpuid((int *)output, input);
-	return true;
-}
-
-#else
-
-#ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-extern "C"
-{
-	static jmp_buf s_jmpNoCPUID;
-	static void SigIllHandlerCPUID(int)
-	{
-		longjmp(s_jmpNoCPUID, 1);
-	}
-
-	static jmp_buf s_jmpNoSSE2;
-	static void SigIllHandlerSSE2(int)
-	{
-		longjmp(s_jmpNoSSE2, 1);
-	}
-}
-#endif
-
-bool CpuId(word32 input, word32 output[4])
-{
-#if defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
-    __try
-	{
-		__asm
-		{
-			mov eax, input
-			mov ecx, 0
-			cpuid
-			mov edi, output
-			mov [edi], eax
-			mov [edi+4], ebx
-			mov [edi+8], ecx
-			mov [edi+12], edx
-		}
-	}
-	// GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		return false;
-	}
-
-	// function 0 returns the highest basic function understood in EAX
-	if(input == 0)
-		return !!output[0];
-
-	return true;
-#else
-	// longjmp and clobber warnings. Volatile is required.
-	// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
-	volatile bool result = true;
-
-	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerCPUID);
-	if (oldHandler == SIG_ERR)
-		return false;
-
-# ifndef __MINGW32__
-	volatile sigset_t oldMask;
-	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		return false;
-# endif
-
-	if (setjmp(s_jmpNoCPUID))
-		result = false;
-	else
-	{
-		asm volatile
-		(
-			// save ebx in case -fPIC is being used
-			// TODO: this might need an early clobber on EDI.
-# if CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
-			"pushq %%rbx; cpuid; mov %%ebx, %%edi; popq %%rbx"
-# else
-			"push %%ebx; cpuid; mov %%ebx, %%edi; pop %%ebx"
-# endif
-			: "=a" (output[0]), "=D" (output[1]), "=c" (output[2]), "=d" (output[3])
-			: "a" (input), "c" (0)
-		);
-	}
-
-# ifndef __MINGW32__
-	sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULL);
-# endif
-
-	signal(SIGILL, oldHandler);
-	return result;
-#endif
-}
-
-#endif
-
-static bool TrySSE2()
-{
-#if CRYPTOPP_BOOL_X64
-	return true;
-#elif defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
-    __try
-	{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-		AS2(por xmm0, xmm0)        // executing SSE2 instruction
-#elif CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-		__m128i x = _mm_setzero_si128();
-		return _mm_cvtsi128_si32(x) == 0;
-#endif
-	}
-	// GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		return false;
-	}
-	return true;
-#else
-	// longjmp and clobber warnings. Volatile is required.
-	// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
-	volatile bool result = true;
-
-	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerSSE2);
-	if (oldHandler == SIG_ERR)
-		return false;
-
-# ifndef __MINGW32__
-	volatile sigset_t oldMask;
-	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		return false;
-# endif
-
-	if (setjmp(s_jmpNoSSE2))
-		result = false;
-	else
-	{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-		__asm __volatile ("por %xmm0, %xmm0");
-#elif CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-		__m128i x = _mm_setzero_si128();
-		result = _mm_cvtsi128_si32(x) == 0;
-#endif
-	}
-
-# ifndef __MINGW32__
-	sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULL);
-# endif
-
-	signal(SIGILL, oldHandler);
-	return result;
-#endif
-}
-
-bool CRYPTOPP_SECTION_INIT g_x86DetectionDone = false;
-bool CRYPTOPP_SECTION_INIT g_hasMMX = false, CRYPTOPP_SECTION_INIT g_hasISSE = false, CRYPTOPP_SECTION_INIT g_hasSSE2 = false, CRYPTOPP_SECTION_INIT g_hasSSSE3 = false;
-bool CRYPTOPP_SECTION_INIT g_hasSSE4 = false, CRYPTOPP_SECTION_INIT g_hasAESNI = false, CRYPTOPP_SECTION_INIT g_hasCLMUL = false, CRYPTOPP_SECTION_INIT g_isP4 = false;
-bool CRYPTOPP_SECTION_INIT g_hasRDRAND = false, CRYPTOPP_SECTION_INIT g_hasRDSEED = false;
-bool CRYPTOPP_SECTION_INIT g_hasPadlockRNG = false, CRYPTOPP_SECTION_INIT g_hasPadlockACE = false, CRYPTOPP_SECTION_INIT g_hasPadlockACE2 = false;
-bool CRYPTOPP_SECTION_INIT g_hasPadlockPHE = false, CRYPTOPP_SECTION_INIT g_hasPadlockPMM = false;
-word32 CRYPTOPP_SECTION_INIT g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE;
-
-static inline bool IsIntel(const word32 output[4])
-{
-	// This is the "GenuineIntel" string
-	return (output[1] /*EBX*/ == 0x756e6547) &&
-		(output[2] /*ECX*/ == 0x6c65746e) &&
-		(output[3] /*EDX*/ == 0x49656e69);
-}
-
-static inline bool IsAMD(const word32 output[4])
-{
-	// This is the "AuthenticAMD" string. Some early K5's can return "AMDisbetter!"
-	return (output[1] /*EBX*/ == 0x68747541) &&
-		(output[2] /*ECX*/ == 0x444D4163) &&
-		(output[3] /*EDX*/ == 0x69746E65);
-}
-
-static inline bool IsVIA(const word32 output[4])
-{
-	// This is the "CentaurHauls" string. Some non-PadLock's can return "VIA VIA VIA "
-	return (output[1] /*EBX*/ == 0x746e6543) &&
-		(output[2] /*ECX*/ == 0x736c7561) &&
-		(output[3] /*EDX*/ == 0x48727561);
-}
-
-#if HAVE_GCC_CONSTRUCTOR1
-void __attribute__ ((constructor (CRYPTOPP_INIT_PRIORITY + 50))) DetectX86Features()
-#elif HAVE_GCC_CONSTRUCTOR0
-void __attribute__ ((constructor)) DetectX86Features()
-#else
-void DetectX86Features()
-#endif
-{
-	word32 cpuid[4], cpuid1[4];
-	if (!CpuId(0, cpuid))
-		return;
-	if (!CpuId(1, cpuid1))
-		return;
-
-	g_hasMMX = (cpuid1[3] & (1 << 23)) != 0;
-	if ((cpuid1[3] & (1 << 26)) != 0)
-		g_hasSSE2 = TrySSE2();
-	g_hasSSSE3 = g_hasSSE2 && (cpuid1[2] & (1<<9));
-	g_hasSSE4 = g_hasSSE2 && ((cpuid1[2] & (1<<19)) && (cpuid1[2] & (1<<20)));
-	g_hasAESNI = g_hasSSE2 && (cpuid1[2] & (1<<25));
-	g_hasCLMUL = g_hasSSE2 && (cpuid1[2] & (1<<1));
-
-	if ((cpuid1[3] & (1 << 25)) != 0)
-		g_hasISSE = true;
-	else
-	{
-		word32 cpuid2[4];
-		CpuId(0x080000000, cpuid2);
-		if (cpuid2[0] >= 0x080000001)
-		{
-			CpuId(0x080000001, cpuid2);
-			g_hasISSE = (cpuid2[3] & (1 << 22)) != 0;
-		}
-	}
-
-	if (IsIntel(cpuid))
-	{
-		static const unsigned int RDRAND_FLAG = (1 << 30);
-		static const unsigned int RDSEED_FLAG = (1 << 18);
-
-		g_isP4 = ((cpuid1[0] >> 8) & 0xf) == 0xf;
-		g_cacheLineSize = 8 * GETBYTE(cpuid1[1], 1);
-		g_hasRDRAND = !!(cpuid1[2] /*ECX*/ & RDRAND_FLAG);
-
-		if (cpuid[0] /*EAX*/ >= 7)
-		{
-			word32 cpuid3[4];
-			if (CpuId(7, cpuid3))
-				g_hasRDSEED = !!(cpuid3[1] /*EBX*/ & RDSEED_FLAG);
-		}
-	}
-	else if (IsAMD(cpuid))
-	{
-		static const unsigned int RDRAND_FLAG = (1 << 30);
-
-		CpuId(0x01, cpuid);
-		g_hasRDRAND = !!(cpuid[2] /*ECX*/ & RDRAND_FLAG);
-
-		CpuId(0x80000005, cpuid);
-		g_cacheLineSize = GETBYTE(cpuid[2], 0);
-	}
-	else if (IsVIA(cpuid))
-	{
-		static const unsigned int  RNG_FLAGS = (0x3 << 2);
-		static const unsigned int  ACE_FLAGS = (0x3 << 6);
-		static const unsigned int ACE2_FLAGS = (0x3 << 8);
-		static const unsigned int  PHE_FLAGS = (0x3 << 10);
-		static const unsigned int  PMM_FLAGS = (0x3 << 12);
-
-		CpuId(0xC0000000, cpuid);
-		if (cpuid[0] >= 0xC0000001)
-		{
-			// Extended features available
-			CpuId(0xC0000001, cpuid);
-			g_hasPadlockRNG  = !!(cpuid[3] /*EDX*/ & RNG_FLAGS);
-			g_hasPadlockACE  = !!(cpuid[3] /*EDX*/ & ACE_FLAGS);
-			g_hasPadlockACE2 = !!(cpuid[3] /*EDX*/ & ACE2_FLAGS);
-			g_hasPadlockPHE  = !!(cpuid[3] /*EDX*/ & PHE_FLAGS);
-			g_hasPadlockPMM  = !!(cpuid[3] /*EDX*/ & PMM_FLAGS);
-		}
-	}
-
-	if (!g_cacheLineSize)
-		g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE;
-
-	*((volatile bool*)&g_x86DetectionDone) = true;
-}
-
-#elif (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARM64)
-
-// The ARM equivalent of CPUID probing is reading a MSR. The code requires Exception Level 1 (EL1) and above, but user space runs at EL0.
-//   Attempting to run the code results in a SIGILL and termination.
-//
-//     #if defined(__arm64__) || defined(__aarch64__)
-//	     word64 caps = 0;  // Read ID_AA64ISAR0_EL1
-//	     __asm __volatile("mrs %0, " "id_aa64isar0_el1" : "=r" (caps));
-//     #elif defined(__arm__) || defined(__aarch32__)
-//	     word32 caps = 0;  // Read ID_ISAR5_EL1
-//	     __asm __volatile("mrs %0, " "id_isar5_el1" : "=r" (caps));
-//     #endif
-//
-// The following does not work well either. Its appears to be missing constants, and it does not detect Aarch32 execution environments on Aarch64
-// http://community.arm.com/groups/android-community/blog/2014/10/10/runtime-detection-of-cpu-features-on-an-armv8-a-cpu
-//
-bool CRYPTOPP_SECTION_INIT g_ArmDetectionDone = false;
-bool CRYPTOPP_SECTION_INIT g_hasNEON = false, CRYPTOPP_SECTION_INIT g_hasPMULL = false, CRYPTOPP_SECTION_INIT g_hasCRC32 = false;
-bool CRYPTOPP_SECTION_INIT g_hasAES = false, CRYPTOPP_SECTION_INIT g_hasSHA1 = false, CRYPTOPP_SECTION_INIT g_hasSHA2 = false;
-word32 CRYPTOPP_SECTION_INIT g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE;
-
-#ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-extern "C"
-{
-	static jmp_buf s_jmpNoNEON;
-	static void SigIllHandlerNEON(int)
-	{
-		longjmp(s_jmpNoNEON, 1);
-	}
-
-	static jmp_buf s_jmpNoPMULL;
-	static void SigIllHandlerPMULL(int)
-	{
-		longjmp(s_jmpNoPMULL, 1);
-	}
-
-	static jmp_buf s_jmpNoCRC32;
-	static void SigIllHandlerCRC32(int)
-	{
-		longjmp(s_jmpNoCRC32, 1);
-	}
-
-	static jmp_buf s_jmpNoAES;
-	static void SigIllHandlerAES(int)
-	{
-		longjmp(s_jmpNoAES, 1);
-	}
-
-	static jmp_buf s_jmpNoSHA1;
-	static void SigIllHandlerSHA1(int)
-	{
-		longjmp(s_jmpNoSHA1, 1);
-	}
-
-	static jmp_buf s_jmpNoSHA2;
-	static void SigIllHandlerSHA2(int)
-	{
-		longjmp(s_jmpNoSHA2, 1);
-	}
-};
-#endif  // Not CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-
-static bool TryNEON()
-{
-#if (CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE)
-# if defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
-	volatile bool result = true;
-	__try
-	{
-		uint32_t v1[4] = {1,1,1,1};
-		uint32x4_t x1 = vld1q_u32(v1);
-		uint64_t v2[2] = {1,1};
-		uint64x2_t x2 = vld1q_u64(v2);
-
-		uint32x4_t x3 = vdupq_n_u32(2);
-		x3 = vsetq_lane_u32(vgetq_lane_u32(x1,0),x3,0);
-		x3 = vsetq_lane_u32(vgetq_lane_u32(x1,3),x3,3);
-		uint64x2_t x4 = vdupq_n_u64(2);
-		x4 = vsetq_lane_u64(vgetq_lane_u64(x2,0),x4,0);
-		x4 = vsetq_lane_u64(vgetq_lane_u64(x2,1),x4,1);
-
-		result = !!(vgetq_lane_u32(x3,0) | vgetq_lane_u64(x4,1));
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		return false;
-	}
-	return result;
-# else
-	// longjmp and clobber warnings. Volatile is required.
-	// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
-	volatile bool result = true;
-
-	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerNEON);
-	if (oldHandler == SIG_ERR)
-		return false;
-
-	volatile sigset_t oldMask;
-	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		return false;
-
-	if (setjmp(s_jmpNoNEON))
-		result = false;
-	else
-	{
-		uint32_t v1[4] = {1,1,1,1};
-		uint32x4_t x1 = vld1q_u32(v1);
-		uint64_t v2[2] = {1,1};
-		uint64x2_t x2 = vld1q_u64(v2);
-
-		uint32x4_t x3 = {0,0,0,0};
-		x3 = vsetq_lane_u32(vgetq_lane_u32(x1,0),x3,0);
-		x3 = vsetq_lane_u32(vgetq_lane_u32(x1,3),x3,3);
-		uint64x2_t x4 = {0,0};
-		x4 = vsetq_lane_u64(vgetq_lane_u64(x2,0),x4,0);
-		x4 = vsetq_lane_u64(vgetq_lane_u64(x2,1),x4,1);
-
-		// Hack... GCC optimizes away the code and returns true
-		result = !!(vgetq_lane_u32(x3,0) | vgetq_lane_u64(x4,1));
-	}
-
-	sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULL);
-	signal(SIGILL, oldHandler);
-	return result;
-# endif
-#else
-	return false;
-#endif  // CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-}
-
-static bool TryPMULL()
-{
-#if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE)
-# if defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
-	volatile bool result = true;
-	__try
-	{
-		const poly64_t a1={2}, b1={3};
-		const poly64x2_t a2={4,5}, b2={6,7};
-		const poly64x2_t a3={0x8080808080808080,0xa0a0a0a0a0a0a0a0}, b3={0xc0c0c0c0c0c0c0c0, 0xe0e0e0e0e0e0e0e0};
-
-		const poly128_t r1 = vmull_p64(a1, b1);
-		const poly128_t r2 = vmull_high_p64(a2, b2);
-		const poly128_t r3 = vmull_high_p64(a3, b3);
-
-		// Also see https://github.com/weidai11/cryptopp/issues/233.
-		const uint64x2_t& t1 = vreinterpretq_u64_p128(r1);  // {6,0}
-		const uint64x2_t& t2 = vreinterpretq_u64_p128(r2);  // {24,0}
-		const uint64x2_t& t3 = vreinterpretq_u64_p128(r3);  // {bignum,bignum}
-
-		result = !!(vgetq_lane_u64(t1,0) == 0x06 && vgetq_lane_u64(t1,1) == 0x00 && vgetq_lane_u64(t2,0) == 0x1b &&
-			vgetq_lane_u64(t2,1) == 0x00 &&	vgetq_lane_u64(t3,0) == 0x6c006c006c006c00 && vgetq_lane_u64(t3,1) == 0x6c006c006c006c00);
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		return false;
-	}
-	return result;
-# else
-	// longjmp and clobber warnings. Volatile is required.
-	// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
-	volatile bool result = true;
-
-	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerPMULL);
-	if (oldHandler == SIG_ERR)
-		return false;
-
-	volatile sigset_t oldMask;
-	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		return false;
-
-	if (setjmp(s_jmpNoPMULL))
-		result = false;
-	else
-	{
-		const poly64_t a1={2}, b1={3};
-		const poly64x2_t a2={4,5}, b2={6,7};
-		const poly64x2_t a3={0x8080808080808080,0xa0a0a0a0a0a0a0a0}, b3={0xc0c0c0c0c0c0c0c0, 0xe0e0e0e0e0e0e0e0};
-
-		const poly128_t r1 = vmull_p64(a1, b1);
-		const poly128_t r2 = vmull_high_p64(a2, b2);
-		const poly128_t r3 = vmull_high_p64(a3, b3);
-
-		// Linaro is missing vreinterpretq_u64_p128. Also see https://github.com/weidai11/cryptopp/issues/233.
-		const uint64x2_t& t1 = (uint64x2_t)(r1);  // {6,0}
-		const uint64x2_t& t2 = (uint64x2_t)(r2);  // {24,0}
-		const uint64x2_t& t3 = (uint64x2_t)(r3);  // {bignum,bignum}
-
-		result = !!(vgetq_lane_u64(t1,0) == 0x06 && vgetq_lane_u64(t1,1) == 0x00 && vgetq_lane_u64(t2,0) == 0x1b &&
-			vgetq_lane_u64(t2,1) == 0x00 &&	vgetq_lane_u64(t3,0) == 0x6c006c006c006c00 && vgetq_lane_u64(t3,1) == 0x6c006c006c006c00);
-	}
-
-	sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULL);
-	signal(SIGILL, oldHandler);
-	return result;
-# endif
-#else
-	return false;
-#endif  // CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE
-}
-
-static bool TryCRC32()
-{
-#if (CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE)
-# if defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
-	volatile bool result = true;
-	__try
-	{
-		word32 w=0, x=1; word16 y=2; byte z=3;
-		w = __crc32cw(w,x);
-		w = __crc32ch(w,y);
-		w = __crc32cb(w,z);
-
-		result = !!w;
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		return false;
-	}
-	return result;
-# else
-	// longjmp and clobber warnings. Volatile is required.
-	// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
-	volatile bool result = true;
-
-	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerCRC32);
-	if (oldHandler == SIG_ERR)
-		return false;
-
-	volatile sigset_t oldMask;
-	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		return false;
-
-	if (setjmp(s_jmpNoCRC32))
-		result = false;
-	else
-	{
-		word32 w=0, x=1; word16 y=2; byte z=3;
-		w = __crc32cw(w,x);
-		w = __crc32ch(w,y);
-		w = __crc32cb(w,z);
-
-		// Hack... GCC optimizes away the code and returns true
-		result = !!w;
-	}
-
-	sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULL);
-	signal(SIGILL, oldHandler);
-	return result;
-# endif
-#else
-	return false;
-#endif  // CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE
-}
-
-static bool TryAES()
-{
-#if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE)
-# if defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
-	volatile bool result = true;
-	__try
-	{
-		// AES encrypt and decrypt
-		uint8x16_t data = vdupq_n_u8(0), key = vdupq_n_u8(0);
-		uint8x16_t r1 = vaeseq_u8(data, key);
-		uint8x16_t r2 = vaesdq_u8(data, key);
-
-		result = !!(vgetq_lane_u8(r1,0) | vgetq_lane_u8(r2,7));
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		return false;
-	}
-	return result;
-# else
-	// longjmp and clobber warnings. Volatile is required.
-	// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
-	volatile bool result = true;
-
-	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerAES);
-	if (oldHandler == SIG_ERR)
-		return false;
-
-	volatile sigset_t oldMask;
-	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		return false;
-
-	if (setjmp(s_jmpNoAES))
-		result = false;
-	else
-	{
-		uint8x16_t data = vdupq_n_u8(0), key = vdupq_n_u8(0);
-		uint8x16_t r1 = vaeseq_u8(data, key);
-		uint8x16_t r2 = vaesdq_u8(data, key);
-
-		// Hack... GCC optimizes away the code and returns true
-		result = !!(vgetq_lane_u8(r1,0) | vgetq_lane_u8(r2,7));
-	}
-
-	sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULL);
-	signal(SIGILL, oldHandler);
-	return result;
-# endif
-#else
-	return false;
-#endif  // CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE
-}
-
-static bool TrySHA1()
-{
-#if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE)
-# if defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
-	volatile bool result = true;
-	__try
-	{
-		uint32x4_t data1 = {1,2,3,4}, data2 = {5,6,7,8}, data3 = {9,10,11,12};
-
-		uint32x4_t r1 = vsha1cq_u32 (data1, 0, data2);
-		uint32x4_t r2 = vsha1mq_u32 (data1, 0, data2);
-		uint32x4_t r3 = vsha1pq_u32 (data1, 0, data2);
-		uint32x4_t r4 = vsha1su0q_u32 (data1, data2, data3);
-		uint32x4_t r5 = vsha1su1q_u32 (data1, data2);
-
-		result = !!(vgetq_lane_u32(r1,0) | vgetq_lane_u32(r2,1) | vgetq_lane_u32(r3,2) | vgetq_lane_u32(r4,3) | vgetq_lane_u32(r5,0));
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		return false;
-	}
-	return result;
-# else
-	// longjmp and clobber warnings. Volatile is required.
-	// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
-	volatile bool result = true;
-
-	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerSHA1);
-	if (oldHandler == SIG_ERR)
-		return false;
-
-	volatile sigset_t oldMask;
-	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		return false;
-
-	if (setjmp(s_jmpNoSHA1))
-		result = false;
-	else
-	{
-		uint32x4_t data1 = {1,2,3,4}, data2 = {5,6,7,8}, data3 = {9,10,11,12};
-
-		uint32x4_t r1 = vsha1cq_u32 (data1, 0, data2);
-		uint32x4_t r2 = vsha1mq_u32 (data1, 0, data2);
-		uint32x4_t r3 = vsha1pq_u32 (data1, 0, data2);
-		uint32x4_t r4 = vsha1su0q_u32 (data1, data2, data3);
-		uint32x4_t r5 = vsha1su1q_u32 (data1, data2);
-
-		// Hack... GCC optimizes away the code and returns true
-		result = !!(vgetq_lane_u32(r1,0) | vgetq_lane_u32(r2,1) | vgetq_lane_u32(r3,2) | vgetq_lane_u32(r4,3) | vgetq_lane_u32(r5,0));
-	}
-
-	sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULL);
-	signal(SIGILL, oldHandler);
-	return result;
-# endif
-#else
-	return false;
-#endif  // CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE
-}
-
-static bool TrySHA2()
-{
-#if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE)
-# if defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)
-	volatile bool result = true;
-	__try
-	{
-		uint32x4_t data1 = {1,2,3,4}, data2 = {5,6,7,8}, data3 = {9,10,11,12};
-
-		uint32x4_t r1 = vsha256hq_u32 (data1, data2, data3);
-		uint32x4_t r2 = vsha256h2q_u32 (data1, data2, data3);
-		uint32x4_t r3 = vsha256su0q_u32 (data1, data2);
-		uint32x4_t r4 = vsha256su1q_u32 (data1, data2, data3);
-
-		result = !!(vgetq_lane_u32(r1,0) | vgetq_lane_u32(r2,1) | vgetq_lane_u32(r3,2) | vgetq_lane_u32(r4,3));
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		return false;
-	}
-	return result;
-# else
-	// longjmp and clobber warnings. Volatile is required.
-	// http://github.com/weidai11/cryptopp/issues/24 and http://stackoverflow.com/q/7721854
-	volatile bool result = true;
-
-	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerSHA2);
-	if (oldHandler == SIG_ERR)
-		return false;
-
-	volatile sigset_t oldMask;
-	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		return false;
-
-	if (setjmp(s_jmpNoSHA2))
-		result = false;
-	else
-	{
-		uint32x4_t data1 = {1,2,3,4}, data2 = {5,6,7,8}, data3 = {9,10,11,12};
-
-		uint32x4_t r1 = vsha256hq_u32 (data1, data2, data3);
-		uint32x4_t r2 = vsha256h2q_u32 (data1, data2, data3);
-		uint32x4_t r3 = vsha256su0q_u32 (data1, data2);
-		uint32x4_t r4 = vsha256su1q_u32 (data1, data2, data3);
-
-		// Hack... GCC optimizes away the code and returns true
-		result = !!(vgetq_lane_u32(r1,0) | vgetq_lane_u32(r2,1) | vgetq_lane_u32(r3,2) | vgetq_lane_u32(r4,3));
-	}
-
-	sigprocmask(SIG_SETMASK, (sigset_t*)&oldMask, NULL);
-	signal(SIGILL, oldHandler);
-	return result;
-# endif
-#else
-	return false;
-#endif  // CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE
-}
-
-#if HAVE_GCC_CONSTRUCTOR1
-void __attribute__ ((constructor (CRYPTOPP_INIT_PRIORITY + 50))) DetectArmFeatures()
-#elif HAVE_GCC_CONSTRUCTOR0
-void __attribute__ ((constructor)) DetectArmFeatures()
-#else
-void DetectArmFeatures()
-#endif
-{
-	g_hasNEON = TryNEON();
-	g_hasPMULL = TryPMULL();
-	g_hasCRC32 = TryCRC32();
-	g_hasAES = TryAES();
-	g_hasSHA1 = TrySHA1();
-	g_hasSHA2 = TrySHA2();
-
-	*((volatile bool*)&g_ArmDetectionDone) = true;
-}
-
-#endif
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/cpu.h b/src-cryptopp/cpu.h
deleted file mode 100644
index 6cef77b..0000000
--- a/src-cryptopp/cpu.h
+++ /dev/null
@@ -1,597 +0,0 @@
-// cpu.h - written and placed in the public domain by Wei Dai
-
-//! \file cpu.h
-//! \brief Functions for CPU features and intrinsics
-//! \details The functions are used in X86/X32/X64 and NEON code paths
-
-#ifndef CRYPTOPP_CPU_H
-#define CRYPTOPP_CPU_H
-
-#include "config.h"
-
-// ARM32/ARM64 Headers
-#if (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARM64)
-# if defined(__GNUC__)
-#  include <stdint.h>
-# endif
-# if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(__ARM_NEON)
-#  include <arm_neon.h>
-# endif
-# if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE) || defined(__ARM_ACLE)
-#  include <arm_acle.h>
-# endif
-#endif  // ARM32 and ARM64 Headers
-
-// X86/X64/X32 Headers
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
-
-// GCC X86 super-include
-#if (CRYPTOPP_GCC_VERSION >= 40800)
-#  include <x86intrin.h>
-#endif
-#if (CRYPTOPP_MSC_VERSION >= 1400)
-#  include <intrin.h>
-#endif
-
-// Baseline include
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-#  include <emmintrin.h>    // __m64, __m128i, _mm_set_epi64x
-#endif
-#if CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE
-#  include <tmmintrin.h>    // _mm_shuffle_pi8, _mm_shuffle_epi8
-#endif // tmmintrin.h
-#if CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-#  include <smmintrin.h>    // _mm_blend_epi16
-#  include <nmmintrin.h>    // _mm_crc32_u{8|16|32}
-#endif // smmintrin.h
-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-#  include <wmmintrin.h>    // aesenc, aesdec, etc
-#endif // wmmintrin.h
-#if CRYPTOPP_BOOL_AVX_INTRINSICS_AVAILABLE
-#  include <immintrin.h>    // RDRAND, RDSEED and AVX
-#endif
-#if CRYPTOPP_BOOL_AVX2_INTRINSICS_AVAILABLE
-#  include <zmmintrin.h>    // AVX 512-bit extensions
-#endif
-#endif  // X86/X64/X32 Headers
-
-// Applies to both X86/X32/X64 and ARM32/ARM64. And we've got MIPS devices on the way.
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-# define CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-#else
-# define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY
-#endif
-
-// Applies to both X86/X32/X64 and ARM32/ARM64
-#if defined(CRYPTOPP_LLVM_CLANG_VERSION) || defined(CRYPTOPP_APPLE_CLANG_VERSION) || defined(CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER)
-	#define NEW_LINE "\n"
-	#define INTEL_PREFIX ".intel_syntax;"
-	#define INTEL_NOPREFIX ".intel_syntax;"
-	#define ATT_PREFIX ".att_syntax;"
-	#define ATT_NOPREFIX ".att_syntax;"
-#elif defined(__GNUC__)
-	#define NEW_LINE
-	#define INTEL_PREFIX ".intel_syntax prefix;"
-	#define INTEL_NOPREFIX ".intel_syntax noprefix;"
-	#define ATT_PREFIX ".att_syntax prefix;"
-	#define ATT_NOPREFIX ".att_syntax noprefix;"
-#else
-	#define NEW_LINE
-	#define INTEL_PREFIX
-	#define INTEL_NOPREFIX
-	#define ATT_PREFIX
-	#define ATT_NOPREFIX
-#endif
-
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-
-#define CRYPTOPP_X86_ASM_AVAILABLE
-#define CRYPTOPP_BOOL_X64 1
-#define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 1
-#define NAMESPACE_END
-
-#else
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64 || CRYPTOPP_DOXYGEN_PROCESSING
-
-#define CRYPTOPP_CPUID_AVAILABLE
-
-// Hide from Doxygen
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-// These should not be used directly
-extern CRYPTOPP_DLL bool g_x86DetectionDone;
-extern CRYPTOPP_DLL bool g_hasMMX;
-extern CRYPTOPP_DLL bool g_hasISSE;
-extern CRYPTOPP_DLL bool g_hasSSE2;
-extern CRYPTOPP_DLL bool g_hasSSSE3;
-extern CRYPTOPP_DLL bool g_hasSSE4;
-extern CRYPTOPP_DLL bool g_hasAESNI;
-extern CRYPTOPP_DLL bool g_hasCLMUL;
-extern CRYPTOPP_DLL bool g_isP4;
-extern CRYPTOPP_DLL bool g_hasRDRAND;
-extern CRYPTOPP_DLL bool g_hasRDSEED;
-extern CRYPTOPP_DLL bool g_hasPadlockRNG;
-extern CRYPTOPP_DLL bool g_hasPadlockACE;
-extern CRYPTOPP_DLL bool g_hasPadlockACE2;
-extern CRYPTOPP_DLL bool g_hasPadlockPHE;
-extern CRYPTOPP_DLL bool g_hasPadlockPMM;
-extern CRYPTOPP_DLL word32 g_cacheLineSize;
-
-CRYPTOPP_DLL void CRYPTOPP_API DetectX86Features();
-CRYPTOPP_DLL bool CRYPTOPP_API CpuId(word32 input, word32 output[4]);
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-//! \brief Determines MMX availability
-//! \returns true if MMX is determined to be available, false otherwise
-//! \details MMX, SSE and SSE2 are core processor features for x86_64, and
-//!   the function always returns true for the platform.
-inline bool HasMMX()
-{
-#if CRYPTOPP_BOOL_X64
-	return true;
-#else
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasMMX;
-#endif
-}
-
-//! \brief Determines SSE availability
-//! \returns true if SSE is determined to be available, false otherwise
-//! \details MMX, SSE and SSE2 are core processor features for x86_64, and
-//!   the function always returns true for the platform.
-inline bool HasISSE()
-{
-#if CRYPTOPP_BOOL_X64
-	return true;
-#else
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasISSE;
-#endif
-}
-
-//! \brief Determines SSE2 availability
-//! \returns true if SSE2 is determined to be available, false otherwise
-//! \details MMX, SSE and SSE2 are core processor features for x86_64, and
-//!   the function always returns true for the platform.
-inline bool HasSSE2()
-{
-#if CRYPTOPP_BOOL_X64
-	return true;
-#else
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasSSE2;
-#endif
-}
-
-//! \brief Determines SSSE3 availability
-//! \returns true if SSSE3 is determined to be available, false otherwise
-//! \details HasSSSE3() is a runtime check performed using CPUID
-//! \note Some Clang compilers incorrectly omit SSSE3 even though its native to the processor.
-inline bool HasSSSE3()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasSSSE3;
-}
-
-//! \brief Determines SSE4 availability
-//! \returns true if SSE4.1 and SSE4.2 are determined to be available, false otherwise
-//! \details HasSSE4() is a runtime check performed using CPUID which requires both SSE4.1 and SSE4.2
-inline bool HasSSE4()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasSSE4;
-}
-
-//! \brief Determines AES-NI availability
-//! \returns true if AES-NI is determined to be available, false otherwise
-//! \details HasAESNI() is a runtime check performed using CPUID
-inline bool HasAESNI()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasAESNI;
-}
-
-//! \brief Determines Carryless Multiply availability
-//! \returns true if pclmulqdq is determined to be available, false otherwise
-//! \details HasCLMUL() is a runtime check performed using CPUID
-inline bool HasCLMUL()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasCLMUL;
-}
-
-//! \brief Determines if the CPU is an Intel P4
-//! \returns true if the CPU is a P4, false otherwise
-//! \details IsP4() is a runtime check performed using CPUID
-inline bool IsP4()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_isP4;
-}
-
-//! \brief Determines RDRAND availability
-//! \returns true if RDRAND is determined to be available, false otherwise
-//! \details HasRDRAND() is a runtime check performed using CPUID
-inline bool HasRDRAND()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasRDRAND;
-}
-
-//! \brief Determines RDSEED availability
-//! \returns true if RDSEED is determined to be available, false otherwise
-//! \details HasRDSEED() is a runtime check performed using CPUID
-inline bool HasRDSEED()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasRDSEED;
-}
-
-//! \brief Determines Padlock RNG availability
-//! \returns true if VIA Padlock RNG is determined to be available, false otherwise
-//! \details HasPadlockRNG() is a runtime check performed using CPUID
-inline bool HasPadlockRNG()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasPadlockRNG;
-}
-
-//! \brief Determines Padlock ACE availability
-//! \returns true if VIA Padlock ACE is determined to be available, false otherwise
-//! \details HasPadlockACE() is a runtime check performed using CPUID
-inline bool HasPadlockACE()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasPadlockACE;
-}
-
-//! \brief Determines Padlock ACE2 availability
-//! \returns true if VIA Padlock ACE2 is determined to be available, false otherwise
-//! \details HasPadlockACE2() is a runtime check performed using CPUID
-inline bool HasPadlockACE2()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasPadlockACE2;
-}
-
-//! \brief Determines Padlock PHE availability
-//! \returns true if VIA Padlock PHE is determined to be available, false otherwise
-//! \details HasPadlockPHE() is a runtime check performed using CPUID
-inline bool HasPadlockPHE()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasPadlockPHE;
-}
-
-//! \brief Determines Padlock PMM availability
-//! \returns true if VIA Padlock PMM is determined to be available, false otherwise
-//! \details HasPadlockPMM() is a runtime check performed using CPUID
-inline bool HasPadlockPMM()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_hasPadlockPMM;
-}
-
-//! \brief Provides the cache line size
-//! \returns lower bound on the size of a cache line in bytes, if available
-//! \details GetCacheLineSize() returns the lower bound on the size of a cache line, if it
-//!   is available. If the value is not available at runtime, then 32 is returned for a 32-bit
-//!   processor and 64 is returned for a 64-bit processor.
-//! \details x86/x32/x64 uses CPUID to determine the value and its usually accurate. The ARM
-//!   processor equivalent is a privileged instruction, so a compile time value is returned.
-inline int GetCacheLineSize()
-{
-	if (!g_x86DetectionDone)
-		DetectX86Features();
-	return g_cacheLineSize;
-}
-
-#elif (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARM64)
-
-extern bool g_ArmDetectionDone;
-extern bool g_hasNEON, g_hasPMULL, g_hasCRC32, g_hasAES, g_hasSHA1, g_hasSHA2;
-void CRYPTOPP_API DetectArmFeatures();
-
-//! \brief Determine if an ARM processor has Advanced SIMD available
-//! \returns true if the hardware is capable of Advanced SIMD at runtime, false otherwise.
-//! \details Advanced SIMD instructions are available under Aarch64 (ARM-64) and Aarch32 (ARM-32).
-//! \details Runtime support requires compile time support. When compiling with GCC, you may
-//!   need to compile with <tt>-mfpu=neon</tt> (32-bit) or <tt>-march=armv8-a</tt>
-//!   (64-bit). Also see ARM's <tt>__ARM_NEON</tt> preprocessor macro.
-inline bool HasNEON()
-{
-	if (!g_ArmDetectionDone)
-		DetectArmFeatures();
-	return g_hasNEON;
-}
-
-//! \brief Determine if an ARM processor provides Polynomial Multiplication (long)
-//! \returns true if the hardware is capable of polynomial multiplications at runtime, false otherwise.
-//! \details The multiplication instructions are available under Aarch64 (ARM-64) and Aarch32 (ARM-32).
-//! \details Runtime support requires compile time support. When compiling with GCC, you may
-//!   need to compile with <tt>-march=armv8-a+crypto</tt>; while Apple requires
-//!   <tt>-arch arm64</tt>. Also see ARM's <tt>__ARM_FEATURE_CRYPTO</tt> preprocessor macro.
-inline bool HasPMULL()
-{
-	if (!g_ArmDetectionDone)
-		DetectArmFeatures();
-	return g_hasPMULL;
-}
-
-//! \brief Determine if an ARM processor has CRC32 available
-//! \returns true if the hardware is capable of CRC32 at runtime, false otherwise.
-//! \details CRC32 instructions provide access to the processor's CRC32 and CRC32-C intructions.
-//!   They are provided by ARM C Language Extensions 2.0 (ACLE 2.0) and available under Aarch64
-//!   (ARM-64) and Aarch32 (ARM-32) running on Aarch64 (i.e., an AArch32 execution environment).
-//! \details Runtime support requires compile time support. When compiling with GCC, you may
-//!   need to compile with <tt>-march=armv8-a+crc</tt>; while Apple requires
-//!   <tt>-arch arm64</tt>. Also see ARM's <tt>__ARM_FEATURE_CRC32</tt> preprocessor macro.
-inline bool HasCRC32()
-{
-	if (!g_ArmDetectionDone)
-		DetectArmFeatures();
-	return g_hasCRC32;
-}
-
-//! \brief Determine if an ARM processor has AES available
-//! \returns true if the hardware is capable of AES at runtime, false otherwise.
-//! \details AES is part of the Crypto extensions from ARM C Language Extensions 2.0 (ACLE 2.0)
-//!   and available under Aarch64 (ARM-64) and Aarch32 (ARM-32) running on Aarch64 (i.e., an
-//!   AArch32 execution environment).
-//! \details Runtime support requires compile time support. When compiling with GCC, you may
-//!   need to compile with <tt>-march=armv8-a+crypto</tt>; while Apple requires
-//!   <tt>-arch arm64</tt>. Also see ARM's <tt>__ARM_FEATURE_CRYPTO</tt> preprocessor macro.
-inline bool HasAES()
-{
-	if (!g_ArmDetectionDone)
-		DetectArmFeatures();
-	return g_hasAES;
-}
-
-//! \brief Determine if an ARM processor has SHA1 available
-//! \returns true if the hardware is capable of SHA1 at runtime, false otherwise.
-//! \details SHA1 is part of the Crypto extensions from ARM C Language Extensions 2.0 (ACLE 2.0)
-//!   and available under Aarch64 (ARM-64) and Aarch32 (ARM-32) running on Aarch64 (i.e., an
-//!   AArch32 execution environment).
-//! \details Runtime support requires compile time support. When compiling with GCC, you may
-//!   need to compile with <tt>-march=armv8-a+crypto</tt>; while Apple requires
-//!   <tt>-arch arm64</tt>. Also see ARM's <tt>__ARM_FEATURE_CRYPTO</tt> preprocessor macro.
-inline bool HasSHA1()
-{
-	if (!g_ArmDetectionDone)
-		DetectArmFeatures();
-	return g_hasSHA1;
-}
-
-//! \brief Determine if an ARM processor has SHA2 available
-//! \returns true if the hardware is capable of SHA2 at runtime, false otherwise.
-//! \details SHA2 is part of the Crypto extensions from ARM C Language Extensions 2.0 (ACLE 2.0)
-//!   and available under Aarch64 (ARM-64) and Aarch32 (ARM-32) running on Aarch64 (i.e., an
-//!   AArch32 execution environment).
-//! \details Runtime support requires compile time support. When compiling with GCC, you may
-//!   need to compile with <tt>-march=armv8-a+crypto</tt>; while Apple requires
-//!   <tt>-arch arm64</tt>. Also see ARM's <tt>__ARM_FEATURE_CRYPTO</tt> preprocessor macro.
-inline bool HasSHA2()
-{
-	if (!g_ArmDetectionDone)
-		DetectArmFeatures();
-	return g_hasSHA2;
-}
-
-//! \brief Provides the cache line size at runtime
-//! \returns true if the hardware is capable of CRC32 at runtime, false otherwise.
-//! \details GetCacheLineSize() provides is an estimate using CRYPTOPP_L1_CACHE_LINE_SIZE.
-//!   The runtime instructions to query the processor are privileged.
-inline int GetCacheLineSize()
-{
-	return CRYPTOPP_L1_CACHE_LINE_SIZE;
-}
-
-#else
-
-inline int GetCacheLineSize()
-{
-	return CRYPTOPP_L1_CACHE_LINE_SIZE;
-}
-
-#endif  // X86/X32/X64 and ARM
-
-#endif
-
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
-
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-	#define AS1(x) x*newline*
-	#define AS2(x, y) x, y*newline*
-	#define AS3(x, y, z) x, y, z*newline*
-	#define ASS(x, y, a, b, c, d) x, y, a*64+b*16+c*4+d*newline*
-	#define ASL(x) label##x:*newline*
-	#define ASJ(x, y, z) x label##y*newline*
-	#define ASC(x, y) x label##y*newline*
-	#define AS_HEX(y) 0##y##h
-#elif defined(_MSC_VER) || defined(__BORLANDC__)
-	#define CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-	#define AS1(x) __asm {x}
-	#define AS2(x, y) __asm {x, y}
-	#define AS3(x, y, z) __asm {x, y, z}
-	#define ASS(x, y, a, b, c, d) __asm {x, y, (a)*64+(b)*16+(c)*4+(d)}
-	#define ASL(x) __asm {label##x:}
-	#define ASJ(x, y, z) __asm {x label##y}
-	#define ASC(x, y) __asm {x label##y}
-	#define CRYPTOPP_NAKED __declspec(naked)
-	#define AS_HEX(y) 0x##y
-#else
-	#define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY
-
-	// define these in two steps to allow arguments to be expanded
-	#define GNU_AS1(x) #x ";" NEW_LINE
-	#define GNU_AS2(x, y) #x ", " #y ";" NEW_LINE
-	#define GNU_AS3(x, y, z) #x ", " #y ", " #z ";" NEW_LINE
-	#define GNU_ASL(x) "\n" #x ":" NEW_LINE
-	#define GNU_ASJ(x, y, z) #x " " #y #z ";" NEW_LINE
-	#define AS1(x) GNU_AS1(x)
-	#define AS2(x, y) GNU_AS2(x, y)
-	#define AS3(x, y, z) GNU_AS3(x, y, z)
-	#define ASS(x, y, a, b, c, d) #x ", " #y ", " #a "*64+" #b "*16+" #c "*4+" #d ";"
-	#define ASL(x) GNU_ASL(x)
-	#define ASJ(x, y, z) GNU_ASJ(x, y, z)
-	#define ASC(x, y) #x " " #y ";"
-	#define CRYPTOPP_NAKED
-	#define AS_HEX(y) 0x##y
-#endif
-
-#define IF0(y)
-#define IF1(y) y
-
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-#define ASM_MOD(x, y) ((x) MOD (y))
-#define XMMWORD_PTR XMMWORD PTR
-#else
-// GNU assembler doesn't seem to have mod operator
-#define ASM_MOD(x, y) ((x)-((x)/(y))*(y))
-// GAS 2.15 doesn't support XMMWORD PTR. it seems necessary only for MASM
-#define XMMWORD_PTR
-#endif
-
-#if CRYPTOPP_BOOL_X86
-	#define AS_REG_1 ecx
-	#define AS_REG_2 edx
-	#define AS_REG_3 esi
-	#define AS_REG_4 edi
-	#define AS_REG_5 eax
-	#define AS_REG_6 ebx
-	#define AS_REG_7 ebp
-	#define AS_REG_1d ecx
-	#define AS_REG_2d edx
-	#define AS_REG_3d esi
-	#define AS_REG_4d edi
-	#define AS_REG_5d eax
-	#define AS_REG_6d ebx
-	#define AS_REG_7d ebp
-	#define WORD_SZ 4
-	#define WORD_REG(x)	e##x
-	#define WORD_PTR DWORD PTR
-	#define AS_PUSH_IF86(x) AS1(push e##x)
-	#define AS_POP_IF86(x) AS1(pop e##x)
-	#define AS_JCXZ jecxz
-#elif CRYPTOPP_BOOL_X32
-	#define AS_REG_1 ecx
-	#define AS_REG_2 edx
-	#define AS_REG_3 r8d
-	#define AS_REG_4 r9d
-	#define AS_REG_5 eax
-	#define AS_REG_6 r10d
-	#define AS_REG_7 r11d
-	#define AS_REG_1d ecx
-	#define AS_REG_2d edx
-	#define AS_REG_3d r8d
-	#define AS_REG_4d r9d
-	#define AS_REG_5d eax
-	#define AS_REG_6d r10d
-	#define AS_REG_7d r11d
-	#define WORD_SZ 4
-	#define WORD_REG(x)	e##x
-	#define WORD_PTR DWORD PTR
-	#define AS_PUSH_IF86(x) AS1(push r##x)
-	#define AS_POP_IF86(x) AS1(pop r##x)
-	#define AS_JCXZ jecxz
-#elif CRYPTOPP_BOOL_X64
-	#ifdef CRYPTOPP_GENERATE_X64_MASM
-		#define AS_REG_1 rcx
-		#define AS_REG_2 rdx
-		#define AS_REG_3 r8
-		#define AS_REG_4 r9
-		#define AS_REG_5 rax
-		#define AS_REG_6 r10
-		#define AS_REG_7 r11
-		#define AS_REG_1d ecx
-		#define AS_REG_2d edx
-		#define AS_REG_3d r8d
-		#define AS_REG_4d r9d
-		#define AS_REG_5d eax
-		#define AS_REG_6d r10d
-		#define AS_REG_7d r11d
-	#else
-		#define AS_REG_1 rdi
-		#define AS_REG_2 rsi
-		#define AS_REG_3 rdx
-		#define AS_REG_4 rcx
-		#define AS_REG_5 r8
-		#define AS_REG_6 r9
-		#define AS_REG_7 r10
-		#define AS_REG_1d edi
-		#define AS_REG_2d esi
-		#define AS_REG_3d edx
-		#define AS_REG_4d ecx
-		#define AS_REG_5d r8d
-		#define AS_REG_6d r9d
-		#define AS_REG_7d r10d
-	#endif
-	#define WORD_SZ 8
-	#define WORD_REG(x)	r##x
-	#define WORD_PTR QWORD PTR
-	#define AS_PUSH_IF86(x)
-	#define AS_POP_IF86(x)
-	#define AS_JCXZ jrcxz
-#endif
-
-// helper macro for stream cipher output
-#define AS_XMM_OUTPUT4(labelPrefix, inputPtr, outputPtr, x0, x1, x2, x3, t, p0, p1, p2, p3, increment)\
-	AS2(	test	inputPtr, inputPtr)\
-	ASC(	jz,		labelPrefix##3)\
-	AS2(	test	inputPtr, 15)\
-	ASC(	jnz,	labelPrefix##7)\
-	AS2(	pxor	xmm##x0, [inputPtr+p0*16])\
-	AS2(	pxor	xmm##x1, [inputPtr+p1*16])\
-	AS2(	pxor	xmm##x2, [inputPtr+p2*16])\
-	AS2(	pxor	xmm##x3, [inputPtr+p3*16])\
-	AS2(	add		inputPtr, increment*16)\
-	ASC(	jmp,	labelPrefix##3)\
-	ASL(labelPrefix##7)\
-	AS2(	movdqu	xmm##t, [inputPtr+p0*16])\
-	AS2(	pxor	xmm##x0, xmm##t)\
-	AS2(	movdqu	xmm##t, [inputPtr+p1*16])\
-	AS2(	pxor	xmm##x1, xmm##t)\
-	AS2(	movdqu	xmm##t, [inputPtr+p2*16])\
-	AS2(	pxor	xmm##x2, xmm##t)\
-	AS2(	movdqu	xmm##t, [inputPtr+p3*16])\
-	AS2(	pxor	xmm##x3, xmm##t)\
-	AS2(	add		inputPtr, increment*16)\
-	ASL(labelPrefix##3)\
-	AS2(	test	outputPtr, 15)\
-	ASC(	jnz,	labelPrefix##8)\
-	AS2(	movdqa	[outputPtr+p0*16], xmm##x0)\
-	AS2(	movdqa	[outputPtr+p1*16], xmm##x1)\
-	AS2(	movdqa	[outputPtr+p2*16], xmm##x2)\
-	AS2(	movdqa	[outputPtr+p3*16], xmm##x3)\
-	ASC(	jmp,	labelPrefix##9)\
-	ASL(labelPrefix##8)\
-	AS2(	movdqu	[outputPtr+p0*16], xmm##x0)\
-	AS2(	movdqu	[outputPtr+p1*16], xmm##x1)\
-	AS2(	movdqu	[outputPtr+p2*16], xmm##x2)\
-	AS2(	movdqu	[outputPtr+p3*16], xmm##x3)\
-	ASL(labelPrefix##9)\
-	AS2(	add		outputPtr, increment*16)
-
-#endif  //  X86/X32/X64
-
-NAMESPACE_END
-
-#endif  // CRYPTOPP_CPU_H
diff --git a/src-cryptopp/cryptest.sln b/src-cryptopp/cryptest.sln
deleted file mode 100644
index 5fd3dbb..0000000
--- a/src-cryptopp/cryptest.sln
+++ /dev/null
@@ -1,89 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptest", "cryptest.vcxproj", "{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C39F4B46-6E89-4074-902E-CA57073044D2} = {C39F4B46-6E89-4074-902E-CA57073044D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "cryptlib.vcxproj", "{C39F4B46-6E89-4074-902E-CA57073044D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltest", "dlltest.vcxproj", "{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257} = {94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptdll", "cryptdll.vcxproj", "{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		DLL-Import Debug|Win32 = DLL-Import Debug|Win32
-		DLL-Import Debug|x64 = DLL-Import Debug|x64
-		DLL-Import Release|Win32 = DLL-Import Release|Win32
-		DLL-Import Release|x64 = DLL-Import Release|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Debug|Win32.Build.0 = Debug|Win32
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Debug|x64.ActiveCfg = Debug|x64
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Debug|x64.Build.0 = Debug|x64
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Release|Win32.ActiveCfg = Release|Win32
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Release|Win32.Build.0 = Release|Win32
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Release|x64.ActiveCfg = Release|x64
-		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Release|x64.Build.0 = Release|x64
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.Debug|Win32.Build.0 = Debug|Win32
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.Debug|x64.ActiveCfg = Debug|x64
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.Debug|x64.Build.0 = Debug|x64
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|Win32.ActiveCfg = Release|Win32
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|Win32.Build.0 = Release|Win32
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|x64.ActiveCfg = Release|x64
-		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|x64.Build.0 = Release|x64
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.Debug|x64.ActiveCfg = Debug|x64
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Release|x64.Build.0 = Release|x64
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.Release|Win32.ActiveCfg = Release|Win32
-		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.Release|x64.ActiveCfg = Release|x64
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Debug|Win32.ActiveCfg = Debug|Win32
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Debug|x64.ActiveCfg = Debug|x64
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Release|x64.Build.0 = Release|x64
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Release|Win32.ActiveCfg = Release|Win32
-		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Release|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src-cryptopp/cryptlib.cpp b/src-cryptopp/cryptlib.cpp
deleted file mode 100644
index e923fce..0000000
--- a/src-cryptopp/cryptlib.cpp
+++ /dev/null
@@ -1,941 +0,0 @@
-// cryptlib.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4127 4189 4459)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic ignored "-Wunused-value"
-# pragma GCC diagnostic ignored "-Wunused-variable"
-# pragma GCC diagnostic ignored "-Wunused-parameter"
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "extraversion.h"
-const char *cryptopp_extra_version = CRYPTOPP_EXTRA_VERSION;
-
-#include "cryptlib.h"
-#include "misc.h"
-#include "filters.h"
-#include "algparam.h"
-#include "fips140.h"
-#include "argnames.h"
-#include "fltrimpl.h"
-#include "trdlocal.h"
-#include "osrng.h"
-#include "secblock.h"
-#include "smartptr.h"
-
-// http://www.cygwin.com/faq.html#faq.api.winsock
-#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && defined(PREFER_WINDOWS_STYLE_SOCKETS)
-# error Cygwin does not support Windows style sockets. See http://www.cygwin.com/faq.html#faq.api.winsock
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-CRYPTOPP_COMPILE_ASSERT(sizeof(byte) == 1);
-CRYPTOPP_COMPILE_ASSERT(sizeof(word16) == 2);
-CRYPTOPP_COMPILE_ASSERT(sizeof(word32) == 4);
-CRYPTOPP_COMPILE_ASSERT(sizeof(word64) == 8);
-#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word));
-#endif
-
-#if HAVE_GCC_INIT_PRIORITY
-CRYPTOPP_COMPILE_ASSERT(CRYPTOPP_INIT_PRIORITY >= 101);
-const std::string DEFAULT_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 25))) = "";
-const std::string AAD_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 26))) = "AAD";
-const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL;
-#elif HAVE_MSC_INIT_PRIORITY
-#pragma warning(disable: 4073)
-#pragma init_seg(lib)
-const std::string DEFAULT_CHANNEL = "";
-const std::string AAD_CHANNEL = "AAD";
-const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL;
-#pragma warning(default: 4073)
-#else
-static const std::string s1(""), s2("AAD");
-const std::string DEFAULT_CHANNEL = s1;
-const std::string AAD_CHANNEL = s2;
-const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL;
-#endif
-
-class NullNameValuePairs : public NameValuePairs
-{
-public:
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-		{CRYPTOPP_UNUSED(name); CRYPTOPP_UNUSED(valueType); CRYPTOPP_UNUSED(pValue); return false;}
-};
-
-#if HAVE_GCC_INIT_PRIORITY
-const simple_ptr<NullNameValuePairs> s_pNullNameValuePairs __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 30))) = new NullNameValuePairs;
-const NameValuePairs &g_nullNameValuePairs = *s_pNullNameValuePairs.m_p;
-#else
-const simple_ptr<NullNameValuePairs> s_pNullNameValuePairs(new NullNameValuePairs);
-const NameValuePairs &g_nullNameValuePairs = *s_pNullNameValuePairs.m_p;
-#endif
-
-BufferedTransformation & TheBitBucket()
-{
-	static BitBucket bitBucket;
-	return bitBucket;
-}
-
-Algorithm::Algorithm(bool checkSelfTestStatus)
-{
-	if (checkSelfTestStatus && FIPS_140_2_ComplianceEnabled())
-	{
-		if (GetPowerUpSelfTestStatus() == POWER_UP_SELF_TEST_NOT_DONE && !PowerUpSelfTestInProgressOnThisThread())
-			throw SelfTestFailure("Cryptographic algorithms are disabled before the power-up self tests are performed.");
-
-		if (GetPowerUpSelfTestStatus() == POWER_UP_SELF_TEST_FAILED)
-			throw SelfTestFailure("Cryptographic algorithms are disabled after a power-up self test failed.");
-	}
-}
-
-void SimpleKeyingInterface::SetKey(const byte *key, size_t length, const NameValuePairs &params)
-{
-	this->ThrowIfInvalidKeyLength(length);
-	this->UncheckedSetKey(key, (unsigned int)length, params);
-}
-
-void SimpleKeyingInterface::SetKeyWithRounds(const byte *key, size_t length, int rounds)
-{
-	SetKey(key, length, MakeParameters(Name::Rounds(), rounds));
-}
-
-void SimpleKeyingInterface::SetKeyWithIV(const byte *key, size_t length, const byte *iv, size_t ivLength)
-{
-	SetKey(key, length, MakeParameters(Name::IV(), ConstByteArrayParameter(iv, ivLength)));
-}
-
-void SimpleKeyingInterface::ThrowIfInvalidKeyLength(size_t length)
-{
-	if (!IsValidKeyLength(length))
-		throw InvalidKeyLength(GetAlgorithm().AlgorithmName(), length);
-}
-
-void SimpleKeyingInterface::ThrowIfResynchronizable()
-{
-	if (IsResynchronizable())
-		throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": this object requires an IV");
-}
-
-void SimpleKeyingInterface::ThrowIfInvalidIV(const byte *iv)
-{
-	if (!iv && IVRequirement() == UNPREDICTABLE_RANDOM_IV)
-		throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": this object cannot use a null IV");
-}
-
-size_t SimpleKeyingInterface::ThrowIfInvalidIVLength(int size)
-{
-	if (size < 0)
-		return IVSize();
-	else if ((size_t)size < MinIVLength())
-		throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": IV length " + IntToString(size) + " is less than the minimum of " + IntToString(MinIVLength()));
-	else if ((size_t)size > MaxIVLength())
-		throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": IV length " + IntToString(size) + " exceeds the maximum of " + IntToString(MaxIVLength()));
-	else
-		return size;
-}
-
-const byte * SimpleKeyingInterface::GetIVAndThrowIfInvalid(const NameValuePairs &params, size_t &size)
-{
-	ConstByteArrayParameter ivWithLength;
-	const byte *iv;
-	bool found = false;
-
-	try {found = params.GetValue(Name::IV(), ivWithLength);}
-	catch (const NameValuePairs::ValueTypeMismatch &) {}
-
-	if (found)
-	{
-		iv = ivWithLength.begin();
-		ThrowIfInvalidIV(iv);
-		size = ThrowIfInvalidIVLength((int)ivWithLength.size());
-		return iv;
-	}
-	else if (params.GetValue(Name::IV(), iv))
-	{
-		ThrowIfInvalidIV(iv);
-		size = IVSize();
-		return iv;
-	}
-	else
-	{
-		ThrowIfResynchronizable();
-		size = 0;
-		return NULL;
-	}
-}
-
-void SimpleKeyingInterface::GetNextIV(RandomNumberGenerator &rng, byte *IV)
-{
-	rng.GenerateBlock(IV, IVSize());
-}
-
-size_t BlockTransformation::AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const
-{
-	CRYPTOPP_ASSERT(inBlocks);
-	CRYPTOPP_ASSERT(outBlocks);
-	CRYPTOPP_ASSERT(length);
-
-	size_t blockSize = BlockSize();
-	size_t inIncrement = (flags & (BT_InBlockIsCounter|BT_DontIncrementInOutPointers)) ? 0 : blockSize;
-	size_t xorIncrement = xorBlocks ? blockSize : 0;
-	size_t outIncrement = (flags & BT_DontIncrementInOutPointers) ? 0 : blockSize;
-
-	if (flags & BT_ReverseDirection)
-	{
-		CRYPTOPP_ASSERT(length % blockSize == 0);
-		inBlocks += length - blockSize;
-		xorBlocks += length - blockSize;
-		outBlocks += length - blockSize;
-		inIncrement = 0-inIncrement;
-		xorIncrement = 0-xorIncrement;
-		outIncrement = 0-outIncrement;
-	}
-
-	while (length >= blockSize)
-	{
-		if (flags & BT_XorInput)
-		{
-			// Coverity finding. However, xorBlocks is never NULL if BT_XorInput.
-			CRYPTOPP_ASSERT(xorBlocks);
-#if defined(__COVERITY__)
-			if (xorBlocks)
-#endif
-			xorbuf(outBlocks, xorBlocks, inBlocks, blockSize);
-			ProcessBlock(outBlocks);
-		}
-		else
-		{
-			// xorBlocks can be NULL. See, for example, ECB_OneWay::ProcessData.
-			ProcessAndXorBlock(inBlocks, xorBlocks, outBlocks);
-		}
-
-		if (flags & BT_InBlockIsCounter)
-			const_cast<byte *>(inBlocks)[blockSize-1]++;
-		inBlocks += inIncrement;
-		outBlocks += outIncrement;
-		xorBlocks += xorIncrement;
-		length -= blockSize;
-	}
-
-	return length;
-}
-
-unsigned int BlockTransformation::OptimalDataAlignment() const
-{
-	return GetAlignmentOf<word32>();
-}
-
-unsigned int StreamTransformation::OptimalDataAlignment() const
-{
-	return GetAlignmentOf<word32>();
-}
-
-unsigned int HashTransformation::OptimalDataAlignment() const
-{
-	return GetAlignmentOf<word32>();
-}
-
-void StreamTransformation::ProcessLastBlock(byte *outString, const byte *inString, size_t length)
-{
-	CRYPTOPP_ASSERT(MinLastBlockSize() == 0);	// this function should be overriden otherwise
-
-	if (length == MandatoryBlockSize())
-		ProcessData(outString, inString, length);
-	else if (length != 0)
-		throw NotImplemented(AlgorithmName() + ": this object does't support a special last block");
-}
-
-void AuthenticatedSymmetricCipher::SpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength)
-{
-	if (headerLength > MaxHeaderLength())
-		throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": header length " + IntToString(headerLength) + " exceeds the maximum of " + IntToString(MaxHeaderLength()));
-
-	if (messageLength > MaxMessageLength())
-		throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": message length " + IntToString(messageLength) + " exceeds the maximum of " + IntToString(MaxMessageLength()));
-
-	if (footerLength > MaxFooterLength())
-		throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": footer length " + IntToString(footerLength) + " exceeds the maximum of " + IntToString(MaxFooterLength()));
-
-	UncheckedSpecifyDataLengths(headerLength, messageLength, footerLength);
-}
-
-void AuthenticatedSymmetricCipher::EncryptAndAuthenticate(byte *ciphertext, byte *mac, size_t macSize, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *message, size_t messageLength)
-{
-	Resynchronize(iv, ivLength);
-	SpecifyDataLengths(headerLength, messageLength);
-	Update(header, headerLength);
-	ProcessString(ciphertext, message, messageLength);
-	TruncatedFinal(mac, macSize);
-}
-
-bool AuthenticatedSymmetricCipher::DecryptAndVerify(byte *message, const byte *mac, size_t macLength, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *ciphertext, size_t ciphertextLength)
-{
-	Resynchronize(iv, ivLength);
-	SpecifyDataLengths(headerLength, ciphertextLength);
-	Update(header, headerLength);
-	ProcessString(message, ciphertext, ciphertextLength);
-	return TruncatedVerify(mac, macLength);
-}
-
-unsigned int RandomNumberGenerator::GenerateBit()
-{
-	return GenerateByte() & 1;
-}
-
-byte RandomNumberGenerator::GenerateByte()
-{
-	byte b;
-	GenerateBlock(&b, 1);
-	return b;
-}
-
-word32 RandomNumberGenerator::GenerateWord32(word32 min, word32 max)
-{
-	const word32 range = max-min;
-	const int maxBits = BitPrecision(range);
-
-	word32 value;
-
-	do
-	{
-		GenerateBlock((byte *)&value, sizeof(value));
-		value = Crop(value, maxBits);
-	} while (value > range);
-
-	return value+min;
-}
-
-// Stack recursion below... GenerateIntoBufferedTransformation calls GenerateBlock,
-// and GenerateBlock calls GenerateIntoBufferedTransformation. Ad infinitum. Also
-// see https://github.com/weidai11/cryptopp/issues/38.
-//
-// According to Wei, RandomNumberGenerator is an interface, and it should not
-// be instantiable. Its now spilt milk, and we are going to CRYPTOPP_ASSERT it in Debug
-// builds to alert the programmer and throw in Release builds. Developers have
-// a reference implementation in case its needed. If a programmer
-// unintentionally lands here, then they should ensure use of a
-// RandomNumberGenerator pointer or reference so polymorphism can provide the
-// proper runtime dispatching.
-
-void RandomNumberGenerator::GenerateBlock(byte *output, size_t size)
-{
-	CRYPTOPP_UNUSED(output), CRYPTOPP_UNUSED(size);
-
-#if 0
-	// This breaks AutoSeededX917RNG<T> generators.
-	throw NotImplemented("RandomNumberGenerator: GenerateBlock not implemented");
-#endif
-
-	ArraySink s(output, size);
-	GenerateIntoBufferedTransformation(s, DEFAULT_CHANNEL, size);
-}
-
-void RandomNumberGenerator::DiscardBytes(size_t n)
-{
-	GenerateIntoBufferedTransformation(TheBitBucket(), DEFAULT_CHANNEL, n);
-}
-
-void RandomNumberGenerator::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword length)
-{
-	FixedSizeSecBlock<byte, 256> buffer;
-	while (length)
-	{
-		size_t len = UnsignedMin(buffer.size(), length);
-		GenerateBlock(buffer, len);
-		size_t rem = target.ChannelPut(channel, buffer, len);
-		CRYPTOPP_UNUSED(rem); CRYPTOPP_ASSERT(rem == 0);
-		length -= len;
-	}
-}
-
-//! \class ClassNullRNG
-//! \brief Random Number Generator that does not produce random numbers
-//! \details ClassNullRNG can be used for functions that require a RandomNumberGenerator
-//!   but don't actually use it. The class throws NotImplemented when a generation function is called.
-//! \sa NullRNG()
-class ClassNullRNG : public RandomNumberGenerator
-{
-public:
-	//! \brief The name of the generator
-	//! \returns the string \a NullRNGs
-	std::string AlgorithmName() const {return "NullRNG";}
-
-#if defined(CRYPTOPP_DOXYGEN_PROCESSING)
-	//! \brief An implementation that throws NotImplemented
-	byte GenerateByte () {}
-	//! \brief An implementation that throws NotImplemented
-	unsigned int GenerateBit () {}
-	//! \brief An implementation that throws NotImplemented
-	word32 GenerateWord32 (word32 min, word32 max) {}
-#endif
-
-	//! \brief An implementation that throws NotImplemented
-	void GenerateBlock(byte *output, size_t size)
-	{
-		CRYPTOPP_UNUSED(output); CRYPTOPP_UNUSED(size);
-		throw NotImplemented("NullRNG: NullRNG should only be passed to functions that don't need to generate random bytes");
-	}
-
-#if defined(CRYPTOPP_DOXYGEN_PROCESSING)
-	//! \brief An implementation that throws NotImplemented
-	void GenerateIntoBufferedTransformation (BufferedTransformation &target, const std::string &channel, lword length) {}
-	//! \brief An implementation that throws NotImplemented
-	void IncorporateEntropy (const byte *input, size_t length) {}
-	//! \brief An implementation that returns \p false
-	bool CanIncorporateEntropy () const {}
-	//! \brief An implementation that does nothing
-	void DiscardBytes (size_t n) {}
-	//! \brief An implementation that does nothing
-	void Shuffle (IT begin, IT end) {}
-
-private:
-	Clonable* Clone () const { return NULL; }
-#endif
-};
-
-RandomNumberGenerator & NullRNG()
-{
-	static ClassNullRNG s_nullRNG;
-	return s_nullRNG;
-}
-
-bool HashTransformation::TruncatedVerify(const byte *digestIn, size_t digestLength)
-{
-	ThrowIfInvalidTruncatedSize(digestLength);
-	SecByteBlock digest(digestLength);
-	TruncatedFinal(digest, digestLength);
-	return VerifyBufsEqual(digest, digestIn, digestLength);
-}
-
-void HashTransformation::ThrowIfInvalidTruncatedSize(size_t size) const
-{
-	if (size > DigestSize())
-		throw InvalidArgument("HashTransformation: can't truncate a " + IntToString(DigestSize()) + " byte digest to " + IntToString(size) + " bytes");
-}
-
-unsigned int BufferedTransformation::GetMaxWaitObjectCount() const
-{
-	const BufferedTransformation *t = AttachedTransformation();
-	return t ? t->GetMaxWaitObjectCount() : 0;
-}
-
-void BufferedTransformation::GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack)
-{
-	BufferedTransformation *t = AttachedTransformation();
-	if (t)
-		t->GetWaitObjects(container, callStack);  // reduce clutter by not adding to stack here
-}
-
-void BufferedTransformation::Initialize(const NameValuePairs &parameters, int propagation)
-{
-	CRYPTOPP_UNUSED(propagation);
-	CRYPTOPP_ASSERT(!AttachedTransformation());
-	IsolatedInitialize(parameters);
-}
-
-bool BufferedTransformation::Flush(bool hardFlush, int propagation, bool blocking)
-{
-	CRYPTOPP_UNUSED(propagation);
-	CRYPTOPP_ASSERT(!AttachedTransformation());
-	return IsolatedFlush(hardFlush, blocking);
-}
-
-bool BufferedTransformation::MessageSeriesEnd(int propagation, bool blocking)
-{
-	CRYPTOPP_UNUSED(propagation);
-	CRYPTOPP_ASSERT(!AttachedTransformation());
-	return IsolatedMessageSeriesEnd(blocking);
-}
-
-byte * BufferedTransformation::ChannelCreatePutSpace(const std::string &channel, size_t &size)
-{
-	if (channel.empty())
-		return CreatePutSpace(size);
-	else
-		throw NoChannelSupport(AlgorithmName());
-}
-
-size_t BufferedTransformation::ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	if (channel.empty())
-		return Put2(begin, length, messageEnd, blocking);
-	else
-		throw NoChannelSupport(AlgorithmName());
-}
-
-size_t BufferedTransformation::ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	if (channel.empty())
-		return PutModifiable2(begin, length, messageEnd, blocking);
-	else
-		return ChannelPut2(channel, begin, length, messageEnd, blocking);
-}
-
-bool BufferedTransformation::ChannelFlush(const std::string &channel, bool completeFlush, int propagation, bool blocking)
-{
-	if (channel.empty())
-		return Flush(completeFlush, propagation, blocking);
-	else
-		throw NoChannelSupport(AlgorithmName());
-}
-
-bool BufferedTransformation::ChannelMessageSeriesEnd(const std::string &channel, int propagation, bool blocking)
-{
-	if (channel.empty())
-		return MessageSeriesEnd(propagation, blocking);
-	else
-		throw NoChannelSupport(AlgorithmName());
-}
-
-lword BufferedTransformation::MaxRetrievable() const
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->MaxRetrievable();
-	else
-		return CopyTo(TheBitBucket());
-}
-
-bool BufferedTransformation::AnyRetrievable() const
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->AnyRetrievable();
-	else
-	{
-		byte b;
-		return Peek(b) != 0;
-	}
-}
-
-size_t BufferedTransformation::Get(byte &outByte)
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->Get(outByte);
-	else
-		return Get(&outByte, 1);
-}
-
-size_t BufferedTransformation::Get(byte *outString, size_t getMax)
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->Get(outString, getMax);
-	else
-	{
-		ArraySink arraySink(outString, getMax);
-		return (size_t)TransferTo(arraySink, getMax);
-	}
-}
-
-size_t BufferedTransformation::Peek(byte &outByte) const
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->Peek(outByte);
-	else
-		return Peek(&outByte, 1);
-}
-
-size_t BufferedTransformation::Peek(byte *outString, size_t peekMax) const
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->Peek(outString, peekMax);
-	else
-	{
-		ArraySink arraySink(outString, peekMax);
-		return (size_t)CopyTo(arraySink, peekMax);
-	}
-}
-
-lword BufferedTransformation::Skip(lword skipMax)
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->Skip(skipMax);
-	else
-		return TransferTo(TheBitBucket(), skipMax);
-}
-
-lword BufferedTransformation::TotalBytesRetrievable() const
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->TotalBytesRetrievable();
-	else
-		return MaxRetrievable();
-}
-
-unsigned int BufferedTransformation::NumberOfMessages() const
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->NumberOfMessages();
-	else
-		return CopyMessagesTo(TheBitBucket());
-}
-
-bool BufferedTransformation::AnyMessages() const
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->AnyMessages();
-	else
-		return NumberOfMessages() != 0;
-}
-
-bool BufferedTransformation::GetNextMessage()
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->GetNextMessage();
-	else
-	{
-		CRYPTOPP_ASSERT(!AnyMessages());
-		return false;
-	}
-}
-
-unsigned int BufferedTransformation::SkipMessages(unsigned int count)
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->SkipMessages(count);
-	else
-		return TransferMessagesTo(TheBitBucket(), count);
-}
-
-size_t BufferedTransformation::TransferMessagesTo2(BufferedTransformation &target, unsigned int &messageCount, const std::string &channel, bool blocking)
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->TransferMessagesTo2(target, messageCount, channel, blocking);
-	else
-	{
-		unsigned int maxMessages = messageCount;
-		for (messageCount=0; messageCount < maxMessages && AnyMessages(); messageCount++)
-		{
-			size_t blockedBytes;
-			lword transferredBytes;
-
-			while (AnyRetrievable())
-			{
-				transferredBytes = LWORD_MAX;
-				blockedBytes = TransferTo2(target, transferredBytes, channel, blocking);
-				if (blockedBytes > 0)
-					return blockedBytes;
-			}
-
-			if (target.ChannelMessageEnd(channel, GetAutoSignalPropagation(), blocking))
-				return 1;
-
-			bool result = GetNextMessage();
-			CRYPTOPP_UNUSED(result); CRYPTOPP_ASSERT(result);
-		}
-		return 0;
-	}
-}
-
-unsigned int BufferedTransformation::CopyMessagesTo(BufferedTransformation &target, unsigned int count, const std::string &channel) const
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->CopyMessagesTo(target, count, channel);
-	else
-		return 0;
-}
-
-void BufferedTransformation::SkipAll()
-{
-	if (AttachedTransformation())
-		AttachedTransformation()->SkipAll();
-	else
-	{
-		while (SkipMessages()) {}
-		while (Skip()) {}
-	}
-}
-
-size_t BufferedTransformation::TransferAllTo2(BufferedTransformation &target, const std::string &channel, bool blocking)
-{
-	if (AttachedTransformation())
-		return AttachedTransformation()->TransferAllTo2(target, channel, blocking);
-	else
-	{
-		CRYPTOPP_ASSERT(!NumberOfMessageSeries());
-
-		unsigned int messageCount;
-		do
-		{
-			messageCount = UINT_MAX;
-			size_t blockedBytes = TransferMessagesTo2(target, messageCount, channel, blocking);
-			if (blockedBytes)
-				return blockedBytes;
-		}
-		while (messageCount != 0);
-
-		lword byteCount;
-		do
-		{
-			byteCount = ULONG_MAX;
-			size_t blockedBytes = TransferTo2(target, byteCount, channel, blocking);
-			if (blockedBytes)
-				return blockedBytes;
-		}
-		while (byteCount != 0);
-
-		return 0;
-	}
-}
-
-void BufferedTransformation::CopyAllTo(BufferedTransformation &target, const std::string &channel) const
-{
-	if (AttachedTransformation())
-		AttachedTransformation()->CopyAllTo(target, channel);
-	else
-	{
-		CRYPTOPP_ASSERT(!NumberOfMessageSeries());
-		while (CopyMessagesTo(target, UINT_MAX, channel)) {}
-	}
-}
-
-void BufferedTransformation::SetRetrievalChannel(const std::string &channel)
-{
-	if (AttachedTransformation())
-		AttachedTransformation()->SetRetrievalChannel(channel);
-}
-
-size_t BufferedTransformation::ChannelPutWord16(const std::string &channel, word16 value, ByteOrder order, bool blocking)
-{
-	PutWord(false, order, m_buf, value);
-	return ChannelPut(channel, m_buf, 2, blocking);
-}
-
-size_t BufferedTransformation::ChannelPutWord32(const std::string &channel, word32 value, ByteOrder order, bool blocking)
-{
-	PutWord(false, order, m_buf, value);
-	return ChannelPut(channel, m_buf, 4, blocking);
-}
-
-size_t BufferedTransformation::PutWord16(word16 value, ByteOrder order, bool blocking)
-{
-	return ChannelPutWord16(DEFAULT_CHANNEL, value, order, blocking);
-}
-
-size_t BufferedTransformation::PutWord32(word32 value, ByteOrder order, bool blocking)
-{
-	return ChannelPutWord32(DEFAULT_CHANNEL, value, order, blocking);
-}
-
-size_t BufferedTransformation::PeekWord16(word16 &value, ByteOrder order) const
-{
-	byte buf[2] = {0, 0};
-	size_t len = Peek(buf, 2);
-
-	if (order)
-		value = (buf[0] << 8) | buf[1];
-	else
-		value = (buf[1] << 8) | buf[0];
-
-	return len;
-}
-
-size_t BufferedTransformation::PeekWord32(word32 &value, ByteOrder order) const
-{
-	byte buf[4] = {0, 0, 0, 0};
-	size_t len = Peek(buf, 4);
-
-	if (order)
-		value = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf [3];
-	else
-		value = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf [0];
-
-	return len;
-}
-
-size_t BufferedTransformation::GetWord16(word16 &value, ByteOrder order)
-{
-	return (size_t)Skip(PeekWord16(value, order));
-}
-
-size_t BufferedTransformation::GetWord32(word32 &value, ByteOrder order)
-{
-	return (size_t)Skip(PeekWord32(value, order));
-}
-
-void BufferedTransformation::Attach(BufferedTransformation *newOut)
-{
-	if (AttachedTransformation() && AttachedTransformation()->Attachable())
-		AttachedTransformation()->Attach(newOut);
-	else
-		Detach(newOut);
-}
-
-void GeneratableCryptoMaterial::GenerateRandomWithKeySize(RandomNumberGenerator &rng, unsigned int keySize)
-{
-	GenerateRandom(rng, MakeParameters("KeySize", (int)keySize));
-}
-
-class PK_DefaultEncryptionFilter : public Unflushable<Filter>
-{
-public:
-	PK_DefaultEncryptionFilter(RandomNumberGenerator &rng, const PK_Encryptor &encryptor, BufferedTransformation *attachment, const NameValuePairs &parameters)
-		: m_rng(rng), m_encryptor(encryptor), m_parameters(parameters)
-	{
-		Detach(attachment);
-	}
-
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-	{
-		FILTER_BEGIN;
-		m_plaintextQueue.Put(inString, length);
-
-		if (messageEnd)
-		{
-			{
-			size_t plaintextLength;
-			if (!SafeConvert(m_plaintextQueue.CurrentSize(), plaintextLength))
-				throw InvalidArgument("PK_DefaultEncryptionFilter: plaintext too long");
-			size_t ciphertextLength = m_encryptor.CiphertextLength(plaintextLength);
-
-			SecByteBlock plaintext(plaintextLength);
-			m_plaintextQueue.Get(plaintext, plaintextLength);
-			m_ciphertext.resize(ciphertextLength);
-			m_encryptor.Encrypt(m_rng, plaintext, plaintextLength, m_ciphertext, m_parameters);
-			}
-
-			FILTER_OUTPUT(1, m_ciphertext, m_ciphertext.size(), messageEnd);
-		}
-		FILTER_END_NO_MESSAGE_END;
-	}
-
-	RandomNumberGenerator &m_rng;
-	const PK_Encryptor &m_encryptor;
-	const NameValuePairs &m_parameters;
-	ByteQueue m_plaintextQueue;
-	SecByteBlock m_ciphertext;
-};
-
-BufferedTransformation * PK_Encryptor::CreateEncryptionFilter(RandomNumberGenerator &rng, BufferedTransformation *attachment, const NameValuePairs &parameters) const
-{
-	return new PK_DefaultEncryptionFilter(rng, *this, attachment, parameters);
-}
-
-class PK_DefaultDecryptionFilter : public Unflushable<Filter>
-{
-public:
-	PK_DefaultDecryptionFilter(RandomNumberGenerator &rng, const PK_Decryptor &decryptor, BufferedTransformation *attachment, const NameValuePairs &parameters)
-		: m_rng(rng), m_decryptor(decryptor), m_parameters(parameters)
-	{
-		Detach(attachment);
-	}
-
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-	{
-		FILTER_BEGIN;
-		m_ciphertextQueue.Put(inString, length);
-
-		if (messageEnd)
-		{
-			{
-			size_t ciphertextLength;
-			if (!SafeConvert(m_ciphertextQueue.CurrentSize(), ciphertextLength))
-				throw InvalidArgument("PK_DefaultDecryptionFilter: ciphertext too long");
-			size_t maxPlaintextLength = m_decryptor.MaxPlaintextLength(ciphertextLength);
-
-			SecByteBlock ciphertext(ciphertextLength);
-			m_ciphertextQueue.Get(ciphertext, ciphertextLength);
-			m_plaintext.resize(maxPlaintextLength);
-			m_result = m_decryptor.Decrypt(m_rng, ciphertext, ciphertextLength, m_plaintext, m_parameters);
-			if (!m_result.isValidCoding)
-				throw InvalidCiphertext(m_decryptor.AlgorithmName() + ": invalid ciphertext");
-			}
-
-			FILTER_OUTPUT(1, m_plaintext, m_result.messageLength, messageEnd);
-		}
-		FILTER_END_NO_MESSAGE_END;
-	}
-
-	RandomNumberGenerator &m_rng;
-	const PK_Decryptor &m_decryptor;
-	const NameValuePairs &m_parameters;
-	ByteQueue m_ciphertextQueue;
-	SecByteBlock m_plaintext;
-	DecodingResult m_result;
-};
-
-BufferedTransformation * PK_Decryptor::CreateDecryptionFilter(RandomNumberGenerator &rng, BufferedTransformation *attachment, const NameValuePairs &parameters) const
-{
-	return new PK_DefaultDecryptionFilter(rng, *this, attachment, parameters);
-}
-
-size_t PK_Signer::Sign(RandomNumberGenerator &rng, PK_MessageAccumulator *messageAccumulator, byte *signature) const
-{
-	member_ptr<PK_MessageAccumulator> m(messageAccumulator);
-	return SignAndRestart(rng, *m, signature, false);
-}
-
-size_t PK_Signer::SignMessage(RandomNumberGenerator &rng, const byte *message, size_t messageLen, byte *signature) const
-{
-	member_ptr<PK_MessageAccumulator> m(NewSignatureAccumulator(rng));
-	m->Update(message, messageLen);
-	return SignAndRestart(rng, *m, signature, false);
-}
-
-size_t PK_Signer::SignMessageWithRecovery(RandomNumberGenerator &rng, const byte *recoverableMessage, size_t recoverableMessageLength,
-	const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, byte *signature) const
-{
-	member_ptr<PK_MessageAccumulator> m(NewSignatureAccumulator(rng));
-	InputRecoverableMessage(*m, recoverableMessage, recoverableMessageLength);
-	m->Update(nonrecoverableMessage, nonrecoverableMessageLength);
-	return SignAndRestart(rng, *m, signature, false);
-}
-
-bool PK_Verifier::Verify(PK_MessageAccumulator *messageAccumulator) const
-{
-	member_ptr<PK_MessageAccumulator> m(messageAccumulator);
-	return VerifyAndRestart(*m);
-}
-
-bool PK_Verifier::VerifyMessage(const byte *message, size_t messageLen, const byte *signature, size_t signatureLength) const
-{
-	member_ptr<PK_MessageAccumulator> m(NewVerificationAccumulator());
-	InputSignature(*m, signature, signatureLength);
-	m->Update(message, messageLen);
-	return VerifyAndRestart(*m);
-}
-
-DecodingResult PK_Verifier::Recover(byte *recoveredMessage, PK_MessageAccumulator *messageAccumulator) const
-{
-	member_ptr<PK_MessageAccumulator> m(messageAccumulator);
-	return RecoverAndRestart(recoveredMessage, *m);
-}
-
-DecodingResult PK_Verifier::RecoverMessage(byte *recoveredMessage,
-	const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength,
-	const byte *signature, size_t signatureLength) const
-{
-	member_ptr<PK_MessageAccumulator> m(NewVerificationAccumulator());
-	InputSignature(*m, signature, signatureLength);
-	m->Update(nonrecoverableMessage, nonrecoverableMessageLength);
-	return RecoverAndRestart(recoveredMessage, *m);
-}
-
-void SimpleKeyAgreementDomain::GenerateKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const
-{
-	GeneratePrivateKey(rng, privateKey);
-	GeneratePublicKey(rng, privateKey, publicKey);
-}
-
-void AuthenticatedKeyAgreementDomain::GenerateStaticKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const
-{
-	GenerateStaticPrivateKey(rng, privateKey);
-	GenerateStaticPublicKey(rng, privateKey, publicKey);
-}
-
-void AuthenticatedKeyAgreementDomain::GenerateEphemeralKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const
-{
-	GenerateEphemeralPrivateKey(rng, privateKey);
-	GenerateEphemeralPublicKey(rng, privateKey, publicKey);
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/cryptlib.h b/src-cryptopp/cryptlib.h
deleted file mode 100644
index c1619e6..0000000
--- a/src-cryptopp/cryptlib.h
+++ /dev/null
@@ -1,3010 +0,0 @@
-// cryptlib.h - written and placed in the public domain by Wei Dai
-
-//! \file cryptlib.h
-//! \brief Abstract base classes that provide a uniform interface to this library.
-
-/*!	\mainpage Crypto++ Library 5.6.5 API Reference
-<dl>
-<dt>Abstract Base Classes<dd>
-	cryptlib.h
-<dt>Authenticated Encryption Modes<dd>
-	CCM, EAX, \ref GCM "GCM (2K tables)", \ref GCM "GCM (64K tables)"
-<dt>Block Ciphers<dd>
-	\ref Rijndael "AES", Weak::ARC4, Blowfish, BTEA, Camellia, CAST128, CAST256, DES, \ref DES_EDE2 "2-key Triple-DES", \ref DES_EDE3 "3-key Triple-DES",
-	\ref DES_XEX3 "DESX", GOST, IDEA, \ref LR "Luby-Rackoff", MARS, RC2, RC5, RC6, \ref SAFER_K "SAFER-K", \ref SAFER_SK "SAFER-SK", SEED, Serpent,
-	\ref SHACAL2 "SHACAL-2", SHARK, SKIPJACK,
-Square, TEA, \ref ThreeWay "3-Way", Twofish, XTEA
-<dt>Stream Ciphers<dd>
-	ChaCha8, ChaCha12, ChaCha20, \ref Panama "Panama-LE", \ref Panama "Panama-BE", Salsa20, \ref SEAL "SEAL-LE", \ref SEAL "SEAL-BE", WAKE, XSalsa20
-<dt>Hash Functions<dd>
-	BLAKE2s, BLAKE2b, \ref Keccak "Keccak (F1600)", SHA1, SHA224, SHA256, SHA384, SHA512, \ref SHA3 "SHA-3", Tiger, Whirlpool, RIPEMD160, RIPEMD320, RIPEMD128, RIPEMD256, Weak::MD2, Weak::MD4, Weak::MD5
-<dt>Non-Cryptographic Checksums<dd>
-	CRC32, Adler32
-<dt>Message Authentication Codes<dd>
-	VMAC, HMAC, CBC_MAC, CMAC, DMAC, TTMAC, \ref GCM "GCM (GMAC)", BLAKE2
-<dt>Random Number Generators<dd>
-	NullRNG(), LC_RNG, RandomPool, BlockingRng, NonblockingRng, AutoSeededRandomPool, AutoSeededX917RNG,
-	\ref MersenneTwister "MersenneTwister (MT19937 and MT19937-AR)", RDRAND, RDSEED
-<dt>Key Derivation and Password-based Cryptography<dd>
-	HKDF, \ref PKCS12_PBKDF "PBKDF (PKCS #12)", \ref PKCS5_PBKDF1 "PBKDF-1 (PKCS #5)", \ref PKCS5_PBKDF2_HMAC "PBKDF-2/HMAC (PKCS #5)"
-<dt>Public Key Cryptosystems<dd>
-	DLIES, ECIES, LUCES, RSAES, RabinES, LUC_IES
-<dt>Public Key Signature Schemes<dd>
-	DSA2, GDSA, ECDSA, NR, ECNR, LUCSS, RSASS, RSASS_ISO, RabinSS, RWSS, ESIGN
-<dt>Key Agreement<dd>
-	DH, DH2, \ref MQV_Domain "MQV", \ref HMQV_Domain "HMQV", \ref FHMQV_Domain "FHMQV", ECDH, ECMQV, ECHMQV, ECFHMQV, XTR_DH
-<dt>Algebraic Structures<dd>
-	Integer, PolynomialMod2, PolynomialOver, RingOfPolynomialsOver,
-	ModularArithmetic, MontgomeryRepresentation, GFP2_ONB, GF2NP, GF256, GF2_32, EC2N, ECP
-<dt>Secret Sharing and Information Dispersal<dd>
-	SecretSharing, SecretRecovery, InformationDispersal, InformationRecovery
-<dt>Compression<dd>
-	Deflator, Inflator, Gzip, Gunzip, ZlibCompressor, ZlibDecompressor
-<dt>Input Source Classes<dd>
-	StringSource, ArraySource, FileSource, SocketSource, WindowsPipeSource, RandomNumberSource
-<dt>Output Sink Classes<dd>
-	StringSinkTemplate, StringSink, ArraySink, FileSink, SocketSink, WindowsPipeSink, RandomNumberSink
-<dt>Filter Wrappers<dd>
-	StreamTransformationFilter, HashFilter, HashVerificationFilter, SignerFilter, SignatureVerificationFilter
-<dt>Binary to Text Encoders and Decoders<dd>
-	HexEncoder, HexDecoder, Base64Encoder, Base64Decoder, Base64URLEncoder, Base64URLDecoder, Base32Encoder, Base32Decoder
-<dt>Wrappers for OS features<dd>
-	Timer, Socket, WindowsHandle, ThreadLocalStorage, ThreadUserTimer
-<dt>FIPS 140 validated cryptography<dd>
-	fips140.h
-</dl>
-
-In the DLL version of Crypto++, only the following implementation class are available.
-<dl>
-<dt>Block Ciphers<dd>
-	AES, \ref DES_EDE2 "2-key Triple-DES", \ref DES_EDE3 "3-key Triple-DES", SKIPJACK
-<dt>Cipher Modes (replace template parameter BC with one of the block ciphers above)<dd>
-	\ref ECB_Mode "ECB_Mode<BC>", \ref CTR_Mode "CTR_Mode<BC>", \ref CBC_Mode "CBC_Mode<BC>", \ref CFB_FIPS_Mode "CFB_FIPS_Mode<BC>", \ref OFB_Mode "OFB_Mode<BC>", \ref GCM "GCM<AES>"
-<dt>Hash Functions<dd>
-	SHA1, SHA224, SHA256, SHA384, SHA512
-<dt>Public Key Signature Schemes (replace template parameter H with one of the hash functions above)<dd>
-	RSASS\<PKCS1v15, H\>, RSASS\<PSS, H\>, RSASS_ISO\<H\>, RWSS\<P1363_EMSA2, H\>, DSA, ECDSA\<ECP, H\>, ECDSA\<EC2N, H\>
-<dt>Message Authentication Codes (replace template parameter H with one of the hash functions above)<dd>
-	HMAC\<H\>, CBC_MAC\<DES_EDE2\>, CBC_MAC\<DES_EDE3\>, GCM\<AES\>
-<dt>Random Number Generators<dd>
-	DefaultAutoSeededRNG (AutoSeededX917RNG\<AES\>)
-<dt>Key Agreement<dd>
-	DH, DH2
-<dt>Public Key Cryptosystems<dd>
-	RSAES\<OAEP\<SHA1\> \>
-</dl>
-
-<p>This reference manual is a work in progress. Some classes are lack detailed descriptions.
-<p>Click <a href="CryptoPPRef.zip">here</a> to download a zip archive containing this manual.
-<p>Thanks to Ryan Phillips for providing the Doxygen configuration file
-and getting us started on the manual.
-*/
-
-#ifndef CRYPTOPP_CRYPTLIB_H
-#define CRYPTOPP_CRYPTLIB_H
-
-#include "config.h"
-#include "stdcpp.h"
-#include "trap.h"
-
-#if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE)
-# include <signal.h>
-#endif
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4127 4189 4702)
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// forward declarations
-class Integer;
-class RandomNumberGenerator;
-class BufferedTransformation;
-
-//! \brief Specifies a direction for a cipher to operate
-//! \sa BlockTransformation::IsForwardTransformation(), BlockTransformation::IsPermutation(), BlockTransformation::GetCipherDirection()
-enum CipherDir {
-	//! \brief the cipher is performing encryption
-	ENCRYPTION,
-	//! \brief the cipher is performing decryption
-	DECRYPTION};
-
-//! \brief Represents infinite time
-const unsigned long INFINITE_TIME = ULONG_MAX;
-
-// VC60 workaround: using enums as template parameters causes problems
-//! \brief Converts a typename to an enumerated value
-template <typename ENUM_TYPE, int VALUE>
-struct EnumToType
-{
-	static ENUM_TYPE ToEnum() {return (ENUM_TYPE)VALUE;}
-};
-
-//! \brief Provides the byte ordering
-//! \details Big-endian and little-endian modes are supported. Bi-endian and PDP-endian modes
-//!   are not supported.
-enum ByteOrder {
-	//! \brief byte order is little-endian
-	LITTLE_ENDIAN_ORDER = 0,
-	//! \brief byte order is big-endian
-	BIG_ENDIAN_ORDER = 1};
-
-//! \brief Provides a constant for LittleEndian
-typedef EnumToType<ByteOrder, LITTLE_ENDIAN_ORDER> LittleEndian;
-//! \brief Provides a constant for BigEndian
-typedef EnumToType<ByteOrder, BIG_ENDIAN_ORDER> BigEndian;
-
-//! \class Exception
-//! \brief Base class for all exceptions thrown by the library
-//! \details All library exceptions directly or indirectly inherit from the Exception class.
-//!   The Exception class itself inherits from std::exception. The library does not use
-//!   std::runtime_error derived classes.
-class CRYPTOPP_DLL Exception : public std::exception
-{
-public:
-	//! \enum ErrorType
-	//! \brief Error types or categories
-	enum ErrorType {
-		//! \brief A method was called which was not implemented
-		NOT_IMPLEMENTED,
-		//! \brief An invalid argument was detected
-		INVALID_ARGUMENT,
-		//! \brief BufferedTransformation received a Flush(true) signal but can't flush buffers
-		CANNOT_FLUSH,
-		//! \brief Data integerity check, such as CRC or MAC, failed
-		DATA_INTEGRITY_CHECK_FAILED,
-		//! \brief Input data was received that did not conform to expected format
-		INVALID_DATA_FORMAT,
-		//! \brief Error reading from input device or writing to output device
-		IO_ERROR,
-		//! \brief Some other error occurred not belonging to other categories
-		OTHER_ERROR
-	};
-
-	//! \brief Construct a new  Exception
-	explicit Exception(ErrorType errorType, const std::string &s) : m_errorType(errorType), m_what(s) {}
-	virtual ~Exception() throw() {}
-
-	//! \brief Retrieves a C-string describing the exception
-	const char *what() const throw() {return (m_what.c_str());}
-	//! \brief Retrieves a string describing the exception
-	const std::string &GetWhat() const {return m_what;}
-	//! \brief Sets the error string for the exception
-	void SetWhat(const std::string &s) {m_what = s;}
-	//! \brief Retrieves the error type for the exception
-	ErrorType GetErrorType() const {return m_errorType;}
-	//! \brief Sets the error type for the exceptions
-	void SetErrorType(ErrorType errorType) {m_errorType = errorType;}
-
-private:
-	ErrorType m_errorType;
-	std::string m_what;
-};
-
-//! \brief An invalid argument was detected
-class CRYPTOPP_DLL InvalidArgument : public Exception
-{
-public:
-	explicit InvalidArgument(const std::string &s) : Exception(INVALID_ARGUMENT, s) {}
-};
-
-//! \brief Input data was received that did not conform to expected format
-class CRYPTOPP_DLL InvalidDataFormat : public Exception
-{
-public:
-	explicit InvalidDataFormat(const std::string &s) : Exception(INVALID_DATA_FORMAT, s) {}
-};
-
-//! \brief A decryption filter encountered invalid ciphertext
-class CRYPTOPP_DLL InvalidCiphertext : public InvalidDataFormat
-{
-public:
-	explicit InvalidCiphertext(const std::string &s) : InvalidDataFormat(s) {}
-};
-
-//! \brief A method was called which was not implemented
-class CRYPTOPP_DLL NotImplemented : public Exception
-{
-public:
-	explicit NotImplemented(const std::string &s) : Exception(NOT_IMPLEMENTED, s) {}
-};
-
-//! \brief Flush(true) was called but it can't completely flush its buffers
-class CRYPTOPP_DLL CannotFlush : public Exception
-{
-public:
-	explicit CannotFlush(const std::string &s) : Exception(CANNOT_FLUSH, s) {}
-};
-
-//! \brief The operating system reported an error
-class CRYPTOPP_DLL OS_Error : public Exception
-{
-public:
-	OS_Error(ErrorType errorType, const std::string &s, const std::string& operation, int errorCode)
-		: Exception(errorType, s), m_operation(operation), m_errorCode(errorCode) {}
-	~OS_Error() throw() {}
-
-	//! \brief Retrieve the operating system API that reported the error
-	const std::string & GetOperation() const {return m_operation;}
-	//! \brief Retrieve the error code returned by the operating system
-	int GetErrorCode() const {return m_errorCode;}
-
-protected:
-	std::string m_operation;
-	int m_errorCode;
-};
-
-//! \class DecodingResult
-//! \brief Returns a decoding results
-struct CRYPTOPP_DLL DecodingResult
-{
-	//! \brief Constructs a DecodingResult
-	//! \details isValidCoding is initialized to  false and messageLength is initialized to 0.
-	explicit DecodingResult() : isValidCoding(false), messageLength(0) {}
-	//! \brief Constructs a DecodingResult
-	//! \param len the message length
-	//! \details isValidCoding is initialized to  true.
-	explicit DecodingResult(size_t len) : isValidCoding(true), messageLength(len) {}
-
-	//! \brief Compare two DecodingResult
-	//! \param rhs the other DecodingResult
-	//! \return true if both isValidCoding and messageLength are equal, false otherwise
-	bool operator==(const DecodingResult &rhs) const {return isValidCoding == rhs.isValidCoding && messageLength == rhs.messageLength;}
-	//! \brief Compare two DecodingResult
-	//! \param rhs the other DecodingResult
-	//! \return true if either isValidCoding or messageLength is \a not equal, false otherwise
-	//! \details Returns <tt>!operator==(rhs)</tt>.
-	bool operator!=(const DecodingResult &rhs) const {return !operator==(rhs);}
-
-	//! \brief Flag to indicate the decoding is valid
-	bool isValidCoding;
-	//! \brief Recovered message length if isValidCoding is true, undefined otherwise
-	size_t messageLength;
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-	operator size_t() const {return isValidCoding ? messageLength : 0;}
-#endif
-};
-
-//! \class NameValuePairs
-//! \brief Interface for retrieving values given their names
-//! \details This class is used to safely pass a variable number of arbitrarily typed arguments to functions
-//!   and to read values from keys and crypto parameters.
-//! \details To obtain an object that implements NameValuePairs for the purpose of parameter
-//!   passing, use the MakeParameters() function.
-//! \details To get a value from NameValuePairs, you need to know the name and the type of the value.
-//!   Call GetValueNames() on a NameValuePairs object to obtain a list of value names that it supports.
-//!   then look at the Name namespace documentation to see what the type of each value is, or
-//!   alternatively, call GetIntValue() with the value name, and if the type is not int, a
-//!   ValueTypeMismatch exception will be thrown and you can get the actual type from the exception object.
-class CRYPTOPP_NO_VTABLE NameValuePairs
-{
-public:
-	virtual ~NameValuePairs() {}
-
-	//! \class ValueTypeMismatch
-	//! \brief Thrown when an unexpected type is encountered
-	//! \details Exception thrown when trying to retrieve a value using a different type than expected
-	class CRYPTOPP_DLL ValueTypeMismatch : public InvalidArgument
-	{
-	public:
-		//! \brief Construct a ValueTypeMismatch
-		//! \param name the name of the value
-		//! \param stored the \a actual type of the value stored
-		//! \param retrieving the \a presumed type of the value retrieved
-		ValueTypeMismatch(const std::string &name, const std::type_info &stored, const std::type_info &retrieving)
-			: InvalidArgument("NameValuePairs: type mismatch for '" + name + "', stored '" + stored.name() + "', trying to retrieve '" + retrieving.name() + "'")
-			, m_stored(stored), m_retrieving(retrieving) {}
-
-		//! \brief Provides the stored type
-		//! \return the C++ mangled name of the type
-		const std::type_info & GetStoredTypeInfo() const {return m_stored;}
-
-		//! \brief Provides the retrieveing type
-		//! \return the C++ mangled name of the type
-		const std::type_info & GetRetrievingTypeInfo() const {return m_retrieving;}
-
-	private:
-		const std::type_info &m_stored;
-		const std::type_info &m_retrieving;
-	};
-
-	//! \brief Get a copy of this object or subobject
-	//! \tparam T class or type
-	//! \param object reference to a variable that receives the value
-	template <class T>
-	bool GetThisObject(T &object) const
-	{
-		return GetValue((std::string("ThisObject:")+typeid(T).name()).c_str(), object);
-	}
-
-	//! \brief Get a pointer to this object
-	//! \tparam T class or type
-	//! \param ptr reference to a pointer to a variable that receives the value
-	template <class T>
-	bool GetThisPointer(T *&ptr) const
-	{
-		return GetValue((std::string("ThisPointer:")+typeid(T).name()).c_str(), ptr);
-	}
-
-	//! \brief Get a named value
-	//! \tparam T class or type
-	//! \param name the name of the object or value to retrieve
-	//! \param value reference to a variable that receives the value
-	//! \returns true if the value was retrieved, false otherwise
-	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
-	//!   GetRequiredParameter() and GetRequiredIntParameter()
-	template <class T>
-	bool GetValue(const char *name, T &value) const
-	{
-		return GetVoidValue(name, typeid(T), &value);
-	}
-
-	//! \brief Get a named value
-	//! \tparam T class or type
-	//! \param name the name of the object or value to retrieve
-	//! \param defaultValue the default value of the class or type if it does not exist
-	//! \return the object or value
-	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
-	//!   GetRequiredParameter() and GetRequiredIntParameter()
-	template <class T>
-	T GetValueWithDefault(const char *name, T defaultValue) const
-	{
-		T value;
-		bool result = GetValue(name, value);
-		// No assert... this recovers from failure
-		if (result) {return value;}
-		return defaultValue;
-	}
-
-	//! \brief Get a list of value names that can be retrieved
-	//! \return a list of names available to retrieve
-	//! \details the items in the list are delimited with a colon.
-	CRYPTOPP_DLL std::string GetValueNames() const
-		{std::string result; GetValue("ValueNames", result); return result;}
-
-	//! \brief Get a named value with type int
-	//! \param name the name of the value to retrieve
-	//! \param value the value retrieved upon success
-	//! \return true if an int value was retrieved, false otherwise
-	//! \details GetIntValue() is used to ensure we don't accidentally try to get an
-	//!   unsigned int or some other type when we mean int (which is the most common case)
-	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
-	//!   GetRequiredParameter() and GetRequiredIntParameter()
-	CRYPTOPP_DLL bool GetIntValue(const char *name, int &value) const
-		{return GetValue(name, value);}
-
-	//! \brief Get a named value with type int, with default
-	//! \param name the name of the value to retrieve
-	//! \param defaultValue the default value if the name does not exist
-	//! \return the value retrieved on success or the default value
-	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
-	//!   GetRequiredParameter() and GetRequiredIntParameter()
-	CRYPTOPP_DLL int GetIntValueWithDefault(const char *name, int defaultValue) const
-		{return GetValueWithDefault(name, defaultValue);}
-
-	//! \brief Ensures an expected name and type is present
-	//! \param name the name of the value
-	//! \param stored the type that was stored for the name
-	//! \param retrieving the type that is being retrieved for the name
-	//! \throws ValueTypeMismatch
-	//! \details ThrowIfTypeMismatch() effectively performs a type safety check.
-	//!    stored and  retrieving are C++ mangled names for the type.
-	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
-	//!   GetRequiredParameter() and GetRequiredIntParameter()
-	CRYPTOPP_DLL static void CRYPTOPP_API ThrowIfTypeMismatch(const char *name, const std::type_info &stored, const std::type_info &retrieving)
-		{if (stored != retrieving) throw ValueTypeMismatch(name, stored, retrieving);}
-
-	//! \brief Retrieves a required name/value pair
-	//! \tparam T class or type
-	//! \param className the name of the class
-	//! \param name the name of the value
-	//! \param value reference to a variable to receive the value
-	//! \throws InvalidArgument
-	//! \details GetRequiredParameter() throws InvalidArgument if the name
-	//!   is not present or not of the expected type T.
-	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
-	//!   GetRequiredParameter() and GetRequiredIntParameter()
-	template <class T>
-	void GetRequiredParameter(const char *className, const char *name, T &value) const
-	{
-		if (!GetValue(name, value))
-			throw InvalidArgument(std::string(className) + ": missing required parameter '" + name + "'");
-	}
-
-	//! \brief Retrieves a required name/value pair
-	//! \param className the name of the class
-	//! \param name the name of the value
-	//! \param value reference to a variable to receive the value
-	//! \throws InvalidArgument
-	//! \details GetRequiredParameter() throws InvalidArgument if the name
-	//!   is not present or not of the expected type T.
-	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
-	//!   GetRequiredParameter() and GetRequiredIntParameter()
-	CRYPTOPP_DLL void GetRequiredIntParameter(const char *className, const char *name, int &value) const
-	{
-		if (!GetIntValue(name, value))
-			throw InvalidArgument(std::string(className) + ": missing required parameter '" + name + "'");
-	}
-
-	//! \brief Get a named value
-	//! \param name the name of the object or value to retrieve
-	//! \param valueType reference to a variable that receives the value
-	//! \param pValue void pointer to a variable that receives the value
-	//! \returns true if the value was retrieved, false otherwise
-	//! \details GetVoidValue() retrives the value of  name if it exists.
-	//! \note  GetVoidValue() is an internal function and should be implemented
-	//!   by derived classes. Users should use one of the other functions instead.
-	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
-	//!   GetRequiredParameter() and GetRequiredIntParameter()
-	CRYPTOPP_DLL virtual bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const =0;
-};
-
-#if CRYPTOPP_DOXYGEN_PROCESSING
-
-//! \brief Namespace containing value name definitions.
-//! \details Name is part of the CryptoPP namespace.
-//! \details The semantics of value names, types are:
-//! <pre>
-//!     ThisObject:ClassName (ClassName, copy of this object or a subobject)
-//!     ThisPointer:ClassName (const ClassName *, pointer to this object or a subobject)
-//! </pre>
-DOCUMENTED_NAMESPACE_BEGIN(Name)
-// more names defined in argnames.h
-DOCUMENTED_NAMESPACE_END
-
-//! \brief Namespace containing weak and wounded algorithms.
-//! \details Weak is part of the CryptoPP namespace. Schemes and algorithms are moved into Weak
-//!   when their security level is reduced to an unacceptable level by contemporary standards.
-//! \details To use an algorithm in the Weak namespace, you must <tt>\c \#define
-//!   CRYPTOPP_ENABLE_NAMESPACE_WEAK 1</tt> before including a header for a weak or wounded
-//!   algorithm. For example:
-//!   <pre>
-//!     \c \#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
-//!     \c \#include <md5.h>
-//!     ...
-//!     CryptoPP::Weak::MD5 md5;
-//!   </pre>
-
-DOCUMENTED_NAMESPACE_BEGIN(Weak)
-// weak and wounded algorithms
-DOCUMENTED_NAMESPACE_END
-#endif
-
-//! \brief An empty set of name-value pairs
-extern CRYPTOPP_DLL const NameValuePairs &g_nullNameValuePairs;
-
-// ********************************************************
-
-//! \class Clonable
-//! \brief Interface for cloning objects
-//! \note this is \a not implemented by most classes
-//! \sa ClonableImpl, NotCopyable
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Clonable
-{
-public:
-	virtual ~Clonable() {}
-
-	//! \brief Copies  this object
-	//! \return a copy of this object
-	//! \throws NotImplemented
-	//! \note this is \a not implemented by most classes
-	//! \sa NotCopyable
-	virtual Clonable* Clone() const {throw NotImplemented("Clone() is not implemented yet.");}	// TODO: make this =0
-};
-
-//! \class Algorithm
-//! \brief Interface for all crypto algorithms
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Algorithm : public Clonable
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~Algorithm() {}
-#endif
-
-	//! \brief Interface for all crypto algorithms
-	//! \param checkSelfTestStatus determines whether the object can proceed if the self
-	//!   tests have not been run or failed.
-	//! \details When FIPS 140-2 compliance is enabled and checkSelfTestStatus == true,
-	//!   this constructor throws SelfTestFailure if the self test hasn't been run or fails.
-	//! \details FIPS 140-2 compliance is disabled by default. It is only used by certain
-	//!   versions of the library when the library is built as a DLL on Windows. Also see
-	//!    CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 in config.h.
-	Algorithm(bool checkSelfTestStatus = true);
-
-	//! \brief Provides the name of this algorithm
-	//! \return the standard algorithm name
-	//! \details The standard algorithm name can be a name like \a AES or \a AES/GCM. Some algorithms
-	//!   do not have standard names yet. For example, there is no standard algorithm name for
-	//!   Shoup's  ECIES.
-	//! \note  AlgorithmName is not universally implemented yet
-	virtual std::string AlgorithmName() const {return "unknown";}
-};
-
-//! \class SimpleKeyingInterface
-//! \brief Interface for algorithms that take byte strings as keys
-//! \sa FixedKeyLength(), VariableKeyLength(), SameKeyLengthAs(), SimpleKeyingInterfaceImpl()
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SimpleKeyingInterface
-{
-public:
-	virtual ~SimpleKeyingInterface() {}
-
-	//! \brief Returns smallest valid key length in bytes
-	virtual size_t MinKeyLength() const =0;
-	//! \brief Returns largest valid key length in bytes
-	virtual size_t MaxKeyLength() const =0;
-	//! \brief Returns default (recommended) key length in bytes
-	virtual size_t DefaultKeyLength() const =0;
-
-	//! \brief
-	//! \param n the desired keylength
-	//! \return the smallest valid key length in bytes that is greater than or equal to <tt>min(n, GetMaxKeyLength())</tt>
-	virtual size_t GetValidKeyLength(size_t n) const =0;
-
-	//! \brief Returns whether  keylength is a valid key length
-	//! \param keylength the requested keylength
-	//! \return true if keylength is valid, false otherwise
-	//! \details Internally the function calls GetValidKeyLength()
-	virtual bool IsValidKeyLength(size_t keylength) const
-		{return keylength == GetValidKeyLength(keylength);}
-
-	//! \brief Sets or reset the key of this object
-	//! \param key the key to use when keying the object
-	//! \param length the size of the key, in bytes
-	//! \param params additional initialization parameters that cannot be passed
-	//!   directly through the constructor
-	virtual void SetKey(const byte *key, size_t length, const NameValuePairs &params = g_nullNameValuePairs);
-
-	//! \brief Sets or reset the key of this object
-	//! \param key the key to use when keying the object
-	//! \param length the size of the key, in bytes
-	//! \param rounds the number of rounds to apply the transformation function,
-	//!    if applicable
-	//! \details SetKeyWithRounds() calls SetKey() with a NameValuePairs
-	//!   object that only specifies rounds. rounds is an integer parameter,
-	//!   and <tt>-1</tt> means use the default number of rounds.
-	void SetKeyWithRounds(const byte *key, size_t length, int rounds);
-
-	//! \brief Sets or reset the key of this object
-	//! \param key the key to use when keying the object
-	//! \param length the size of the key, in bytes
-	//! \param iv the intiialization vector to use when keying the object
-	//! \param ivLength the size of the iv, in bytes
-	//! \details SetKeyWithIV() calls SetKey() with a NameValuePairs
-	//!   that only specifies IV. The IV is a byte buffer with size ivLength.
-	//!   ivLength is an integer parameter, and <tt>-1</tt> means use IVSize().
-	void SetKeyWithIV(const byte *key, size_t length, const byte *iv, size_t ivLength);
-
-	//! \brief Sets or reset the key of this object
-	//! \param key the key to use when keying the object
-	//! \param length the size of the key, in bytes
-	//! \param iv the intiialization vector to use when keying the object
-	//! \details SetKeyWithIV() calls SetKey() with a NameValuePairs() object
-	//!   that only specifies iv. iv is a byte buffer, and it must have
-	//!   a size IVSize().
-	void SetKeyWithIV(const byte *key, size_t length, const byte *iv)
-		{SetKeyWithIV(key, length, iv, IVSize());}
-
-	//! \brief Secure IVs requirements as enumerated values.
-	//! \details Provides secure IV requirements as a monotomically increasing enumerated values. Requirements can be
-	//!    compared using less than (&lt;) and greater than (&gt;). For example, <tt>UNIQUE_IV &lt; RANDOM_IV</tt>
-	//!    and <tt>UNPREDICTABLE_RANDOM_IV &gt; RANDOM_IV</tt>.
-	//! \sa IsResynchronizable(), CanUseRandomIVs(), CanUsePredictableIVs(), CanUseStructuredIVs()
-	enum IV_Requirement {
-		//! \brief The IV must be unique
-		UNIQUE_IV = 0,
-		//! \brief The IV must be random and possibly predictable
-		RANDOM_IV,
-		//! \brief The IV must be random and unpredictable
-		UNPREDICTABLE_RANDOM_IV,
-		//! \brief The IV is set by the object
-		INTERNALLY_GENERATED_IV,
-		//! \brief The object does not use an IV
-		NOT_RESYNCHRONIZABLE
-	};
-
-	//! \brief Minimal requirement for secure IVs
-	//! \return the secure IV requirement of the algorithm
-	virtual IV_Requirement IVRequirement() const =0;
-
-	//! \brief Determines if the object can be resynchronized
-	//! \return true if the object can be resynchronized (i.e. supports initialization vectors), false otherwise
-	//! \note If this function returns true, and no IV is passed to SetKey() and <tt>CanUseStructuredIVs()==true</tt>,
-	//!   an IV of all 0's will be assumed.
-	bool IsResynchronizable() const {return IVRequirement() < NOT_RESYNCHRONIZABLE;}
-
-	//! \brief Determines if the object can use random IVs
-	//! \return true if the object can use random IVs (in addition to ones returned by GetNextIV), false otherwise
-	bool CanUseRandomIVs() const {return IVRequirement() <= UNPREDICTABLE_RANDOM_IV;}
-
-	//! \brief Determines if the object can use random but possibly predictable IVs
-	//! \return true if the object can use random but possibly predictable IVs (in addition to ones returned by
-	//!    GetNextIV), false otherwise
-	bool CanUsePredictableIVs() const {return IVRequirement() <= RANDOM_IV;}
-
-	//! \brief Determines if the object can use structured IVs
-	//! \returns true if the object can use structured IVs, false otherwise
-	//! \details CanUseStructuredIVs() indicates whether the object can use structured IVs; for example a counter
-	//!    (in addition to ones returned by GetNextIV).
-	bool CanUseStructuredIVs() const {return IVRequirement() <= UNIQUE_IV;}
-
-	//! \brief Returns length of the IV accepted by this object
-	//! \return the size of an IV, in bytes
-	//! \throws NotImplemented() if the object does not support resynchronization
-	//! \details The default implementation throws NotImplemented
-	virtual unsigned int IVSize() const
-		{throw NotImplemented(GetAlgorithm().AlgorithmName() + ": this object doesn't support resynchronization");}
-
-	//! \brief Provides the default size of an IV
-	//! \return default length of IVs accepted by this object, in bytes
-	unsigned int DefaultIVLength() const {return IVSize();}
-
-	//! \brief Provides the minimum size of an IV
-	//! \return minimal length of IVs accepted by this object, in bytes
-	//! \throws NotImplemented() if the object does not support resynchronization
-	virtual unsigned int MinIVLength() const {return IVSize();}
-
-	//! \brief Provides the maximum size of an IV
-	//! \return maximal length of IVs accepted by this object, in bytes
-	//! \throws NotImplemented() if the object does not support resynchronization
-	virtual unsigned int MaxIVLength() const {return IVSize();}
-
-	//! \brief Resynchronize with an IV
-	//! \param iv the initialization vector
-	//! \param ivLength the size of the initialization vector, in bytes
-	//! \details Resynchronize() resynchronizes with an IV provided by the caller. <tt>ivLength=-1</tt> means use IVSize().
-	//! \throws NotImplemented() if the object does not support resynchronization
-	virtual void Resynchronize(const byte *iv, int ivLength=-1) {
-		CRYPTOPP_UNUSED(iv); CRYPTOPP_UNUSED(ivLength);
-		throw NotImplemented(GetAlgorithm().AlgorithmName() + ": this object doesn't support resynchronization");
-	}
-
-	//! \brief Retrieves a secure IV for the next message
-	//! \param rng a RandomNumberGenerator to produce keying material
-	//! \param iv a block of bytes to receive the IV
-	//! \details The IV must be at least IVSize() in length.
-	//! \details This method should be called after you finish encrypting one message and are ready
-	//!    to start the next one. After calling it, you must call SetKey() or Resynchronize().
-	//!    before using this object again.
-	//! \details Internally, the base class implementation calls RandomNumberGenerator's GenerateBlock()
-	//! \note This method is not implemented on decryption objects.
-	virtual void GetNextIV(RandomNumberGenerator &rng, byte *iv);
-
-protected:
-	//! \brief Returns the base class  Algorithm
-	//! \return the base class  Algorithm
-	virtual const Algorithm & GetAlgorithm() const =0;
-
-	//! \brief Sets the key for this object without performing parameter validation
-	//! \param key a byte buffer used to key the cipher
-	//! \param length the length of the byte buffer
-	//! \param params additional parameters passed as  NameValuePairs
-	//! \details key must be at least DEFAULT_KEYLENGTH in length.
-	virtual void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params) =0;
-
-	//! \brief Validates the key length
-	//! \param length the size of the keying material, in bytes
-	//! \throws InvalidKeyLength if the key length is invalid
-	void ThrowIfInvalidKeyLength(size_t length);
-
-	//! \brief Validates the object
-	//! \throws InvalidArgument if the IV is present
-	//! \details Internally, the default implementation calls  IsResynchronizable() and throws
-	//!    InvalidArgument if the function returns  true.
-	//! \note called when no IV is passed
-	void ThrowIfResynchronizable();
-
-	//! \brief Validates the IV
-	//! \param iv the IV with a length of  IVSize, in bytes
-	//! \throws InvalidArgument on failure
-	//! \details Internally, the default implementation checks the  iv. If  iv is not  NULL,
-	//!   then the function succeeds. If  iv is  NULL, then  IVRequirement is checked against
-	//!    UNPREDICTABLE_RANDOM_IV. If  IVRequirement is  UNPREDICTABLE_RANDOM_IV, then
-	//!   then the function succeeds. Otherwise, an exception is thrown.
-	void ThrowIfInvalidIV(const byte *iv);
-
-	//! \brief Validates the IV length
-	//! \param length the size of an IV, in bytes
-	//! \throws InvalidArgument if the number of  rounds are invalid
-	size_t ThrowIfInvalidIVLength(int length);
-
-	//! \brief Retrieves and validates the IV
-	//! \param params  NameValuePairs with the IV supplied as a ConstByteArrayParameter
-	//! \param size the length of the IV, in bytes
-	//! \return a pointer to the first byte of the  IV
-	//! \throws InvalidArgument if the number of  rounds are invalid
-	const byte * GetIVAndThrowIfInvalid(const NameValuePairs &params, size_t &size);
-
-	//! \brief Validates the key length
-	//! \param length the size of the keying material, in bytes
-	inline void AssertValidKeyLength(size_t length) const
-		{CRYPTOPP_UNUSED(length); CRYPTOPP_ASSERT(IsValidKeyLength(length));}
-};
-
-//! \brief Interface for the data processing part of block ciphers
-//! \details Classes derived from BlockTransformation are block ciphers
-//!   in ECB mode (for example the DES::Encryption class), which are stateless.
-//!   These classes should not be used directly, but only in combination with
-//!   a mode class (see CipherModeDocumentation in modes.h).
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BlockTransformation : public Algorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~BlockTransformation() {}
-#endif
-
-	//! \brief Encrypt or decrypt a block
-	//! \param inBlock the input message before processing
-	//! \param outBlock the output message after processing
-	//! \param xorBlock an optional XOR mask
-	//! \details ProcessAndXorBlock encrypts or decrypts inBlock, xor with xorBlock, and write to outBlock.
-	//! \details The size of the block is determined by the block cipher and its documentation. Use
-	//!     BLOCKSIZE at compile time, or BlockSize() at runtime.
-	//! \note The message can be transformed in-place, or the buffers must \a not overlap
-	//! \sa FixedBlockSize, BlockCipherFinal from seckey.h and BlockSize()
-	virtual void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const =0;
-
-	//! \brief Encrypt or decrypt a block
-	//! \param inBlock the input message before processing
-	//! \param outBlock the output message after processing
-	//! \details ProcessBlock encrypts or decrypts inBlock and write to outBlock.
-	//! \details The size of the block is determined by the block cipher and its documentation.
-	//!    Use  BLOCKSIZE at compile time, or BlockSize() at runtime.
-	//! \sa FixedBlockSize, BlockCipherFinal from seckey.h and BlockSize()
-	//! \note The message can be transformed in-place, or the buffers must \a not overlap
-	void ProcessBlock(const byte *inBlock, byte *outBlock) const
-		{ProcessAndXorBlock(inBlock, NULL, outBlock);}
-
-	//! \brief Encrypt or decrypt a block in place
-	//! \param inoutBlock the input message before processing
-	//! \details ProcessBlock encrypts or decrypts inoutBlock in-place.
-	//! \details The size of the block is determined by the block cipher and its documentation.
-	//!    Use BLOCKSIZE at compile time, or BlockSize() at runtime.
-	//! \sa FixedBlockSize, BlockCipherFinal from seckey.h and BlockSize()
-	void ProcessBlock(byte *inoutBlock) const
-		{ProcessAndXorBlock(inoutBlock, NULL, inoutBlock);}
-
-	//! Provides the block size of the cipher
-	//! \return the block size of the cipher, in bytes
-	virtual unsigned int BlockSize() const =0;
-
-	//! \brief Provides input and output data alignment for optimal performance.
-	//! \return the input data alignment that provides optimal performance
-	virtual unsigned int OptimalDataAlignment() const;
-
-	//! returns true if this is a permutation (i.e. there is an inverse transformation)
-	virtual bool IsPermutation() const {return true;}
-
-	//! \brief Determines if the cipher is being operated in its forward direction
-	//! \returns true if DIR is ENCRYPTION, false otherwise
-	//! \sa IsForwardTransformation(), IsPermutation(), GetCipherDirection()
-	virtual bool IsForwardTransformation() const =0;
-
-	//! \brief Determines the number of blocks that can be processed in parallel
-	//! \return the number of blocks that can be processed in parallel, for bit-slicing implementations
-	//! \details Bit-slicing is often used to improve throughput and minimize timing attacks.
-	virtual unsigned int OptimalNumberOfParallelBlocks() const {return 1;}
-
-	//! \brief Bit flags that control AdvancedProcessBlocks() behavior
-	enum FlagsForAdvancedProcessBlocks {
-		//! \brief inBlock is a counter
-		BT_InBlockIsCounter=1,
-		//! \brief should not modify block pointers
-		BT_DontIncrementInOutPointers=2,
-		//! \brief
-		BT_XorInput=4,
-		//! \brief perform the transformation in reverse
-		BT_ReverseDirection=8,
-		//! \brief
-		BT_AllowParallel=16};
-
-	//! \brief Encrypt and xor multiple blocks using additional flags
-	//! \param inBlocks the input message before processing
-	//! \param xorBlocks an optional XOR mask
-	//! \param outBlocks the output message after processing
-	//! \param length the size of the blocks, in bytes
-	//! \param flags additional flags to control processing
-	//! \details Encrypt and xor multiple blocks according to FlagsForAdvancedProcessBlocks flags.
-	//! \note If BT_InBlockIsCounter is set, then the last byte of inBlocks may be modified.
-	virtual size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
-
-	//! \brief Provides the direction of the cipher
-	//! \return ENCRYPTION if IsForwardTransformation() is true, DECRYPTION otherwise
-	//! \sa IsForwardTransformation(), IsPermutation()
-	inline CipherDir GetCipherDirection() const {return IsForwardTransformation() ? ENCRYPTION : DECRYPTION;}
-};
-
-//! \class StreamTransformation
-//! \brief Interface for the data processing portion of stream ciphers
-//! \sa StreamTransformationFilter()
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE StreamTransformation : public Algorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~StreamTransformation() {}
-#endif
-
-	//! \brief Provides a reference to this object
-	//! \return A reference to this object
-	//! \details Useful for passing a temporary object to a function that takes a non-const reference
-	StreamTransformation& Ref() {return *this;}
-
-	//! \brief Provides the mandatory block size of the cipher
-	//! \return The block size of the cipher if input must be processed in blocks, 1 otherwise
-	virtual unsigned int MandatoryBlockSize() const {return 1;}
-
-	//! \brief Provides the input block size most efficient for this cipher.
-	//! \return The input block size that is most efficient for the cipher
-	//! \details The base class implementation returns MandatoryBlockSize().
-	//! \note Optimal input length is
-	//!   <tt>n * OptimalBlockSize() - GetOptimalBlockSizeUsed()</tt> for any <tt>n \> 0</tt>.
-	virtual unsigned int OptimalBlockSize() const {return MandatoryBlockSize();}
-
-	//! \brief Provides the number of bytes used in the current block when processing at optimal block size.
-	//! \return the number of bytes used in the current block when processing at the optimal block size
-	virtual unsigned int GetOptimalBlockSizeUsed() const {return 0;}
-
-	//! \brief Provides input and output data alignment for optimal performance.
-	//! \return the input data alignment that provides optimal performance
-	virtual unsigned int OptimalDataAlignment() const;
-
-	//! \brief Encrypt or decrypt an array of bytes
-	//! \param outString the output byte buffer
-	//! \param inString the input byte buffer
-	//! \param length the size of the input and output byte buffers, in bytes
-	//! \details Either <tt>inString == outString</tt>, or they must not overlap.
-	virtual void ProcessData(byte *outString, const byte *inString, size_t length) =0;
-
-	//! \brief Encrypt or decrypt the last block of data
-	//! \param outString the output byte buffer
-	//! \param inString the input byte buffer
-	//! \param length the size of the input and output byte buffers, in bytes
-	//!  ProcessLastBlock is used when the last block of data is special.
-	//!   Currently the only use of this function is CBC-CTS mode.
-	virtual void ProcessLastBlock(byte *outString, const byte *inString, size_t length);
-
-	//! \brief Provides the size of the last block
-	//! \returns the minimum size of the last block
-	//! \details MinLastBlockSize() returns the minimum size of the last block. 0 indicates the last
-	//!   block is not special.
-	virtual unsigned int MinLastBlockSize() const {return 0;}
-
-	//! \brief Encrypt or decrypt a string of bytes
-	//! \param inoutString the string to process
-	//! \param length the size of the  inoutString, in bytes
-	//! \details Internally, the base class implementation calls ProcessData().
-	inline void ProcessString(byte *inoutString, size_t length)
-		{ProcessData(inoutString, inoutString, length);}
-
-	//! \brief Encrypt or decrypt a string of bytes
-	//! \param outString the output string to process
-	//! \param inString the input string to process
-	//! \param length the size of the input and output strings, in bytes
-	//! \details Internally, the base class implementation calls ProcessData().
-	inline void ProcessString(byte *outString, const byte *inString, size_t length)
-		{ProcessData(outString, inString, length);}
-
-	//! \brief Encrypt or decrypt a byte
-	//! \param input the input byte to process
-	//! \details Internally, the base class implementation calls ProcessData() with a size of 1.
-	inline byte ProcessByte(byte input)
-		{ProcessData(&input, &input, 1); return input;}
-
-	//! \brief Determines whether the cipher supports random access
-	//! \returns true if the cipher supports random access, false otherwise
-	virtual bool IsRandomAccess() const =0;
-
-	//! \brief Seek to an absolute position
-	//! \param pos position to seek
-	//! \throws NotImplemented
-	//! \details The base class implementation throws NotImplemented. The function
-	//!   \ref CRYPTOPP_ASSERT "asserts" IsRandomAccess() in debug builds.
-	virtual void Seek(lword pos)
-	{
-		CRYPTOPP_UNUSED(pos);
-		CRYPTOPP_ASSERT(!IsRandomAccess());
-		throw NotImplemented("StreamTransformation: this object doesn't support random access");
-	}
-
-	//! \brief Determines whether the cipher is self-inverting
-	//! \returns true if the cipher is self-inverting, false otherwise
-	//! \details IsSelfInverting determines whether this transformation is
-	//!   self-inverting (e.g. xor with a keystream).
-	virtual bool IsSelfInverting() const =0;
-
-	//! \brief Determines if the cipher is being operated in its forward direction
-	//! \returns true if DIR is ENCRYPTION, false otherwise
-	//! \sa IsForwardTransformation(), IsPermutation(), GetCipherDirection()
-	virtual bool IsForwardTransformation() const =0;
-};
-
-//! \class HashTransformation
-//! \brief Interface for hash functions and data processing part of MACs
-//! \details HashTransformation objects are stateful. They are created in an initial state,
-//!   change state as Update() is called, and return to the initial
-//!   state when Final() is called. This interface allows a large message to
-//!   be hashed in pieces by calling Update() on each piece followed by
-//!   calling Final().
-//! \sa HashFilter(), HashVerificationFilter()
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE HashTransformation : public Algorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~HashTransformation() {}
-#endif
-
-	//! \brief Provides a reference to this object
-	//! \return A reference to this object
-	//! \details Useful for passing a temporary object to a function that takes a non-const reference
-	HashTransformation& Ref() {return *this;}
-
-	//! \brief Updates a hash with additional input
-	//! \param input the additional input as a buffer
-	//! \param length the size of the buffer, in bytes
-	virtual void Update(const byte *input, size_t length) =0;
-
-	//! \brief Request space which can be written into by the caller
-	//! \param size the requested size of the buffer
-	//! \details The purpose of this method is to help avoid extra memory allocations.
-	//! \details size is an \a IN and \a OUT parameter and used as a hint. When the call is made,
-	//!   size is the requested size of the buffer. When the call returns, size is the size of
-	//!   the array returned to the caller.
-	//! \details The base class implementation sets  size to 0 and returns  NULL.
-	//! \note Some objects, like ArraySink, cannot create a space because its fixed.
-	virtual byte * CreateUpdateSpace(size_t &size) {size=0; return NULL;}
-
-	//! \brief Computes the hash of the current message
-	//! \param digest a pointer to the buffer to receive the hash
-	//! \details Final() restarts the hash for a new message.
-	//! \pre <tt>COUNTOF(digest) == DigestSize()</tt> or <tt>COUNTOF(digest) == HASH::DIGESTSIZE</tt> ensures
-	//!   the output byte buffer is large enough for the digest.
-	virtual void Final(byte *digest)
-		{TruncatedFinal(digest, DigestSize());}
-
-	//! \brief Restart the hash
-	//! \details Discards the current state, and restart for a new message
-	virtual void Restart()
-		{TruncatedFinal(NULL, 0);}
-
-	//! Provides the digest size of the hash
-	//! \return the digest size of the hash.
-	virtual unsigned int DigestSize() const =0;
-
-	//! Provides the tag size of the hash
-	//! \return the tag size of the hash.
-	//! \details Same as DigestSize().
-	unsigned int TagSize() const {return DigestSize();}
-
-	//! \brief Provides the block size of the compression function
-	//! \return the block size of the compression function, in bytes
-	//! \details BlockSize() will return 0 if the hash is not block based. For example,
-	//!   SHA3 is a recursive hash (not an iterative hash), and it does not have a block size.
-	virtual unsigned int BlockSize() const {return 0;}
-
-	//! \brief Provides the input block size most efficient for this hash.
-	//! \return The input block size that is most efficient for the cipher
-	//! \details The base class implementation returns MandatoryBlockSize().
-	//! \details Optimal input length is
-	//!   <tt>n * OptimalBlockSize() - GetOptimalBlockSizeUsed()</tt> for any <tt>n \> 0</tt>.
-	virtual unsigned int OptimalBlockSize() const {return 1;}
-
-	//! \brief Provides input and output data alignment for optimal performance
-	//! \return the input data alignment that provides optimal performance
-	virtual unsigned int OptimalDataAlignment() const;
-
-	//! \brief Updates the hash with additional input and computes the hash of the current message
-	//! \param digest a pointer to the buffer to receive the hash
-	//! \param input the additional input as a buffer
-	//! \param length the size of the buffer, in bytes
-	//! \details Use this if your input is in one piece and you don't want to call Update()
-	//!   and Final() separately
-	//! \details CalculateDigest() restarts the hash for the next message.
-	//! \pre <tt>COUNTOF(digest) == DigestSize()</tt> or <tt>COUNTOF(digest) == HASH::DIGESTSIZE</tt> ensures
-	//!   the output byte buffer is large enough for the digest.
-	virtual void CalculateDigest(byte *digest, const byte *input, size_t length)
-		{Update(input, length); Final(digest);}
-
-	//! \brief Verifies the hash of the current message
-	//! \param digest a pointer to the buffer of an \a existing hash
-	//! \return \p true if the existing hash matches the computed hash, \p false otherwise
-	//! \throws ThrowIfInvalidTruncatedSize() if the existing hash's size exceeds DigestSize()
-	//! \details Verify() performs a bitwise compare on the buffers using VerifyBufsEqual(), which is
-	//!   a constant time comparison function. digestLength cannot exceed DigestSize().
-	//! \details Verify() restarts the hash for the next message.
-	//! \pre <tt>COUNTOF(digest) == DigestSize()</tt> or <tt>COUNTOF(digest) == HASH::DIGESTSIZE</tt> ensures
-	//!   the output byte buffer is large enough for the digest.
-	virtual bool Verify(const byte *digest)
-		{return TruncatedVerify(digest, DigestSize());}
-
-	//! \brief Updates the hash with additional input and verifies the hash of the current message
-	//! \param digest a pointer to the buffer of an \a existing hash
-	//! \param input the additional input as a buffer
-	//! \param length the size of the buffer, in bytes
-	//! \return \p true if the existing hash matches the computed hash, \p false otherwise
-	//! \throws ThrowIfInvalidTruncatedSize() if the existing hash's size exceeds DigestSize()
-	//! \details Use this if your input is in one piece and you don't want to call Update()
-	//!   and Verify() separately
-	//! \details VerifyDigest() performs a bitwise compare on the buffers using VerifyBufsEqual(),
-	//!   which is a constant time comparison function. digestLength cannot exceed DigestSize().
-	//! \details VerifyDigest() restarts the hash for the next message.
-	//! \pre <tt>COUNTOF(digest) == DigestSize()</tt> or <tt>COUNTOF(digest) == HASH::DIGESTSIZE</tt> ensures
-	//!   the output byte buffer is large enough for the digest.
-	virtual bool VerifyDigest(const byte *digest, const byte *input, size_t length)
-		{Update(input, length); return Verify(digest);}
-
-	//! \brief Computes the hash of the current message
-	//! \param digest a pointer to the buffer to receive the hash
-	//! \param digestSize the size of the truncated digest, in bytes
-	//! \details TruncatedFinal() call Final() and then copies digestSize bytes to digest.
-	//!   The hash is restarted the hash for the next message.
-	virtual void TruncatedFinal(byte *digest, size_t digestSize) =0;
-
-	//! \brief Updates the hash with additional input and computes the hash of the current message
-	//! \param digest a pointer to the buffer to receive the hash
-	//! \param digestSize the length of the truncated hash, in bytes
-	//! \param input the additional input as a buffer
-	//! \param length the size of the buffer, in bytes
-	//! \details Use this if your input is in one piece and you don't want to call Update()
-	//!   and CalculateDigest() separately.
-	//! \details CalculateTruncatedDigest() restarts the hash for the next message.
-	//! \pre <tt>COUNTOF(digest) == DigestSize()</tt> or <tt>COUNTOF(digest) == HASH::DIGESTSIZE</tt> ensures
-	//!   the output byte buffer is large enough for the digest.
-	virtual void CalculateTruncatedDigest(byte *digest, size_t digestSize, const byte *input, size_t length)
-		{Update(input, length); TruncatedFinal(digest, digestSize);}
-
-	//! \brief Verifies the hash of the current message
-	//! \param digest a pointer to the buffer of an \a existing hash
-	//! \param digestLength the size of the truncated hash, in bytes
-	//! \return \p true if the existing hash matches the computed hash, \p false otherwise
-	//! \throws ThrowIfInvalidTruncatedSize() if digestLength exceeds DigestSize()
-	//! \details TruncatedVerify() is a truncated version of Verify(). It can operate on a
-	//!   buffer smaller than DigestSize(). However, digestLength cannot exceed DigestSize().
-	//! \details Verify() performs a bitwise compare on the buffers using VerifyBufsEqual(), which is
-	//!   a constant time comparison function. digestLength cannot exceed DigestSize().
-	//! \details TruncatedVerify() restarts the hash for the next message.
-	virtual bool TruncatedVerify(const byte *digest, size_t digestLength);
-
-	//! \brief Updates the hash with additional input and verifies the hash of the current message
-	//! \param digest a pointer to the buffer of an \a existing hash
-	//! \param digestLength the size of the truncated hash, in bytes
-	//! \param input the additional input as a buffer
-	//! \param length the size of the buffer, in bytes
-	//! \return \p true if the existing hash matches the computed hash, \p false otherwise
-	//! \throws ThrowIfInvalidTruncatedSize() if digestLength exceeds DigestSize()
-	//! \details Use this if your input is in one piece and you don't want to call Update()
-	//!   and TruncatedVerify() separately.
-	//! \details VerifyTruncatedDigest() is a truncated version of VerifyDigest(). It can operate
-	//!   on a buffer smaller than DigestSize(). However, digestLength cannot exceed DigestSize().
-	//! \details VerifyTruncatedDigest() restarts the hash for the next message.
-	//! \pre <tt>COUNTOF(digest) == DigestSize()</tt> or <tt>COUNTOF(digest) == HASH::DIGESTSIZE</tt> ensures
-	//!   the output byte buffer is large enough for the digest.
-	virtual bool VerifyTruncatedDigest(const byte *digest, size_t digestLength, const byte *input, size_t length)
-		{Update(input, length); return TruncatedVerify(digest, digestLength);}
-
-protected:
-	//! \brief Validates a truncated digest size
-	//! \param size the requested digest size
-	//! \throws InvalidArgument if the algorithm's digest size cannot be truncated to the requested size
-	//! \details Throws an exception when the truncated digest size is greater than DigestSize()
-	void ThrowIfInvalidTruncatedSize(size_t size) const;
-};
-
-typedef HashTransformation HashFunction;
-
-//! \brief Interface for one direction (encryption or decryption) of a block cipher
-//! \details These objects usually should not be used directly. See BlockTransformation for more details.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BlockCipher : public SimpleKeyingInterface, public BlockTransformation
-{
-protected:
-	const Algorithm & GetAlgorithm() const {return *this;}
-};
-
-//! \brief Interface for one direction (encryption or decryption) of a stream cipher or cipher mode
-//! \details These objects usually should not be used directly. See StreamTransformation for more details.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SymmetricCipher : public SimpleKeyingInterface, public StreamTransformation
-{
-protected:
-	const Algorithm & GetAlgorithm() const {return *this;}
-};
-
-//! \brief Interface for message authentication codes
-//! \details These objects usually should not be used directly. See HashTransformation for more details.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE MessageAuthenticationCode : public SimpleKeyingInterface, public HashTransformation
-{
-protected:
-	const Algorithm & GetAlgorithm() const {return *this;}
-};
-
-//! \brief Interface for one direction (encryption or decryption) of a stream cipher or block cipher mode with authentication
-//! \details The StreamTransformation part of this interface is used to encrypt/decrypt the data, and the
-//!   MessageAuthenticationCode part of this interface is used to input additional authenticated data (AAD,
-//!   which is MAC'ed but not encrypted), and to generate/verify the MAC.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AuthenticatedSymmetricCipher : public MessageAuthenticationCode, public StreamTransformation
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~AuthenticatedSymmetricCipher() {}
-#endif
-
-	//! \brief Exception thrown when the object is in the wrong state for the operation
-	//! \details this indicates that a member function was called in the wrong state, for example trying to encrypt
-	//!   a message before having set the key or IV
-	class BadState : public Exception
-	{
-	public:
-		explicit BadState(const std::string &name, const char *message) : Exception(OTHER_ERROR, name + ": " + message) {}
-		explicit BadState(const std::string &name, const char *function, const char *state) : Exception(OTHER_ERROR, name + ": " + function + " was called before " + state) {}
-	};
-
-	//! \brief Provides the maximum length of AAD that can be input
-	//! \return the maximum length of AAD that can be input before the encrypted data
-	virtual lword MaxHeaderLength() const =0;
-	//! \brief Provides the maximum length of encrypted data
-	//! \return the maximum length of encrypted data
-	virtual lword MaxMessageLength() const =0;
-	//! \brief Provides the the maximum length of AAD
-	//! \return the maximum length of AAD that can be input after the encrypted data
-	virtual lword MaxFooterLength() const {return 0;}
-	//! \brief Determines if data lengths must be specified prior to inputting data
-	//! \return true if the data lengths are required before inputting data, false otherwise
-	//! \details if this function returns true, SpecifyDataLengths() must be called before attempting to input data.
-	//!   This is the case for some schemes, such as CCM.
-	//! \sa SpecifyDataLengths()
-	virtual bool NeedsPrespecifiedDataLengths() const {return false;}
-	//! \brief Prespecifies the data lengths
-	//! \details this function only needs to be called if NeedsPrespecifiedDataLengths() returns true
-	//! \sa NeedsPrespecifiedDataLengths()
-	void SpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength=0);
-	//! \brief Encrypts and calculates a MAC in one call
-	//! \return true if the authenticated encryption succeeded, false otherwise
-	//! \details EncryptAndAuthenticate() encrypts and generates the MAC in one call. The function will truncate MAC if
-	//!   <tt>macSize < TagSize()</tt>.
-	virtual void EncryptAndAuthenticate(byte *ciphertext, byte *mac, size_t macSize, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *message, size_t messageLength);
-	//! \brief Decrypts and verifies a MAC in one call
-	//! \return true if the MAC is valid and the decoding succeeded, false otherwise
-	//! \details DecryptAndVerify() decrypts and verifies the MAC in one call. The function returns true iff MAC is valid.
-	//!   DecryptAndVerify() will assume MAC is truncated if <tt>macLength < TagSize()</tt>.
-	virtual bool DecryptAndVerify(byte *message, const byte *mac, size_t macLength, const byte *iv, int ivLength, const byte *header, size_t headerLength, const byte *ciphertext, size_t ciphertextLength);
-
-	//! \brief Provides the name of this algorithm
-	//! \return the standard algorithm name
-	//! \details The standard algorithm name can be a name like \a AES or \a AES/GCM. Some algorithms
-	//!   do not have standard names yet. For example, there is no standard algorithm name for
-	//!   Shoup's  ECIES.
-	virtual std::string AlgorithmName() const =0;
-
-protected:
-	const Algorithm & GetAlgorithm() const
-		{return *static_cast<const MessageAuthenticationCode *>(this);}
-	virtual void UncheckedSpecifyDataLengths(lword headerLength, lword messageLength, lword footerLength)
-		{CRYPTOPP_UNUSED(headerLength); CRYPTOPP_UNUSED(messageLength); CRYPTOPP_UNUSED(footerLength);}
-};
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-typedef SymmetricCipher StreamCipher;
-#endif
-
-//! \class RandomNumberGenerator
-//! \brief Interface for random number generators
-//! \details The library provides a number of random number generators, from software based to hardware based generators.
-//! \details All generated values are uniformly distributed over the range specified.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE RandomNumberGenerator : public Algorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~RandomNumberGenerator() {}
-#endif
-
-	//! \brief Update RNG state with additional unpredictable values
-	//! \param input the entropy to add to the generator
-	//! \param length the size of the input buffer
-	//! \throws NotImplemented
-	//! \details A generator may or may not accept additional entropy. Call CanIncorporateEntropy() to test for the
-	//!   ability to use additional entropy.
-	//! \details If a derived class does not override IncorporateEntropy(), then the base class throws
-	//!   NotImplemented.
-	virtual void IncorporateEntropy(const byte *input, size_t length)
-	{
-		CRYPTOPP_UNUSED(input); CRYPTOPP_UNUSED(length);
-		throw NotImplemented("RandomNumberGenerator: IncorporateEntropy not implemented");
-	}
-
-	//! \brief Determines if a generator can accept additional entropy
-	//! \return true if IncorporateEntropy() is implemented
-	virtual bool CanIncorporateEntropy() const {return false;}
-
-	//! \brief Generate new random byte and return it
-	//! \return a random 8-bit byte
-	//! \details Default implementation calls GenerateBlock() with one byte.
-	//! \details All generated values are uniformly distributed over the range specified within the
-	//!   the contraints of a particular generator.
-	virtual byte GenerateByte();
-
-	//! \brief Generate new random bit and return it
-	//! \return a random bit
-	//! \details The default implementation calls GenerateByte() and return its lowest bit.
-	//! \details All generated values are uniformly distributed over the range specified within the
-	//!   the contraints of a particular generator.
-	virtual unsigned int GenerateBit();
-
-	//! \brief Generate a random 32 bit word in the range min to max, inclusive
-	//! \param min the lower bound of the range
-	//! \param max the upper bound of the range
-	//! \return a random 32-bit word
-	//! \details The default implementation calls Crop() on the difference between max and
-	//!    min, and then returns the result added to min.
-	//! \details All generated values are uniformly distributed over the range specified within the
-	//!   the contraints of a particular generator.
-	virtual word32 GenerateWord32(word32 min=0, word32 max=0xffffffffUL);
-
-	//! \brief Generate random array of bytes
-	//! \param output the byte buffer
-	//! \param size the length of the buffer, in bytes
-	//! \details All generated values are uniformly distributed over the range specified within the
-	//!   the contraints of a particular generator.
-	//! \note A derived generator \a must override either GenerateBlock() or
-	//!    GenerateIntoBufferedTransformation(). They can override both, or have one call the other.
-	virtual void GenerateBlock(byte *output, size_t size);
-
-	//! \brief Generate random bytes into a BufferedTransformation
-	//! \param target the BufferedTransformation object which receives the bytes
-	//! \param channel the channel on which the bytes should be pumped
-	//! \param length the number of bytes to generate
-	//! \details The default implementation calls GenerateBlock() and pumps the result into
-	//!   the  DEFAULT_CHANNEL of the target.
-	//! \details All generated values are uniformly distributed over the range specified within the
-	//!   the contraints of a particular generator.
-	//! \note A derived generator \a must override either GenerateBlock() or
-	//!    GenerateIntoBufferedTransformation(). They can override both, or have one call the other.
-	virtual void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword length);
-
-	//! \brief Generate and discard n bytes
-	//! \param n the number of bytes to generate and discard
-	virtual void DiscardBytes(size_t n);
-
-	//! \brief Randomly shuffle the specified array
-	//! \param begin an iterator to the first element in the array
-	//! \param end an iterator beyond the last element in the array
-	//! \details The resulting permutation is uniformly distributed.
-	template <class IT> void Shuffle(IT begin, IT end)
-	{
-		// TODO: What happens if there are more than 2^32 elements?
-		for (; begin != end; ++begin)
-			std::iter_swap(begin, begin + GenerateWord32(0, end-begin-1));
-	}
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-	byte GetByte() {return GenerateByte();}
-	unsigned int GetBit() {return GenerateBit();}
-	word32 GetLong(word32 a=0, word32 b=0xffffffffL) {return GenerateWord32(a, b);}
-	word16 GetShort(word16 a=0, word16 b=0xffff) {return (word16)GenerateWord32(a, b);}
-	void GetBlock(byte *output, size_t size) {GenerateBlock(output, size);}
-#endif
-
-};
-
-//! \brief Random Number Generator that does not produce random numbers
-//! \return reference that can be passed to functions that require a RandomNumberGenerator
-//! \details NullRNG() returns a reference that can be passed to functions that require a
-//!   RandomNumberGenerator but don't actually use it. The NullRNG() throws NotImplemented
-//!   when a generation function is called.
-//! \sa ClassNullRNG, PK_SignatureScheme::IsProbabilistic()
-CRYPTOPP_DLL RandomNumberGenerator & CRYPTOPP_API NullRNG();
-
-//! \class WaitObjectContainer
-class WaitObjectContainer;
-//! \class CallStack
-class CallStack;
-
-//! \brief Interface for objects that can be waited on.
-class CRYPTOPP_NO_VTABLE Waitable
-{
-public:
-	virtual ~Waitable() {}
-
-	//! \brief Maximum number of wait objects that this object can return
-	//! \return the maximum number of wait objects
-	virtual unsigned int GetMaxWaitObjectCount() const =0;
-
-	//! \brief Retrieves waitable objects
-	//! \param container the wait container to receive the references to the objects.
-	//! \param callStack  CallStack object used to select waitable objects
-	//! \details GetWaitObjects is usually called in one of two ways. First, it can
-	//!   be called like <tt>something.GetWaitObjects(c, CallStack("my func after X", 0));</tt>.
-	//!   Second, if in an outer  GetWaitObjects() method that itself takes a callStack
-	//!   parameter, it can be called like
-	//!   <tt>innerThing.GetWaitObjects(c, CallStack("MyClass::GetWaitObjects at X", &callStack));</tt>.
-	virtual void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack) =0;
-
-	//! \brief Wait on this object
-	//! \return true if the wait succeeded, false otherwise
-	//! \details Wait() is the same as creating an empty container, calling GetWaitObjects(), and then calling
-	//!   Wait() on the container.
-	bool Wait(unsigned long milliseconds, CallStack const& callStack);
-};
-
-//! \brief Default channel for BufferedTransformation
-//! \details DEFAULT_CHANNEL is equal to an empty  string
-extern CRYPTOPP_DLL const std::string DEFAULT_CHANNEL;
-
-//! \brief Channel for additional authenticated data
-//! \details AAD_CHANNEL is equal to "AAD"
-extern CRYPTOPP_DLL const std::string AAD_CHANNEL;
-
-//! \brief Interface for buffered transformations
-//! \details BufferedTransformation is a generalization of BlockTransformation,
-//!   StreamTransformation and HashTransformation.
-//! \details A buffered transformation is an object that takes a stream of bytes as input (this may
-//!   be done in stages), does some computation on them, and then places the result into an internal
-//!   buffer for later retrieval. Any partial result already in the output buffer is not modified
-//!   by further input.
-//! \details If a method takes a "blocking" parameter, and you pass  false for it, then the method
-//!   will return before all input has been processed if the input cannot be processed without waiting
-//!   (for network buffers to become available, for example). In this case the method will return true
-//!   or a non-zero integer value. When this happens you must continue to call the method with the same
-//!   parameters until it returns false or zero, before calling any other method on it or attached
-//!   /p BufferedTransformation. The integer return value in this case is approximately
-//!   the number of bytes left to be processed, and can be used to implement a progress bar.
-//! \details For functions that take a "propagation" parameter, <tt>propagation != 0</tt> means pass on
-//!   the signal to attached BufferedTransformation objects, with propagation decremented at each
-//!   step until it reaches <tt>0</tt>. <tt>-1</tt> means unlimited propagation.
-//! \details \a All of the retrieval functions, like Get() and GetWord32(), return the actual
-//!   number of bytes retrieved, which is the lesser of the request number and  MaxRetrievable().
-//! \details \a Most of the input functions, like Put() and PutWord32(), return the number of
-//!   bytes remaining to be processed. A 0 value means all bytes were processed, and a non-0 value
-//!   means bytes remain to be processed.
-//! \nosubgrouping
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BufferedTransformation : public Algorithm, public Waitable
-{
-public:
-	// placed up here for CW8
-	static const std::string &NULL_CHANNEL;	// same as DEFAULT_CHANNEL, for backwards compatibility
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~BufferedTransformation() {}
-#endif
-
-	//! \brief Construct a BufferedTransformation
-	BufferedTransformation() : Algorithm(false) {}
-
-	//! \brief Provides a reference to this object
-	//! \return A reference to this object
-	//! \details Useful for passing a temporary object to a function that takes a non-const reference
-	BufferedTransformation& Ref() {return *this;}
-
-	//!	\name INPUT
-	//@{
-
-		//! \brief Input a byte for processing
-		//! \param inByte the 8-bit byte (octet) to be processed.
-		//! \param blocking specifies whether the object should block when processing input.
-		//! \return the number of bytes that remain in the block (i.e., bytes not processed)
-		//! \details <tt>Put(byte)</tt> calls <tt>Put(byte*, size_t)</tt>.
-		size_t Put(byte inByte, bool blocking=true)
-			{return Put(&inByte, 1, blocking);}
-
-		//! \brief Input a byte buffer for processing
-		//! \param inString the byte buffer to process
-		//! \param length the size of the string, in bytes
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the block (i.e., bytes not processed)
-		//! \details Internally, Put() calls Put2().
-		size_t Put(const byte *inString, size_t length, bool blocking=true)
-			{return Put2(inString, length, 0, blocking);}
-
-		//! Input a 16-bit word for processing.
-		//! \param value the 16-bit value to be processed
-		//! \param order the  ByteOrder in which the word should be processed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the block (i.e., bytes not processed)
-		size_t PutWord16(word16 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true);
-
-		//! Input a 32-bit word for processing.
-		//! \param value the 32-bit value to be processed.
-		//! \param order the  ByteOrder in which the word should be processed.
-		//! \param blocking specifies whether the object should block when processing input.
-		//! \return the number of bytes that remain in the block (i.e., bytes not processed)
-		size_t PutWord32(word32 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true);
-
-		//! \brief Request space which can be written into by the caller
-		//! \param size the requested size of the buffer
-		//! \details The purpose of this method is to help avoid extra memory allocations.
-		//! \details size is an \a IN and \a OUT parameter and used as a hint. When the call is made,
-		//!    size is the requested size of the buffer. When the call returns,  size is the size of
-		//!   the array returned to the caller.
-		//! \details The base class implementation sets  size to 0 and returns  NULL.
-		//! \note Some objects, like ArraySink, cannot create a space because its fixed. In the case of
-		//! an ArraySink, the pointer to the array is returned and the  size is remaining size.
-		virtual byte * CreatePutSpace(size_t &size)
-			{size=0; return NULL;}
-
-		//! \brief Determines whether input can be modifed by the callee
-		//! \return true if input can be modified, false otherwise
-		//! \details The base class implementation returns  false.
-		virtual bool CanModifyInput() const
-			{return false;}
-
-		//! \brief Input multiple bytes that may be modified by callee.
-		//! \param inString the byte buffer to process
-		//! \param length the size of the string, in bytes
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return 0 indicates all bytes were processed during the call. Non-0 indicates the
-		//!   number of bytes that were \a not processed
-		size_t PutModifiable(byte *inString, size_t length, bool blocking=true)
-			{return PutModifiable2(inString, length, 0, blocking);}
-
-		//! \brief Signals the end of messages to the object
-		//! \param propagation the number of attached transformations the  MessageEnd() signal should be passed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		bool MessageEnd(int propagation=-1, bool blocking=true)
-			{return !!Put2(NULL, 0, propagation < 0 ? -1 : propagation+1, blocking);}
-
-		//! \brief Input multiple bytes for processing and signal the end of a message
-		//! \param inString the byte buffer to process
-		//! \param length the size of the string, in bytes
-		//! \param propagation the number of attached transformations the  MessageEnd() signal should be passed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the block (i.e., bytes not processed)
-		//! \details Internally, PutMessageEnd() calls Put2() with a modified  propagation to
-		//!    ensure all attached transformations finish processing the message.
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		size_t PutMessageEnd(const byte *inString, size_t length, int propagation=-1, bool blocking=true)
-			{return Put2(inString, length, propagation < 0 ? -1 : propagation+1, blocking);}
-
-		//! \brief Input multiple bytes for processing
-		//! \param inString the byte buffer to process
-		//! \param length the size of the string, in bytes
-		//! \param messageEnd means how many filters to signal MessageEnd() to, including this one
-		//! \param blocking specifies whether the object should block when processing input
-		//! \details Derived classes must implement Put2().
-		virtual size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking) =0;
-
-		//! \brief Input multiple bytes that may be modified by callee.
-		//! \param inString the byte buffer to process.
-		//! \param length the size of the string, in bytes.
-		//! \param messageEnd means how many filters to signal MessageEnd() to, including this one.
-		//! \param blocking specifies whether the object should block when processing input.
-		//! \details Internally, PutModifiable2() calls Put2().
-		virtual size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking)
-			{return Put2(inString, length, messageEnd, blocking);}
-
-		//! \class BlockingInputOnly
-		//! \brief Exception thrown by objects that have \a not implemented nonblocking input processing
-		//! \details BlockingInputOnly inherits from NotImplemented
-		struct BlockingInputOnly : public NotImplemented
-			{BlockingInputOnly(const std::string &s) : NotImplemented(s + ": Nonblocking input is not implemented by this object.") {}};
-	//@}
-
-	//!	\name WAITING
-	//@{
-		//! \brief Retrieves the maximum number of waitable objects
-		unsigned int GetMaxWaitObjectCount() const;
-
-		//! \brief Retrieves waitable objects
-		//! \param container the wait container to receive the references to the objects
-		//! \param callStack  CallStack object used to select waitable objects
-		//! \details GetWaitObjects is usually called in one of two ways. First, it can
-		//!    be called like <tt>something.GetWaitObjects(c, CallStack("my func after X", 0));</tt>.
-		//!    Second, if in an outer  GetWaitObjects() method that itself takes a callStack
-		//!    parameter, it can be called like
-		//!    <tt>innerThing.GetWaitObjects(c, CallStack("MyClass::GetWaitObjects at X", &callStack));</tt>.
-		void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack);
-	//@} // WAITING
-
-	//!	\name SIGNALS
-	//@{
-
-		//! \brief Initialize or reinitialize this object, without signal propagation
-		//! \param parameters a set of NameValuePairs to initialize this object
-		//! \throws NotImplemented
-		//! \details IsolatedInitialize() is used to initialize or reinitialize an object using a variable
-		//!   number of  arbitrarily typed arguments. The function avoids the need for multiple constuctors providing
-		//!   all possible combintations of configurable parameters.
-		//! \details IsolatedInitialize() does not call Initialize() on attached transformations. If initialization
-		//!   should be propagated, then use the Initialize() function.
-		//! \details If a derived class does not override IsolatedInitialize(), then the base class throws
-		//!   NotImplemented.
-		virtual void IsolatedInitialize(const NameValuePairs &parameters) {
-			CRYPTOPP_UNUSED(parameters);
-			throw NotImplemented("BufferedTransformation: this object can't be reinitialized");
-		}
-
-		//! \brief Flushes data buffered by this object, without signal propagation
-		//! \param hardFlush indicates whether all data should be flushed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \note  hardFlush must be used with care
-		virtual bool IsolatedFlush(bool hardFlush, bool blocking) =0;
-
-		//! \brief Marks the end of a series of messages, without signal propagation
-		//! \param blocking specifies whether the object should block when completing the processing on
-		//!    the current series of messages
-		virtual bool IsolatedMessageSeriesEnd(bool blocking)
-			{CRYPTOPP_UNUSED(blocking); return false;}
-
-		//! \brief Initialize or reinitialize this object, with signal propagation
-		//! \param parameters a set of NameValuePairs to initialize or reinitialize this object
-		//! \param propagation the number of attached transformations the Initialize() signal should be passed
-		//! \details Initialize() is used to initialize or reinitialize an object using a variable number of
-		//!   arbitrarily typed arguments. The function avoids the need for multiple constuctors providing
-		//!   all possible combintations of configurable parameters.
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		virtual void Initialize(const NameValuePairs &parameters=g_nullNameValuePairs, int propagation=-1);
-
-		//! \brief Flush buffered input and/or output, with signal propagation
-		//! \param hardFlush is used to indicate whether all data should be flushed
-		//! \param propagation the number of attached transformations the  Flush() signal should be passed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		//! \note Hard flushes must be used with care. It means try to process and output everything, even if
-		//!   there may not be enough data to complete the action. For example, hard flushing a HexDecoder
-		//!   would cause an error if you do it after inputing an odd number of hex encoded characters.
-		//! \note For some types of filters, like  ZlibDecompressor, hard flushes can only
-		//!   be done at "synchronization points". These synchronization points are positions in the data
-		//!   stream that are created by hard flushes on the corresponding reverse filters, in this
-		//!   example ZlibCompressor. This is useful when zlib compressed data is moved across a
-		//!   network in packets and compression state is preserved across packets, as in the SSH2 protocol.
-		virtual bool Flush(bool hardFlush, int propagation=-1, bool blocking=true);
-
-		//! \brief Marks the end of a series of messages, with signal propagation
-		//! \param propagation the number of attached transformations the  MessageSeriesEnd() signal should be passed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \details Each object that receives the signal will perform its processing, decrement
-		//!    propagation, and then pass the signal on to attached transformations if the value is not 0.
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		//! \note There should be a MessageEnd() immediately before MessageSeriesEnd().
-		virtual bool MessageSeriesEnd(int propagation=-1, bool blocking=true);
-
-		//! \brief Set propagation of automatically generated and transferred signals
-		//! \param propagation then new value
-		//! \details Setting propagation to <tt>0</tt> means do not automaticly generate signals. Setting
-		//!    propagation to <tt>-1</tt> means unlimited propagation.
-		virtual void SetAutoSignalPropagation(int propagation)
-			{CRYPTOPP_UNUSED(propagation);}
-
-		//! \brief Retrieve automatic signal propagation value
-		//! \return the number of attached transformations the signal is propogated to. 0 indicates
-		//!   the signal is only witnessed by this object
-		virtual int GetAutoSignalPropagation() const {return 0;}
-public:
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-		void Close() {MessageEnd();}
-#endif
-	//@}
-
-	//!	\name RETRIEVAL OF ONE MESSAGE
-	//@{
-
-		//! \brief Provides the number of bytes ready for retrieval
-		//! \return the number of bytes ready for retrieval
-		//! \details All retrieval functions return the actual number of bytes retrieved, which is
-		//!   the lesser of the request number and  MaxRetrievable()
-		virtual lword MaxRetrievable() const;
-
-		//! \brief Determines whether bytes are ready for retrieval
-		//! \returns true if bytes are available for retrieval, false otherwise
-		virtual bool AnyRetrievable() const;
-
-		//! \brief Retrieve a 8-bit byte
-		//! \param outByte the 8-bit value to be retrieved
-		//! \return the number of bytes consumed during the call.
-		//! \details Use the return value of  Get to detect short reads.
-		virtual size_t Get(byte &outByte);
-
-		//! \brief Retrieve a block of bytes
-		//! \param outString a block of bytes
-		//! \param getMax the number of bytes to  Get
-		//! \return the number of bytes consumed during the call.
-		//! \details Use the return value of  Get to detect short reads.
-		virtual size_t Get(byte *outString, size_t getMax);
-
-		//! \brief Peek a 8-bit byte
-		//! \param outByte the 8-bit value to be retrieved
-		//! \return the number of bytes read during the call.
-		//! \details Peek does not remove bytes from the object. Use the return value of
-		//!     Get to detect short reads.
-		virtual size_t Peek(byte &outByte) const;
-
-		//! \brief Peek a block of bytes
-		//! \param outString a block of bytes
-		//! \param peekMax the number of bytes to  Peek
-		//! \return the number of bytes read during the call.
-		//! \details Peek does not remove bytes from the object. Use the return value of
-		//!     Get to detect short reads.
-		virtual size_t Peek(byte *outString, size_t peekMax) const;
-
-		//! \brief Retrieve a 16-bit word
-		//! \param value the 16-bit value to be retrieved
-		//! \param order the  ByteOrder in which the word should be retrieved
-		//! \return the number of bytes consumed during the call.
-		//! \details Use the return value of  GetWord16 to detect short reads.
-		size_t GetWord16(word16 &value, ByteOrder order=BIG_ENDIAN_ORDER);
-
-		//! \brief Retrieve a 32-bit word
-		//! \param value the 32-bit value to be retrieved
-		//! \param order the  ByteOrder in which the word should be retrieved
-		//! \return the number of bytes consumed during the call.
-		//! \details Use the return value of  GetWord16 to detect short reads.
-		size_t GetWord32(word32 &value, ByteOrder order=BIG_ENDIAN_ORDER);
-
-		//! \brief Peek a 16-bit word
-		//! \param value the 16-bit value to be retrieved
-		//! \param order the  ByteOrder in which the word should be retrieved
-		//! \return the number of bytes consumed during the call.
-		//! \details Peek does not consume bytes in the stream. Use the return value
-		//!    of  GetWord16 to detect short reads.
-		size_t PeekWord16(word16 &value, ByteOrder order=BIG_ENDIAN_ORDER) const;
-
-		//! \brief Peek a 32-bit word
-		//! \param value the 32-bit value to be retrieved
-		//! \param order the  ByteOrder in which the word should be retrieved
-		//! \return the number of bytes consumed during the call.
-		//! \details Peek does not consume bytes in the stream. Use the return value
-		//!    of  GetWord16 to detect short reads.
-		size_t PeekWord32(word32 &value, ByteOrder order=BIG_ENDIAN_ORDER) const;
-
-		//! move transferMax bytes of the buffered output to target as input
-
-		//! \brief Transfer bytes from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param transferMax the number of bytes to transfer
-		//! \param channel the channel on which the transfer should occur
-		//! \return the number of bytes transferred during the call.
-		//! \details TransferTo removes bytes from this object and moves them to the destination.
-		//! \details The function always returns  transferMax. If an accurate count is needed, then use  TransferTo2.
-		lword TransferTo(BufferedTransformation &target, lword transferMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL)
-			{TransferTo2(target, transferMax, channel); return transferMax;}
-
-		//! \brief Discard skipMax bytes from the output buffer
-		//! \param skipMax the number of bytes to discard
-		//! \details Skip() discards bytes from the output buffer, which is the AttachedTransformation(), if present.
-		//!   The function always returns skipMax.
-		//! \details If you want to skip bytes from a Source, then perform the following.
-		//! <pre>StringSource ss(str, false, new Redirector(TheBitBucket()));
-		//! ss.Pump(10);    // Skip 10 bytes from Source
-		//! ss.Detach(new FilterChain(...));
-		//! ss.PumpAll();
-		//! </pre>
-		virtual lword Skip(lword skipMax=LWORD_MAX);
-
-		//! copy copyMax bytes of the buffered output to target as input
-
-		//! \brief Copy bytes from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param copyMax the number of bytes to copy
-		//! \param channel the channel on which the transfer should occur
-		//! \return the number of bytes copied during the call.
-		//! \details CopyTo copies bytes from this object to the destination. The bytes are not removed from this object.
-		//! \details The function always returns  copyMax. If an accurate count is needed, then use  CopyRangeTo2.
-		lword CopyTo(BufferedTransformation &target, lword copyMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL) const
-			{return CopyRangeTo(target, 0, copyMax, channel);}
-
-		//! \brief Copy bytes from this object using an index to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param position the 0-based index of the byte stream to begin the copying
-		//! \param copyMax the number of bytes to copy
-		//! \param channel the channel on which the transfer should occur
-		//! \return the number of bytes copied during the call.
-		//! \details CopyTo copies bytes from this object to the destination. The bytes remain in this
-		//!   object. Copying begins at the index position in the current stream, and not from an absolute
-		//!   position in the stream.
-		//! \details The function returns the new position in the stream after transferring the bytes starting at the index.
-		lword CopyRangeTo(BufferedTransformation &target, lword position, lword copyMax=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL) const
-			{lword i = position; CopyRangeTo2(target, i, i+copyMax, channel); return i-position;}
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-		unsigned long MaxRetrieveable() const {return MaxRetrievable();}
-#endif
-	//@}
-
-	//!	\name RETRIEVAL OF MULTIPLE MESSAGES
-	//@{
-
-		//! \brief Provides the number of bytes ready for retrieval
-		//! \return the number of bytes ready for retrieval
-		virtual lword TotalBytesRetrievable() const;
-
-		//! \brief Provides the number of meesages processed by this object
-		//! \return the number of meesages processed by this object
-		//! \details NumberOfMessages returns number of times  MessageEnd() has been
-		//!    received minus messages retrieved or skipped
-		virtual unsigned int NumberOfMessages() const;
-
-		//! \brief Determines if any messages are available for retrieval
-		//! \returns true if <tt>NumberOfMessages() &gt; 0</tt>, false otherwise
-		//! \details AnyMessages returns true if <tt>NumberOfMessages() &gt; 0</tt>
-		virtual bool AnyMessages() const;
-
-		//! \brief Start retrieving the next message
-		//! \return true if a message is ready for retrieval
-		//! \details GetNextMessage() returns true if a message is ready for retrieval; false
-		//!   if no more messages exist or this message is not completely retrieved.
-		virtual bool GetNextMessage();
-
-		//! \brief Skip a number of meessages
-		//! \return 0 if the requested number of messages was skipped, non-0 otherwise
-		//! \details SkipMessages() skips count number of messages. If there is an AttachedTransformation()
-		//!   then SkipMessages() is called on the attached transformation. If there is no attached
-		//!   transformation, then count number of messages are sent to TheBitBucket() using TransferMessagesTo().
-		virtual unsigned int SkipMessages(unsigned int count=UINT_MAX);
-
-		//! \brief Transfer messages from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param count the number of messages to transfer
-		//! \param channel the channel on which the transfer should occur
-		//! \return the number of bytes that remain in the current transfer block (i.e., bytes not transferred)
-		//! \details TransferMessagesTo2() removes messages from this object and moves them to the destination.
-		//!   If all bytes are not transferred for a message, then processing stops and the number of remaining
-		//!   bytes is returned. TransferMessagesTo() does not proceed to the next message.
-		//! \details A return value of 0 indicates all messages were successfully transferred.
-		unsigned int TransferMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL)
-			{TransferMessagesTo2(target, count, channel); return count;}
-
-		//! \brief Copy messages from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param count the number of messages to transfer
-		//! \param channel the channel on which the transfer should occur
-		//! \return the number of bytes that remain in the current transfer block (i.e., bytes not transferred)
-		//! \details CopyMessagesTo copies messages from this object and copies them to the destination.
-		//!   If all bytes are not transferred for a message, then processing stops and the number of remaining
-		//!   bytes is returned. CopyMessagesTo() does not proceed to the next message.
-		//! \details A return value of 0 indicates all messages were successfully copied.
-		unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) const;
-
-		//! \brief Skip all messages in the series
-		virtual void SkipAll();
-
-		//! \brief Transfer all bytes from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param channel the channel on which the transfer should occur
-		//! \return the number of bytes that remain in the current transfer block (i.e., bytes not transferred)
-		//! \details TransferMessagesTo2() removes messages from this object and moves them to the destination.
-		//!   Internally TransferAllTo() calls TransferAllTo2().
-		void TransferAllTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL)
-			{TransferAllTo2(target, channel);}
-
-		//! \brief Copy messages from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param channel the channel on which the transfer should occur
-		//! \details CopyAllTo copies messages from this object and copies them to the destination.
-		void CopyAllTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL) const;
-
-		//! \brief Retrieve the next message in a series
-		//! \return true if a message was retreved, false otherwise
-		//! \details Internally, the base class implementation returns false.
-		virtual bool GetNextMessageSeries() {return false;}
-		//! \brief Provides the number of messages in a series
-		//! \return the number of messages in this series
-		virtual unsigned int NumberOfMessagesInThisSeries() const {return NumberOfMessages();}
-		//! \brief Provides the number of messages in a series
-		//! \return the number of messages in this series
-		virtual unsigned int NumberOfMessageSeries() const {return 0;}
-	//@}
-
-	//!	\name NON-BLOCKING TRANSFER OF OUTPUT
-	//@{
-
-		// upon return, byteCount contains number of bytes that have finished being transfered,
-		// and returns the number of bytes left in the current transfer block
-
-		//! \brief Transfer bytes from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param byteCount the number of bytes to transfer
-		//! \param channel the channel on which the transfer should occur
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the transfer block (i.e., bytes not transferred)
-		//! \details TransferTo() removes bytes from this object and moves them to the destination.
-		//!   Transfer begins at the index position in the current stream, and not from an absolute
-		//!   position in the stream.
-		//! \details byteCount is an \a IN and \a OUT parameter. When the call is made,
-		//!   byteCount is the requested size of the transfer. When the call returns, byteCount is
-		//!   the number of bytes that were transferred.
-		virtual size_t TransferTo2(BufferedTransformation &target, lword &byteCount, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) =0;
-
-		// upon return, begin contains the start position of data yet to be finished copying,
-		// and returns the number of bytes left in the current transfer block
-
-		//! \brief Copy bytes from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param begin the 0-based index of the first byte to copy in the stream
-		//! \param end the 0-based index of the last byte to copy in the stream
-		//! \param channel the channel on which the transfer should occur
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the copy block (i.e., bytes not copied)
-		//! \details CopyRangeTo2 copies bytes from this object to the destination. The bytes are not
-		//!   removed from this object. Copying begins at the index position in the current stream, and
-		//!   not from an absolute position in the stream.
-		//! \details begin is an \a IN and \a OUT parameter. When the call is made, begin is the
-		//!   starting position of the copy. When the call returns, begin is the position of the first
-		//!   byte that was \a not copied (which may be different tahn  end).  begin can be used for
-		//!   subsequent calls to  CopyRangeTo2.
-		virtual size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const =0;
-
-		// upon return, messageCount contains number of messages that have finished being transfered,
-		// and returns the number of bytes left in the current transfer block
-
-		//! \brief Transfer messages from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param messageCount the number of messages to transfer
-		//! \param channel the channel on which the transfer should occur
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the current transfer block (i.e., bytes not transferred)
-		//! \details TransferMessagesTo2() removes messages from this object and moves them to the destination.
-		//! \details messageCount is an \a IN and \a OUT parameter. When the call is made, messageCount is the
-		//!   the number of messages requested to  be transferred. When the call returns, messageCount is the
-		//!   number of messages actually transferred.
-		size_t TransferMessagesTo2(BufferedTransformation &target, unsigned int &messageCount, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-
-		// returns the number of bytes left in the current transfer block
-
-		//! \brief Transfer all bytes from this object to another BufferedTransformation
-		//! \param target the destination BufferedTransformation
-		//! \param channel the channel on which the transfer should occur
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the current transfer block (i.e., bytes not transferred)
-		//! \details TransferMessagesTo2() removes messages from this object and moves them to the destination.
-		size_t TransferAllTo2(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	//@}
-
-	//!	\name CHANNELS
-	//@{
-		//! \brief Exception thrown when a filter does not support named channels
-		struct NoChannelSupport : public NotImplemented
-			{NoChannelSupport(const std::string &name) : NotImplemented(name + ": this object doesn't support multiple channels") {}};
-		//! \brief Exception thrown when a filter does not recognize a named channel
-		struct InvalidChannelName : public InvalidArgument
-			{InvalidChannelName(const std::string &name, const std::string &channel) : InvalidArgument(name + ": unexpected channel name \"" + channel + "\"") {}};
-
-		//! \brief Input a byte for processing on a channel
-		//! \param channel the channel to process the data.
-		//! \param inByte the 8-bit byte (octet) to be processed.
-		//! \param blocking specifies whether the object should block when processing input.
-		//! \return 0 indicates all bytes were processed during the call. Non-0 indicates the
-		//!   number of bytes that were \a not processed.
-		size_t ChannelPut(const std::string &channel, byte inByte, bool blocking=true)
-			{return ChannelPut(channel, &inByte, 1, blocking);}
-
-		//! \brief Input a byte buffer for processing on a channel
-		//! \param channel the channel to process the data
-		//! \param inString the byte buffer to process
-		//! \param length the size of the string, in bytes
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return 0 indicates all bytes were processed during the call. Non-0 indicates the
-		//!   number of bytes that were \a not processed.
-		size_t ChannelPut(const std::string &channel, const byte *inString, size_t length, bool blocking=true)
-			{return ChannelPut2(channel, inString, length, 0, blocking);}
-
-		//! \brief Input multiple bytes that may be modified by callee on a channel
-		//! \param channel the channel to process the data.
-		//! \param inString the byte buffer to process
-		//! \param length the size of the string, in bytes
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return 0 indicates all bytes were processed during the call. Non-0 indicates the
-		//!   number of bytes that were \a not processed.
-		size_t ChannelPutModifiable(const std::string &channel, byte *inString, size_t length, bool blocking=true)
-			{return ChannelPutModifiable2(channel, inString, length, 0, blocking);}
-
-		//! \brief Input a 16-bit word for processing on a channel.
-		//! \param channel the channel to process the data.
-		//! \param value the 16-bit value to be processed.
-		//! \param order the  ByteOrder in which the word should be processed.
-		//! \param blocking specifies whether the object should block when processing input.
-		//! \return 0 indicates all bytes were processed during the call. Non-0 indicates the
-		//!   number of bytes that were \a not processed.
-		size_t ChannelPutWord16(const std::string &channel, word16 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true);
-
-		//! \brief Input a 32-bit word for processing on a channel.
-		//! \param channel the channel to process the data.
-		//! \param value the 32-bit value to be processed.
-		//! \param order the  ByteOrder in which the word should be processed.
-		//! \param blocking specifies whether the object should block when processing input.
-		//! \return 0 indicates all bytes were processed during the call. Non-0 indicates the
-		//!   number of bytes that were \a not processed.
-		size_t ChannelPutWord32(const std::string &channel, word32 value, ByteOrder order=BIG_ENDIAN_ORDER, bool blocking=true);
-
-		//! \brief Signal the end of a message
-		//! \param channel the channel to process the data.
-		//! \param propagation the number of attached transformations the  ChannelMessageEnd() signal should be passed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return 0 indicates all bytes were processed during the call. Non-0 indicates the
-		//!   number of bytes that were \a not processed.
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		bool ChannelMessageEnd(const std::string &channel, int propagation=-1, bool blocking=true)
-			{return !!ChannelPut2(channel, NULL, 0, propagation < 0 ? -1 : propagation+1, blocking);}
-
-		//! \brief Input multiple bytes for processing and signal the end of a message
-		//! \param channel the channel to process the data.
-		//! \param inString the byte buffer to process
-		//! \param length the size of the string, in bytes
-		//! \param propagation the number of attached transformations the ChannelPutMessageEnd() signal should be passed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the block (i.e., bytes not processed)
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		size_t ChannelPutMessageEnd(const std::string &channel, const byte *inString, size_t length, int propagation=-1, bool blocking=true)
-			{return ChannelPut2(channel, inString, length, propagation < 0 ? -1 : propagation+1, blocking);}
-
-		//! \brief Request space which can be written into by the caller
-		//! \param channel the channel to process the data
-		//! \param size the requested size of the buffer
-		//! \return a pointer to a memroy block with length size
-		//! \details The purpose of this method is to help avoid extra memory allocations.
-		//! \details size is an \a IN and \a OUT parameter and used as a hint. When the call is made,
-		//!    size is the requested size of the buffer. When the call returns,  size is the size of
-		//!   the array returned to the caller.
-		//! \details The base class implementation sets size to 0 and returns NULL.
-		//! \note Some objects, like ArraySink(), cannot create a space because its fixed. In the case of
-		//! an ArraySink(), the pointer to the array is returned and the size is remaining size.
-		virtual byte * ChannelCreatePutSpace(const std::string &channel, size_t &size);
-
-		//! \brief Input multiple bytes for processing on a channel.
-		//! \param channel the channel to process the data.
-		//! \param inString the byte buffer to process.
-		//! \param length the size of the string, in bytes.
-		//! \param messageEnd means how many filters to signal MessageEnd() to, including this one.
-		//! \param blocking specifies whether the object should block when processing input.
-		//! \return the number of bytes that remain in the block (i.e., bytes not processed)
-		virtual size_t ChannelPut2(const std::string &channel, const byte *inString, size_t length, int messageEnd, bool blocking);
-
-		//! \brief Input multiple bytes that may be modified by callee on a channel
-		//! \param channel the channel to process the data
-		//! \param inString the byte buffer to process
-		//! \param length the size of the string, in bytes
-		//! \param messageEnd means how many filters to signal MessageEnd() to, including this one
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return the number of bytes that remain in the block (i.e., bytes not processed)
-		virtual size_t ChannelPutModifiable2(const std::string &channel, byte *inString, size_t length, int messageEnd, bool blocking);
-
-		//! \brief Flush buffered input and/or output on a channel
-		//! \param channel the channel to flush the data
-		//! \param hardFlush is used to indicate whether all data should be flushed
-		//! \param propagation the number of attached transformations the  ChannelFlush() signal should be passed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \return true of the Flush was successful
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		virtual bool ChannelFlush(const std::string &channel, bool hardFlush, int propagation=-1, bool blocking=true);
-
-		//! \brief Marks the end of a series of messages on a channel
-		//! \param channel the channel to signal the end of a series of messages
-		//! \param propagation the number of attached transformations the  ChannelMessageSeriesEnd() signal should be passed
-		//! \param blocking specifies whether the object should block when processing input
-		//! \details Each object that receives the signal will perform its processing, decrement
-		//!     propagation, and then pass the signal on to attached transformations if the value is not 0.
-		//! \details propagation count includes this object. Setting propagation to <tt>1</tt> means this
-		//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-		//! \note There should be a MessageEnd() immediately before MessageSeriesEnd().
-		virtual bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true);
-
-		//! \brief Sets the default retrieval channel
-		//! \param channel the channel to signal the end of a series of messages
-		//! \note this function may not be implemented in all objects that should support it.
-		virtual void SetRetrievalChannel(const std::string &channel);
-	//@}
-
-	//!	\name ATTACHMENT
-	//! \details Some BufferedTransformation objects (e.g. Filter objects) allow other BufferedTransformation objects to be
-	//!   attached. When this is done, the first object instead of buffering its output, sends that output to the attached
-	//!   object as input. The entire attachment chain is deleted when the anchor object is destructed.
-
-	//@{
-		//! \brief Determines whether the object allows attachment
-		//! \return true if the object allows an attachment, false otherwise
-		//! \details Sources and  Filters will returns true, while  Sinks and other objects will return  false.
-		virtual bool Attachable() {return false;}
-
-		//! \brief Returns the object immediately attached to this object
-		//! \return the attached transformation
-		//! \details AttachedTransformation() returns NULL if there is no attachment. The non-const
-		//!   version of AttachedTransformation() always returns NULL.
-		virtual BufferedTransformation *AttachedTransformation() {CRYPTOPP_ASSERT(!Attachable()); return 0;}
-
-		//! \brief Returns the object immediately attached to this object
-		//! \return the attached transformation
-		//! \details AttachedTransformation() returns NULL if there is no attachment. The non-const
-		//!   version of AttachedTransformation() always returns NULL.
-		virtual const BufferedTransformation *AttachedTransformation() const
-			{return const_cast<BufferedTransformation *>(this)->AttachedTransformation();}
-
-		//! \brief Delete the current attachment chain and attach a new one
-		//! \param newAttachment the new BufferedTransformation to attach
-		//! \throws NotImplemented
-		//! \details Detach delete the current attachment chain and replace it with an optional  newAttachment
-		//! \details If a derived class does not override  Detach, then the base class throws
-		//!   NotImplemented.
-		virtual void Detach(BufferedTransformation *newAttachment = 0) {
-			CRYPTOPP_UNUSED(newAttachment); CRYPTOPP_ASSERT(!Attachable());
-			throw NotImplemented("BufferedTransformation: this object is not attachable");
-		}
-
-		//! \brief Add newAttachment to the end of attachment chain
-		//! \param newAttachment the attachment to add to the end of the chain
-		virtual void Attach(BufferedTransformation *newAttachment);
-	//@}
-
-protected:
-	//! \brief Decrements the propagation count while clamping at 0
-	//! \return the decremented propagation or 0
-	static int DecrementPropagation(int propagation)
-		{return propagation != 0 ? propagation - 1 : 0;}
-
-private:
-	byte m_buf[4];	// for ChannelPutWord16 and ChannelPutWord32, to ensure buffer isn't deallocated before non-blocking operation completes
-};
-
-//! \brief An input discarding BufferedTransformation
-//! \return a reference to a BufferedTransformation object that discards all input
-CRYPTOPP_DLL BufferedTransformation & TheBitBucket();
-
-//! \class CryptoMaterial
-//! \brief Interface for crypto material, such as public and private keys, and crypto parameters
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoMaterial : public NameValuePairs
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~CryptoMaterial() {}
-#endif
-
-	//! Exception thrown when invalid crypto material is detected
-	class CRYPTOPP_DLL InvalidMaterial : public InvalidDataFormat
-	{
-	public:
-		explicit InvalidMaterial(const std::string &s) : InvalidDataFormat(s) {}
-	};
-
-	//! \brief Assign values to this object
-	//! \details This function can be used to create a public key from a private key.
-	virtual void AssignFrom(const NameValuePairs &source) =0;
-
-	//! \brief Check this object for errors
-	//! \param rng a RandomNumberGenerator for objects which use randomized testing
-	//! \param level the level of thoroughness
-	//! \returns true if the tests succeed, false otherwise
-	//! \details There are four levels of thoroughness:
-	//!   <ul>
-	//!   <li>0 - using this object won't cause a crash or exception
-	//!   <li>1 - this object will probably function, and encrypt, sign, other operations correctly
-	//!   <li>2 - ensure this object will function correctly, and perform reasonable security checks
-	//!   <li>3 - perform reasonable security checks, and do checks that may take a long time
-	//!   </ul>
-	//! \details Level 0 does not require a RandomNumberGenerator. A NullRNG() can be used for level 0.
-	//!   Level 1 may not check for weak keys and such. Levels 2 and 3 are recommended.
-	//! \sa ThrowIfInvalid()
-	virtual bool Validate(RandomNumberGenerator &rng, unsigned int level) const =0;
-
-	//! \brief Check this object for errors
-	//! \param rng a RandomNumberGenerator for objects which use randomized testing
-	//! \param level the level of thoroughness
-	//! \throws InvalidMaterial
-	//! \details Internally, ThrowIfInvalid() calls Validate() and throws InvalidMaterial() if validation fails.
-	//! \sa Validate()
-	virtual void ThrowIfInvalid(RandomNumberGenerator &rng, unsigned int level) const
-		{if (!Validate(rng, level)) throw InvalidMaterial("CryptoMaterial: this object contains invalid values");}
-
-	//! \brief Saves a key to a BufferedTransformation
-	//! \param bt the destination BufferedTransformation
-	//! \throws NotImplemented
-	//! \details Save() writes the material to a BufferedTransformation.
-	//! \details If the material is a key, then the key is written with ASN.1 DER encoding. The key
-	//!   includes an object identifier with an algorthm id, like a subjectPublicKeyInfo.
-	//! \details A "raw" key without the "key info" can be saved using a key's DEREncode() method.
-	//! \details If a derived class does not override Save(), then the base class throws
-	//!   NotImplemented().
-	virtual void Save(BufferedTransformation &bt) const
-		{CRYPTOPP_UNUSED(bt); throw NotImplemented("CryptoMaterial: this object does not support saving");}
-
-	//! \brief Loads a key from a BufferedTransformation
-	//! \param bt the source BufferedTransformation
-	//! \throws KeyingErr
-	//! \details Load() attempts to read material from a BufferedTransformation. If the
-	//!   material is a key that was generated outside the library, then the following
-	//!   usually applies:
-	//!   <ul>
-	//!   <li>the key should be ASN.1 BER encoded
-	//!   <li>the key should be a "key info"
-	//!   </ul>
-	//! \details "key info" means the key should have an object identifier with an algorthm id,
-	//!   like a subjectPublicKeyInfo.
-	//! \details To read a "raw" key without the "key info", then call the key's BERDecode() method.
-	//! \note  Load generally does not check that the key is valid. Call Validate(), if needed.
-	virtual void Load(BufferedTransformation &bt)
-		{CRYPTOPP_UNUSED(bt); throw NotImplemented("CryptoMaterial: this object does not support loading");}
-
-	//! \brief Determines whether the object supports precomputation
-	//! \return true if the object supports precomputation, false otherwise
-	//! \sa Precompute()
-	virtual bool SupportsPrecomputation() const {return false;}
-
-	//! \brief Perform precomputation
-	//! \param precomputationStorage the suggested number of objects for the precompute table
-	//! \throws NotImplemented
-	//! \details The exact semantics of Precompute() varies, but it typically means calculate
-	//!   a table of n objects that can be used later to speed up computation.
-	//! \details If a derived class does not override Precompute(), then the base class throws
-	//!   NotImplemented.
-	//! \sa SupportsPrecomputation(), LoadPrecomputation(), SavePrecomputation()
-	virtual void Precompute(unsigned int precomputationStorage) {
-		CRYPTOPP_UNUSED(precomputationStorage); CRYPTOPP_ASSERT(!SupportsPrecomputation());
-		throw NotImplemented("CryptoMaterial: this object does not support precomputation");
-	}
-
-	//! \brief Retrieve previously saved precomputation
-	//! \param storedPrecomputation BufferedTransformation with the saved precomputation
-	//! \throws NotImplemented
-	//! \sa SupportsPrecomputation(), Precompute()
-	virtual void LoadPrecomputation(BufferedTransformation &storedPrecomputation)
-		{CRYPTOPP_UNUSED(storedPrecomputation); CRYPTOPP_ASSERT(!SupportsPrecomputation()); throw NotImplemented("CryptoMaterial: this object does not support precomputation");}
-	//! \brief Save precomputation for later use
-	//! \param storedPrecomputation BufferedTransformation to write the precomputation
-	//! \throws NotImplemented
-	//! \sa SupportsPrecomputation(), Precompute()
-	virtual void SavePrecomputation(BufferedTransformation &storedPrecomputation) const
-		{CRYPTOPP_UNUSED(storedPrecomputation); CRYPTOPP_ASSERT(!SupportsPrecomputation()); throw NotImplemented("CryptoMaterial: this object does not support precomputation");}
-
-	//! \brief Perform a quick sanity check
-	//! \details DoQuickSanityCheck() is for internal library use, and it should not be called by library users.
-	void DoQuickSanityCheck() const	{ThrowIfInvalid(NullRNG(), 0);}
-
-#if (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590)
-	// Sun Studio 11/CC 5.8 workaround: it generates incorrect code when casting to an empty virtual base class
-	char m_sunCCworkaround;
-#endif
-};
-
-//! \class GeneratableCryptoMaterial
-//! \brief Interface for generatable crypto material, such as private keys and crypto parameters
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE GeneratableCryptoMaterial : virtual public CryptoMaterial
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~GeneratableCryptoMaterial() {}
-#endif
-
-	//! \brief Generate a random key or crypto parameters
-	//! \param rng a RandomNumberGenerator to produce keying material
-	//! \param params additional initialization parameters
-	//! \throws KeyingErr if a key can't be generated or algorithm parameters are invalid
-	//! \details If a derived class does not override  GenerateRandom, then the base class throws
-	//!    NotImplemented.
-	virtual void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &params = g_nullNameValuePairs) {
-		CRYPTOPP_UNUSED(rng); CRYPTOPP_UNUSED(params);
-		throw NotImplemented("GeneratableCryptoMaterial: this object does not support key/parameter generation");
-	}
-
-	//! \brief Generate a random key or crypto parameters
-	//! \param rng a RandomNumberGenerator to produce keying material
-	//! \param keySize the size of the key, in bits
-	//! \throws KeyingErr if a key can't be generated or algorithm parameters are invalid
-	//! \details GenerateRandomWithKeySize calls  GenerateRandom with a NameValuePairs
-	//!    object with only "KeySize"
-	void GenerateRandomWithKeySize(RandomNumberGenerator &rng, unsigned int keySize);
-};
-
-//! \brief Interface for public keys
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PublicKey : virtual public CryptoMaterial
-{
-};
-
-//! \brief Interface for private keys
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PrivateKey : public GeneratableCryptoMaterial
-{
-};
-
-//! \brief Interface for crypto prameters
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoParameters : public GeneratableCryptoMaterial
-{
-};
-
-//! \brief Interface for asymmetric algorithms
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AsymmetricAlgorithm : public Algorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~AsymmetricAlgorithm() {}
-#endif
-
-	//! \brief Retrieves a reference to CryptoMaterial
-	//! \return a reference to the crypto material
-	virtual CryptoMaterial & AccessMaterial() =0;
-
-	//! \brief Retrieves a reference to CryptoMaterial
-	//! \return a const reference to the crypto material
-	virtual const CryptoMaterial & GetMaterial() const =0;
-
-	//! \brief Loads this object from a BufferedTransformation
-	//! \param bt a BufferedTransformation object
-	//! \deprecated for backwards compatibility, calls <tt>AccessMaterial().Load(bt)</tt>
-	void BERDecode(BufferedTransformation &bt)
-		{AccessMaterial().Load(bt);}
-
-	//! \brief Saves this object to a BufferedTransformation
-	//! \param bt a BufferedTransformation object
-	//! \deprecated for backwards compatibility, calls GetMaterial().Save(bt)
-	void DEREncode(BufferedTransformation &bt) const
-		{GetMaterial().Save(bt);}
-};
-
-//! \brief Interface for asymmetric algorithms using public keys
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PublicKeyAlgorithm : public AsymmetricAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PublicKeyAlgorithm() {}
-#endif
-
-	// VC60 workaround: no co-variant return type
-
-	//! \brief Retrieves a reference to a Public Key
-	//! \return a reference to the public key
-	CryptoMaterial & AccessMaterial()
-		{return AccessPublicKey();}
-	//! \brief Retrieves a reference to a Public Key
-	//! \return a const reference the public key
-	const CryptoMaterial & GetMaterial() const
-		{return GetPublicKey();}
-
-	//! \brief Retrieves a reference to a Public Key
-	//! \return a reference to the public key
-	virtual PublicKey & AccessPublicKey() =0;
-	//! \brief Retrieves a reference to a Public Key
-	//! \return a const reference the public key
-	virtual const PublicKey & GetPublicKey() const
-		{return const_cast<PublicKeyAlgorithm *>(this)->AccessPublicKey();}
-};
-
-//! \brief Interface for asymmetric algorithms using private keys
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PrivateKeyAlgorithm : public AsymmetricAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PrivateKeyAlgorithm() {}
-#endif
-
-	//! \brief Retrieves a reference to a Private Key
-	//! \return a reference the private key
-	CryptoMaterial & AccessMaterial() {return AccessPrivateKey();}
-	//! \brief Retrieves a reference to a Private Key
-	//! \return a const reference the private key
-	const CryptoMaterial & GetMaterial() const {return GetPrivateKey();}
-
-	//! \brief Retrieves a reference to a Private Key
-	//! \return a reference the private key
-	virtual PrivateKey & AccessPrivateKey() =0;
-	//! \brief Retrieves a reference to a Private Key
-	//! \return a const reference the private key
-	virtual const PrivateKey & GetPrivateKey() const {return const_cast<PrivateKeyAlgorithm *>(this)->AccessPrivateKey();}
-};
-
-//! \brief Interface for key agreement algorithms
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE KeyAgreementAlgorithm : public AsymmetricAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~KeyAgreementAlgorithm() {}
-#endif
-
-	//! \brief Retrieves a reference to Crypto Parameters
-	//! \return a reference the crypto parameters
-	CryptoMaterial & AccessMaterial() {return AccessCryptoParameters();}
-	//! \brief Retrieves a reference to Crypto Parameters
-	//! \return a const reference the crypto parameters
-	const CryptoMaterial & GetMaterial() const {return GetCryptoParameters();}
-
-	//! \brief Retrieves a reference to Crypto Parameters
-	//! \return a reference the crypto parameters
-	virtual CryptoParameters & AccessCryptoParameters() =0;
-	//! \brief Retrieves a reference to Crypto Parameters
-	//! \return a const reference the crypto parameters
-	virtual const CryptoParameters & GetCryptoParameters() const {return const_cast<KeyAgreementAlgorithm *>(this)->AccessCryptoParameters();}
-};
-
-//! \brief Interface for public-key encryptors and decryptors
-//! \details This class provides an interface common to encryptors and decryptors
-//!   for querying their plaintext and ciphertext lengths.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_CryptoSystem
-{
-public:
-	virtual ~PK_CryptoSystem() {}
-
-	//! \brief Provides the maximum length of plaintext for a given ciphertext length
-	//! \return the maximum size of the plaintext, in bytes
-	//! \details This function returns 0 if ciphertextLength is not valid (too long or too short).
-	virtual size_t MaxPlaintextLength(size_t ciphertextLength) const =0;
-
-	//! \brief Calculate the length of ciphertext given length of plaintext
-	//! \return the maximum size of the ciphertext, in bytes
-	//! \details This function returns 0 if plaintextLength is not valid (too long).
-	virtual size_t CiphertextLength(size_t plaintextLength) const =0;
-
-	//! \brief Determines whether this object supports the use of a named parameter
-	//! \param name the name of the parameter
-	//! \return true if the parameter name is supported, false otherwise
-	//! \details Some possible parameter names: EncodingParameters(), KeyDerivationParameters()
-	//!   and others Parameters listed in argnames.h
-	virtual bool ParameterSupported(const char *name) const =0;
-
-	//! \brief Provides the fixed ciphertext length, if one exists
-	//! \return the fixed ciphertext length if one exists, otherwise 0
-	//! \details "Fixed" here means length of ciphertext does not depend on length of plaintext.
-	//!   In this case, it usually does depend on the key length.
-	virtual size_t FixedCiphertextLength() const {return 0;}
-
-	//! \brief Provides the maximum plaintext length given a fixed ciphertext length
-	//! \return maximum plaintext length given the fixed ciphertext length, if one exists,
-	//!   otherwise return 0.
-	//! \details FixedMaxPlaintextLength(0 returns the maximum plaintext length given the fixed ciphertext
-	//!   length, if one exists, otherwise return 0.
-	virtual size_t FixedMaxPlaintextLength() const {return 0;}
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-	size_t MaxPlainTextLength(size_t cipherTextLength) const {return MaxPlaintextLength(cipherTextLength);}
-	size_t CipherTextLength(size_t plainTextLength) const {return CiphertextLength(plainTextLength);}
-#endif
-};
-
-//! \class PK_Encryptor
-//! \brief Interface for public-key encryptors
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Encryptor : public PK_CryptoSystem, public PublicKeyAlgorithm
-{
-public:
-	//! \brief Exception thrown when trying to encrypt plaintext of invalid length
-	class CRYPTOPP_DLL InvalidPlaintextLength : public Exception
-	{
-	public:
-		InvalidPlaintextLength() : Exception(OTHER_ERROR, "PK_Encryptor: invalid plaintext length") {}
-	};
-
-	//! \brief Encrypt a byte string
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param plaintext the plaintext byte buffer
-	//! \param plaintextLength the size of the plaintext byte buffer
-	//! \param ciphertext a byte buffer to hold the encrypted string
-	//! \param parameters a set of NameValuePairs to initialize this object
-	//! \pre <tt>CiphertextLength(plaintextLength) != 0</tt> ensures the plaintext isn't too large
-	//! \pre <tt>COUNTOF(ciphertext) == CiphertextLength(plaintextLength)</tt> ensures the output
-	//!   byte buffer is large enough.
-	//! \sa PK_Decryptor
-	virtual void Encrypt(RandomNumberGenerator &rng,
-		const byte *plaintext, size_t plaintextLength,
-		byte *ciphertext, const NameValuePairs &parameters = g_nullNameValuePairs) const =0;
-
-	//! \brief Create a new encryption filter
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param attachment an attached transformation
-	//! \param parameters a set of NameValuePairs to initialize this object
-	//! \details \p attachment can be \p NULL. The caller is responsible for deleting the returned pointer.
-	//!   Encoding parameters should be passed in the "EP" channel.
-	virtual BufferedTransformation * CreateEncryptionFilter(RandomNumberGenerator &rng,
-		BufferedTransformation *attachment=NULL, const NameValuePairs &parameters = g_nullNameValuePairs) const;
-};
-
-//! \class PK_Decryptor
-//! \brief Interface for public-key decryptors
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Decryptor : public PK_CryptoSystem, public PrivateKeyAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PK_Decryptor() {}
-#endif
-
-	//! \brief Decrypt a byte string
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param ciphertext the encrypted byte buffer
-	//! \param ciphertextLength the size of the encrypted byte buffer
-	//! \param plaintext a byte buffer to hold the decrypted string
-	//! \param parameters a set of NameValuePairs to initialize this object
-	//! \return the result of the decryption operation
-	//! \details If DecodingResult::isValidCoding is true, then DecodingResult::messageLength
-	//!   is valid and holds the the actual length of the plaintext recovered. The result is undefined
-	//!   if decryption failed. If DecodingResult::isValidCoding is false, then DecodingResult::messageLength
-	//!   is undefined.
-	//! \pre <tt>COUNTOF(plaintext) == MaxPlaintextLength(ciphertextLength)</tt> ensures the output
-	//!   byte buffer is large enough
-	//! \sa PK_Encryptor
-	virtual DecodingResult Decrypt(RandomNumberGenerator &rng,
-		const byte *ciphertext, size_t ciphertextLength,
-		byte *plaintext, const NameValuePairs &parameters = g_nullNameValuePairs) const =0;
-
-	//! \brief Create a new decryption filter
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param attachment an attached transformation
-	//! \param parameters a set of NameValuePairs to initialize this object
-	//! \return the newly created decryption filter
-	//! \note the caller is responsible for deleting the returned pointer
-	virtual BufferedTransformation * CreateDecryptionFilter(RandomNumberGenerator &rng,
-		BufferedTransformation *attachment=NULL, const NameValuePairs &parameters = g_nullNameValuePairs) const;
-
-	//! \brief Decrypt a fixed size ciphertext
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param ciphertext the encrypted byte buffer
-	//! \param plaintext a byte buffer to hold the decrypted string
-	//! \param parameters a set of NameValuePairs to initialize this object
-	//! \return the result of the decryption operation
-	//! \details If DecodingResult::isValidCoding is true, then DecodingResult::messageLength
-	//!   is valid and holds the the actual length of the plaintext recovered. The result is undefined
-	//!   if decryption failed. If DecodingResult::isValidCoding is false, then DecodingResult::messageLength
-	//!   is undefined.
-	//! \pre <tt>COUNTOF(plaintext) == MaxPlaintextLength(ciphertextLength)</tt> ensures the output
-	//!   byte buffer is large enough
-	//! \sa PK_Encryptor
-	DecodingResult FixedLengthDecrypt(RandomNumberGenerator &rng, const byte *ciphertext, byte *plaintext, const NameValuePairs &parameters = g_nullNameValuePairs) const
-		{return Decrypt(rng, ciphertext, FixedCiphertextLength(), plaintext, parameters);}
-};
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-typedef PK_CryptoSystem PK_FixedLengthCryptoSystem;
-typedef PK_Encryptor PK_FixedLengthEncryptor;
-typedef PK_Decryptor PK_FixedLengthDecryptor;
-#endif
-
-//! \class PK_SignatureScheme
-//! \brief Interface for public-key signers and verifiers
-//! \details This class provides an interface common to signers and verifiers for querying scheme properties
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_SignatureScheme
-{
-public:
-	//! \class InvalidKeyLength
-	//! \brief Exception throw when the private or public key has a length that can't be used
-	//! \details InvalidKeyLength() may be thrown by any function in this class if the private
-	//!   or public key has a length that can't be used
-	class CRYPTOPP_DLL InvalidKeyLength : public Exception
-	{
-	public:
-		InvalidKeyLength(const std::string &message) : Exception(OTHER_ERROR, message) {}
-	};
-
-	//! \class KeyTooShort
-	//! \brief Exception throw when the private or public key is too short to sign or verify
-	//! \details KeyTooShort() may be thrown by any function in this class if the private or public
-	//!   key is too short to sign or verify anything
-	class CRYPTOPP_DLL KeyTooShort : public InvalidKeyLength
-	{
-	public:
-		KeyTooShort() : InvalidKeyLength("PK_Signer: key too short for this signature scheme") {}
-	};
-
-	virtual ~PK_SignatureScheme() {}
-
-	//! \brief Provides the signature length if it only depends on the key
-	//! \return the signature length if it only depends on the key, in bytes
-	//! \details SignatureLength() returns the signature length if it only depends on the key, otherwise 0.
-	virtual size_t SignatureLength() const =0;
-
-	//! \brief Provides the maximum signature length produced given the length of the recoverable message part
-	//! \param recoverablePartLength the length of the recoverable message part, in bytes
-	//! \return the maximum signature length produced for a given length of recoverable message part, in bytes
-	//! \details MaxSignatureLength() returns the maximum signature length produced given the length of the
-	//!   recoverable message part.
-	virtual size_t MaxSignatureLength(size_t recoverablePartLength = 0) const
-	{CRYPTOPP_UNUSED(recoverablePartLength); return SignatureLength();}
-
-	//! \brief Provides the length of longest message that can be recovered
-	//! \return the length of longest message that can be recovered, in bytes
-	//! \details MaxRecoverableLength() returns the length of longest message that can be recovered, or 0 if
-	//!   this signature scheme does not support message recovery.
-	virtual size_t MaxRecoverableLength() const =0;
-
-	//! \brief Provides the length of longest message that can be recovered from a signature of given length
-	//! \param signatureLength the length of the signature, in bytes
-	//! \return the length of longest message that can be recovered from a signature of given length, in bytes
-	//! \details MaxRecoverableLengthFromSignatureLength() returns the length of longest message that can be
-	//!   recovered from a signature of given length, or 0 if this signature scheme does not support message
-	//!   recovery.
-	virtual size_t MaxRecoverableLengthFromSignatureLength(size_t signatureLength) const =0;
-
-	//! \brief Determines whether a signature scheme requires a random number generator
-	//! \return true if the signature scheme requires a RandomNumberGenerator() to sign
-	//! \details if IsProbabilistic() returns false, then NullRNG() can be passed to functions that take
-	//!   RandomNumberGenerator().
-	virtual bool IsProbabilistic() const =0;
-
-	//! \brief Determines whether the non-recoverable message part can be signed
-	//! \return true if the non-recoverable message part can be signed
-	virtual bool AllowNonrecoverablePart() const =0;
-
-	//! \brief Determines whether the signature must be input before the message
-	//! \return true if the signature must be input before the message during verifcation
-	//! \details if SignatureUpfront() returns true, then you must input the signature before the message
-	//!   during verification. Otherwise you can input the signature at anytime.
-	virtual bool SignatureUpfront() const {return false;}
-
-	//! \brief Determines whether the recoverable part must be input before the non-recoverable part
-	//! \return true if the recoverable part must be input before the non-recoverable part during signing
-	//! \details RecoverablePartFirst() determines whether you must input the recoverable part before the
-	//!   non-recoverable part during signing
-	virtual bool RecoverablePartFirst() const =0;
-};
-
-//! \class PK_MessageAccumulator
-//! \brief Interface for accumulating messages to be signed or verified
-//! \details Only Update() should be called from the PK_MessageAccumulator() class. No other functions
-//!   inherited from HashTransformation, like DigestSize() and TruncatedFinal(), should be called.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_MessageAccumulator : public HashTransformation
-{
-public:
-	//! \warning DigestSize() should not be called on PK_MessageAccumulator
-	unsigned int DigestSize() const
-		{throw NotImplemented("PK_MessageAccumulator: DigestSize() should not be called");}
-
-	//! \warning TruncatedFinal() should not be called on PK_MessageAccumulator
-	void TruncatedFinal(byte *digest, size_t digestSize)
-	{
-		CRYPTOPP_UNUSED(digest); CRYPTOPP_UNUSED(digestSize);
-		throw NotImplemented("PK_MessageAccumulator: TruncatedFinal() should not be called");
-	}
-};
-
-//! \class PK_Signer
-//! \brief Interface for public-key signers
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Signer : public PK_SignatureScheme, public PrivateKeyAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PK_Signer() {}
-#endif
-
-	//! \brief Create a new HashTransformation to accumulate the message to be signed
-	//! \param rng a RandomNumberGenerator derived class
-	//! \return a pointer to a PK_MessageAccumulator
-	//! \details NewSignatureAccumulator() can be used with all signing methods. Sign() will autimatically delete the
-	//!   accumulator pointer. The caller is responsible for deletion if a method is called that takes a reference.
-	virtual PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const =0;
-
-	//! \brief Input a recoverable message to an accumulator
-	//! \param messageAccumulator a reference to a PK_MessageAccumulator
-	//! \param recoverableMessage a pointer to the recoverable message part to be signed
-	//! \param recoverableMessageLength the size of the recoverable message part
-	virtual void InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const =0;
-
-	//! \brief Sign and delete the messageAccumulator
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param messageAccumulator a pointer to a PK_MessageAccumulator derived class
-	//! \param signature a block of bytes for the signature
-	//! \return actual signature length
-	//! \details Sign() deletes the messageAccumulator, even if an exception is thrown.
-	//! \pre <tt>COUNTOF(signature) == MaxSignatureLength()</tt>
-	virtual size_t Sign(RandomNumberGenerator &rng, PK_MessageAccumulator *messageAccumulator, byte *signature) const;
-
-	//! \brief Sign and restart messageAccumulator
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param messageAccumulator a pointer to a PK_MessageAccumulator derived class
-	//! \param signature a block of bytes for the signature
-	//! \param restart flag indicating whether the messageAccumulator should be restarted
-	//! \return actual signature length
-	//! \pre <tt>COUNTOF(signature) == MaxSignatureLength()</tt>
-	virtual size_t SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart=true) const =0;
-
-	//! \brief Sign a message
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param message a pointer to the message
-	//! \param messageLen the size of the message to be signed
-	//! \param signature a block of bytes for the signature
-	//! \return actual signature length
-	//! \pre <tt>COUNTOF(signature) == MaxSignatureLength()</tt>
-	virtual size_t SignMessage(RandomNumberGenerator &rng, const byte *message, size_t messageLen, byte *signature) const;
-
-	//! \brief Sign a recoverable message
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param recoverableMessage a pointer to the recoverable message part to be signed
-	//! \param recoverableMessageLength the size of the recoverable message part
-	//! \param nonrecoverableMessage a pointer to the non-recoverable message part to be signed
-	//! \param nonrecoverableMessageLength the size of the non-recoverable message part
-	//! \param signature a block of bytes for the signature
-	//! \return actual signature length
-	//! \pre <tt>COUNTOF(signature) == MaxSignatureLength(recoverableMessageLength)</tt>
-	virtual size_t SignMessageWithRecovery(RandomNumberGenerator &rng, const byte *recoverableMessage, size_t recoverableMessageLength,
-		const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength, byte *signature) const;
-};
-
-//! \class PK_Verifier
-//! \brief Interface for public-key signature verifiers
-//! \details The Recover* functions throw NotImplemented if the signature scheme does not support
-//!   message recovery.
-//! \details The Verify* functions throw InvalidDataFormat if the scheme does support message
-//!   recovery and the signature contains a non-empty recoverable message part. The
-//!   Recover* functions should be used in that case.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Verifier : public PK_SignatureScheme, public PublicKeyAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PK_Verifier() {}
-#endif
-
-	//! \brief Create a new HashTransformation to accumulate the message to be verified
-	//! \return a pointer to a PK_MessageAccumulator
-	//! \details NewVerificationAccumulator() can be used with all verification methods. Verify() will autimatically delete
-	//!   the accumulator pointer. The caller is responsible for deletion if a method is called that takes a reference.
-	virtual PK_MessageAccumulator * NewVerificationAccumulator() const =0;
-
-	//! \brief Input signature into a message accumulator
-	//! \param messageAccumulator a pointer to a PK_MessageAccumulator derived class
-	//! \param signature the signature on the message
-	//! \param signatureLength the size of the signature
-	virtual void InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const =0;
-
-	//! \brief Check whether messageAccumulator contains a valid signature and message
-	//! \param messageAccumulator a pointer to a PK_MessageAccumulator derived class
-	//! \return true if the signature is valid, false otherwise
-	//! \details Verify() deletes the messageAccumulator, even if an exception is thrown.
-	virtual bool Verify(PK_MessageAccumulator *messageAccumulator) const;
-
-	//! \brief Check whether messageAccumulator contains a valid signature and message, and restart messageAccumulator
-	//! \param messageAccumulator a reference to a PK_MessageAccumulator derived class
-	//! \return true if the signature is valid, false otherwise
-	//! \details VerifyAndRestart() restarts the messageAccumulator
-	virtual bool VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const =0;
-
-	//! \brief Check whether input signature is a valid signature for input message
-	//! \param message a pointer to the message to be verified
-	//! \param messageLen the size of the message
-	//! \param signature a pointer to the signature over the message
-	//! \param signatureLen the size of the signature
-	//! \return true if the signature is valid, false otherwise
-	virtual bool VerifyMessage(const byte *message, size_t messageLen,
-		const byte *signature, size_t signatureLen) const;
-
-	//! \brief Recover a message from its signature
-	//! \param recoveredMessage a pointer to the recoverable message part to be verified
-	//! \param messageAccumulator a pointer to a PK_MessageAccumulator derived class
-	//! \return the result of the verification operation
-	//! \details Recover() deletes the messageAccumulator, even if an exception is thrown.
-	//! \pre <tt>COUNTOF(recoveredMessage) == MaxRecoverableLengthFromSignatureLength(signatureLength)</tt>
-	virtual DecodingResult Recover(byte *recoveredMessage, PK_MessageAccumulator *messageAccumulator) const;
-
-	//! \brief Recover a message from its signature
-	//! \param recoveredMessage a pointer to the recoverable message part to be verified
-	//! \param messageAccumulator a pointer to a PK_MessageAccumulator derived class
-	//! \return the result of the verification operation
-	//! \details RecoverAndRestart() restarts the messageAccumulator
-	//! \pre <tt>COUNTOF(recoveredMessage) == MaxRecoverableLengthFromSignatureLength(signatureLength)</tt>
-	virtual DecodingResult RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &messageAccumulator) const =0;
-
-	//! \brief Recover a message from its signature
-	//! \param recoveredMessage a pointer for the recovered message
-	//! \param nonrecoverableMessage a pointer to the non-recoverable message part to be signed
-	//! \param nonrecoverableMessageLength the size of the non-recoverable message part
-	//! \param signature the signature on the message
-	//! \param signatureLength the size of the signature
-	//! \return the result of the verification operation
-	//! \pre <tt>COUNTOF(recoveredMessage) == MaxRecoverableLengthFromSignatureLength(signatureLength)</tt>
-	virtual DecodingResult RecoverMessage(byte *recoveredMessage,
-		const byte *nonrecoverableMessage, size_t nonrecoverableMessageLength,
-		const byte *signature, size_t signatureLength) const;
-};
-
-//! \class SimpleKeyAgreementDomain
-//! \brief Interface for domains of simple key agreement protocols
-//! \details A key agreement domain is a set of parameters that must be shared
-//!   by two parties in a key agreement protocol, along with the algorithms
-//!   for generating key pairs and deriving agreed values.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE SimpleKeyAgreementDomain : public KeyAgreementAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~SimpleKeyAgreementDomain() {}
-#endif
-
-	//! \brief Provides the size of the agreed value
-	//! \return size of agreed value produced  in this domain
-	virtual unsigned int AgreedValueLength() const =0;
-
-	//! \brief Provides the size of the private key
-	//! \return size of private keys in this domain
-	virtual unsigned int PrivateKeyLength() const =0;
-
-	//! \brief Provides the size of the public key
-	//! \return size of public keys in this domain
-	virtual unsigned int PublicKeyLength() const =0;
-
-	//! \brief Generate private key in this domain
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer for the generated private key in this domain
-	//! \pre <tt>COUNTOF(privateKey) == PrivateKeyLength()</tt>
-	virtual void GeneratePrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0;
-
-	//! \brief Generate a public key from a private key in this domain
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer with the previously generated private key
-	//! \param publicKey a byte buffer for the generated public key in this domain
-	//! \pre <tt>COUNTOF(publicKey) == PublicKeyLength()</tt>
-	virtual void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0;
-
-	//! \brief Generate a private/public key pair
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer for the generated private key in this domain
-	//! \param publicKey a byte buffer for the generated public key in this domain
-	//! \details GenerateKeyPair() is equivalent to calling GeneratePrivateKey() and then GeneratePublicKey().
-	//! \pre <tt>COUNTOF(privateKey) == PrivateKeyLength()</tt>
-	//! \pre <tt>COUNTOF(publicKey) == PublicKeyLength()</tt>
-	virtual void GenerateKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const;
-
-	//! \brief Derive agreed value
-	//! \param agreedValue a byte buffer for the shared secret
-	//! \param privateKey a byte buffer with your private key in this domain
-	//! \param otherPublicKey a byte buffer with the other party's public key in this domain
-	//! \param validateOtherPublicKey a flag indicating if the other party's public key should be validated
-	//! \return true upon success, false in case of failure
-	//! \details Agree() derives an agreed value from your private keys and couterparty's public keys.
-	//! \details The other party's public key is validated by default. If you have previously validated the
-	//!   static public key, use <tt>validateStaticOtherPublicKey=false</tt> to save time.
-	//! \pre <tt>COUNTOF(agreedValue) == AgreedValueLength()</tt>
-	//! \pre <tt>COUNTOF(privateKey) == PrivateKeyLength()</tt>
-	//! \pre <tt>COUNTOF(otherPublicKey) == PublicKeyLength()</tt>
-	virtual bool Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey=true) const =0;
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-	bool ValidateDomainParameters(RandomNumberGenerator &rng) const
-		{return GetCryptoParameters().Validate(rng, 2);}
-#endif
-};
-
-//! \brief Interface for domains of authenticated key agreement protocols
-//! \details In an authenticated key agreement protocol, each party has two
-//!   key pairs. The long-lived key pair is called the static key pair,
-//!   and the short-lived key pair is called the ephemeral key pair.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AuthenticatedKeyAgreementDomain : public KeyAgreementAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~AuthenticatedKeyAgreementDomain() {}
-#endif
-
-	//! \brief Provides the size of the agreed value
-	//! \return size of agreed value produced  in this domain
-	virtual unsigned int AgreedValueLength() const =0;
-
-	//! \brief Provides the size of the static private key
-	//! \return size of static private keys in this domain
-	virtual unsigned int StaticPrivateKeyLength() const =0;
-
-	//! \brief Provides the size of the static public key
-	//! \return size of static public keys in this domain
-	virtual unsigned int StaticPublicKeyLength() const =0;
-
-	//! \brief Generate static private key in this domain
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer for the generated private key in this domain
-	//! \pre <tt>COUNTOF(privateKey) == PrivateStaticKeyLength()</tt>
-	virtual void GenerateStaticPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0;
-
-	//! \brief Generate a static public key from a private key in this domain
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer with the previously generated private key
-	//! \param publicKey a byte buffer for the generated public key in this domain
-	//! \pre <tt>COUNTOF(publicKey) == PublicStaticKeyLength()</tt>
-	virtual void GenerateStaticPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0;
-
-	//! \brief Generate a static private/public key pair
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer for the generated private key in this domain
-	//! \param publicKey a byte buffer for the generated public key in this domain
-	//! \details GenerateStaticKeyPair() is equivalent to calling GenerateStaticPrivateKey() and then GenerateStaticPublicKey().
-	//! \pre <tt>COUNTOF(privateKey) == PrivateStaticKeyLength()</tt>
-	//! \pre <tt>COUNTOF(publicKey) == PublicStaticKeyLength()</tt>
-	virtual void GenerateStaticKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const;
-
-	//! \brief Provides the size of ephemeral private key
-	//! \return the size of ephemeral private key in this domain
-	virtual unsigned int EphemeralPrivateKeyLength() const =0;
-
-	//! \brief Provides the size of ephemeral public key
-	//! \return the size of ephemeral public key in this domain
-	virtual unsigned int EphemeralPublicKeyLength() const =0;
-
-	//! \brief Generate ephemeral private key
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer for the generated private key in this domain
-	//! \pre <tt>COUNTOF(privateKey) == PrivateEphemeralKeyLength()</tt>
-	virtual void GenerateEphemeralPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const =0;
-
-	//! \brief Generate ephemeral public key
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer for the generated private key in this domain
-	//! \param publicKey a byte buffer for the generated public key in this domain
-	//! \pre <tt>COUNTOF(publicKey) == PublicEphemeralKeyLength()</tt>
-	virtual void GenerateEphemeralPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const =0;
-
-	//! \brief Generate private/public key pair
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer for the generated private key in this domain
-	//! \param publicKey a byte buffer for the generated public key in this domain
-	//! \details GenerateEphemeralKeyPair() is equivalent to calling GenerateEphemeralPrivateKey() and then GenerateEphemeralPublicKey()
-	virtual void GenerateEphemeralKeyPair(RandomNumberGenerator &rng, byte *privateKey, byte *publicKey) const;
-
-	//! \brief Derive agreed value
-	//! \param agreedValue a byte buffer for the shared secret
-	//! \param staticPrivateKey a byte buffer with your static private key in this domain
-	//! \param ephemeralPrivateKey a byte buffer with your ephemeral private key in this domain
-	//! \param staticOtherPublicKey a byte buffer with the other party's static public key in this domain
-	//! \param ephemeralOtherPublicKey a byte buffer with the other party's ephemeral public key in this domain
-	//! \param validateStaticOtherPublicKey a flag indicating if the other party's public key should be validated
-	//! \return true upon success, false in case of failure
-	//! \details Agree() derives an agreed value from your private keys and couterparty's public keys.
-	//! \details The other party's ephemeral public key is validated by default. If you have previously validated
-	//!   the static public key, use <tt>validateStaticOtherPublicKey=false</tt> to save time.
-	//! \pre <tt>COUNTOF(agreedValue) == AgreedValueLength()</tt>
-	//! \pre <tt>COUNTOF(staticPrivateKey) == StaticPrivateKeyLength()</tt>
-	//! \pre <tt>COUNTOF(ephemeralPrivateKey) == EphemeralPrivateKeyLength()</tt>
-	//! \pre <tt>COUNTOF(staticOtherPublicKey) == StaticPublicKeyLength()</tt>
-	//! \pre <tt>COUNTOF(ephemeralOtherPublicKey) == EphemeralPublicKeyLength()</tt>
-	virtual bool Agree(byte *agreedValue,
-		const byte *staticPrivateKey, const byte *ephemeralPrivateKey,
-		const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey,
-		bool validateStaticOtherPublicKey=true) const =0;
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-	bool ValidateDomainParameters(RandomNumberGenerator &rng) const
-		{return GetCryptoParameters().Validate(rng, 2);}
-#endif
-};
-
-// interface for password authenticated key agreement protocols, not implemented yet
-#if 0
-//! \brief Interface for protocol sessions
-/*! The methods should be called in the following order:
-
-	InitializeSession(rng, parameters);	// or call initialize method in derived class
-	while (true)
-	{
-		if (OutgoingMessageAvailable())
-		{
-			length = GetOutgoingMessageLength();
-			GetOutgoingMessage(message);
-			; // send outgoing message
-		}
-
-		if (LastMessageProcessed())
-			break;
-
-		; // receive incoming message
-		ProcessIncomingMessage(message);
-	}
-	; // call methods in derived class to obtain result of protocol session
-*/
-class ProtocolSession
-{
-public:
-	//! Exception thrown when an invalid protocol message is processed
-	class ProtocolError : public Exception
-	{
-	public:
-		ProtocolError(ErrorType errorType, const std::string &s) : Exception(errorType, s) {}
-	};
-
-	//! Exception thrown when a function is called unexpectedly
-	/*! for example calling ProcessIncomingMessage() when ProcessedLastMessage() == true */
-	class UnexpectedMethodCall : public Exception
-	{
-	public:
-		UnexpectedMethodCall(const std::string &s) : Exception(OTHER_ERROR, s) {}
-	};
-
-	ProtocolSession() : m_rng(NULL), m_throwOnProtocolError(true), m_validState(false) {}
-	virtual ~ProtocolSession() {}
-
-	virtual void InitializeSession(RandomNumberGenerator &rng, const NameValuePairs &parameters) =0;
-
-	bool GetThrowOnProtocolError() const {return m_throwOnProtocolError;}
-	void SetThrowOnProtocolError(bool throwOnProtocolError) {m_throwOnProtocolError = throwOnProtocolError;}
-
-	bool HasValidState() const {return m_validState;}
-
-	virtual bool OutgoingMessageAvailable() const =0;
-	virtual unsigned int GetOutgoingMessageLength() const =0;
-	virtual void GetOutgoingMessage(byte *message) =0;
-
-	virtual bool LastMessageProcessed() const =0;
-	virtual void ProcessIncomingMessage(const byte *message, unsigned int messageLength) =0;
-
-protected:
-	void HandleProtocolError(Exception::ErrorType errorType, const std::string &s) const;
-	void CheckAndHandleInvalidState() const;
-	void SetValidState(bool valid) {m_validState = valid;}
-
-	RandomNumberGenerator *m_rng;
-
-private:
-	bool m_throwOnProtocolError, m_validState;
-};
-
-class KeyAgreementSession : public ProtocolSession
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~KeyAgreementSession() {}
-#endif
-
-	virtual unsigned int GetAgreedValueLength() const =0;
-	virtual void GetAgreedValue(byte *agreedValue) const =0;
-};
-
-class PasswordAuthenticatedKeyAgreementSession : public KeyAgreementSession
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PasswordAuthenticatedKeyAgreementSession() {}
-#endif
-
-	void InitializePasswordAuthenticatedKeyAgreementSession(RandomNumberGenerator &rng,
-		const byte *myId, unsigned int myIdLength,
-		const byte *counterPartyId, unsigned int counterPartyIdLength,
-		const byte *passwordOrVerifier, unsigned int passwordOrVerifierLength);
-};
-
-class PasswordAuthenticatedKeyAgreementDomain : public KeyAgreementAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PasswordAuthenticatedKeyAgreementDomain() {}
-#endif
-
-	//! return whether the domain parameters stored in this object are valid
-	virtual bool ValidateDomainParameters(RandomNumberGenerator &rng) const
-		{return GetCryptoParameters().Validate(rng, 2);}
-
-	virtual unsigned int GetPasswordVerifierLength(const byte *password, unsigned int passwordLength) const =0;
-	virtual void GeneratePasswordVerifier(RandomNumberGenerator &rng, const byte *userId, unsigned int userIdLength, const byte *password, unsigned int passwordLength, byte *verifier) const =0;
-
-	enum RoleFlags {CLIENT=1, SERVER=2, INITIATOR=4, RESPONDER=8};
-
-	virtual bool IsValidRole(unsigned int role) =0;
-	virtual PasswordAuthenticatedKeyAgreementSession * CreateProtocolSession(unsigned int role) const =0;
-};
-#endif
-
-//! \brief Exception thrown when an ASN.1 BER decoing error is encountered
-class CRYPTOPP_DLL BERDecodeErr : public InvalidArgument
-{
-public:
-	BERDecodeErr() : InvalidArgument("BER decode error") {}
-	BERDecodeErr(const std::string &s) : InvalidArgument(s) {}
-};
-
-//! \brief Interface for encoding and decoding ASN1 objects
-//! \details Each class that derives from ASN1Object should provide a serialization format
-//!   that controls subobject layout. Most of the time the serialization format is
-//!   taken from a standard, like P1363 or an RFC.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE ASN1Object
-{
-public:
-	virtual ~ASN1Object() {}
-
-	//! \brief Decode this object from a BufferedTransformation
-	//! \param bt BufferedTransformation object
-	//! \details Uses Basic Encoding Rules (BER)
-	virtual void BERDecode(BufferedTransformation &bt) =0;
-
-	//! \brief Encode this object into a BufferedTransformation
-	//! \param bt BufferedTransformation object
-	//! \details Uses Distinguished Encoding Rules (DER)
-	virtual void DEREncode(BufferedTransformation &bt) const =0;
-
-	//! \brief Encode this object into a BufferedTransformation
-	//! \param bt BufferedTransformation object
-	//! \details Uses Basic Encoding Rules (BER).
-	//! \details This may be useful if DEREncode() would be too inefficient.
-	virtual void BEREncode(BufferedTransformation &bt) const {DEREncode(bt);}
-};
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-typedef PK_SignatureScheme PK_SignatureSystem;
-typedef SimpleKeyAgreementDomain PK_SimpleKeyAgreementDomain;
-typedef AuthenticatedKeyAgreementDomain PK_AuthenticatedKeyAgreementDomain;
-#endif
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/cryptopp.rc b/src-cryptopp/cryptopp.rc
deleted file mode 100644
index bbf1635..0000000
--- a/src-cryptopp/cryptopp.rc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "windows.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,6,5,0
- PRODUCTVERSION 5,6,5,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Free crypto library, more information available at www.cryptopp.com"
-            VALUE "CompanyName", "Wei Dai"
-            VALUE "FileDescription", "Crypto++® Library DLL"
-            VALUE "FileVersion", "5, 6, 5, 0"
-            VALUE "InternalName", "cryptopp"
-            VALUE "LegalCopyright", "Copyright© 1995-2016 by Wei Dai"
-            VALUE "LegalTrademarks", "Crypto++®"
-            VALUE "OriginalFilename", "cryptopp.dll"
-            VALUE "ProductName", "Crypto++® Library"
-            VALUE "ProductVersion", "5, 6, 5, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""windows.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/src-cryptopp/des.cpp b/src-cryptopp/des.cpp
deleted file mode 100644
index 7807e75..0000000
--- a/src-cryptopp/des.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-// des.cpp - modified by Wei Dai from Phil Karn's des.c
-// The original code and all modifications are in the public domain.
-
-/*
- * This is a major rewrite of my old public domain DES code written
- * circa 1987, which in turn borrowed heavily from Jim Gillogly's 1977
- * public domain code. I pretty much kept my key scheduling code, but
- * the actual encrypt/decrypt routines are taken from from Richard
- * Outerbridge's DES code as printed in Schneier's "Applied Cryptography."
- *
- * This code is in the public domain. I would appreciate bug reports and
- * enhancements.
- *
- * Phil Karn KA9Q, karn@unix.ka9q.ampr.org, August 1994.
- */
-
-#include "pch.h"
-#include "misc.h"
-#include "des.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-typedef BlockGetAndPut<word32, BigEndian> Block;
-
-// Richard Outerbridge's initial permutation algorithm
-/*
-inline void IPERM(word32 &left, word32 &right)
-{
-	word32 work;
-
-	work = ((left >> 4) ^ right) & 0x0f0f0f0f;
-	right ^= work;
-	left ^= work << 4;
-	work = ((left >> 16) ^ right) & 0xffff;
-	right ^= work;
-	left ^= work << 16;
-	work = ((right >> 2) ^ left) & 0x33333333;
-	left ^= work;
-	right ^= (work << 2);
-	work = ((right >> 8) ^ left) & 0xff00ff;
-	left ^= work;
-	right ^= (work << 8);
-	right = rotl(right, 1);
-	work = (left ^ right) & 0xaaaaaaaa;
-	left ^= work;
-	right ^= work;
-	left = rotl(left, 1);
-}
-inline void FPERM(word32 &left, word32 &right)
-{
-	word32 work;
-
-	right = rotr(right, 1);
-	work = (left ^ right) & 0xaaaaaaaa;
-	left ^= work;
-	right ^= work;
-	left = rotr(left, 1);
-	work = ((left >> 8) ^ right) & 0xff00ff;
-	right ^= work;
-	left ^= work << 8;
-	work = ((left >> 2) ^ right) & 0x33333333;
-	right ^= work;
-	left ^= work << 2;
-	work = ((right >> 16) ^ left) & 0xffff;
-	left ^= work;
-	right ^= work << 16;
-	work = ((right >> 4) ^ left) & 0x0f0f0f0f;
-	left ^= work;
-	right ^= work << 4;
-}
-*/
-
-// Wei Dai's modification to Richard Outerbridge's initial permutation
-// algorithm, this one is faster if you have access to rotate instructions
-// (like in MSVC)
-static inline void IPERM(word32 &left, word32 &right)
-{
-	word32 work;
-
-	right = rotlFixed(right, 4U);
-	work = (left ^ right) & 0xf0f0f0f0;
-	left ^= work;
-	right = rotrFixed(right^work, 20U);
-	work = (left ^ right) & 0xffff0000;
-	left ^= work;
-	right = rotrFixed(right^work, 18U);
-	work = (left ^ right) & 0x33333333;
-	left ^= work;
-	right = rotrFixed(right^work, 6U);
-	work = (left ^ right) & 0x00ff00ff;
-	left ^= work;
-	right = rotlFixed(right^work, 9U);
-	work = (left ^ right) & 0xaaaaaaaa;
-	left = rotlFixed(left^work, 1U);
-	right ^= work;
-}
-
-static inline void FPERM(word32 &left, word32 &right)
-{
-	word32 work;
-
-	right = rotrFixed(right, 1U);
-	work = (left ^ right) & 0xaaaaaaaa;
-	right ^= work;
-	left = rotrFixed(left^work, 9U);
-	work = (left ^ right) & 0x00ff00ff;
-	right ^= work;
-	left = rotlFixed(left^work, 6U);
-	work = (left ^ right) & 0x33333333;
-	right ^= work;
-	left = rotlFixed(left^work, 18U);
-	work = (left ^ right) & 0xffff0000;
-	right ^= work;
-	left = rotlFixed(left^work, 20U);
-	work = (left ^ right) & 0xf0f0f0f0;
-	right ^= work;
-	left = rotrFixed(left^work, 4U);
-}
-
-void DES::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &)
-{
-	AssertValidKeyLength(length);
-
-	RawSetKey(GetCipherDirection(), userKey);
-}
-
-#ifndef CRYPTOPP_IMPORTS
-
-/* Tables defined in the Data Encryption Standard documents
- * Three of these tables, the initial permutation, the final
- * permutation and the expansion operator, are regular enough that
- * for speed, we hard-code them. They're here for reference only.
- * Also, the S and P boxes are used by a separate program, gensp.c,
- * to build the combined SP box, Spbox[]. They're also here just
- * for reference.
- */
-#ifdef notdef
-/* initial permutation IP */
-static byte ip[] = {
-	   58, 50, 42, 34, 26, 18, 10,  2,
-	   60, 52, 44, 36, 28, 20, 12,  4,
-	   62, 54, 46, 38, 30, 22, 14,  6,
-	   64, 56, 48, 40, 32, 24, 16,  8,
-	   57, 49, 41, 33, 25, 17,  9,  1,
-	   59, 51, 43, 35, 27, 19, 11,  3,
-	   61, 53, 45, 37, 29, 21, 13,  5,
-	   63, 55, 47, 39, 31, 23, 15,  7
-};
-
-/* final permutation IP^-1 */
-static byte fp[] = {
-	   40,  8, 48, 16, 56, 24, 64, 32,
-	   39,  7, 47, 15, 55, 23, 63, 31,
-	   38,  6, 46, 14, 54, 22, 62, 30,
-	   37,  5, 45, 13, 53, 21, 61, 29,
-	   36,  4, 44, 12, 52, 20, 60, 28,
-	   35,  3, 43, 11, 51, 19, 59, 27,
-	   34,  2, 42, 10, 50, 18, 58, 26,
-	   33,  1, 41,  9, 49, 17, 57, 25
-};
-/* expansion operation matrix */
-static byte ei[] = {
-	   32,  1,  2,  3,  4,  5,
-		4,  5,  6,  7,  8,  9,
-		8,  9, 10, 11, 12, 13,
-	   12, 13, 14, 15, 16, 17,
-	   16, 17, 18, 19, 20, 21,
-	   20, 21, 22, 23, 24, 25,
-	   24, 25, 26, 27, 28, 29,
-	   28, 29, 30, 31, 32,  1
-};
-/* The (in)famous S-boxes */
-static byte sbox[8][64] = {
-	   /* S1 */
-	   14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
-		0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
-		4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
-	   15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,
-
-	   /* S2 */
-	   15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
-		3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
-		0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
-	   13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
-
-	   /* S3 */
-	   10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
-	   13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
-	   13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
-		1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,
-
-	   /* S4 */
-		7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
-	   13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
-	   10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
-		3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,
-
-	   /* S5 */
-		2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
-	   14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
-		4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
-	   11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,
-
-	   /* S6 */
-	   12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
-	   10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
-		9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
-		4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,
-
-	   /* S7 */
-		4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
-	   13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
-		1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
-		6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,
-
-	   /* S8 */
-	   13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
-		1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
-		7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
-		2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11
-};
-
-/* 32-bit permutation function P used on the output of the S-boxes */
-namespace {
-	const byte p32i[] = {
-	   16,  7, 20, 21,
-	   29, 12, 28, 17,
-		1, 15, 23, 26,
-		5, 18, 31, 10,
-		2,  8, 24, 14,
-	   32, 27,  3,  9,
-	   19, 13, 30,  6,
-	   22, 11,  4, 25
-	};
-}
-#endif
-
-/* permuted choice table (key) */
-namespace {
-	const byte pc1[] = {
-	   57, 49, 41, 33, 25, 17,  9,
-		1, 58, 50, 42, 34, 26, 18,
-	   10,  2, 59, 51, 43, 35, 27,
-	   19, 11,  3, 60, 52, 44, 36,
-
-	   63, 55, 47, 39, 31, 23, 15,
-		7, 62, 54, 46, 38, 30, 22,
-	   14,  6, 61, 53, 45, 37, 29,
-	   21, 13,  5, 28, 20, 12,  4
-	};
-}
-
-/* number left rotations of pc1 */
-namespace {
-	const byte totrot[] = {
-	   1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28
-	};
-}
-
-/* permuted choice key (table) */
-namespace {
-	const byte pc2[] = {
-	   14, 17, 11, 24,  1,  5,
-		3, 28, 15,  6, 21, 10,
-	   23, 19, 12,  4, 26,  8,
-	   16,  7, 27, 20, 13,  2,
-	   41, 52, 31, 37, 47, 55,
-	   30, 40, 51, 45, 33, 48,
-	   44, 49, 39, 56, 34, 53,
-	   46, 42, 50, 36, 29, 32
-	};
-}
-
-/* End of DES-defined tables */
-
-/* bit 0 is left-most in byte */
-namespace {
-	const int bytebit[] = {
-	   0200,0100,040,020,010,04,02,01
-	};
-}
-
-/* Set key (initialize key schedule array) */
-void RawDES::RawSetKey(CipherDir dir, const byte *key)
-{
-#if (_MSC_VER >= 1600) || (__cplusplus >= 201103L)
-# define register /* Define to nothing for C++11 and above */
-#endif
-
-	SecByteBlock buffer(56+56+8);
-	byte *const pc1m=buffer;                 /* place to modify pc1 into */
-	byte *const pcr=pc1m+56;                 /* place to rotate pc1 into */
-	byte *const ks=pcr+56;
-	register int i,j,l;
-	int m;
-
-	for (j=0; j<56; j++) {          /* convert pc1 to bits of key */
-		l=pc1[j]-1;             /* integer bit location  */
-		m = l & 07;             /* find bit              */
-		pc1m[j]=(key[l>>3] &    /* find which key byte l is in */
-			bytebit[m])     /* and which bit of that byte */
-			? 1 : 0;        /* and store 1-bit result */
-	}
-	for (i=0; i<16; i++) {          /* key chunk for each iteration */
-		memset(ks,0,8);         /* Clear key schedule */
-		for (j=0; j<56; j++)    /* rotate pc1 the right amount */
-			pcr[j] = pc1m[(l=j+totrot[i])<(j<28? 28 : 56) ? l: l-28];
-		/* rotate left and right halves independently */
-		for (j=0; j<48; j++){   /* select bits individually */
-			/* check bit that goes to ks[j] */
-			if (pcr[pc2[j]-1]){
-				/* mask it in if it's there */
-				l= j % 6;
-				ks[j/6] |= bytebit[l] >> 2;
-			}
-		}
-		/* Now convert to odd/even interleaved form for use in F */
-		k[2*i] = ((word32)ks[0] << 24)
-			| ((word32)ks[2] << 16)
-			| ((word32)ks[4] << 8)
-			| ((word32)ks[6]);
-		k[2*i+1] = ((word32)ks[1] << 24)
-			| ((word32)ks[3] << 16)
-			| ((word32)ks[5] << 8)
-			| ((word32)ks[7]);
-	}
-
-	if (dir==DECRYPTION)     // reverse key schedule order
-		for (i=0; i<16; i+=2)
-		{
-			std::swap(k[i], k[32-2-i]);
-			std::swap(k[i+1], k[32-1-i]);
-		}
-}
-
-void RawDES::RawProcessBlock(word32 &l_, word32 &r_) const
-{
-	word32 l = l_, r = r_;
-	const word32 *kptr=k;
-
-	for (unsigned i=0; i<8; i++)
-	{
-		word32 work = rotrFixed(r, 4U) ^ kptr[4*i+0];
-		l ^= Spbox[6][(work) & 0x3f]
-		  ^  Spbox[4][(work >> 8) & 0x3f]
-		  ^  Spbox[2][(work >> 16) & 0x3f]
-		  ^  Spbox[0][(work >> 24) & 0x3f];
-		work = r ^ kptr[4*i+1];
-		l ^= Spbox[7][(work) & 0x3f]
-		  ^  Spbox[5][(work >> 8) & 0x3f]
-		  ^  Spbox[3][(work >> 16) & 0x3f]
-		  ^  Spbox[1][(work >> 24) & 0x3f];
-
-		work = rotrFixed(l, 4U) ^ kptr[4*i+2];
-		r ^= Spbox[6][(work) & 0x3f]
-		  ^  Spbox[4][(work >> 8) & 0x3f]
-		  ^  Spbox[2][(work >> 16) & 0x3f]
-		  ^  Spbox[0][(work >> 24) & 0x3f];
-		work = l ^ kptr[4*i+3];
-		r ^= Spbox[7][(work) & 0x3f]
-		  ^  Spbox[5][(work >> 8) & 0x3f]
-		  ^  Spbox[3][(work >> 16) & 0x3f]
-		  ^  Spbox[1][(work >> 24) & 0x3f];
-	}
-
-	l_ = l; r_ = r;
-}
-
-void DES_EDE2::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &)
-{
-	AssertValidKeyLength(length);
-
-	m_des1.RawSetKey(GetCipherDirection(), userKey);
-	m_des2.RawSetKey(ReverseCipherDir(GetCipherDirection()), userKey+8);
-}
-
-void DES_EDE2::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-{
-	word32 l,r;
-	Block::Get(inBlock)(l)(r);
-	IPERM(l,r);
-	m_des1.RawProcessBlock(l, r);
-	m_des2.RawProcessBlock(r, l);
-	m_des1.RawProcessBlock(l, r);
-	FPERM(l,r);
-	Block::Put(xorBlock, outBlock)(r)(l);
-}
-
-void DES_EDE3::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &)
-{
-	AssertValidKeyLength(length);
-
-	m_des1.RawSetKey(GetCipherDirection(), userKey + (IsForwardTransformation() ? 0 : 16));
-	m_des2.RawSetKey(ReverseCipherDir(GetCipherDirection()), userKey + 8);
-	m_des3.RawSetKey(GetCipherDirection(), userKey + (IsForwardTransformation() ? 16 : 0));
-}
-
-void DES_EDE3::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-{
-	word32 l,r;
-	Block::Get(inBlock)(l)(r);
-	IPERM(l,r);
-	m_des1.RawProcessBlock(l, r);
-	m_des2.RawProcessBlock(r, l);
-	m_des3.RawProcessBlock(l, r);
-	FPERM(l,r);
-	Block::Put(xorBlock, outBlock)(r)(l);
-}
-
-#endif	// #ifndef CRYPTOPP_IMPORTS
-
-static inline bool CheckParity(byte b)
-{
-	unsigned int a = b ^ (b >> 4);
-	return ((a ^ (a>>1) ^ (a>>2) ^ (a>>3)) & 1) == 1;
-}
-
-bool DES::CheckKeyParityBits(const byte *key)
-{
-	for (unsigned int i=0; i<8; i++)
-		if (!CheckParity(key[i]))
-			return false;
-	return true;
-}
-
-void DES::CorrectKeyParityBits(byte *key)
-{
-	for (unsigned int i=0; i<8; i++)
-		if (!CheckParity(key[i]))
-			key[i] ^= 1;
-}
-
-// Encrypt or decrypt a block of data in ECB mode
-void DES::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-{
-	word32 l,r;
-	Block::Get(inBlock)(l)(r);
-	IPERM(l,r);
-	RawProcessBlock(l, r);
-	FPERM(l,r);
-	Block::Put(xorBlock, outBlock)(r)(l);
-}
-
-void DES_XEX3::Base::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &)
-{
-	AssertValidKeyLength(length);
-
-	if (!m_des.get())
-		m_des.reset(new DES::Encryption);
-
-	memcpy(m_x1, key + (IsForwardTransformation() ? 0 : 16), BLOCKSIZE);
-	m_des->RawSetKey(GetCipherDirection(), key + 8);
-	memcpy(m_x3, key + (IsForwardTransformation() ? 16 : 0), BLOCKSIZE);
-}
-
-void DES_XEX3::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-{
-	xorbuf(outBlock, inBlock, m_x1, BLOCKSIZE);
-	m_des->ProcessAndXorBlock(outBlock, xorBlock, outBlock);
-	xorbuf(outBlock, m_x3, BLOCKSIZE);
-}
-
-NAMESPACE_END
diff --git a/src-cryptopp/des.h b/src-cryptopp/des.h
deleted file mode 100644
index 3e686dc..0000000
--- a/src-cryptopp/des.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// des.h - written and placed in the public domain by Wei Dai
-
-//! \file des.h
-//! \brief Classes for DES, 2-key Triple-DES, 3-key Triple-DES and DESX
-
-#ifndef CRYPTOPP_DES_H
-#define CRYPTOPP_DES_H
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class RawDES
-//! \brief DES block cipher base class
-class CRYPTOPP_DLL RawDES
-{
-public:
-	void RawSetKey(CipherDir direction, const byte *userKey);
-	void RawProcessBlock(word32 &l, word32 &r) const;
-
-protected:
-	static const word32 Spbox[8][64];
-
-	FixedSizeSecBlock<word32, 32> k;
-};
-
-//! \class DES_Info
-//! \brief DES block cipher information
-struct DES_Info : public FixedBlockSize<8>, public FixedKeyLength<8>
-{
-	// disable DES in DLL version by not exporting this function
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "DES";}
-};
-
-//! \class DES
-//! \brief DES block cipher
-//! \details The DES implementation in Crypto++ ignores the parity bits
-//!   (the least significant bits of each byte) in the key. However you can use CheckKeyParityBits()
-//!   and CorrectKeyParityBits() to	check or correct the parity bits if you wish.
-//! \sa <a href="http://www.weidai.com/scan-mirror/cs.html#DES">DES</a>
-class DES : public DES_Info, public BlockCipherDocumentation
-{
-	//! \class Base
-	//! \brief DES block cipher default operation
-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_Info>, public RawDES
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-	};
-
-public:
-	//! check DES key parity bits
-	static bool CheckKeyParityBits(const byte *key);
-	//! correct DES key parity bits
-	static void CorrectKeyParityBits(byte *key);
-
-	typedef BlockCipherFinal<ENCRYPTION, Base> Encryption;
-	typedef BlockCipherFinal<DECRYPTION, Base> Decryption;
-};
-
-//! \class DES_EDE2_Info
-//! \brief 2-key TripleDES block cipher information
-struct DES_EDE2_Info : public FixedBlockSize<8>, public FixedKeyLength<16>
-{
-	CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return "DES-EDE2";}
-};
-
-//! \class DES_EDE2
-//! \brief 2-key TripleDES block cipher
-/// \sa <a href="http://www.weidai.com/scan-mirror/cs.html#DESede">DES-EDE2</a>
-class DES_EDE2 : public DES_EDE2_Info, public BlockCipherDocumentation
-{
-	//! \class Base
-	//! \brief DES_EDE2 block cipher default operation
-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE2_Info>
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-
-	protected:
-		RawDES m_des1, m_des2;
-	};
-
-public:
-	typedef BlockCipherFinal<ENCRYPTION, Base> Encryption;
-	typedef BlockCipherFinal<DECRYPTION, Base> Decryption;
-};
-
-//! \class DES_EDE3_Info
-//! \brief 3-key TripleDES block cipher information
-struct DES_EDE3_Info : public FixedBlockSize<8>, public FixedKeyLength<24>
-{
-	CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return "DES-EDE3";}
-};
-
-//! \class DES_EDE3
-//! \brief 3-key TripleDES block cipher
-//! \sa <a href="http://www.weidai.com/scan-mirror/cs.html#DESede">DES-EDE3</a>
-class DES_EDE3 : public DES_EDE3_Info, public BlockCipherDocumentation
-{
-	//! \class Base
-	//! \brief DES_EDE3 block cipher default operation
-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE3_Info>
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-
-	protected:
-		RawDES m_des1, m_des2, m_des3;
-	};
-
-public:
-	typedef BlockCipherFinal<ENCRYPTION, Base> Encryption;
-	typedef BlockCipherFinal<DECRYPTION, Base> Decryption;
-};
-
-//! \class DES_XEX3_Info
-//! \brief DESX block cipher information
-struct DES_XEX3_Info : public FixedBlockSize<8>, public FixedKeyLength<24>
-{
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "DES-XEX3";}
-};
-
-//! \class DES_XEX3
-//! \brief DESX block cipher
-//! \sa <a href="http://www.weidai.com/scan-mirror/cs.html#DESX">DES-XEX3</a>, AKA DESX
-class DES_XEX3 : public DES_XEX3_Info, public BlockCipherDocumentation
-{
-	//! \class Base
-	//! \brief DES_XEX3 block cipher default operation
-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_XEX3_Info>
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-
-	protected:
-		FixedSizeSecBlock<byte, BLOCKSIZE> m_x1, m_x3;
-		// VS2005 workaround: calling modules compiled with /clr gets unresolved external symbol DES::Base::ProcessAndXorBlock
-		// if we use DES::Encryption here directly without value_ptr.
-		value_ptr<DES::Encryption> m_des;
-	};
-
-public:
-	typedef BlockCipherFinal<ENCRYPTION, Base> Encryption;
-	typedef BlockCipherFinal<DECRYPTION, Base> Decryption;
-};
-
-typedef DES::Encryption DESEncryption;
-typedef DES::Decryption DESDecryption;
-
-typedef DES_EDE2::Encryption DES_EDE2_Encryption;
-typedef DES_EDE2::Decryption DES_EDE2_Decryption;
-
-typedef DES_EDE3::Encryption DES_EDE3_Encryption;
-typedef DES_EDE3::Decryption DES_EDE3_Decryption;
-
-typedef DES_XEX3::Encryption DES_XEX3_Encryption;
-typedef DES_XEX3::Decryption DES_XEX3_Decryption;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/dessp.cpp b/src-cryptopp/dessp.cpp
deleted file mode 100644
index 9382721..0000000
--- a/src-cryptopp/dessp.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// This file is mostly generated by Phil Karn's gensp.c
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "des.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// VC60 workaround: gives a C4786 warning without this function
-// when runtime lib is set to multithread debug DLL
-// even though warning 4786 is disabled!
-void DES_VC60Workaround()
-{
-}
-
-const word32 RawDES::Spbox[8][64] = {
-{
-0x01010400,0x00000000,0x00010000,0x01010404, 0x01010004,0x00010404,0x00000004,0x00010000,
-0x00000400,0x01010400,0x01010404,0x00000400, 0x01000404,0x01010004,0x01000000,0x00000004,
-0x00000404,0x01000400,0x01000400,0x00010400, 0x00010400,0x01010000,0x01010000,0x01000404,
-0x00010004,0x01000004,0x01000004,0x00010004, 0x00000000,0x00000404,0x00010404,0x01000000,
-0x00010000,0x01010404,0x00000004,0x01010000, 0x01010400,0x01000000,0x01000000,0x00000400,
-0x01010004,0x00010000,0x00010400,0x01000004, 0x00000400,0x00000004,0x01000404,0x00010404,
-0x01010404,0x00010004,0x01010000,0x01000404, 0x01000004,0x00000404,0x00010404,0x01010400,
-0x00000404,0x01000400,0x01000400,0x00000000, 0x00010004,0x00010400,0x00000000,0x01010004},
-{
-0x80108020,0x80008000,0x00008000,0x00108020, 0x00100000,0x00000020,0x80100020,0x80008020,
-0x80000020,0x80108020,0x80108000,0x80000000, 0x80008000,0x00100000,0x00000020,0x80100020,
-0x00108000,0x00100020,0x80008020,0x00000000, 0x80000000,0x00008000,0x00108020,0x80100000,
-0x00100020,0x80000020,0x00000000,0x00108000, 0x00008020,0x80108000,0x80100000,0x00008020,
-0x00000000,0x00108020,0x80100020,0x00100000, 0x80008020,0x80100000,0x80108000,0x00008000,
-0x80100000,0x80008000,0x00000020,0x80108020, 0x00108020,0x00000020,0x00008000,0x80000000,
-0x00008020,0x80108000,0x00100000,0x80000020, 0x00100020,0x80008020,0x80000020,0x00100020,
-0x00108000,0x00000000,0x80008000,0x00008020, 0x80000000,0x80100020,0x80108020,0x00108000},
-{
-0x00000208,0x08020200,0x00000000,0x08020008, 0x08000200,0x00000000,0x00020208,0x08000200,
-0x00020008,0x08000008,0x08000008,0x00020000, 0x08020208,0x00020008,0x08020000,0x00000208,
-0x08000000,0x00000008,0x08020200,0x00000200, 0x00020200,0x08020000,0x08020008,0x00020208,
-0x08000208,0x00020200,0x00020000,0x08000208, 0x00000008,0x08020208,0x00000200,0x08000000,
-0x08020200,0x08000000,0x00020008,0x00000208, 0x00020000,0x08020200,0x08000200,0x00000000,
-0x00000200,0x00020008,0x08020208,0x08000200, 0x08000008,0x00000200,0x00000000,0x08020008,
-0x08000208,0x00020000,0x08000000,0x08020208, 0x00000008,0x00020208,0x00020200,0x08000008,
-0x08020000,0x08000208,0x00000208,0x08020000, 0x00020208,0x00000008,0x08020008,0x00020200},
-{
-0x00802001,0x00002081,0x00002081,0x00000080, 0x00802080,0x00800081,0x00800001,0x00002001,
-0x00000000,0x00802000,0x00802000,0x00802081, 0x00000081,0x00000000,0x00800080,0x00800001,
-0x00000001,0x00002000,0x00800000,0x00802001, 0x00000080,0x00800000,0x00002001,0x00002080,
-0x00800081,0x00000001,0x00002080,0x00800080, 0x00002000,0x00802080,0x00802081,0x00000081,
-0x00800080,0x00800001,0x00802000,0x00802081, 0x00000081,0x00000000,0x00000000,0x00802000,
-0x00002080,0x00800080,0x00800081,0x00000001, 0x00802001,0x00002081,0x00002081,0x00000080,
-0x00802081,0x00000081,0x00000001,0x00002000, 0x00800001,0x00002001,0x00802080,0x00800081,
-0x00002001,0x00002080,0x00800000,0x00802001, 0x00000080,0x00800000,0x00002000,0x00802080},
-{
-0x00000100,0x02080100,0x02080000,0x42000100, 0x00080000,0x00000100,0x40000000,0x02080000,
-0x40080100,0x00080000,0x02000100,0x40080100, 0x42000100,0x42080000,0x00080100,0x40000000,
-0x02000000,0x40080000,0x40080000,0x00000000, 0x40000100,0x42080100,0x42080100,0x02000100,
-0x42080000,0x40000100,0x00000000,0x42000000, 0x02080100,0x02000000,0x42000000,0x00080100,
-0x00080000,0x42000100,0x00000100,0x02000000, 0x40000000,0x02080000,0x42000100,0x40080100,
-0x02000100,0x40000000,0x42080000,0x02080100, 0x40080100,0x00000100,0x02000000,0x42080000,
-0x42080100,0x00080100,0x42000000,0x42080100, 0x02080000,0x00000000,0x40080000,0x42000000,
-0x00080100,0x02000100,0x40000100,0x00080000, 0x00000000,0x40080000,0x02080100,0x40000100},
-{
-0x20000010,0x20400000,0x00004000,0x20404010, 0x20400000,0x00000010,0x20404010,0x00400000,
-0x20004000,0x00404010,0x00400000,0x20000010, 0x00400010,0x20004000,0x20000000,0x00004010,
-0x00000000,0x00400010,0x20004010,0x00004000, 0x00404000,0x20004010,0x00000010,0x20400010,
-0x20400010,0x00000000,0x00404010,0x20404000, 0x00004010,0x00404000,0x20404000,0x20000000,
-0x20004000,0x00000010,0x20400010,0x00404000, 0x20404010,0x00400000,0x00004010,0x20000010,
-0x00400000,0x20004000,0x20000000,0x00004010, 0x20000010,0x20404010,0x00404000,0x20400000,
-0x00404010,0x20404000,0x00000000,0x20400010, 0x00000010,0x00004000,0x20400000,0x00404010,
-0x00004000,0x00400010,0x20004010,0x00000000, 0x20404000,0x20000000,0x00400010,0x20004010},
-{
-0x00200000,0x04200002,0x04000802,0x00000000, 0x00000800,0x04000802,0x00200802,0x04200800,
-0x04200802,0x00200000,0x00000000,0x04000002, 0x00000002,0x04000000,0x04200002,0x00000802,
-0x04000800,0x00200802,0x00200002,0x04000800, 0x04000002,0x04200000,0x04200800,0x00200002,
-0x04200000,0x00000800,0x00000802,0x04200802, 0x00200800,0x00000002,0x04000000,0x00200800,
-0x04000000,0x00200800,0x00200000,0x04000802, 0x04000802,0x04200002,0x04200002,0x00000002,
-0x00200002,0x04000000,0x04000800,0x00200000, 0x04200800,0x00000802,0x00200802,0x04200800,
-0x00000802,0x04000002,0x04200802,0x04200000, 0x00200800,0x00000000,0x00000002,0x04200802,
-0x00000000,0x00200802,0x04200000,0x00000800, 0x04000002,0x04000800,0x00000800,0x00200002},
-{
-0x10001040,0x00001000,0x00040000,0x10041040, 0x10000000,0x10001040,0x00000040,0x10000000,
-0x00040040,0x10040000,0x10041040,0x00041000, 0x10041000,0x00041040,0x00001000,0x00000040,
-0x10040000,0x10000040,0x10001000,0x00001040, 0x00041000,0x00040040,0x10040040,0x10041000,
-0x00001040,0x00000000,0x00000000,0x10040040, 0x10000040,0x10001000,0x00041040,0x00040000,
-0x00041040,0x00040000,0x10041000,0x00001000, 0x00000040,0x10040040,0x00001000,0x00041040,
-0x10001000,0x00000040,0x10000040,0x10040000, 0x10040040,0x10000000,0x00040000,0x10001040,
-0x00000000,0x10041040,0x00040040,0x10000040, 0x10040000,0x10001000,0x10001040,0x00000000,
-0x10041040,0x00041000,0x00041000,0x00001040, 0x00001040,0x00040040,0x10000000,0x10041000}
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/dh.h b/src-cryptopp/dh.h
deleted file mode 100644
index f0558a8..0000000
--- a/src-cryptopp/dh.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// dh.h - written and placed in the public domain by Wei Dai
-
-//! \file dh.h
-//! \brief Classes for Diffie-Hellman key exchange
-
-#ifndef CRYPTOPP_DH_H
-#define CRYPTOPP_DH_H
-
-#include "cryptlib.h"
-#include "gfpcrypt.h"
-#include "algebra.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class DH_Domain
-//! \brief Diffie-Hellman domain
-//! \tparam GROUP_PARAMETERS group parameters
-//! \tparam COFACTOR_OPTION \ref CofactorMultiplicationOption "cofactor multiplication option"
-//! \details A Diffie-Hellman domain is a set of parameters that must be shared
-//!   by two parties in a key agreement protocol, along with the algorithms
-//!   for generating key pairs and deriving agreed values.
-template <class GROUP_PARAMETERS, class COFACTOR_OPTION = CPP_TYPENAME GROUP_PARAMETERS::DefaultCofactorOption>
-class DH_Domain : public DL_SimpleKeyAgreementDomainBase<typename GROUP_PARAMETERS::Element>
-{
-	typedef DL_SimpleKeyAgreementDomainBase<typename GROUP_PARAMETERS::Element> Base;
-
-public:
-	typedef GROUP_PARAMETERS GroupParameters;
-	typedef typename GroupParameters::Element Element;
-	typedef DL_KeyAgreementAlgorithm_DH<Element, COFACTOR_OPTION> DH_Algorithm;
-	typedef DH_Domain<GROUP_PARAMETERS, COFACTOR_OPTION> Domain;
-
-	//! \brief Construct a Diffie-Hellman domain
-	DH_Domain() {}
-
-	//! \brief Construct a Diffie-Hellman domain
-	//! \param params group parameters and options
-	DH_Domain(const GroupParameters &params)
-		: m_groupParameters(params) {}
-
-	//! \brief Construct a Diffie-Hellman domain
-	//! \param bt BufferedTransformation with group parameters and options
-	DH_Domain(BufferedTransformation &bt)
-		{m_groupParameters.BERDecode(bt);}
-
-	//! \brief Construct a Diffie-Hellman domain
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \param v1 RandomNumberGenerator derived class
-	//! \param v2 second parameter
-	//! \details v1 and v2 are passed directly to the GROUP_PARAMETERS object.
-	template <class T2>
-	DH_Domain(RandomNumberGenerator &v1, const T2 &v2)
-		{m_groupParameters.Initialize(v1, v2);}
-
-	//! \brief Construct a Diffie-Hellman domain
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \tparam T3 template parameter used as a constructor parameter
-	//! \param v1 RandomNumberGenerator derived class
-	//! \param v2 second parameter
-	//! \param v3 third parameter
-	//! \details v1, v2 and v3 are passed directly to the GROUP_PARAMETERS object.
-	template <class T2, class T3>
-	DH_Domain(RandomNumberGenerator &v1, const T2 &v2, const T3 &v3)
-		{m_groupParameters.Initialize(v1, v2, v3);}
-
-	//! \brief Construct a Diffie-Hellman domain
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \tparam T3 template parameter used as a constructor parameter
-	//! \tparam T4 template parameter used as a constructor parameter
-	//! \param v1 RandomNumberGenerator derived class
-	//! \param v2 second parameter
-	//! \param v3 third parameter
-	//! \param v4 fourth parameter
-	//! \details v1, v2, v3 and v4 are passed directly to the GROUP_PARAMETERS object.
-	template <class T2, class T3, class T4>
-	DH_Domain(RandomNumberGenerator &v1, const T2 &v2, const T3 &v3, const T4 &v4)
-		{m_groupParameters.Initialize(v1, v2, v3, v4);}
-
-	//! \brief Construct a Diffie-Hellman domain
-	//! \tparam T1 template parameter used as a constructor parameter
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \param v1 first parameter
-	//! \param v2 second parameter
-	//! \details v1 and v2 are passed directly to the GROUP_PARAMETERS object.
-	template <class T1, class T2>
-	DH_Domain(const T1 &v1, const T2 &v2)
-		{m_groupParameters.Initialize(v1, v2);}
-
-	//! \brief Construct a Diffie-Hellman domain
-	//! \tparam T1 template parameter used as a constructor parameter
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \tparam T3 template parameter used as a constructor parameter
-	//! \param v1 first parameter
-	//! \param v2 second parameter
-	//! \param v3 third parameter
-	//! \details v1, v2 and v3 are passed directly to the GROUP_PARAMETERS object.
-	template <class T1, class T2, class T3>
-	DH_Domain(const T1 &v1, const T2 &v2, const T3 &v3)
-		{m_groupParameters.Initialize(v1, v2, v3);}
-
-	//! \brief Construct a Diffie-Hellman domain
-	//! \tparam T1 template parameter used as a constructor parameter
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \tparam T3 template parameter used as a constructor parameter
-	//! \tparam T4 template parameter used as a constructor parameter
-	//! \param v1 first parameter
-	//! \param v2 second parameter
-	//! \param v3 third parameter
-	//! \param v4 fourth parameter
-	//! \details v1, v2, v3 and v4 are passed directly to the GROUP_PARAMETERS object.
-	template <class T1, class T2, class T3, class T4>
-	DH_Domain(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4)
-		{m_groupParameters.Initialize(v1, v2, v3, v4);}
-
-	//! \brief Retrieves the group parameters for this domain
-	//! \return the group parameters for this domain as a const reference
-	const GroupParameters & GetGroupParameters() const {return m_groupParameters;}
-	//! \brief Retrieves the group parameters for this domain
-	//! \return the group parameters for this domain as a non-const reference
-	GroupParameters & AccessGroupParameters() {return m_groupParameters;}
-
-	//! \brief Generate a public key from a private key in this domain
-	//! \param rng RandomNumberGenerator derived class
-	//! \param privateKey byte buffer with the previously generated private key
-	//! \param publicKey byte buffer for the generated public key in this domain
-	//! \details If using a FIPS 140-2 validated library on Windows, then this class will perform
-	//!   a self test to ensure the key pair is pairwise consistent. Non-FIPS and non-Windows
-	//!   builds of the library do not provide FIPS validated cryptography, so the code should be
-	//!   removed by the optimizer.
-	//! \pre <tt>COUNTOF(publicKey) == PublicKeyLength()</tt>
-	void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const
-	{
-		Base::GeneratePublicKey(rng, privateKey, publicKey);
-
-		if (FIPS_140_2_ComplianceEnabled())
-		{
-			SecByteBlock privateKey2(this->PrivateKeyLength());
-			this->GeneratePrivateKey(rng, privateKey2);
-
-			SecByteBlock publicKey2(this->PublicKeyLength());
-			Base::GeneratePublicKey(rng, privateKey2, publicKey2);
-
-			SecByteBlock agreedValue(this->AgreedValueLength()), agreedValue2(this->AgreedValueLength());
-			bool agreed1 = this->Agree(agreedValue, privateKey, publicKey2);
-			bool agreed2 = this->Agree(agreedValue2, privateKey2, publicKey);
-
-			if (!agreed1 || !agreed2 || agreedValue != agreedValue2)
-				throw SelfTestFailure(this->AlgorithmName() + ": pairwise consistency test failed");
-		}
-	}
-
-	static std::string CRYPTOPP_API StaticAlgorithmName()
-		{return GroupParameters::StaticAlgorithmNamePrefix() + DH_Algorithm::StaticAlgorithmName();}
-	std::string AlgorithmName() const {return StaticAlgorithmName();}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DH_Domain() {}
-#endif
-
-private:
-	const DL_KeyAgreementAlgorithm<Element> & GetKeyAgreementAlgorithm() const
-		{return Singleton<DH_Algorithm>().Ref();}
-	DL_GroupParameters<Element> & AccessAbstractGroupParameters()
-		{return m_groupParameters;}
-
-	GroupParameters m_groupParameters;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DH_Domain<DL_GroupParameters_GFP_DefaultSafePrime>;
-
-//! <a href="http://www.weidai.com/scan-mirror/ka.html#DH">Diffie-Hellman</a> in GF(p) with key validation
-typedef DH_Domain<DL_GroupParameters_GFP_DefaultSafePrime> DH;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/dll.cpp b/src-cryptopp/dll.cpp
deleted file mode 100644
index 26a658a..0000000
--- a/src-cryptopp/dll.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// dll.cpp - written and placed in the public domain by Wei Dai
-
-#define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
-#define CRYPTOPP_DEFAULT_NO_DLL
-
-#include "dll.h"
-#include "config.h"
-
-// TODO: fix the C4589 warnings
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4589)
-#endif
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(default: 4660)
-#endif
-
-#if defined(CRYPTOPP_EXPORTS) && defined(CRYPTOPP_WIN32_AVAILABLE)
-#include <windows.h>
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// Guarding based on DLL due to Clang, http://github.com/weidai11/cryptopp/issues/300
-#if defined(CRYPTOPP_IS_DLL)
-template<> const byte PKCS_DigestDecoration<SHA1>::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x04,0x14};
-template<> const unsigned int PKCS_DigestDecoration<SHA1>::length = sizeof(PKCS_DigestDecoration<SHA1>::decoration);
-
-template<> const byte PKCS_DigestDecoration<SHA224>::decoration[] = {0x30,0x2d,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,0x05,0x00,0x04,0x1c};
-template<> const unsigned int PKCS_DigestDecoration<SHA224>::length = sizeof(PKCS_DigestDecoration<SHA224>::decoration);
-
-template<> const byte PKCS_DigestDecoration<SHA256>::decoration[] = {0x30,0x31,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,0x05,0x00,0x04,0x20};
-template<> const unsigned int PKCS_DigestDecoration<SHA256>::length = sizeof(PKCS_DigestDecoration<SHA256>::decoration);
-
-template<> const byte PKCS_DigestDecoration<SHA384>::decoration[] = {0x30,0x41,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,0x05,0x00,0x04,0x30};
-template<> const unsigned int PKCS_DigestDecoration<SHA384>::length = sizeof(PKCS_DigestDecoration<SHA384>::decoration);
-
-template<> const byte PKCS_DigestDecoration<SHA512>::decoration[] = {0x30,0x51,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,0x05,0x00,0x04,0x40};
-template<> const unsigned int PKCS_DigestDecoration<SHA512>::length = sizeof(PKCS_DigestDecoration<SHA512>::decoration);
-
-template<> const byte EMSA2HashId<SHA1>::id = 0x33;
-template<> const byte EMSA2HashId<SHA224>::id = 0x38;
-template<> const byte EMSA2HashId<SHA256>::id = 0x34;
-template<> const byte EMSA2HashId<SHA384>::id = 0x36;
-template<> const byte EMSA2HashId<SHA512>::id = 0x35;
-
-#endif	// CRYPTOPP_IS_DLL
-
-NAMESPACE_END
-
-#endif
-
-#ifdef CRYPTOPP_EXPORTS
-
-USING_NAMESPACE(CryptoPP)
-
-#if !(defined(_MSC_VER) && (_MSC_VER < 1300))
-using std::set_new_handler;
-#endif
-
-static PNew s_pNew = NULL;
-static PDelete s_pDelete = NULL;
-
-static void * New (size_t size)
-{
-	void *p;
-	while ((p = malloc(size)) == NULL)
-		CallNewHandler();
-
-	return p;
-}
-
-// Cast from FARPROC to funcptr with args, http://stackoverflow.com/q/4192058/608639
-#pragma warning(disable: 4191)
-
-static void SetNewAndDeleteFunctionPointers()
-{
-	void *p = NULL;
-	HMODULE hModule = NULL;
-	MEMORY_BASIC_INFORMATION mbi;
-
-	while (true)
-	{
-		VirtualQuery(p, &mbi, sizeof(mbi));
-
-		if (p >= (char *)mbi.BaseAddress + mbi.RegionSize)
-			break;
-
-		p = (char *)mbi.BaseAddress + mbi.RegionSize;
-
-		if (!mbi.AllocationBase || mbi.AllocationBase == hModule)
-			continue;
-
-		hModule = HMODULE(mbi.AllocationBase);
-		PGetNewAndDelete pGetNewAndDelete = (PGetNewAndDelete)GetProcAddress(hModule, "GetNewAndDeleteForCryptoPP");
-		if (pGetNewAndDelete)
-		{
-			pGetNewAndDelete(s_pNew, s_pDelete);
-			return;
-		}
-
-		PSetNewAndDelete pSetNewAndDelete = (PSetNewAndDelete)GetProcAddress(hModule, "SetNewAndDeleteFromCryptoPP");
-		if (pSetNewAndDelete)
-		{
-			s_pNew = &New;
-			s_pDelete = &free;
-			pSetNewAndDelete(s_pNew, s_pDelete, &set_new_handler);
-			return;
-		}
-	}
-
-	// try getting these directly using mangled names of new and delete operators
-
-	hModule = GetModuleHandle("msvcrtd");
-	if (!hModule)
-		hModule = GetModuleHandle("msvcrt");
-	if (hModule)
-	{
-		// 32-bit versions
-		s_pNew = (PNew)GetProcAddress(hModule, "??2@YAPAXI@Z");
-		s_pDelete = (PDelete)GetProcAddress(hModule, "??3@YAXPAX@Z");
-		if (s_pNew && s_pDelete)
-			return;
-
-		// 64-bit versions
-		s_pNew = (PNew)GetProcAddress(hModule, "??2@YAPEAX_K@Z");
-		s_pDelete = (PDelete)GetProcAddress(hModule, "??3@YAXPEAX@Z");
-		if (s_pNew && s_pDelete)
-			return;
-	}
-
-	OutputDebugString("Crypto++ DLL was not able to obtain new and delete function pointers.\n");
-	throw 0;
-}
-
-// Cast from FARPROC to funcptr with args
-#pragma warning(default: 4191)
-
-void * operator new (size_t size)
-{
-	if (!s_pNew)
-		SetNewAndDeleteFunctionPointers();
-
-	return s_pNew(size);
-}
-
-void operator delete (void * p)
-{
-	s_pDelete(p);
-}
-
-void * operator new [] (size_t size)
-{
-	return operator new (size);
-}
-
-void operator delete [] (void * p)
-{
-	operator delete (p);
-}
-
-#endif	// #ifdef CRYPTOPP_EXPORTS
diff --git a/src-cryptopp/dll.h b/src-cryptopp/dll.h
deleted file mode 100644
index 3fd4b08..0000000
--- a/src-cryptopp/dll.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// dll.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile dll.h
-//! \brief Functions and definitions required for building the FIPS-140 DLL on Windows
-
-#ifndef CRYPTOPP_DLL_H
-#define CRYPTOPP_DLL_H
-
-#if !defined(CRYPTOPP_IMPORTS) && !defined(CRYPTOPP_EXPORTS) && !defined(CRYPTOPP_DEFAULT_NO_DLL)
-#ifdef CRYPTOPP_CONFIG_H
-#error To use the DLL version of Crypto++, this file must be included before any other Crypto++ header files.
-#endif
-#define CRYPTOPP_IMPORTS
-#endif
-
-#include "aes.h"
-#include "cbcmac.h"
-#include "ccm.h"
-#include "cmac.h"
-#include "channels.h"
-#include "des.h"
-#include "dh.h"
-#include "dsa.h"
-#include "ec2n.h"
-#include "eccrypto.h"
-#include "ecp.h"
-#include "files.h"
-#include "fips140.h"
-#include "gcm.h"
-#include "hex.h"
-#include "hmac.h"
-#include "modes.h"
-#include "mqueue.h"
-#include "nbtheory.h"
-#include "osrng.h"
-#include "pkcspad.h"
-#include "pssr.h"
-#include "randpool.h"
-#include "rsa.h"
-#include "rw.h"
-#include "sha.h"
-#include "skipjack.h"
-#include "trdlocal.h"
-
-#ifdef CRYPTOPP_IMPORTS
-
-#ifdef _DLL
-// cause CRT DLL to be initialized before Crypto++ so that we can use malloc and free during DllMain()
-#ifdef CRYPTOPP_DEBUG
-# pragma comment(lib, "msvcrtd")
-# pragma comment(lib, "cryptopp")
-#else
-# pragma comment(lib, "msvcrt")
-# pragma comment(lib, "cryptopp")
-#endif
-#endif
-
-#endif		// #ifdef CRYPTOPP_IMPORTS
-
-#include <new>	// for new_handler
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#if !(defined(_MSC_VER) && (_MSC_VER < 1300))
-using std::new_handler;
-#endif
-
-typedef void * (CRYPTOPP_API * PNew)(size_t);
-typedef void (CRYPTOPP_API * PDelete)(void *);
-typedef void (CRYPTOPP_API * PGetNewAndDelete)(PNew &, PDelete &);
-typedef new_handler (CRYPTOPP_API * PSetNewHandler)(new_handler);
-typedef void (CRYPTOPP_API * PSetNewAndDelete)(PNew, PDelete, PSetNewHandler);
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/dsa.cpp b/src-cryptopp/dsa.cpp
deleted file mode 100644
index 0141fcd..0000000
--- a/src-cryptopp/dsa.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// dsa.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "dsa.h"
-#include "asn.h"
-#include "integer.h"
-#include "filters.h"
-#include "nbtheory.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-size_t DSAConvertSignatureFormat(byte *buffer, size_t bufferSize, DSASignatureFormat toFormat, const byte *signature, size_t signatureLen, DSASignatureFormat fromFormat)
-{
-	Integer r, s;
-	StringStore store(signature, signatureLen);
-	ArraySink sink(buffer, bufferSize);
-
-	switch (fromFormat)
-	{
-	case DSA_P1363:
-		r.Decode(store, signatureLen/2);
-		s.Decode(store, signatureLen/2);
-		break;
-	case DSA_DER:
-	{
-		BERSequenceDecoder seq(store);
-		r.BERDecode(seq);
-		s.BERDecode(seq);
-		seq.MessageEnd();
-		break;
-	}
-	case DSA_OPENPGP:
-		r.OpenPGPDecode(store);
-		s.OpenPGPDecode(store);
-		break;
-	}
-
-	switch (toFormat)
-	{
-	case DSA_P1363:
-		r.Encode(sink, bufferSize/2);
-		s.Encode(sink, bufferSize/2);
-		break;
-	case DSA_DER:
-	{
-		DERSequenceEncoder seq(sink);
-		r.DEREncode(seq);
-		s.DEREncode(seq);
-		seq.MessageEnd();
-		break;
-	}
-	case DSA_OPENPGP:
-		r.OpenPGPEncode(sink);
-		s.OpenPGPEncode(sink);
-		break;
-	}
-
-	return (size_t)sink.TotalPutLength();
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/dsa.h b/src-cryptopp/dsa.h
deleted file mode 100644
index 41c9506..0000000
--- a/src-cryptopp/dsa.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// dsa.h - written and placed in the public domain by Wei Dai
-
-//! \file dsa.h
-//! \brief Classes for the DSA signature algorithm
-
-#ifndef CRYPTOPP_DSA_H
-#define CRYPTOPP_DSA_H
-
-#include "cryptlib.h"
-#include "gfpcrypt.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief DSA Signature Format
-//! \details The DSA signature format used by Crypto++ is as defined by IEEE P1363.
-//!   Java nad .Net use the DER format, and OpenPGP uses the OpenPGP format.
-enum DSASignatureFormat {
-	//! \brief Crypto++ native signature encoding format
-	DSA_P1363,
-	//! \brief signature encoding format used by Java and .Net
-	DSA_DER,
-	//! \brief OpenPGP signature encoding format
-	DSA_OPENPGP
-};
-
-//! \brief Converts between signature encoding formats
-//! \param buffer byte buffer for the converted signature encoding
-//! \param bufferSize the length of the converted signature encoding buffer
-//! \param toFormat the source signature format
-//! \param signature byte buffer for the existing signature encoding
-//! \param signatureLen the length of the existing signature encoding buffer
-//! \param fromFormat the source signature format
-//! \details This function converts between these formats, and returns length
-//!   of signature in the target format. If <tt>toFormat == DSA_P1363</tt>, then
-//!   <tt>bufferSize</tt> must equal <tt>publicKey.SignatureLength()</tt>
-size_t DSAConvertSignatureFormat(byte *buffer, size_t bufferSize, DSASignatureFormat toFormat,
-	const byte *signature, size_t signatureLen, DSASignatureFormat fromFormat);
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/ec2n.cpp b/src-cryptopp/ec2n.cpp
deleted file mode 100644
index 33a9d45..0000000
--- a/src-cryptopp/ec2n.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-// ec2n.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "ec2n.h"
-#include "asn.h"
-#include "integer.h"
-#include "filters.h"
-#include "algebra.cpp"
-#include "eprecomp.cpp"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-EC2N::EC2N(BufferedTransformation &bt)
-	: m_field(BERDecodeGF2NP(bt))
-{
-	BERSequenceDecoder seq(bt);
-	m_field->BERDecodeElement(seq, m_a);
-	m_field->BERDecodeElement(seq, m_b);
-	// skip optional seed
-	if (!seq.EndReached())
-	{
-		SecByteBlock seed;
-		unsigned int unused;
-		BERDecodeBitString(seq, seed, unused);
-	}
-	seq.MessageEnd();
-}
-
-void EC2N::DEREncode(BufferedTransformation &bt) const
-{
-	m_field->DEREncode(bt);
-	DERSequenceEncoder seq(bt);
-	m_field->DEREncodeElement(seq, m_a);
-	m_field->DEREncodeElement(seq, m_b);
-	seq.MessageEnd();
-}
-
-bool EC2N::DecodePoint(EC2N::Point &P, const byte *encodedPoint, size_t encodedPointLen) const
-{
-	StringStore store(encodedPoint, encodedPointLen);
-	return DecodePoint(P, store, encodedPointLen);
-}
-
-bool EC2N::DecodePoint(EC2N::Point &P, BufferedTransformation &bt, size_t encodedPointLen) const
-{
-	byte type;
-	if (encodedPointLen < 1 || !bt.Get(type))
-		return false;
-
-	switch (type)
-	{
-	case 0:
-		P.identity = true;
-		return true;
-	case 2:
-	case 3:
-	{
-		if (encodedPointLen != EncodedPointSize(true))
-			return false;
-
-		P.identity = false;
-		P.x.Decode(bt, m_field->MaxElementByteLength());
-
-		if (P.x.IsZero())
-		{
-			P.y = m_field->SquareRoot(m_b);
-			return true;
-		}
-
-		FieldElement z = m_field->Square(P.x);
-		CRYPTOPP_ASSERT(P.x == m_field->SquareRoot(z));
-		P.y = m_field->Divide(m_field->Add(m_field->Multiply(z, m_field->Add(P.x, m_a)), m_b), z);
-		CRYPTOPP_ASSERT(P.x == m_field->Subtract(m_field->Divide(m_field->Subtract(m_field->Multiply(P.y, z), m_b), z), m_a));
-		z = m_field->SolveQuadraticEquation(P.y);
-		CRYPTOPP_ASSERT(m_field->Add(m_field->Square(z), z) == P.y);
-		z.SetCoefficient(0, type & 1);
-
-		P.y = m_field->Multiply(z, P.x);
-		return true;
-	}
-	case 4:
-	{
-		if (encodedPointLen != EncodedPointSize(false))
-			return false;
-
-		unsigned int len = m_field->MaxElementByteLength();
-		P.identity = false;
-		P.x.Decode(bt, len);
-		P.y.Decode(bt, len);
-		return true;
-	}
-	default:
-		return false;
-	}
-}
-
-void EC2N::EncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const
-{
-	if (P.identity)
-		NullStore().TransferTo(bt, EncodedPointSize(compressed));
-	else if (compressed)
-	{
-		bt.Put(2 + (!P.x ? 0 : m_field->Divide(P.y, P.x).GetBit(0)));
-		P.x.Encode(bt, m_field->MaxElementByteLength());
-	}
-	else
-	{
-		unsigned int len = m_field->MaxElementByteLength();
-		bt.Put(4);	// uncompressed
-		P.x.Encode(bt, len);
-		P.y.Encode(bt, len);
-	}
-}
-
-void EC2N::EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const
-{
-	ArraySink sink(encodedPoint, EncodedPointSize(compressed));
-	EncodePoint(sink, P, compressed);
-	CRYPTOPP_ASSERT(sink.TotalPutLength() == EncodedPointSize(compressed));
-}
-
-EC2N::Point EC2N::BERDecodePoint(BufferedTransformation &bt) const
-{
-	SecByteBlock str;
-	BERDecodeOctetString(bt, str);
-	Point P;
-	if (!DecodePoint(P, str, str.size()))
-		BERDecodeError();
-	return P;
-}
-
-void EC2N::DEREncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const
-{
-	SecByteBlock str(EncodedPointSize(compressed));
-	EncodePoint(str, P, compressed);
-	DEREncodeOctetString(bt, str);
-}
-
-bool EC2N::ValidateParameters(RandomNumberGenerator &rng, unsigned int level) const
-{
-	CRYPTOPP_UNUSED(rng);
-	bool pass = !!m_b;
-	pass = pass && m_a.CoefficientCount() <= m_field->MaxElementBitLength();
-	pass = pass && m_b.CoefficientCount() <= m_field->MaxElementBitLength();
-
-	if (level >= 1)
-		pass = pass && m_field->GetModulus().IsIrreducible();
-
-	return pass;
-}
-
-bool EC2N::VerifyPoint(const Point &P) const
-{
-	const FieldElement &x = P.x, &y = P.y;
-	return P.identity ||
-		(x.CoefficientCount() <= m_field->MaxElementBitLength()
-		&& y.CoefficientCount() <= m_field->MaxElementBitLength()
-		&& !(((x+m_a)*x*x+m_b-(x+y)*y)%m_field->GetModulus()));
-}
-
-bool EC2N::Equal(const Point &P, const Point &Q) const
-{
-	if (P.identity && Q.identity)
-		return true;
-
-	if (P.identity && !Q.identity)
-		return false;
-
-	if (!P.identity && Q.identity)
-		return false;
-
-	return (m_field->Equal(P.x,Q.x) && m_field->Equal(P.y,Q.y));
-}
-
-const EC2N::Point& EC2N::Identity() const
-{
-	return Singleton<Point>().Ref();
-}
-
-const EC2N::Point& EC2N::Inverse(const Point &P) const
-{
-	if (P.identity)
-		return P;
-	else
-	{
-		m_R.identity = false;
-		m_R.y = m_field->Add(P.x, P.y);
-		m_R.x = P.x;
-		return m_R;
-	}
-}
-
-const EC2N::Point& EC2N::Add(const Point &P, const Point &Q) const
-{
-	if (P.identity) return Q;
-	if (Q.identity) return P;
-	if (Equal(P, Q)) return Double(P);
-	if (m_field->Equal(P.x, Q.x) && m_field->Equal(P.y, m_field->Add(Q.x, Q.y))) return Identity();
-
-	FieldElement t = m_field->Add(P.y, Q.y);
-	t = m_field->Divide(t, m_field->Add(P.x, Q.x));
-	FieldElement x = m_field->Square(t);
-	m_field->Accumulate(x, t);
-	m_field->Accumulate(x, Q.x);
-	m_field->Accumulate(x, m_a);
-	m_R.y = m_field->Add(P.y, m_field->Multiply(t, x));
-	m_field->Accumulate(x, P.x);
-	m_field->Accumulate(m_R.y, x);
-
-	m_R.x.swap(x);
-	m_R.identity = false;
-	return m_R;
-}
-
-const EC2N::Point& EC2N::Double(const Point &P) const
-{
-	if (P.identity) return P;
-	if (!m_field->IsUnit(P.x)) return Identity();
-
-	FieldElement t = m_field->Divide(P.y, P.x);
-	m_field->Accumulate(t, P.x);
-	m_R.y = m_field->Square(P.x);
-	m_R.x = m_field->Square(t);
-	m_field->Accumulate(m_R.x, t);
-	m_field->Accumulate(m_R.x, m_a);
-	m_field->Accumulate(m_R.y, m_field->Multiply(t, m_R.x));
-	m_field->Accumulate(m_R.y, m_R.x);
-
-	m_R.identity = false;
-	return m_R;
-}
-
-// ********************************************************
-
-/*
-EcPrecomputation<EC2N>& EcPrecomputation<EC2N>::operator=(const EcPrecomputation<EC2N> &rhs)
-{
-	m_ec = rhs.m_ec;
-	m_ep = rhs.m_ep;
-	m_ep.m_group = m_ec.get();
-	return *this;
-}
-
-void EcPrecomputation<EC2N>::SetCurveAndBase(const EC2N &ec, const EC2N::Point &base)
-{
-	m_ec.reset(new EC2N(ec));
-	m_ep.SetGroupAndBase(*m_ec, base);
-}
-
-void EcPrecomputation<EC2N>::Precompute(unsigned int maxExpBits, unsigned int storage)
-{
-	m_ep.Precompute(maxExpBits, storage);
-}
-
-void EcPrecomputation<EC2N>::Load(BufferedTransformation &bt)
-{
-	BERSequenceDecoder seq(bt);
-	word32 version;
-	BERDecodeUnsigned<word32>(seq, version, INTEGER, 1, 1);
-	m_ep.m_exponentBase.BERDecode(seq);
-	m_ep.m_windowSize = m_ep.m_exponentBase.BitCount() - 1;
-	m_ep.m_bases.clear();
-	while (!seq.EndReached())
-		m_ep.m_bases.push_back(m_ec->BERDecodePoint(seq));
-	seq.MessageEnd();
-}
-
-void EcPrecomputation<EC2N>::Save(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder seq(bt);
-	DEREncodeUnsigned<word32>(seq, 1);	// version
-	m_ep.m_exponentBase.DEREncode(seq);
-	for (unsigned i=0; i<m_ep.m_bases.size(); i++)
-		m_ec->DEREncodePoint(seq, m_ep.m_bases[i]);
-	seq.MessageEnd();
-}
-
-EC2N::Point EcPrecomputation<EC2N>::Exponentiate(const Integer &exponent) const
-{
-	return m_ep.Exponentiate(exponent);
-}
-
-EC2N::Point EcPrecomputation<EC2N>::CascadeExponentiate(const Integer &exponent, const DL_FixedBasePrecomputation<Element> &pc2, const Integer &exponent2) const
-{
-	return m_ep.CascadeExponentiate(exponent, static_cast<const EcPrecomputation<EC2N> &>(pc2).m_ep, exponent2);
-}
-*/
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/ec2n.h b/src-cryptopp/ec2n.h
deleted file mode 100644
index 959c1e9..0000000
--- a/src-cryptopp/ec2n.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// ec2n.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile ec2n.h
-//! \brief Classes for Elliptic Curves over binary fields
-
-
-#ifndef CRYPTOPP_EC2N_H
-#define CRYPTOPP_EC2N_H
-
-#include "cryptlib.h"
-#include "gf2n.h"
-#include "integer.h"
-#include "algebra.h"
-#include "eprecomp.h"
-#include "smartptr.h"
-#include "pubkey.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! Elliptic Curve Point
-struct CRYPTOPP_DLL EC2NPoint
-{
-	EC2NPoint() : identity(true) {}
-	EC2NPoint(const PolynomialMod2 &x, const PolynomialMod2 &y)
-		: identity(false), x(x), y(y) {}
-
-	bool operator==(const EC2NPoint &t) const
-		{return (identity && t.identity) || (!identity && !t.identity && x==t.x && y==t.y);}
-	bool operator< (const EC2NPoint &t) const
-		{return identity ? !t.identity : (!t.identity && (x<t.x || (x==t.x && y<t.y)));}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~EC2NPoint() {}
-#endif
-
-	bool identity;
-	PolynomialMod2 x, y;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractGroup<EC2NPoint>;
-
-//! Elliptic Curve over GF(2^n)
-class CRYPTOPP_DLL EC2N : public AbstractGroup<EC2NPoint>
-{
-public:
-	typedef GF2NP Field;
-	typedef Field::Element FieldElement;
-	typedef EC2NPoint Point;
-
-	EC2N() {}
-	EC2N(const Field &field, const Field::Element &a, const Field::Element &b)
-		: m_field(field), m_a(a), m_b(b) {}
-	// construct from BER encoded parameters
-	// this constructor will decode and extract the the fields fieldID and curve of the sequence ECParameters
-	EC2N(BufferedTransformation &bt);
-
-	// encode the fields fieldID and curve of the sequence ECParameters
-	void DEREncode(BufferedTransformation &bt) const;
-
-	bool Equal(const Point &P, const Point &Q) const;
-	const Point& Identity() const;
-	const Point& Inverse(const Point &P) const;
-	bool InversionIsFast() const {return true;}
-	const Point& Add(const Point &P, const Point &Q) const;
-	const Point& Double(const Point &P) const;
-
-	Point Multiply(const Integer &k, const Point &P) const
-		{return ScalarMultiply(P, k);}
-	Point CascadeMultiply(const Integer &k1, const Point &P, const Integer &k2, const Point &Q) const
-		{return CascadeScalarMultiply(P, k1, Q, k2);}
-
-	bool ValidateParameters(RandomNumberGenerator &rng, unsigned int level=3) const;
-	bool VerifyPoint(const Point &P) const;
-
-	unsigned int EncodedPointSize(bool compressed = false) const
-		{return 1 + (compressed?1:2)*m_field->MaxElementByteLength();}
-	// returns false if point is compressed and not valid (doesn't check if uncompressed)
-	bool DecodePoint(Point &P, BufferedTransformation &bt, size_t len) const;
-	bool DecodePoint(Point &P, const byte *encodedPoint, size_t len) const;
-	void EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const;
-	void EncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const;
-
-	Point BERDecodePoint(BufferedTransformation &bt) const;
-	void DEREncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const;
-
-	Integer FieldSize() const {return Integer::Power2(m_field->MaxElementBitLength());}
-	const Field & GetField() const {return *m_field;}
-	const FieldElement & GetA() const {return m_a;}
-	const FieldElement & GetB() const {return m_b;}
-
-	bool operator==(const EC2N &rhs) const
-		{return GetField() == rhs.GetField() && m_a == rhs.m_a && m_b == rhs.m_b;}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~EC2N() {}
-#endif
-
-private:
-	clonable_ptr<Field> m_field;
-	FieldElement m_a, m_b;
-	mutable Point m_R;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_FixedBasePrecomputationImpl<EC2N::Point>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupPrecomputation<EC2N::Point>;
-
-template <class T> class EcPrecomputation;
-
-//! EC2N precomputation
-template<> class EcPrecomputation<EC2N> : public DL_GroupPrecomputation<EC2N::Point>
-{
-public:
-	typedef EC2N EllipticCurve;
-
-	// DL_GroupPrecomputation
-	const AbstractGroup<Element> & GetGroup() const {return m_ec;}
-	Element BERDecodeElement(BufferedTransformation &bt) const {return m_ec.BERDecodePoint(bt);}
-	void DEREncodeElement(BufferedTransformation &bt, const Element &v) const {m_ec.DEREncodePoint(bt, v, false);}
-
-	// non-inherited
-	void SetCurve(const EC2N &ec) {m_ec = ec;}
-	const EC2N & GetCurve() const {return m_ec;}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~EcPrecomputation() {}
-#endif
-
-private:
-	EC2N m_ec;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/eccrypto.cpp b/src-cryptopp/eccrypto.cpp
deleted file mode 100644
index 4c2640b..0000000
--- a/src-cryptopp/eccrypto.cpp
+++ /dev/null
@@ -1,719 +0,0 @@
-// eccrypto.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4127 4189)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "eccrypto.h"
-#include "integer.h"
-#include "nbtheory.h"
-#include "filters.h"
-#include "argnames.h"
-#include "smartptr.h"
-#include "oids.h"
-#include "asn.h"
-#include "hex.h"
-#include "ec2n.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#if 0
-#if CRYPTOPP_DEBUG && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
-static void ECDSA_TestInstantiations()
-{
-	ECDSA<EC2N>::Signer t1;
-	ECDSA<EC2N>::Verifier t2(t1);
-	ECNR<ECP>::Signer t3;
-	ECNR<ECP>::Verifier t4(t3);
-	ECIES<ECP>::Encryptor t5;
-	ECIES<EC2N>::Decryptor t6;
-	ECDH<ECP>::Domain t7;
-	ECMQV<ECP>::Domain t8;
-}
-#endif
-#endif
-
-// VC60 workaround: complains when these functions are put into an anonymous namespace
-static Integer ConvertToInteger(const PolynomialMod2 &x)
-{
-	unsigned int l = x.ByteCount();
-	SecByteBlock temp(l);
-	x.Encode(temp, l);
-	return Integer(temp, l);
-}
-
-static inline Integer ConvertToInteger(const Integer &x)
-{
-	return x;
-}
-
-static bool CheckMOVCondition(const Integer &q, const Integer &r)
-{
-	// see "Updated standards for validating elliptic curves", http://eprint.iacr.org/2007/343
-	Integer t = 1;
-	unsigned int n = q.IsEven() ? 1 : q.BitCount(), m = r.BitCount();
-
-	for (unsigned int i=n; DiscreteLogWorkFactor(i)<m/2; i+=n)
-	{
-		if (q.IsEven())
-			t = (t+t)%r;
-		else
-			t = (t*q)%r;
-		if (t == 1)
-			return false;
-	}
-	return true;
-}
-
-// ******************************************************************
-
-template <class T> struct EcRecommendedParameters;
-
-template<> struct EcRecommendedParameters<EC2N>
-{
-	EcRecommendedParameters(const OID &oid, unsigned int t2, unsigned int t3, unsigned int t4, const char *a, const char *b, const char *g, const char *n, unsigned int h)
-		: oid(oid), t0(0), t1(0), t2(t2), t3(t3), t4(t4), a(a), b(b), g(g), n(n), h(h) {}
-	EcRecommendedParameters(const OID &oid, unsigned int t0, unsigned int t1, unsigned int t2, unsigned int t3, unsigned int t4, const char *a, const char *b, const char *g, const char *n, unsigned int h)
-		: oid(oid), t0(t0), t1(t1), t2(t2), t3(t3), t4(t4), a(a), b(b), g(g), n(n), h(h) {}
-	EC2N *NewEC() const
-	{
-		StringSource ssA(a, true, new HexDecoder);
-		StringSource ssB(b, true, new HexDecoder);
-		if (t0 == 0)
-			return new EC2N(GF2NT(t2, t3, t4), EC2N::FieldElement(ssA, (size_t)ssA.MaxRetrievable()), EC2N::FieldElement(ssB, (size_t)ssB.MaxRetrievable()));
-		else
-			return new EC2N(GF2NPP(t0, t1, t2, t3, t4), EC2N::FieldElement(ssA, (size_t)ssA.MaxRetrievable()), EC2N::FieldElement(ssB, (size_t)ssB.MaxRetrievable()));
-	};
-
-	OID oid;
-	unsigned int t0, t1, t2, t3, t4;
-	const char *a, *b, *g, *n;
-	unsigned int h;
-};
-
-template<> struct EcRecommendedParameters<ECP>
-{
-	EcRecommendedParameters(const OID &oid, const char *p, const char *a, const char *b, const char *g, const char *n, unsigned int h)
-		: oid(oid), p(p), a(a), b(b), g(g), n(n), h(h) {}
-	ECP *NewEC() const
-	{
-		StringSource ssP(p, true, new HexDecoder);
-		StringSource ssA(a, true, new HexDecoder);
-		StringSource ssB(b, true, new HexDecoder);
-		return new ECP(Integer(ssP, (size_t)ssP.MaxRetrievable()), ECP::FieldElement(ssA, (size_t)ssA.MaxRetrievable()), ECP::FieldElement(ssB, (size_t)ssB.MaxRetrievable()));
-	};
-
-	OID oid;
-	const char *p;
-	const char *a, *b, *g, *n;
-	unsigned int h;
-};
-
-struct OIDLessThan
-{
-	template <typename T>
-	inline bool operator()(const EcRecommendedParameters<T>& a, const OID& b) {return a.oid < b;}
-	template <typename T>
-	inline bool operator()(const OID& a, const EcRecommendedParameters<T>& b) {return a < b.oid;}
-	template <typename T>
-	inline bool operator()(const EcRecommendedParameters<T>& a, const EcRecommendedParameters<T>& b) {return a.oid < b.oid;}
-};
-
-static void GetRecommendedParameters(const EcRecommendedParameters<EC2N> *&begin, const EcRecommendedParameters<EC2N> *&end)
-{
-	// this array must be sorted by OID
-	static const EcRecommendedParameters<EC2N> rec[] = {
-		EcRecommendedParameters<EC2N>(ASN1::sect163k1(),
-			163, 7, 6, 3, 0,
-			"000000000000000000000000000000000000000001",
-			"000000000000000000000000000000000000000001",
-			"0402FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE80289070FB05D38FF58321F2E800536D538CCDAA3D9",
-			"04000000000000000000020108A2E0CC0D99F8A5EF",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect163r1(),
-			163, 7, 6, 3, 0,
-			"07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
-			"0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
-			"040369979697AB43897789566789567F787A7876A65400435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
-			"03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect239k1(),
-			239, 158, 0,
-			"000000000000000000000000000000000000000000000000000000000000",
-			"000000000000000000000000000000000000000000000000000000000001",
-			"0429A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
-			"2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5",
-			4),
-		EcRecommendedParameters<EC2N>(ASN1::sect113r1(),
-			113, 9, 0,
-			"003088250CA6E7C7FE649CE85820F7",
-			"00E8BEE4D3E2260744188BE0E9C723",
-			"04009D73616F35F4AB1407D73562C10F00A52830277958EE84D1315ED31886",
-			"0100000000000000D9CCEC8A39E56F",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect113r2(),
-			113, 9, 0,
-			"00689918DBEC7E5A0DD6DFC0AA55C7",
-			"0095E9A9EC9B297BD4BF36E059184F",
-			"0401A57A6A7B26CA5EF52FCDB816479700B3ADC94ED1FE674C06E695BABA1D",
-			"010000000000000108789B2496AF93",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect163r2(),
-			163, 7, 6, 3, 0,
-			"000000000000000000000000000000000000000001",
-			"020A601907B8C953CA1481EB10512F78744A3205FD",
-			"0403F0EBA16286A2D57EA0991168D4994637E8343E3600D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
-			"040000000000000000000292FE77E70C12A4234C33",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect283k1(),
-			283, 12, 7, 5, 0,
-			"000000000000000000000000000000000000000000000000000000000000000000000000",
-			"000000000000000000000000000000000000000000000000000000000000000000000001",
-			"040503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC245849283601CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
-			"01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
-			4),
-		EcRecommendedParameters<EC2N>(ASN1::sect283r1(),
-			283, 12, 7, 5, 0,
-			"000000000000000000000000000000000000000000000000000000000000000000000001",
-			"027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
-			"0405F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B1205303676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
-			"03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect131r1(),
-			131, 8, 3, 2, 0,
-			"07A11B09A76B562144418FF3FF8C2570B8",
-			"0217C05610884B63B9C6C7291678F9D341",
-			"040081BAF91FDF9833C40F9C181343638399078C6E7EA38C001F73C8134B1B4EF9E150",
-			"0400000000000000023123953A9464B54D",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect131r2(),
-			131, 8, 3, 2, 0,
-			"03E5A88919D7CAFCBF415F07C2176573B2",
-			"04B8266A46C55657AC734CE38F018F2192",
-			"040356DCD8F2F95031AD652D23951BB366A80648F06D867940A5366D9E265DE9EB240F",
-			"0400000000000000016954A233049BA98F",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect193r1(),
-			193, 15, 0,
-			"0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
-			"00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
-			"0401F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E10025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
-			"01000000000000000000000000C7F34A778F443ACC920EBA49",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect193r2(),
-			193, 15, 0,
-			"0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
-			"00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
-			"0400D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
-			"010000000000000000000000015AAB561B005413CCD4EE99D5",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect233k1(),
-			233, 74, 0,
-			"000000000000000000000000000000000000000000000000000000000000",
-			"000000000000000000000000000000000000000000000000000000000001",
-			"04017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD612601DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
-			"8000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
-			4),
-		EcRecommendedParameters<EC2N>(ASN1::sect233r1(),
-			233, 74, 0,
-			"000000000000000000000000000000000000000000000000000000000001",
-			"0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
-			"0400FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
-			"01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect409k1(),
-			409, 87, 0,
-			"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-			"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-			"040060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE902374601E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
-			"7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
-			4),
-		EcRecommendedParameters<EC2N>(ASN1::sect409r1(),
-			409, 87, 0,
-			"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-			"0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
-			"04015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A70061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
-			"010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
-			2),
-		EcRecommendedParameters<EC2N>(ASN1::sect571k1(),
-			571, 10, 5, 2, 0,
-			"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-			"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-			"04026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C89720349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
-			"020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
-			4),
-		EcRecommendedParameters<EC2N>(ASN1::sect571r1(),
-			571, 10, 5, 2, 0,
-			"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-			"02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
-			"040303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
-			"03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
-			2),
-	};
-	begin = rec;
-	end = rec + sizeof(rec)/sizeof(rec[0]);
-}
-
-static void GetRecommendedParameters(const EcRecommendedParameters<ECP> *&begin, const EcRecommendedParameters<ECP> *&end)
-{
-	// this array must be sorted by OID
-	static const EcRecommendedParameters<ECP> rec[] = {
-		EcRecommendedParameters<ECP>(ASN1::secp192r1(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-			"64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
-			"04188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF101207192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
-			"FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp256r1(),
-			"FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
-			"FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
-			"5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B",
-			"046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5",
-			"FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::brainpoolP160r1(),
-			"E95E4A5F737059DC60DFC7AD95B3D8139515620F",
-			"340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
-			"1E589A8595423412134FAA2DBDEC95C8D8675E58",
-			"04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321",
-			"E95E4A5F737059DC60DF5991D45029409E60FC09",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::brainpoolP192r1(),
-			"C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
-			"6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
-			"469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
-			"04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
-			"C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::brainpoolP224r1(),
-			"D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
-			"68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
-			"2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
-			"040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
-			"D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::brainpoolP256r1(),
-			"A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
-			"7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
-			"26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
-			"048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
-			"A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::brainpoolP320r1(),
-			"D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
-			"3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
-			"520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
-			"0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
-			"D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::brainpoolP384r1(),
-			"8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
-			"7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
-			"04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
-			"041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
-			"8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::brainpoolP512r1(),
-			"AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
-			"7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
-			"3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
-			"0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
-			"AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp112r1(),
-			"DB7C2ABF62E35E668076BEAD208B",
-			"DB7C2ABF62E35E668076BEAD2088",
-			"659EF8BA043916EEDE8911702B22",
-			"0409487239995A5EE76B55F9C2F098A89CE5AF8724C0A23E0E0FF77500",
-			"DB7C2ABF62E35E7628DFAC6561C5",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp112r2(),
-			"DB7C2ABF62E35E668076BEAD208B",
-			"6127C24C05F38A0AAAF65C0EF02C",
-			"51DEF1815DB5ED74FCC34C85D709",
-			"044BA30AB5E892B4E1649DD0928643ADCD46F5882E3747DEF36E956E97",
-			"36DF0AAFD8B8D7597CA10520D04B",
-			4),
-		EcRecommendedParameters<ECP>(ASN1::secp160r1(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
-			"1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
-			"044A96B5688EF573284664698968C38BB913CBFC8223A628553168947D59DCC912042351377AC5FB32",
-			"0100000000000000000001F4C8F927AED3CA752257",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp160k1(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-			"0000000000000000000000000000000000000000",
-			"0000000000000000000000000000000000000007",
-			"043B4C382CE37AA192A4019E763036F4F5DD4D7EBB938CF935318FDCED6BC28286531733C3F03C4FEE",
-			"0100000000000000000001B8FA16DFAB9ACA16B6B3",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp256k1(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
-			"0000000000000000000000000000000000000000000000000000000000000000",
-			"0000000000000000000000000000000000000000000000000000000000000007",
-			"0479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp128r1(),
-			"FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-			"FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
-			"E87579C11079F43DD824993C2CEE5ED3",
-			"04161FF7528B899B2D0C28607CA52C5B86CF5AC8395BAFEB13C02DA292DDED7A83",
-			"FFFFFFFE0000000075A30D1B9038A115",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp128r2(),
-			"FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-			"D6031998D1B3BBFEBF59CC9BBFF9AEE1",
-			"5EEEFCA380D02919DC2C6558BB6D8A5D",
-			"047B6AA5D85E572983E6FB32A7CDEBC14027B6916A894D3AEE7106FE805FC34B44",
-			"3FFFFFFF7FFFFFFFBE0024720613B5A3",
-			4),
-		EcRecommendedParameters<ECP>(ASN1::secp160r2(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
-			"B4E134D3FB59EB8BAB57274904664D5AF50388BA",
-			"0452DCB034293A117E1F4FF11B30F7199D3144CE6DFEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
-			"0100000000000000000000351EE786A818F3A1A16B",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp192k1(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
-			"000000000000000000000000000000000000000000000000",
-			"000000000000000000000000000000000000000000000003",
-			"04DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
-			"FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp224k1(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
-			"00000000000000000000000000000000000000000000000000000000",
-			"00000000000000000000000000000000000000000000000000000005",
-			"04A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
-			"010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp224r1(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
-			"B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
-			"04B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp384r1(),
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF",
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC",
-			"B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF",
-			"04AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB73617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F",
-			"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973",
-			1),
-		EcRecommendedParameters<ECP>(ASN1::secp521r1(),
-			"01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
-			"01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC",
-			"0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00",
-			"0400C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650",
-			"01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
-			1),
-	};
-	begin = rec;
-	end = rec + sizeof(rec)/sizeof(rec[0]);
-}
-
-template <class EC> OID DL_GroupParameters_EC<EC>::GetNextRecommendedParametersOID(const OID &oid)
-{
-	const EcRecommendedParameters<EllipticCurve> *begin, *end;
-	GetRecommendedParameters(begin, end);
-	const EcRecommendedParameters<EllipticCurve> *it = std::upper_bound(begin, end, oid, OIDLessThan());
-	return (it == end ? OID() : it->oid);
-}
-
-template <class EC> void DL_GroupParameters_EC<EC>::Initialize(const OID &oid)
-{
-	const EcRecommendedParameters<EllipticCurve> *begin, *end;
-	GetRecommendedParameters(begin, end);
-	const EcRecommendedParameters<EllipticCurve> *it = std::lower_bound(begin, end, oid, OIDLessThan());
-	if (it == end || it->oid != oid)
-		throw UnknownOID();
-
-	const EcRecommendedParameters<EllipticCurve> &param = *it;
-	m_oid = oid;
-	member_ptr<EllipticCurve> ec(param.NewEC());
-	this->m_groupPrecomputation.SetCurve(*ec);
-
-	StringSource ssG(param.g, true, new HexDecoder);
-	Element G;
-	bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable());
-	this->SetSubgroupGenerator(G);
-
-	// TODO: this fails in practice. Should it throw?
-	CRYPTOPP_UNUSED(result); CRYPTOPP_ASSERT(result);
-
-	StringSource ssN(param.n, true, new HexDecoder);
-	m_n.Decode(ssN, (size_t)ssN.MaxRetrievable());
-	m_k = param.h;
-}
-
-template <class EC>
-bool DL_GroupParameters_EC<EC>::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-{
-	if (strcmp(name, Name::GroupOID()) == 0)
-	{
-		if (m_oid.m_values.empty())
-			return false;
-
-		this->ThrowIfTypeMismatch(name, typeid(OID), valueType);
-		*reinterpret_cast<OID *>(pValue) = m_oid;
-		return true;
-	}
-	else
-		return GetValueHelper<DL_GroupParameters<Element> >(this, name, valueType, pValue).Assignable()
-			CRYPTOPP_GET_FUNCTION_ENTRY(Curve);
-}
-
-template <class EC>
-void DL_GroupParameters_EC<EC>::AssignFrom(const NameValuePairs &source)
-{
-	OID oid;
-	if (source.GetValue(Name::GroupOID(), oid))
-		Initialize(oid);
-	else
-	{
-		EllipticCurve ec;
-		Point G;
-		Integer n;
-
-		source.GetRequiredParameter("DL_GroupParameters_EC<EC>", Name::Curve(), ec);
-		source.GetRequiredParameter("DL_GroupParameters_EC<EC>", Name::SubgroupGenerator(), G);
-		source.GetRequiredParameter("DL_GroupParameters_EC<EC>", Name::SubgroupOrder(), n);
-		Integer k = source.GetValueWithDefault(Name::Cofactor(), Integer::Zero());
-
-		Initialize(ec, G, n, k);
-	}
-}
-
-template <class EC>
-void DL_GroupParameters_EC<EC>::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg)
-{
-	try
-	{
-		CRYPTOPP_UNUSED(rng);
-		AssignFrom(alg);
-	}
-	catch (InvalidArgument &)
-	{
-		throw NotImplemented("DL_GroupParameters_EC<EC>: curve generation is not implemented yet");
-	}
-}
-
-template <class EC>
-void DL_GroupParameters_EC<EC>::BERDecode(BufferedTransformation &bt)
-{
-	byte b;
-	if (!bt.Peek(b))
-		BERDecodeError();
-	if (b == OBJECT_IDENTIFIER)
-		Initialize(OID(bt));
-	else
-	{
-		BERSequenceDecoder seq(bt);
-			word32 version;
-			BERDecodeUnsigned<word32>(seq, version, INTEGER, 1, 1);	// check version
-			EllipticCurve ec(seq);
-			Point G = ec.BERDecodePoint(seq);
-			Integer n(seq);
-			Integer k;
-			bool cofactorPresent = !seq.EndReached();
-			if (cofactorPresent)
-				k.BERDecode(seq);
-			else
-				k = Integer::Zero();
-		seq.MessageEnd();
-
-		Initialize(ec, G, n, k);
-	}
-}
-
-template <class EC>
-void DL_GroupParameters_EC<EC>::DEREncode(BufferedTransformation &bt) const
-{
-	if (m_encodeAsOID && !m_oid.m_values.empty())
-		m_oid.DEREncode(bt);
-	else
-	{
-		DERSequenceEncoder seq(bt);
-		DEREncodeUnsigned<word32>(seq, 1);	// version
-		GetCurve().DEREncode(seq);
-		GetCurve().DEREncodePoint(seq, this->GetSubgroupGenerator(), m_compress);
-		m_n.DEREncode(seq);
-		if (m_k.NotZero())
-			m_k.DEREncode(seq);
-		seq.MessageEnd();
-	}
-}
-
-template <class EC>
-Integer DL_GroupParameters_EC<EC>::GetCofactor() const
-{
-	if (!m_k)
-	{
-		Integer q = GetCurve().FieldSize();
-		Integer qSqrt = q.SquareRoot();
-		m_k = (q+2*qSqrt+1)/m_n;
-	}
-
-	return m_k;
-}
-
-template <class EC>
-Integer DL_GroupParameters_EC<EC>::ConvertElementToInteger(const Element &element) const
-{
-	return ConvertToInteger(element.x);
-};
-
-template <class EC>
-bool DL_GroupParameters_EC<EC>::ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const
-{
-	bool pass = GetCurve().ValidateParameters(rng, level);
-
-	Integer q = GetCurve().FieldSize();
-	pass = pass && m_n!=q;
-
-	if (level >= 2)
-	{
-		Integer qSqrt = q.SquareRoot();
-		pass = pass && m_n>4*qSqrt;
-		pass = pass && VerifyPrime(rng, m_n, level-2);
-		pass = pass && (m_k.IsZero() || m_k == (q+2*qSqrt+1)/m_n);
-		pass = pass && CheckMOVCondition(q, m_n);
-	}
-
-	return pass;
-}
-
-template <class EC>
-bool DL_GroupParameters_EC<EC>::ValidateElement(unsigned int level, const Element &g, const DL_FixedBasePrecomputation<Element> *gpc) const
-{
-	bool pass = !IsIdentity(g) && GetCurve().VerifyPoint(g);
-	if (level >= 1)
-	{
-		if (gpc)
-			pass = pass && gpc->Exponentiate(this->GetGroupPrecomputation(), Integer::One()) == g;
-	}
-	if (level >= 2 && pass)
-	{
-		const Integer &q = GetSubgroupOrder();
-		Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q);
-		pass = pass && IsIdentity(gq);
-	}
-	return pass;
-}
-
-template <class EC>
-void DL_GroupParameters_EC<EC>::SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const
-{
-	GetCurve().SimultaneousMultiply(results, base, exponents, exponentsCount);
-}
-
-template <class EC>
-CPP_TYPENAME DL_GroupParameters_EC<EC>::Element DL_GroupParameters_EC<EC>::MultiplyElements(const Element &a, const Element &b) const
-{
-	return GetCurve().Add(a, b);
-}
-
-template <class EC>
-CPP_TYPENAME DL_GroupParameters_EC<EC>::Element DL_GroupParameters_EC<EC>::CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const
-{
-	return GetCurve().CascadeMultiply(exponent1, element1, exponent2, element2);
-}
-
-template <class EC>
-OID DL_GroupParameters_EC<EC>::GetAlgorithmID() const
-{
-	return ASN1::id_ecPublicKey();
-}
-
-// ******************************************************************
-
-template <class EC>
-void DL_PublicKey_EC<EC>::BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size)
-{
-	CRYPTOPP_UNUSED(parametersPresent);
-
-	typename EC::Point P;
-	if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
-		BERDecodeError();
-	this->SetPublicElement(P);
-}
-
-template <class EC>
-void DL_PublicKey_EC<EC>::DEREncodePublicKey(BufferedTransformation &bt) const
-{
-	this->GetGroupParameters().GetCurve().EncodePoint(bt, this->GetPublicElement(), this->GetGroupParameters().GetPointCompression());
-}
-
-// ******************************************************************
-
-template <class EC>
-void DL_PrivateKey_EC<EC>::BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size)
-{
-	CRYPTOPP_UNUSED(size);
-	BERSequenceDecoder seq(bt);
-		word32 version;
-		BERDecodeUnsigned<word32>(seq, version, INTEGER, 1, 1);	// check version
-
-		BERGeneralDecoder dec(seq, OCTET_STRING);
-		if (!dec.IsDefiniteLength())
-			BERDecodeError();
-		Integer x;
-		x.Decode(dec, (size_t)dec.RemainingLength());
-		dec.MessageEnd();
-		if (!parametersPresent && seq.PeekByte() != (CONTEXT_SPECIFIC | CONSTRUCTED | 0))
-			BERDecodeError();
-		if (!seq.EndReached() && seq.PeekByte() == (CONTEXT_SPECIFIC | CONSTRUCTED | 0))
-		{
-			BERGeneralDecoder parameters(seq, CONTEXT_SPECIFIC | CONSTRUCTED | 0);
-			this->AccessGroupParameters().BERDecode(parameters);
-			parameters.MessageEnd();
-		}
-		if (!seq.EndReached())
-		{
-			// skip over the public element
-			SecByteBlock subjectPublicKey;
-			unsigned int unusedBits;
-			BERGeneralDecoder publicKey(seq, CONTEXT_SPECIFIC | CONSTRUCTED | 1);
-			BERDecodeBitString(publicKey, subjectPublicKey, unusedBits);
-			publicKey.MessageEnd();
-			Element Q;
-			if (!(unusedBits == 0 && this->GetGroupParameters().GetCurve().DecodePoint(Q, subjectPublicKey, subjectPublicKey.size())))
-				BERDecodeError();
-		}
-	seq.MessageEnd();
-
-	this->SetPrivateExponent(x);
-}
-
-template <class EC>
-void DL_PrivateKey_EC<EC>::DEREncodePrivateKey(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder privateKey(bt);
-		DEREncodeUnsigned<word32>(privateKey, 1);	// version
-		// SEC 1 ver 1.0 says privateKey (m_d) has the same length as order of the curve
-		// this will be changed to order of base point in a future version
-		this->GetPrivateExponent().DEREncodeAsOctetString(privateKey, this->GetGroupParameters().GetSubgroupOrder().ByteCount());
-	privateKey.MessageEnd();
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/eccrypto.h b/src-cryptopp/eccrypto.h
deleted file mode 100644
index b9178d2..0000000
--- a/src-cryptopp/eccrypto.h
+++ /dev/null
@@ -1,376 +0,0 @@
-// eccrypto.h - written and placed in the public domain by Wei Dai
-
-//! \file eccrypto.h
-//! \brief Classes and functions for Elliptic Curves over prime and binary fields
-
-#ifndef CRYPTOPP_ECCRYPTO_H
-#define CRYPTOPP_ECCRYPTO_H
-
-#include "config.h"
-#include "cryptlib.h"
-#include "pubkey.h"
-#include "integer.h"
-#include "asn.h"
-#include "hmac.h"
-#include "sha.h"
-#include "gfpcrypt.h"
-#include "dh.h"
-#include "mqv.h"
-#include "hmqv.h"
-#include "fhmqv.h"
-#include "ecp.h"
-#include "ec2n.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief Elliptic Curve Parameters
-//! \tparam EC elliptic curve field
-//! \details This class corresponds to the ASN.1 sequence of the same name
-//!   in ANSI X9.62 and SEC 1. EC is currently defined for ECP and EC2N.
-template <class EC>
-class DL_GroupParameters_EC : public DL_GroupParametersImpl<EcPrecomputation<EC> >
-{
-	typedef DL_GroupParameters_EC<EC> ThisClass;
-
-public:
-	typedef EC EllipticCurve;
-	typedef typename EllipticCurve::Point Point;
-	typedef Point Element;
-	typedef IncompatibleCofactorMultiplication DefaultCofactorOption;
-
-	DL_GroupParameters_EC() : m_compress(false), m_encodeAsOID(false) {}
-	DL_GroupParameters_EC(const OID &oid)
-		: m_compress(false), m_encodeAsOID(false) {Initialize(oid);}
-	DL_GroupParameters_EC(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero())
-		: m_compress(false), m_encodeAsOID(false) {Initialize(ec, G, n, k);}
-	DL_GroupParameters_EC(BufferedTransformation &bt)
-		: m_compress(false), m_encodeAsOID(false) {BERDecode(bt);}
-
-	void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero())
-	{
-		this->m_groupPrecomputation.SetCurve(ec);
-		this->SetSubgroupGenerator(G);
-		m_n = n;
-		m_k = k;
-	}
-	void Initialize(const OID &oid);
-
-	// NameValuePairs
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-	void AssignFrom(const NameValuePairs &source);
-
-	// GeneratibleCryptoMaterial interface
-	//! this implementation doesn't actually generate a curve, it just initializes the parameters with existing values
-	/*! parameters: (Curve, SubgroupGenerator, SubgroupOrder, Cofactor (optional)), or (GroupOID) */
-	void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg);
-
-	// DL_GroupParameters
-	const DL_FixedBasePrecomputation<Element> & GetBasePrecomputation() const {return this->m_gpc;}
-	DL_FixedBasePrecomputation<Element> & AccessBasePrecomputation() {return this->m_gpc;}
-	const Integer & GetSubgroupOrder() const {return m_n;}
-	Integer GetCofactor() const;
-	bool ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const;
-	bool ValidateElement(unsigned int level, const Element &element, const DL_FixedBasePrecomputation<Element> *precomp) const;
-	bool FastSubgroupCheckAvailable() const {return false;}
-	void EncodeElement(bool reversible, const Element &element, byte *encoded) const
-	{
-		if (reversible)
-			GetCurve().EncodePoint(encoded, element, m_compress);
-		else
-			element.x.Encode(encoded, GetEncodedElementSize(false));
-	}
-	virtual unsigned int GetEncodedElementSize(bool reversible) const
-	{
-		if (reversible)
-			return GetCurve().EncodedPointSize(m_compress);
-		else
-			return GetCurve().GetField().MaxElementByteLength();
-	}
-	Element DecodeElement(const byte *encoded, bool checkForGroupMembership) const
-	{
-		Point result;
-		if (!GetCurve().DecodePoint(result, encoded, GetEncodedElementSize(true)))
-			throw DL_BadElement();
-		if (checkForGroupMembership && !ValidateElement(1, result, NULL))
-			throw DL_BadElement();
-		return result;
-	}
-	Integer ConvertElementToInteger(const Element &element) const;
-	Integer GetMaxExponent() const {return GetSubgroupOrder()-1;}
-	bool IsIdentity(const Element &element) const {return element.identity;}
-	void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const;
-	static std::string CRYPTOPP_API StaticAlgorithmNamePrefix() {return "EC";}
-
-	// ASN1Key
-	OID GetAlgorithmID() const;
-
-	// used by MQV
-	Element MultiplyElements(const Element &a, const Element &b) const;
-	Element CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const;
-
-	// non-inherited
-
-	// enumerate OIDs for recommended parameters, use OID() to get first one
-	static OID CRYPTOPP_API GetNextRecommendedParametersOID(const OID &oid);
-
-	void BERDecode(BufferedTransformation &bt);
-	void DEREncode(BufferedTransformation &bt) const;
-
-	void SetPointCompression(bool compress) {m_compress = compress;}
-	bool GetPointCompression() const {return m_compress;}
-
-	void SetEncodeAsOID(bool encodeAsOID) {m_encodeAsOID = encodeAsOID;}
-	bool GetEncodeAsOID() const {return m_encodeAsOID;}
-
-	const EllipticCurve& GetCurve() const {return this->m_groupPrecomputation.GetCurve();}
-
-	bool operator==(const ThisClass &rhs) const
-		{return this->m_groupPrecomputation.GetCurve() == rhs.m_groupPrecomputation.GetCurve() && this->m_gpc.GetBase(this->m_groupPrecomputation) == rhs.m_gpc.GetBase(rhs.m_groupPrecomputation);}
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-	const Point& GetBasePoint() const {return this->GetSubgroupGenerator();}
-	const Integer& GetBasePointOrder() const {return this->GetSubgroupOrder();}
-	void LoadRecommendedParameters(const OID &oid) {Initialize(oid);}
-#endif
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupParameters_EC() {}
-#endif
-
-protected:
-	unsigned int FieldElementLength() const {return GetCurve().GetField().MaxElementByteLength();}
-	unsigned int ExponentLength() const {return m_n.ByteCount();}
-
-	OID m_oid;			// set if parameters loaded from a recommended curve
-	Integer m_n;		// order of base point
-	mutable Integer m_k;		// cofactor
-	mutable bool m_compress, m_encodeAsOID;		// presentation details
-};
-
-//! EC public key
-template <class EC>
-class DL_PublicKey_EC : public DL_PublicKeyImpl<DL_GroupParameters_EC<EC> >
-{
-public:
-	typedef typename EC::Point Element;
-
-	void Initialize(const DL_GroupParameters_EC<EC> &params, const Element &Q)
-		{this->AccessGroupParameters() = params; this->SetPublicElement(Q);}
-	void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q)
-		{this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);}
-
-	// X509PublicKey
-	void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
-	void DEREncodePublicKey(BufferedTransformation &bt) const;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PublicKey_EC() {}
-#endif
-};
-
-//! EC private key
-template <class EC>
-class DL_PrivateKey_EC : public DL_PrivateKeyImpl<DL_GroupParameters_EC<EC> >
-{
-public:
-	typedef typename EC::Point Element;
-
-	void Initialize(const DL_GroupParameters_EC<EC> &params, const Integer &x)
-		{this->AccessGroupParameters() = params; this->SetPrivateExponent(x);}
-	void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x)
-		{this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);}
-	void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> &params)
-		{this->GenerateRandom(rng, params);}
-	void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n)
-		{this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
-
-	// PKCS8PrivateKey
-	void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
-	void DEREncodePrivateKey(BufferedTransformation &bt) const;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PrivateKey_EC() {}
-#endif
-};
-
-//! Elliptic Curve Diffie-Hellman, AKA <a href="http://www.weidai.com/scan-mirror/ka.html#ECDH">ECDH</a>
-template <class EC, class COFACTOR_OPTION = CPP_TYPENAME DL_GroupParameters_EC<EC>::DefaultCofactorOption>
-struct ECDH
-{
-	typedef DH_Domain<DL_GroupParameters_EC<EC>, COFACTOR_OPTION> Domain;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECDH() {}
-#endif
-};
-
-/// Elliptic Curve Menezes-Qu-Vanstone, AKA <a href="http://www.weidai.com/scan-mirror/ka.html#ECMQV">ECMQV</a>
-template <class EC, class COFACTOR_OPTION = CPP_TYPENAME DL_GroupParameters_EC<EC>::DefaultCofactorOption>
-struct ECMQV
-{
-	typedef MQV_Domain<DL_GroupParameters_EC<EC>, COFACTOR_OPTION> Domain;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECMQV() {}
-#endif
-};
-
-//! \brief Hashed Menezes-Qu-Vanstone in ECP or EC2N
-//! \details This implementation follows Hugo Krawczyk's <a href="http://eprint.iacr.org/2005/176">HMQV: A High-Performance
-//!   Secure Diffie-Hellman Protocol</a>. Note: this implements HMQV only. HMQV-C with Key Confirmation is not provided.
-template <class EC, class COFACTOR_OPTION = CPP_TYPENAME DL_GroupParameters_EC<EC>::DefaultCofactorOption, class HASH = SHA256>
-struct ECHMQV
-{
-	typedef HMQV_Domain<DL_GroupParameters_EC<EC>, COFACTOR_OPTION, HASH> Domain;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECHMQV() {}
-#endif
-};
-
-typedef ECHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption,   SHA1 >::Domain ECHMQV160;
-typedef ECHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption, SHA256 >::Domain ECHMQV256;
-typedef ECHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption, SHA384 >::Domain ECHMQV384;
-typedef ECHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption, SHA512 >::Domain ECHMQV512;
-
-//! \brief Fully Hashed Menezes-Qu-Vanstone in ECP or EC2N
-//! \details This implementation follows Augustin P. Sarr and Philippe Elbaz–Vincent, and Jean–Claude Bajard's
-//!   <a href="http://eprint.iacr.org/2009/408">A Secure and Efficient Authenticated Diffie-Hellman Protocol</a>.
-//!   Note: this is FHMQV, Protocol 5, from page 11; and not FHMQV-C.
-template <class EC, class COFACTOR_OPTION = CPP_TYPENAME DL_GroupParameters_EC<EC>::DefaultCofactorOption, class HASH = SHA256>
-struct ECFHMQV
-{
-	typedef FHMQV_Domain<DL_GroupParameters_EC<EC>, COFACTOR_OPTION, HASH> Domain;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECFHMQV() {}
-#endif
-};
-
-typedef ECFHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption,   SHA1 >::Domain ECFHMQV160;
-typedef ECFHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption, SHA256 >::Domain ECFHMQV256;
-typedef ECFHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption, SHA384 >::Domain ECFHMQV384;
-typedef ECFHMQV< ECP, DL_GroupParameters_EC< ECP >::DefaultCofactorOption, SHA512 >::Domain ECFHMQV512;
-
-//! EC keys
-template <class EC>
-struct DL_Keys_EC
-{
-	typedef DL_PublicKey_EC<EC> PublicKey;
-	typedef DL_PrivateKey_EC<EC> PrivateKey;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Keys_EC() {}
-#endif
-};
-
-template <class EC, class H>
-struct ECDSA;
-
-//! ECDSA keys
-template <class EC>
-struct DL_Keys_ECDSA
-{
-	typedef DL_PublicKey_EC<EC> PublicKey;
-	typedef DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_EC<EC>, ECDSA<EC, SHA256> > PrivateKey;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Keys_ECDSA() {}
-#endif
-};
-
-//! ECDSA algorithm
-template <class EC>
-class DL_Algorithm_ECDSA : public DL_Algorithm_GDSA<typename EC::Point>
-{
-public:
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "ECDSA";}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Algorithm_ECDSA() {}
-#endif
-};
-
-//! ECNR algorithm
-template <class EC>
-class DL_Algorithm_ECNR : public DL_Algorithm_NR<typename EC::Point>
-{
-public:
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "ECNR";}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Algorithm_ECNR() {}
-#endif
-};
-
-//! <a href="http://www.weidai.com/scan-mirror/sig.html#ECDSA">ECDSA</a>
-template <class EC, class H>
-struct ECDSA : public DL_SS<DL_Keys_ECDSA<EC>, DL_Algorithm_ECDSA<EC>, DL_SignatureMessageEncodingMethod_DSA, H>
-{
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECDSA() {}
-#endif
-};
-
-//! ECNR
-template <class EC, class H = SHA>
-struct ECNR : public DL_SS<DL_Keys_EC<EC>, DL_Algorithm_ECNR<EC>, DL_SignatureMessageEncodingMethod_NR, H>
-{
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECNR() {}
-#endif
-};
-
-//! Elliptic Curve Integrated Encryption Scheme, AKA <a href="http://www.weidai.com/scan-mirror/ca.html#ECIES">ECIES</a>
-/*! Default to (NoCofactorMultiplication and DHAES_MODE = false) for compatibilty with SEC1 and Crypto++ 4.2.
-	The combination of (IncompatibleCofactorMultiplication and DHAES_MODE = true) is recommended for best
-	efficiency and security. */
-template <class EC, class COFACTOR_OPTION = NoCofactorMultiplication, bool DHAES_MODE = false>
-struct ECIES
-	: public DL_ES<
-		DL_Keys_EC<EC>,
-		DL_KeyAgreementAlgorithm_DH<typename EC::Point, COFACTOR_OPTION>,
-		DL_KeyDerivationAlgorithm_P1363<typename EC::Point, DHAES_MODE, P1363_KDF2<SHA1> >,
-		DL_EncryptionAlgorithm_Xor<HMAC<SHA1>, DHAES_MODE>,
-		ECIES<EC> >
-{
-	static std::string CRYPTOPP_API StaticAlgorithmName() {return "ECIES";}	// TODO: fix this after name is standardized
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECIES() {}
-#endif
-
-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800)
-} __attribute__((deprecated ("ECIES will be changing in the near future due to (1) an implementation bug and (2) an interop issue")));
-#elif (CRYPTOPP_GCC_VERSION)
-} __attribute__((deprecated));
-#else
-};
-#endif
-
-NAMESPACE_END
-
-#ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
-#include "eccrypto.cpp"
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters_EC<ECP>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters_EC<EC2N>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKeyImpl<DL_GroupParameters_EC<ECP> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKeyImpl<DL_GroupParameters_EC<EC2N> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKey_EC<ECP>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKey_EC<EC2N>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKeyImpl<DL_GroupParameters_EC<ECP> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKeyImpl<DL_GroupParameters_EC<EC2N> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_EC<ECP>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_EC<EC2N>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_Algorithm_GDSA<ECP::Point>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_Algorithm_GDSA<EC2N::Point>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_EC<ECP>, ECDSA<ECP, SHA256> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_EC<EC2N>, ECDSA<EC2N, SHA256> >;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/ecp.cpp b/src-cryptopp/ecp.cpp
deleted file mode 100644
index eae99eb..0000000
--- a/src-cryptopp/ecp.cpp
+++ /dev/null
@@ -1,476 +0,0 @@
-// ecp.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "ecp.h"
-#include "asn.h"
-#include "integer.h"
-#include "nbtheory.h"
-#include "modarith.h"
-#include "filters.h"
-#include "algebra.cpp"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-ANONYMOUS_NAMESPACE_BEGIN
-static inline ECP::Point ToMontgomery(const ModularArithmetic &mr, const ECP::Point &P)
-{
-	return P.identity ? P : ECP::Point(mr.ConvertIn(P.x), mr.ConvertIn(P.y));
-}
-
-static inline ECP::Point FromMontgomery(const ModularArithmetic &mr, const ECP::Point &P)
-{
-	return P.identity ? P : ECP::Point(mr.ConvertOut(P.x), mr.ConvertOut(P.y));
-}
-NAMESPACE_END
-
-ECP::ECP(const ECP &ecp, bool convertToMontgomeryRepresentation)
-{
-	if (convertToMontgomeryRepresentation && !ecp.GetField().IsMontgomeryRepresentation())
-	{
-		m_fieldPtr.reset(new MontgomeryRepresentation(ecp.GetField().GetModulus()));
-		m_a = GetField().ConvertIn(ecp.m_a);
-		m_b = GetField().ConvertIn(ecp.m_b);
-	}
-	else
-		operator=(ecp);
-}
-
-ECP::ECP(BufferedTransformation &bt)
-	: m_fieldPtr(new Field(bt))
-{
-	BERSequenceDecoder seq(bt);
-	GetField().BERDecodeElement(seq, m_a);
-	GetField().BERDecodeElement(seq, m_b);
-	// skip optional seed
-	if (!seq.EndReached())
-	{
-		SecByteBlock seed;
-		unsigned int unused;
-		BERDecodeBitString(seq, seed, unused);
-	}
-	seq.MessageEnd();
-}
-
-void ECP::DEREncode(BufferedTransformation &bt) const
-{
-	GetField().DEREncode(bt);
-	DERSequenceEncoder seq(bt);
-	GetField().DEREncodeElement(seq, m_a);
-	GetField().DEREncodeElement(seq, m_b);
-	seq.MessageEnd();
-}
-
-bool ECP::DecodePoint(ECP::Point &P, const byte *encodedPoint, size_t encodedPointLen) const
-{
-	StringStore store(encodedPoint, encodedPointLen);
-	return DecodePoint(P, store, encodedPointLen);
-}
-
-bool ECP::DecodePoint(ECP::Point &P, BufferedTransformation &bt, size_t encodedPointLen) const
-{
-	byte type;
-	if (encodedPointLen < 1 || !bt.Get(type))
-		return false;
-
-	switch (type)
-	{
-	case 0:
-		P.identity = true;
-		return true;
-	case 2:
-	case 3:
-	{
-		if (encodedPointLen != EncodedPointSize(true))
-			return false;
-
-		Integer p = FieldSize();
-
-		P.identity = false;
-		P.x.Decode(bt, GetField().MaxElementByteLength());
-		P.y = ((P.x*P.x+m_a)*P.x+m_b) % p;
-
-		if (Jacobi(P.y, p) !=1)
-			return false;
-
-		P.y = ModularSquareRoot(P.y, p);
-
-		if ((type & 1) != P.y.GetBit(0))
-			P.y = p-P.y;
-
-		return true;
-	}
-	case 4:
-	{
-		if (encodedPointLen != EncodedPointSize(false))
-			return false;
-
-		unsigned int len = GetField().MaxElementByteLength();
-		P.identity = false;
-		P.x.Decode(bt, len);
-		P.y.Decode(bt, len);
-		return true;
-	}
-	default:
-		return false;
-	}
-}
-
-void ECP::EncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const
-{
-	if (P.identity)
-		NullStore().TransferTo(bt, EncodedPointSize(compressed));
-	else if (compressed)
-	{
-		bt.Put(2 + P.y.GetBit(0));
-		P.x.Encode(bt, GetField().MaxElementByteLength());
-	}
-	else
-	{
-		unsigned int len = GetField().MaxElementByteLength();
-		bt.Put(4);	// uncompressed
-		P.x.Encode(bt, len);
-		P.y.Encode(bt, len);
-	}
-}
-
-void ECP::EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const
-{
-	ArraySink sink(encodedPoint, EncodedPointSize(compressed));
-	EncodePoint(sink, P, compressed);
-	CRYPTOPP_ASSERT(sink.TotalPutLength() == EncodedPointSize(compressed));
-}
-
-ECP::Point ECP::BERDecodePoint(BufferedTransformation &bt) const
-{
-	SecByteBlock str;
-	BERDecodeOctetString(bt, str);
-	Point P;
-	if (!DecodePoint(P, str, str.size()))
-		BERDecodeError();
-	return P;
-}
-
-void ECP::DEREncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const
-{
-	SecByteBlock str(EncodedPointSize(compressed));
-	EncodePoint(str, P, compressed);
-	DEREncodeOctetString(bt, str);
-}
-
-bool ECP::ValidateParameters(RandomNumberGenerator &rng, unsigned int level) const
-{
-	Integer p = FieldSize();
-
-	bool pass = p.IsOdd();
-	pass = pass && !m_a.IsNegative() && m_a<p && !m_b.IsNegative() && m_b<p;
-
-	if (level >= 1)
-		pass = pass && ((4*m_a*m_a*m_a+27*m_b*m_b)%p).IsPositive();
-
-	if (level >= 2)
-		pass = pass && VerifyPrime(rng, p);
-
-	return pass;
-}
-
-bool ECP::VerifyPoint(const Point &P) const
-{
-	const FieldElement &x = P.x, &y = P.y;
-	Integer p = FieldSize();
-	return P.identity ||
-		(!x.IsNegative() && x<p && !y.IsNegative() && y<p
-		&& !(((x*x+m_a)*x+m_b-y*y)%p));
-}
-
-bool ECP::Equal(const Point &P, const Point &Q) const
-{
-	if (P.identity && Q.identity)
-		return true;
-
-	if (P.identity && !Q.identity)
-		return false;
-
-	if (!P.identity && Q.identity)
-		return false;
-
-	return (GetField().Equal(P.x,Q.x) && GetField().Equal(P.y,Q.y));
-}
-
-const ECP::Point& ECP::Identity() const
-{
-	return Singleton<Point>().Ref();
-}
-
-const ECP::Point& ECP::Inverse(const Point &P) const
-{
-	if (P.identity)
-		return P;
-	else
-	{
-		m_R.identity = false;
-		m_R.x = P.x;
-		m_R.y = GetField().Inverse(P.y);
-		return m_R;
-	}
-}
-
-const ECP::Point& ECP::Add(const Point &P, const Point &Q) const
-{
-	if (P.identity) return Q;
-	if (Q.identity) return P;
-	if (GetField().Equal(P.x, Q.x))
-		return GetField().Equal(P.y, Q.y) ? Double(P) : Identity();
-
-	FieldElement t = GetField().Subtract(Q.y, P.y);
-	t = GetField().Divide(t, GetField().Subtract(Q.x, P.x));
-	FieldElement x = GetField().Subtract(GetField().Subtract(GetField().Square(t), P.x), Q.x);
-	m_R.y = GetField().Subtract(GetField().Multiply(t, GetField().Subtract(P.x, x)), P.y);
-
-	m_R.x.swap(x);
-	m_R.identity = false;
-	return m_R;
-}
-
-const ECP::Point& ECP::Double(const Point &P) const
-{
-	if (P.identity || P.y==GetField().Identity()) return Identity();
-
-	FieldElement t = GetField().Square(P.x);
-	t = GetField().Add(GetField().Add(GetField().Double(t), t), m_a);
-	t = GetField().Divide(t, GetField().Double(P.y));
-	FieldElement x = GetField().Subtract(GetField().Subtract(GetField().Square(t), P.x), P.x);
-	m_R.y = GetField().Subtract(GetField().Multiply(t, GetField().Subtract(P.x, x)), P.y);
-
-	m_R.x.swap(x);
-	m_R.identity = false;
-	return m_R;
-}
-
-template <class T, class Iterator> void ParallelInvert(const AbstractRing<T> &ring, Iterator begin, Iterator end)
-{
-	size_t n = end-begin;
-	if (n == 1)
-		*begin = ring.MultiplicativeInverse(*begin);
-	else if (n > 1)
-	{
-		std::vector<T> vec((n+1)/2);
-		unsigned int i;
-		Iterator it;
-
-		for (i=0, it=begin; i<n/2; i++, it+=2)
-			vec[i] = ring.Multiply(*it, *(it+1));
-		if (n%2 == 1)
-			vec[n/2] = *it;
-
-		ParallelInvert(ring, vec.begin(), vec.end());
-
-		for (i=0, it=begin; i<n/2; i++, it+=2)
-		{
-			if (!vec[i])
-			{
-				*it = ring.MultiplicativeInverse(*it);
-				*(it+1) = ring.MultiplicativeInverse(*(it+1));
-			}
-			else
-			{
-				std::swap(*it, *(it+1));
-				*it = ring.Multiply(*it, vec[i]);
-				*(it+1) = ring.Multiply(*(it+1), vec[i]);
-			}
-		}
-		if (n%2 == 1)
-			*it = vec[n/2];
-	}
-}
-
-struct ProjectivePoint
-{
-	ProjectivePoint() {}
-	ProjectivePoint(const Integer &x, const Integer &y, const Integer &z)
-		: x(x), y(y), z(z)	{}
-
-	Integer x,y,z;
-};
-
-class ProjectiveDoubling
-{
-public:
-	ProjectiveDoubling(const ModularArithmetic &m_mr, const Integer &m_a, const Integer &m_b, const ECPPoint &Q)
-		: mr(m_mr), firstDoubling(true), negated(false)
-	{
-		CRYPTOPP_UNUSED(m_b);
-		if (Q.identity)
-		{
-			sixteenY4 = P.x = P.y = mr.MultiplicativeIdentity();
-			aZ4 = P.z = mr.Identity();
-		}
-		else
-		{
-			P.x = Q.x;
-			P.y = Q.y;
-			sixteenY4 = P.z = mr.MultiplicativeIdentity();
-			aZ4 = m_a;
-		}
-	}
-
-	void Double()
-	{
-		twoY = mr.Double(P.y);
-		P.z = mr.Multiply(P.z, twoY);
-		fourY2 = mr.Square(twoY);
-		S = mr.Multiply(fourY2, P.x);
-		aZ4 = mr.Multiply(aZ4, sixteenY4);
-		M = mr.Square(P.x);
-		M = mr.Add(mr.Add(mr.Double(M), M), aZ4);
-		P.x = mr.Square(M);
-		mr.Reduce(P.x, S);
-		mr.Reduce(P.x, S);
-		mr.Reduce(S, P.x);
-		P.y = mr.Multiply(M, S);
-		sixteenY4 = mr.Square(fourY2);
-		mr.Reduce(P.y, mr.Half(sixteenY4));
-	}
-
-	const ModularArithmetic &mr;
-	ProjectivePoint P;
-	bool firstDoubling, negated;
-	Integer sixteenY4, aZ4, twoY, fourY2, S, M;
-};
-
-struct ZIterator
-{
-	ZIterator() {}
-	ZIterator(std::vector<ProjectivePoint>::iterator it) : it(it) {}
-	Integer& operator*() {return it->z;}
-	int operator-(ZIterator it2) {return int(it-it2.it);}
-	ZIterator operator+(int i) {return ZIterator(it+i);}
-	ZIterator& operator+=(int i) {it+=i; return *this;}
-	std::vector<ProjectivePoint>::iterator it;
-};
-
-ECP::Point ECP::ScalarMultiply(const Point &P, const Integer &k) const
-{
-	Element result;
-	if (k.BitCount() <= 5)
-		AbstractGroup<ECPPoint>::SimultaneousMultiply(&result, P, &k, 1);
-	else
-		ECP::SimultaneousMultiply(&result, P, &k, 1);
-	return result;
-}
-
-void ECP::SimultaneousMultiply(ECP::Point *results, const ECP::Point &P, const Integer *expBegin, unsigned int expCount) const
-{
-	if (!GetField().IsMontgomeryRepresentation())
-	{
-		ECP ecpmr(*this, true);
-		const ModularArithmetic &mr = ecpmr.GetField();
-		ecpmr.SimultaneousMultiply(results, ToMontgomery(mr, P), expBegin, expCount);
-		for (unsigned int i=0; i<expCount; i++)
-			results[i] = FromMontgomery(mr, results[i]);
-		return;
-	}
-
-	ProjectiveDoubling rd(GetField(), m_a, m_b, P);
-	std::vector<ProjectivePoint> bases;
-	std::vector<WindowSlider> exponents;
-	exponents.reserve(expCount);
-	std::vector<std::vector<word32> > baseIndices(expCount);
-	std::vector<std::vector<bool> > negateBase(expCount);
-	std::vector<std::vector<word32> > exponentWindows(expCount);
-	unsigned int i;
-
-	for (i=0; i<expCount; i++)
-	{
-		CRYPTOPP_ASSERT(expBegin->NotNegative());
-		exponents.push_back(WindowSlider(*expBegin++, InversionIsFast(), 5));
-		exponents[i].FindNextWindow();
-	}
-
-	unsigned int expBitPosition = 0;
-	bool notDone = true;
-
-	while (notDone)
-	{
-		notDone = false;
-		bool baseAdded = false;
-		for (i=0; i<expCount; i++)
-		{
-			if (!exponents[i].finished && expBitPosition == exponents[i].windowBegin)
-			{
-				if (!baseAdded)
-				{
-					bases.push_back(rd.P);
-					baseAdded =true;
-				}
-
-				exponentWindows[i].push_back(exponents[i].expWindow);
-				baseIndices[i].push_back((word32)bases.size()-1);
-				negateBase[i].push_back(exponents[i].negateNext);
-
-				exponents[i].FindNextWindow();
-			}
-			notDone = notDone || !exponents[i].finished;
-		}
-
-		if (notDone)
-		{
-			rd.Double();
-			expBitPosition++;
-		}
-	}
-
-	// convert from projective to affine coordinates
-	ParallelInvert(GetField(), ZIterator(bases.begin()), ZIterator(bases.end()));
-	for (i=0; i<bases.size(); i++)
-	{
-		if (bases[i].z.NotZero())
-		{
-			bases[i].y = GetField().Multiply(bases[i].y, bases[i].z);
-			bases[i].z = GetField().Square(bases[i].z);
-			bases[i].x = GetField().Multiply(bases[i].x, bases[i].z);
-			bases[i].y = GetField().Multiply(bases[i].y, bases[i].z);
-		}
-	}
-
-	std::vector<BaseAndExponent<Point, Integer> > finalCascade;
-	for (i=0; i<expCount; i++)
-	{
-		finalCascade.resize(baseIndices[i].size());
-		for (unsigned int j=0; j<baseIndices[i].size(); j++)
-		{
-			ProjectivePoint &base = bases[baseIndices[i][j]];
-			if (base.z.IsZero())
-				finalCascade[j].base.identity = true;
-			else
-			{
-				finalCascade[j].base.identity = false;
-				finalCascade[j].base.x = base.x;
-				if (negateBase[i][j])
-					finalCascade[j].base.y = GetField().Inverse(base.y);
-				else
-					finalCascade[j].base.y = base.y;
-			}
-			finalCascade[j].exponent = Integer(Integer::POSITIVE, 0, exponentWindows[i][j]);
-		}
-		results[i] = GeneralCascadeMultiplication(*this, finalCascade.begin(), finalCascade.end());
-	}
-}
-
-ECP::Point ECP::CascadeScalarMultiply(const Point &P, const Integer &k1, const Point &Q, const Integer &k2) const
-{
-	if (!GetField().IsMontgomeryRepresentation())
-	{
-		ECP ecpmr(*this, true);
-		const ModularArithmetic &mr = ecpmr.GetField();
-		return FromMontgomery(mr, ecpmr.CascadeScalarMultiply(ToMontgomery(mr, P), k1, ToMontgomery(mr, Q), k2));
-	}
-	else
-		return AbstractGroup<Point>::CascadeScalarMultiply(P, k1, Q, k2);
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/ecp.h b/src-cryptopp/ecp.h
deleted file mode 100644
index c181473..0000000
--- a/src-cryptopp/ecp.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// ecp.h - written and placed in the public domain by Wei Dai
-
-//! \file ecp.h
-//! \brief Classes for Elliptic Curves over prime fields
-
-#ifndef CRYPTOPP_ECP_H
-#define CRYPTOPP_ECP_H
-
-#include "cryptlib.h"
-#include "integer.h"
-#include "algebra.h"
-#include "modarith.h"
-#include "eprecomp.h"
-#include "smartptr.h"
-#include "pubkey.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! Elliptical Curve Point
-struct CRYPTOPP_DLL ECPPoint
-{
-	ECPPoint() : identity(true) {}
-	ECPPoint(const Integer &x, const Integer &y)
-		: identity(false), x(x), y(y) {}
-
-	bool operator==(const ECPPoint &t) const
-		{return (identity && t.identity) || (!identity && !t.identity && x==t.x && y==t.y);}
-	bool operator< (const ECPPoint &t) const
-		{return identity ? !t.identity : (!t.identity && (x<t.x || (x==t.x && y<t.y)));}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECPPoint() {}
-#endif
-
-	bool identity;
-	Integer x, y;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractGroup<ECPPoint>;
-
-//! Elliptic Curve over GF(p), where p is prime
-class CRYPTOPP_DLL ECP : public AbstractGroup<ECPPoint>
-{
-public:
-	typedef ModularArithmetic Field;
-	typedef Integer FieldElement;
-	typedef ECPPoint Point;
-
-	ECP() {}
-	ECP(const ECP &ecp, bool convertToMontgomeryRepresentation = false);
-	ECP(const Integer &modulus, const FieldElement &a, const FieldElement &b)
-		: m_fieldPtr(new Field(modulus)), m_a(a.IsNegative() ? modulus+a : a), m_b(b) {}
-	// construct from BER encoded parameters
-	// this constructor will decode and extract the the fields fieldID and curve of the sequence ECParameters
-	ECP(BufferedTransformation &bt);
-
-	// encode the fields fieldID and curve of the sequence ECParameters
-	void DEREncode(BufferedTransformation &bt) const;
-
-	bool Equal(const Point &P, const Point &Q) const;
-	const Point& Identity() const;
-	const Point& Inverse(const Point &P) const;
-	bool InversionIsFast() const {return true;}
-	const Point& Add(const Point &P, const Point &Q) const;
-	const Point& Double(const Point &P) const;
-	Point ScalarMultiply(const Point &P, const Integer &k) const;
-	Point CascadeScalarMultiply(const Point &P, const Integer &k1, const Point &Q, const Integer &k2) const;
-	void SimultaneousMultiply(Point *results, const Point &base, const Integer *exponents, unsigned int exponentsCount) const;
-
-	Point Multiply(const Integer &k, const Point &P) const
-		{return ScalarMultiply(P, k);}
-	Point CascadeMultiply(const Integer &k1, const Point &P, const Integer &k2, const Point &Q) const
-		{return CascadeScalarMultiply(P, k1, Q, k2);}
-
-	bool ValidateParameters(RandomNumberGenerator &rng, unsigned int level=3) const;
-	bool VerifyPoint(const Point &P) const;
-
-	unsigned int EncodedPointSize(bool compressed = false) const
-		{return 1 + (compressed?1:2)*GetField().MaxElementByteLength();}
-	// returns false if point is compressed and not valid (doesn't check if uncompressed)
-	bool DecodePoint(Point &P, BufferedTransformation &bt, size_t len) const;
-	bool DecodePoint(Point &P, const byte *encodedPoint, size_t len) const;
-	void EncodePoint(byte *encodedPoint, const Point &P, bool compressed) const;
-	void EncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const;
-
-	Point BERDecodePoint(BufferedTransformation &bt) const;
-	void DEREncodePoint(BufferedTransformation &bt, const Point &P, bool compressed) const;
-
-	Integer FieldSize() const {return GetField().GetModulus();}
-	const Field & GetField() const {return *m_fieldPtr;}
-	const FieldElement & GetA() const {return m_a;}
-	const FieldElement & GetB() const {return m_b;}
-
-	bool operator==(const ECP &rhs) const
-		{return GetField() == rhs.GetField() && m_a == rhs.m_a && m_b == rhs.m_b;}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ECP() {}
-#endif
-
-private:
-	clonable_ptr<Field> m_fieldPtr;
-	FieldElement m_a, m_b;
-	mutable Point m_R;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_FixedBasePrecomputationImpl<ECP::Point>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupPrecomputation<ECP::Point>;
-
-template <class T> class EcPrecomputation;
-
-//! ECP precomputation
-template<> class EcPrecomputation<ECP> : public DL_GroupPrecomputation<ECP::Point>
-{
-public:
-	typedef ECP EllipticCurve;
-
-	// DL_GroupPrecomputation
-	bool NeedConversions() const {return true;}
-	Element ConvertIn(const Element &P) const
-		{return P.identity ? P : ECP::Point(m_ec->GetField().ConvertIn(P.x), m_ec->GetField().ConvertIn(P.y));};
-	Element ConvertOut(const Element &P) const
-		{return P.identity ? P : ECP::Point(m_ec->GetField().ConvertOut(P.x), m_ec->GetField().ConvertOut(P.y));}
-	const AbstractGroup<Element> & GetGroup() const {return *m_ec;}
-	Element BERDecodeElement(BufferedTransformation &bt) const {return m_ec->BERDecodePoint(bt);}
-	void DEREncodeElement(BufferedTransformation &bt, const Element &v) const {m_ec->DEREncodePoint(bt, v, false);}
-
-	// non-inherited
-	void SetCurve(const ECP &ec)
-	{
-		m_ec.reset(new ECP(ec, true));
-		m_ecOriginal = ec;
-	}
-	const ECP & GetCurve() const {return *m_ecOriginal;}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~EcPrecomputation() {}
-#endif
-
-private:
-	value_ptr<ECP> m_ec, m_ecOriginal;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/emsa2.h b/src-cryptopp/emsa2.h
deleted file mode 100644
index c7bf22e..0000000
--- a/src-cryptopp/emsa2.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// emsa2.h - written and placed in the public domain by Wei Dai
-
-//! \file emsa2.h
-//! \brief Classes and functions for various padding schemes used in public key algorithms
-
-#ifndef CRYPTOPP_EMSA2_H
-#define CRYPTOPP_EMSA2_H
-
-#include "cryptlib.h"
-#include "pubkey.h"
-#include "misc.h"
-
-#ifdef CRYPTOPP_IS_DLL
-# include "sha.h"
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-template <class H> class EMSA2HashId
-{
-public:
-	static const byte id;
-};
-
-template <class BASE>
-class EMSA2HashIdLookup : public BASE
-{
-public:
-	struct HashIdentifierLookup
-	{
-		template <class H> struct HashIdentifierLookup2
-		{
-			static HashIdentifier Lookup()
-			{
-				return HashIdentifier(&EMSA2HashId<H>::id, 1);
-			}
-		};
-	};
-};
-
-// EMSA2HashId can be instantiated with the following classes.
-class SHA1;
-class SHA224;
-class SHA256;
-class SHA384;
-class SHA512;
-class RIPEMD128;
-class RIPEMD160;
-class Whirlpool;
-// end of list
-
-#ifdef CRYPTOPP_IS_DLL
-CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId<SHA1>;
-CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId<SHA224>;
-CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId<SHA256>;
-CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId<SHA384>;
-CRYPTOPP_DLL_TEMPLATE_CLASS EMSA2HashId<SHA512>;
-#endif
-
-//! _
-class CRYPTOPP_DLL EMSA2Pad : public EMSA2HashIdLookup<PK_DeterministicSignatureMessageEncodingMethod>
-{
-public:
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "EMSA2";}
-
-	size_t MinRepresentativeBitLength(size_t hashIdentifierLength, size_t digestLength) const
-		{CRYPTOPP_UNUSED(hashIdentifierLength); return 8*digestLength + 31;}
-
-	void ComputeMessageRepresentative(RandomNumberGenerator &rng,
-		const byte *recoverableMessage, size_t recoverableMessageLength,
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const;
-};
-
-//! EMSA2, for use with RWSS and RSA_ISO
-/*! Only the following hash functions are supported by this signature standard:
-	\dontinclude emsa2.h
-	\skip EMSA2HashId can be instantiated
-	\until end of list
-*/
-struct P1363_EMSA2 : public SignatureStandard
-{
-	typedef EMSA2Pad SignatureMessageEncodingMethod;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/eprecomp.cpp b/src-cryptopp/eprecomp.cpp
deleted file mode 100644
index 3a021b6..0000000
--- a/src-cryptopp/eprecomp.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// eprecomp.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "eprecomp.h"
-#include "integer.h"
-#include "algebra.h"
-#include "asn.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-template <class T> void DL_FixedBasePrecomputationImpl<T>::SetBase(const DL_GroupPrecomputation<Element> &group, const Element &i_base)
-{
-	m_base = group.NeedConversions() ? group.ConvertIn(i_base) : i_base;
-
-	if (m_bases.empty() || !(m_base == m_bases[0]))
-	{
-		m_bases.resize(1);
-		m_bases[0] = m_base;
-	}
-
-	if (group.NeedConversions())
-		m_base = i_base;
-}
-
-template <class T> void DL_FixedBasePrecomputationImpl<T>::Precompute(const DL_GroupPrecomputation<Element> &group, unsigned int maxExpBits, unsigned int storage)
-{
-	CRYPTOPP_ASSERT(m_bases.size() > 0);
-	CRYPTOPP_ASSERT(storage <= maxExpBits);
-
-	if (storage > 1)
-	{
-		m_windowSize = (maxExpBits+storage-1)/storage;
-		m_exponentBase = Integer::Power2(m_windowSize);
-	}
-
-	m_bases.resize(storage);
-	for (unsigned i=1; i<storage; i++)
-		m_bases[i] = group.GetGroup().ScalarMultiply(m_bases[i-1], m_exponentBase);
-}
-
-template <class T> void DL_FixedBasePrecomputationImpl<T>::Load(const DL_GroupPrecomputation<Element> &group, BufferedTransformation &bt)
-{
-	BERSequenceDecoder seq(bt);
-	word32 version;
-	BERDecodeUnsigned<word32>(seq, version, INTEGER, 1, 1);
-	m_exponentBase.BERDecode(seq);
-	m_windowSize = m_exponentBase.BitCount() - 1;
-	m_bases.clear();
-	while (!seq.EndReached())
-		m_bases.push_back(group.BERDecodeElement(seq));
-	if (!m_bases.empty() && group.NeedConversions())
-		m_base = group.ConvertOut(m_bases[0]);
-	seq.MessageEnd();
-}
-
-template <class T> void DL_FixedBasePrecomputationImpl<T>::Save(const DL_GroupPrecomputation<Element> &group, BufferedTransformation &bt) const
-{
-	DERSequenceEncoder seq(bt);
-	DEREncodeUnsigned<word32>(seq, 1);	// version
-	m_exponentBase.DEREncode(seq);
-	for (unsigned i=0; i<m_bases.size(); i++)
-		group.DEREncodeElement(seq, m_bases[i]);
-	seq.MessageEnd();
-}
-
-template <class T> void DL_FixedBasePrecomputationImpl<T>::PrepareCascade(const DL_GroupPrecomputation<Element> &i_group, std::vector<BaseAndExponent<Element> > &eb, const Integer &exponent) const
-{
-	const AbstractGroup<T> &group = i_group.GetGroup();
-
-	Integer r, q, e = exponent;
-	bool fastNegate = group.InversionIsFast() && m_windowSize > 1;
-	unsigned int i;
-
-	for (i=0; i+1<m_bases.size(); i++)
-	{
-		Integer::DivideByPowerOf2(r, q, e, m_windowSize);
-		std::swap(q, e);
-		if (fastNegate && r.GetBit(m_windowSize-1))
-		{
-			++e;
-			eb.push_back(BaseAndExponent<Element>(group.Inverse(m_bases[i]), m_exponentBase - r));
-		}
-		else
-			eb.push_back(BaseAndExponent<Element>(m_bases[i], r));
-	}
-	eb.push_back(BaseAndExponent<Element>(m_bases[i], e));
-}
-
-template <class T> T DL_FixedBasePrecomputationImpl<T>::Exponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent) const
-{
-	std::vector<BaseAndExponent<Element> > eb;	// array of segments of the exponent and precalculated bases
-	eb.reserve(m_bases.size());
-	PrepareCascade(group, eb, exponent);
-	return group.ConvertOut(GeneralCascadeMultiplication<Element>(group.GetGroup(), eb.begin(), eb.end()));
-}
-
-template <class T> T
-	DL_FixedBasePrecomputationImpl<T>::CascadeExponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent,
-		const DL_FixedBasePrecomputation<T> &i_pc2, const Integer &exponent2) const
-{
-	std::vector<BaseAndExponent<Element> > eb;	// array of segments of the exponent and precalculated bases
-	const DL_FixedBasePrecomputationImpl<T> &pc2 = static_cast<const DL_FixedBasePrecomputationImpl<T> &>(i_pc2);
-	eb.reserve(m_bases.size() + pc2.m_bases.size());
-	PrepareCascade(group, eb, exponent);
-	pc2.PrepareCascade(group, eb, exponent2);
-	return group.ConvertOut(GeneralCascadeMultiplication<Element>(group.GetGroup(), eb.begin(), eb.end()));
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/eprecomp.h b/src-cryptopp/eprecomp.h
deleted file mode 100644
index cf44ce6..0000000
--- a/src-cryptopp/eprecomp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// eprecomp.h - written and placed in the public domain by Wei Dai
-
-//! \file eprecomp.h
-//! \brief Classes for precomputation in a group
-
-#ifndef CRYPTOPP_EPRECOMP_H
-#define CRYPTOPP_EPRECOMP_H
-
-#include "cryptlib.h"
-#include "integer.h"
-#include "algebra.h"
-#include "stdcpp.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-template <class T>
-class DL_GroupPrecomputation
-{
-public:
-	typedef T Element;
-
-	virtual bool NeedConversions() const {return false;}
-	virtual Element ConvertIn(const Element &v) const {return v;}
-	virtual Element ConvertOut(const Element &v) const {return v;}
-	virtual const AbstractGroup<Element> & GetGroup() const =0;
-	virtual Element BERDecodeElement(BufferedTransformation &bt) const =0;
-	virtual void DEREncodeElement(BufferedTransformation &bt, const Element &P) const =0;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupPrecomputation() {}
-#endif
-};
-
-template <class T>
-class DL_FixedBasePrecomputation
-{
-public:
-	typedef T Element;
-
-	virtual bool IsInitialized() const =0;
-	virtual void SetBase(const DL_GroupPrecomputation<Element> &group, const Element &base) =0;
-	virtual const Element & GetBase(const DL_GroupPrecomputation<Element> &group) const =0;
-	virtual void Precompute(const DL_GroupPrecomputation<Element> &group, unsigned int maxExpBits, unsigned int storage) =0;
-	virtual void Load(const DL_GroupPrecomputation<Element> &group, BufferedTransformation &storedPrecomputation) =0;
-	virtual void Save(const DL_GroupPrecomputation<Element> &group, BufferedTransformation &storedPrecomputation) const =0;
-	virtual Element Exponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent) const =0;
-	virtual Element CascadeExponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent, const DL_FixedBasePrecomputation<Element> &pc2, const Integer &exponent2) const =0;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_FixedBasePrecomputation() {}
-#endif
-};
-
-template <class T>
-class DL_FixedBasePrecomputationImpl : public DL_FixedBasePrecomputation<T>
-{
-public:
-	typedef T Element;
-
-	DL_FixedBasePrecomputationImpl() : m_windowSize(0) {}
-
-	// DL_FixedBasePrecomputation
-	bool IsInitialized() const
-		{return !m_bases.empty();}
-	void SetBase(const DL_GroupPrecomputation<Element> &group, const Element &base);
-	const Element & GetBase(const DL_GroupPrecomputation<Element> &group) const
-		{return group.NeedConversions() ? m_base : m_bases[0];}
-	void Precompute(const DL_GroupPrecomputation<Element> &group, unsigned int maxExpBits, unsigned int storage);
-	void Load(const DL_GroupPrecomputation<Element> &group, BufferedTransformation &storedPrecomputation);
-	void Save(const DL_GroupPrecomputation<Element> &group, BufferedTransformation &storedPrecomputation) const;
-	Element Exponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent) const;
-	Element CascadeExponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent, const DL_FixedBasePrecomputation<Element> &pc2, const Integer &exponent2) const;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_FixedBasePrecomputationImpl() {}
-#endif
-
-private:
-	void PrepareCascade(const DL_GroupPrecomputation<Element> &group, std::vector<BaseAndExponent<Element> > &eb, const Integer &exponent) const;
-
-	Element m_base;
-	unsigned int m_windowSize;
-	Integer m_exponentBase;			// what base to represent the exponent in
-	std::vector<Element> m_bases;	// precalculated bases
-};
-
-NAMESPACE_END
-
-#ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
-#include "eprecomp.cpp"
-#endif
-
-#endif
diff --git a/src-cryptopp/fhmqv.h b/src-cryptopp/fhmqv.h
deleted file mode 100644
index b5eceb7..0000000
--- a/src-cryptopp/fhmqv.h
+++ /dev/null
@@ -1,304 +0,0 @@
-// fhmqv.h - written and placed in the public domain by Jeffrey Walton, Ray Clayton and Uri Blumenthal
-//           Shamelessly based upon Wei Dai's MQV source files
-
-#ifndef CRYPTOPP_FHMQV_H
-#define CRYPTOPP_FHMQV_H
-
-//! \file fhmqv.h
-//! \brief Classes for Fully Hashed Menezes-Qu-Vanstone key agreement in GF(p)
-//! \since Crypto++ 5.6.4
-
-#include "gfpcrypt.h"
-#include "algebra.h"
-#include "sha.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief Fully Hashed Menezes-Qu-Vanstone in GF(p)
-//! \details This implementation follows Augustin P. Sarr and Philippe Elbaz–Vincent, and Jean–Claude Bajard's
-//!   <a href="http://eprint.iacr.org/2009/408">A Secure and Efficient Authenticated Diffie-Hellman Protocol</a>.
-//!   Note: this is FHMQV, Protocol 5, from page 11; and not FHMQV-C.
-//! \sa MQV, HMQV, FHMQV, and AuthenticatedKeyAgreementDomain
-//! \since Crypto++ 5.6.4
-template <class GROUP_PARAMETERS, class COFACTOR_OPTION = CPP_TYPENAME GROUP_PARAMETERS::DefaultCofactorOption, class HASH = SHA512>
-class FHMQV_Domain : public AuthenticatedKeyAgreementDomain
-{
-public:
-  typedef GROUP_PARAMETERS GroupParameters;
-  typedef typename GroupParameters::Element Element;
-  typedef FHMQV_Domain<GROUP_PARAMETERS, COFACTOR_OPTION, HASH> Domain;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~FHMQV_Domain() {}
-#endif
-
-  FHMQV_Domain(bool clientRole = true): m_role(clientRole ? RoleClient : RoleServer) {}
-
-  FHMQV_Domain(const GroupParameters &params, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer), m_groupParameters(params) {}
-
-  FHMQV_Domain(BufferedTransformation &bt, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.BERDecode(bt);}
-
-  template <class T1>
-  FHMQV_Domain(T1 v1, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.Initialize(v1);}
-
-  template <class T1, class T2>
-  FHMQV_Domain(T1 v1, T2 v2, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.Initialize(v1, v2);}
-
-  template <class T1, class T2, class T3>
-  FHMQV_Domain(T1 v1, T2 v2, T3 v3, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.Initialize(v1, v2, v3);}
-
-  template <class T1, class T2, class T3, class T4>
-  FHMQV_Domain(T1 v1, T2 v2, T3 v3, T4 v4, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.Initialize(v1, v2, v3, v4);}
-
-public:
-
-  const GroupParameters & GetGroupParameters() const {return m_groupParameters;}
-  GroupParameters & AccessGroupParameters(){return m_groupParameters;}
-
-  CryptoParameters & AccessCryptoParameters(){return AccessAbstractGroupParameters();}
-
-  //! return length of agreed value produced
-  unsigned int AgreedValueLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(false);}
-  //! return length of static private keys in this domain
-  unsigned int StaticPrivateKeyLength() const {return GetAbstractGroupParameters().GetSubgroupOrder().ByteCount();}
-  //! return length of static public keys in this domain
-  unsigned int StaticPublicKeyLength() const{return GetAbstractGroupParameters().GetEncodedElementSize(true);}
-
-  //! generate static private key
-  /*! \pre size of privateKey == PrivateStaticKeyLength() */
-  void GenerateStaticPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const
-  {
-    Integer x(rng, Integer::One(), GetAbstractGroupParameters().GetMaxExponent());
-    x.Encode(privateKey, StaticPrivateKeyLength());
-  }
-
-  //! generate static public key
-  /*! \pre size of publicKey == PublicStaticKeyLength() */
-  void GenerateStaticPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const
-  {
-    CRYPTOPP_UNUSED(rng);
-    const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-    Integer x(privateKey, StaticPrivateKeyLength());
-    Element y = params.ExponentiateBase(x);
-    params.EncodeElement(true, y, publicKey);
-  }
-
-  unsigned int EphemeralPrivateKeyLength() const {return StaticPrivateKeyLength() + StaticPublicKeyLength();}
-  unsigned int EphemeralPublicKeyLength() const{return StaticPublicKeyLength();}
-
-  //! return length of ephemeral private keys in this domain
-  void GenerateEphemeralPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const
-  {
-    const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-    Integer x(rng, Integer::One(), params.GetMaxExponent());
-    x.Encode(privateKey, StaticPrivateKeyLength());
-    Element y = params.ExponentiateBase(x);
-    params.EncodeElement(true, y, privateKey+StaticPrivateKeyLength());
-  }
-
-  //! return length of ephemeral public keys in this domain
-  void GenerateEphemeralPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const
-  {
-    CRYPTOPP_UNUSED(rng);
-    memcpy(publicKey, privateKey+StaticPrivateKeyLength(), EphemeralPublicKeyLength());
-  }
-
-  //! derive agreed value from your private keys and couterparty's public keys, return false in case of failure
-  /*! \note The ephemeral public key will always be validated.
-  If you have previously validated the static public key, use validateStaticOtherPublicKey=false to save time.
-  \pre size of agreedValue == AgreedValueLength()
-  \pre length of staticPrivateKey == StaticPrivateKeyLength()
-  \pre length of ephemeralPrivateKey == EphemeralPrivateKeyLength()
-  \pre length of staticOtherPublicKey == StaticPublicKeyLength()
-  \pre length of ephemeralOtherPublicKey == EphemeralPublicKeyLength()
-  */
-  bool Agree(byte *agreedValue,
-    const byte *staticPrivateKey, const byte *ephemeralPrivateKey,
-    const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey,
-    bool validateStaticOtherPublicKey=true) const
-  {
-    byte *XX = NULL, *YY = NULL, *AA = NULL, *BB = NULL;
-    size_t xxs = 0, yys = 0, aas = 0, bbs = 0;
-
-    // Depending on the role, this will hold either A's or B's static
-    // (long term) public key. AA or BB will then point into tt.
-    SecByteBlock tt(StaticPublicKeyLength());
-
-    try
-    {
-      const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-
-      if(m_role == RoleServer)
-      {
-        Integer b(staticPrivateKey, StaticPrivateKeyLength());
-        Element B = params.ExponentiateBase(b);
-        params.EncodeElement(true, B, tt);
-
-        XX = const_cast<byte*>(ephemeralOtherPublicKey);
-        xxs = EphemeralPublicKeyLength();
-        YY = const_cast<byte*>(ephemeralPrivateKey) + StaticPrivateKeyLength();
-        yys = EphemeralPublicKeyLength();
-        AA = const_cast<byte*>(staticOtherPublicKey);
-        aas = StaticPublicKeyLength();
-        BB = tt.BytePtr();
-        bbs = tt.SizeInBytes();
-      }
-      else if(m_role == RoleClient)
-      {
-        Integer a(staticPrivateKey, StaticPrivateKeyLength());
-        Element A = params.ExponentiateBase(a);
-        params.EncodeElement(true, A, tt);
-
-        XX = const_cast<byte*>(ephemeralPrivateKey) + StaticPrivateKeyLength();
-        xxs = EphemeralPublicKeyLength();
-        YY = const_cast<byte*>(ephemeralOtherPublicKey);
-        yys = EphemeralPublicKeyLength();
-        AA = tt.BytePtr();
-        aas = tt.SizeInBytes();
-        BB = const_cast<byte*>(staticOtherPublicKey);
-        bbs = StaticPublicKeyLength();
-      }
-      else
-      {
-        CRYPTOPP_ASSERT(0);
-        return false;
-      }
-
-      // DecodeElement calls ValidateElement at level 1. Level 1 only calls
-      // VerifyPoint to ensure the element is in G*. If the other's PublicKey is
-      // requested to be validated, we manually call ValidateElement at level 3.
-      Element VV1 = params.DecodeElement(staticOtherPublicKey, false);
-      if(!params.ValidateElement(validateStaticOtherPublicKey ? 3 : 1, VV1, NULL))
-        return false;
-
-      // DecodeElement calls ValidateElement at level 1. Level 1 only calls
-      // VerifyPoint to ensure the element is in G*. Crank it up.
-      Element VV2 = params.DecodeElement(ephemeralOtherPublicKey, false);
-      if(!params.ValidateElement(3, VV2, NULL))
-        return false;
-
-      const Integer& q = params.GetSubgroupOrder();
-      const unsigned int len /*bytes*/ = (((q.BitCount()+1)/2 +7)/8);
-
-      Integer d, e;
-      SecByteBlock dd(len), ee(len);
-
-      Hash(NULL, XX, xxs, YY, yys, AA, aas, BB, bbs, dd.BytePtr(), dd.SizeInBytes());
-      d.Decode(dd.BytePtr(), dd.SizeInBytes());
-
-      Hash(NULL, YY, yys, XX, xxs, AA, aas, BB, bbs, ee.BytePtr(), ee.SizeInBytes());
-      e.Decode(ee.BytePtr(), ee.SizeInBytes());
-
-      Element sigma;
-      if(m_role == RoleServer)
-      {
-        Integer y(ephemeralPrivateKey, StaticPrivateKeyLength());
-        Integer b(staticPrivateKey, StaticPrivateKeyLength());
-        Integer s_B = (y + e * b) % q;
-
-        Element A = params.DecodeElement(AA, false);
-        Element X = params.DecodeElement(XX, false);
-
-        Element t1 = params.ExponentiateElement(A, d);
-        Element t2 = m_groupParameters.MultiplyElements(X, t1);
-
-        sigma = params.ExponentiateElement(t2, s_B);
-      }
-      else
-      {
-        Integer x(ephemeralPrivateKey, StaticPrivateKeyLength());
-        Integer a(staticPrivateKey, StaticPrivateKeyLength());
-        Integer s_A = (x + d * a) % q;
-
-        Element B = params.DecodeElement(BB, false);
-        Element Y = params.DecodeElement(YY, false);
-
-        Element t1 = params.ExponentiateElement(B, e);
-        Element t2 = m_groupParameters.MultiplyElements(Y, t1);
-
-        sigma = params.ExponentiateElement(t2, s_A);
-      }
-
-      Hash(&sigma, XX, xxs, YY, yys, AA, aas, BB, bbs, agreedValue, AgreedValueLength());
-    }
-    catch (DL_BadElement &)
-    {
-      return false;
-    }
-    return true;
-  }
-
-protected:
-
-  inline void Hash(const Element* sigma,
-    const byte* e1, size_t e1len, const byte* e2, size_t e2len,
-    const byte* s1, size_t s1len, const byte* s2, size_t s2len,
-    byte* digest, size_t dlen) const
-  {
-    HASH hash;
-    size_t idx = 0, req = dlen;
-    size_t blk = STDMIN(dlen, (size_t)HASH::DIGESTSIZE);
-
-    if(sigma)
-    {
-      Integer x = GetAbstractGroupParameters().ConvertElementToInteger(*sigma);
-      SecByteBlock sbb(x.MinEncodedSize());
-      x.Encode(sbb.BytePtr(), sbb.SizeInBytes());
-      hash.Update(sbb.BytePtr(), sbb.SizeInBytes());
-    }
-
-    hash.Update(e1, e1len);
-    hash.Update(e2, e2len);
-    hash.Update(s1, s1len);
-    hash.Update(s2, s2len);
-
-    hash.TruncatedFinal(digest, blk);
-    req -= blk;
-
-    // All this to catch tail bytes for large curves and small hashes
-    while(req != 0)
-    {
-      hash.Update(&digest[idx], (size_t)HASH::DIGESTSIZE);
-
-      idx += (size_t)HASH::DIGESTSIZE;
-      blk = STDMIN(req, (size_t)HASH::DIGESTSIZE);
-      hash.TruncatedFinal(&digest[idx], blk);
-
-      req -= blk;
-    }
-  }
-
-private:
-
-  // The paper uses Initiator and Recipient - make it classical.
-  enum KeyAgreementRole{ RoleServer = 1, RoleClient };
-
-  DL_GroupParameters<Element> & AccessAbstractGroupParameters() {return m_groupParameters;}
-  const DL_GroupParameters<Element> & GetAbstractGroupParameters() const{return m_groupParameters;}
-
-  GroupParameters m_groupParameters;
-  KeyAgreementRole m_role;
-};
-
-//! \brief Fully Hashed Menezes-Qu-Vanstone in GF(p)
-//! \details This implementation follows Augustin P. Sarr and Philippe Elbaz–Vincent, and Jean–Claude Bajard's
-//!   <a href="http://eprint.iacr.org/2009/408">A Secure and Efficient Authenticated Diffie-Hellman Protocol</a>.
-//!   Note: this is FHMQV, Protocol 5, from page 11; and not FHMQV-C.
-//! \sa FHMQV, MQV_Domain, HMQV_Domain, AuthenticatedKeyAgreementDomain
-//! \since Crypto++ 5.6.4
-typedef FHMQV_Domain<DL_GroupParameters_GFP_DefaultSafePrime> FHMQV;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/files.h b/src-cryptopp/files.h
deleted file mode 100644
index 554ae84..0000000
--- a/src-cryptopp/files.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef CRYPTOPP_FILES_H
-#define CRYPTOPP_FILES_H
-
-#include "cryptlib.h"
-#include "filters.h"
-#include "argnames.h"
-#include "smartptr.h"
-
-#include <iostream>
-#include <fstream>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! file-based implementation of Store interface
-class CRYPTOPP_DLL FileStore : public Store, private FilterPutSpaceHelper, public NotCopyable
-{
-public:
-	class Err : public Exception
-	{
-	public:
-		Err(const std::string &s) : Exception(IO_ERROR, s) {}
-	};
-	class OpenErr : public Err {public: OpenErr(const std::string &filename) : Err("FileStore: error opening file for reading: " + filename) {}};
-	class ReadErr : public Err {public: ReadErr() : Err("FileStore: error reading file") {}};
-
-	FileStore() : m_stream(NULL), m_space(NULL), m_len(0), m_waiting(0) {}
-	FileStore(std::istream &in) : m_stream(NULL), m_space(NULL), m_len(0), m_waiting(0)
-		{StoreInitialize(MakeParameters(Name::InputStreamPointer(), &in));}
-	FileStore(const char *filename) : m_stream(NULL), m_space(NULL), m_len(0), m_waiting(0)
-		{StoreInitialize(MakeParameters(Name::InputFileName(), filename ? filename : ""));}
-#if defined(CRYPTOPP_UNIX_AVAILABLE) || _MSC_VER >= 1400
-	//! specify file with Unicode name. On non-Windows OS, this function assumes that setlocale() has been called.
-	FileStore(const wchar_t *filename)
-		{StoreInitialize(MakeParameters(Name::InputFileNameWide(), filename));}
-#endif
-
-	std::istream* GetStream() {return m_stream;}
-
-	lword MaxRetrievable() const;
-	size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const;
-	lword Skip(lword skipMax=ULONG_MAX);
-
-private:
-	void StoreInitialize(const NameValuePairs &parameters);
-
-	member_ptr<std::ifstream> m_file;
-	std::istream *m_stream;
-	byte *m_space;
-	size_t m_len;
-	bool m_waiting;
-};
-
-//! file-based implementation of Source interface
-class CRYPTOPP_DLL FileSource : public SourceTemplate<FileStore>
-{
-public:
-	typedef FileStore::Err Err;
-	typedef FileStore::OpenErr OpenErr;
-	typedef FileStore::ReadErr ReadErr;
-
-	FileSource(BufferedTransformation *attachment = NULL)
-		: SourceTemplate<FileStore>(attachment) {}
-	FileSource(std::istream &in, bool pumpAll, BufferedTransformation *attachment = NULL)
-		: SourceTemplate<FileStore>(attachment) {SourceInitialize(pumpAll, MakeParameters(Name::InputStreamPointer(), &in));}
-	FileSource(const char *filename, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true)
-		: SourceTemplate<FileStore>(attachment) {SourceInitialize(pumpAll, MakeParameters(Name::InputFileName(), filename)(Name::InputBinaryMode(), binary));}
-#if defined(CRYPTOPP_UNIX_AVAILABLE) || _MSC_VER >= 1400
-	//! specify file with Unicode name. On non-Windows OS, this function assumes that setlocale() has been called.
-	FileSource(const wchar_t *filename, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true)
-		: SourceTemplate<FileStore>(attachment) {SourceInitialize(pumpAll, MakeParameters(Name::InputFileNameWide(), filename)(Name::InputBinaryMode(), binary));}
-#endif
-
-	std::istream* GetStream() {return m_store.GetStream();}
-};
-
-//! file-based implementation of Sink interface
-class CRYPTOPP_DLL FileSink : public Sink, public NotCopyable
-{
-public:
-	class Err : public Exception
-	{
-	public:
-		Err(const std::string &s) : Exception(IO_ERROR, s) {}
-	};
-	class OpenErr : public Err {public: OpenErr(const std::string &filename) : Err("FileSink: error opening file for writing: " + filename) {}};
-	class WriteErr : public Err {public: WriteErr() : Err("FileSink: error writing file") {}};
-
-	FileSink() : m_stream(NULL) {}
-	FileSink(std::ostream &out)
-		{IsolatedInitialize(MakeParameters(Name::OutputStreamPointer(), &out));}
-	FileSink(const char *filename, bool binary=true)
-		{IsolatedInitialize(MakeParameters(Name::OutputFileName(), filename)(Name::OutputBinaryMode(), binary));}
-#if defined(CRYPTOPP_UNIX_AVAILABLE) || _MSC_VER >= 1400
-	//! specify file with Unicode name. On non-Windows OS, this function assumes that setlocale() has been called.
-	FileSink(const wchar_t *filename, bool binary=true)
-		{IsolatedInitialize(MakeParameters(Name::OutputFileNameWide(), filename)(Name::OutputBinaryMode(), binary));}
-#endif
-
-	std::ostream* GetStream() {return m_stream;}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-	bool IsolatedFlush(bool hardFlush, bool blocking);
-
-private:
-	member_ptr<std::ofstream> m_file;
-	std::ostream *m_stream;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/filters.cpp b/src-cryptopp/filters.cpp
deleted file mode 100644
index 9366ca7..0000000
--- a/src-cryptopp/filters.cpp
+++ /dev/null
@@ -1,1169 +0,0 @@
-// filters.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4100 4189)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic ignored "-Wunused-value"
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "filters.h"
-#include "mqueue.h"
-#include "fltrimpl.h"
-#include "argnames.h"
-#include "smartptr.h"
-#include "stdcpp.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-Filter::Filter(BufferedTransformation *attachment)
-	: m_attachment(attachment), m_inputPosition(0), m_continueAt(0)
-{
-}
-
-BufferedTransformation * Filter::NewDefaultAttachment() const
-{
-	return new MessageQueue;
-}
-
-BufferedTransformation * Filter::AttachedTransformation()
-{
-	if (m_attachment.get() == NULL)
-		m_attachment.reset(NewDefaultAttachment());
-	return m_attachment.get();
-}
-
-const BufferedTransformation *Filter::AttachedTransformation() const
-{
-	if (m_attachment.get() == NULL)
-		const_cast<Filter *>(this)->m_attachment.reset(NewDefaultAttachment());
-	return m_attachment.get();
-}
-
-void Filter::Detach(BufferedTransformation *newOut)
-{
-	m_attachment.reset(newOut);
-}
-
-void Filter::Insert(Filter *filter)
-{
-	filter->m_attachment.reset(m_attachment.release());
-	m_attachment.reset(filter);
-}
-
-size_t Filter::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const
-{
-	return AttachedTransformation()->CopyRangeTo2(target, begin, end, channel, blocking);
-}
-
-size_t Filter::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking)
-{
-	return AttachedTransformation()->TransferTo2(target, transferBytes, channel, blocking);
-}
-
-void Filter::Initialize(const NameValuePairs &parameters, int propagation)
-{
-	m_inputPosition = m_continueAt = 0;
-	IsolatedInitialize(parameters);
-	PropagateInitialize(parameters, propagation);
-}
-
-bool Filter::Flush(bool hardFlush, int propagation, bool blocking)
-{
-	switch (m_continueAt)
-	{
-	case 0:
-		if (IsolatedFlush(hardFlush, blocking))
-			return true;
-		// fall through
-	case 1:
-		if (OutputFlush(1, hardFlush, propagation, blocking))
-			return true;
-		// fall through
-	default: ;;
-	}
-	return false;
-}
-
-bool Filter::MessageSeriesEnd(int propagation, bool blocking)
-{
-	switch (m_continueAt)
-	{
-	case 0:
-		if (IsolatedMessageSeriesEnd(blocking))
-			return true;
-		// fall through
-	case 1:
-		if (ShouldPropagateMessageSeriesEnd() && OutputMessageSeriesEnd(1, propagation, blocking))
-			return true;
-		// fall through
-	default: ;;
-	}
-	return false;
-}
-
-void Filter::PropagateInitialize(const NameValuePairs &parameters, int propagation)
-{
-	if (propagation)
-		AttachedTransformation()->Initialize(parameters, propagation-1);
-}
-
-size_t Filter::OutputModifiable(int outputSite, byte *inString, size_t length, int messageEnd, bool blocking, const std::string &channel)
-{
-	if (messageEnd)
-		messageEnd--;
-	size_t result = AttachedTransformation()->ChannelPutModifiable2(channel, inString, length, messageEnd, blocking);
-	m_continueAt = result ? outputSite : 0;
-	return result;
-}
-
-size_t Filter::Output(int outputSite, const byte *inString, size_t length, int messageEnd, bool blocking, const std::string &channel)
-{
-	if (messageEnd)
-		messageEnd--;
-	size_t result = AttachedTransformation()->ChannelPut2(channel, inString, length, messageEnd, blocking);
-	m_continueAt = result ? outputSite : 0;
-	return result;
-}
-
-bool Filter::OutputFlush(int outputSite, bool hardFlush, int propagation, bool blocking, const std::string &channel)
-{
-	if (propagation && AttachedTransformation()->ChannelFlush(channel, hardFlush, propagation-1, blocking))
-	{
-		m_continueAt = outputSite;
-		return true;
-	}
-	m_continueAt = 0;
-	return false;
-}
-
-bool Filter::OutputMessageSeriesEnd(int outputSite, int propagation, bool blocking, const std::string &channel)
-{
-	if (propagation && AttachedTransformation()->ChannelMessageSeriesEnd(channel, propagation-1, blocking))
-	{
-		m_continueAt = outputSite;
-		return true;
-	}
-	m_continueAt = 0;
-	return false;
-}
-
-// *************************************************************
-
-void MeterFilter::ResetMeter()
-{
-	m_currentMessageBytes = m_totalBytes = m_currentSeriesMessages = m_totalMessages = m_totalMessageSeries = 0;
-	m_rangesToSkip.clear();
-}
-
-void MeterFilter::AddRangeToSkip(unsigned int message, lword position, lword size, bool sortNow)
-{
-	MessageRange r = {message, position, size};
-	m_rangesToSkip.push_back(r);
-	if (sortNow)
-		std::sort(m_rangesToSkip.begin(), m_rangesToSkip.end());
-}
-
-size_t MeterFilter::PutMaybeModifiable(byte *begin, size_t length, int messageEnd, bool blocking, bool modifiable)
-{
-	if (!m_transparent)
-		return 0;
-
-	size_t t;
-	FILTER_BEGIN;
-
-	m_begin = begin;
-	m_length = length;
-
-	while (m_length > 0 || messageEnd)
-	{
-		if (m_length > 0  && !m_rangesToSkip.empty() && m_rangesToSkip.front().message == m_totalMessages && m_currentMessageBytes + m_length > m_rangesToSkip.front().position)
-		{
-			FILTER_OUTPUT_MAYBE_MODIFIABLE(1, m_begin, t = (size_t)SaturatingSubtract(m_rangesToSkip.front().position, m_currentMessageBytes), false, modifiable);
-
-			CRYPTOPP_ASSERT(t < m_length);
-			m_begin += t;
-			m_length -= t;
-			m_currentMessageBytes += t;
-			m_totalBytes += t;
-
-			if (m_currentMessageBytes + m_length < m_rangesToSkip.front().position + m_rangesToSkip.front().size)
-				t = m_length;
-			else
-			{
-				t = (size_t)SaturatingSubtract(m_rangesToSkip.front().position + m_rangesToSkip.front().size, m_currentMessageBytes);
-				CRYPTOPP_ASSERT(t <= m_length);
-				m_rangesToSkip.pop_front();
-			}
-
-			m_begin += t;
-			m_length -= t;
-			m_currentMessageBytes += t;
-			m_totalBytes += t;
-		}
-		else
-		{
-			FILTER_OUTPUT_MAYBE_MODIFIABLE(2, m_begin, m_length, messageEnd, modifiable);
-
-			m_currentMessageBytes += m_length;
-			m_totalBytes += m_length;
-			m_length = 0;
-
-			if (messageEnd)
-			{
-				m_currentMessageBytes = 0;
-				m_currentSeriesMessages++;
-				m_totalMessages++;
-				messageEnd = false;
-			}
-		}
-	}
-
-	FILTER_END_NO_MESSAGE_END;
-}
-
-size_t MeterFilter::Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	return PutMaybeModifiable(const_cast<byte *>(begin), length, messageEnd, blocking, false);
-}
-
-size_t MeterFilter::PutModifiable2(byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	return PutMaybeModifiable(begin, length, messageEnd, blocking, true);
-}
-
-bool MeterFilter::IsolatedMessageSeriesEnd(bool blocking)
-{
-	CRYPTOPP_UNUSED(blocking);
-	m_currentMessageBytes = 0;
-	m_currentSeriesMessages = 0;
-	m_totalMessageSeries++;
-	return false;
-}
-
-// *************************************************************
-
-void FilterWithBufferedInput::BlockQueue::ResetQueue(size_t blockSize, size_t maxBlocks)
-{
-	m_buffer.New(blockSize * maxBlocks);
-	m_blockSize = blockSize;
-	m_maxBlocks = maxBlocks;
-	m_size = 0;
-	m_begin = m_buffer;
-}
-
-byte *FilterWithBufferedInput::BlockQueue::GetBlock()
-{
-	if (m_size >= m_blockSize)
-	{
-		byte *ptr = m_begin;
-		if ((m_begin+=m_blockSize) == m_buffer.end())
-			m_begin = m_buffer;
-		m_size -= m_blockSize;
-		return ptr;
-	}
-	else
-		return NULL;
-}
-
-byte *FilterWithBufferedInput::BlockQueue::GetContigousBlocks(size_t &numberOfBytes)
-{
-	numberOfBytes = STDMIN(numberOfBytes, STDMIN(size_t(m_buffer.end()-m_begin), m_size));
-	byte *ptr = m_begin;
-	m_begin += numberOfBytes;
-	m_size -= numberOfBytes;
-	if (m_size == 0 || m_begin == m_buffer.end())
-		m_begin = m_buffer;
-	return ptr;
-}
-
-size_t FilterWithBufferedInput::BlockQueue::GetAll(byte *outString)
-{
-	// Avoid passing NULL pointer to memcpy
-	if (!outString) return 0;
-
-	size_t size = m_size;
-	size_t numberOfBytes = m_maxBlocks*m_blockSize;
-	const byte *ptr = GetContigousBlocks(numberOfBytes);
-	memcpy(outString, ptr, numberOfBytes);
-	memcpy(outString+numberOfBytes, m_begin, m_size);
-	m_size = 0;
-	return size;
-}
-
-void FilterWithBufferedInput::BlockQueue::Put(const byte *inString, size_t length)
-{
-	// Avoid passing NULL pointer to memcpy
-	if (!inString || !length) return;
-
-	CRYPTOPP_ASSERT(m_size + length <= m_buffer.size());
-	byte *end = (m_size < size_t(m_buffer.end()-m_begin)) ? m_begin + m_size : m_begin + m_size - m_buffer.size();
-	size_t len = STDMIN(length, size_t(m_buffer.end()-end));
-	memcpy(end, inString, len);
-	if (len < length)
-		memcpy(m_buffer, inString+len, length-len);
-	m_size += length;
-}
-
-#if !defined(CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562)
-FilterWithBufferedInput::FilterWithBufferedInput()
-	: Filter(), m_firstSize(SIZE_MAX), m_blockSize(0), m_lastSize(SIZE_MAX), m_firstInputDone(false)
-{
-}
-#endif
-
-FilterWithBufferedInput::FilterWithBufferedInput(BufferedTransformation *attachment)
-	: Filter(attachment), m_firstSize(SIZE_MAX), m_blockSize(0), m_lastSize(SIZE_MAX), m_firstInputDone(false)
-{
-}
-
-FilterWithBufferedInput::FilterWithBufferedInput(size_t firstSize, size_t blockSize, size_t lastSize, BufferedTransformation *attachment)
-	: Filter(attachment), m_firstSize(firstSize), m_blockSize(blockSize), m_lastSize(lastSize), m_firstInputDone(false)
-{
-	if (m_firstSize == SIZE_MAX || m_blockSize < 1 || m_lastSize == SIZE_MAX)
-		throw InvalidArgument("FilterWithBufferedInput: invalid buffer size");
-
-	m_queue.ResetQueue(1, m_firstSize);
-}
-
-void FilterWithBufferedInput::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	InitializeDerivedAndReturnNewSizes(parameters, m_firstSize, m_blockSize, m_lastSize);
-	if (m_firstSize == SIZE_MAX || m_blockSize < 1 || m_lastSize == SIZE_MAX)
-		throw InvalidArgument("FilterWithBufferedInput: invalid buffer size");
-	m_queue.ResetQueue(1, m_firstSize);
-	m_firstInputDone = false;
-}
-
-bool FilterWithBufferedInput::IsolatedFlush(bool hardFlush, bool blocking)
-{
-	if (!blocking)
-		throw BlockingInputOnly("FilterWithBufferedInput");
-
-	if (hardFlush)
-		ForceNextPut();
-	FlushDerived();
-
-	return false;
-}
-
-size_t FilterWithBufferedInput::PutMaybeModifiable(byte *inString, size_t length, int messageEnd, bool blocking, bool modifiable)
-{
-	if (!blocking)
-		throw BlockingInputOnly("FilterWithBufferedInput");
-
-	if (length != 0)
-	{
-		size_t newLength = m_queue.CurrentSize() + length;
-
-		if (!m_firstInputDone && newLength >= m_firstSize)
-		{
-			size_t len = m_firstSize - m_queue.CurrentSize();
-			m_queue.Put(inString, len);
-			FirstPut(m_queue.GetContigousBlocks(m_firstSize));
-			CRYPTOPP_ASSERT(m_queue.CurrentSize() == 0);
-			m_queue.ResetQueue(m_blockSize, (2*m_blockSize+m_lastSize-2)/m_blockSize);
-
-			inString += len;
-			newLength -= m_firstSize;
-			m_firstInputDone = true;
-		}
-
-		if (m_firstInputDone)
-		{
-			if (m_blockSize == 1)
-			{
-				while (newLength > m_lastSize && m_queue.CurrentSize() > 0)
-				{
-					size_t len = newLength - m_lastSize;
-					byte *ptr = m_queue.GetContigousBlocks(len);
-					NextPutModifiable(ptr, len);
-					newLength -= len;
-				}
-
-				if (newLength > m_lastSize)
-				{
-					size_t len = newLength - m_lastSize;
-					NextPutMaybeModifiable(inString, len, modifiable);
-					inString += len;
-					newLength -= len;
-				}
-			}
-			else
-			{
-				while (newLength >= m_blockSize + m_lastSize && m_queue.CurrentSize() >= m_blockSize)
-				{
-					NextPutModifiable(m_queue.GetBlock(), m_blockSize);
-					newLength -= m_blockSize;
-				}
-
-				if (newLength >= m_blockSize + m_lastSize && m_queue.CurrentSize() > 0)
-				{
-					CRYPTOPP_ASSERT(m_queue.CurrentSize() < m_blockSize);
-					size_t len = m_blockSize - m_queue.CurrentSize();
-					m_queue.Put(inString, len);
-					inString += len;
-					NextPutModifiable(m_queue.GetBlock(), m_blockSize);
-					newLength -= m_blockSize;
-				}
-
-				if (newLength >= m_blockSize + m_lastSize)
-				{
-					size_t len = RoundDownToMultipleOf(newLength - m_lastSize, m_blockSize);
-					NextPutMaybeModifiable(inString, len, modifiable);
-					inString += len;
-					newLength -= len;
-				}
-			}
-		}
-
-		m_queue.Put(inString, newLength - m_queue.CurrentSize());
-	}
-
-	if (messageEnd)
-	{
-		if (!m_firstInputDone && m_firstSize==0)
-			FirstPut(NULL);
-
-		SecByteBlock temp(m_queue.CurrentSize());
-		m_queue.GetAll(temp);
-		LastPut(temp, temp.size());
-
-		m_firstInputDone = false;
-		m_queue.ResetQueue(1, m_firstSize);
-
-		// Cast to void to supress Coverity finding
-		(void)Output(1, NULL, 0, messageEnd, blocking);
-	}
-	return 0;
-}
-
-void FilterWithBufferedInput::ForceNextPut()
-{
-	if (!m_firstInputDone)
-		return;
-
-	if (m_blockSize > 1)
-	{
-		while (m_queue.CurrentSize() >= m_blockSize)
-			NextPutModifiable(m_queue.GetBlock(), m_blockSize);
-	}
-	else
-	{
-		size_t len;
-		while ((len = m_queue.CurrentSize()) > 0)
-			NextPutModifiable(m_queue.GetContigousBlocks(len), len);
-	}
-}
-
-void FilterWithBufferedInput::NextPutMultiple(const byte *inString, size_t length)
-{
-	CRYPTOPP_ASSERT(m_blockSize > 1);	// m_blockSize = 1 should always override this function
-	while (length > 0)
-	{
-		CRYPTOPP_ASSERT(length >= m_blockSize);
-		NextPutSingle(inString);
-		inString += m_blockSize;
-		length -= m_blockSize;
-	}
-}
-
-// *************************************************************
-
-void Redirector::Initialize(const NameValuePairs &parameters, int propagation)
-{
-	m_target = parameters.GetValueWithDefault("RedirectionTargetPointer", (BufferedTransformation*)NULL);
-	m_behavior = parameters.GetIntValueWithDefault("RedirectionBehavior", PASS_EVERYTHING);
-
-	if (m_target && GetPassSignals())
-		m_target->Initialize(parameters, propagation);
-}
-
-// *************************************************************
-
-ProxyFilter::ProxyFilter(BufferedTransformation *filter, size_t firstSize, size_t lastSize, BufferedTransformation *attachment)
-	: FilterWithBufferedInput(firstSize, 1, lastSize, attachment), m_filter(filter)
-{
-	if (m_filter.get())
-		m_filter->Attach(new OutputProxy(*this, false));
-}
-
-bool ProxyFilter::IsolatedFlush(bool hardFlush, bool blocking)
-{
-	return m_filter.get() ? m_filter->Flush(hardFlush, -1, blocking) : false;
-}
-
-void ProxyFilter::SetFilter(Filter *filter)
-{
-	m_filter.reset(filter);
-	if (filter)
-	{
-		OutputProxy *proxy;
-		member_ptr<OutputProxy> temp(proxy = new OutputProxy(*this, false));
-		m_filter->TransferAllTo(*proxy);
-		m_filter->Attach(temp.release());
-	}
-}
-
-void ProxyFilter::NextPutMultiple(const byte *s, size_t len)
-{
-	if (m_filter.get())
-		m_filter->Put(s, len);
-}
-
-void ProxyFilter::NextPutModifiable(byte *s, size_t len)
-{
-	if (m_filter.get())
-		m_filter->PutModifiable(s, len);
-}
-
-// *************************************************************
-
-void RandomNumberSink::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	parameters.GetRequiredParameter("RandomNumberSink", "RandomNumberGeneratorPointer", m_rng);
-}
-
-size_t RandomNumberSink::Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	CRYPTOPP_UNUSED(messageEnd); CRYPTOPP_UNUSED(blocking);
-	m_rng->IncorporateEntropy(begin, length);
-	return 0;
-}
-
-size_t ArraySink::Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	CRYPTOPP_UNUSED(messageEnd); CRYPTOPP_UNUSED(blocking);
-
-	// Avoid passing NULL pointer to memcpy. Using memmove due to
-	//  Valgrind finding on overlapping buffers.
-	size_t copied = 0;
-	if (m_buf && begin)
-	{
-		copied = STDMIN(length, SaturatingSubtract(m_size, m_total));
-		memmove(m_buf+m_total, begin, copied);
-	}
-	m_total += copied;
-	return length - copied;
-}
-
-byte * ArraySink::CreatePutSpace(size_t &size)
-{
-	size = SaturatingSubtract(m_size, m_total);
-	return m_buf + m_total;
-}
-
-void ArraySink::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	ByteArrayParameter array;
-	if (!parameters.GetValue(Name::OutputBuffer(), array))
-		throw InvalidArgument("ArraySink: missing OutputBuffer argument");
-	m_buf = array.begin();
-	m_size = array.size();
-}
-
-size_t ArrayXorSink::Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	CRYPTOPP_UNUSED(messageEnd); CRYPTOPP_UNUSED(blocking);
-
-	// Avoid passing NULL pointer to xorbuf
-	size_t copied = 0;
-	if (m_buf && begin)
-	{
-		copied = STDMIN(length, SaturatingSubtract(m_size, m_total));
-		xorbuf(m_buf+m_total, begin, copied);
-	}
-	m_total += copied;
-	return length - copied;
-}
-
-// *************************************************************
-
-StreamTransformationFilter::StreamTransformationFilter(StreamTransformation &c, BufferedTransformation *attachment, BlockPaddingScheme padding, bool allowAuthenticatedSymmetricCipher)
-	: FilterWithBufferedInput(attachment)
-	, m_cipher(c), m_padding(DEFAULT_PADDING), m_optimalBufferSize(0)
-{
-	CRYPTOPP_ASSERT(c.MinLastBlockSize() == 0 || c.MinLastBlockSize() > c.MandatoryBlockSize());
-
-	if (!allowAuthenticatedSymmetricCipher && dynamic_cast<AuthenticatedSymmetricCipher *>(&c) != 0)
-		throw InvalidArgument("StreamTransformationFilter: please use AuthenticatedEncryptionFilter and AuthenticatedDecryptionFilter for AuthenticatedSymmetricCipher");
-
-	IsolatedInitialize(MakeParameters(Name::BlockPaddingScheme(), padding));
-}
-
-size_t StreamTransformationFilter::LastBlockSize(StreamTransformation &c, BlockPaddingScheme padding)
-{
-	if (c.MinLastBlockSize() > 0)
-		return c.MinLastBlockSize();
-	else if (c.MandatoryBlockSize() > 1 && !c.IsForwardTransformation() && padding != NO_PADDING && padding != ZEROS_PADDING)
-		return c.MandatoryBlockSize();
-	else
-		return 0;
-}
-
-void StreamTransformationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize)
-{
-	BlockPaddingScheme padding = parameters.GetValueWithDefault(Name::BlockPaddingScheme(), DEFAULT_PADDING);
-	bool isBlockCipher = (m_cipher.MandatoryBlockSize() > 1 && m_cipher.MinLastBlockSize() == 0);
-
-	if (padding == DEFAULT_PADDING)
-		m_padding = isBlockCipher ? PKCS_PADDING : NO_PADDING;
-	else
-		m_padding = padding;
-
-	if (!isBlockCipher && (m_padding == PKCS_PADDING || m_padding == ONE_AND_ZEROS_PADDING))
-		throw InvalidArgument("StreamTransformationFilter: PKCS_PADDING and ONE_AND_ZEROS_PADDING cannot be used with " + m_cipher.AlgorithmName());
-
-	firstSize = 0;
-	blockSize = m_cipher.MandatoryBlockSize();
-	lastSize = LastBlockSize(m_cipher, m_padding);
-}
-
-void StreamTransformationFilter::FirstPut(const byte* inString)
-{
-	CRYPTOPP_UNUSED(inString);
-	m_optimalBufferSize = m_cipher.OptimalBlockSize();
-	m_optimalBufferSize = (unsigned int)STDMAX(m_optimalBufferSize, RoundDownToMultipleOf(4096U, m_optimalBufferSize));
-}
-
-void StreamTransformationFilter::NextPutMultiple(const byte *inString, size_t length)
-{
-	if (!length)
-		return;
-
-	size_t s = m_cipher.MandatoryBlockSize();
-
-	do
-	{
-		size_t len = m_optimalBufferSize;
-		byte *space = HelpCreatePutSpace(*AttachedTransformation(), DEFAULT_CHANNEL, s, length, len);
-		if (len < length)
-		{
-			if (len == m_optimalBufferSize)
-				len -= m_cipher.GetOptimalBlockSizeUsed();
-			len = RoundDownToMultipleOf(len, s);
-		}
-		else
-			len = length;
-		m_cipher.ProcessString(space, inString, len);
-		AttachedTransformation()->PutModifiable(space, len);
-		inString += len;
-		length -= len;
-	}
-	while (length > 0);
-}
-
-void StreamTransformationFilter::NextPutModifiable(byte *inString, size_t length)
-{
-	m_cipher.ProcessString(inString, length);
-	AttachedTransformation()->PutModifiable(inString, length);
-}
-
-void StreamTransformationFilter::LastPut(const byte *inString, size_t length)
-{
-	byte *space = NULL;
-
-	switch (m_padding)
-	{
-	case NO_PADDING:
-	case ZEROS_PADDING:
-		if (length > 0)
-		{
-			size_t minLastBlockSize = m_cipher.MinLastBlockSize();
-			bool isForwardTransformation = m_cipher.IsForwardTransformation();
-
-			if (isForwardTransformation && m_padding == ZEROS_PADDING && (minLastBlockSize == 0 || length < minLastBlockSize))
-			{
-				// do padding
-				size_t blockSize = STDMAX(minLastBlockSize, (size_t)m_cipher.MandatoryBlockSize());
-				space = HelpCreatePutSpace(*AttachedTransformation(), DEFAULT_CHANNEL, blockSize);
-				if (inString) {memcpy(space, inString, length);}
-				memset(space + length, 0, blockSize - length);
-				m_cipher.ProcessLastBlock(space, space, blockSize);
-				AttachedTransformation()->Put(space, blockSize);
-			}
-			else
-			{
-				if (minLastBlockSize == 0)
-				{
-					if (isForwardTransformation)
-						throw InvalidDataFormat("StreamTransformationFilter: plaintext length is not a multiple of block size and NO_PADDING is specified");
-					else
-						throw InvalidCiphertext("StreamTransformationFilter: ciphertext length is not a multiple of block size");
-				}
-
-				space = HelpCreatePutSpace(*AttachedTransformation(), DEFAULT_CHANNEL, length, m_optimalBufferSize);
-				m_cipher.ProcessLastBlock(space, inString, length);
-				AttachedTransformation()->Put(space, length);
-			}
-		}
-		break;
-
-	case PKCS_PADDING:
-	case ONE_AND_ZEROS_PADDING:
-		unsigned int s;
-		s = m_cipher.MandatoryBlockSize();
-		CRYPTOPP_ASSERT(s > 1);
-		space = HelpCreatePutSpace(*AttachedTransformation(), DEFAULT_CHANNEL, s, m_optimalBufferSize);
-		if (m_cipher.IsForwardTransformation())
-		{
-			CRYPTOPP_ASSERT(length < s);
-			if (inString) {memcpy(space, inString, length);}
-			if (m_padding == PKCS_PADDING)
-			{
-				CRYPTOPP_ASSERT(s < 256);
-				byte pad = byte(s-length);
-				memset(space+length, pad, s-length);
-			}
-			else
-			{
-				space[length] = 0x80;
-				memset(space+length+1, 0, s-length-1);
-			}
-			m_cipher.ProcessData(space, space, s);
-			AttachedTransformation()->Put(space, s);
-		}
-		else
-		{
-			if (length != s)
-				throw InvalidCiphertext("StreamTransformationFilter: ciphertext length is not a multiple of block size");
-			m_cipher.ProcessData(space, inString, s);
-			if (m_padding == PKCS_PADDING)
-			{
-				byte pad = space[s-1];
-				if (pad < 1 || pad > s || std::find_if(space+s-pad, space+s, std::bind2nd(std::not_equal_to<byte>(), pad)) != space+s)
-					throw InvalidCiphertext("StreamTransformationFilter: invalid PKCS #7 block padding found");
-				length = s-pad;
-			}
-			else
-			{
-				while (length > 1 && space[length-1] == 0)
-					--length;
-				if (space[--length] != 0x80)
-					throw InvalidCiphertext("StreamTransformationFilter: invalid ones-and-zeros padding found");
-			}
-			AttachedTransformation()->Put(space, length);
-		}
-		break;
-
-	default:
-		CRYPTOPP_ASSERT(false);
-	}
-}
-
-// *************************************************************
-
-HashFilter::HashFilter(HashTransformation &hm, BufferedTransformation *attachment, bool putMessage, int truncatedDigestSize, const std::string &messagePutChannel, const std::string &hashPutChannel)
-	: m_hashModule(hm), m_putMessage(putMessage), m_digestSize(0), m_space(NULL)
-	, m_messagePutChannel(messagePutChannel), m_hashPutChannel(hashPutChannel)
-{
-	m_digestSize = truncatedDigestSize < 0 ? m_hashModule.DigestSize() : truncatedDigestSize;
-	Detach(attachment);
-}
-
-void HashFilter::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	m_putMessage = parameters.GetValueWithDefault(Name::PutMessage(), false);
-	int s = parameters.GetIntValueWithDefault(Name::TruncatedDigestSize(), -1);
-	m_digestSize = s < 0 ? m_hashModule.DigestSize() : s;
-}
-
-size_t HashFilter::Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-{
-	FILTER_BEGIN;
-	if (m_putMessage)
-		FILTER_OUTPUT3(1, 0, inString, length, 0, m_messagePutChannel);
-	if (inString && length)
-		m_hashModule.Update(inString, length);
-	if (messageEnd)
-	{
-		{
-			size_t size;
-			m_space = HelpCreatePutSpace(*AttachedTransformation(), m_hashPutChannel, m_digestSize, m_digestSize, size = m_digestSize);
-			m_hashModule.TruncatedFinal(m_space, m_digestSize);
-		}
-		FILTER_OUTPUT3(2, 0, m_space, m_digestSize, messageEnd, m_hashPutChannel);
-	}
-	FILTER_END_NO_MESSAGE_END;
-}
-
-// *************************************************************
-
-HashVerificationFilter::HashVerificationFilter(HashTransformation &hm, BufferedTransformation *attachment, word32 flags, int truncatedDigestSize)
-	: FilterWithBufferedInput(attachment)
-	, m_hashModule(hm), m_flags(0), m_digestSize(0), m_verified(false)
-{
-	IsolatedInitialize(MakeParameters(Name::HashVerificationFilterFlags(), flags)(Name::TruncatedDigestSize(), truncatedDigestSize));
-}
-
-void HashVerificationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize)
-{
-	m_flags = parameters.GetValueWithDefault(Name::HashVerificationFilterFlags(), (word32)DEFAULT_FLAGS);
-	int s = parameters.GetIntValueWithDefault(Name::TruncatedDigestSize(), -1);
-	m_digestSize = s < 0 ? m_hashModule.DigestSize() : s;
-	m_verified = false;
-	firstSize = m_flags & HASH_AT_BEGIN ? m_digestSize : 0;
-	blockSize = 1;
-	lastSize = m_flags & HASH_AT_BEGIN ? 0 : m_digestSize;
-}
-
-void HashVerificationFilter::FirstPut(const byte *inString)
-{
-	if (m_flags & HASH_AT_BEGIN)
-	{
-		m_expectedHash.New(m_digestSize);
-		if (inString) {memcpy(m_expectedHash, inString, m_expectedHash.size());}
-		if (m_flags & PUT_HASH)
-			AttachedTransformation()->Put(inString, m_expectedHash.size());
-	}
-}
-
-void HashVerificationFilter::NextPutMultiple(const byte *inString, size_t length)
-{
-	m_hashModule.Update(inString, length);
-	if (m_flags & PUT_MESSAGE)
-		AttachedTransformation()->Put(inString, length);
-}
-
-void HashVerificationFilter::LastPut(const byte *inString, size_t length)
-{
-	if (m_flags & HASH_AT_BEGIN)
-	{
-		CRYPTOPP_ASSERT(length == 0);
-		m_verified = m_hashModule.TruncatedVerify(m_expectedHash, m_digestSize);
-	}
-	else
-	{
-		m_verified = (length==m_digestSize && m_hashModule.TruncatedVerify(inString, length));
-		if (m_flags & PUT_HASH)
-			AttachedTransformation()->Put(inString, length);
-	}
-
-	if (m_flags & PUT_RESULT)
-		AttachedTransformation()->Put(m_verified);
-
-	if ((m_flags & THROW_EXCEPTION) && !m_verified)
-		throw HashVerificationFailed();
-}
-
-// *************************************************************
-
-AuthenticatedEncryptionFilter::AuthenticatedEncryptionFilter(AuthenticatedSymmetricCipher &c, BufferedTransformation *attachment,
-								bool putAAD, int truncatedDigestSize, const std::string &macChannel, BlockPaddingScheme padding)
-	: StreamTransformationFilter(c, attachment, padding, true)
-	, m_hf(c, new OutputProxy(*this, false), putAAD, truncatedDigestSize, AAD_CHANNEL, macChannel)
-{
-	CRYPTOPP_ASSERT(c.IsForwardTransformation());
-}
-
-void AuthenticatedEncryptionFilter::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	m_hf.IsolatedInitialize(parameters);
-	StreamTransformationFilter::IsolatedInitialize(parameters);
-}
-
-byte * AuthenticatedEncryptionFilter::ChannelCreatePutSpace(const std::string &channel, size_t &size)
-{
-	if (channel.empty())
-		return StreamTransformationFilter::CreatePutSpace(size);
-
-	if (channel == AAD_CHANNEL)
-		return m_hf.CreatePutSpace(size);
-
-	throw InvalidChannelName("AuthenticatedEncryptionFilter", channel);
-}
-
-size_t AuthenticatedEncryptionFilter::ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	if (channel.empty())
-		return StreamTransformationFilter::Put2(begin, length, messageEnd, blocking);
-
-	if (channel == AAD_CHANNEL)
-		return m_hf.Put2(begin, length, 0, blocking);
-
-	throw InvalidChannelName("AuthenticatedEncryptionFilter", channel);
-}
-
-void AuthenticatedEncryptionFilter::LastPut(const byte *inString, size_t length)
-{
-	StreamTransformationFilter::LastPut(inString, length);
-	m_hf.MessageEnd();
-}
-
-// *************************************************************
-
-AuthenticatedDecryptionFilter::AuthenticatedDecryptionFilter(AuthenticatedSymmetricCipher &c, BufferedTransformation *attachment, word32 flags, int truncatedDigestSize, BlockPaddingScheme padding)
-	: FilterWithBufferedInput(attachment)
-	, m_hashVerifier(c, new OutputProxy(*this, false))
-	, m_streamFilter(c, new OutputProxy(*this, false), padding, true)
-{
-	CRYPTOPP_ASSERT(!c.IsForwardTransformation() || c.IsSelfInverting());
-	IsolatedInitialize(MakeParameters(Name::BlockPaddingScheme(), padding)(Name::AuthenticatedDecryptionFilterFlags(), flags)(Name::TruncatedDigestSize(), truncatedDigestSize));
-}
-
-void AuthenticatedDecryptionFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize)
-{
-	word32 flags = parameters.GetValueWithDefault(Name::AuthenticatedDecryptionFilterFlags(), (word32)DEFAULT_FLAGS);
-
-	m_hashVerifier.Initialize(CombinedNameValuePairs(parameters, MakeParameters(Name::HashVerificationFilterFlags(), flags)));
-	m_streamFilter.Initialize(parameters);
-
-	firstSize = m_hashVerifier.m_firstSize;
-	blockSize = 1;
-	lastSize = m_hashVerifier.m_lastSize;
-}
-
-byte * AuthenticatedDecryptionFilter::ChannelCreatePutSpace(const std::string &channel, size_t &size)
-{
-	if (channel.empty())
-		return m_streamFilter.CreatePutSpace(size);
-
-	if (channel == AAD_CHANNEL)
-		return m_hashVerifier.CreatePutSpace(size);
-
-	throw InvalidChannelName("AuthenticatedDecryptionFilter", channel);
-}
-
-size_t AuthenticatedDecryptionFilter::ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking)
-{
-	if (channel.empty())
-	{
-		if (m_lastSize > 0)
-			m_hashVerifier.ForceNextPut();
-		return FilterWithBufferedInput::Put2(begin, length, messageEnd, blocking);
-	}
-
-	if (channel == AAD_CHANNEL)
-		return m_hashVerifier.Put2(begin, length, 0, blocking);
-
-	throw InvalidChannelName("AuthenticatedDecryptionFilter", channel);
-}
-
-void AuthenticatedDecryptionFilter::FirstPut(const byte *inString)
-{
-	m_hashVerifier.Put(inString, m_firstSize);
-}
-
-void AuthenticatedDecryptionFilter::NextPutMultiple(const byte *inString, size_t length)
-{
-	m_streamFilter.Put(inString, length);
-}
-
-void AuthenticatedDecryptionFilter::LastPut(const byte *inString, size_t length)
-{
-	m_streamFilter.MessageEnd();
-	m_hashVerifier.PutMessageEnd(inString, length);
-}
-
-// *************************************************************
-
-void SignerFilter::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	m_putMessage = parameters.GetValueWithDefault(Name::PutMessage(), false);
-	m_messageAccumulator.reset(m_signer.NewSignatureAccumulator(m_rng));
-}
-
-size_t SignerFilter::Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-{
-	FILTER_BEGIN;
-	m_messageAccumulator->Update(inString, length);
-	if (m_putMessage)
-		FILTER_OUTPUT(1, inString, length, 0);
-	if (messageEnd)
-	{
-		m_buf.New(m_signer.SignatureLength());
-		m_signer.Sign(m_rng, m_messageAccumulator.release(), m_buf);
-		FILTER_OUTPUT(2, m_buf, m_buf.size(), messageEnd);
-		m_messageAccumulator.reset(m_signer.NewSignatureAccumulator(m_rng));
-	}
-	FILTER_END_NO_MESSAGE_END;
-}
-
-SignatureVerificationFilter::SignatureVerificationFilter(const PK_Verifier &verifier, BufferedTransformation *attachment, word32 flags)
-	: FilterWithBufferedInput(attachment)
-	, m_verifier(verifier), m_flags(0), m_verified(0)
-{
-	IsolatedInitialize(MakeParameters(Name::SignatureVerificationFilterFlags(), flags));
-}
-
-void SignatureVerificationFilter::InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize)
-{
-	m_flags = parameters.GetValueWithDefault(Name::SignatureVerificationFilterFlags(), (word32)DEFAULT_FLAGS);
-	m_messageAccumulator.reset(m_verifier.NewVerificationAccumulator());
-	size_t size = m_verifier.SignatureLength();
-	CRYPTOPP_ASSERT(size != 0);	// TODO: handle recoverable signature scheme
-	m_verified = false;
-	firstSize = m_flags & SIGNATURE_AT_BEGIN ? size : 0;
-	blockSize = 1;
-	lastSize = m_flags & SIGNATURE_AT_BEGIN ? 0 : size;
-}
-
-void SignatureVerificationFilter::FirstPut(const byte *inString)
-{
-	if (m_flags & SIGNATURE_AT_BEGIN)
-	{
-		if (m_verifier.SignatureUpfront())
-			m_verifier.InputSignature(*m_messageAccumulator, inString, m_verifier.SignatureLength());
-		else
-		{
-			m_signature.New(m_verifier.SignatureLength());
-			if (inString) {memcpy(m_signature, inString, m_signature.size());}
-		}
-
-		if (m_flags & PUT_SIGNATURE)
-			AttachedTransformation()->Put(inString, m_signature.size());
-	}
-	else
-	{
-		CRYPTOPP_ASSERT(!m_verifier.SignatureUpfront());
-	}
-}
-
-void SignatureVerificationFilter::NextPutMultiple(const byte *inString, size_t length)
-{
-	m_messageAccumulator->Update(inString, length);
-	if (m_flags & PUT_MESSAGE)
-		AttachedTransformation()->Put(inString, length);
-}
-
-void SignatureVerificationFilter::LastPut(const byte *inString, size_t length)
-{
-	if (m_flags & SIGNATURE_AT_BEGIN)
-	{
-		CRYPTOPP_ASSERT(length == 0);
-		m_verifier.InputSignature(*m_messageAccumulator, m_signature, m_signature.size());
-		m_verified = m_verifier.VerifyAndRestart(*m_messageAccumulator);
-	}
-	else
-	{
-		m_verifier.InputSignature(*m_messageAccumulator, inString, length);
-		m_verified = m_verifier.VerifyAndRestart(*m_messageAccumulator);
-		if (m_flags & PUT_SIGNATURE)
-			AttachedTransformation()->Put(inString, length);
-	}
-
-	if (m_flags & PUT_RESULT)
-		AttachedTransformation()->Put(m_verified);
-
-	if ((m_flags & THROW_EXCEPTION) && !m_verified)
-		throw SignatureVerificationFailed();
-}
-
-// *************************************************************
-
-size_t Source::PumpAll2(bool blocking)
-{
-	unsigned int messageCount = UINT_MAX;
-	do {
-		RETURN_IF_NONZERO(PumpMessages2(messageCount, blocking));
-	} while(messageCount == UINT_MAX);
-
-	return 0;
-}
-
-bool Store::GetNextMessage()
-{
-	if (!m_messageEnd && !AnyRetrievable())
-	{
-		m_messageEnd=true;
-		return true;
-	}
-	else
-		return false;
-}
-
-unsigned int Store::CopyMessagesTo(BufferedTransformation &target, unsigned int count, const std::string &channel) const
-{
-	if (m_messageEnd || count == 0)
-		return 0;
-	else
-	{
-		CopyTo(target, ULONG_MAX, channel);
-		if (GetAutoSignalPropagation())
-			target.ChannelMessageEnd(channel, GetAutoSignalPropagation()-1);
-		return 1;
-	}
-}
-
-void StringStore::StoreInitialize(const NameValuePairs &parameters)
-{
-	ConstByteArrayParameter array;
-	if (!parameters.GetValue(Name::InputBuffer(), array))
-		throw InvalidArgument("StringStore: missing InputBuffer argument");
-	m_store = array.begin();
-	m_length = array.size();
-	m_count = 0;
-}
-
-size_t StringStore::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking)
-{
-	lword position = 0;
-	size_t blockedBytes = CopyRangeTo2(target, position, transferBytes, channel, blocking);
-	m_count += (size_t)position;
-	transferBytes = position;
-	return blockedBytes;
-}
-
-size_t StringStore::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const
-{
-	size_t i = UnsignedMin(m_length, m_count+begin);
-	size_t len = UnsignedMin(m_length-i, end-begin);
-	size_t blockedBytes = target.ChannelPut2(channel, m_store+i, len, 0, blocking);
-	if (!blockedBytes)
-		begin += len;
-	return blockedBytes;
-}
-
-void RandomNumberStore::StoreInitialize(const NameValuePairs &parameters)
-{
-	parameters.GetRequiredParameter("RandomNumberStore", "RandomNumberGeneratorPointer", m_rng);
-	int length;
-	parameters.GetRequiredIntParameter("RandomNumberStore", "RandomNumberStoreSize", length);
-	m_length = length;
-}
-
-size_t RandomNumberStore::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking)
-{
-	if (!blocking)
-		throw NotImplemented("RandomNumberStore: nonblocking transfer is not implemented by this object");
-
-	transferBytes = UnsignedMin(transferBytes, m_length - m_count);
-	m_rng->GenerateIntoBufferedTransformation(target, channel, transferBytes);
-	m_count += transferBytes;
-
-	return 0;
-}
-
-size_t NullStore::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const
-{
-	static const byte nullBytes[128] = {0};
-	while (begin < end)
-	{
-		size_t len = (size_t)STDMIN(end-begin, lword(128));
-		size_t blockedBytes = target.ChannelPut2(channel, nullBytes, len, 0, blocking);
-		if (blockedBytes)
-			return blockedBytes;
-		begin += len;
-	}
-	return 0;
-}
-
-size_t NullStore::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking)
-{
-	lword begin = 0;
-	size_t blockedBytes = NullStore::CopyRangeTo2(target, begin, transferBytes, channel, blocking);
-	transferBytes = begin;
-	m_size -= begin;
-	return blockedBytes;
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/filters.h b/src-cryptopp/filters.h
deleted file mode 100644
index 0324b46..0000000
--- a/src-cryptopp/filters.h
+++ /dev/null
@@ -1,1301 +0,0 @@
-// filters.h - written and placed in the public domain by Wei Dai
-
-//! \file filters.h
-//! \brief Implementation of BufferedTransformation's attachment interface.
-
-#ifndef CRYPTOPP_FILTERS_H
-#define CRYPTOPP_FILTERS_H
-
-#include "cryptlib.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4127 4189 4514)
-#endif
-
-#include "cryptlib.h"
-#include "simple.h"
-#include "secblock.h"
-#include "misc.h"
-#include "smartptr.h"
-#include "queue.h"
-#include "algparam.h"
-#include "stdcpp.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class Filter
-//! \brief Implementation of BufferedTransformation's attachment interface
-//! \details Filter is a cornerstone of the Pipeline trinitiy. Data flows from
-//!   Sources, through Filters, and then terminates in Sinks. The difference
-//!   between a Source and Filter is a Source \a pumps data, while a Filter does
-//!   not. The difference between a Filter and a Sink is a Filter allows an
-//!   attached transformation, while a Sink does not.
-//! \details See the discussion of BufferedTransformation in cryptlib.h for
-//!   more details.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Filter : public BufferedTransformation, public NotCopyable
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~Filter() {}
-#endif
-
-	//!	\name ATTACHMENT
-	//@{
-
-	//! \brief Construct a Filter
-	//! \param attachment an optional attached transformation
-	//! \details attachment can be \p NULL.
-	Filter(BufferedTransformation *attachment = NULL);
-
-	//! \brief Determine if attachable
-	//! \returns \p true if the object allows attached transformations, \p false otherwise.
-	//! \note Source and Filter offer attached transformations; while Sink does not.
-	bool Attachable() {return true;}
-
-	//! \brief Retrieve attached transformation
-	//! \returns pointer to a BufferedTransformation if there is an attached transformation, \p NULL otherwise.
-	BufferedTransformation *AttachedTransformation();
-
-	//! \brief Retrieve attached transformation
-	//! \returns pointer to a BufferedTransformation if there is an attached transformation, \p NULL otherwise.
-	const BufferedTransformation *AttachedTransformation() const;
-
-	//! \brief Replace an attached transformation
-	//! \param newAttachment an optional attached transformation
-	//! \details newAttachment can be a single filter, a chain of filters or \p NULL.
-	//!    Pass \p NULL to remove an existing BufferedTransformation or chain of filters
-	void Detach(BufferedTransformation *newAttachment = NULL);
-
-	//@}
-
-	// See the documentation for BufferedTransformation in cryptlib.h
-	size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const;
-
-	// See the documentation for BufferedTransformation in cryptlib.h
-	void Initialize(const NameValuePairs &parameters=g_nullNameValuePairs, int propagation=-1);
-	bool Flush(bool hardFlush, int propagation=-1, bool blocking=true);
-	bool MessageSeriesEnd(int propagation=-1, bool blocking=true);
-
-protected:
-	virtual BufferedTransformation * NewDefaultAttachment() const;
-	void Insert(Filter *nextFilter);	// insert filter after this one
-
-	virtual bool ShouldPropagateMessageEnd() const {return true;}
-	virtual bool ShouldPropagateMessageSeriesEnd() const {return true;}
-
-	void PropagateInitialize(const NameValuePairs &parameters, int propagation);
-
-	//! \brief Forward processed data on to attached transformation
-	//! \param outputSite unknown, system crash between keyboard and chair...
-	//! \param inString the byte buffer to process
-	//! \param length the size of the string, in bytes
-	//! \param messageEnd means how many filters to signal MessageEnd() to, including this one
-	//! \param blocking specifies whether the object should block when processing input
-	//! \param channel the channel to process the data
-	//! \returns the number of bytes that remain in the block (i.e., bytes not processed)
-	size_t Output(int outputSite, const byte *inString, size_t length, int messageEnd, bool blocking, const std::string &channel=DEFAULT_CHANNEL);
-
-	//! \brief Output multiple bytes that may be modified by callee.
-	//! \param outputSite unknown, system crash between keyboard and chair...
-	//! \param inString the byte buffer to process
-	//! \param length the size of the string, in bytes
-	//! \param messageEnd means how many filters to signal MessageEnd() to, including this one
-	//! \param blocking specifies whether the object should block when processing input
-	//! \param channel the channel to process the data
-	//! \returns the number of bytes that remain in the block (i.e., bytes not processed)
-	size_t OutputModifiable(int outputSite, byte *inString, size_t length, int messageEnd, bool blocking, const std::string &channel=DEFAULT_CHANNEL);
-
-	//! \brief Signals the end of messages to the object
-	//! \param outputSite unknown, system crash between keyboard and chair...
-	//! \param propagation the number of attached transformations the  MessageEnd() signal should be passed
-	//! \param blocking specifies whether the object should block when processing input
-	//! \param channel the channel to process the data
-	//! \returns TODO
-	//! \details propagation count includes this object. Setting  propagation to <tt>1</tt> means this
-	//!   object only. Setting propagation to <tt>-1</tt> means unlimited propagation.
-	bool OutputMessageEnd(int outputSite, int propagation, bool blocking, const std::string &channel=DEFAULT_CHANNEL);
-
-	//! \brief Flush buffered input and/or output, with signal propagation
-	//! \param outputSite unknown, system crash between keyboard and chair...
-	//! \param hardFlush is used to indicate whether all data should be flushed
-	//! \param propagation the number of attached transformations the  Flush() signal should be passed
-	//! \param blocking specifies whether the object should block when processing input
-	//! \param channel the channel to process the data
-	//! \returns TODO
-	//! \details propagation count includes this object. Setting  propagation to <tt>1</tt> means this
-	//!   object only. Setting  propagation to <tt>-1</tt> means unlimited propagation.
-	//! \note Hard flushes must be used with care. It means try to process and output everything, even if
-	//!   there may not be enough data to complete the action. For example, hard flushing a  HexDecoder
-	//!   would cause an error if you do it after inputing an odd number of hex encoded characters.
-	//! \note For some types of filters, like  ZlibDecompressor, hard flushes can only
-	//!   be done at "synchronization points". These synchronization points are positions in the data
-	//!   stream that are created by hard flushes on the corresponding reverse filters, in this
-	//!   example ZlibCompressor. This is useful when zlib compressed data is moved across a
-	//!   network in packets and compression state is preserved across packets, as in the SSH2 protocol.
-	bool OutputFlush(int outputSite, bool hardFlush, int propagation, bool blocking, const std::string &channel=DEFAULT_CHANNEL);
-
-	//! \brief Marks the end of a series of messages, with signal propagation
-	//! \param outputSite unknown, system crash between keyboard and chair...
-	//! \param propagation the number of attached transformations the  MessageSeriesEnd() signal should be passed
-	//! \param blocking specifies whether the object should block when processing input
-	//! \param channel the channel to process the data
-	//! \returns TODO
-	//! \details Each object that receives the signal will perform its processing, decrement
-	//!    propagation, and then pass the signal on to attached transformations if the value is not 0.
-	//! \details propagation count includes this object. Setting  propagation to <tt>1</tt> means this
-	//!   object only. Setting  propagation to <tt>-1</tt> means unlimited propagation.
-	//! \note There should be a MessageEnd() immediately before MessageSeriesEnd().
-	bool OutputMessageSeriesEnd(int outputSite, int propagation, bool blocking, const std::string &channel=DEFAULT_CHANNEL);
-
-private:
-	member_ptr<BufferedTransformation> m_attachment;
-
-protected:
-	size_t m_inputPosition;
-	int m_continueAt;
-};
-
-//! \class FilterPutSpaceHelper
-//! \brief Create a working space in a BufferedTransformation
-struct CRYPTOPP_DLL FilterPutSpaceHelper
-{
-	//! \brief Create a working space in a BufferedTransformation
-	//! \param target BufferedTransformation for the working space
-	//! \param channel channel for the working space
-	//! \param minSize minimum size of the allocation, in bytes
-	//! \param desiredSize preferred size of the allocation, in bytes
-	//! \param bufferSize actual size of the allocation, in bytes
-	//! \pre <tt>desiredSize >= minSize</tt> and <tt>bufferSize >= minSize</tt>.
-	//! \details \p bufferSize is an IN and OUT parameter. If HelpCreatePutSpace() returns a non-NULL value, then
-	//!    bufferSize is valid and provides the size of the working space created for the caller.
-	//! \details Internally, HelpCreatePutSpace() calls \ref BufferedTransformation::ChannelCreatePutSpace
-	//!   "ChannelCreatePutSpace()" using \p desiredSize. If the target returns \p desiredSize with a size less
-	//!   than \p minSize (i.e., the request could not be fulfilled), then an internal SecByteBlock
-	//!   called \p m_tempSpace is resized and used for the caller.
-	byte *HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize, size_t desiredSize, size_t &bufferSize)
-	{
-		CRYPTOPP_ASSERT(desiredSize >= minSize && bufferSize >= minSize);
-		if (m_tempSpace.size() < minSize)
-		{
-			byte *result = target.ChannelCreatePutSpace(channel, desiredSize);
-			if (desiredSize >= minSize)
-			{
-				bufferSize = desiredSize;
-				return result;
-			}
-			m_tempSpace.New(bufferSize);
-		}
-
-		bufferSize = m_tempSpace.size();
-		return m_tempSpace.begin();
-	}
-
-	//! \brief Create a working space in a BufferedTransformation
-	//! \param target the BufferedTransformation for the working space
-	//! \param channel channel for the working space
-	//! \param minSize minimum size of the allocation, in bytes
-	//! \details Internally, the overload calls HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize, size_t desiredSize, size_t &bufferSize) using \p minSize for missing arguments.
-	byte *HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize)
-		{return HelpCreatePutSpace(target, channel, minSize, minSize, minSize);}
-
-	//! \brief Create a working space in a BufferedTransformation
-	//! \param target the BufferedTransformation for the working space
-	//! \param channel channel for the working space
-	//! \param minSize minimum size of the allocation, in bytes
-	//! \param bufferSize the actual size of the allocation, in bytes
-	//! \details Internally, the overload calls HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize, size_t desiredSize, size_t &bufferSize) using \p minSize for missing arguments.
-	byte *HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize, size_t bufferSize)
-		{return HelpCreatePutSpace(target, channel, minSize, minSize, bufferSize);}
-
-	//! \brief Temporay working space
-	SecByteBlock m_tempSpace;
-};
-
-//! \class MeterFilter
-//! \brief Measure how many bytes and messages pass through the filter
-//! \details measure how many bytes and messages pass through the filter. The filter also serves as valve by
-//!   maintaining a list of ranges to skip during processing.
-class CRYPTOPP_DLL MeterFilter : public Bufferless<Filter>
-{
-public:
-	//! \brief Construct a MeterFilter
-	//! \param attachment an optional attached transformation
-	//! \param transparent flag indicating if the filter should function transparently
-	//! \details \p attachment can be \p NULL. The filter is transparent by default. If the filter is
-	//!   transparent, then PutMaybeModifiable() does not process a request and always returns 0.
-	MeterFilter(BufferedTransformation *attachment=NULL, bool transparent=true)
-		: m_transparent(transparent), m_currentMessageBytes(0), m_totalBytes(0)
-		, m_currentSeriesMessages(0), m_totalMessages(0), m_totalMessageSeries(0)
-		, m_begin(NULL), m_length(0) {Detach(attachment); ResetMeter();}
-
-	//! \brief Set or change the transparent mode of this object
-	//! \param transparent the new transparent mode
-	void SetTransparent(bool transparent) {m_transparent = transparent;}
-
-	//! \brief Adds a range to skip during processing
-	//! \param message the message to apply the range
-	//! \param position the 0-based index in the current stream
-	//! \param size the length of the range
-	//! \param sortNow flag indicating whether the range should be sorted
-	//! \details Internally, MeterFilter maitains a deque of ranges to skip. As messages are processed,
-	//!   ranges of bytes are skipped according to the list of ranges.
-	void AddRangeToSkip(unsigned int message, lword position, lword size, bool sortNow = true);
-
-	//! \brief Resets the meter
-	//! \details ResetMeter() reinitializes the meter by setting counters to 0 and removing previous
-	//!   skip ranges.
-	void ResetMeter();
-
-	void IsolatedInitialize(const NameValuePairs &parameters)
-		{CRYPTOPP_UNUSED(parameters); ResetMeter();}
-
-	lword GetCurrentMessageBytes() const {return m_currentMessageBytes;}
-	lword GetTotalBytes() const {return m_totalBytes;}
-	unsigned int GetCurrentSeriesMessages() const {return m_currentSeriesMessages;}
-	unsigned int GetTotalMessages() const {return m_totalMessages;}
-	unsigned int GetTotalMessageSeries() const {return m_totalMessageSeries;}
-
-	byte * CreatePutSpace(size_t &size)
-		{return AttachedTransformation()->CreatePutSpace(size);}
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-	size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking);
-	bool IsolatedMessageSeriesEnd(bool blocking);
-
-private:
-	size_t PutMaybeModifiable(byte *inString, size_t length, int messageEnd, bool blocking, bool modifiable);
-	bool ShouldPropagateMessageEnd() const {return m_transparent;}
-	bool ShouldPropagateMessageSeriesEnd() const {return m_transparent;}
-
-	struct MessageRange
-	{
-		inline bool operator<(const MessageRange &b) const	// BCB2006 workaround: this has to be a member function
-			{return message < b.message || (message == b.message && position < b.position);}
-		unsigned int message; lword position; lword size;
-	};
-
-	bool m_transparent;
-	lword m_currentMessageBytes, m_totalBytes;
-	unsigned int m_currentSeriesMessages, m_totalMessages, m_totalMessageSeries;
-	std::deque<MessageRange> m_rangesToSkip;
-	byte *m_begin;
-	size_t m_length;
-};
-
-//! \class TransparentFilter
-//! \brief A transparent MeterFilter
-//! \sa MeterFilter, OpaqueFilter
-class CRYPTOPP_DLL TransparentFilter : public MeterFilter
-{
-public:
-	//! \brief Construct a TransparentFilter
-	//! \param attachment an optional attached transformation
-	TransparentFilter(BufferedTransformation *attachment=NULL) : MeterFilter(attachment, true) {}
-};
-
-//! \class OpaqueFilter
-//! \brief A non-transparent MeterFilter
-//! \sa MeterFilter, TransparentFilter
-class CRYPTOPP_DLL OpaqueFilter : public MeterFilter
-{
-public:
-	//! \brief Construct an OpaqueFilter
-	//! \param attachment an optional attached transformation
-	OpaqueFilter(BufferedTransformation *attachment=NULL) : MeterFilter(attachment, false) {}
-};
-
-//! \class FilterWithBufferedInput
-//! \brief Divides an input stream into discrete blocks
-//! \details FilterWithBufferedInput divides the input stream into a first block, a number of
-//!   middle blocks, and a last block. First and last blocks are optional, and middle blocks may
-//!   be a stream instead (i.e. <tt>blockSize == 1</tt>).
-//! \sa AuthenticatedEncryptionFilter, AuthenticatedDecryptionFilter, HashVerificationFilter,
-//!   SignatureVerificationFilter, StreamTransformationFilter
-class CRYPTOPP_DLL FilterWithBufferedInput : public Filter
-{
-public:
-
-#if !defined(CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562)
-	//! default FilterWithBufferedInput for temporaries
-	FilterWithBufferedInput();
-#endif
-
-	//! \brief Construct a FilterWithBufferedInput with an attached transformation
-	//! \param attachment an attached transformation
-	FilterWithBufferedInput(BufferedTransformation *attachment);
-
-	//! \brief Construct a FilterWithBufferedInput with an attached transformation
-	//! \param firstSize the size of the first block
-	//! \param blockSize the size of middle blocks
-	//! \param lastSize the size of the last block
-	//! \param attachment an attached transformation
-	//! \details \p firstSize and \p lastSize may be 0. \p blockSize must be at least 1.
-	FilterWithBufferedInput(size_t firstSize, size_t blockSize, size_t lastSize, BufferedTransformation *attachment);
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-	{
-		return PutMaybeModifiable(const_cast<byte *>(inString), length, messageEnd, blocking, false);
-	}
-	size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking)
-	{
-		return PutMaybeModifiable(inString, length, messageEnd, blocking, true);
-	}
-
-	//! \brief Flushes data buffered by this object, without signal propagation
-	//! \param hardFlush indicates whether all data should be flushed
-	//! \param blocking specifies whether the object should block when processing input
-	//! \details IsolatedFlush() calls ForceNextPut() if hardFlush is true
-	//! \note  hardFlush must be used with care
-	bool IsolatedFlush(bool hardFlush, bool blocking);
-
-	//! \brief Flushes data buffered by this object
-	//! \details The input buffer may contain more than blockSize bytes if <tt>lastSize != 0</tt>.
-	//!   ForceNextPut() forces a call to NextPut() if this is the case.
-	void ForceNextPut();
-
-protected:
-	virtual bool DidFirstPut() const {return m_firstInputDone;}
-	virtual size_t GetFirstPutSize() const {return m_firstSize;}
-	virtual size_t GetBlockPutSize() const {return m_blockSize;}
-	virtual size_t GetLastPutSize() const {return m_lastSize;}
-
-	virtual void InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize)
-		{CRYPTOPP_UNUSED(parameters); CRYPTOPP_UNUSED(firstSize); CRYPTOPP_UNUSED(blockSize); CRYPTOPP_UNUSED(lastSize); InitializeDerived(parameters);}
-	virtual void InitializeDerived(const NameValuePairs &parameters)
-		{CRYPTOPP_UNUSED(parameters);}
-	// FirstPut() is called if (firstSize != 0 and totalLength >= firstSize)
-	// or (firstSize == 0 and (totalLength > 0 or a MessageEnd() is received)).
-	// inString is m_firstSize in length.
-	virtual void FirstPut(const byte *inString) =0;
-	// NextPut() is called if totalLength >= firstSize+blockSize+lastSize
-	virtual void NextPutSingle(const byte *inString)
-		{CRYPTOPP_UNUSED(inString); CRYPTOPP_ASSERT(false);}
-	// Same as NextPut() except length can be a multiple of blockSize
-	// Either NextPut() or NextPutMultiple() must be overriden
-	virtual void NextPutMultiple(const byte *inString, size_t length);
-	// Same as NextPutMultiple(), but inString can be modified
-	virtual void NextPutModifiable(byte *inString, size_t length)
-		{NextPutMultiple(inString, length);}
-	// LastPut() is always called
-	// if totalLength < firstSize then length == totalLength
-	// else if totalLength <= firstSize+lastSize then length == totalLength-firstSize
-	// else lastSize <= length < lastSize+blockSize
-	virtual void LastPut(const byte *inString, size_t length) =0;
-	virtual void FlushDerived() {}
-
-protected:
-	size_t PutMaybeModifiable(byte *begin, size_t length, int messageEnd, bool blocking, bool modifiable);
-	void NextPutMaybeModifiable(byte *inString, size_t length, bool modifiable)
-	{
-		if (modifiable) NextPutModifiable(inString, length);
-		else NextPutMultiple(inString, length);
-	}
-
-	// This function should no longer be used, put this here to cause a compiler error
-	// if someone tries to override NextPut().
-	virtual int NextPut(const byte *inString, size_t length)
-		{CRYPTOPP_UNUSED(inString); CRYPTOPP_UNUSED(length); CRYPTOPP_ASSERT(false); return 0;}
-
-	class BlockQueue
-	{
-	public:
-		void ResetQueue(size_t blockSize, size_t maxBlocks);
-		byte *GetBlock();
-		byte *GetContigousBlocks(size_t &numberOfBytes);
-		size_t GetAll(byte *outString);
-		void Put(const byte *inString, size_t length);
-		size_t CurrentSize() const {return m_size;}
-		size_t MaxSize() const {return m_buffer.size();}
-
-	private:
-		SecByteBlock m_buffer;
-		size_t m_blockSize, m_maxBlocks, m_size;
-		byte *m_begin;
-	};
-
-	size_t m_firstSize, m_blockSize, m_lastSize;
-	bool m_firstInputDone;
-	BlockQueue m_queue;
-};
-
-//! \class FilterWithInputQueue
-//! \brief A filter that buffers input using a ByteQueue
-//! \details FilterWithInputQueue will buffer input using a ByteQueue. When the filter receives
-//!   a \ref BufferedTransformation::MessageEnd() "MessageEnd()" signal it will pass the data
-//!   on to its attached transformation.
-class CRYPTOPP_DLL FilterWithInputQueue : public Filter
-{
-public:
-	//! \brief Construct a FilterWithInputQueue
-	//! \param attachment an optional attached transformation
-	FilterWithInputQueue(BufferedTransformation *attachment=NULL) : Filter(attachment) {}
-
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-	{
-		if (!blocking)
-			throw BlockingInputOnly("FilterWithInputQueue");
-
-		m_inQueue.Put(inString, length);
-		if (messageEnd)
-		{
-			IsolatedMessageEnd(blocking);
-			Output(0, NULL, 0, messageEnd, blocking);
-		}
-		return 0;
-	}
-
-protected:
-	virtual bool IsolatedMessageEnd(bool blocking) =0;
-	void IsolatedInitialize(const NameValuePairs &parameters)
-		{CRYPTOPP_UNUSED(parameters); m_inQueue.Clear();}
-
-	ByteQueue m_inQueue;
-};
-
-//! \struct BlockPaddingSchemeDef
-//! \brief Padding schemes used for block ciphers
-struct BlockPaddingSchemeDef
-{
-	//! \enum BlockPaddingScheme
-	//! \brief Padding schemes used for block ciphers.
-	//! \details DEFAULT_PADDING means PKCS_PADDING if <tt>cipher.MandatoryBlockSize() > 1 &&
-	//!   cipher.MinLastBlockSize() == 0</tt>, which holds for ECB or CBC mode. Otherwise,
-	//!   NO_PADDING for modes like OFB, CFB, CTR, CBC-CTS.
-	//! \sa <A HREF="http://www.weidai.com/scan-mirror/csp.html">Block Cipher Padding</A> for
-	//!   additional details.
-	enum BlockPaddingScheme {
-		//! \brief No padding added to a block
-		NO_PADDING,
-		//! \brief 0's padding added to a block
-		ZEROS_PADDING,
-		//! \brief PKCS #5 padding added to a block
-		PKCS_PADDING,
-		//! \brief 1 and 0's padding added to a block
-		ONE_AND_ZEROS_PADDING,
-		//! \brief Default padding scheme
-		DEFAULT_PADDING
-	};
-};
-
-//! \class StreamTransformationFilter
-//! \brief Filter wrapper for StreamTransformation
-//! \details Filter wrapper for StreamTransformation. The filter will optionally handle padding/unpadding when needed
-class CRYPTOPP_DLL StreamTransformationFilter : public FilterWithBufferedInput, public BlockPaddingSchemeDef, private FilterPutSpaceHelper
-{
-public:
-	//! \brief Construct a StreamTransformationFilter
-	//! \param c reference to a StreamTransformation
-	//! \param attachment an optional attached transformation
-	//! \param padding the \ref BlockPaddingSchemeDef "padding scheme"
-	//! \param allowAuthenticatedSymmetricCipher flag indicating whether the filter should allow authenticated encryption schemes
-	StreamTransformationFilter(StreamTransformation &c, BufferedTransformation *attachment = NULL, BlockPaddingScheme padding = DEFAULT_PADDING, bool allowAuthenticatedSymmetricCipher = false);
-
-	std::string AlgorithmName() const {return m_cipher.AlgorithmName();}
-
-protected:
-	void InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize);
-	void FirstPut(const byte *inString);
-	void NextPutMultiple(const byte *inString, size_t length);
-	void NextPutModifiable(byte *inString, size_t length);
-	void LastPut(const byte *inString, size_t length);
-
-	static size_t LastBlockSize(StreamTransformation &c, BlockPaddingScheme padding);
-
-	StreamTransformation &m_cipher;
-	BlockPaddingScheme m_padding;
-	unsigned int m_optimalBufferSize;
-};
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-typedef StreamTransformationFilter StreamCipherFilter;
-#endif
-
-//! \class HashFilter
-//! \brief Filter wrapper for HashTransformation
-class CRYPTOPP_DLL HashFilter : public Bufferless<Filter>, private FilterPutSpaceHelper
-{
-public:
-	//! \brief Construct a HashFilter
-	//! \param hm reference to a HashTransformation
-	//! \param attachment an optional attached transformation
-	//! \param putMessage flag indicating whether the original message should be passed to an attached transformation
-	//! \param truncatedDigestSize the size of the digest
-	//! \param messagePutChannel the channel on which the message should be output
-	//! \param hashPutChannel the channel on which the digest should be output
-	HashFilter(HashTransformation &hm, BufferedTransformation *attachment = NULL, bool putMessage=false, int truncatedDigestSize=-1, const std::string &messagePutChannel=DEFAULT_CHANNEL, const std::string &hashPutChannel=DEFAULT_CHANNEL);
-
-	std::string AlgorithmName() const {return m_hashModule.AlgorithmName();}
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-	byte * CreatePutSpace(size_t &size) {return m_hashModule.CreateUpdateSpace(size);}
-
-private:
-	HashTransformation &m_hashModule;
-	bool m_putMessage;
-	unsigned int m_digestSize;
-	byte *m_space;
-	std::string m_messagePutChannel, m_hashPutChannel;
-};
-
-//! \class HashVerificationFilter
-//! \brief Filter wrapper for HashTransformation
-class CRYPTOPP_DLL HashVerificationFilter : public FilterWithBufferedInput
-{
-public:
-	//! \class HashVerificationFailed
-	//! \brief Exception thrown when a data integrity check failure is encountered
-	class HashVerificationFailed : public Exception
-	{
-	public:
-		HashVerificationFailed()
-			: Exception(DATA_INTEGRITY_CHECK_FAILED, "HashVerificationFilter: message hash or MAC not valid") {}
-	};
-
-	//! \enum Flags
-	//! \brief Flags controlling filter behavior.
-	//! \details The flags are a bitmask and can be OR'd together.
-	enum Flags {
-		//! \brief Indicates the hash is at the end of the message (i.e., concatenation of message+hash)
-		HASH_AT_END=0,
-		//! \brief Indicates the hash is at the beginning of the message (i.e., concatenation of hash+message)
-		HASH_AT_BEGIN=1,
-		//! \brief Indicates the message should be passed to an attached transformation
-		PUT_MESSAGE=2,
-		//! \brief Indicates the hash should be passed to an attached transformation
-		PUT_HASH=4,
-		//! \brief Indicates the result of the verification should be passed to an attached transformation
-		PUT_RESULT=8,
-		//! \brief Indicates the filter should throw a HashVerificationFailed if a failure is encountered
-		THROW_EXCEPTION=16,
-		//! \brief Default flags using \p HASH_AT_BEGIN and \p PUT_RESULT
-		DEFAULT_FLAGS = HASH_AT_BEGIN | PUT_RESULT
-	};
-
-	//! \brief Construct a HashVerificationFilter
-	//! \param hm reference to a HashTransformation
-	//! \param attachment an optional attached transformation
-	//! \param flags flags indicating behaviors for the filter
-	//! \param truncatedDigestSize the size of the digest
-	//! \details <tt>truncatedDigestSize = -1</tt> indicates \ref HashTransformation::DigestSize() "DigestSize" should be used.
-	HashVerificationFilter(HashTransformation &hm, BufferedTransformation *attachment = NULL, word32 flags = DEFAULT_FLAGS, int truncatedDigestSize=-1);
-
-	std::string AlgorithmName() const {return m_hashModule.AlgorithmName();}
-	bool GetLastResult() const {return m_verified;}
-
-protected:
-	void InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize);
-	void FirstPut(const byte *inString);
-	void NextPutMultiple(const byte *inString, size_t length);
-	void LastPut(const byte *inString, size_t length);
-
-private:
-	friend class AuthenticatedDecryptionFilter;
-
-	HashTransformation &m_hashModule;
-	word32 m_flags;
-	unsigned int m_digestSize;
-	bool m_verified;
-	SecByteBlock m_expectedHash;
-};
-
-typedef HashVerificationFilter HashVerifier;	// for backwards compatibility
-
-//! \class AuthenticatedEncryptionFilter
-//! \brief Filter wrapper for encrypting with AuthenticatedSymmetricCipher
-//! \details Filter wrapper for encrypting with AuthenticatedSymmetricCipher, optionally handling padding/unpadding when needed
-class CRYPTOPP_DLL AuthenticatedEncryptionFilter : public StreamTransformationFilter
-{
-public:
-	//! \brief Construct a AuthenticatedEncryptionFilter
-	//! \param c reference to a AuthenticatedSymmetricCipher
-	//! \param attachment an optional attached transformation
-	//! \param putAAD flag indicating whether the AAD should be passed to an attached transformation
-	//! \param truncatedDigestSize the size of the digest
-	//! \param macChannel the channel on which the MAC should be output
-	//! \param padding the \ref BlockPaddingSchemeDef "padding scheme"
-	//! \details <tt>truncatedDigestSize = -1</tt> indicates \ref HashTransformation::DigestSize() "DigestSize" should be used.
-	AuthenticatedEncryptionFilter(AuthenticatedSymmetricCipher &c, BufferedTransformation *attachment = NULL, bool putAAD=false, int truncatedDigestSize=-1, const std::string &macChannel=DEFAULT_CHANNEL, BlockPaddingScheme padding = DEFAULT_PADDING);
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	byte * ChannelCreatePutSpace(const std::string &channel, size_t &size);
-	size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking);
-	void LastPut(const byte *inString, size_t length);
-
-protected:
-	HashFilter m_hf;
-};
-
-//! \class AuthenticatedDecryptionFilter
-//! \brief Filter wrapper for decrypting with AuthenticatedSymmetricCipher
-//! \details Filter wrapper wrapper for decrypting with AuthenticatedSymmetricCipher, optionally handling padding/unpadding when needed.
-class CRYPTOPP_DLL AuthenticatedDecryptionFilter : public FilterWithBufferedInput, public BlockPaddingSchemeDef
-{
-public:
-	//! \enum Flags
-	//! \brief Flags controlling filter behavior.
-	//! \details The flags are a bitmask and can be OR'd together.
-	enum Flags {
-		//! \brief Indicates the MAC is at the end of the message (i.e., concatenation of message+mac)
-		MAC_AT_END=0,
-		//! \brief Indicates the MAC is at the beginning of the message (i.e., concatenation of mac+message)
-		MAC_AT_BEGIN=1,
-		//! \brief Indicates the filter should throw a HashVerificationFailed if a failure is encountered
-		THROW_EXCEPTION=16,
-		//! \brief Default flags using \p THROW_EXCEPTION
-		DEFAULT_FLAGS = THROW_EXCEPTION
-	};
-
-	//! \brief Construct a AuthenticatedDecryptionFilter
-	//! \param c reference to a AuthenticatedSymmetricCipher
-	//! \param attachment an optional attached transformation
-	//! \param flags flags indicating behaviors for the filter
-	//! \param truncatedDigestSize the size of the digest
-	//! \param padding the \ref BlockPaddingSchemeDef "padding scheme"
-	//! \details Additional authenticated data should be given in channel "AAD".
-	//! \details <tt>truncatedDigestSize = -1</tt> indicates \ref HashTransformation::DigestSize() "DigestSize" should be used.
-	AuthenticatedDecryptionFilter(AuthenticatedSymmetricCipher &c, BufferedTransformation *attachment = NULL, word32 flags = DEFAULT_FLAGS, int truncatedDigestSize=-1, BlockPaddingScheme padding = DEFAULT_PADDING);
-
-	std::string AlgorithmName() const {return m_hashVerifier.AlgorithmName();}
-	byte * ChannelCreatePutSpace(const std::string &channel, size_t &size);
-	size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking);
-	bool GetLastResult() const {return m_hashVerifier.GetLastResult();}
-
-protected:
-	void InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize);
-	void FirstPut(const byte *inString);
-	void NextPutMultiple(const byte *inString, size_t length);
-	void LastPut(const byte *inString, size_t length);
-
-	HashVerificationFilter m_hashVerifier;
-	StreamTransformationFilter m_streamFilter;
-};
-
-//! \class SignerFilter
-//! \brief Filter wrapper for PK_Signer
-class CRYPTOPP_DLL SignerFilter : public Unflushable<Filter>
-{
-public:
-	//! \brief Construct a SignerFilter
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param signer a PK_Signer derived class
-	//! \param attachment an optional attached transformation
-	//! \param putMessage flag indicating whether the original message should be passed to an attached transformation
-	SignerFilter(RandomNumberGenerator &rng, const PK_Signer &signer, BufferedTransformation *attachment = NULL, bool putMessage=false)
-		: m_rng(rng), m_signer(signer), m_messageAccumulator(signer.NewSignatureAccumulator(rng)), m_putMessage(putMessage) {Detach(attachment);}
-
-	std::string AlgorithmName() const {return m_signer.AlgorithmName();}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-
-private:
-	RandomNumberGenerator &m_rng;
-	const PK_Signer &m_signer;
-	member_ptr<PK_MessageAccumulator> m_messageAccumulator;
-	bool m_putMessage;
-	SecByteBlock m_buf;
-};
-
-//! \class SignatureVerificationFilter
-//! \brief Filter wrapper for PK_Verifier
-class CRYPTOPP_DLL SignatureVerificationFilter : public FilterWithBufferedInput
-{
-public:
-	//! \brief Exception thrown when an invalid signature is encountered
-	class SignatureVerificationFailed : public Exception
-	{
-	public:
-		SignatureVerificationFailed()
-			: Exception(DATA_INTEGRITY_CHECK_FAILED, "VerifierFilter: digital signature not valid") {}
-	};
-
-	//! \enum Flags
-	//! \brief Flags controlling filter behavior.
-	//! \details The flags are a bitmask and can be OR'd together.
-	enum Flags {
-		//! \brief Indicates the signature is at the end of the message (i.e., concatenation of message+signature)
-		SIGNATURE_AT_END=0,
-		//! \brief Indicates the signature is at the beginning of the message (i.e., concatenation of signature+message)
-		SIGNATURE_AT_BEGIN=1,
-		//! \brief Indicates the message should be passed to an attached transformation
-		PUT_MESSAGE=2,
-		//! \brief Indicates the signature should be passed to an attached transformation
-		PUT_SIGNATURE=4,
-		//! \brief Indicates the result of the verification should be passed to an attached transformation
-		PUT_RESULT=8,
-		//! \brief Indicates the filter should throw a HashVerificationFailed if a failure is encountered
-		THROW_EXCEPTION=16,
-		//! \brief Default flags using \p SIGNATURE_AT_BEGIN and \p PUT_RESULT
-		DEFAULT_FLAGS = SIGNATURE_AT_BEGIN | PUT_RESULT
-	};
-
-	//! \brief Construct a SignatureVerificationFilter
-	//! \param verifier a PK_Verifier derived class
-	//! \param attachment an optional attached transformation
-	//! \param flags flags indicating behaviors for the filter
-	SignatureVerificationFilter(const PK_Verifier &verifier, BufferedTransformation *attachment = NULL, word32 flags = DEFAULT_FLAGS);
-
-	std::string AlgorithmName() const {return m_verifier.AlgorithmName();}
-
-	//! \brief Retrieves the result of the last verification
-	//! \returns true if the signature on the previosus message was valid, false otherwise
-	bool GetLastResult() const {return m_verified;}
-
-protected:
-	void InitializeDerivedAndReturnNewSizes(const NameValuePairs &parameters, size_t &firstSize, size_t &blockSize, size_t &lastSize);
-	void FirstPut(const byte *inString);
-	void NextPutMultiple(const byte *inString, size_t length);
-	void LastPut(const byte *inString, size_t length);
-
-private:
-	const PK_Verifier &m_verifier;
-	member_ptr<PK_MessageAccumulator> m_messageAccumulator;
-	word32 m_flags;
-	SecByteBlock m_signature;
-	bool m_verified;
-};
-
-typedef SignatureVerificationFilter VerifierFilter;	// for backwards compatibility
-
-//! \class Redirector
-//! \brief Redirect input to another BufferedTransformation without owning it
-class CRYPTOPP_DLL Redirector : public CustomSignalPropagation<Sink>
-{
-public:
-	//! \enum Behavior
-	//! \brief Controls signal propagation behavior
-	enum Behavior
-	{
-		//! \brief Pass data only
-		DATA_ONLY = 0x00,
-		//! \brief Pass signals
-		PASS_SIGNALS = 0x01,
-		//! \brief Pass wait events
-		PASS_WAIT_OBJECTS = 0x02,
-		//! \brief Pass everything
-		//! \details PASS_EVERYTHING is default
-		PASS_EVERYTHING = PASS_SIGNALS | PASS_WAIT_OBJECTS
-	};
-
-	//! \brief Construct a Redirector
-	Redirector() : m_target(NULL), m_behavior(PASS_EVERYTHING) {}
-
-	//! \brief Construct a Redirector
-	//! \param target the destination BufferedTransformation
-	//! \param behavior \ref Behavior "flags" specifying signal propagation
-	Redirector(BufferedTransformation &target, Behavior behavior=PASS_EVERYTHING)
-		: m_target(&target), m_behavior(behavior) {}
-
-	//! \brief Redirect input to another BufferedTransformation
-	//! \param target the destination BufferedTransformation
-	void Redirect(BufferedTransformation &target) {m_target = &target;}
-	//! \brief Stop redirecting input
-	void StopRedirection() {m_target = NULL;}
-
-	Behavior GetBehavior() {return (Behavior) m_behavior;}
-	void SetBehavior(Behavior behavior) {m_behavior=behavior;}
-	bool GetPassSignals() const {return (m_behavior & PASS_SIGNALS) != 0;}
-	void SetPassSignals(bool pass) { if (pass) m_behavior |= PASS_SIGNALS; else m_behavior &= ~(word32) PASS_SIGNALS; }
-	bool GetPassWaitObjects() const {return (m_behavior & PASS_WAIT_OBJECTS) != 0;}
-	void SetPassWaitObjects(bool pass) { if (pass) m_behavior |= PASS_WAIT_OBJECTS; else m_behavior &= ~(word32) PASS_WAIT_OBJECTS; }
-
-	bool CanModifyInput() const
-		{return m_target ? m_target->CanModifyInput() : false;}
-
-	void Initialize(const NameValuePairs &parameters, int propagation);
-	byte * CreatePutSpace(size_t &size)
-	{
-		if (m_target)
-			return m_target->CreatePutSpace(size);
-		else
-		{
-			size = 0;
-			return NULL;
-		}
-	}
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-		{return m_target ? m_target->Put2(inString, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;}
-	bool Flush(bool hardFlush, int propagation=-1, bool blocking=true)
-		{return m_target && GetPassSignals() ? m_target->Flush(hardFlush, propagation, blocking) : false;}
-	bool MessageSeriesEnd(int propagation=-1, bool blocking=true)
-		{return m_target && GetPassSignals() ? m_target->MessageSeriesEnd(propagation, blocking) : false;}
-
-	byte * ChannelCreatePutSpace(const std::string &channel, size_t &size)
-	{
-		if (m_target)
-			return m_target->ChannelCreatePutSpace(channel, size);
-		else
-		{
-			size = 0;
-			return NULL;
-		}
-	}
-	size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking)
-		{return m_target ? m_target->ChannelPut2(channel, begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;}
-	size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking)
-		{return m_target ? m_target->ChannelPutModifiable2(channel, begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;}
-	bool ChannelFlush(const std::string &channel, bool completeFlush, int propagation=-1, bool blocking=true)
-		{return m_target && GetPassSignals() ? m_target->ChannelFlush(channel, completeFlush, propagation, blocking) : false;}
-	bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true)
-		{return m_target && GetPassSignals() ? m_target->ChannelMessageSeriesEnd(channel, propagation, blocking) : false;}
-
-	unsigned int GetMaxWaitObjectCount() const
-		{ return m_target && GetPassWaitObjects() ? m_target->GetMaxWaitObjectCount() : 0; }
-	void GetWaitObjects(WaitObjectContainer &container, CallStack const& callStack)
-		{ if (m_target && GetPassWaitObjects()) m_target->GetWaitObjects(container, callStack); }
-
-private:
-	BufferedTransformation *m_target;
-	word32 m_behavior;
-};
-
-// Used By ProxyFilter
-class CRYPTOPP_DLL OutputProxy : public CustomSignalPropagation<Sink>
-{
-public:
-	OutputProxy(BufferedTransformation &owner, bool passSignal) : m_owner(owner), m_passSignal(passSignal) {}
-
-	bool GetPassSignal() const {return m_passSignal;}
-	void SetPassSignal(bool passSignal) {m_passSignal = passSignal;}
-
-	byte * CreatePutSpace(size_t &size)
-		{return m_owner.AttachedTransformation()->CreatePutSpace(size);}
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-		{return m_owner.AttachedTransformation()->Put2(inString, length, m_passSignal ? messageEnd : 0, blocking);}
-	size_t PutModifiable2(byte *begin, size_t length, int messageEnd, bool blocking)
-		{return m_owner.AttachedTransformation()->PutModifiable2(begin, length, m_passSignal ? messageEnd : 0, blocking);}
-	void Initialize(const NameValuePairs &parameters=g_nullNameValuePairs, int propagation=-1)
-		{if (m_passSignal) m_owner.AttachedTransformation()->Initialize(parameters, propagation);}
-	bool Flush(bool hardFlush, int propagation=-1, bool blocking=true)
-		{return m_passSignal ? m_owner.AttachedTransformation()->Flush(hardFlush, propagation, blocking) : false;}
-	bool MessageSeriesEnd(int propagation=-1, bool blocking=true)
-		{return m_passSignal ? m_owner.AttachedTransformation()->MessageSeriesEnd(propagation, blocking) : false;}
-
-	byte * ChannelCreatePutSpace(const std::string &channel, size_t &size)
-		{return m_owner.AttachedTransformation()->ChannelCreatePutSpace(channel, size);}
-	size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking)
-		{return m_owner.AttachedTransformation()->ChannelPut2(channel, begin, length, m_passSignal ? messageEnd : 0, blocking);}
-	size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking)
-		{return m_owner.AttachedTransformation()->ChannelPutModifiable2(channel, begin, length, m_passSignal ? messageEnd : 0, blocking);}
-	bool ChannelFlush(const std::string &channel, bool completeFlush, int propagation=-1, bool blocking=true)
-		{return m_passSignal ? m_owner.AttachedTransformation()->ChannelFlush(channel, completeFlush, propagation, blocking) : false;}
-	bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true)
-		{return m_passSignal ? m_owner.AttachedTransformation()->ChannelMessageSeriesEnd(channel, propagation, blocking) : false;}
-
-private:
-	BufferedTransformation &m_owner;
-	bool m_passSignal;
-};
-
-//! \class ProxyFilter
-//! \brief Base class for Filter classes that are proxies for a chain of other filters
-class CRYPTOPP_DLL ProxyFilter : public FilterWithBufferedInput
-{
-public:
-	//! \brief Construct a ProxyFilter
-	//! \param filter an output filter
-	//! \param firstSize the first Put size
-	//! \param lastSize the last Put size
-	//! \param attachment an attached transformation
-	ProxyFilter(BufferedTransformation *filter, size_t firstSize, size_t lastSize, BufferedTransformation *attachment);
-
-	bool IsolatedFlush(bool hardFlush, bool blocking);
-
-	//! \brief Sets the OutputProxy filter
-	//! \param filter an OutputProxy filter
-	void SetFilter(Filter *filter);
-	void NextPutMultiple(const byte *s, size_t len);
-	void NextPutModifiable(byte *inString, size_t length);
-
-protected:
-	member_ptr<BufferedTransformation> m_filter;
-};
-
-//! \class SimpleProxyFilter
-//! \brief Proxy filter that doesn't modify the underlying filter's input or output
-class CRYPTOPP_DLL SimpleProxyFilter : public ProxyFilter
-{
-public:
-	//! \brief Construct a SimpleProxyFilter
-	//! \param filter an output filter
-	//! \param attachment an attached transformation
-	SimpleProxyFilter(BufferedTransformation *filter, BufferedTransformation *attachment)
-		: ProxyFilter(filter, 0, 0, attachment) {}
-
-	void FirstPut(const byte * inString)
-		{CRYPTOPP_UNUSED(inString);}
-	void LastPut(const byte *inString, size_t length)
-		{CRYPTOPP_UNUSED(inString), CRYPTOPP_UNUSED(length); m_filter->MessageEnd();}
-};
-
-//! \class PK_EncryptorFilter
-//! \brief Filter wrapper for PK_Encryptor
-//! \details PK_DecryptorFilter is a proxy for the filter created by PK_Encryptor::CreateEncryptionFilter.
-//!   This class provides symmetry with VerifierFilter.
-class CRYPTOPP_DLL PK_EncryptorFilter : public SimpleProxyFilter
-{
-public:
-	//! \brief Construct a PK_EncryptorFilter
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param encryptor a PK_Encryptor derived class
-	//! \param attachment an optional attached transformation
-	PK_EncryptorFilter(RandomNumberGenerator &rng, const PK_Encryptor &encryptor, BufferedTransformation *attachment = NULL)
-		: SimpleProxyFilter(encryptor.CreateEncryptionFilter(rng), attachment) {}
-};
-
-//! \class PK_DecryptorFilter
-//! \brief Filter wrapper for PK_Decryptor
-//! \details PK_DecryptorFilter is a proxy for the filter created by PK_Decryptor::CreateDecryptionFilter.
-//!   This class provides symmetry with SignerFilter.
-class CRYPTOPP_DLL PK_DecryptorFilter : public SimpleProxyFilter
-{
-public:
-	//! \brief Construct a PK_DecryptorFilter
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param decryptor a PK_Decryptor derived class
-	//! \param attachment an optional attached transformation
-	PK_DecryptorFilter(RandomNumberGenerator &rng, const PK_Decryptor &decryptor, BufferedTransformation *attachment = NULL)
-		: SimpleProxyFilter(decryptor.CreateDecryptionFilter(rng), attachment) {}
-};
-
-//! \class StringSinkTemplate
-//! \brief Append input to a string object
-//! \tparam T std::basic_string<char> type
-//! \details \ref StringSinkTemplate "StringSink" is a StringSinkTemplate typedef
-template <class T>
-class StringSinkTemplate : public Bufferless<Sink>
-{
-public:
-	// VC60 workaround: no T::char_type
-	typedef typename T::traits_type::char_type char_type;
-
-	//! \brief Construct a StringSinkTemplate
-	//! \param output std::basic_string<char> type
-	StringSinkTemplate(T &output)
-		: m_output(&output) {CRYPTOPP_ASSERT(sizeof(output[0])==1);}
-
-	void IsolatedInitialize(const NameValuePairs &parameters)
-		{if (!parameters.GetValue("OutputStringPointer", m_output)) throw InvalidArgument("StringSink: OutputStringPointer not specified");}
-
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-	{
-		CRYPTOPP_UNUSED(messageEnd); CRYPTOPP_UNUSED(blocking);
-		if (length > 0)
-		{
-			typename T::size_type size = m_output->size();
-			if (length < size && size + length > m_output->capacity())
-				m_output->reserve(2*size);
-			m_output->append((const char_type *)inString, (const char_type *)inString+length);
-		}
-		return 0;
-	}
-
-private:
-	T *m_output;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS StringSinkTemplate<std::string>;
-DOCUMENTED_TYPEDEF(StringSinkTemplate<std::string>, StringSink);
-
-//! \class RandomNumberSink
-//! \brief Incorporates input into RNG as additional entropy
-class RandomNumberSink : public Bufferless<Sink>
-{
-public:
-	//! \brief Construct a RandomNumberSink
-	RandomNumberSink()
-		: m_rng(NULL) {}
-
-	//! \brief Construct a RandomNumberSink
-	//! \param rng a RandomNumberGenerator derived class
-	RandomNumberSink(RandomNumberGenerator &rng)
-		: m_rng(&rng) {}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-
-private:
-	RandomNumberGenerator *m_rng;
-};
-
-//! \class ArraySink
-//! \brief Copy input to a memory buffer
-class CRYPTOPP_DLL ArraySink : public Bufferless<Sink>
-{
-public:
-	//! \brief Construct an ArraySink
-	//! \param parameters a set of NameValuePairs to initialize this object
-	//! \details Name::OutputBuffer() is a mandatory parameter using this constructor.
-	ArraySink(const NameValuePairs &parameters = g_nullNameValuePairs)
-		: m_buf(NULL), m_size(0), m_total(0) {IsolatedInitialize(parameters);}
-
-	//! \brief Construct an ArraySink
-	//! \param buf pointer to a memory buffer
-	//! \param size length of the memory buffer
-	ArraySink(byte *buf, size_t size)
-		: m_buf(buf), m_size(size), m_total(0) {}
-
-	//! \brief Provides the size remaining in the Sink
-	//! \returns size remaining in the Sink, in bytes
-	size_t AvailableSize() {return SaturatingSubtract(m_size, m_total);}
-
-	//! \brief Provides the number of bytes written to the Sink
-	//! \returns number of bytes written to the Sink, in bytes
-	lword TotalPutLength() {return m_total;}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	byte * CreatePutSpace(size_t &size);
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-
-protected:
-	byte *m_buf;
-	size_t m_size;
-	lword m_total;
-};
-
-//! \class ArrayXorSink
-//! \brief Xor input to a memory buffer
-class CRYPTOPP_DLL ArrayXorSink : public ArraySink
-{
-public:
-	//! \brief Construct an ArrayXorSink
-	//! \param buf pointer to a memory buffer
-	//! \param size length of the memory buffer
-	ArrayXorSink(byte *buf, size_t size)
-		: ArraySink(buf, size) {}
-
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-	byte * CreatePutSpace(size_t &size) {return BufferedTransformation::CreatePutSpace(size);}
-};
-
-//! \class StringStore
-//! \brief String-based implementation of Store interface
-class StringStore : public Store
-{
-public:
-	//! \brief Construct a StringStore
-	//! \param string pointer to a C-String
-	StringStore(const char *string = NULL)
-		{StoreInitialize(MakeParameters("InputBuffer", ConstByteArrayParameter(string)));}
-
-	//! \brief Construct a StringStore
-	//! \param string pointer to a memory buffer
-	//! \param length size of the memory buffer
-	StringStore(const byte *string, size_t length)
-		{StoreInitialize(MakeParameters("InputBuffer", ConstByteArrayParameter(string, length)));}
-
-	//! \brief Construct a StringStore
-	//! \tparam T std::basic_string<char> type
-	//! \param string reference to a std::basic_string<char> type
-	template <class T> StringStore(const T &string)
-		{StoreInitialize(MakeParameters("InputBuffer", ConstByteArrayParameter(string)));}
-
-	CRYPTOPP_DLL size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	CRYPTOPP_DLL size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const;
-
-private:
-	CRYPTOPP_DLL void StoreInitialize(const NameValuePairs &parameters);
-
-	const byte *m_store;
-	size_t m_length, m_count;
-};
-
-//! RNG-based implementation of Source interface
-class CRYPTOPP_DLL RandomNumberStore : public Store
-{
-public:
-	RandomNumberStore()
-		: m_rng(NULL), m_length(0), m_count(0) {}
-
-	RandomNumberStore(RandomNumberGenerator &rng, lword length)
-		: m_rng(&rng), m_length(length), m_count(0) {}
-
-	bool AnyRetrievable() const {return MaxRetrievable() != 0;}
-	lword MaxRetrievable() const {return m_length-m_count;}
-
-	size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const
-	{
-		CRYPTOPP_UNUSED(target); CRYPTOPP_UNUSED(begin); CRYPTOPP_UNUSED(end); CRYPTOPP_UNUSED(channel); CRYPTOPP_UNUSED(blocking);
-		throw NotImplemented("RandomNumberStore: CopyRangeTo2() is not supported by this store");
-	}
-
-private:
-	void StoreInitialize(const NameValuePairs &parameters);
-
-	RandomNumberGenerator *m_rng;
-	lword m_length, m_count;
-};
-
-//! empty store
-class CRYPTOPP_DLL NullStore : public Store
-{
-public:
-	NullStore(lword size = ULONG_MAX) : m_size(size) {}
-	void StoreInitialize(const NameValuePairs &parameters)
-		{CRYPTOPP_UNUSED(parameters);}
-	lword MaxRetrievable() const {return m_size;}
-	size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const;
-
-private:
-	lword m_size;
-};
-
-//! \class Source
-//! \brief Implementation of BufferedTransformation's attachment interface
-//! \details Source is a cornerstone of the Pipeline trinitiy. Data flows from
-//!   Sources, through Filters, and then terminates in Sinks. The difference
-//!   between a Source and Filter is a Source \a pumps data, while a Filter does
-//!   not. The difference between a Filter and a Sink is a Filter allows an
-//!   attached transformation, while a Sink does not.
-//! \details See the discussion of BufferedTransformation in cryptlib.h for
-//!   more details.
-//! \sa Store and SourceTemplate
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Source : public InputRejecting<Filter>
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~Source() {}
-#endif
-
-	//! \brief Construct a Source
-	//! \param attachment an optional attached transformation
-	Source(BufferedTransformation *attachment = NULL)
-		{Source::Detach(attachment);}
-
-	//!	\name PIPELINE
-	//@{
-
-	//! \brief Pump data to attached transformation
-	//! \param pumpMax the maximpum number of bytes to pump
-	//! \returns the number of bytes that remain in the block (i.e., bytes not processed)
-	//! \details Internally, Pump() calls Pump2().
-	//! \note pumpMax is a \p lword, which is a 64-bit value that typically uses \p LWORD_MAX. The default
-	//!   argument is a \p size_t that uses \p SIZE_MAX, and it can be 32-bits or 64-bits.
-	lword Pump(lword pumpMax=(size_t)SIZE_MAX)
-		{Pump2(pumpMax); return pumpMax;}
-
-	//! \brief Pump messages to attached transformation
-	//! \param count the maximpum number of messages to pump
-	//! \returns TODO
-	//! \details Internally, PumpMessages() calls PumpMessages2().
-	unsigned int PumpMessages(unsigned int count=UINT_MAX)
-		{PumpMessages2(count); return count;}
-
-	//! \brief Pump all data to attached transformation
-	//! \details Internally, PumpAll() calls PumpAll2().
-	void PumpAll()
-		{PumpAll2();}
-
-	//! \brief Pump data to attached transformation
-	//! \param byteCount the maximpum number of bytes to pump
-	//! \param blocking specifies whether the object should block when processing input
-	//! \returns the number of bytes that remain in the block (i.e., bytes not processed)
-	//! \details byteCount is an \a IN and \a OUT parameter. When the call is made, byteCount is the
-	//!   requested size of the pump. When the call returns, byteCount is the number of bytes that
-	//!   were pumped.
-	virtual size_t Pump2(lword &byteCount, bool blocking=true) =0;
-
-	//! \brief Pump messages to attached transformation
-	//! \param messageCount the maximpum number of messages to pump
-	//! \param blocking specifies whether the object should block when processing input
-	//! \details messageCount is an IN and OUT parameter.
-	virtual size_t PumpMessages2(unsigned int &messageCount, bool blocking=true) =0;
-
-	//! \brief Pump all data to attached transformation
-	//! \param blocking specifies whether the object should block when processing input
-	//! \returns the number of bytes that remain in the block (i.e., bytes not processed)
-	virtual size_t PumpAll2(bool blocking=true);
-
-	//! \brief Determines if the Source is exhausted
-	//! \returns true if the source has been exhausted
-	virtual bool SourceExhausted() const =0;
-
-	//@}
-
-protected:
-	void SourceInitialize(bool pumpAll, const NameValuePairs &parameters)
-	{
-		IsolatedInitialize(parameters);
-		if (pumpAll)
-			PumpAll();
-	}
-};
-
-//! \class SourceTemplate
-//! \brief Transform a Store into a Source
-//! \tparam T the class or type
-template <class T>
-class SourceTemplate : public Source
-{
-public:
-	//! \brief Construct a SourceTemplate
-	//! \tparam T the class or type
-	//! \param attachment an attached transformation
-	SourceTemplate<T>(BufferedTransformation *attachment)
-		: Source(attachment) {}
-	void IsolatedInitialize(const NameValuePairs &parameters)
-		{m_store.IsolatedInitialize(parameters);}
-	size_t Pump2(lword &byteCount, bool blocking=true)
-		{return m_store.TransferTo2(*AttachedTransformation(), byteCount, DEFAULT_CHANNEL, blocking);}
-	size_t PumpMessages2(unsigned int &messageCount, bool blocking=true)
-		{return m_store.TransferMessagesTo2(*AttachedTransformation(), messageCount, DEFAULT_CHANNEL, blocking);}
-	size_t PumpAll2(bool blocking=true)
-		{return m_store.TransferAllTo2(*AttachedTransformation(), DEFAULT_CHANNEL, blocking);}
-	bool SourceExhausted() const
-		{return !m_store.AnyRetrievable() && !m_store.AnyMessages();}
-	void SetAutoSignalPropagation(int propagation)
-		{m_store.SetAutoSignalPropagation(propagation);}
-	int GetAutoSignalPropagation() const
-		{return m_store.GetAutoSignalPropagation();}
-
-protected:
-	T m_store;
-};
-
-//! \class SourceTemplate
-//! \brief String-based implementation of the Source interface
-class CRYPTOPP_DLL StringSource : public SourceTemplate<StringStore>
-{
-public:
-	//! \brief Construct a StringSource
-	//! \param attachment an optional attached transformation
-	StringSource(BufferedTransformation *attachment = NULL)
-		: SourceTemplate<StringStore>(attachment) {}
-
-	//! \brief Construct a StringSource
-	//! \param string C-String
-	//! \param pumpAll C-String
-	//! \param attachment an optional attached transformation
-	StringSource(const char *string, bool pumpAll, BufferedTransformation *attachment = NULL)
-		: SourceTemplate<StringStore>(attachment) {SourceInitialize(pumpAll, MakeParameters("InputBuffer", ConstByteArrayParameter(string)));}
-	//! binary byte array as source
-	StringSource(const byte *string, size_t length, bool pumpAll, BufferedTransformation *attachment = NULL)
-		: SourceTemplate<StringStore>(attachment) {SourceInitialize(pumpAll, MakeParameters("InputBuffer", ConstByteArrayParameter(string, length)));}
-	//! std::string as source
-	StringSource(const std::string &string, bool pumpAll, BufferedTransformation *attachment = NULL)
-		: SourceTemplate<StringStore>(attachment) {SourceInitialize(pumpAll, MakeParameters("InputBuffer", ConstByteArrayParameter(string)));}
-};
-
-// Use the third constructor for an array source
-DOCUMENTED_TYPEDEF(StringSource, ArraySource);
-
-//! RNG-based implementation of Source interface
-class CRYPTOPP_DLL RandomNumberSource : public SourceTemplate<RandomNumberStore>
-{
-public:
-	RandomNumberSource(RandomNumberGenerator &rng, int length, bool pumpAll, BufferedTransformation *attachment = NULL)
-		: SourceTemplate<RandomNumberStore>(attachment)
-		{SourceInitialize(pumpAll, MakeParameters("RandomNumberGeneratorPointer", &rng)("RandomNumberStoreSize", length));}
-};
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/fips140.cpp b/src-cryptopp/fips140.cpp
deleted file mode 100644
index 1c442e8..0000000
--- a/src-cryptopp/fips140.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// fips140.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "fips140.h"
-#include "misc.h"
-#include "trdlocal.h"	// needs to be included last for cygwin
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// Define this to 1 to turn on FIPS 140-2 compliance features, including additional tests during
-// startup, random number generation, and key generation. These tests may affect performance.
-#ifndef CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
-#define CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 0
-#endif
-
-#if (CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 && !defined(THREADS_AVAILABLE))
-#error FIPS 140-2 compliance requires the availability of thread local storage.
-#endif
-
-#if (CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 && !defined(OS_RNG_AVAILABLE))
-#error FIPS 140-2 compliance requires the availability of OS provided RNG.
-#endif
-
-PowerUpSelfTestStatus g_powerUpSelfTestStatus = POWER_UP_SELF_TEST_NOT_DONE;
-
-bool FIPS_140_2_ComplianceEnabled()
-{
-	return CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2;
-}
-
-void SimulatePowerUpSelfTestFailure()
-{
-	g_powerUpSelfTestStatus = POWER_UP_SELF_TEST_FAILED;
-}
-
-PowerUpSelfTestStatus CRYPTOPP_API GetPowerUpSelfTestStatus()
-{
-	return g_powerUpSelfTestStatus;
-}
-
-#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
-ThreadLocalStorage & AccessPowerUpSelfTestInProgress()
-{
-	static ThreadLocalStorage selfTestInProgress;
-	return selfTestInProgress;
-}
-#endif
-
-bool PowerUpSelfTestInProgressOnThisThread()
-{
-#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
-	return AccessPowerUpSelfTestInProgress().GetValue() != NULL;
-#else
-	CRYPTOPP_ASSERT(false);	// should not be called
-	return false;
-#endif
-}
-
-void SetPowerUpSelfTestInProgressOnThisThread(bool inProgress)
-{
-	CRYPTOPP_UNUSED(inProgress);
-#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
-	AccessPowerUpSelfTestInProgress().SetValue((void *)inProgress);
-#endif
-}
-
-void EncryptionPairwiseConsistencyTest_FIPS_140_Only(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor)
-{
-	CRYPTOPP_UNUSED(encryptor), CRYPTOPP_UNUSED(decryptor);
-#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
-	EncryptionPairwiseConsistencyTest(encryptor, decryptor);
-#endif
-}
-
-void SignaturePairwiseConsistencyTest_FIPS_140_Only(const PK_Signer &signer, const PK_Verifier &verifier)
-{
-	CRYPTOPP_UNUSED(signer), CRYPTOPP_UNUSED(verifier);
-#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
-	SignaturePairwiseConsistencyTest(signer, verifier);
-#endif
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/fips140.h b/src-cryptopp/fips140.h
deleted file mode 100644
index ec37158..0000000
--- a/src-cryptopp/fips140.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// fips140.h - written and placed in the public domain by Wei Dai
-
-//! \file fips140.h
-//! \brief Classes and functions for the FIPS 140-2 validated library
-//! \details The FIPS validated library is only available on Windows as a DLL. Once compiled,
-//!   the library is always in FIPS mode contingent upon successful execution of
-//!   DoPowerUpSelfTest() or DoDllPowerUpSelfTest().
-//! \sa <A HREF="http://cryptopp.com/wiki/Visual_Studio">Visual Studio</A> and
-//!   <A HREF="http://cryptopp.com/wiki/config.h">config.h</A> on the Crypto++ wiki.
-
-#ifndef CRYPTOPP_FIPS140_H
-#define CRYPTOPP_FIPS140_H
-
-#include "cryptlib.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class SelfTestFailure
-//! Exception thrown when a crypto algorithm is used after a self test fails
-//! \details The self tests for an algorithm are performed by Algortihm class
-//!   when CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 is defined.
-class CRYPTOPP_DLL SelfTestFailure : public Exception
-{
-public:
-	explicit SelfTestFailure(const std::string &s) : Exception(OTHER_ERROR, s) {}
-};
-
-//! \brief Determines whether the library provides FIPS validated cryptography
-//! \returns true if FIPS 140-2 validated features were enabled at compile time.
-//! \details true if FIPS 140-2 validated features were enabled at compile time,
-//!   false otherwise.
-//! \note FIPS mode is enabled at compile time. A program or other module cannot
-//!   arbitrarily enter or exit the mode.
-CRYPTOPP_DLL bool CRYPTOPP_API FIPS_140_2_ComplianceEnabled();
-
-//! \brief Status of the power-up self test
-enum PowerUpSelfTestStatus {
-
-	//! \brief The self tests have not been performed.
-	POWER_UP_SELF_TEST_NOT_DONE,
-	//! \brief The self tests were executed via DoPowerUpSelfTest() or
-	//!   DoDllPowerUpSelfTest(), but the result was failure.
-	POWER_UP_SELF_TEST_FAILED,
-	//! \brief The self tests were executed via DoPowerUpSelfTest() or
-	//!   DoDllPowerUpSelfTest(), and the result was success.
-	POWER_UP_SELF_TEST_PASSED
-};
-
-//! \brief Performs the power-up self test
-//! \param moduleFilename the fully qualified name of the module
-//! \param expectedModuleMac the expected MAC of the components protected by the integrity check
-//! \details Performs the power-up self test, and sets the self test status to
-//!   POWER_UP_SELF_TEST_PASSED or POWER_UP_SELF_TEST_FAILED.
-//! \details The self tests for an algorithm are performed by the Algortihm class
-//!   when CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 is defined.
-CRYPTOPP_DLL void CRYPTOPP_API DoPowerUpSelfTest(const char *moduleFilename, const byte *expectedModuleMac);
-
-//! \brief Performs the power-up self test on the DLL
-//! \details Performs the power-up self test using the filename of this DLL and the
-//!   embedded module MAC, and sets the self test status to POWER_UP_SELF_TEST_PASSED or
-//!   POWER_UP_SELF_TEST_FAILED.
-//! \details The self tests for an algorithm are performed by the Algortihm class
-//!   when CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 is defined.
-CRYPTOPP_DLL void CRYPTOPP_API DoDllPowerUpSelfTest();
-
-//! \brief Sets the power-up self test status to POWER_UP_SELF_TEST_FAILED
-//! \details Sets the power-up self test status to POWER_UP_SELF_TEST_FAILED to simulate failure.
-CRYPTOPP_DLL void CRYPTOPP_API SimulatePowerUpSelfTestFailure();
-
-//! \brief Provides the current power-up self test status
-//! \returns the current power-up self test status
-CRYPTOPP_DLL PowerUpSelfTestStatus CRYPTOPP_API GetPowerUpSelfTestStatus();
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-typedef PowerUpSelfTestStatus (CRYPTOPP_API * PGetPowerUpSelfTestStatus)();
-#endif
-
-//! \brief Class object that calculates the MAC on the module
-//! \returns the MAC for the module
-CRYPTOPP_DLL MessageAuthenticationCode * CRYPTOPP_API NewIntegrityCheckingMAC();
-
-//! \brief Verifies the MAC on the module
-//! \param moduleFilename the fully qualified name of the module
-//! \param expectedModuleMac the expected MAC of the components protected by the integrity check
-//! \param pActualMac the actual MAC of the components calculated by the integrity check
-//! \param pMacFileLocation the offest of the MAC in the PE/PE+ module
-//! \returns true if the MAC is valid, false otherwise
-CRYPTOPP_DLL bool CRYPTOPP_API IntegrityCheckModule(const char *moduleFilename, const byte *expectedModuleMac, SecByteBlock *pActualMac = NULL, unsigned long *pMacFileLocation = NULL);
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-// this is used by Algorithm constructor to allow Algorithm objects to be constructed for the self test
-bool PowerUpSelfTestInProgressOnThisThread();
-
-void SetPowerUpSelfTestInProgressOnThisThread(bool inProgress);
-
-void SignaturePairwiseConsistencyTest(const PK_Signer &signer, const PK_Verifier &verifier);
-void EncryptionPairwiseConsistencyTest(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor);
-
-void SignaturePairwiseConsistencyTest_FIPS_140_Only(const PK_Signer &signer, const PK_Verifier &verifier);
-void EncryptionPairwiseConsistencyTest_FIPS_140_Only(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor);
-#endif
-
-//! \brief The placeholder used prior to embedding the actual MAC in the module.
-//! \details After the DLL is built but before it is MAC'd, the string CRYPTOPP_DUMMY_DLL_MAC
-//!   is used as a placeholder for the actual MAC. A post-build step is performed which calculates
-//!   the MAC of the DLL and embeds it in the module. The actual MAC is written by the
-//!   <tt>cryptest.exe</tt> program using the <tt>mac_dll</tt> subcommand.
-#define CRYPTOPP_DUMMY_DLL_MAC "MAC_51f34b8db820ae8"
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/fltrimpl.h b/src-cryptopp/fltrimpl.h
deleted file mode 100644
index 1577ca7..0000000
--- a/src-cryptopp/fltrimpl.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef CRYPTOPP_FLTRIMPL_H
-#define CRYPTOPP_FLTRIMPL_H
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4100)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wunused-value"
-#endif
-
-#define FILTER_BEGIN	\
-	switch (m_continueAt)	\
-	{	\
-	case 0:	\
-		m_inputPosition = 0;
-
-#define FILTER_END_NO_MESSAGE_END_NO_RETURN	\
-		break;	\
-	default:	\
-		CRYPTOPP_ASSERT(false);	\
-	}
-
-#define FILTER_END_NO_MESSAGE_END	\
-	FILTER_END_NO_MESSAGE_END_NO_RETURN	\
-	return 0;
-
-/*
-#define FILTER_END	\
-	case -1:	\
-		if (messageEnd && Output(-1, NULL, 0, messageEnd, blocking))	\
-			return 1;	\
-	FILTER_END_NO_MESSAGE_END
-*/
-
-#define FILTER_OUTPUT3(site, statement, output, length, messageEnd, channel)	\
-	{\
-	case site:	\
-	statement;	\
-	if (Output(site, output, length, messageEnd, blocking, channel))	\
-		return STDMAX(size_t(1), length-m_inputPosition);\
-	}
-
-#define FILTER_OUTPUT2(site, statement, output, length, messageEnd)	\
-	FILTER_OUTPUT3(site, statement, output, length, messageEnd, DEFAULT_CHANNEL)
-
-#define FILTER_OUTPUT(site, output, length, messageEnd)	\
-	FILTER_OUTPUT2(site, 0, output, length, messageEnd)
-
-#define FILTER_OUTPUT_BYTE(site, output)	\
-	FILTER_OUTPUT(site, &(const byte &)(byte)output, 1, 0)
-
-#define FILTER_OUTPUT2_MODIFIABLE(site, statement, output, length, messageEnd)	\
-	{\
-	case site:	\
-	statement;	\
-	if (OutputModifiable(site, output, length, messageEnd, blocking))	\
-		return STDMAX(size_t(1), length-m_inputPosition);\
-	}
-
-#define FILTER_OUTPUT_MODIFIABLE(site, output, length, messageEnd)	\
-	FILTER_OUTPUT2_MODIFIABLE(site, 0, output, length, messageEnd)
-
-#define FILTER_OUTPUT2_MAYBE_MODIFIABLE(site, statement, output, length, messageEnd, modifiable)	\
-	{\
-	case site:	\
-	statement;	\
-	if (modifiable ? OutputModifiable(site, output, length, messageEnd, blocking) : Output(site, output, length, messageEnd, blocking))	\
-		return STDMAX(size_t(1), length-m_inputPosition);\
-	}
-
-#define FILTER_OUTPUT_MAYBE_MODIFIABLE(site, output, length, messageEnd, modifiable)	\
-	FILTER_OUTPUT2_MAYBE_MODIFIABLE(site, 0, output, length, messageEnd, modifiable)
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic pop
-#endif
-
-#endif
diff --git a/src-cryptopp/gcm.h b/src-cryptopp/gcm.h
deleted file mode 100644
index d2a4347..0000000
--- a/src-cryptopp/gcm.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// gcm.h - written and placed in the public domain by Wei Dai
-
-//! \file gcm.h
-//! \brief GCM block cipher mode of operation
-//! \since Crypto++ 5.6.0
-
-#ifndef CRYPTOPP_GCM_H
-#define CRYPTOPP_GCM_H
-
-#include "authenc.h"
-#include "modes.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \enum GCM_TablesOption
-//! \brief GCM table size options
-enum GCM_TablesOption {
-	//! \brief Use a table with 2K entries
-	GCM_2K_Tables,
-	//! \brief Use a table with 64K entries
-	GCM_64K_Tables};
-
-//! \class GCM_Base
-//! \brief GCM block cipher base implementation
-//! \details Base implementation of the AuthenticatedSymmetricCipher interface
-//! \since Crypto++ 5.6.0
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE GCM_Base : public AuthenticatedSymmetricCipherBase
-{
-public:
-	// AuthenticatedSymmetricCipher
-	std::string AlgorithmName() const
-		{return GetBlockCipher().AlgorithmName() + std::string("/GCM");}
-	size_t MinKeyLength() const
-		{return GetBlockCipher().MinKeyLength();}
-	size_t MaxKeyLength() const
-		{return GetBlockCipher().MaxKeyLength();}
-	size_t DefaultKeyLength() const
-		{return GetBlockCipher().DefaultKeyLength();}
-	size_t GetValidKeyLength(size_t n) const
-		{return GetBlockCipher().GetValidKeyLength(n);}
-	bool IsValidKeyLength(size_t n) const
-		{return GetBlockCipher().IsValidKeyLength(n);}
-	unsigned int OptimalDataAlignment() const;
-	IV_Requirement IVRequirement() const
-		{return UNIQUE_IV;}
-	unsigned int IVSize() const
-		{return 12;}
-	unsigned int MinIVLength() const
-		{return 1;}
-	unsigned int MaxIVLength() const
-		{return UINT_MAX;}		// (W64LIT(1)<<61)-1 in the standard
-	unsigned int DigestSize() const
-		{return 16;}
-	lword MaxHeaderLength() const
-		{return (W64LIT(1)<<61)-1;}
-	lword MaxMessageLength() const
-		{return ((W64LIT(1)<<39)-256)/8;}
-
-protected:
-	// AuthenticatedSymmetricCipherBase
-	bool AuthenticationIsOnPlaintext() const
-		{return false;}
-	unsigned int AuthenticationBlockSize() const
-		{return HASH_BLOCKSIZE;}
-	void SetKeyWithoutResync(const byte *userKey, size_t keylength, const NameValuePairs &params);
-	void Resync(const byte *iv, size_t len);
-	size_t AuthenticateBlocks(const byte *data, size_t len);
-	void AuthenticateLastHeaderBlock();
-	void AuthenticateLastConfidentialBlock();
-	void AuthenticateLastFooterBlock(byte *mac, size_t macSize);
-	SymmetricCipher & AccessSymmetricCipher() {return m_ctr;}
-
-	virtual BlockCipher & AccessBlockCipher() =0;
-	virtual GCM_TablesOption GetTablesOption() const =0;
-
-	const BlockCipher & GetBlockCipher() const {return const_cast<GCM_Base *>(this)->AccessBlockCipher();};
-	byte *HashBuffer() {return m_buffer+REQUIRED_BLOCKSIZE;}
-	byte *HashKey() {return m_buffer+2*REQUIRED_BLOCKSIZE;}
-	byte *MulTable() {return m_buffer+3*REQUIRED_BLOCKSIZE;}
-	inline void ReverseHashBufferIfNeeded();
-
-	class CRYPTOPP_DLL GCTR : public CTR_Mode_ExternalCipher::Encryption
-	{
-	protected:
-		void IncrementCounterBy256();
-	};
-
-	GCTR m_ctr;
-	static word16 s_reductionTable[256];
-	static volatile bool s_reductionTableInitialized;
-	enum {REQUIRED_BLOCKSIZE = 16, HASH_BLOCKSIZE = 16};
-};
-
-//! \class GCM_Final
-//! \brief GCM block cipher final implementation
-//! \tparam T_BlockCipher block cipher
-//! \tparam T_TablesOption table size, either \p GCM_2K_Tables or \p GCM_64K_Tables
-//! \tparam T_IsEncryption direction in which to operate the cipher
-//! \since Crypto++ 5.6.0
-template <class T_BlockCipher, GCM_TablesOption T_TablesOption, bool T_IsEncryption>
-class GCM_Final : public GCM_Base
-{
-public:
-	static std::string StaticAlgorithmName()
-		{return T_BlockCipher::StaticAlgorithmName() + std::string("/GCM");}
-	bool IsForwardTransformation() const
-		{return T_IsEncryption;}
-
-private:
-	GCM_TablesOption GetTablesOption() const {return T_TablesOption;}
-	BlockCipher & AccessBlockCipher() {return m_cipher;}
-	typename T_BlockCipher::Encryption m_cipher;
-};
-
-//! \class GCM
-//! \brief GCM block cipher mode of operation
-//! \tparam T_BlockCipher block cipher
-//! \tparam T_TablesOption table size, either \p GCM_2K_Tables or \p GCM_64K_Tables
-//! \details \p GCM provides the \p Encryption and \p Decryption typedef. See GCM_Base
-//!   and GCM_Final for the AuthenticatedSymmetricCipher implementation.
-//! \sa <a href="http://www.cryptolounge.org/wiki/GCM">GCM</a> at the Crypto Lounge
-//! \since Crypto++ 5.6.0
-template <class T_BlockCipher, GCM_TablesOption T_TablesOption=GCM_2K_Tables>
-struct GCM : public AuthenticatedSymmetricCipherDocumentation
-{
-	typedef GCM_Final<T_BlockCipher, T_TablesOption, true> Encryption;
-	typedef GCM_Final<T_BlockCipher, T_TablesOption, false> Decryption;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/gf2n.cpp b/src-cryptopp/gf2n.cpp
deleted file mode 100644
index 92915da..0000000
--- a/src-cryptopp/gf2n.cpp
+++ /dev/null
@@ -1,909 +0,0 @@
-// gf2n.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "cryptlib.h"
-#include "algebra.h"
-#include "randpool.h"
-#include "filters.h"
-#include "smartptr.h"
-#include "words.h"
-#include "misc.h"
-#include "gf2n.h"
-#include "asn.h"
-#include "oids.h"
-
-#include <iostream>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-PolynomialMod2::PolynomialMod2()
-{
-}
-
-PolynomialMod2::PolynomialMod2(word value, size_t bitLength)
-	: reg(BitsToWords(bitLength))
-{
-	CRYPTOPP_ASSERT(value==0 || reg.size()>0);
-
-	if (reg.size() > 0)
-	{
-		reg[0] = value;
-		SetWords(reg+1, 0, reg.size()-1);
-	}
-}
-
-PolynomialMod2::PolynomialMod2(const PolynomialMod2& t)
-	: reg(t.reg.size())
-{
-	CopyWords(reg, t.reg, reg.size());
-}
-
-void PolynomialMod2::Randomize(RandomNumberGenerator &rng, size_t nbits)
-{
-	const size_t nbytes = nbits/8 + 1;
-	SecByteBlock buf(nbytes);
-	rng.GenerateBlock(buf, nbytes);
-	buf[0] = (byte)Crop(buf[0], nbits % 8);
-	Decode(buf, nbytes);
-}
-
-PolynomialMod2 PolynomialMod2::AllOnes(size_t bitLength)
-{
-	PolynomialMod2 result((word)0, bitLength);
-	SetWords(result.reg, word(SIZE_MAX), result.reg.size());
-	if (bitLength%WORD_BITS)
-		result.reg[result.reg.size()-1] = (word)Crop(result.reg[result.reg.size()-1], bitLength%WORD_BITS);
-	return result;
-}
-
-void PolynomialMod2::SetBit(size_t n, int value)
-{
-	if (value)
-	{
-		reg.CleanGrow(n/WORD_BITS + 1);
-		reg[n/WORD_BITS] |= (word(1) << (n%WORD_BITS));
-	}
-	else
-	{
-		if (n/WORD_BITS < reg.size())
-			reg[n/WORD_BITS] &= ~(word(1) << (n%WORD_BITS));
-	}
-}
-
-byte PolynomialMod2::GetByte(size_t n) const
-{
-	if (n/WORD_SIZE >= reg.size())
-		return 0;
-	else
-		return byte(reg[n/WORD_SIZE] >> ((n%WORD_SIZE)*8));
-}
-
-void PolynomialMod2::SetByte(size_t n, byte value)
-{
-	reg.CleanGrow(BytesToWords(n+1));
-	reg[n/WORD_SIZE] &= ~(word(0xff) << 8*(n%WORD_SIZE));
-	reg[n/WORD_SIZE] |= (word(value) << 8*(n%WORD_SIZE));
-}
-
-PolynomialMod2 PolynomialMod2::Monomial(size_t i)
-{
-	PolynomialMod2 r((word)0, i+1);
-	r.SetBit(i);
-	return r;
-}
-
-PolynomialMod2 PolynomialMod2::Trinomial(size_t t0, size_t t1, size_t t2)
-{
-	PolynomialMod2 r((word)0, t0+1);
-	r.SetBit(t0);
-	r.SetBit(t1);
-	r.SetBit(t2);
-	return r;
-}
-
-PolynomialMod2 PolynomialMod2::Pentanomial(size_t t0, size_t t1, size_t t2, size_t t3, size_t t4)
-{
-	PolynomialMod2 r((word)0, t0+1);
-	r.SetBit(t0);
-	r.SetBit(t1);
-	r.SetBit(t2);
-	r.SetBit(t3);
-	r.SetBit(t4);
-	return r;
-}
-
-template <word i>
-struct NewPolynomialMod2
-{
-	PolynomialMod2 * operator()() const
-	{
-		return new PolynomialMod2(i);
-	}
-};
-
-const PolynomialMod2 &PolynomialMod2::Zero()
-{
-	return Singleton<PolynomialMod2>().Ref();
-}
-
-const PolynomialMod2 &PolynomialMod2::One()
-{
-	return Singleton<PolynomialMod2, NewPolynomialMod2<1> >().Ref();
-}
-
-void PolynomialMod2::Decode(const byte *input, size_t inputLen)
-{
-	StringStore store(input, inputLen);
-	Decode(store, inputLen);
-}
-
-void PolynomialMod2::Encode(byte *output, size_t outputLen) const
-{
-	ArraySink sink(output, outputLen);
-	Encode(sink, outputLen);
-}
-
-void PolynomialMod2::Decode(BufferedTransformation &bt, size_t inputLen)
-{
-	reg.CleanNew(BytesToWords(inputLen));
-
-	for (size_t i=inputLen; i > 0; i--)
-	{
-		byte b;
-		bt.Get(b);
-		reg[(i-1)/WORD_SIZE] |= word(b) << ((i-1)%WORD_SIZE)*8;
-	}
-}
-
-void PolynomialMod2::Encode(BufferedTransformation &bt, size_t outputLen) const
-{
-	for (size_t i=outputLen; i > 0; i--)
-		bt.Put(GetByte(i-1));
-}
-
-void PolynomialMod2::DEREncodeAsOctetString(BufferedTransformation &bt, size_t length) const
-{
-	DERGeneralEncoder enc(bt, OCTET_STRING);
-	Encode(enc, length);
-	enc.MessageEnd();
-}
-
-void PolynomialMod2::BERDecodeAsOctetString(BufferedTransformation &bt, size_t length)
-{
-	BERGeneralDecoder dec(bt, OCTET_STRING);
-	if (!dec.IsDefiniteLength() || dec.RemainingLength() != length)
-		BERDecodeError();
-	Decode(dec, length);
-	dec.MessageEnd();
-}
-
-unsigned int PolynomialMod2::WordCount() const
-{
-	return (unsigned int)CountWords(reg, reg.size());
-}
-
-unsigned int PolynomialMod2::ByteCount() const
-{
-	unsigned wordCount = WordCount();
-	if (wordCount)
-		return (wordCount-1)*WORD_SIZE + BytePrecision(reg[wordCount-1]);
-	else
-		return 0;
-}
-
-unsigned int PolynomialMod2::BitCount() const
-{
-	unsigned wordCount = WordCount();
-	if (wordCount)
-		return (wordCount-1)*WORD_BITS + BitPrecision(reg[wordCount-1]);
-	else
-		return 0;
-}
-
-unsigned int PolynomialMod2::Parity() const
-{
-	unsigned i;
-	word temp=0;
-	for (i=0; i<reg.size(); i++)
-		temp ^= reg[i];
-	return CryptoPP::Parity(temp);
-}
-
-PolynomialMod2& PolynomialMod2::operator=(const PolynomialMod2& t)
-{
-	reg.Assign(t.reg);
-	return *this;
-}
-
-PolynomialMod2& PolynomialMod2::operator^=(const PolynomialMod2& t)
-{
-	reg.CleanGrow(t.reg.size());
-	XorWords(reg, t.reg, t.reg.size());
-	return *this;
-}
-
-PolynomialMod2 PolynomialMod2::Xor(const PolynomialMod2 &b) const
-{
-	if (b.reg.size() >= reg.size())
-	{
-		PolynomialMod2 result((word)0, b.reg.size()*WORD_BITS);
-		XorWords(result.reg, reg, b.reg, reg.size());
-		CopyWords(result.reg+reg.size(), b.reg+reg.size(), b.reg.size()-reg.size());
-		return result;
-	}
-	else
-	{
-		PolynomialMod2 result((word)0, reg.size()*WORD_BITS);
-		XorWords(result.reg, reg, b.reg, b.reg.size());
-		CopyWords(result.reg+b.reg.size(), reg+b.reg.size(), reg.size()-b.reg.size());
-		return result;
-	}
-}
-
-PolynomialMod2 PolynomialMod2::And(const PolynomialMod2 &b) const
-{
-	PolynomialMod2 result((word)0, WORD_BITS*STDMIN(reg.size(), b.reg.size()));
-	AndWords(result.reg, reg, b.reg, result.reg.size());
-	return result;
-}
-
-PolynomialMod2 PolynomialMod2::Times(const PolynomialMod2 &b) const
-{
-	PolynomialMod2 result((word)0, BitCount() + b.BitCount());
-
-	for (int i=b.Degree(); i>=0; i--)
-	{
-		result <<= 1;
-		if (b[i])
-			XorWords(result.reg, reg, reg.size());
-	}
-	return result;
-}
-
-PolynomialMod2 PolynomialMod2::Squared() const
-{
-	static const word map[16] = {0, 1, 4, 5, 16, 17, 20, 21, 64, 65, 68, 69, 80, 81, 84, 85};
-
-	PolynomialMod2 result((word)0, 2*reg.size()*WORD_BITS);
-
-	for (unsigned i=0; i<reg.size(); i++)
-	{
-		unsigned j;
-
-		for (j=0; j<WORD_BITS; j+=8)
-			result.reg[2*i] |= map[(reg[i] >> (j/2)) % 16] << j;
-
-		for (j=0; j<WORD_BITS; j+=8)
-			result.reg[2*i+1] |= map[(reg[i] >> (j/2 + WORD_BITS/2)) % 16] << j;
-	}
-
-	return result;
-}
-
-void PolynomialMod2::Divide(PolynomialMod2 &remainder, PolynomialMod2 &quotient,
-				   const PolynomialMod2 &dividend, const PolynomialMod2 &divisor)
-{
-	if (!divisor)
-		throw PolynomialMod2::DivideByZero();
-
-	int degree = divisor.Degree();
-	remainder.reg.CleanNew(BitsToWords(degree+1));
-	if (dividend.BitCount() >= divisor.BitCount())
-		quotient.reg.CleanNew(BitsToWords(dividend.BitCount() - divisor.BitCount() + 1));
-	else
-		quotient.reg.CleanNew(0);
-
-	for (int i=dividend.Degree(); i>=0; i--)
-	{
-		remainder <<= 1;
-		remainder.reg[0] |= dividend[i];
-		if (remainder[degree])
-		{
-			remainder -= divisor;
-			quotient.SetBit(i);
-		}
-	}
-}
-
-PolynomialMod2 PolynomialMod2::DividedBy(const PolynomialMod2 &b) const
-{
-	PolynomialMod2 remainder, quotient;
-	PolynomialMod2::Divide(remainder, quotient, *this, b);
-	return quotient;
-}
-
-PolynomialMod2 PolynomialMod2::Modulo(const PolynomialMod2 &b) const
-{
-	PolynomialMod2 remainder, quotient;
-	PolynomialMod2::Divide(remainder, quotient, *this, b);
-	return remainder;
-}
-
-PolynomialMod2& PolynomialMod2::operator<<=(unsigned int n)
-{
-#if CRYPTOPP_DEBUG
-	int x; CRYPTOPP_UNUSED(x);
-	CRYPTOPP_ASSERT(SafeConvert(n,x));
-#endif
-
-	if (!reg.size())
-		return *this;
-
-	int i;
-	word u;
-	word carry=0;
-	word *r=reg;
-
-	if (n==1)	// special case code for most frequent case
-	{
-		i = (int)reg.size();
-		while (i--)
-		{
-			u = *r;
-			*r = (u << 1) | carry;
-			carry = u >> (WORD_BITS-1);
-			r++;
-		}
-
-		if (carry)
-		{
-			reg.Grow(reg.size()+1);
-			reg[reg.size()-1] = carry;
-		}
-
-		return *this;
-	}
-
-	const int shiftWords = n / WORD_BITS;
-	const int shiftBits = n % WORD_BITS;
-
-	if (shiftBits)
-	{
-		i = (int)reg.size();
-		while (i--)
-		{
-			u = *r;
-			*r = (u << shiftBits) | carry;
-			carry = u >> (WORD_BITS-shiftBits);
-			r++;
-		}
-	}
-
-	if (carry)
-	{
-		// Thanks to Apatryda, http://github.com/weidai11/cryptopp/issues/64
-		const size_t carryIndex = reg.size();
-		reg.Grow(reg.size()+shiftWords+!!shiftBits);
-		reg[carryIndex] = carry;
-	}
-	else
-		reg.Grow(reg.size()+shiftWords);
-
-	if (shiftWords)
-	{
-		for (i = (int)reg.size()-1; i>=shiftWords; i--)
-			reg[i] = reg[i-shiftWords];
-		for (; i>=0; i--)
-			reg[i] = 0;
-	}
-
-	return *this;
-}
-
-PolynomialMod2& PolynomialMod2::operator>>=(unsigned int n)
-{
-	if (!reg.size())
-		return *this;
-
-	int shiftWords = n / WORD_BITS;
-	int shiftBits = n % WORD_BITS;
-
-	size_t i;
-	word u;
-	word carry=0;
-	word *r=reg+reg.size()-1;
-
-	if (shiftBits)
-	{
-		i = reg.size();
-		while (i--)
-		{
-			u = *r;
-			*r = (u >> shiftBits) | carry;
-			carry = u << (WORD_BITS-shiftBits);
-			r--;
-		}
-	}
-
-	if (shiftWords)
-	{
-		for (i=0; i<reg.size()-shiftWords; i++)
-			reg[i] = reg[i+shiftWords];
-		for (; i<reg.size(); i++)
-			reg[i] = 0;
-	}
-
-	return *this;
-}
-
-PolynomialMod2 PolynomialMod2::operator<<(unsigned int n) const
-{
-	PolynomialMod2 result(*this);
-	return result<<=n;
-}
-
-PolynomialMod2 PolynomialMod2::operator>>(unsigned int n) const
-{
-	PolynomialMod2 result(*this);
-	return result>>=n;
-}
-
-bool PolynomialMod2::operator!() const
-{
-	for (unsigned i=0; i<reg.size(); i++)
-		if (reg[i]) return false;
-	return true;
-}
-
-bool PolynomialMod2::Equals(const PolynomialMod2 &rhs) const
-{
-	size_t i, smallerSize = STDMIN(reg.size(), rhs.reg.size());
-
-	for (i=0; i<smallerSize; i++)
-		if (reg[i] != rhs.reg[i]) return false;
-
-	for (i=smallerSize; i<reg.size(); i++)
-		if (reg[i] != 0) return false;
-
-	for (i=smallerSize; i<rhs.reg.size(); i++)
-		if (rhs.reg[i] != 0) return false;
-
-	return true;
-}
-
-std::ostream& operator<<(std::ostream& out, const PolynomialMod2 &a)
-{
-	// Get relevant conversion specifications from ostream.
-	long f = out.flags() & std::ios::basefield;	// Get base digits.
-	int bits, block;
-	char suffix;
-	switch(f)
-	{
-	case std::ios::oct :
-		bits = 3;
-		block = 4;
-		suffix = 'o';
-		break;
-	case std::ios::hex :
-		bits = 4;
-		block = 2;
-		suffix = 'h';
-		break;
-	default :
-		bits = 1;
-		block = 8;
-		suffix = 'b';
-	}
-
-	if (!a)
-		return out << '0' << suffix;
-
-	SecBlock<char> s(a.BitCount()/bits+1);
-	unsigned i;
-
-	static const char upper[]="0123456789ABCDEF";
-	static const char lower[]="0123456789abcdef";
-	const char* vec = (out.flags() & std::ios::uppercase) ? upper : lower;
-
-	for (i=0; i*bits < a.BitCount(); i++)
-	{
-		int digit=0;
-		for (int j=0; j<bits; j++)
-			digit |= a[i*bits+j] << j;
-		s[i]=vec[digit];
-	}
-
-	while (i--)
-	{
-		out << s[i];
-		if (i && (i%block)==0)
-			out << ',';
-	}
-
-	return out << suffix;
-}
-
-PolynomialMod2 PolynomialMod2::Gcd(const PolynomialMod2 &a, const PolynomialMod2 &b)
-{
-	return EuclideanDomainOf<PolynomialMod2>().Gcd(a, b);
-}
-
-PolynomialMod2 PolynomialMod2::InverseMod(const PolynomialMod2 &modulus) const
-{
-	typedef EuclideanDomainOf<PolynomialMod2> Domain;
-	return QuotientRing<Domain>(Domain(), modulus).MultiplicativeInverse(*this);
-}
-
-bool PolynomialMod2::IsIrreducible() const
-{
-	signed int d = Degree();
-	if (d <= 0)
-		return false;
-
-	PolynomialMod2 t(2), u(t);
-	for (int i=1; i<=d/2; i++)
-	{
-		u = u.Squared()%(*this);
-		if (!Gcd(u+t, *this).IsUnit())
-			return false;
-	}
-	return true;
-}
-
-// ********************************************************
-
-GF2NP::GF2NP(const PolynomialMod2 &modulus)
-	: QuotientRing<EuclideanDomainOf<PolynomialMod2> >(EuclideanDomainOf<PolynomialMod2>(), modulus), m(modulus.Degree())
-{
-}
-
-GF2NP::Element GF2NP::SquareRoot(const Element &a) const
-{
-	Element r = a;
-	for (unsigned int i=1; i<m; i++)
-		r = Square(r);
-	return r;
-}
-
-GF2NP::Element GF2NP::HalfTrace(const Element &a) const
-{
-	CRYPTOPP_ASSERT(m%2 == 1);
-	Element h = a;
-	for (unsigned int i=1; i<=(m-1)/2; i++)
-		h = Add(Square(Square(h)), a);
-	return h;
-}
-
-GF2NP::Element GF2NP::SolveQuadraticEquation(const Element &a) const
-{
-	if (m%2 == 0)
-	{
-		Element z, w;
-		RandomPool rng;
-		do
-		{
-			Element p((RandomNumberGenerator &)rng, m);
-			z = PolynomialMod2::Zero();
-			w = p;
-			for (unsigned int i=1; i<=m-1; i++)
-			{
-				w = Square(w);
-				z = Square(z);
-				Accumulate(z, Multiply(w, a));
-				Accumulate(w, p);
-			}
-		} while (w.IsZero());
-		return z;
-	}
-	else
-		return HalfTrace(a);
-}
-
-// ********************************************************
-
-GF2NT::GF2NT(unsigned int c0, unsigned int c1, unsigned int c2)
-	: GF2NP(PolynomialMod2::Trinomial(c0, c1, c2))
-	, t0(c0), t1(c1)
-	, result((word)0, m)
-{
-	CRYPTOPP_ASSERT(c0 > c1 && c1 > c2 && c2==0);
-}
-
-const GF2NT::Element& GF2NT::MultiplicativeInverse(const Element &a) const
-{
-	if (t0-t1 < WORD_BITS)
-		return GF2NP::MultiplicativeInverse(a);
-
-	SecWordBlock T(m_modulus.reg.size() * 4);
-	word *b = T;
-	word *c = T+m_modulus.reg.size();
-	word *f = T+2*m_modulus.reg.size();
-	word *g = T+3*m_modulus.reg.size();
-	size_t bcLen=1, fgLen=m_modulus.reg.size();
-	unsigned int k=0;
-
-	SetWords(T, 0, 3*m_modulus.reg.size());
-	b[0]=1;
-	CRYPTOPP_ASSERT(a.reg.size() <= m_modulus.reg.size());
-	CopyWords(f, a.reg, a.reg.size());
-	CopyWords(g, m_modulus.reg, m_modulus.reg.size());
-
-	while (1)
-	{
-		word t=f[0];
-		while (!t)
-		{
-			ShiftWordsRightByWords(f, fgLen, 1);
-			if (c[bcLen-1])
-				bcLen++;
-			CRYPTOPP_ASSERT(bcLen <= m_modulus.reg.size());
-			ShiftWordsLeftByWords(c, bcLen, 1);
-			k+=WORD_BITS;
-			t=f[0];
-		}
-
-		unsigned int i=0;
-		while (t%2 == 0)
-		{
-			t>>=1;
-			i++;
-		}
-		k+=i;
-
-		if (t==1 && CountWords(f, fgLen)==1)
-			break;
-
-		if (i==1)
-		{
-			ShiftWordsRightByBits(f, fgLen, 1);
-			t=ShiftWordsLeftByBits(c, bcLen, 1);
-		}
-		else
-		{
-			ShiftWordsRightByBits(f, fgLen, i);
-			t=ShiftWordsLeftByBits(c, bcLen, i);
-		}
-		if (t)
-		{
-			c[bcLen] = t;
-			bcLen++;
-			CRYPTOPP_ASSERT(bcLen <= m_modulus.reg.size());
-		}
-
-		if (f[fgLen-1]==0 && g[fgLen-1]==0)
-			fgLen--;
-
-		if (f[fgLen-1] < g[fgLen-1])
-		{
-			std::swap(f, g);
-			std::swap(b, c);
-		}
-
-		XorWords(f, g, fgLen);
-		XorWords(b, c, bcLen);
-	}
-
-	while (k >= WORD_BITS)
-	{
-		word temp = b[0];
-		// right shift b
-		for (unsigned i=0; i+1<BitsToWords(m); i++)
-			b[i] = b[i+1];
-		b[BitsToWords(m)-1] = 0;
-
-		if (t1 < WORD_BITS)
-			for (unsigned int j=0; j<WORD_BITS-t1; j++)
-			{
-				// Coverity finding on shift amount of 'word x << (t1+j)'.
-				//   temp ^= ((temp >> j) & 1) << (t1 + j);
-				const unsigned int shift = t1 + j;
-				CRYPTOPP_ASSERT(shift < WORD_BITS);
-				temp ^= (shift < WORD_BITS) ? (((temp >> j) & 1) << shift) : 0;
-			}
-		else
-			b[t1/WORD_BITS-1] ^= temp << t1%WORD_BITS;
-
-		if (t1 % WORD_BITS)
-			b[t1/WORD_BITS] ^= temp >> (WORD_BITS - t1%WORD_BITS);
-
-		if (t0%WORD_BITS)
-		{
-			b[t0/WORD_BITS-1] ^= temp << t0%WORD_BITS;
-			b[t0/WORD_BITS] ^= temp >> (WORD_BITS - t0%WORD_BITS);
-		}
-		else
-			b[t0/WORD_BITS-1] ^= temp;
-
-		k -= WORD_BITS;
-	}
-
-	if (k)
-	{
-		word temp = b[0] << (WORD_BITS - k);
-		ShiftWordsRightByBits(b, BitsToWords(m), k);
-
-		if (t1 < WORD_BITS)
-		{
-			for (unsigned int j=0; j<WORD_BITS-t1; j++)
-			{
-				// Coverity finding on shift amount of 'word x << (t1+j)'.
-				//   temp ^= ((temp >> j) & 1) << (t1 + j);
-				const unsigned int shift = t1 + j;
-				CRYPTOPP_ASSERT(shift < WORD_BITS);
-				temp ^= (shift < WORD_BITS) ? (((temp >> j) & 1) << shift) : 0;
-			}
-		}
-		else
-		{
-			b[t1/WORD_BITS-1] ^= temp << t1%WORD_BITS;
-		}
-
-		if (t1 % WORD_BITS)
-			b[t1/WORD_BITS] ^= temp >> (WORD_BITS - t1%WORD_BITS);
-
-		if (t0%WORD_BITS)
-		{
-			b[t0/WORD_BITS-1] ^= temp << t0%WORD_BITS;
-			b[t0/WORD_BITS] ^= temp >> (WORD_BITS - t0%WORD_BITS);
-		}
-		else
-			b[t0/WORD_BITS-1] ^= temp;
-	}
-
-	CopyWords(result.reg.begin(), b, result.reg.size());
-	return result;
-}
-
-const GF2NT::Element& GF2NT::Multiply(const Element &a, const Element &b) const
-{
-	size_t aSize = STDMIN(a.reg.size(), result.reg.size());
-	Element r((word)0, m);
-
-	for (int i=m-1; i>=0; i--)
-	{
-		if (r[m-1])
-		{
-			ShiftWordsLeftByBits(r.reg.begin(), r.reg.size(), 1);
-			XorWords(r.reg.begin(), m_modulus.reg, r.reg.size());
-		}
-		else
-			ShiftWordsLeftByBits(r.reg.begin(), r.reg.size(), 1);
-
-		if (b[i])
-			XorWords(r.reg.begin(), a.reg, aSize);
-	}
-
-	if (m%WORD_BITS)
-		r.reg.begin()[r.reg.size()-1] = (word)Crop(r.reg[r.reg.size()-1], m%WORD_BITS);
-
-	CopyWords(result.reg.begin(), r.reg.begin(), result.reg.size());
-	return result;
-}
-
-const GF2NT::Element& GF2NT::Reduced(const Element &a) const
-{
-	if (t0-t1 < WORD_BITS)
-		return m_domain.Mod(a, m_modulus);
-
-	SecWordBlock b(a.reg);
-
-	size_t i;
-	for (i=b.size()-1; i>=BitsToWords(t0); i--)
-	{
-		word temp = b[i];
-
-		if (t0%WORD_BITS)
-		{
-			b[i-t0/WORD_BITS] ^= temp >> t0%WORD_BITS;
-			b[i-t0/WORD_BITS-1] ^= temp << (WORD_BITS - t0%WORD_BITS);
-		}
-		else
-			b[i-t0/WORD_BITS] ^= temp;
-
-		if ((t0-t1)%WORD_BITS)
-		{
-			b[i-(t0-t1)/WORD_BITS] ^= temp >> (t0-t1)%WORD_BITS;
-			b[i-(t0-t1)/WORD_BITS-1] ^= temp << (WORD_BITS - (t0-t1)%WORD_BITS);
-		}
-		else
-			b[i-(t0-t1)/WORD_BITS] ^= temp;
-	}
-
-	if (i==BitsToWords(t0)-1 && t0%WORD_BITS)
-	{
-		word mask = ((word)1<<(t0%WORD_BITS))-1;
-		word temp = b[i] & ~mask;
-		b[i] &= mask;
-
-		b[i-t0/WORD_BITS] ^= temp >> t0%WORD_BITS;
-
-		if ((t0-t1)%WORD_BITS)
-		{
-			b[i-(t0-t1)/WORD_BITS] ^= temp >> (t0-t1)%WORD_BITS;
-			if ((t0-t1)%WORD_BITS > t0%WORD_BITS)
-				b[i-(t0-t1)/WORD_BITS-1] ^= temp << (WORD_BITS - (t0-t1)%WORD_BITS);
-			else
-				CRYPTOPP_ASSERT(temp << (WORD_BITS - (t0-t1)%WORD_BITS) == 0);
-		}
-		else
-			b[i-(t0-t1)/WORD_BITS] ^= temp;
-	}
-
-	SetWords(result.reg.begin(), 0, result.reg.size());
-	CopyWords(result.reg.begin(), b, STDMIN(b.size(), result.reg.size()));
-	return result;
-}
-
-void GF2NP::DEREncodeElement(BufferedTransformation &out, const Element &a) const
-{
-	a.DEREncodeAsOctetString(out, MaxElementByteLength());
-}
-
-void GF2NP::BERDecodeElement(BufferedTransformation &in, Element &a) const
-{
-	a.BERDecodeAsOctetString(in, MaxElementByteLength());
-}
-
-void GF2NT::DEREncode(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder seq(bt);
-		ASN1::characteristic_two_field().DEREncode(seq);
-		DERSequenceEncoder parameters(seq);
-			DEREncodeUnsigned(parameters, m);
-			ASN1::tpBasis().DEREncode(parameters);
-			DEREncodeUnsigned(parameters, t1);
-		parameters.MessageEnd();
-	seq.MessageEnd();
-}
-
-void GF2NPP::DEREncode(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder seq(bt);
-		ASN1::characteristic_two_field().DEREncode(seq);
-		DERSequenceEncoder parameters(seq);
-			DEREncodeUnsigned(parameters, m);
-			ASN1::ppBasis().DEREncode(parameters);
-			DERSequenceEncoder pentanomial(parameters);
-				DEREncodeUnsigned(pentanomial, t3);
-				DEREncodeUnsigned(pentanomial, t2);
-				DEREncodeUnsigned(pentanomial, t1);
-			pentanomial.MessageEnd();
-		parameters.MessageEnd();
-	seq.MessageEnd();
-}
-
-GF2NP * BERDecodeGF2NP(BufferedTransformation &bt)
-{
-	member_ptr<GF2NP> result;
-
-	BERSequenceDecoder seq(bt);
-		if (OID(seq) != ASN1::characteristic_two_field())
-			BERDecodeError();
-		BERSequenceDecoder parameters(seq);
-			unsigned int m;
-			BERDecodeUnsigned(parameters, m);
-			OID oid(parameters);
-			if (oid == ASN1::tpBasis())
-			{
-				unsigned int t1;
-				BERDecodeUnsigned(parameters, t1);
-				result.reset(new GF2NT(m, t1, 0));
-			}
-			else if (oid == ASN1::ppBasis())
-			{
-				unsigned int t1, t2, t3;
-				BERSequenceDecoder pentanomial(parameters);
-				BERDecodeUnsigned(pentanomial, t3);
-				BERDecodeUnsigned(pentanomial, t2);
-				BERDecodeUnsigned(pentanomial, t1);
-				pentanomial.MessageEnd();
-				result.reset(new GF2NPP(m, t3, t2, t1, 0));
-			}
-			else
-			{
-				BERDecodeError();
-				return NULL;
-			}
-		parameters.MessageEnd();
-	seq.MessageEnd();
-
-	return result.release();
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/gf2n.h b/src-cryptopp/gf2n.h
deleted file mode 100644
index bfd1902..0000000
--- a/src-cryptopp/gf2n.h
+++ /dev/null
@@ -1,370 +0,0 @@
-#ifndef CRYPTOPP_GF2N_H
-#define CRYPTOPP_GF2N_H
-
-/*! \file */
-
-#include "cryptlib.h"
-#include "secblock.h"
-#include "algebra.h"
-#include "misc.h"
-#include "asn.h"
-
-#include <iosfwd>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! Polynomial with Coefficients in GF(2)
-/*!	\nosubgrouping */
-class CRYPTOPP_DLL PolynomialMod2
-{
-public:
-	//! \name ENUMS, EXCEPTIONS, and TYPEDEFS
-	//@{
-		//! divide by zero exception
-		class DivideByZero : public Exception
-		{
-		public:
-			DivideByZero() : Exception(OTHER_ERROR, "PolynomialMod2: division by zero") {}
-		};
-
-		typedef unsigned int RandomizationParameter;
-	//@}
-
-	//! \name CREATORS
-	//@{
-		//! creates the zero polynomial
-		PolynomialMod2();
-		//! copy constructor
-		PolynomialMod2(const PolynomialMod2& t);
-
-		//! convert from word
-		/*! value should be encoded with the least significant bit as coefficient to x^0
-			and most significant bit as coefficient to x^(WORD_BITS-1)
-			bitLength denotes how much memory to allocate initially
-		*/
-		PolynomialMod2(word value, size_t bitLength=WORD_BITS);
-
-		//! convert from big-endian byte array
-		PolynomialMod2(const byte *encodedPoly, size_t byteCount)
-			{Decode(encodedPoly, byteCount);}
-
-		//! convert from big-endian form stored in a BufferedTransformation
-		PolynomialMod2(BufferedTransformation &encodedPoly, size_t byteCount)
-			{Decode(encodedPoly, byteCount);}
-
-		//! create a random polynomial uniformly distributed over all polynomials with degree less than bitcount
-		PolynomialMod2(RandomNumberGenerator &rng, size_t bitcount)
-			{Randomize(rng, bitcount);}
-
-		//! return x^i
-		static PolynomialMod2 CRYPTOPP_API Monomial(size_t i);
-		//! return x^t0 + x^t1 + x^t2
-		static PolynomialMod2 CRYPTOPP_API Trinomial(size_t t0, size_t t1, size_t t2);
-		//! return x^t0 + x^t1 + x^t2 + x^t3 + x^t4
-		static PolynomialMod2 CRYPTOPP_API Pentanomial(size_t t0, size_t t1, size_t t2, size_t t3, size_t t4);
-		//! return x^(n-1) + ... + x + 1
-		static PolynomialMod2 CRYPTOPP_API AllOnes(size_t n);
-
-		//!
-		static const PolynomialMod2 & CRYPTOPP_API Zero();
-		//!
-		static const PolynomialMod2 & CRYPTOPP_API One();
-	//@}
-
-	//! \name ENCODE/DECODE
-	//@{
-		//! minimum number of bytes to encode this polynomial
-		/*! MinEncodedSize of 0 is 1 */
-		unsigned int MinEncodedSize() const {return STDMAX(1U, ByteCount());}
-
-		//! encode in big-endian format
-		/*! if outputLen < MinEncodedSize, the most significant bytes will be dropped
-			if outputLen > MinEncodedSize, the most significant bytes will be padded
-		*/
-		void Encode(byte *output, size_t outputLen) const;
-		//!
-		void Encode(BufferedTransformation &bt, size_t outputLen) const;
-
-		//!
-		void Decode(const byte *input, size_t inputLen);
-		//!
-		//* Precondition: bt.MaxRetrievable() >= inputLen
-		void Decode(BufferedTransformation &bt, size_t inputLen);
-
-		//! encode value as big-endian octet string
-		void DEREncodeAsOctetString(BufferedTransformation &bt, size_t length) const;
-		//! decode value as big-endian octet string
-		void BERDecodeAsOctetString(BufferedTransformation &bt, size_t length);
-	//@}
-
-	//! \name ACCESSORS
-	//@{
-		//! number of significant bits = Degree() + 1
-		unsigned int BitCount() const;
-		//! number of significant bytes = ceiling(BitCount()/8)
-		unsigned int ByteCount() const;
-		//! number of significant words = ceiling(ByteCount()/sizeof(word))
-		unsigned int WordCount() const;
-
-		//! return the n-th bit, n=0 being the least significant bit
-		bool GetBit(size_t n) const {return GetCoefficient(n)!=0;}
-		//! return the n-th byte
-		byte GetByte(size_t n) const;
-
-		//! the zero polynomial will return a degree of -1
-		signed int Degree() const {return (signed int)(BitCount()-1U);}
-		//! degree + 1
-		unsigned int CoefficientCount() const {return BitCount();}
-		//! return coefficient for x^i
-		int GetCoefficient(size_t i) const
-			{return (i/WORD_BITS < reg.size()) ? int(reg[i/WORD_BITS] >> (i % WORD_BITS)) & 1 : 0;}
-		//! return coefficient for x^i
-		int operator[](unsigned int i) const {return GetCoefficient(i);}
-
-		//!
-		bool IsZero() const {return !*this;}
-		//!
-		bool Equals(const PolynomialMod2 &rhs) const;
-	//@}
-
-	//! \name MANIPULATORS
-	//@{
-		//!
-		PolynomialMod2&  operator=(const PolynomialMod2& t);
-		//!
-		PolynomialMod2&  operator&=(const PolynomialMod2& t);
-		//!
-		PolynomialMod2&  operator^=(const PolynomialMod2& t);
-		//!
-		PolynomialMod2&  operator+=(const PolynomialMod2& t) {return *this ^= t;}
-		//!
-		PolynomialMod2&  operator-=(const PolynomialMod2& t) {return *this ^= t;}
-		//!
-		PolynomialMod2&  operator*=(const PolynomialMod2& t);
-		//!
-		PolynomialMod2&  operator/=(const PolynomialMod2& t);
-		//!
-		PolynomialMod2&  operator%=(const PolynomialMod2& t);
-		//!
-		PolynomialMod2&  operator<<=(unsigned int);
-		//!
-		PolynomialMod2&  operator>>=(unsigned int);
-
-		//!
-		void Randomize(RandomNumberGenerator &rng, size_t bitcount);
-
-		//!
-		void SetBit(size_t i, int value = 1);
-		//! set the n-th byte to value
-		void SetByte(size_t n, byte value);
-
-		//!
-		void SetCoefficient(size_t i, int value) {SetBit(i, value);}
-
-		//!
-		void swap(PolynomialMod2 &a) {reg.swap(a.reg);}
-	//@}
-
-	//! \name UNARY OPERATORS
-	//@{
-		//!
-		bool			operator!() const;
-		//!
-		PolynomialMod2	operator+() const {return *this;}
-		//!
-		PolynomialMod2	operator-() const {return *this;}
-	//@}
-
-	//! \name BINARY OPERATORS
-	//@{
-		//!
-		PolynomialMod2 And(const PolynomialMod2 &b) const;
-		//!
-		PolynomialMod2 Xor(const PolynomialMod2 &b) const;
-		//!
-		PolynomialMod2 Plus(const PolynomialMod2 &b) const {return Xor(b);}
-		//!
-		PolynomialMod2 Minus(const PolynomialMod2 &b) const {return Xor(b);}
-		//!
-		PolynomialMod2 Times(const PolynomialMod2 &b) const;
-		//!
-		PolynomialMod2 DividedBy(const PolynomialMod2 &b) const;
-		//!
-		PolynomialMod2 Modulo(const PolynomialMod2 &b) const;
-
-		//!
-		PolynomialMod2 operator>>(unsigned int n) const;
-		//!
-		PolynomialMod2 operator<<(unsigned int n) const;
-	//@}
-
-	//! \name OTHER ARITHMETIC FUNCTIONS
-	//@{
-		//! sum modulo 2 of all coefficients
-		unsigned int Parity() const;
-
-		//! check for irreducibility
-		bool IsIrreducible() const;
-
-		//! is always zero since we're working modulo 2
-		PolynomialMod2 Doubled() const {return Zero();}
-		//!
-		PolynomialMod2 Squared() const;
-
-		//! only 1 is a unit
-		bool IsUnit() const {return Equals(One());}
-		//! return inverse if *this is a unit, otherwise return 0
-		PolynomialMod2 MultiplicativeInverse() const {return IsUnit() ? One() : Zero();}
-
-		//! greatest common divisor
-		static PolynomialMod2 CRYPTOPP_API Gcd(const PolynomialMod2 &a, const PolynomialMod2 &n);
-		//! calculate multiplicative inverse of *this mod n
-		PolynomialMod2 InverseMod(const PolynomialMod2 &) const;
-
-		//! calculate r and q such that (a == d*q + r) && (deg(r) < deg(d))
-		static void CRYPTOPP_API Divide(PolynomialMod2 &r, PolynomialMod2 &q, const PolynomialMod2 &a, const PolynomialMod2 &d);
-	//@}
-
-	//! \name INPUT/OUTPUT
-	//@{
-		//!
-		friend std::ostream& operator<<(std::ostream& out, const PolynomialMod2 &a);
-	//@}
-
-private:
-	friend class GF2NT;
-
-	SecWordBlock reg;
-};
-
-//!
-inline bool operator==(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b)
-{return a.Equals(b);}
-//!
-inline bool operator!=(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b)
-{return !(a==b);}
-//! compares degree
-inline bool operator> (const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b)
-{return a.Degree() > b.Degree();}
-//! compares degree
-inline bool operator>=(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b)
-{return a.Degree() >= b.Degree();}
-//! compares degree
-inline bool operator< (const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b)
-{return a.Degree() < b.Degree();}
-//! compares degree
-inline bool operator<=(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b)
-{return a.Degree() <= b.Degree();}
-//!
-inline CryptoPP::PolynomialMod2 operator&(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.And(b);}
-//!
-inline CryptoPP::PolynomialMod2 operator^(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Xor(b);}
-//!
-inline CryptoPP::PolynomialMod2 operator+(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Plus(b);}
-//!
-inline CryptoPP::PolynomialMod2 operator-(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Minus(b);}
-//!
-inline CryptoPP::PolynomialMod2 operator*(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Times(b);}
-//!
-inline CryptoPP::PolynomialMod2 operator/(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.DividedBy(b);}
-//!
-inline CryptoPP::PolynomialMod2 operator%(const CryptoPP::PolynomialMod2 &a, const CryptoPP::PolynomialMod2 &b) {return a.Modulo(b);}
-
-// CodeWarrior 8 workaround: put these template instantiations after overloaded operator declarations,
-// but before the use of QuotientRing<EuclideanDomainOf<PolynomialMod2> > for VC .NET 2003
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractGroup<PolynomialMod2>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractRing<PolynomialMod2>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractEuclideanDomain<PolynomialMod2>;
-CRYPTOPP_DLL_TEMPLATE_CLASS EuclideanDomainOf<PolynomialMod2>;
-CRYPTOPP_DLL_TEMPLATE_CLASS QuotientRing<EuclideanDomainOf<PolynomialMod2> >;
-
-//! GF(2^n) with Polynomial Basis
-class CRYPTOPP_DLL GF2NP : public QuotientRing<EuclideanDomainOf<PolynomialMod2> >
-{
-public:
-	GF2NP(const PolynomialMod2 &modulus);
-
-	virtual GF2NP * Clone() const {return new GF2NP(*this);}
-	virtual void DEREncode(BufferedTransformation &bt) const
-		{CRYPTOPP_UNUSED(bt); CRYPTOPP_ASSERT(false);}	// no ASN.1 syntax yet for general polynomial basis
-
-	void DEREncodeElement(BufferedTransformation &out, const Element &a) const;
-	void BERDecodeElement(BufferedTransformation &in, Element &a) const;
-
-	bool Equal(const Element &a, const Element &b) const
-		{CRYPTOPP_ASSERT(a.Degree() < m_modulus.Degree() && b.Degree() < m_modulus.Degree()); return a.Equals(b);}
-
-	bool IsUnit(const Element &a) const
-		{CRYPTOPP_ASSERT(a.Degree() < m_modulus.Degree()); return !!a;}
-
-	unsigned int MaxElementBitLength() const
-		{return m;}
-
-	unsigned int MaxElementByteLength() const
-		{return (unsigned int)BitsToBytes(MaxElementBitLength());}
-
-	Element SquareRoot(const Element &a) const;
-
-	Element HalfTrace(const Element &a) const;
-
-	// returns z such that z^2 + z == a
-	Element SolveQuadraticEquation(const Element &a) const;
-
-protected:
-	unsigned int m;
-};
-
-//! GF(2^n) with Trinomial Basis
-class CRYPTOPP_DLL GF2NT : public GF2NP
-{
-public:
-	// polynomial modulus = x^t0 + x^t1 + x^t2, t0 > t1 > t2
-	GF2NT(unsigned int t0, unsigned int t1, unsigned int t2);
-
-	GF2NP * Clone() const {return new GF2NT(*this);}
-	void DEREncode(BufferedTransformation &bt) const;
-
-	const Element& Multiply(const Element &a, const Element &b) const;
-
-	const Element& Square(const Element &a) const
-		{return Reduced(a.Squared());}
-
-	const Element& MultiplicativeInverse(const Element &a) const;
-
-private:
-	const Element& Reduced(const Element &a) const;
-
-	unsigned int t0, t1;
-	mutable PolynomialMod2 result;
-};
-
-//! GF(2^n) with Pentanomial Basis
-class CRYPTOPP_DLL GF2NPP : public GF2NP
-{
-public:
-	// polynomial modulus = x^t0 + x^t1 + x^t2 + x^t3 + x^t4, t0 > t1 > t2 > t3 > t4
-	GF2NPP(unsigned int t0, unsigned int t1, unsigned int t2, unsigned int t3, unsigned int t4)
-		: GF2NP(PolynomialMod2::Pentanomial(t0, t1, t2, t3, t4)), t0(t0), t1(t1), t2(t2), t3(t3) {}
-
-	GF2NP * Clone() const {return new GF2NPP(*this);}
-	void DEREncode(BufferedTransformation &bt) const;
-
-private:
-	unsigned int t0, t1, t2, t3;
-};
-
-// construct new GF2NP from the ASN.1 sequence Characteristic-two
-CRYPTOPP_DLL GF2NP * CRYPTOPP_API BERDecodeGF2NP(BufferedTransformation &bt);
-
-NAMESPACE_END
-
-#ifndef __BORLANDC__
-NAMESPACE_BEGIN(std)
-template<> inline void swap(CryptoPP::PolynomialMod2 &a, CryptoPP::PolynomialMod2 &b)
-{
-	a.swap(b);
-}
-NAMESPACE_END
-#endif
-
-#endif
diff --git a/src-cryptopp/gfpcrypt.cpp b/src-cryptopp/gfpcrypt.cpp
deleted file mode 100644
index f49be2f..0000000
--- a/src-cryptopp/gfpcrypt.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-// dsa.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-// TODO: fix the C4589 warnings
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4189 4589)
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "gfpcrypt.h"
-#include "nbtheory.h"
-#include "modarith.h"
-#include "integer.h"
-#include "asn.h"
-#include "oids.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#if CRYPTOPP_DEBUG && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
-void TestInstantiations_gfpcrypt()
-{
-	GDSA<SHA>::Signer test;
-	GDSA<SHA>::Verifier test1;
-	DSA::Signer test5(NullRNG(), 100);
-	DSA::Signer test2(test5);
-	NR<SHA>::Signer test3;
-	NR<SHA>::Verifier test4;
-	DLIES<>::Encryptor test6;
-	DLIES<>::Decryptor test7;
-}
-#endif
-
-void DL_GroupParameters_DSA::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg)
-{
-	Integer p, q, g;
-
-	if (alg.GetValue("Modulus", p) && alg.GetValue("SubgroupGenerator", g))
-	{
-		q = alg.GetValueWithDefault("SubgroupOrder", ComputeGroupOrder(p)/2);
-		Initialize(p, q, g);
-	}
-	else
-	{
-		int modulusSize = 1024, defaultSubgroupOrderSize;
-		alg.GetIntValue("ModulusSize", modulusSize) || alg.GetIntValue("KeySize", modulusSize);
-
-		switch (modulusSize)
-		{
-		case 1024:
-			defaultSubgroupOrderSize = 160;
-			break;
-		case 2048:
-			defaultSubgroupOrderSize = 224;
-			break;
-		case 3072:
-			defaultSubgroupOrderSize = 256;
-			break;
-		default:
-			throw InvalidArgument("DSA: not a valid prime length");
-		}
-
-		DL_GroupParameters_GFP::GenerateRandom(rng, CombinedNameValuePairs(alg, MakeParameters(Name::SubgroupOrderSize(), defaultSubgroupOrderSize, false)));
-	}
-}
-
-bool DL_GroupParameters_DSA::ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const
-{
-	bool pass = DL_GroupParameters_GFP::ValidateGroup(rng, level);
-	int pSize = GetModulus().BitCount(), qSize = GetSubgroupOrder().BitCount();
-	pass = pass && ((pSize==1024 && qSize==160) || (pSize==2048 && qSize==224) || (pSize==2048 && qSize==256) || (pSize==3072 && qSize==256));
-	return pass;
-}
-
-void DL_SignatureMessageEncodingMethod_DSA::ComputeMessageRepresentative(RandomNumberGenerator &rng,
-	const byte *recoverableMessage, size_t recoverableMessageLength,
-	HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-	byte *representative, size_t representativeBitLength) const
-{
-	CRYPTOPP_UNUSED(rng), CRYPTOPP_UNUSED(recoverableMessage), CRYPTOPP_UNUSED(recoverableMessageLength);
-	CRYPTOPP_UNUSED(messageEmpty), CRYPTOPP_UNUSED(hashIdentifier);
-	CRYPTOPP_ASSERT(recoverableMessageLength == 0);
-	CRYPTOPP_ASSERT(hashIdentifier.second == 0);
-
-	const size_t representativeByteLength = BitsToBytes(representativeBitLength);
-	const size_t digestSize = hash.DigestSize();
-	const size_t paddingLength = SaturatingSubtract(representativeByteLength, digestSize);
-
-	memset(representative, 0, paddingLength);
-	hash.TruncatedFinal(representative+paddingLength, STDMIN(representativeByteLength, digestSize));
-
-	if (digestSize*8 > representativeBitLength)
-	{
-		Integer h(representative, representativeByteLength);
-		h >>= representativeByteLength*8 - representativeBitLength;
-		h.Encode(representative, representativeByteLength);
-	}
-}
-
-void DL_SignatureMessageEncodingMethod_NR::ComputeMessageRepresentative(RandomNumberGenerator &rng,
-	const byte *recoverableMessage, size_t recoverableMessageLength,
-	HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-	byte *representative, size_t representativeBitLength) const
-{
-	CRYPTOPP_UNUSED(rng);CRYPTOPP_UNUSED(recoverableMessage); CRYPTOPP_UNUSED(recoverableMessageLength);
-	CRYPTOPP_UNUSED(hash); CRYPTOPP_UNUSED(hashIdentifier); CRYPTOPP_UNUSED(messageEmpty);
-	CRYPTOPP_UNUSED(representative); CRYPTOPP_UNUSED(representativeBitLength);
-
-	CRYPTOPP_ASSERT(recoverableMessageLength == 0);
-	CRYPTOPP_ASSERT(hashIdentifier.second == 0);
-	const size_t representativeByteLength = BitsToBytes(representativeBitLength);
-	const size_t digestSize = hash.DigestSize();
-	const size_t paddingLength = SaturatingSubtract(representativeByteLength, digestSize);
-
-	memset(representative, 0, paddingLength);
-	hash.TruncatedFinal(representative+paddingLength, STDMIN(representativeByteLength, digestSize));
-
-	if (digestSize*8 >= representativeBitLength)
-	{
-		Integer h(representative, representativeByteLength);
-		h >>= representativeByteLength*8 - representativeBitLength + 1;
-		h.Encode(representative, representativeByteLength);
-	}
-}
-
-bool DL_GroupParameters_IntegerBased::ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const
-{
-	const Integer &p = GetModulus(), &q = GetSubgroupOrder();
-
-	bool pass = true;
-	pass = pass && p > Integer::One() && p.IsOdd();
-	pass = pass && q > Integer::One() && q.IsOdd();
-
-	if (level >= 1)
-		pass = pass && GetCofactor() > Integer::One() && GetGroupOrder() % q == Integer::Zero();
-	if (level >= 2)
-		pass = pass && VerifyPrime(rng, q, level-2) && VerifyPrime(rng, p, level-2);
-
-	return pass;
-}
-
-bool DL_GroupParameters_IntegerBased::ValidateElement(unsigned int level, const Integer &g, const DL_FixedBasePrecomputation<Integer> *gpc) const
-{
-	const Integer &p = GetModulus(), &q = GetSubgroupOrder();
-
-	bool pass = true;
-	pass = pass && GetFieldType() == 1 ? g.IsPositive() : g.NotNegative();
-	pass = pass && g < p && !IsIdentity(g);
-
-	if (level >= 1)
-	{
-		if (gpc)
-			pass = pass && gpc->Exponentiate(GetGroupPrecomputation(), Integer::One()) == g;
-	}
-	if (level >= 2)
-	{
-		if (GetFieldType() == 2)
-			pass = pass && Jacobi(g*g-4, p)==-1;
-
-		// verifying that Lucas((p+1)/2, w, p)==2 is omitted because it's too costly
-		// and at most 1 bit is leaked if it's false
-		bool fullValidate = (GetFieldType() == 2 && level >= 3) || !FastSubgroupCheckAvailable();
-
-		if (fullValidate && pass)
-		{
-			Integer gp = gpc ? gpc->Exponentiate(GetGroupPrecomputation(), q) : ExponentiateElement(g, q);
-			pass = pass && IsIdentity(gp);
-		}
-		else if (GetFieldType() == 1)
-			pass = pass && Jacobi(g, p) == 1;
-	}
-
-	return pass;
-}
-
-void DL_GroupParameters_IntegerBased::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg)
-{
-	Integer p, q, g;
-
-	if (alg.GetValue("Modulus", p) && alg.GetValue("SubgroupGenerator", g))
-	{
-		q = alg.GetValueWithDefault("SubgroupOrder", ComputeGroupOrder(p)/2);
-	}
-	else
-	{
-		int modulusSize, subgroupOrderSize;
-
-		if (!alg.GetIntValue("ModulusSize", modulusSize))
-			modulusSize = alg.GetIntValueWithDefault("KeySize", 2048);
-
-		if (!alg.GetIntValue("SubgroupOrderSize", subgroupOrderSize))
-			subgroupOrderSize = GetDefaultSubgroupOrderSize(modulusSize);
-
-		PrimeAndGenerator pg;
-		pg.Generate(GetFieldType() == 1 ? 1 : -1, rng, modulusSize, subgroupOrderSize);
-		p = pg.Prime();
-		q = pg.SubPrime();
-		g = pg.Generator();
-	}
-
-	Initialize(p, q, g);
-}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-void DL_GroupParameters_IntegerBased::EncodeElement(bool reversible, const Element &element, byte *encoded) const
-{
-	CRYPTOPP_UNUSED(reversible);
-	element.Encode(encoded, GetModulus().ByteCount());
-}
-
-unsigned int DL_GroupParameters_IntegerBased::GetEncodedElementSize(bool reversible) const
-{
-	CRYPTOPP_UNUSED(reversible);
-	return GetModulus().ByteCount();
-}
-#endif
-
-Integer DL_GroupParameters_IntegerBased::DecodeElement(const byte *encoded, bool checkForGroupMembership) const
-{
-	CRYPTOPP_UNUSED(checkForGroupMembership);
-	Integer g(encoded, GetModulus().ByteCount());
-	if (!ValidateElement(1, g, NULL))
-		throw DL_BadElement();
-	return g;
-}
-
-void DL_GroupParameters_IntegerBased::BERDecode(BufferedTransformation &bt)
-{
-	BERSequenceDecoder parameters(bt);
-		Integer p(parameters);
-		Integer q(parameters);
-		Integer g;
-		if (parameters.EndReached())
-		{
-			g = q;
-			q = ComputeGroupOrder(p) / 2;
-		}
-		else
-			g.BERDecode(parameters);
-	parameters.MessageEnd();
-
-	SetModulusAndSubgroupGenerator(p, g);
-	SetSubgroupOrder(q);
-}
-
-void DL_GroupParameters_IntegerBased::DEREncode(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder parameters(bt);
-		GetModulus().DEREncode(parameters);
-		m_q.DEREncode(parameters);
-		GetSubgroupGenerator().DEREncode(parameters);
-	parameters.MessageEnd();
-}
-
-bool DL_GroupParameters_IntegerBased::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-{
-	return GetValueHelper<DL_GroupParameters<Element> >(this, name, valueType, pValue)
-		CRYPTOPP_GET_FUNCTION_ENTRY(Modulus);
-}
-
-void DL_GroupParameters_IntegerBased::AssignFrom(const NameValuePairs &source)
-{
-	AssignFromHelper(this, source)
-		CRYPTOPP_SET_FUNCTION_ENTRY2(Modulus, SubgroupGenerator)
-		CRYPTOPP_SET_FUNCTION_ENTRY(SubgroupOrder)
-		;
-}
-
-OID DL_GroupParameters_IntegerBased::GetAlgorithmID() const
-{
-	return ASN1::id_dsa();
-}
-
-void DL_GroupParameters_GFP::SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const
-{
-	ModularArithmetic ma(GetModulus());
-	ma.SimultaneousExponentiate(results, base, exponents, exponentsCount);
-}
-
-DL_GroupParameters_GFP::Element DL_GroupParameters_GFP::MultiplyElements(const Element &a, const Element &b) const
-{
-	return a_times_b_mod_c(a, b, GetModulus());
-}
-
-DL_GroupParameters_GFP::Element DL_GroupParameters_GFP::CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const
-{
-	ModularArithmetic ma(GetModulus());
-	return ma.CascadeExponentiate(element1, exponent1, element2, exponent2);
-}
-
-Integer DL_GroupParameters_IntegerBased::GetMaxExponent() const
-{
-	return STDMIN(GetSubgroupOrder()-1, Integer::Power2(2*DiscreteLogWorkFactor(GetFieldType()*GetModulus().BitCount())));
-}
-
-unsigned int DL_GroupParameters_IntegerBased::GetDefaultSubgroupOrderSize(unsigned int modulusSize) const
-{
-	return 2*DiscreteLogWorkFactor(GetFieldType()*modulusSize);
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/gfpcrypt.h b/src-cryptopp/gfpcrypt.h
deleted file mode 100644
index 4cdf3b0..0000000
--- a/src-cryptopp/gfpcrypt.h
+++ /dev/null
@@ -1,636 +0,0 @@
-#ifndef CRYPTOPP_GFPCRYPT_H
-#define CRYPTOPP_GFPCRYPT_H
-
-/** \file
-	Implementation of schemes based on DL over GF(p)
-*/
-
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4189)
-#endif
-
-#include "cryptlib.h"
-#include "pubkey.h"
-#include "integer.h"
-#include "modexppc.h"
-#include "algparam.h"
-#include "smartptr.h"
-#include "sha.h"
-#include "asn.h"
-#include "hmac.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters<Integer>;
-
-//! _
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE DL_GroupParameters_IntegerBased : public ASN1CryptoMaterial<DL_GroupParameters<Integer> >
-{
-	typedef DL_GroupParameters_IntegerBased ThisClass;
-
-public:
-	void Initialize(const DL_GroupParameters_IntegerBased &params)
-		{Initialize(params.GetModulus(), params.GetSubgroupOrder(), params.GetSubgroupGenerator());}
-	void Initialize(RandomNumberGenerator &rng, unsigned int pbits)
-		{GenerateRandom(rng, MakeParameters("ModulusSize", (int)pbits));}
-	void Initialize(const Integer &p, const Integer &g)
-		{SetModulusAndSubgroupGenerator(p, g); SetSubgroupOrder(ComputeGroupOrder(p)/2);}
-	void Initialize(const Integer &p, const Integer &q, const Integer &g)
-		{SetModulusAndSubgroupGenerator(p, g); SetSubgroupOrder(q);}
-
-	// ASN1Object interface
-	void BERDecode(BufferedTransformation &bt);
-	void DEREncode(BufferedTransformation &bt) const;
-
-	// GeneratibleCryptoMaterial interface
-	/*! parameters: (ModulusSize, SubgroupOrderSize (optional)) */
-	void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg);
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-	void AssignFrom(const NameValuePairs &source);
-
-	// DL_GroupParameters
-	const Integer & GetSubgroupOrder() const {return m_q;}
-	Integer GetGroupOrder() const {return GetFieldType() == 1 ? GetModulus()-Integer::One() : GetModulus()+Integer::One();}
-	bool ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const;
-	bool ValidateElement(unsigned int level, const Integer &element, const DL_FixedBasePrecomputation<Integer> *precomp) const;
-	bool FastSubgroupCheckAvailable() const {return GetCofactor() == 2;}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	// Cygwin i386 crash at -O3; see .
-	void EncodeElement(bool reversible, const Element &element, byte *encoded) const;
-	unsigned int GetEncodedElementSize(bool reversible) const;
-#else
-	void EncodeElement(bool reversible, const Element &element, byte *encoded) const
-		{CRYPTOPP_UNUSED(reversible); element.Encode(encoded, GetModulus().ByteCount());}
-	unsigned int GetEncodedElementSize(bool reversible) const
-		{CRYPTOPP_UNUSED(reversible); return GetModulus().ByteCount();}
-#endif
-
-	Integer DecodeElement(const byte *encoded, bool checkForGroupMembership) const;
-	Integer ConvertElementToInteger(const Element &element) const
-		{return element;}
-	Integer GetMaxExponent() const;
-	static std::string CRYPTOPP_API StaticAlgorithmNamePrefix() {return "";}
-
-	OID GetAlgorithmID() const;
-
-	virtual const Integer & GetModulus() const =0;
-	virtual void SetModulusAndSubgroupGenerator(const Integer &p, const Integer &g) =0;
-
-	void SetSubgroupOrder(const Integer &q)
-		{m_q = q; ParametersChanged();}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupParameters_IntegerBased() {}
-#endif
-
-protected:
-	Integer ComputeGroupOrder(const Integer &modulus) const
-		{return modulus-(GetFieldType() == 1 ? 1 : -1);}
-
-	// GF(p) = 1, GF(p^2) = 2
-	virtual int GetFieldType() const =0;
-	virtual unsigned int GetDefaultSubgroupOrderSize(unsigned int modulusSize) const;
-
-private:
-	Integer m_q;
-};
-
-//! _
-template <class GROUP_PRECOMP, class BASE_PRECOMP = DL_FixedBasePrecomputationImpl<CPP_TYPENAME GROUP_PRECOMP::Element> >
-class CRYPTOPP_NO_VTABLE DL_GroupParameters_IntegerBasedImpl : public DL_GroupParametersImpl<GROUP_PRECOMP, BASE_PRECOMP, DL_GroupParameters_IntegerBased>
-{
-	typedef DL_GroupParameters_IntegerBasedImpl<GROUP_PRECOMP, BASE_PRECOMP> ThisClass;
-
-public:
-	typedef typename GROUP_PRECOMP::Element Element;
-
-	// GeneratibleCryptoMaterial interface
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-		{return GetValueHelper<DL_GroupParameters_IntegerBased>(this, name, valueType, pValue).Assignable();}
-
-	void AssignFrom(const NameValuePairs &source)
-		{AssignFromHelper<DL_GroupParameters_IntegerBased>(this, source);}
-
-	// DL_GroupParameters
-	const DL_FixedBasePrecomputation<Element> & GetBasePrecomputation() const {return this->m_gpc;}
-	DL_FixedBasePrecomputation<Element> & AccessBasePrecomputation() {return this->m_gpc;}
-
-	// IntegerGroupParameters
-	const Integer & GetModulus() const {return this->m_groupPrecomputation.GetModulus();}
-    const Integer & GetGenerator() const {return this->m_gpc.GetBase(this->GetGroupPrecomputation());}
-
-	void SetModulusAndSubgroupGenerator(const Integer &p, const Integer &g)		// these have to be set together
-		{this->m_groupPrecomputation.SetModulus(p); this->m_gpc.SetBase(this->GetGroupPrecomputation(), g); this->ParametersChanged();}
-
-	// non-inherited
-	bool operator==(const DL_GroupParameters_IntegerBasedImpl<GROUP_PRECOMP, BASE_PRECOMP> &rhs) const
-		{return GetModulus() == rhs.GetModulus() && GetGenerator() == rhs.GetGenerator() && this->GetSubgroupOrder() == rhs.GetSubgroupOrder();}
-	bool operator!=(const DL_GroupParameters_IntegerBasedImpl<GROUP_PRECOMP, BASE_PRECOMP> &rhs) const
-		{return !operator==(rhs);}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupParameters_IntegerBasedImpl() {}
-#endif
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters_IntegerBasedImpl<ModExpPrecomputation>;
-
-//! GF(p) group parameters
-class CRYPTOPP_DLL DL_GroupParameters_GFP : public DL_GroupParameters_IntegerBasedImpl<ModExpPrecomputation>
-{
-public:
-	// DL_GroupParameters
-	bool IsIdentity(const Integer &element) const {return element == Integer::One();}
-	void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const;
-
-	// NameValuePairs interface
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-	{
-		return GetValueHelper<DL_GroupParameters_IntegerBased>(this, name, valueType, pValue).Assignable();
-	}
-
-	// used by MQV
-	Element MultiplyElements(const Element &a, const Element &b) const;
-	Element CascadeExponentiate(const Element &element1, const Integer &exponent1, const Element &element2, const Integer &exponent2) const;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupParameters_GFP() {}
-#endif
-
-protected:
-	int GetFieldType() const {return 1;}
-};
-
-//! GF(p) group parameters that default to same primes
-class CRYPTOPP_DLL DL_GroupParameters_GFP_DefaultSafePrime : public DL_GroupParameters_GFP
-{
-public:
-	typedef NoCofactorMultiplication DefaultCofactorOption;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupParameters_GFP_DefaultSafePrime() {}
-#endif
-
-protected:
-	unsigned int GetDefaultSubgroupOrderSize(unsigned int modulusSize) const {return modulusSize-1;}
-};
-
-//! GDSA algorithm
-template <class T>
-class DL_Algorithm_GDSA : public DL_ElgamalLikeSignatureAlgorithm<T>
-{
-public:
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "DSA-1363";}
-
-	void Sign(const DL_GroupParameters<T> &params, const Integer &x, const Integer &k, const Integer &e, Integer &r, Integer &s) const
-	{
-		const Integer &q = params.GetSubgroupOrder();
-		r %= q;
-		Integer kInv = k.InverseMod(q);
-		s = (kInv * (x*r + e)) % q;
-		CRYPTOPP_ASSERT(!!r && !!s);
-	}
-
-	bool Verify(const DL_GroupParameters<T> &params, const DL_PublicKey<T> &publicKey, const Integer &e, const Integer &r, const Integer &s) const
-	{
-		const Integer &q = params.GetSubgroupOrder();
-		if (r>=q || r<1 || s>=q || s<1)
-			return false;
-
-		Integer w = s.InverseMod(q);
-		Integer u1 = (e * w) % q;
-		Integer u2 = (r * w) % q;
-		// verify r == (g^u1 * y^u2 mod p) mod q
-		return r == params.ConvertElementToInteger(publicKey.CascadeExponentiateBaseAndPublicElement(u1, u2)) % q;
-	}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Algorithm_GDSA() {}
-#endif
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_Algorithm_GDSA<Integer>;
-
-//! NR algorithm
-template <class T>
-class DL_Algorithm_NR : public DL_ElgamalLikeSignatureAlgorithm<T>
-{
-public:
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "NR";}
-
-	void Sign(const DL_GroupParameters<T> &params, const Integer &x, const Integer &k, const Integer &e, Integer &r, Integer &s) const
-	{
-		const Integer &q = params.GetSubgroupOrder();
-		r = (r + e) % q;
-		s = (k - x*r) % q;
-		CRYPTOPP_ASSERT(!!r);
-	}
-
-	bool Verify(const DL_GroupParameters<T> &params, const DL_PublicKey<T> &publicKey, const Integer &e, const Integer &r, const Integer &s) const
-	{
-		const Integer &q = params.GetSubgroupOrder();
-		if (r>=q || r<1 || s>=q)
-			return false;
-
-		// check r == (m_g^s * m_y^r + m) mod m_q
-		return r == (params.ConvertElementToInteger(publicKey.CascadeExponentiateBaseAndPublicElement(s, r)) + e) % q;
-	}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Algorithm_NR() {}
-#endif
-};
-
-/*! DSA public key format is defined in 7.3.3 of RFC 2459. The
-	private key format is defined in 12.9 of PKCS #11 v2.10. */
-template <class GP>
-class DL_PublicKey_GFP : public DL_PublicKeyImpl<GP>
-{
-public:
-	void Initialize(const DL_GroupParameters_IntegerBased &params, const Integer &y)
-		{this->AccessGroupParameters().Initialize(params); this->SetPublicElement(y);}
-	void Initialize(const Integer &p, const Integer &g, const Integer &y)
-		{this->AccessGroupParameters().Initialize(p, g); this->SetPublicElement(y);}
-	void Initialize(const Integer &p, const Integer &q, const Integer &g, const Integer &y)
-		{this->AccessGroupParameters().Initialize(p, q, g); this->SetPublicElement(y);}
-
-	// X509PublicKey
-	void BERDecodePublicKey(BufferedTransformation &bt, bool, size_t)
-		{this->SetPublicElement(Integer(bt));}
-	void DEREncodePublicKey(BufferedTransformation &bt) const
-		{this->GetPublicElement().DEREncode(bt);}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PublicKey_GFP() {}
-#endif
-};
-
-//! DL private key (in GF(p) groups)
-template <class GP>
-class DL_PrivateKey_GFP : public DL_PrivateKeyImpl<GP>
-{
-public:
-	void Initialize(RandomNumberGenerator &rng, unsigned int modulusBits)
-		{this->GenerateRandomWithKeySize(rng, modulusBits);}
-	void Initialize(RandomNumberGenerator &rng, const Integer &p, const Integer &g)
-		{this->GenerateRandom(rng, MakeParameters("Modulus", p)("SubgroupGenerator", g));}
-	void Initialize(RandomNumberGenerator &rng, const Integer &p, const Integer &q, const Integer &g)
-		{this->GenerateRandom(rng, MakeParameters("Modulus", p)("SubgroupOrder", q)("SubgroupGenerator", g));}
-	void Initialize(const DL_GroupParameters_IntegerBased &params, const Integer &x)
-		{this->AccessGroupParameters().Initialize(params); this->SetPrivateExponent(x);}
-	void Initialize(const Integer &p, const Integer &g, const Integer &x)
-		{this->AccessGroupParameters().Initialize(p, g); this->SetPrivateExponent(x);}
-	void Initialize(const Integer &p, const Integer &q, const Integer &g, const Integer &x)
-		{this->AccessGroupParameters().Initialize(p, q, g); this->SetPrivateExponent(x);}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PrivateKey_GFP() {}
-#endif
-};
-
-//! DL signing/verification keys (in GF(p) groups)
-struct DL_SignatureKeys_GFP
-{
-	typedef DL_GroupParameters_GFP GroupParameters;
-	typedef DL_PublicKey_GFP<GroupParameters> PublicKey;
-	typedef DL_PrivateKey_GFP<GroupParameters> PrivateKey;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_SignatureKeys_GFP() {}
-#endif
-};
-
-//! DL encryption/decryption keys (in GF(p) groups)
-struct DL_CryptoKeys_GFP
-{
-	typedef DL_GroupParameters_GFP_DefaultSafePrime GroupParameters;
-	typedef DL_PublicKey_GFP<GroupParameters> PublicKey;
-	typedef DL_PrivateKey_GFP<GroupParameters> PrivateKey;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_CryptoKeys_GFP() {}
-#endif
-};
-
-//! provided for backwards compatibility, this class uses the old non-standard Crypto++ key format
-template <class BASE>
-class DL_PublicKey_GFP_OldFormat : public BASE
-{
-public:
-	void BERDecode(BufferedTransformation &bt)
-	{
-		BERSequenceDecoder seq(bt);
-			Integer v1(seq);
-			Integer v2(seq);
-			Integer v3(seq);
-
-			if (seq.EndReached())
-			{
-				this->AccessGroupParameters().Initialize(v1, v1/2, v2);
-				this->SetPublicElement(v3);
-			}
-			else
-			{
-				Integer v4(seq);
-				this->AccessGroupParameters().Initialize(v1, v2, v3);
-				this->SetPublicElement(v4);
-			}
-
-		seq.MessageEnd();
-	}
-
-	void DEREncode(BufferedTransformation &bt) const
-	{
-		DERSequenceEncoder seq(bt);
-			this->GetGroupParameters().GetModulus().DEREncode(seq);
-			if (this->GetGroupParameters().GetCofactor() != 2)
-				this->GetGroupParameters().GetSubgroupOrder().DEREncode(seq);
-			this->GetGroupParameters().GetGenerator().DEREncode(seq);
-			this->GetPublicElement().DEREncode(seq);
-		seq.MessageEnd();
-	}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PublicKey_GFP_OldFormat() {}
-#endif
-};
-
-//! provided for backwards compatibility, this class uses the old non-standard Crypto++ key format
-template <class BASE>
-class DL_PrivateKey_GFP_OldFormat : public BASE
-{
-public:
-	void BERDecode(BufferedTransformation &bt)
-	{
-		BERSequenceDecoder seq(bt);
-			Integer v1(seq);
-			Integer v2(seq);
-			Integer v3(seq);
-			Integer v4(seq);
-
-			if (seq.EndReached())
-			{
-				this->AccessGroupParameters().Initialize(v1, v1/2, v2);
-				this->SetPrivateExponent(v4 % (v1/2));	// some old keys may have x >= q
-			}
-			else
-			{
-				Integer v5(seq);
-				this->AccessGroupParameters().Initialize(v1, v2, v3);
-				this->SetPrivateExponent(v5);
-			}
-
-		seq.MessageEnd();
-	}
-
-	void DEREncode(BufferedTransformation &bt) const
-	{
-		DERSequenceEncoder seq(bt);
-			this->GetGroupParameters().GetModulus().DEREncode(seq);
-			if (this->GetGroupParameters().GetCofactor() != 2)
-				this->GetGroupParameters().GetSubgroupOrder().DEREncode(seq);
-			this->GetGroupParameters().GetGenerator().DEREncode(seq);
-			this->GetGroupParameters().ExponentiateBase(this->GetPrivateExponent()).DEREncode(seq);
-			this->GetPrivateExponent().DEREncode(seq);
-		seq.MessageEnd();
-	}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PrivateKey_GFP_OldFormat() {}
-#endif
-};
-
-//! <a href="http://www.weidai.com/scan-mirror/sig.html#DSA-1363">DSA-1363</a>
-template <class H>
-struct GDSA : public DL_SS<
-	DL_SignatureKeys_GFP,
-	DL_Algorithm_GDSA<Integer>,
-	DL_SignatureMessageEncodingMethod_DSA,
-	H>
-{
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~GDSA() {}
-#endif
-};
-
-//! <a href="http://www.weidai.com/scan-mirror/sig.html#NR">NR</a>
-template <class H>
-struct NR : public DL_SS<
-	DL_SignatureKeys_GFP,
-	DL_Algorithm_NR<Integer>,
-	DL_SignatureMessageEncodingMethod_NR,
-	H>
-{
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~NR() {}
-#endif
-};
-
-//! DSA group parameters, these are GF(p) group parameters that are allowed by the DSA standard
-class CRYPTOPP_DLL DL_GroupParameters_DSA : public DL_GroupParameters_GFP
-{
-public:
-	/*! also checks that the lengths of p and q are allowed by the DSA standard */
-	bool ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const;
-	/*! parameters: (ModulusSize), or (Modulus, SubgroupOrder, SubgroupGenerator) */
-	/*! ModulusSize must be between DSA::MIN_PRIME_LENGTH and DSA::MAX_PRIME_LENGTH, and divisible by DSA::PRIME_LENGTH_MULTIPLE */
-	void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg);
-
-	static bool CRYPTOPP_API IsValidPrimeLength(unsigned int pbits)
-		{return pbits >= MIN_PRIME_LENGTH && pbits <= MAX_PRIME_LENGTH && pbits % PRIME_LENGTH_MULTIPLE == 0;}
-
-	enum {MIN_PRIME_LENGTH = 1024, MAX_PRIME_LENGTH = 3072, PRIME_LENGTH_MULTIPLE = 1024};
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupParameters_DSA() {}
-#endif
-};
-
-template <class H>
-class DSA2;
-
-//! DSA keys
-struct DL_Keys_DSA
-{
-	typedef DL_PublicKey_GFP<DL_GroupParameters_DSA> PublicKey;
-	typedef DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_GFP<DL_GroupParameters_DSA>, DSA2<SHA> > PrivateKey;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Keys_DSA() {}
-#endif
-};
-
-//! <a href="http://en.wikipedia.org/wiki/Digital_Signature_Algorithm">DSA</a>, as specified in FIPS 186-3
-// class named DSA2 instead of DSA for backwards compatibility (DSA was a non-template class)
-template <class H>
-class DSA2 : public DL_SS<
-	DL_Keys_DSA,
-	DL_Algorithm_GDSA<Integer>,
-	DL_SignatureMessageEncodingMethod_DSA,
-	H,
-	DSA2<H> >
-{
-public:
-	static std::string CRYPTOPP_API StaticAlgorithmName() {return "DSA/" + (std::string)H::StaticAlgorithmName();}
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-	enum {MIN_PRIME_LENGTH = 1024, MAX_PRIME_LENGTH = 3072, PRIME_LENGTH_MULTIPLE = 1024};
-#endif
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DSA2() {}
-#endif
-};
-
-//! DSA with SHA-1, typedef'd for backwards compatibility
-typedef DSA2<SHA> DSA;
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PublicKey_GFP<DL_GroupParameters_DSA>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_GFP<DL_GroupParameters_DSA>;
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_GFP<DL_GroupParameters_DSA>, DSA2<SHA> >;
-
-//! the XOR encryption method, for use with DL-based cryptosystems
-template <class MAC, bool DHAES_MODE>
-class DL_EncryptionAlgorithm_Xor : public DL_SymmetricEncryptionAlgorithm
-{
-public:
-	bool ParameterSupported(const char *name) const {return strcmp(name, Name::EncodingParameters()) == 0;}
-	size_t GetSymmetricKeyLength(size_t plaintextLength) const
-		{return plaintextLength + MAC::DEFAULT_KEYLENGTH;}
-	size_t GetSymmetricCiphertextLength(size_t plaintextLength) const
-		{return plaintextLength + MAC::DIGESTSIZE;}
-	size_t GetMaxSymmetricPlaintextLength(size_t ciphertextLength) const
-		{return (unsigned int)SaturatingSubtract(ciphertextLength, (unsigned int)MAC::DIGESTSIZE);}
-	void SymmetricEncrypt(RandomNumberGenerator &rng, const byte *key, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs &parameters) const
-	{
-		CRYPTOPP_UNUSED(rng);
-		const byte *cipherKey = NULL, *macKey = NULL;
-		if (DHAES_MODE)
-		{
-			macKey = key;
-			cipherKey = key + MAC::DEFAULT_KEYLENGTH;
-		}
-		else
-		{
-			cipherKey = key;
-			macKey = key + plaintextLength;
-		}
-
-		ConstByteArrayParameter encodingParameters;
-		parameters.GetValue(Name::EncodingParameters(), encodingParameters);
-
-		if (plaintextLength)	// Coverity finding
-			xorbuf(ciphertext, plaintext, cipherKey, plaintextLength);
-
-		MAC mac(macKey);
-		mac.Update(ciphertext, plaintextLength);
-		mac.Update(encodingParameters.begin(), encodingParameters.size());
-		if (DHAES_MODE)
-		{
-			byte L[8] = {0,0,0,0};
-			PutWord(false, BIG_ENDIAN_ORDER, L+4, word32(encodingParameters.size()));
-			mac.Update(L, 8);
-		}
-		mac.Final(ciphertext + plaintextLength);
-	}
-	DecodingResult SymmetricDecrypt(const byte *key, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs &parameters) const
-	{
-		size_t plaintextLength = GetMaxSymmetricPlaintextLength(ciphertextLength);
-		const byte *cipherKey, *macKey;
-		if (DHAES_MODE)
-		{
-			macKey = key;
-			cipherKey = key + MAC::DEFAULT_KEYLENGTH;
-		}
-		else
-		{
-			cipherKey = key;
-			macKey = key + plaintextLength;
-		}
-
-		ConstByteArrayParameter encodingParameters;
-		parameters.GetValue(Name::EncodingParameters(), encodingParameters);
-
-		MAC mac(macKey);
-		mac.Update(ciphertext, plaintextLength);
-		mac.Update(encodingParameters.begin(), encodingParameters.size());
-		if (DHAES_MODE)
-		{
-			byte L[8] = {0,0,0,0};
-			PutWord(false, BIG_ENDIAN_ORDER, L+4, word32(encodingParameters.size()));
-			mac.Update(L, 8);
-		}
-		if (!mac.Verify(ciphertext + plaintextLength))
-			return DecodingResult();
-
-		if (plaintextLength)	// Coverity finding
-			xorbuf(plaintext, ciphertext, cipherKey, plaintextLength);
-
-		return DecodingResult(plaintextLength);
-	}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_EncryptionAlgorithm_Xor() {}
-#endif
-};
-
-//! _
-template <class T, bool DHAES_MODE, class KDF>
-class DL_KeyDerivationAlgorithm_P1363 : public DL_KeyDerivationAlgorithm<T>
-{
-public:
-	bool ParameterSupported(const char *name) const {return strcmp(name, Name::KeyDerivationParameters()) == 0;}
-	void Derive(const DL_GroupParameters<T> &params, byte *derivedKey, size_t derivedLength, const T &agreedElement, const T &ephemeralPublicKey, const NameValuePairs &parameters) const
-	{
-		SecByteBlock agreedSecret;
-		if (DHAES_MODE)
-		{
-			agreedSecret.New(params.GetEncodedElementSize(true) + params.GetEncodedElementSize(false));
-			params.EncodeElement(true, ephemeralPublicKey, agreedSecret);
-			params.EncodeElement(false, agreedElement, agreedSecret + params.GetEncodedElementSize(true));
-		}
-		else
-		{
-			agreedSecret.New(params.GetEncodedElementSize(false));
-			params.EncodeElement(false, agreedElement, agreedSecret);
-		}
-
-		ConstByteArrayParameter derivationParameters;
-		parameters.GetValue(Name::KeyDerivationParameters(), derivationParameters);
-		KDF::DeriveKey(derivedKey, derivedLength, agreedSecret, agreedSecret.size(), derivationParameters.begin(), derivationParameters.size());
-	}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_KeyDerivationAlgorithm_P1363() {}
-#endif
-};
-
-//! Discrete Log Integrated Encryption Scheme, AKA <a href="http://www.weidai.com/scan-mirror/ca.html#DLIES">DLIES</a>
-template <class COFACTOR_OPTION = NoCofactorMultiplication, bool DHAES_MODE = true>
-struct DLIES
-	: public DL_ES<
-		DL_CryptoKeys_GFP,
-		DL_KeyAgreementAlgorithm_DH<Integer, COFACTOR_OPTION>,
-		DL_KeyDerivationAlgorithm_P1363<Integer, DHAES_MODE, P1363_KDF2<SHA1> >,
-		DL_EncryptionAlgorithm_Xor<HMAC<SHA1>, DHAES_MODE>,
-		DLIES<> >
-{
-	static std::string CRYPTOPP_API StaticAlgorithmName() {return "DLIES";}	// TODO: fix this after name is standardized
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DLIES() {}
-#endif
-};
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/hex.cpp b/src-cryptopp/hex.cpp
deleted file mode 100644
index dbf1cf6..0000000
--- a/src-cryptopp/hex.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// hex.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "hex.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-namespace
-{
-	const byte s_vecUpper[] = "0123456789ABCDEF";
-	const byte s_vecLower[] = "0123456789abcdef";
-}
-
-void HexEncoder::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	bool uppercase = parameters.GetValueWithDefault(Name::Uppercase(), true);
-	m_filter->Initialize(CombinedNameValuePairs(
-		parameters,
-		MakeParameters(Name::EncodingLookupArray(), uppercase ? &s_vecUpper[0] : &s_vecLower[0], false)(Name::Log2Base(), 4, true)));
-}
-
-void HexDecoder::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	BaseN_Decoder::IsolatedInitialize(CombinedNameValuePairs(
-		parameters,
-		MakeParameters(Name::DecodingLookupArray(), GetDefaultDecodingLookupArray(), false)(Name::Log2Base(), 4, true)));
-}
-
-const int *HexDecoder::GetDefaultDecodingLookupArray()
-{
-	static volatile bool s_initialized = false;
-	static int s_array[256];
-
-	if (!s_initialized)
-	{
-		InitializeDecodingLookupArray(s_array, s_vecUpper, 16, true);
-		s_initialized = true;
-	}
-	return s_array;
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/hex.h b/src-cryptopp/hex.h
deleted file mode 100644
index 0e53301..0000000
--- a/src-cryptopp/hex.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// hex.h - written and placed in the public domain by Wei Dai
-
-//! \file hex.h
-//! \brief Classes for HexEncoder and HexDecoder
-
-#ifndef CRYPTOPP_HEX_H
-#define CRYPTOPP_HEX_H
-
-#include "cryptlib.h"
-#include "basecode.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class HexEncoder
-//! \brief Converts given data to base 16
-class CRYPTOPP_DLL HexEncoder : public SimpleProxyFilter
-{
-public:
-	//! \brief Construct a HexEncoder
-	//! \param attachment a BufferedTrasformation to attach to this object
-	//! \param uppercase a flag indicating uppercase output
-	//! \param groupSize the size of the output grouping
-	//! \param separator the separator to use between groups
-	//! \param terminator the terminator append after processing
-	HexEncoder(BufferedTransformation *attachment = NULL, bool uppercase = true, int groupSize = 0, const std::string &separator = ":", const std::string &terminator = "")
-		: SimpleProxyFilter(new BaseN_Encoder(new Grouper), attachment)
-	{
-		IsolatedInitialize(MakeParameters(Name::Uppercase(), uppercase)(Name::GroupSize(), groupSize)(Name::Separator(), ConstByteArrayParameter(separator))(Name::Terminator(), ConstByteArrayParameter(terminator)));
-	}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-};
-
-//! \class HexDecoder
-//! \brief Decode base 16 data back to bytes
-class CRYPTOPP_DLL HexDecoder : public BaseN_Decoder
-{
-public:
-	//! \brief Construct a HexDecoder
-	//! \param attachment a BufferedTrasformation to attach to this object
-	HexDecoder(BufferedTransformation *attachment = NULL)
-		: BaseN_Decoder(GetDefaultDecodingLookupArray(), 4, attachment) {}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-
-private:
-	static const int * CRYPTOPP_API GetDefaultDecodingLookupArray();
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/hmac.cpp b/src-cryptopp/hmac.cpp
deleted file mode 100644
index bb0d9e5..0000000
--- a/src-cryptopp/hmac.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// hmac.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "hmac.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-void HMAC_Base::UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs &)
-{
-	AssertValidKeyLength(keylength);
-
-	Restart();
-
-	HashTransformation &hash = AccessHash();
-	unsigned int blockSize = hash.BlockSize();
-
-	if (!blockSize)
-		throw InvalidArgument("HMAC: can only be used with a block-based hash function");
-
-	m_buf.resize(2*AccessHash().BlockSize() + AccessHash().DigestSize());
-
-	if (keylength <= blockSize)
-		memcpy(AccessIpad(), userKey, keylength);
-	else
-	{
-		AccessHash().CalculateDigest(AccessIpad(), userKey, keylength);
-		keylength = hash.DigestSize();
-	}
-
-	CRYPTOPP_ASSERT(keylength <= blockSize);
-	memset(AccessIpad()+keylength, 0, blockSize-keylength);
-
-	for (unsigned int i=0; i<blockSize; i++)
-	{
-		AccessOpad()[i] = AccessIpad()[i] ^ 0x5c;
-		AccessIpad()[i] ^= 0x36;
-	}
-}
-
-void HMAC_Base::KeyInnerHash()
-{
-	CRYPTOPP_ASSERT(!m_innerHashKeyed);
-	HashTransformation &hash = AccessHash();
-	hash.Update(AccessIpad(), hash.BlockSize());
-	m_innerHashKeyed = true;
-}
-
-void HMAC_Base::Restart()
-{
-	if (m_innerHashKeyed)
-	{
-		AccessHash().Restart();
-		m_innerHashKeyed = false;
-	}
-}
-
-void HMAC_Base::Update(const byte *input, size_t length)
-{
-	if (!m_innerHashKeyed)
-		KeyInnerHash();
-	AccessHash().Update(input, length);
-}
-
-void HMAC_Base::TruncatedFinal(byte *mac, size_t size)
-{
-	ThrowIfInvalidTruncatedSize(size);
-
-	HashTransformation &hash = AccessHash();
-
-	if (!m_innerHashKeyed)
-		KeyInnerHash();
-	hash.Final(AccessInnerHash());
-
-	hash.Update(AccessOpad(), hash.BlockSize());
-	hash.Update(AccessInnerHash(), hash.DigestSize());
-	hash.TruncatedFinal(mac, size);
-
-	m_innerHashKeyed = false;
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/hmac.h b/src-cryptopp/hmac.h
deleted file mode 100644
index f6c1499..0000000
--- a/src-cryptopp/hmac.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// hmac.h - written and placed in the public domain by Wei Dai
-
-//! \file hmac.h
-//! \brief Classes for HMAC message authentication codes
-
-#ifndef CRYPTOPP_HMAC_H
-#define CRYPTOPP_HMAC_H
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class HMAC_Base
-//! \brief HMAC information
-//! \details HMAC_Base derives from VariableKeyLength and MessageAuthenticationCode
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE HMAC_Base : public VariableKeyLength<16, 0, INT_MAX>, public MessageAuthenticationCode
-{
-public:
-	//! \brief Construct a HMAC_Base
-	HMAC_Base() : m_innerHashKeyed(false) {}
-	void UncheckedSetKey(const byte *userKey, unsigned int keylength, const NameValuePairs &params);
-
-	void Restart();
-	void Update(const byte *input, size_t length);
-	void TruncatedFinal(byte *mac, size_t size);
-	unsigned int OptimalBlockSize() const {return const_cast<HMAC_Base*>(this)->AccessHash().OptimalBlockSize();}
-	unsigned int DigestSize() const {return const_cast<HMAC_Base*>(this)->AccessHash().DigestSize();}
-
-protected:
-	virtual HashTransformation & AccessHash() =0;
-	byte * AccessIpad() {return m_buf;}
-	byte * AccessOpad() {return m_buf + AccessHash().BlockSize();}
-	byte * AccessInnerHash() {return m_buf + 2*AccessHash().BlockSize();}
-
-private:
-	void KeyInnerHash();
-
-	SecByteBlock m_buf;
-	bool m_innerHashKeyed;
-};
-
-//! \class HMAC
-//! \brief HMAC
-//! \tparam T HashTransformation derived class
-//! \details HMAC derives from MessageAuthenticationCodeImpl. It calculates the HMAC using
-//!   <tt>HMAC(K, text) = H(K XOR opad, H(K XOR ipad, text))</tt>.
-//! \sa <a href="http://www.weidai.com/scan-mirror/mac.html#HMAC">HMAC</a>
-template <class T>
-class HMAC : public MessageAuthenticationCodeImpl<HMAC_Base, HMAC<T> >
-{
-public:
-	CRYPTOPP_CONSTANT(DIGESTSIZE=T::DIGESTSIZE)
-	CRYPTOPP_CONSTANT(BLOCKSIZE=T::BLOCKSIZE)
-
-	//! \brief Construct a HMAC
-	HMAC() {}
-	//! \brief Construct a HMAC
-	//! \param key the HMAC key
-	//! \param length the size of the HMAC key
-	HMAC(const byte *key, size_t length=HMAC_Base::DEFAULT_KEYLENGTH)
-		{this->SetKey(key, length);}
-
-	static std::string StaticAlgorithmName() {return std::string("HMAC(") + T::StaticAlgorithmName() + ")";}
-	std::string AlgorithmName() const {return std::string("HMAC(") + m_hash.AlgorithmName() + ")";}
-
-private:
-	HashTransformation & AccessHash() {return m_hash;}
-
-	T m_hash;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/hmqv.h b/src-cryptopp/hmqv.h
deleted file mode 100644
index 7cbc1c5..0000000
--- a/src-cryptopp/hmqv.h
+++ /dev/null
@@ -1,312 +0,0 @@
-// hmqv.h - written and placed in the public domain by Uri Blumenthal
-//          Shamelessly based upon Jeffrey Walton's FHMQV and Wei Dai's MQV source files
-
-#ifndef CRYPTOPP_HMQV_H
-#define CRYPTOPP_HMQV_H
-
-//! \file hmqv.h
-//! \brief Classes for Hashed Menezes-Qu-Vanstone key agreement in GF(p)
-//! \since Crypto++ 5.6.4
-
-#include "gfpcrypt.h"
-#include "algebra.h"
-#include "sha.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief Hashed Menezes-Qu-Vanstone in GF(p)
-//! \details This implementation follows Hugo Krawczyk's <a href="http://eprint.iacr.org/2005/176">HMQV: A High-Performance
-//!   Secure Diffie-Hellman Protocol</a>. Note: this implements HMQV only. HMQV-C with Key Confirmation is not provided.
-//! \sa MQV, HMQV, FHMQV, and AuthenticatedKeyAgreementDomain
-//! \since Crypto++ 5.6.4
-template <class GROUP_PARAMETERS, class COFACTOR_OPTION = CPP_TYPENAME GROUP_PARAMETERS::DefaultCofactorOption, class HASH = SHA512>
-class HMQV_Domain: public AuthenticatedKeyAgreementDomain
-{
-public:
-  typedef GROUP_PARAMETERS GroupParameters;
-  typedef typename GroupParameters::Element Element;
-  typedef HMQV_Domain<GROUP_PARAMETERS, COFACTOR_OPTION, HASH> Domain;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~HMQV_Domain() {}
-#endif
-
-  HMQV_Domain(bool clientRole = true): m_role(clientRole ? RoleClient : RoleServer) {}
-
-  HMQV_Domain(const GroupParameters &params, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer), m_groupParameters(params) {}
-
-  HMQV_Domain(BufferedTransformation &bt, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.BERDecode(bt);}
-
-  template <class T1>
-  HMQV_Domain(T1 v1, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.Initialize(v1);}
-
-  template <class T1, class T2>
-  HMQV_Domain(T1 v1, T2 v2, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.Initialize(v1, v2);}
-
-  template <class T1, class T2, class T3>
-  HMQV_Domain(T1 v1, T2 v2, T3 v3, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.Initialize(v1, v2, v3);}
-
-  template <class T1, class T2, class T3, class T4>
-  HMQV_Domain(T1 v1, T2 v2, T3 v3, T4 v4, bool clientRole = true)
-    : m_role(clientRole ? RoleClient : RoleServer)
-  {m_groupParameters.Initialize(v1, v2, v3, v4);}
-
-public:
-
-  const GroupParameters & GetGroupParameters() const {return m_groupParameters;}
-  GroupParameters & AccessGroupParameters(){return m_groupParameters;}
-
-  CryptoParameters & AccessCryptoParameters(){return AccessAbstractGroupParameters();}
-
-  //! return length of agreed value produced
-  unsigned int AgreedValueLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(false);}
-  //! return length of static private keys in this domain
-  unsigned int StaticPrivateKeyLength() const {return GetAbstractGroupParameters().GetSubgroupOrder().ByteCount();}
-  //! return length of static public keys in this domain
-  unsigned int StaticPublicKeyLength() const{return GetAbstractGroupParameters().GetEncodedElementSize(true);}
-
-  //! generate static private key
-  /*! \pre size of privateKey == PrivateStaticKeyLength() */
-  void GenerateStaticPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const
-  {
-    Integer x(rng, Integer::One(), GetAbstractGroupParameters().GetMaxExponent());
-    x.Encode(privateKey, StaticPrivateKeyLength());
-  }
-
-  //! generate static public key
-  /*! \pre size of publicKey == PublicStaticKeyLength() */
-  void GenerateStaticPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const
-  {
-    CRYPTOPP_UNUSED(rng);
-    const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-    Integer x(privateKey, StaticPrivateKeyLength());
-    Element y = params.ExponentiateBase(x);
-    params.EncodeElement(true, y, publicKey);
-  }
-
-  unsigned int EphemeralPrivateKeyLength() const {return StaticPrivateKeyLength() + StaticPublicKeyLength();}
-  unsigned int EphemeralPublicKeyLength() const{return StaticPublicKeyLength();}
-
-  //! return length of ephemeral private keys in this domain
-  void GenerateEphemeralPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const
-  {
-    const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-    Integer x(rng, Integer::One(), params.GetMaxExponent());
-    x.Encode(privateKey, StaticPrivateKeyLength());
-    Element y = params.ExponentiateBase(x);
-    params.EncodeElement(true, y, privateKey+StaticPrivateKeyLength());
-  }
-
-  //! return length of ephemeral public keys in this domain
-  void GenerateEphemeralPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const
-  {
-    CRYPTOPP_UNUSED(rng);
-    memcpy(publicKey, privateKey+StaticPrivateKeyLength(), EphemeralPublicKeyLength());
-  }
-
-  //! derive agreed value from your private keys and couterparty's public keys, return false in case of failure
-  /*! \note The ephemeral public key will always be validated.
-  If you have previously validated the static public key, use validateStaticOtherPublicKey=false to save time.
-  \pre size of agreedValue == AgreedValueLength()
-  \pre length of staticPrivateKey == StaticPrivateKeyLength()
-  \pre length of ephemeralPrivateKey == EphemeralPrivateKeyLength()
-  \pre length of staticOtherPublicKey == StaticPublicKeyLength()
-  \pre length of ephemeralOtherPublicKey == EphemeralPublicKeyLength()
-  */
-  bool Agree(byte *agreedValue,
-    const byte *staticPrivateKey, const byte *ephemeralPrivateKey,
-    const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey,
-    bool validateStaticOtherPublicKey=true) const
-  {
-    byte *XX = NULL, *YY = NULL, *AA = NULL, *BB = NULL;
-    size_t xxs = 0, yys = 0, aas = 0, bbs = 0;
-
-    // Depending on the role, this will hold either A's or B's static
-    // (long term) public key. AA or BB will then point into tt.
-    SecByteBlock tt(StaticPublicKeyLength());
-
-    try
-    {
-      const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-
-      if(m_role == RoleServer)
-      {
-        Integer b(staticPrivateKey, StaticPrivateKeyLength());
-        Element B = params.ExponentiateBase(b);
-        params.EncodeElement(true, B, tt);
-
-        XX = const_cast<byte*>(ephemeralOtherPublicKey);
-        xxs = EphemeralPublicKeyLength();
-        YY = const_cast<byte*>(ephemeralPrivateKey) + StaticPrivateKeyLength();
-        yys = EphemeralPublicKeyLength();
-        AA = const_cast<byte*>(staticOtherPublicKey);
-        aas = StaticPublicKeyLength();
-        BB = tt.BytePtr();
-        bbs = tt.SizeInBytes();
-      }
-      else if(m_role == RoleClient)
-      {
-        Integer a(staticPrivateKey, StaticPrivateKeyLength());
-        Element A = params.ExponentiateBase(a);
-        params.EncodeElement(true, A, tt);
-
-        XX = const_cast<byte*>(ephemeralPrivateKey) + StaticPrivateKeyLength();
-        xxs = EphemeralPublicKeyLength();
-        YY = const_cast<byte*>(ephemeralOtherPublicKey);
-        yys = EphemeralPublicKeyLength();
-        AA = tt.BytePtr();
-        aas = tt.SizeInBytes();
-        BB = const_cast<byte*>(staticOtherPublicKey);
-        bbs = StaticPublicKeyLength();
-      }
-      else
-      {
-        CRYPTOPP_ASSERT(0);
-        return false;
-      }
-
-      // DecodeElement calls ValidateElement at level 1. Level 1 only calls
-      // VerifyPoint to ensure the element is in G*. If the other's PublicKey is
-      // requested to be validated, we manually call ValidateElement at level 3.
-      Element VV1 = params.DecodeElement(staticOtherPublicKey, false);
-      if(!params.ValidateElement(validateStaticOtherPublicKey ? 3 : 1, VV1, NULL))
-        return false;
-
-      // DecodeElement calls ValidateElement at level 1. Level 1 only calls
-      // VerifyPoint to ensure the element is in G*. Crank it up.
-      Element VV2 = params.DecodeElement(ephemeralOtherPublicKey, false);
-      if(!params.ValidateElement(3, VV2, NULL))
-        return false;
-
-      // const Integer& p = params.GetGroupOrder(); // not used, remove later
-      const Integer& q = params.GetSubgroupOrder();
-      const unsigned int len /*bytes*/ = (((q.BitCount()+1)/2 +7)/8);
-
-      Integer d, e;
-      SecByteBlock dd(len), ee(len);
-
-      // Compute $d = \hat{H}(X, \hat{B})$
-      Hash(NULL, XX, xxs, BB, bbs, dd.BytePtr(), dd.SizeInBytes());
-      d.Decode(dd.BytePtr(), dd.SizeInBytes());
-
-      // Compute $e = \hat{H}(Y, \hat{A})$
-      Hash(NULL, YY, yys, AA, aas, ee.BytePtr(), ee.SizeInBytes());
-      e.Decode(ee.BytePtr(), ee.SizeInBytes());
-
-      Element sigma;
-      if(m_role == RoleServer)
-      {
-        Integer y(ephemeralPrivateKey, StaticPrivateKeyLength());
-        Integer b(staticPrivateKey, StaticPrivateKeyLength());
-        Integer s_B = (y + e * b) % q;
-
-        Element A = params.DecodeElement(AA, false);
-        Element X = params.DecodeElement(XX, false);
-
-        Element t1 = params.ExponentiateElement(A, d);
-        Element t2 = m_groupParameters.MultiplyElements(X, t1);
-
-        // $\sigma_B}=(X \cdot A^{d})^{s_B}
-        sigma = params.ExponentiateElement(t2, s_B);
-      }
-      else
-      {
-        Integer x(ephemeralPrivateKey, StaticPrivateKeyLength());
-        Integer a(staticPrivateKey, StaticPrivateKeyLength());
-        Integer s_A = (x + d * a) % q;
-
-        Element B = params.DecodeElement(BB, false);
-        Element Y = params.DecodeElement(YY, false);
-
-        Element t1 = params.ExponentiateElement(B, e);
-        Element t2 = m_groupParameters.MultiplyElements(Y, t1);
-
-        // $\sigma_A}=(Y \cdot B^{e})^{s_A}
-        sigma = params.ExponentiateElement(t2, s_A);
-      }
-      Hash(&sigma, NULL, 0, NULL, 0, agreedValue, AgreedValueLength());
-    }
-    catch (DL_BadElement &)
-    {
-      return false;
-    }
-    return true;
-  }
-
-protected:
-  // Hash invocation by client and server differ only in what keys
-  // each provides.
-
-  inline void Hash(const Element* sigma,
-    const byte* e1, size_t e1len, // Ephemeral key and key length
-    const byte* s1, size_t s1len, // Static key and key length
-    byte* digest, size_t dlen) const
-  {
-    HASH hash;
-    size_t idx = 0, req = dlen;
-    size_t blk = STDMIN(dlen, (size_t)HASH::DIGESTSIZE);
-
-    if(sigma)
-    {
-      if (e1len != 0 || s1len != 0) {
-	CRYPTOPP_ASSERT(0);
-      }
-      Integer x = GetAbstractGroupParameters().ConvertElementToInteger(*sigma);
-      SecByteBlock sbb(x.MinEncodedSize());
-      x.Encode(sbb.BytePtr(), sbb.SizeInBytes());
-      hash.Update(sbb.BytePtr(), sbb.SizeInBytes());
-    } else {
-      if (e1len == 0 || s1len == 0) {
-	CRYPTOPP_ASSERT(0);
-      }
-      hash.Update(e1, e1len);
-      hash.Update(s1, s1len);
-    }
-
-    hash.TruncatedFinal(digest, blk);
-    req -= blk;
-
-    // All this to catch tail bytes for large curves and small hashes
-    while(req != 0)
-    {
-      hash.Update(&digest[idx], (size_t)HASH::DIGESTSIZE);
-
-      idx += (size_t)HASH::DIGESTSIZE;
-      blk = STDMIN(req, (size_t)HASH::DIGESTSIZE);
-      hash.TruncatedFinal(&digest[idx], blk);
-
-      req -= blk;
-    }
-  }
-
-private:
-
-  // The paper uses Initiator and Recipient - make it classical.
-  enum KeyAgreementRole{ RoleServer = 1, RoleClient };
-
-  DL_GroupParameters<Element> & AccessAbstractGroupParameters() {return m_groupParameters;}
-  const DL_GroupParameters<Element> & GetAbstractGroupParameters() const{return m_groupParameters;}
-
-  GroupParameters m_groupParameters;
-  KeyAgreementRole m_role;
-};
-
-//! \brief Hashed Menezes-Qu-Vanstone in GF(p)
-//! \details This implementation follows Hugo Krawczyk's <a href="http://eprint.iacr.org/2005/176">HMQV: A High-Performance
-//!   Secure Diffie-Hellman Protocol</a>. Note: this implements HMQV only. HMQV-C with Key Confirmation is not provided.
-//! \sa HMQV, MQV_Domain, FHMQV_Domain, AuthenticatedKeyAgreementDomain
-//! \since Crypto++ 5.6.4
-typedef HMQV_Domain<DL_GroupParameters_GFP_DefaultSafePrime> HMQV;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/hrtimer.cpp b/src-cryptopp/hrtimer.cpp
deleted file mode 100644
index 6152935..0000000
--- a/src-cryptopp/hrtimer.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// hrtimer.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "hrtimer.h"
-#include "misc.h"
-
-#include <stddef.h>		// for NULL
-#include <time.h>
-
-#if defined(CRYPTOPP_WIN32_AVAILABLE)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-# if ((WINVER >= 0x0602 /*_WIN32_WINNT_WIN8*/) || (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/))
-# include <processthreadsapi.h>
-# if defined(WINAPI_FAMILY)
-#  if (WINAPI_FAMILY_PARTITION(WINAPI_FAMILY_PHONE_APP))
-#   include <profileapi.h>
-#  endif
-# endif
-#endif
-#endif
-
-#if defined(CRYPTOPP_UNIX_AVAILABLE)
-#include <sys/time.h>
-#include <sys/times.h>
-#include <unistd.h>
-#endif
-
-#include "trap.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#ifndef CRYPTOPP_IMPORTS
-
-#if defined(CRYPTOPP_WIN32_AVAILABLE)
-static TimerWord InitializePerformanceCounterFrequency()
-{
-	LARGE_INTEGER freq = {0,0};
-	if (!QueryPerformanceFrequency(&freq))
-		throw Exception(Exception::OTHER_ERROR, "Timer: QueryPerformanceFrequency failed with error " + IntToString(GetLastError()));
-	return freq.QuadPart;
-}
-
-inline TimerWord PerformanceCounterFrequency()
-{
-	static const word64 freq = InitializePerformanceCounterFrequency();
-	return freq;
-}
-#endif
-
-double TimerBase::ConvertTo(TimerWord t, Unit unit)
-{
-	static unsigned long unitsPerSecondTable[] = {1, 1000, 1000*1000, 1000*1000*1000};
-
-	// When 'unit' is an enum 'Unit', a Clang warning is generated.
-	CRYPTOPP_ASSERT(static_cast<unsigned int>(unit) < COUNTOF(unitsPerSecondTable));
-	return (double)CRYPTOPP_VC6_INT64 t * unitsPerSecondTable[unit] / CRYPTOPP_VC6_INT64 TicksPerSecond();
-}
-
-void TimerBase::StartTimer()
-{
-	m_last = m_start = GetCurrentTimerValue();
-	m_started = true;
-}
-
-double TimerBase::ElapsedTimeAsDouble()
-{
-	if (m_stuckAtZero)
-		return 0;
-
-	if (m_started)
-	{
-		TimerWord now = GetCurrentTimerValue();
-		if (m_last < now)	// protect against OS bugs where time goes backwards
-			m_last = now;
-		return ConvertTo(m_last - m_start, m_timerUnit);
-	}
-
-	StartTimer();
-	return 0;
-}
-
-unsigned long TimerBase::ElapsedTime()
-{
-	double elapsed = ElapsedTimeAsDouble();
-	CRYPTOPP_ASSERT(elapsed <= (double)ULONG_MAX);
-	return (unsigned long)elapsed;
-}
-
-TimerWord Timer::GetCurrentTimerValue()
-{
-#if defined(CRYPTOPP_WIN32_AVAILABLE)
-	// Use the first union member to avoid an uninitialized warning
-	LARGE_INTEGER now = {0,0};
-	if (!QueryPerformanceCounter(&now))
-		throw Exception(Exception::OTHER_ERROR, "Timer: QueryPerformanceCounter failed with error " + IntToString(GetLastError()));
-	return now.QuadPart;
-#elif defined(CRYPTOPP_UNIX_AVAILABLE)
-	timeval now;
-	gettimeofday(&now, NULL);
-	return (TimerWord)now.tv_sec * 1000000 + now.tv_usec;
-#else
-	// clock_t now;
-	return clock();
-#endif
-}
-
-TimerWord Timer::TicksPerSecond()
-{
-#if defined(CRYPTOPP_WIN32_AVAILABLE)
-	return PerformanceCounterFrequency();
-#elif defined(CRYPTOPP_UNIX_AVAILABLE)
-	return 1000000;
-#else
-	return CLOCKS_PER_SEC;
-#endif
-}
-
-#endif	// #ifndef CRYPTOPP_IMPORTS
-
-TimerWord ThreadUserTimer::GetCurrentTimerValue()
-{
-#if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(THREAD_TIMER_AVAILABLE)
-	static bool getCurrentThreadImplemented = true;
-	if (getCurrentThreadImplemented)
-	{
-		FILETIME now, ignored;
-		if (!GetThreadTimes(GetCurrentThread(), &ignored, &ignored, &ignored, &now))
-		{
-			const DWORD lastError = GetLastError();
-			if (lastError == ERROR_CALL_NOT_IMPLEMENTED)
-			{
-				getCurrentThreadImplemented = false;
-				goto GetCurrentThreadNotImplemented;
-			}
-			throw Exception(Exception::OTHER_ERROR, "ThreadUserTimer: GetThreadTimes failed with error " + IntToString(lastError));
-		}
-		return now.dwLowDateTime + ((TimerWord)now.dwHighDateTime << 32);
-	}
-GetCurrentThreadNotImplemented:
-	return (TimerWord)clock() * (10*1000*1000 / CLOCKS_PER_SEC);
-#elif defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(THREAD_TIMER_AVAILABLE)
-	LARGE_INTEGER now;
-	if (!QueryPerformanceCounter(&now))
-	{
-		const DWORD lastError = GetLastError();
-		throw Exception(Exception::OTHER_ERROR, "ThreadUserTimer: QueryPerformanceCounter failed with error " + IntToString(lastError));
-	}
-	return now.QuadPart;
-#elif defined(CRYPTOPP_UNIX_AVAILABLE)
-	tms now;
-	times(&now);
-	return now.tms_utime;
-#else
-	return clock();
-#endif
-}
-
-TimerWord ThreadUserTimer::TicksPerSecond()
-{
-#if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(THREAD_TIMER_AVAILABLE)
-	return 10*1000*1000;
-#elif defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(THREAD_TIMER_AVAILABLE)
-	static const TimerWord ticksPerSecond = PerformanceCounterFrequency();
-	return ticksPerSecond;
-#elif defined(CRYPTOPP_UNIX_AVAILABLE)
-	static const long ticksPerSecond = sysconf(_SC_CLK_TCK);
-	return ticksPerSecond;
-#else
-	return CLOCKS_PER_SEC;
-#endif
-}
-
-NAMESPACE_END
diff --git a/src-cryptopp/hrtimer.h b/src-cryptopp/hrtimer.h
deleted file mode 100644
index 88c2e53..0000000
--- a/src-cryptopp/hrtimer.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef CRYPTOPP_HRTIMER_H
-#define CRYPTOPP_HRTIMER_H
-
-#include "config.h"
-
-#if !defined(HIGHRES_TIMER_AVAILABLE) || (defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(THREAD_TIMER_AVAILABLE))
-#include <time.h>
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#ifdef HIGHRES_TIMER_AVAILABLE
-	typedef word64 TimerWord;
-#else
-	typedef clock_t TimerWord;
-#endif
-
-//! \class TimerBase
-//! \brief Base class for timers
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TimerBase
-{
-public:
-	enum Unit {SECONDS = 0, MILLISECONDS, MICROSECONDS, NANOSECONDS};
-	TimerBase(Unit unit, bool stuckAtZero)
-		: m_timerUnit(unit), m_stuckAtZero(stuckAtZero), m_started(false)
-		, m_start(0), m_last(0) {}
-
-	virtual TimerWord GetCurrentTimerValue() =0;	// GetCurrentTime is a macro in MSVC 6.0
-	virtual TimerWord TicksPerSecond() =0;	// this is not the resolution, just a conversion factor into seconds
-
-	void StartTimer();
-	double ElapsedTimeAsDouble();
-	unsigned long ElapsedTime();
-
-private:
-	double ConvertTo(TimerWord t, Unit unit);
-
-	Unit m_timerUnit;	// HPUX workaround: m_unit is a system macro on HPUX
-	bool m_stuckAtZero, m_started;
-	TimerWord m_start, m_last;
-};
-
-//! \class ThreadUserTimer
-//! \brief Measure CPU time spent executing instructions of this thread (if supported by OS)
-//! \note ThreadUserTimer only works correctly on Windows NT or later desktops and servers.
-//! On Unix-based it reports process time. On Windows Phone and Windows Store it reports wall
-//! clock time with performance counter precision. On all others it reports wall clock time.
-class ThreadUserTimer : public TimerBase
-{
-public:
-	ThreadUserTimer(Unit unit = TimerBase::SECONDS, bool stuckAtZero = false) : TimerBase(unit, stuckAtZero) {}
-	TimerWord GetCurrentTimerValue();
-	TimerWord TicksPerSecond();
-};
-
-//! high resolution timer
-class CRYPTOPP_DLL Timer : public TimerBase
-{
-public:
-	Timer(Unit unit = TimerBase::SECONDS, bool stuckAtZero = false)	: TimerBase(unit, stuckAtZero) {}
-	TimerWord GetCurrentTimerValue();
-	TimerWord TicksPerSecond();
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/integer.cpp b/src-cryptopp/integer.cpp
deleted file mode 100644
index e1d59f8..0000000
--- a/src-cryptopp/integer.cpp
+++ /dev/null
@@ -1,4606 +0,0 @@
-// integer.cpp - written and placed in the public domain by Wei Dai
-// contains public domain code contributed by Alister Lee and Leonard Janke
-
-#include "pch.h"
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4100)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic ignored "-Wunused"
-# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "integer.h"
-#include "secblock.h"
-#include "modarith.h"
-#include "nbtheory.h"
-#include "smartptr.h"
-#include "algparam.h"
-#include "filters.h"
-#include "asn.h"
-#include "oids.h"
-#include "words.h"
-#include "pubkey.h"		// for P1363_KDF2
-#include "sha.h"
-#include "cpu.h"
-#include "misc.h"
-
-#include <iostream>
-
-#if (_MSC_VER >= 1400) && !defined(_M_ARM)
-	#include <intrin.h>
-#endif
-
-#ifdef __DECCXX
-	#include <c_asm.h>
-#endif
-
-#ifdef CRYPTOPP_MSVC6_NO_PP
-	#pragma message("You do not seem to have the Visual C++ Processor Pack installed, so use of SSE2 instructions will be disabled.")
-#endif
-
-// "Error: The operand ___LKDB cannot be assigned to", http://github.com/weidai11/cryptopp/issues/188
-#if (__SUNPRO_CC >= 0x5130)
-# define MAYBE_CONST
-# define MAYBE_UNCONST_CAST const_cast<word*>
-#else
-# define MAYBE_CONST const
-# define MAYBE_UNCONST_CAST
-#endif
-
-// "Inline assembly operands don't work with .intel_syntax",
-//   http://llvm.org/bugs/show_bug.cgi?id=24232
-#if CRYPTOPP_BOOL_X32 || defined(CRYPTOPP_DISABLE_INTEL_ASM)
-# undef CRYPTOPP_X86_ASM_AVAILABLE
-# undef CRYPTOPP_X32_ASM_AVAILABLE
-# undef CRYPTOPP_X64_ASM_AVAILABLE
-# undef CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-# undef CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE
-# define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0
-# define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
-#else
-# define CRYPTOPP_INTEGER_SSE2 (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && CRYPTOPP_BOOL_X86)
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-bool AssignIntToInteger(const std::type_info &valueType, void *pInteger, const void *pInt)
-{
-	if (valueType != typeid(Integer))
-		return false;
-	*reinterpret_cast<Integer *>(pInteger) = *reinterpret_cast<const int *>(pInt);
-	return true;
-}
-
-inline static int Compare(const word *A, const word *B, size_t N)
-{
-	while (N--)
-		if (A[N] > B[N])
-			return 1;
-		else if (A[N] < B[N])
-			return -1;
-
-	return 0;
-}
-
-inline static int Increment(word *A, size_t N, word B=1)
-{
-	CRYPTOPP_ASSERT(N);
-	word t = A[0];
-	A[0] = t+B;
-	if (A[0] >= t)
-		return 0;
-	for (unsigned i=1; i<N; i++)
-		if (++A[i])
-			return 0;
-	return 1;
-}
-
-inline static int Decrement(word *A, size_t N, word B=1)
-{
-	CRYPTOPP_ASSERT(N);
-	word t = A[0];
-	A[0] = t-B;
-	if (A[0] <= t)
-		return 0;
-	for (unsigned i=1; i<N; i++)
-		if (A[i]--)
-			return 0;
-	return 1;
-}
-
-static void TwosComplement(word *A, size_t N)
-{
-	Decrement(A, N);
-	for (unsigned i=0; i<N; i++)
-		A[i] = ~A[i];
-}
-
-static word AtomicInverseModPower2(word A)
-{
-	CRYPTOPP_ASSERT(A%2==1);
-
-	word R=A%8;
-
-	for (unsigned i=3; i<WORD_BITS; i*=2)
-		R = R*(2-R*A);
-
-	CRYPTOPP_ASSERT(R*A==1);
-	return R;
-}
-
-// ********************************************************
-
-#if !defined(CRYPTOPP_NATIVE_DWORD_AVAILABLE) || (defined(__x86_64__) && defined(CRYPTOPP_WORD128_AVAILABLE))
-	#define Declare2Words(x)			word x##0, x##1;
-	#define AssignWord(a, b)			a##0 = b; a##1 = 0;
-	#define Add2WordsBy1(a, b, c)		a##0 = b##0 + c; a##1 = b##1 + (a##0 < c);
-	#define LowWord(a)					a##0
-	#define HighWord(a)					a##1
-	#ifdef _MSC_VER
-		#define MultiplyWordsLoHi(p0, p1, a, b)		p0 = _umul128(a, b, &p1);
-		#ifndef __INTEL_COMPILER
-			#define Double3Words(c, d)		d##1 = __shiftleft128(d##0, d##1, 1); d##0 = __shiftleft128(c, d##0, 1); c *= 2;
-		#endif
-	#elif defined(__DECCXX)
-		#define MultiplyWordsLoHi(p0, p1, a, b)		p0 = a*b; p1 = asm("umulh %a0, %a1, %v0", a, b);
-	#elif defined(__x86_64__)
-		#if defined(__SUNPRO_CC) && __SUNPRO_CC < 0x5100
-			// Sun Studio's gcc-style inline assembly is heavily bugged as of version 5.9 Patch 124864-09 2008/12/16, but this one works
-			#define MultiplyWordsLoHi(p0, p1, a, b)		asm ("mulq %3" : "=a"(p0), "=d"(p1) : "a"(a), "r"(b) : "cc");
-		#else
-			#define MultiplyWordsLoHi(p0, p1, a, b)		asm ("mulq %3" : "=a"(p0), "=d"(p1) : "a"(a), "g"(b) : "cc");
-			#define MulAcc(c, d, a, b)		asm ("mulq %6; addq %3, %0; adcq %4, %1; adcq $0, %2;" : "+r"(c), "+r"(d##0), "+r"(d##1), "=a"(p0), "=d"(p1) : "a"(a), "g"(b) : "cc");
-			#define Double3Words(c, d)		asm ("addq %0, %0; adcq %1, %1; adcq %2, %2;" : "+r"(c), "+r"(d##0), "+r"(d##1) : : "cc");
-			#define Acc2WordsBy1(a, b)		asm ("addq %2, %0; adcq $0, %1;" : "+r"(a##0), "+r"(a##1) : "r"(b) : "cc");
-			#define Acc2WordsBy2(a, b)		asm ("addq %2, %0; adcq %3, %1;" : "+r"(a##0), "+r"(a##1) : "r"(b##0), "r"(b##1) : "cc");
-			#define Acc3WordsBy2(c, d, e)	asm ("addq %5, %0; adcq %6, %1; adcq $0, %2;" : "+r"(c), "=r"(e##0), "=r"(e##1) : "1"(d##0), "2"(d##1), "r"(e##0), "r"(e##1) : "cc");
-		#endif
-	#endif
-	#define MultiplyWords(p, a, b)		MultiplyWordsLoHi(p##0, p##1, a, b)
-	#ifndef Double3Words
-		#define Double3Words(c, d)		d##1 = 2*d##1 + (d##0>>(WORD_BITS-1)); d##0 = 2*d##0 + (c>>(WORD_BITS-1)); c *= 2;
-	#endif
-	#ifndef Acc2WordsBy2
-		#define Acc2WordsBy2(a, b)		a##0 += b##0; a##1 += a##0 < b##0; a##1 += b##1;
-	#endif
-	#define AddWithCarry(u, a, b)		{word t = a+b; u##0 = t + u##1; u##1 = (t<a) + (u##0<t);}
-	#define SubtractWithBorrow(u, a, b)	{word t = a-b; u##0 = t - u##1; u##1 = (t>a) + (u##0>t);}
-	#define GetCarry(u)					u##1
-	#define GetBorrow(u)				u##1
-#else
-	#define Declare2Words(x)			dword x;
-	#if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER) && !defined(_M_ARM)
-		#define MultiplyWords(p, a, b)		p = __emulu(a, b);
-	#else
-		#define MultiplyWords(p, a, b)		p = (dword)a*b;
-	#endif
-	#define AssignWord(a, b)			a = b;
-	#define Add2WordsBy1(a, b, c)		a = b + c;
-	#define Acc2WordsBy2(a, b)			a += b;
-	#define LowWord(a)					word(a)
-	#define HighWord(a)					word(a>>WORD_BITS)
-	#define Double3Words(c, d)			d = 2*d + (c>>(WORD_BITS-1)); c *= 2;
-	#define AddWithCarry(u, a, b)		u = dword(a) + b + GetCarry(u);
-	#define SubtractWithBorrow(u, a, b)	u = dword(a) - b - GetBorrow(u);
-	#define GetCarry(u)					HighWord(u)
-	#define GetBorrow(u)				word(u>>(WORD_BITS*2-1))
-#endif
-#ifndef MulAcc
-	#define MulAcc(c, d, a, b)			MultiplyWords(p, a, b); Acc2WordsBy1(p, c); c = LowWord(p); Acc2WordsBy1(d, HighWord(p));
-#endif
-#ifndef Acc2WordsBy1
-	#define Acc2WordsBy1(a, b)			Add2WordsBy1(a, a, b)
-#endif
-#ifndef Acc3WordsBy2
-	#define Acc3WordsBy2(c, d, e)		Acc2WordsBy1(e, c); c = LowWord(e); Add2WordsBy1(e, d, HighWord(e));
-#endif
-
-class DWord
-{
-public:
-#if defined(CRYPTOPP_NATIVE_DWORD_AVAILABLE)
-	DWord() : m_whole() { }
-#else
-	DWord() : m_halfs() { }
-#endif
-
-#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-	explicit DWord(word low) : m_whole(low) { }
-#else
-	explicit DWord(word low) : m_halfs()
-	{
-		m_halfs.low = low;
-	}
-#endif
-
-#if defined(CRYPTOPP_NATIVE_DWORD_AVAILABLE)
-	DWord(word low, word high) : m_whole()
-#else
-	DWord(word low, word high) : m_halfs()
-#endif
-	{
-#if defined(CRYPTOPP_NATIVE_DWORD_AVAILABLE)
-#  if defined(IS_LITTLE_ENDIAN)
-		const word t[2] = {low,high};
-		memcpy(&m_whole, &t, sizeof(m_whole));
-#  else
-		const word t[2] = {high,low};
-		memcpy(&m_whole, &t, sizeof(m_whole));
-#  endif
-#else
-		m_halfs.low = low;
-		m_halfs.high = high;
-#endif
-	}
-
-	static DWord Multiply(word a, word b)
-	{
-		DWord r;
-		#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-			r.m_whole = (dword)a * b;
-		#elif defined(MultiplyWordsLoHi)
-			MultiplyWordsLoHi(r.m_halfs.low, r.m_halfs.high, a, b);
-		#else
-			CRYPTOPP_ASSERT(0);
-		#endif
-		return r;
-	}
-
-	static DWord MultiplyAndAdd(word a, word b, word c)
-	{
-		DWord r = Multiply(a, b);
-		return r += c;
-	}
-
-	DWord & operator+=(word a)
-	{
-		#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-			m_whole = m_whole + a;
-		#else
-			m_halfs.low += a;
-			m_halfs.high += (m_halfs.low < a);
-		#endif
-		return *this;
-	}
-
-	DWord operator+(word a)
-	{
-		DWord r;
-		#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-			r.m_whole = m_whole + a;
-		#else
-			r.m_halfs.low = m_halfs.low + a;
-			r.m_halfs.high = m_halfs.high + (r.m_halfs.low < a);
-		#endif
-		return r;
-	}
-
-	DWord operator-(DWord a)
-	{
-		DWord r;
-		#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-			r.m_whole = m_whole - a.m_whole;
-		#else
-			r.m_halfs.low = m_halfs.low - a.m_halfs.low;
-			r.m_halfs.high = m_halfs.high - a.m_halfs.high - (r.m_halfs.low > m_halfs.low);
-		#endif
-		return r;
-	}
-
-	DWord operator-(word a)
-	{
-		DWord r;
-		#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-			r.m_whole = m_whole - a;
-		#else
-			r.m_halfs.low = m_halfs.low - a;
-			r.m_halfs.high = m_halfs.high - (r.m_halfs.low > m_halfs.low);
-		#endif
-		return r;
-	}
-
-	// returns quotient, which must fit in a word
-	word operator/(word divisor);
-
-	word operator%(word a);
-
-	bool operator!() const
-	{
-	#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-		return !m_whole;
-	#else
-		return !m_halfs.high && !m_halfs.low;
-	#endif
-	}
-
-	// TODO: When NATIVE_DWORD is in effect, we access high and low, which are inactive
-	//  union members, and that's UB. Also see http://stackoverflow.com/q/11373203.
-	word GetLowHalf() const {return m_halfs.low;}
-	word GetHighHalf() const {return m_halfs.high;}
-	word GetHighHalfAsBorrow() const {return 0-m_halfs.high;}
-
-private:
-	// Issue 274, "Types cannot be declared in anonymous union",
-	//   http://github.com/weidai11/cryptopp/issues/274
-	//   Thanks to Martin Bonner at http://stackoverflow.com/a/39507183
-    struct half_words
-    {
-    #ifdef IS_LITTLE_ENDIAN
-        word low;
-        word high;
-    #else
-        word high;
-        word low;
-    #endif
-   };
-   union
-   {
-   #ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-       dword m_whole;
-   #endif
-       half_words m_halfs;
-   };
-};
-
-class Word
-{
-public:
-	// Converity finding on default ctor. We've isntrumented the code,
-	//   and cannot uncover a case where it affects a result.
-#if defined(__COVERITY__)
-	Word() : m_whole(0) {}
-#elif CRYPTOPP_DEBUG
-	// Repeating pattern of 1010 for debug builds to break things...
-	Word() : m_whole(0) {memset(&m_whole, 0xaa, sizeof(m_whole));}
-#else
-	Word() {}
-#endif
-
-	Word(word value) : m_whole(value) {}
-	Word(hword low, hword high) : m_whole(low | (word(high) << (WORD_BITS/2))) {}
-
-	static Word Multiply(hword a, hword b)
-	{
-		Word r;
-		r.m_whole = (word)a * b;
-		return r;
-	}
-
-	Word operator-(Word a)
-	{
-		Word r;
-		r.m_whole = m_whole - a.m_whole;
-		return r;
-	}
-
-	Word operator-(hword a)
-	{
-		Word r;
-		r.m_whole = m_whole - a;
-		return r;
-	}
-
-	// returns quotient, which must fit in a word
-	hword operator/(hword divisor)
-	{
-		return hword(m_whole / divisor);
-	}
-
-	bool operator!() const
-	{
-		return !m_whole;
-	}
-
-	word GetWhole() const {return m_whole;}
-	hword GetLowHalf() const {return hword(m_whole);}
-	hword GetHighHalf() const {return hword(m_whole>>(WORD_BITS/2));}
-	hword GetHighHalfAsBorrow() const {return 0-hword(m_whole>>(WORD_BITS/2));}
-
-private:
-	word m_whole;
-};
-
-// do a 3 word by 2 word divide, returns quotient and leaves remainder in A
-template <class S, class D>
-S DivideThreeWordsByTwo(S *A, S B0, S B1, D *dummy=NULL)
-{
-	CRYPTOPP_UNUSED(dummy);
-
-	// CRYPTOPP_ASSERT {A[2],A[1]} < {B1,B0}, so quotient can fit in a S
-	CRYPTOPP_ASSERT(A[2] < B1 || (A[2]==B1 && A[1] < B0));
-
-	// estimate the quotient: do a 2 S by 1 S divide.
-	// Profiling tells us the original second case was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-
-	S Q; bool pre = (S(B1+1) == 0);
-	if (B1 > 0 && !pre)
-		Q = D(A[1], A[2]) / S(B1+1);
-	else if (pre)
-		Q = A[2];
-	else
-		Q = D(A[0], A[1]) / B0;
-
-	// now subtract Q*B from A
-	D p = D::Multiply(B0, Q);
-	D u = (D) A[0] - p.GetLowHalf();
-	A[0] = u.GetLowHalf();
-	u = (D) A[1] - p.GetHighHalf() - u.GetHighHalfAsBorrow() - D::Multiply(B1, Q);
-	A[1] = u.GetLowHalf();
-	A[2] += u.GetHighHalf();
-
-	// Q <= actual quotient, so fix it
-	while (A[2] || A[1] > B1 || (A[1]==B1 && A[0]>=B0))
-	{
-		u = (D) A[0] - B0;
-		A[0] = u.GetLowHalf();
-		u = (D) A[1] - B1 - u.GetHighHalfAsBorrow();
-		A[1] = u.GetLowHalf();
-		A[2] += u.GetHighHalf();
-		Q++;
-		CRYPTOPP_ASSERT(Q);	// shouldn't overflow
-	}
-
-	return Q;
-}
-
-// do a 4 word by 2 word divide, returns 2 word quotient in Q0 and Q1
-template <class S, class D>
-inline D DivideFourWordsByTwo(S *T, const D &Al, const D &Ah, const D &B)
-{
-	// Profiling tells us the original second case was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-
-	if (!!B)
-	{
-		S Q[2];
-		T[0] = Al.GetLowHalf();
-		T[1] = Al.GetHighHalf();
-		T[2] = Ah.GetLowHalf();
-		T[3] = Ah.GetHighHalf();
-		Q[1] = DivideThreeWordsByTwo<S, D>(T+1, B.GetLowHalf(), B.GetHighHalf());
-		Q[0] = DivideThreeWordsByTwo<S, D>(T, B.GetLowHalf(), B.GetHighHalf());
-		return D(Q[0], Q[1]);
-	}
-	else  // if divisor is 0, we assume divisor==2**(2*WORD_BITS)
-	{
-		return D(Ah.GetLowHalf(), Ah.GetHighHalf());
-	}
-}
-
-// returns quotient, which must fit in a word
-inline word DWord::operator/(word a)
-{
-	#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-		return word(m_whole / a);
-	#else
-		hword r[4];
-		return DivideFourWordsByTwo<hword, Word>(r, m_halfs.low, m_halfs.high, a).GetWhole();
-	#endif
-}
-
-inline word DWord::operator%(word a)
-{
-	#ifdef CRYPTOPP_NATIVE_DWORD_AVAILABLE
-		return word(m_whole % a);
-	#else
-		if (a < (word(1) << (WORD_BITS/2)))
-		{
-			hword h = hword(a);
-			word r = m_halfs.high % h;
-			r = ((m_halfs.low >> (WORD_BITS/2)) + (r << (WORD_BITS/2))) % h;
-			return hword((hword(m_halfs.low) + (r << (WORD_BITS/2))) % h);
-		}
-		else
-		{
-			hword r[4];
-			DivideFourWordsByTwo<hword, Word>(r, m_halfs.low, m_halfs.high, a);
-			return Word(r[0], r[1]).GetWhole();
-		}
-	#endif
-}
-
-// ********************************************************
-
-// Use some tricks to share assembly code between MSVC, GCC, Clang and Sun CC.
-#if defined(__GNUC__)
-	#define AddPrologue \
-		int result;	\
-		__asm__ __volatile__ \
-		( \
-			INTEL_NOPREFIX
-	#define AddEpilogue \
-			ATT_PREFIX \
-					: "=a" (result)\
-					: "d" (C), "a" (A), "D" (B), "c" (N) \
-					: "%esi", "memory", "cc" \
-		);\
-		return result;
-	#define MulPrologue \
-		__asm__ __volatile__ \
-		( \
-			INTEL_NOPREFIX \
-			AS1(	push	ebx) \
-			AS2(	mov		ebx, edx)
-	#define MulEpilogue \
-			AS1(	pop		ebx) \
-			ATT_PREFIX \
-			: \
-			: "d" (s_maskLow16), "c" (C), "a" (A), "D" (B) \
-			: "%esi", "memory", "cc" \
-		);
-	#define SquPrologue		MulPrologue
-	#define SquEpilogue	\
-			AS1(	pop		ebx) \
-			ATT_PREFIX \
-			: \
-			: "d" (s_maskLow16), "c" (C), "a" (A) \
-			: "%esi", "%edi", "memory", "cc" \
-		);
-	#define TopPrologue		MulPrologue
-	#define TopEpilogue	\
-			AS1(	pop		ebx) \
-			ATT_PREFIX \
-			: \
-			: "d" (s_maskLow16), "c" (C), "a" (A), "D" (B), "S" (L) \
-			: "memory", "cc" \
-		);
-#else
-	#define AddPrologue \
-		__asm	push edi \
-		__asm	push esi \
-		__asm	mov		eax, [esp+12] \
-		__asm	mov		edi, [esp+16]
-	#define AddEpilogue \
-		__asm	pop esi \
-		__asm	pop edi \
-		__asm	ret 8
-#if _MSC_VER < 1300
-	#define SaveEBX		__asm push ebx
-	#define RestoreEBX	__asm pop ebx
-#else
-	#define SaveEBX
-	#define RestoreEBX
-#endif
-	#define SquPrologue					\
-		AS2(	mov		eax, A)			\
-		AS2(	mov		ecx, C)			\
-		SaveEBX							\
-		AS2(	lea		ebx, s_maskLow16)
-	#define MulPrologue					\
-		AS2(	mov		eax, A)			\
-		AS2(	mov		edi, B)			\
-		AS2(	mov		ecx, C)			\
-		SaveEBX							\
-		AS2(	lea		ebx, s_maskLow16)
-	#define TopPrologue					\
-		AS2(	mov		eax, A)			\
-		AS2(	mov		edi, B)			\
-		AS2(	mov		ecx, C)			\
-		AS2(	mov		esi, L)			\
-		SaveEBX							\
-		AS2(	lea		ebx, s_maskLow16)
-	#define SquEpilogue		RestoreEBX
-	#define MulEpilogue		RestoreEBX
-	#define TopEpilogue		RestoreEBX
-#endif
-
-#ifdef CRYPTOPP_X64_MASM_AVAILABLE
-extern "C" {
-int Baseline_Add(size_t N, word *C, const word *A, const word *B);
-int Baseline_Sub(size_t N, word *C, const word *A, const word *B);
-}
-#elif defined(CRYPTOPP_X64_ASM_AVAILABLE) && defined(__GNUC__) && defined(CRYPTOPP_WORD128_AVAILABLE)
-int Baseline_Add(size_t N, word *C, const word *A, const word *B)
-{
-	word result;
-	__asm__ __volatile__
-	(
-	INTEL_NOPREFIX
-	AS1(	neg		%1)
-	ASJ(	jz,		1, f)
-	AS2(	mov		%0,[%3+8*%1])
-	AS2(	add		%0,[%4+8*%1])
-	AS2(	mov		[%2+8*%1],%0)
-	ASL(0)
-	AS2(	mov		%0,[%3+8*%1+8])
-	AS2(	adc		%0,[%4+8*%1+8])
-	AS2(	mov		[%2+8*%1+8],%0)
-	AS2(	lea		%1,[%1+2])
-	ASJ(	jrcxz,	1, f)
-	AS2(	mov		%0,[%3+8*%1])
-	AS2(	adc		%0,[%4+8*%1])
-	AS2(	mov		[%2+8*%1],%0)
-	ASJ(	jmp,	0, b)
-	ASL(1)
-	AS2(	mov		%0, 0)
-	AS2(	adc		%0, %0)
-	ATT_NOPREFIX
-	: "=&r" (result), "+c" (N)
-	: "r" (C+N), "r" (A+N), "r" (B+N)
-	: "memory", "cc"
-	);
-	return (int)result;
-}
-
-int Baseline_Sub(size_t N, word *C, const word *A, const word *B)
-{
-	word result;
-	__asm__ __volatile__
-	(
-	INTEL_NOPREFIX
-	AS1(	neg		%1)
-	ASJ(	jz,		1, f)
-	AS2(	mov		%0,[%3+8*%1])
-	AS2(	sub		%0,[%4+8*%1])
-	AS2(	mov		[%2+8*%1],%0)
-	ASL(0)
-	AS2(	mov		%0,[%3+8*%1+8])
-	AS2(	sbb		%0,[%4+8*%1+8])
-	AS2(	mov		[%2+8*%1+8],%0)
-	AS2(	lea		%1,[%1+2])
-	ASJ(	jrcxz,	1, f)
-	AS2(	mov		%0,[%3+8*%1])
-	AS2(	sbb		%0,[%4+8*%1])
-	AS2(	mov		[%2+8*%1],%0)
-	ASJ(	jmp,	0, b)
-	ASL(1)
-	AS2(	mov		%0, 0)
-	AS2(	adc		%0, %0)
-	ATT_NOPREFIX
-	: "=&r" (result), "+c" (N)
-	: "r" (C+N), "r" (A+N), "r" (B+N)
-	: "memory", "cc"
-	);
-	return (int)result;
-}
-#elif defined(CRYPTOPP_X86_ASM_AVAILABLE) && CRYPTOPP_BOOL_X86
-CRYPTOPP_NAKED int CRYPTOPP_FASTCALL Baseline_Add(size_t N, word *C, const word *A, const word *B)
-{
-	AddPrologue
-
-	// now: eax = A, edi = B, edx = C, ecx = N
-	AS2(	lea		eax, [eax+4*ecx])
-	AS2(	lea		edi, [edi+4*ecx])
-	AS2(	lea		edx, [edx+4*ecx])
-
-	AS1(	neg		ecx)				// ecx is negative index
-	AS2(	test	ecx, 2)				// this clears carry flag
-	ASJ(	jz,		0, f)
-	AS2(	sub		ecx, 2)
-	ASJ(	jmp,	1, f)
-
-	ASL(0)
-	ASJ(	jecxz,	2, f)				// loop until ecx overflows and becomes zero
-	AS2(	mov		esi,[eax+4*ecx])
-	AS2(	adc		esi,[edi+4*ecx])
-	AS2(	mov		[edx+4*ecx],esi)
-	AS2(	mov		esi,[eax+4*ecx+4])
-	AS2(	adc		esi,[edi+4*ecx+4])
-	AS2(	mov		[edx+4*ecx+4],esi)
-	ASL(1)
-	AS2(	mov		esi,[eax+4*ecx+8])
-	AS2(	adc		esi,[edi+4*ecx+8])
-	AS2(	mov		[edx+4*ecx+8],esi)
-	AS2(	mov		esi,[eax+4*ecx+12])
-	AS2(	adc		esi,[edi+4*ecx+12])
-	AS2(	mov		[edx+4*ecx+12],esi)
-
-	AS2(	lea		ecx,[ecx+4])		// advance index, avoid inc which causes slowdown on Intel Core 2
-	ASJ(	jmp,	0, b)
-
-	ASL(2)
-	AS2(	mov		eax, 0)
-	AS1(	setc	al)					// store carry into eax (return result register)
-
-	AddEpilogue
-}
-
-CRYPTOPP_NAKED int CRYPTOPP_FASTCALL Baseline_Sub(size_t N, word *C, const word *A, const word *B)
-{
-	AddPrologue
-
-	// now: eax = A, edi = B, edx = C, ecx = N
-	AS2(	lea		eax, [eax+4*ecx])
-	AS2(	lea		edi, [edi+4*ecx])
-	AS2(	lea		edx, [edx+4*ecx])
-
-	AS1(	neg		ecx)				// ecx is negative index
-	AS2(	test	ecx, 2)				// this clears carry flag
-	ASJ(	jz,		0, f)
-	AS2(	sub		ecx, 2)
-	ASJ(	jmp,	1, f)
-
-	ASL(0)
-	ASJ(	jecxz,	2, f)				// loop until ecx overflows and becomes zero
-	AS2(	mov		esi,[eax+4*ecx])
-	AS2(	sbb		esi,[edi+4*ecx])
-	AS2(	mov		[edx+4*ecx],esi)
-	AS2(	mov		esi,[eax+4*ecx+4])
-	AS2(	sbb		esi,[edi+4*ecx+4])
-	AS2(	mov		[edx+4*ecx+4],esi)
-	ASL(1)
-	AS2(	mov		esi,[eax+4*ecx+8])
-	AS2(	sbb		esi,[edi+4*ecx+8])
-	AS2(	mov		[edx+4*ecx+8],esi)
-	AS2(	mov		esi,[eax+4*ecx+12])
-	AS2(	sbb		esi,[edi+4*ecx+12])
-	AS2(	mov		[edx+4*ecx+12],esi)
-
-	AS2(	lea		ecx,[ecx+4])		// advance index, avoid inc which causes slowdown on Intel Core 2
-	ASJ(	jmp,	0, b)
-
-	ASL(2)
-	AS2(	mov		eax, 0)
-	AS1(	setc	al)					// store carry into eax (return result register)
-
-	AddEpilogue
-}
-
-#if CRYPTOPP_INTEGER_SSE2
-CRYPTOPP_NAKED int CRYPTOPP_FASTCALL SSE2_Add(size_t N, word *C, const word *A, const word *B)
-{
-	AddPrologue
-
-	// now: eax = A, edi = B, edx = C, ecx = N
-	AS2(	lea		eax, [eax+4*ecx])
-	AS2(	lea		edi, [edi+4*ecx])
-	AS2(	lea		edx, [edx+4*ecx])
-
-	AS1(	neg		ecx)				// ecx is negative index
-	AS2(	pxor    mm2, mm2)
-	ASJ(	jz,		2, f)
-	AS2(	test	ecx, 2)				// this clears carry flag
-	ASJ(	jz,		0, f)
-	AS2(	sub		ecx, 2)
-	ASJ(	jmp,	1, f)
-
-	ASL(0)
-	AS2(	movd     mm0, DWORD PTR [eax+4*ecx])
-	AS2(	movd     mm1, DWORD PTR [edi+4*ecx])
-	AS2(	paddq    mm0, mm1)
-	AS2(	paddq	 mm2, mm0)
-	AS2(	movd	 DWORD PTR [edx+4*ecx], mm2)
-	AS2(	psrlq    mm2, 32)
-
-	AS2(	movd     mm0, DWORD PTR [eax+4*ecx+4])
-	AS2(	movd     mm1, DWORD PTR [edi+4*ecx+4])
-	AS2(	paddq    mm0, mm1)
-	AS2(	paddq	 mm2, mm0)
-	AS2(	movd	 DWORD PTR [edx+4*ecx+4], mm2)
-	AS2(	psrlq    mm2, 32)
-
-	ASL(1)
-	AS2(	movd     mm0, DWORD PTR [eax+4*ecx+8])
-	AS2(	movd     mm1, DWORD PTR [edi+4*ecx+8])
-	AS2(	paddq    mm0, mm1)
-	AS2(	paddq	 mm2, mm0)
-	AS2(	movd	 DWORD PTR [edx+4*ecx+8], mm2)
-	AS2(	psrlq    mm2, 32)
-
-	AS2(	movd     mm0, DWORD PTR [eax+4*ecx+12])
-	AS2(	movd     mm1, DWORD PTR [edi+4*ecx+12])
-	AS2(	paddq    mm0, mm1)
-	AS2(	paddq	 mm2, mm0)
-	AS2(	movd	 DWORD PTR [edx+4*ecx+12], mm2)
-	AS2(	psrlq    mm2, 32)
-
-	AS2(	add		ecx, 4)
-	ASJ(	jnz,	0, b)
-
-	ASL(2)
-	AS2(	movd	eax, mm2)
-	AS1(	emms)
-
-	AddEpilogue
-}
-CRYPTOPP_NAKED int CRYPTOPP_FASTCALL SSE2_Sub(size_t N, word *C, const word *A, const word *B)
-{
-	AddPrologue
-
-	// now: eax = A, edi = B, edx = C, ecx = N
-	AS2(	lea		eax, [eax+4*ecx])
-	AS2(	lea		edi, [edi+4*ecx])
-	AS2(	lea		edx, [edx+4*ecx])
-
-	AS1(	neg		ecx)				// ecx is negative index
-	AS2(	pxor    mm2, mm2)
-	ASJ(	jz,		2, f)
-	AS2(	test	ecx, 2)				// this clears carry flag
-	ASJ(	jz,		0, f)
-	AS2(	sub		ecx, 2)
-	ASJ(	jmp,	1, f)
-
-	ASL(0)
-	AS2(	movd     mm0, DWORD PTR [eax+4*ecx])
-	AS2(	movd     mm1, DWORD PTR [edi+4*ecx])
-	AS2(	psubq    mm0, mm1)
-	AS2(	psubq	 mm0, mm2)
-	AS2(	movd	 DWORD PTR [edx+4*ecx], mm0)
-	AS2(	psrlq    mm0, 63)
-
-	AS2(	movd     mm2, DWORD PTR [eax+4*ecx+4])
-	AS2(	movd     mm1, DWORD PTR [edi+4*ecx+4])
-	AS2(	psubq    mm2, mm1)
-	AS2(	psubq	 mm2, mm0)
-	AS2(	movd	 DWORD PTR [edx+4*ecx+4], mm2)
-	AS2(	psrlq    mm2, 63)
-
-	ASL(1)
-	AS2(	movd     mm0, DWORD PTR [eax+4*ecx+8])
-	AS2(	movd     mm1, DWORD PTR [edi+4*ecx+8])
-	AS2(	psubq    mm0, mm1)
-	AS2(	psubq	 mm0, mm2)
-	AS2(	movd	 DWORD PTR [edx+4*ecx+8], mm0)
-	AS2(	psrlq    mm0, 63)
-
-	AS2(	movd     mm2, DWORD PTR [eax+4*ecx+12])
-	AS2(	movd     mm1, DWORD PTR [edi+4*ecx+12])
-	AS2(	psubq    mm2, mm1)
-	AS2(	psubq	 mm2, mm0)
-	AS2(	movd	 DWORD PTR [edx+4*ecx+12], mm2)
-	AS2(	psrlq    mm2, 63)
-
-	AS2(	add		ecx, 4)
-	ASJ(	jnz,	0, b)
-
-	ASL(2)
-	AS2(	movd	eax, mm2)
-	AS1(	emms)
-
-	AddEpilogue
-}
-#endif	// #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-#else
-int CRYPTOPP_FASTCALL Baseline_Add(size_t N, word *C, const word *A, const word *B)
-{
-	CRYPTOPP_ASSERT (N%2 == 0);
-
-	Declare2Words(u);
-	AssignWord(u, 0);
-	for (size_t i=0; i<N; i+=2)
-	{
-		AddWithCarry(u, A[i], B[i]);
-		C[i] = LowWord(u);
-		AddWithCarry(u, A[i+1], B[i+1]);
-		C[i+1] = LowWord(u);
-	}
-	return int(GetCarry(u));
-}
-
-int CRYPTOPP_FASTCALL Baseline_Sub(size_t N, word *C, const word *A, const word *B)
-{
-	CRYPTOPP_ASSERT (N%2 == 0);
-
-	Declare2Words(u);
-	AssignWord(u, 0);
-	for (size_t i=0; i<N; i+=2)
-	{
-		SubtractWithBorrow(u, A[i], B[i]);
-		C[i] = LowWord(u);
-		SubtractWithBorrow(u, A[i+1], B[i+1]);
-		C[i+1] = LowWord(u);
-	}
-	return int(GetBorrow(u));
-}
-#endif
-
-static word LinearMultiply(word *C, const word *AA, word B, size_t N)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-
-	word carry=0;
-	for(unsigned i=0; i<N; i++)
-	{
-		Declare2Words(p);
-		MultiplyWords(p, A[i], B);
-		Acc2WordsBy1(p, carry);
-		C[i] = LowWord(p);
-		carry = HighWord(p);
-	}
-	return carry;
-}
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-
-#define Mul_2 \
-	Mul_Begin(2) \
-	Mul_SaveAcc(0, 0, 1) Mul_Acc(1, 0) \
-	Mul_End(1, 1)
-
-#define Mul_4 \
-	Mul_Begin(4) \
-	Mul_SaveAcc(0, 0, 1) Mul_Acc(1, 0) \
-	Mul_SaveAcc(1, 0, 2) Mul_Acc(1, 1) Mul_Acc(2, 0)  \
-	Mul_SaveAcc(2, 0, 3) Mul_Acc(1, 2) Mul_Acc(2, 1) Mul_Acc(3, 0)  \
-	Mul_SaveAcc(3, 1, 3) Mul_Acc(2, 2) Mul_Acc(3, 1)  \
-	Mul_SaveAcc(4, 2, 3) Mul_Acc(3, 2) \
-	Mul_End(5, 3)
-
-#define Mul_8 \
-	Mul_Begin(8) \
-	Mul_SaveAcc(0, 0, 1) Mul_Acc(1, 0) \
-	Mul_SaveAcc(1, 0, 2) Mul_Acc(1, 1) Mul_Acc(2, 0)  \
-	Mul_SaveAcc(2, 0, 3) Mul_Acc(1, 2) Mul_Acc(2, 1) Mul_Acc(3, 0)  \
-	Mul_SaveAcc(3, 0, 4) Mul_Acc(1, 3) Mul_Acc(2, 2) Mul_Acc(3, 1) Mul_Acc(4, 0) \
-	Mul_SaveAcc(4, 0, 5) Mul_Acc(1, 4) Mul_Acc(2, 3) Mul_Acc(3, 2) Mul_Acc(4, 1) Mul_Acc(5, 0) \
-	Mul_SaveAcc(5, 0, 6) Mul_Acc(1, 5) Mul_Acc(2, 4) Mul_Acc(3, 3) Mul_Acc(4, 2) Mul_Acc(5, 1) Mul_Acc(6, 0) \
-	Mul_SaveAcc(6, 0, 7) Mul_Acc(1, 6) Mul_Acc(2, 5) Mul_Acc(3, 4) Mul_Acc(4, 3) Mul_Acc(5, 2) Mul_Acc(6, 1) Mul_Acc(7, 0) \
-	Mul_SaveAcc(7, 1, 7) Mul_Acc(2, 6) Mul_Acc(3, 5) Mul_Acc(4, 4) Mul_Acc(5, 3) Mul_Acc(6, 2) Mul_Acc(7, 1) \
-	Mul_SaveAcc(8, 2, 7) Mul_Acc(3, 6) Mul_Acc(4, 5) Mul_Acc(5, 4) Mul_Acc(6, 3) Mul_Acc(7, 2) \
-	Mul_SaveAcc(9, 3, 7) Mul_Acc(4, 6) Mul_Acc(5, 5) Mul_Acc(6, 4) Mul_Acc(7, 3) \
-	Mul_SaveAcc(10, 4, 7) Mul_Acc(5, 6) Mul_Acc(6, 5) Mul_Acc(7, 4) \
-	Mul_SaveAcc(11, 5, 7) Mul_Acc(6, 6) Mul_Acc(7, 5) \
-	Mul_SaveAcc(12, 6, 7) Mul_Acc(7, 6) \
-	Mul_End(13, 7)
-
-#define Mul_16 \
-	Mul_Begin(16) \
-	Mul_SaveAcc(0, 0, 1) Mul_Acc(1, 0) \
-	Mul_SaveAcc(1, 0, 2) Mul_Acc(1, 1) Mul_Acc(2, 0) \
-	Mul_SaveAcc(2, 0, 3) Mul_Acc(1, 2) Mul_Acc(2, 1) Mul_Acc(3, 0) \
-	Mul_SaveAcc(3, 0, 4) Mul_Acc(1, 3) Mul_Acc(2, 2) Mul_Acc(3, 1) Mul_Acc(4, 0) \
-	Mul_SaveAcc(4, 0, 5) Mul_Acc(1, 4) Mul_Acc(2, 3) Mul_Acc(3, 2) Mul_Acc(4, 1) Mul_Acc(5, 0) \
-	Mul_SaveAcc(5, 0, 6) Mul_Acc(1, 5) Mul_Acc(2, 4) Mul_Acc(3, 3) Mul_Acc(4, 2) Mul_Acc(5, 1) Mul_Acc(6, 0) \
-	Mul_SaveAcc(6, 0, 7) Mul_Acc(1, 6) Mul_Acc(2, 5) Mul_Acc(3, 4) Mul_Acc(4, 3) Mul_Acc(5, 2) Mul_Acc(6, 1) Mul_Acc(7, 0) \
-	Mul_SaveAcc(7, 0, 8) Mul_Acc(1, 7) Mul_Acc(2, 6) Mul_Acc(3, 5) Mul_Acc(4, 4) Mul_Acc(5, 3) Mul_Acc(6, 2) Mul_Acc(7, 1) Mul_Acc(8, 0) \
-	Mul_SaveAcc(8, 0, 9) Mul_Acc(1, 8) Mul_Acc(2, 7) Mul_Acc(3, 6) Mul_Acc(4, 5) Mul_Acc(5, 4) Mul_Acc(6, 3) Mul_Acc(7, 2) Mul_Acc(8, 1) Mul_Acc(9, 0) \
-	Mul_SaveAcc(9, 0, 10) Mul_Acc(1, 9) Mul_Acc(2, 8) Mul_Acc(3, 7) Mul_Acc(4, 6) Mul_Acc(5, 5) Mul_Acc(6, 4) Mul_Acc(7, 3) Mul_Acc(8, 2) Mul_Acc(9, 1) Mul_Acc(10, 0) \
-	Mul_SaveAcc(10, 0, 11) Mul_Acc(1, 10) Mul_Acc(2, 9) Mul_Acc(3, 8) Mul_Acc(4, 7) Mul_Acc(5, 6) Mul_Acc(6, 5) Mul_Acc(7, 4) Mul_Acc(8, 3) Mul_Acc(9, 2) Mul_Acc(10, 1) Mul_Acc(11, 0) \
-	Mul_SaveAcc(11, 0, 12) Mul_Acc(1, 11) Mul_Acc(2, 10) Mul_Acc(3, 9) Mul_Acc(4, 8) Mul_Acc(5, 7) Mul_Acc(6, 6) Mul_Acc(7, 5) Mul_Acc(8, 4) Mul_Acc(9, 3) Mul_Acc(10, 2) Mul_Acc(11, 1) Mul_Acc(12, 0) \
-	Mul_SaveAcc(12, 0, 13) Mul_Acc(1, 12) Mul_Acc(2, 11) Mul_Acc(3, 10) Mul_Acc(4, 9) Mul_Acc(5, 8) Mul_Acc(6, 7) Mul_Acc(7, 6) Mul_Acc(8, 5) Mul_Acc(9, 4) Mul_Acc(10, 3) Mul_Acc(11, 2) Mul_Acc(12, 1) Mul_Acc(13, 0) \
-	Mul_SaveAcc(13, 0, 14) Mul_Acc(1, 13) Mul_Acc(2, 12) Mul_Acc(3, 11) Mul_Acc(4, 10) Mul_Acc(5, 9) Mul_Acc(6, 8) Mul_Acc(7, 7) Mul_Acc(8, 6) Mul_Acc(9, 5) Mul_Acc(10, 4) Mul_Acc(11, 3) Mul_Acc(12, 2) Mul_Acc(13, 1) Mul_Acc(14, 0) \
-	Mul_SaveAcc(14, 0, 15) Mul_Acc(1, 14) Mul_Acc(2, 13) Mul_Acc(3, 12) Mul_Acc(4, 11) Mul_Acc(5, 10) Mul_Acc(6, 9) Mul_Acc(7, 8) Mul_Acc(8, 7) Mul_Acc(9, 6) Mul_Acc(10, 5) Mul_Acc(11, 4) Mul_Acc(12, 3) Mul_Acc(13, 2) Mul_Acc(14, 1) Mul_Acc(15, 0) \
-	Mul_SaveAcc(15, 1, 15) Mul_Acc(2, 14) Mul_Acc(3, 13) Mul_Acc(4, 12) Mul_Acc(5, 11) Mul_Acc(6, 10) Mul_Acc(7, 9) Mul_Acc(8, 8) Mul_Acc(9, 7) Mul_Acc(10, 6) Mul_Acc(11, 5) Mul_Acc(12, 4) Mul_Acc(13, 3) Mul_Acc(14, 2) Mul_Acc(15, 1) \
-	Mul_SaveAcc(16, 2, 15) Mul_Acc(3, 14) Mul_Acc(4, 13) Mul_Acc(5, 12) Mul_Acc(6, 11) Mul_Acc(7, 10) Mul_Acc(8, 9) Mul_Acc(9, 8) Mul_Acc(10, 7) Mul_Acc(11, 6) Mul_Acc(12, 5) Mul_Acc(13, 4) Mul_Acc(14, 3) Mul_Acc(15, 2) \
-	Mul_SaveAcc(17, 3, 15) Mul_Acc(4, 14) Mul_Acc(5, 13) Mul_Acc(6, 12) Mul_Acc(7, 11) Mul_Acc(8, 10) Mul_Acc(9, 9) Mul_Acc(10, 8) Mul_Acc(11, 7) Mul_Acc(12, 6) Mul_Acc(13, 5) Mul_Acc(14, 4) Mul_Acc(15, 3) \
-	Mul_SaveAcc(18, 4, 15) Mul_Acc(5, 14) Mul_Acc(6, 13) Mul_Acc(7, 12) Mul_Acc(8, 11) Mul_Acc(9, 10) Mul_Acc(10, 9) Mul_Acc(11, 8) Mul_Acc(12, 7) Mul_Acc(13, 6) Mul_Acc(14, 5) Mul_Acc(15, 4) \
-	Mul_SaveAcc(19, 5, 15) Mul_Acc(6, 14) Mul_Acc(7, 13) Mul_Acc(8, 12) Mul_Acc(9, 11) Mul_Acc(10, 10) Mul_Acc(11, 9) Mul_Acc(12, 8) Mul_Acc(13, 7) Mul_Acc(14, 6) Mul_Acc(15, 5) \
-	Mul_SaveAcc(20, 6, 15) Mul_Acc(7, 14) Mul_Acc(8, 13) Mul_Acc(9, 12) Mul_Acc(10, 11) Mul_Acc(11, 10) Mul_Acc(12, 9) Mul_Acc(13, 8) Mul_Acc(14, 7) Mul_Acc(15, 6) \
-	Mul_SaveAcc(21, 7, 15) Mul_Acc(8, 14) Mul_Acc(9, 13) Mul_Acc(10, 12) Mul_Acc(11, 11) Mul_Acc(12, 10) Mul_Acc(13, 9) Mul_Acc(14, 8) Mul_Acc(15, 7) \
-	Mul_SaveAcc(22, 8, 15) Mul_Acc(9, 14) Mul_Acc(10, 13) Mul_Acc(11, 12) Mul_Acc(12, 11) Mul_Acc(13, 10) Mul_Acc(14, 9) Mul_Acc(15, 8) \
-	Mul_SaveAcc(23, 9, 15) Mul_Acc(10, 14) Mul_Acc(11, 13) Mul_Acc(12, 12) Mul_Acc(13, 11) Mul_Acc(14, 10) Mul_Acc(15, 9) \
-	Mul_SaveAcc(24, 10, 15) Mul_Acc(11, 14) Mul_Acc(12, 13) Mul_Acc(13, 12) Mul_Acc(14, 11) Mul_Acc(15, 10) \
-	Mul_SaveAcc(25, 11, 15) Mul_Acc(12, 14) Mul_Acc(13, 13) Mul_Acc(14, 12) Mul_Acc(15, 11) \
-	Mul_SaveAcc(26, 12, 15) Mul_Acc(13, 14) Mul_Acc(14, 13) Mul_Acc(15, 12) \
-	Mul_SaveAcc(27, 13, 15) Mul_Acc(14, 14) Mul_Acc(15, 13) \
-	Mul_SaveAcc(28, 14, 15) Mul_Acc(15, 14) \
-	Mul_End(29, 15)
-
-#define Squ_2 \
-	Squ_Begin(2) \
-	Squ_End(2)
-
-#define Squ_4 \
-	Squ_Begin(4) \
-	Squ_SaveAcc(1, 0, 2) Squ_Diag(1) \
-	Squ_SaveAcc(2, 0, 3) Squ_Acc(1, 2) Squ_NonDiag \
-	Squ_SaveAcc(3, 1, 3) Squ_Diag(2) \
-	Squ_SaveAcc(4, 2, 3) Squ_NonDiag \
-	Squ_End(4)
-
-#define Squ_8 \
-	Squ_Begin(8) \
-	Squ_SaveAcc(1, 0, 2) Squ_Diag(1) \
-	Squ_SaveAcc(2, 0, 3) Squ_Acc(1, 2) Squ_NonDiag \
-	Squ_SaveAcc(3, 0, 4) Squ_Acc(1, 3) Squ_Diag(2) \
-	Squ_SaveAcc(4, 0, 5) Squ_Acc(1, 4) Squ_Acc(2, 3) Squ_NonDiag \
-	Squ_SaveAcc(5, 0, 6) Squ_Acc(1, 5) Squ_Acc(2, 4) Squ_Diag(3) \
-	Squ_SaveAcc(6, 0, 7) Squ_Acc(1, 6) Squ_Acc(2, 5) Squ_Acc(3, 4) Squ_NonDiag \
-	Squ_SaveAcc(7, 1, 7) Squ_Acc(2, 6) Squ_Acc(3, 5) Squ_Diag(4) \
-	Squ_SaveAcc(8, 2, 7) Squ_Acc(3, 6) Squ_Acc(4, 5)  Squ_NonDiag \
-	Squ_SaveAcc(9, 3, 7) Squ_Acc(4, 6) Squ_Diag(5) \
-	Squ_SaveAcc(10, 4, 7) Squ_Acc(5, 6) Squ_NonDiag \
-	Squ_SaveAcc(11, 5, 7) Squ_Diag(6) \
-	Squ_SaveAcc(12, 6, 7) Squ_NonDiag \
-	Squ_End(8)
-
-#define Squ_16 \
-	Squ_Begin(16) \
-	Squ_SaveAcc(1, 0, 2) Squ_Diag(1) \
-	Squ_SaveAcc(2, 0, 3) Squ_Acc(1, 2) Squ_NonDiag \
-	Squ_SaveAcc(3, 0, 4) Squ_Acc(1, 3) Squ_Diag(2) \
-	Squ_SaveAcc(4, 0, 5) Squ_Acc(1, 4) Squ_Acc(2, 3) Squ_NonDiag \
-	Squ_SaveAcc(5, 0, 6) Squ_Acc(1, 5) Squ_Acc(2, 4) Squ_Diag(3) \
-	Squ_SaveAcc(6, 0, 7) Squ_Acc(1, 6) Squ_Acc(2, 5) Squ_Acc(3, 4) Squ_NonDiag \
-	Squ_SaveAcc(7, 0, 8) Squ_Acc(1, 7) Squ_Acc(2, 6) Squ_Acc(3, 5) Squ_Diag(4) \
-	Squ_SaveAcc(8, 0, 9) Squ_Acc(1, 8) Squ_Acc(2, 7) Squ_Acc(3, 6) Squ_Acc(4, 5) Squ_NonDiag \
-	Squ_SaveAcc(9, 0, 10) Squ_Acc(1, 9) Squ_Acc(2, 8) Squ_Acc(3, 7) Squ_Acc(4, 6) Squ_Diag(5) \
-	Squ_SaveAcc(10, 0, 11) Squ_Acc(1, 10) Squ_Acc(2, 9) Squ_Acc(3, 8) Squ_Acc(4, 7) Squ_Acc(5, 6) Squ_NonDiag \
-	Squ_SaveAcc(11, 0, 12) Squ_Acc(1, 11) Squ_Acc(2, 10) Squ_Acc(3, 9) Squ_Acc(4, 8) Squ_Acc(5, 7) Squ_Diag(6) \
-	Squ_SaveAcc(12, 0, 13) Squ_Acc(1, 12) Squ_Acc(2, 11) Squ_Acc(3, 10) Squ_Acc(4, 9) Squ_Acc(5, 8) Squ_Acc(6, 7) Squ_NonDiag \
-	Squ_SaveAcc(13, 0, 14) Squ_Acc(1, 13) Squ_Acc(2, 12) Squ_Acc(3, 11) Squ_Acc(4, 10) Squ_Acc(5, 9) Squ_Acc(6, 8) Squ_Diag(7) \
-	Squ_SaveAcc(14, 0, 15) Squ_Acc(1, 14) Squ_Acc(2, 13) Squ_Acc(3, 12) Squ_Acc(4, 11) Squ_Acc(5, 10) Squ_Acc(6, 9) Squ_Acc(7, 8) Squ_NonDiag \
-	Squ_SaveAcc(15, 1, 15) Squ_Acc(2, 14) Squ_Acc(3, 13) Squ_Acc(4, 12) Squ_Acc(5, 11) Squ_Acc(6, 10) Squ_Acc(7, 9) Squ_Diag(8) \
-	Squ_SaveAcc(16, 2, 15) Squ_Acc(3, 14) Squ_Acc(4, 13) Squ_Acc(5, 12) Squ_Acc(6, 11) Squ_Acc(7, 10) Squ_Acc(8, 9) Squ_NonDiag \
-	Squ_SaveAcc(17, 3, 15) Squ_Acc(4, 14) Squ_Acc(5, 13) Squ_Acc(6, 12) Squ_Acc(7, 11) Squ_Acc(8, 10) Squ_Diag(9) \
-	Squ_SaveAcc(18, 4, 15) Squ_Acc(5, 14) Squ_Acc(6, 13) Squ_Acc(7, 12) Squ_Acc(8, 11) Squ_Acc(9, 10) Squ_NonDiag \
-	Squ_SaveAcc(19, 5, 15) Squ_Acc(6, 14) Squ_Acc(7, 13) Squ_Acc(8, 12) Squ_Acc(9, 11) Squ_Diag(10) \
-	Squ_SaveAcc(20, 6, 15) Squ_Acc(7, 14) Squ_Acc(8, 13) Squ_Acc(9, 12) Squ_Acc(10, 11) Squ_NonDiag \
-	Squ_SaveAcc(21, 7, 15) Squ_Acc(8, 14) Squ_Acc(9, 13) Squ_Acc(10, 12) Squ_Diag(11) \
-	Squ_SaveAcc(22, 8, 15) Squ_Acc(9, 14) Squ_Acc(10, 13) Squ_Acc(11, 12) Squ_NonDiag \
-	Squ_SaveAcc(23, 9, 15) Squ_Acc(10, 14) Squ_Acc(11, 13) Squ_Diag(12) \
-	Squ_SaveAcc(24, 10, 15) Squ_Acc(11, 14) Squ_Acc(12, 13) Squ_NonDiag \
-	Squ_SaveAcc(25, 11, 15) Squ_Acc(12, 14) Squ_Diag(13) \
-	Squ_SaveAcc(26, 12, 15) Squ_Acc(13, 14) Squ_NonDiag \
-	Squ_SaveAcc(27, 13, 15) Squ_Diag(14) \
-	Squ_SaveAcc(28, 14, 15) Squ_NonDiag \
-	Squ_End(16)
-
-#define Bot_2 \
-	Mul_Begin(2) \
-	Bot_SaveAcc(0, 0, 1) Bot_Acc(1, 0) \
-	Bot_End(2)
-
-#define Bot_4 \
-	Mul_Begin(4) \
-	Mul_SaveAcc(0, 0, 1) Mul_Acc(1, 0) \
-	Mul_SaveAcc(1, 2, 0) Mul_Acc(1, 1) Mul_Acc(0, 2)  \
-	Bot_SaveAcc(2, 0, 3) Bot_Acc(1, 2) Bot_Acc(2, 1) Bot_Acc(3, 0)  \
-	Bot_End(4)
-
-#define Bot_8 \
-	Mul_Begin(8) \
-	Mul_SaveAcc(0, 0, 1) Mul_Acc(1, 0) \
-	Mul_SaveAcc(1, 0, 2) Mul_Acc(1, 1) Mul_Acc(2, 0)  \
-	Mul_SaveAcc(2, 0, 3) Mul_Acc(1, 2) Mul_Acc(2, 1) Mul_Acc(3, 0)  \
-	Mul_SaveAcc(3, 0, 4) Mul_Acc(1, 3) Mul_Acc(2, 2) Mul_Acc(3, 1) Mul_Acc(4, 0) \
-	Mul_SaveAcc(4, 0, 5) Mul_Acc(1, 4) Mul_Acc(2, 3) Mul_Acc(3, 2) Mul_Acc(4, 1) Mul_Acc(5, 0) \
-	Mul_SaveAcc(5, 0, 6) Mul_Acc(1, 5) Mul_Acc(2, 4) Mul_Acc(3, 3) Mul_Acc(4, 2) Mul_Acc(5, 1) Mul_Acc(6, 0) \
-	Bot_SaveAcc(6, 0, 7) Bot_Acc(1, 6) Bot_Acc(2, 5) Bot_Acc(3, 4) Bot_Acc(4, 3) Bot_Acc(5, 2) Bot_Acc(6, 1) Bot_Acc(7, 0) \
-	Bot_End(8)
-
-#define Bot_16 \
-	Mul_Begin(16) \
-	Mul_SaveAcc(0, 0, 1) Mul_Acc(1, 0) \
-	Mul_SaveAcc(1, 0, 2) Mul_Acc(1, 1) Mul_Acc(2, 0) \
-	Mul_SaveAcc(2, 0, 3) Mul_Acc(1, 2) Mul_Acc(2, 1) Mul_Acc(3, 0) \
-	Mul_SaveAcc(3, 0, 4) Mul_Acc(1, 3) Mul_Acc(2, 2) Mul_Acc(3, 1) Mul_Acc(4, 0) \
-	Mul_SaveAcc(4, 0, 5) Mul_Acc(1, 4) Mul_Acc(2, 3) Mul_Acc(3, 2) Mul_Acc(4, 1) Mul_Acc(5, 0) \
-	Mul_SaveAcc(5, 0, 6) Mul_Acc(1, 5) Mul_Acc(2, 4) Mul_Acc(3, 3) Mul_Acc(4, 2) Mul_Acc(5, 1) Mul_Acc(6, 0) \
-	Mul_SaveAcc(6, 0, 7) Mul_Acc(1, 6) Mul_Acc(2, 5) Mul_Acc(3, 4) Mul_Acc(4, 3) Mul_Acc(5, 2) Mul_Acc(6, 1) Mul_Acc(7, 0) \
-	Mul_SaveAcc(7, 0, 8) Mul_Acc(1, 7) Mul_Acc(2, 6) Mul_Acc(3, 5) Mul_Acc(4, 4) Mul_Acc(5, 3) Mul_Acc(6, 2) Mul_Acc(7, 1) Mul_Acc(8, 0) \
-	Mul_SaveAcc(8, 0, 9) Mul_Acc(1, 8) Mul_Acc(2, 7) Mul_Acc(3, 6) Mul_Acc(4, 5) Mul_Acc(5, 4) Mul_Acc(6, 3) Mul_Acc(7, 2) Mul_Acc(8, 1) Mul_Acc(9, 0) \
-	Mul_SaveAcc(9, 0, 10) Mul_Acc(1, 9) Mul_Acc(2, 8) Mul_Acc(3, 7) Mul_Acc(4, 6) Mul_Acc(5, 5) Mul_Acc(6, 4) Mul_Acc(7, 3) Mul_Acc(8, 2) Mul_Acc(9, 1) Mul_Acc(10, 0) \
-	Mul_SaveAcc(10, 0, 11) Mul_Acc(1, 10) Mul_Acc(2, 9) Mul_Acc(3, 8) Mul_Acc(4, 7) Mul_Acc(5, 6) Mul_Acc(6, 5) Mul_Acc(7, 4) Mul_Acc(8, 3) Mul_Acc(9, 2) Mul_Acc(10, 1) Mul_Acc(11, 0) \
-	Mul_SaveAcc(11, 0, 12) Mul_Acc(1, 11) Mul_Acc(2, 10) Mul_Acc(3, 9) Mul_Acc(4, 8) Mul_Acc(5, 7) Mul_Acc(6, 6) Mul_Acc(7, 5) Mul_Acc(8, 4) Mul_Acc(9, 3) Mul_Acc(10, 2) Mul_Acc(11, 1) Mul_Acc(12, 0) \
-	Mul_SaveAcc(12, 0, 13) Mul_Acc(1, 12) Mul_Acc(2, 11) Mul_Acc(3, 10) Mul_Acc(4, 9) Mul_Acc(5, 8) Mul_Acc(6, 7) Mul_Acc(7, 6) Mul_Acc(8, 5) Mul_Acc(9, 4) Mul_Acc(10, 3) Mul_Acc(11, 2) Mul_Acc(12, 1) Mul_Acc(13, 0) \
-	Mul_SaveAcc(13, 0, 14) Mul_Acc(1, 13) Mul_Acc(2, 12) Mul_Acc(3, 11) Mul_Acc(4, 10) Mul_Acc(5, 9) Mul_Acc(6, 8) Mul_Acc(7, 7) Mul_Acc(8, 6) Mul_Acc(9, 5) Mul_Acc(10, 4) Mul_Acc(11, 3) Mul_Acc(12, 2) Mul_Acc(13, 1) Mul_Acc(14, 0) \
-	Bot_SaveAcc(14, 0, 15) Bot_Acc(1, 14) Bot_Acc(2, 13) Bot_Acc(3, 12) Bot_Acc(4, 11) Bot_Acc(5, 10) Bot_Acc(6, 9) Bot_Acc(7, 8) Bot_Acc(8, 7) Bot_Acc(9, 6) Bot_Acc(10, 5) Bot_Acc(11, 4) Bot_Acc(12, 3) Bot_Acc(13, 2) Bot_Acc(14, 1) Bot_Acc(15, 0) \
-	Bot_End(16)
-
-#endif
-
-#if 0
-#define Mul_Begin(n)				\
-	Declare2Words(p)				\
-	Declare2Words(c)				\
-	Declare2Words(d)				\
-	MultiplyWords(p, A[0], B[0])	\
-	AssignWord(c, LowWord(p))		\
-	AssignWord(d, HighWord(p))
-
-#define Mul_Acc(i, j)				\
-	MultiplyWords(p, A[i], B[j])	\
-	Acc2WordsBy1(c, LowWord(p))		\
-	Acc2WordsBy1(d, HighWord(p))
-
-#define Mul_SaveAcc(k, i, j) 		\
-	R[k] = LowWord(c);				\
-	Add2WordsBy1(c, d, HighWord(c))	\
-	MultiplyWords(p, A[i], B[j])	\
-	AssignWord(d, HighWord(p))		\
-	Acc2WordsBy1(c, LowWord(p))
-
-#define Mul_End(n)					\
-	R[2*n-3] = LowWord(c);			\
-	Acc2WordsBy1(d, HighWord(c))	\
-	MultiplyWords(p, A[n-1], B[n-1])\
-	Acc2WordsBy2(d, p)				\
-	R[2*n-2] = LowWord(d);			\
-	R[2*n-1] = HighWord(d);
-
-#define Bot_SaveAcc(k, i, j)		\
-	R[k] = LowWord(c);				\
-	word e = LowWord(d) + HighWord(c);	\
-	e += A[i] * B[j];
-
-#define Bot_Acc(i, j)	\
-	e += A[i] * B[j];
-
-#define Bot_End(n)		\
-	R[n-1] = e;
-#else
-#define Mul_Begin(n)				\
-	Declare2Words(p)				\
-	word c;	\
-	Declare2Words(d)				\
-	MultiplyWords(p, A[0], B[0])	\
-	c = LowWord(p);		\
-	AssignWord(d, HighWord(p))
-
-#define Mul_Acc(i, j)				\
-	MulAcc(c, d, A[i], B[j])
-
-#define Mul_SaveAcc(k, i, j) 		\
-	R[k] = c;				\
-	c = LowWord(d);	\
-	AssignWord(d, HighWord(d))	\
-	MulAcc(c, d, A[i], B[j])
-
-#define Mul_End(k, i)					\
-	R[k] = c;			\
-	MultiplyWords(p, A[i], B[i])	\
-	Acc2WordsBy2(p, d)				\
-	R[k+1] = LowWord(p);			\
-	R[k+2] = HighWord(p);
-
-#define Bot_SaveAcc(k, i, j)		\
-	R[k] = c;				\
-	c = LowWord(d);	\
-	c += A[i] * B[j];
-
-#define Bot_Acc(i, j)	\
-	c += A[i] * B[j];
-
-#define Bot_End(n)		\
-	R[n-1] = c;
-#endif
-
-#define Squ_Begin(n)				\
-	Declare2Words(p)				\
-	word c;				\
-	Declare2Words(d)				\
-	Declare2Words(e)				\
-	MultiplyWords(p, A[0], A[0])	\
-	R[0] = LowWord(p);				\
-	AssignWord(e, HighWord(p))		\
-	MultiplyWords(p, A[0], A[1])	\
-	c = LowWord(p);		\
-	AssignWord(d, HighWord(p))		\
-	Squ_NonDiag						\
-
-#define Squ_NonDiag				\
-	Double3Words(c, d)
-
-#define Squ_SaveAcc(k, i, j) 		\
-	Acc3WordsBy2(c, d, e)			\
-	R[k] = c;				\
-	MultiplyWords(p, A[i], A[j])	\
-	c = LowWord(p);		\
-	AssignWord(d, HighWord(p))		\
-
-#define Squ_Acc(i, j)				\
-	MulAcc(c, d, A[i], A[j])
-
-#define Squ_Diag(i)					\
-	Squ_NonDiag						\
-	MulAcc(c, d, A[i], A[i])
-
-#define Squ_End(n)					\
-	Acc3WordsBy2(c, d, e)			\
-	R[2*n-3] = c;			\
-	MultiplyWords(p, A[n-1], A[n-1])\
-	Acc2WordsBy2(p, e)				\
-	R[2*n-2] = LowWord(p);			\
-	R[2*n-1] = HighWord(p);
-
-
-void Baseline_Multiply2(word *R, const word *AA, const word *BB)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Mul_2
-}
-
-void Baseline_Multiply4(word *R, const word *AA, const word *BB)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Mul_4
-}
-
-void Baseline_Multiply8(word *R, const word *AA, const word *BB)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Mul_8
-}
-
-void Baseline_Square2(word *R, const word *AA)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-
-	Squ_2
-}
-
-void Baseline_Square4(word *R, const word *AA)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-
-	Squ_4
-}
-
-void Baseline_Square8(word *R, const word *AA)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-
-	Squ_8
-}
-
-void Baseline_MultiplyBottom2(word *R, const word *AA, const word *BB)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Bot_2
-}
-
-void Baseline_MultiplyBottom4(word *R, const word *AA, const word *BB)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Bot_4
-}
-
-void Baseline_MultiplyBottom8(word *R, const word *AA, const word *BB)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Bot_8
-}
-
-#define Top_Begin(n)				\
-	Declare2Words(p)				\
-	word c;	\
-	Declare2Words(d)				\
-	MultiplyWords(p, A[0], B[n-2]);\
-	AssignWord(d, HighWord(p));
-
-#define Top_Acc(i, j)	\
-	MultiplyWords(p, A[i], B[j]);\
-	Acc2WordsBy1(d, HighWord(p));
-
-#define Top_SaveAcc0(i, j) 		\
-	c = LowWord(d);	\
-	AssignWord(d, HighWord(d))	\
-	MulAcc(c, d, A[i], B[j])
-
-#define Top_SaveAcc1(i, j) 		\
-	c = L<c; \
-	Acc2WordsBy1(d, c);	\
-	c = LowWord(d);	\
-	AssignWord(d, HighWord(d))	\
-	MulAcc(c, d, A[i], B[j])
-
-void Baseline_MultiplyTop2(word *R, const word *A, const word *B, word L)
-{
-	CRYPTOPP_UNUSED(L);
-	word T[4];
-	Baseline_Multiply2(T, A, B);
-	R[0] = T[2];
-	R[1] = T[3];
-}
-
-void Baseline_MultiplyTop4(word *R, const word *AA, const word *BB, word L)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Top_Begin(4)
-	Top_Acc(1, 1) Top_Acc(2, 0)  \
-	Top_SaveAcc0(0, 3) Mul_Acc(1, 2) Mul_Acc(2, 1) Mul_Acc(3, 0)  \
-	Top_SaveAcc1(1, 3) Mul_Acc(2, 2) Mul_Acc(3, 1)  \
-	Mul_SaveAcc(0, 2, 3) Mul_Acc(3, 2) \
-	Mul_End(1, 3)
-}
-
-void Baseline_MultiplyTop8(word *R, const word *AA, const word *BB, word L)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Top_Begin(8)
-	Top_Acc(1, 5) Top_Acc(2, 4) Top_Acc(3, 3) Top_Acc(4, 2) Top_Acc(5, 1) Top_Acc(6, 0) \
-	Top_SaveAcc0(0, 7) Mul_Acc(1, 6) Mul_Acc(2, 5) Mul_Acc(3, 4) Mul_Acc(4, 3) Mul_Acc(5, 2) Mul_Acc(6, 1) Mul_Acc(7, 0) \
-	Top_SaveAcc1(1, 7) Mul_Acc(2, 6) Mul_Acc(3, 5) Mul_Acc(4, 4) Mul_Acc(5, 3) Mul_Acc(6, 2) Mul_Acc(7, 1) \
-	Mul_SaveAcc(0, 2, 7) Mul_Acc(3, 6) Mul_Acc(4, 5) Mul_Acc(5, 4) Mul_Acc(6, 3) Mul_Acc(7, 2) \
-	Mul_SaveAcc(1, 3, 7) Mul_Acc(4, 6) Mul_Acc(5, 5) Mul_Acc(6, 4) Mul_Acc(7, 3) \
-	Mul_SaveAcc(2, 4, 7) Mul_Acc(5, 6) Mul_Acc(6, 5) Mul_Acc(7, 4) \
-	Mul_SaveAcc(3, 5, 7) Mul_Acc(6, 6) Mul_Acc(7, 5) \
-	Mul_SaveAcc(4, 6, 7) Mul_Acc(7, 6) \
-	Mul_End(5, 7)
-}
-
-#if !CRYPTOPP_INTEGER_SSE2	// save memory by not compiling these functions when SSE2 is available
-void Baseline_Multiply16(word *R, const word *AA, const word *BB)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Mul_16
-}
-
-void Baseline_Square16(word *R, const word *AA)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-
-	Squ_16
-}
-
-void Baseline_MultiplyBottom16(word *R, const word *AA, const word *BB)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Bot_16
-}
-
-void Baseline_MultiplyTop16(word *R, const word *AA, const word *BB, word L)
-{
-	// http://github.com/weidai11/cryptopp/issues/188
-	MAYBE_CONST word* A = MAYBE_UNCONST_CAST(AA);
-	MAYBE_CONST word* B = MAYBE_UNCONST_CAST(BB);
-
-	Top_Begin(16)
-	Top_Acc(1, 13) Top_Acc(2, 12) Top_Acc(3, 11) Top_Acc(4, 10) Top_Acc(5, 9) Top_Acc(6, 8) Top_Acc(7, 7) Top_Acc(8, 6) Top_Acc(9, 5) Top_Acc(10, 4) Top_Acc(11, 3) Top_Acc(12, 2) Top_Acc(13, 1) Top_Acc(14, 0) \
-	Top_SaveAcc0(0, 15) Mul_Acc(1, 14) Mul_Acc(2, 13) Mul_Acc(3, 12) Mul_Acc(4, 11) Mul_Acc(5, 10) Mul_Acc(6, 9) Mul_Acc(7, 8) Mul_Acc(8, 7) Mul_Acc(9, 6) Mul_Acc(10, 5) Mul_Acc(11, 4) Mul_Acc(12, 3) Mul_Acc(13, 2) Mul_Acc(14, 1) Mul_Acc(15, 0) \
-	Top_SaveAcc1(1, 15) Mul_Acc(2, 14) Mul_Acc(3, 13) Mul_Acc(4, 12) Mul_Acc(5, 11) Mul_Acc(6, 10) Mul_Acc(7, 9) Mul_Acc(8, 8) Mul_Acc(9, 7) Mul_Acc(10, 6) Mul_Acc(11, 5) Mul_Acc(12, 4) Mul_Acc(13, 3) Mul_Acc(14, 2) Mul_Acc(15, 1) \
-	Mul_SaveAcc(0, 2, 15) Mul_Acc(3, 14) Mul_Acc(4, 13) Mul_Acc(5, 12) Mul_Acc(6, 11) Mul_Acc(7, 10) Mul_Acc(8, 9) Mul_Acc(9, 8) Mul_Acc(10, 7) Mul_Acc(11, 6) Mul_Acc(12, 5) Mul_Acc(13, 4) Mul_Acc(14, 3) Mul_Acc(15, 2) \
-	Mul_SaveAcc(1, 3, 15) Mul_Acc(4, 14) Mul_Acc(5, 13) Mul_Acc(6, 12) Mul_Acc(7, 11) Mul_Acc(8, 10) Mul_Acc(9, 9) Mul_Acc(10, 8) Mul_Acc(11, 7) Mul_Acc(12, 6) Mul_Acc(13, 5) Mul_Acc(14, 4) Mul_Acc(15, 3) \
-	Mul_SaveAcc(2, 4, 15) Mul_Acc(5, 14) Mul_Acc(6, 13) Mul_Acc(7, 12) Mul_Acc(8, 11) Mul_Acc(9, 10) Mul_Acc(10, 9) Mul_Acc(11, 8) Mul_Acc(12, 7) Mul_Acc(13, 6) Mul_Acc(14, 5) Mul_Acc(15, 4) \
-	Mul_SaveAcc(3, 5, 15) Mul_Acc(6, 14) Mul_Acc(7, 13) Mul_Acc(8, 12) Mul_Acc(9, 11) Mul_Acc(10, 10) Mul_Acc(11, 9) Mul_Acc(12, 8) Mul_Acc(13, 7) Mul_Acc(14, 6) Mul_Acc(15, 5) \
-	Mul_SaveAcc(4, 6, 15) Mul_Acc(7, 14) Mul_Acc(8, 13) Mul_Acc(9, 12) Mul_Acc(10, 11) Mul_Acc(11, 10) Mul_Acc(12, 9) Mul_Acc(13, 8) Mul_Acc(14, 7) Mul_Acc(15, 6) \
-	Mul_SaveAcc(5, 7, 15) Mul_Acc(8, 14) Mul_Acc(9, 13) Mul_Acc(10, 12) Mul_Acc(11, 11) Mul_Acc(12, 10) Mul_Acc(13, 9) Mul_Acc(14, 8) Mul_Acc(15, 7) \
-	Mul_SaveAcc(6, 8, 15) Mul_Acc(9, 14) Mul_Acc(10, 13) Mul_Acc(11, 12) Mul_Acc(12, 11) Mul_Acc(13, 10) Mul_Acc(14, 9) Mul_Acc(15, 8) \
-	Mul_SaveAcc(7, 9, 15) Mul_Acc(10, 14) Mul_Acc(11, 13) Mul_Acc(12, 12) Mul_Acc(13, 11) Mul_Acc(14, 10) Mul_Acc(15, 9) \
-	Mul_SaveAcc(8, 10, 15) Mul_Acc(11, 14) Mul_Acc(12, 13) Mul_Acc(13, 12) Mul_Acc(14, 11) Mul_Acc(15, 10) \
-	Mul_SaveAcc(9, 11, 15) Mul_Acc(12, 14) Mul_Acc(13, 13) Mul_Acc(14, 12) Mul_Acc(15, 11) \
-	Mul_SaveAcc(10, 12, 15) Mul_Acc(13, 14) Mul_Acc(14, 13) Mul_Acc(15, 12) \
-	Mul_SaveAcc(11, 13, 15) Mul_Acc(14, 14) Mul_Acc(15, 13) \
-	Mul_SaveAcc(12, 14, 15) Mul_Acc(15, 14) \
-	Mul_End(13, 15)
-}
-#endif
-
-// ********************************************************
-
-#if CRYPTOPP_INTEGER_SSE2
-
-CRYPTOPP_ALIGN_DATA(16) static const word32 s_maskLow16[4] CRYPTOPP_SECTION_ALIGN16 = {0xffff,0xffff,0xffff,0xffff};
-
-#undef Mul_Begin
-#undef Mul_Acc
-#undef Top_Begin
-#undef Top_Acc
-#undef Squ_Acc
-#undef Squ_NonDiag
-#undef Squ_Diag
-#undef Squ_SaveAcc
-#undef Squ_Begin
-#undef Mul_SaveAcc
-#undef Bot_Acc
-#undef Bot_SaveAcc
-#undef Bot_End
-#undef Squ_End
-#undef Mul_End
-
-#define SSE2_FinalSave(k)			\
-	AS2(	psllq		xmm5, 16)	\
-	AS2(	paddq		xmm4, xmm5)	\
-	AS2(	movq		QWORD PTR [ecx+8*(k)], xmm4)
-
-#define SSE2_SaveShift(k)			\
-	AS2(	movq		xmm0, xmm6)	\
-	AS2(	punpckhqdq	xmm6, xmm0)	\
-	AS2(	movq		xmm1, xmm7)	\
-	AS2(	punpckhqdq	xmm7, xmm1)	\
-	AS2(	paddd		xmm6, xmm0)	\
-	AS2(	pslldq		xmm6, 4)	\
-	AS2(	paddd		xmm7, xmm1)	\
-	AS2(	paddd		xmm4, xmm6)	\
-	AS2(	pslldq		xmm7, 4)	\
-	AS2(	movq		xmm6, xmm4)	\
-	AS2(	paddd		xmm5, xmm7)	\
-	AS2(	movq		xmm7, xmm5)	\
-	AS2(	movd		DWORD PTR [ecx+8*(k)], xmm4)	\
-	AS2(	psrlq		xmm6, 16)	\
-	AS2(	paddq		xmm6, xmm7)	\
-	AS2(	punpckhqdq	xmm4, xmm0)	\
-	AS2(	punpckhqdq	xmm5, xmm0)	\
-	AS2(	movq		QWORD PTR [ecx+8*(k)+2], xmm6)	\
-	AS2(	psrlq		xmm6, 3*16)	\
-	AS2(	paddd		xmm4, xmm6)	\
-
-#define Squ_SSE2_SaveShift(k)			\
-	AS2(	movq		xmm0, xmm6)	\
-	AS2(	punpckhqdq	xmm6, xmm0)	\
-	AS2(	movq		xmm1, xmm7)	\
-	AS2(	punpckhqdq	xmm7, xmm1)	\
-	AS2(	paddd		xmm6, xmm0)	\
-	AS2(	pslldq		xmm6, 4)	\
-	AS2(	paddd		xmm7, xmm1)	\
-	AS2(	paddd		xmm4, xmm6)	\
-	AS2(	pslldq		xmm7, 4)	\
-	AS2(	movhlps		xmm6, xmm4)	\
-	AS2(	movd		DWORD PTR [ecx+8*(k)], xmm4)	\
-	AS2(	paddd		xmm5, xmm7)	\
-	AS2(	movhps		QWORD PTR [esp+12], xmm5)\
-	AS2(	psrlq		xmm4, 16)	\
-	AS2(	paddq		xmm4, xmm5)	\
-	AS2(	movq		QWORD PTR [ecx+8*(k)+2], xmm4)	\
-	AS2(	psrlq		xmm4, 3*16)	\
-	AS2(	paddd		xmm4, xmm6)	\
-	AS2(	movq		QWORD PTR [esp+4], xmm4)\
-
-#define SSE2_FirstMultiply(i)				\
-	AS2(	movdqa		xmm7, [esi+(i)*16])\
-	AS2(	movdqa		xmm5, [edi-(i)*16])\
-	AS2(	pmuludq		xmm5, xmm7)		\
-	AS2(	movdqa		xmm4, [ebx])\
-	AS2(	movdqa		xmm6, xmm4)		\
-	AS2(	pand		xmm4, xmm5)		\
-	AS2(	psrld		xmm5, 16)		\
-	AS2(	pmuludq		xmm7, [edx-(i)*16])\
-	AS2(	pand		xmm6, xmm7)		\
-	AS2(	psrld		xmm7, 16)
-
-#define Squ_Begin(n)							\
-	SquPrologue									\
-	AS2(	mov		esi, esp)\
-	AS2(	and		esp, 0xfffffff0)\
-	AS2(	lea		edi, [esp-32*n])\
-	AS2(	sub		esp, 32*n+16)\
-	AS1(	push	esi)\
-	AS2(	mov		esi, edi)					\
-	AS2(	xor		edx, edx)					\
-	ASL(1)										\
-	ASS(	pshufd	xmm0, [eax+edx], 3,1,2,0)	\
-	ASS(	pshufd	xmm1, [eax+edx], 2,0,3,1)	\
-	AS2(	movdqa	[edi+2*edx], xmm0)		\
-	AS2(	psrlq	xmm0, 32)					\
-	AS2(	movdqa	[edi+2*edx+16], xmm0)	\
-	AS2(	movdqa	[edi+16*n+2*edx], xmm1)		\
-	AS2(	psrlq	xmm1, 32)					\
-	AS2(	movdqa	[edi+16*n+2*edx+16], xmm1)	\
-	AS2(	add		edx, 16)					\
-	AS2(	cmp		edx, 8*(n))					\
-	ASJ(	jne,	1, b)						\
-	AS2(	lea		edx, [edi+16*n])\
-	SSE2_FirstMultiply(0)							\
-
-#define Squ_Acc(i)								\
-	ASL(LSqu##i)								\
-	AS2(	movdqa		xmm1, [esi+(i)*16])	\
-	AS2(	movdqa		xmm0, [edi-(i)*16])	\
-	AS2(	movdqa		xmm2, [ebx])	\
-	AS2(	pmuludq		xmm0, xmm1)				\
-	AS2(	pmuludq		xmm1, [edx-(i)*16])	\
-	AS2(	movdqa		xmm3, xmm2)			\
-	AS2(	pand		xmm2, xmm0)			\
-	AS2(	psrld		xmm0, 16)			\
-	AS2(	paddd		xmm4, xmm2)			\
-	AS2(	paddd		xmm5, xmm0)			\
-	AS2(	pand		xmm3, xmm1)			\
-	AS2(	psrld		xmm1, 16)			\
-	AS2(	paddd		xmm6, xmm3)			\
-	AS2(	paddd		xmm7, xmm1)		\
-
-#define Squ_Acc1(i)
-#define Squ_Acc2(i)		ASC(call, LSqu##i)
-#define Squ_Acc3(i)		Squ_Acc2(i)
-#define Squ_Acc4(i)		Squ_Acc2(i)
-#define Squ_Acc5(i)		Squ_Acc2(i)
-#define Squ_Acc6(i)		Squ_Acc2(i)
-#define Squ_Acc7(i)		Squ_Acc2(i)
-#define Squ_Acc8(i)		Squ_Acc2(i)
-
-#define SSE2_End(E, n)					\
-	SSE2_SaveShift(2*(n)-3)			\
-	AS2(	movdqa		xmm7, [esi+16])	\
-	AS2(	movdqa		xmm0, [edi])	\
-	AS2(	pmuludq		xmm0, xmm7)				\
-	AS2(	movdqa		xmm2, [ebx])		\
-	AS2(	pmuludq		xmm7, [edx])	\
-	AS2(	movdqa		xmm6, xmm2)				\
-	AS2(	pand		xmm2, xmm0)				\
-	AS2(	psrld		xmm0, 16)				\
-	AS2(	paddd		xmm4, xmm2)				\
-	AS2(	paddd		xmm5, xmm0)				\
-	AS2(	pand		xmm6, xmm7)				\
-	AS2(	psrld		xmm7, 16)	\
-	SSE2_SaveShift(2*(n)-2)			\
-	SSE2_FinalSave(2*(n)-1)			\
-	AS1(	pop		esp)\
-	E
-
-#define Squ_End(n)		SSE2_End(SquEpilogue, n)
-#define Mul_End(n)		SSE2_End(MulEpilogue, n)
-#define Top_End(n)		SSE2_End(TopEpilogue, n)
-
-#define Squ_Column1(k, i)	\
-	Squ_SSE2_SaveShift(k)					\
-	AS2(	add			esi, 16)	\
-	SSE2_FirstMultiply(1)\
-	Squ_Acc##i(i)	\
-	AS2(	paddd		xmm4, xmm4)		\
-	AS2(	paddd		xmm5, xmm5)		\
-	AS2(	movdqa		xmm3, [esi])				\
-	AS2(	movq		xmm1, QWORD PTR [esi+8])	\
-	AS2(	pmuludq		xmm1, xmm3)		\
-	AS2(	pmuludq		xmm3, xmm3)		\
-	AS2(	movdqa		xmm0, [ebx])\
-	AS2(	movdqa		xmm2, xmm0)		\
-	AS2(	pand		xmm0, xmm1)		\
-	AS2(	psrld		xmm1, 16)		\
-	AS2(	paddd		xmm6, xmm0)		\
-	AS2(	paddd		xmm7, xmm1)		\
-	AS2(	pand		xmm2, xmm3)		\
-	AS2(	psrld		xmm3, 16)		\
-	AS2(	paddd		xmm6, xmm6)		\
-	AS2(	paddd		xmm7, xmm7)		\
-	AS2(	paddd		xmm4, xmm2)		\
-	AS2(	paddd		xmm5, xmm3)		\
-	AS2(	movq		xmm0, QWORD PTR [esp+4])\
-	AS2(	movq		xmm1, QWORD PTR [esp+12])\
-	AS2(	paddd		xmm4, xmm0)\
-	AS2(	paddd		xmm5, xmm1)\
-
-#define Squ_Column0(k, i)	\
-	Squ_SSE2_SaveShift(k)					\
-	AS2(	add			edi, 16)	\
-	AS2(	add			edx, 16)	\
-	SSE2_FirstMultiply(1)\
-	Squ_Acc##i(i)	\
-	AS2(	paddd		xmm6, xmm6)		\
-	AS2(	paddd		xmm7, xmm7)		\
-	AS2(	paddd		xmm4, xmm4)		\
-	AS2(	paddd		xmm5, xmm5)		\
-	AS2(	movq		xmm0, QWORD PTR [esp+4])\
-	AS2(	movq		xmm1, QWORD PTR [esp+12])\
-	AS2(	paddd		xmm4, xmm0)\
-	AS2(	paddd		xmm5, xmm1)\
-
-#define SSE2_MulAdd45						\
-	AS2(	movdqa		xmm7, [esi])	\
-	AS2(	movdqa		xmm0, [edi])	\
-	AS2(	pmuludq		xmm0, xmm7)				\
-	AS2(	movdqa		xmm2, [ebx])		\
-	AS2(	pmuludq		xmm7, [edx])	\
-	AS2(	movdqa		xmm6, xmm2)				\
-	AS2(	pand		xmm2, xmm0)				\
-	AS2(	psrld		xmm0, 16)				\
-	AS2(	paddd		xmm4, xmm2)				\
-	AS2(	paddd		xmm5, xmm0)				\
-	AS2(	pand		xmm6, xmm7)				\
-	AS2(	psrld		xmm7, 16)
-
-#define Mul_Begin(n)							\
-	MulPrologue									\
-	AS2(	mov		esi, esp)\
-	AS2(	and		esp, 0xfffffff0)\
-	AS2(	sub		esp, 48*n+16)\
-	AS1(	push	esi)\
-	AS2(	xor		edx, edx)					\
-	ASL(1)										\
-	ASS(	pshufd	xmm0, [eax+edx], 3,1,2,0)	\
-	ASS(	pshufd	xmm1, [eax+edx], 2,0,3,1)	\
-	ASS(	pshufd	xmm2, [edi+edx], 3,1,2,0)	\
-	AS2(	movdqa	[esp+20+2*edx], xmm0)		\
-	AS2(	psrlq	xmm0, 32)					\
-	AS2(	movdqa	[esp+20+2*edx+16], xmm0)	\
-	AS2(	movdqa	[esp+20+16*n+2*edx], xmm1)		\
-	AS2(	psrlq	xmm1, 32)					\
-	AS2(	movdqa	[esp+20+16*n+2*edx+16], xmm1)	\
-	AS2(	movdqa	[esp+20+32*n+2*edx], xmm2)		\
-	AS2(	psrlq	xmm2, 32)					\
-	AS2(	movdqa	[esp+20+32*n+2*edx+16], xmm2)	\
-	AS2(	add		edx, 16)					\
-	AS2(	cmp		edx, 8*(n))					\
-	ASJ(	jne,	1, b)						\
-	AS2(	lea		edi, [esp+20])\
-	AS2(	lea		edx, [esp+20+16*n])\
-	AS2(	lea		esi, [esp+20+32*n])\
-	SSE2_FirstMultiply(0)							\
-
-#define Mul_Acc(i)								\
-	ASL(LMul##i)										\
-	AS2(	movdqa		xmm1, [esi+i/2*(1-(i-2*(i/2))*2)*16])	\
-	AS2(	movdqa		xmm0, [edi-i/2*(1-(i-2*(i/2))*2)*16])	\
-	AS2(	movdqa		xmm2, [ebx])	\
-	AS2(	pmuludq		xmm0, xmm1)				\
-	AS2(	pmuludq		xmm1, [edx-i/2*(1-(i-2*(i/2))*2)*16])	\
-	AS2(	movdqa		xmm3, xmm2)			\
-	AS2(	pand		xmm2, xmm0)			\
-	AS2(	psrld		xmm0, 16)			\
-	AS2(	paddd		xmm4, xmm2)			\
-	AS2(	paddd		xmm5, xmm0)			\
-	AS2(	pand		xmm3, xmm1)			\
-	AS2(	psrld		xmm1, 16)			\
-	AS2(	paddd		xmm6, xmm3)			\
-	AS2(	paddd		xmm7, xmm1)		\
-
-#define Mul_Acc1(i)
-#define Mul_Acc2(i)		ASC(call, LMul##i)
-#define Mul_Acc3(i)		Mul_Acc2(i)
-#define Mul_Acc4(i)		Mul_Acc2(i)
-#define Mul_Acc5(i)		Mul_Acc2(i)
-#define Mul_Acc6(i)		Mul_Acc2(i)
-#define Mul_Acc7(i)		Mul_Acc2(i)
-#define Mul_Acc8(i)		Mul_Acc2(i)
-#define Mul_Acc9(i)		Mul_Acc2(i)
-#define Mul_Acc10(i)	Mul_Acc2(i)
-#define Mul_Acc11(i)	Mul_Acc2(i)
-#define Mul_Acc12(i)	Mul_Acc2(i)
-#define Mul_Acc13(i)	Mul_Acc2(i)
-#define Mul_Acc14(i)	Mul_Acc2(i)
-#define Mul_Acc15(i)	Mul_Acc2(i)
-#define Mul_Acc16(i)	Mul_Acc2(i)
-
-#define Mul_Column1(k, i)	\
-	SSE2_SaveShift(k)					\
-	AS2(	add			esi, 16)	\
-	SSE2_MulAdd45\
-	Mul_Acc##i(i)	\
-
-#define Mul_Column0(k, i)	\
-	SSE2_SaveShift(k)					\
-	AS2(	add			edi, 16)	\
-	AS2(	add			edx, 16)	\
-	SSE2_MulAdd45\
-	Mul_Acc##i(i)	\
-
-#define Bot_Acc(i)							\
-	AS2(	movdqa		xmm1, [esi+i/2*(1-(i-2*(i/2))*2)*16])	\
-	AS2(	movdqa		xmm0, [edi-i/2*(1-(i-2*(i/2))*2)*16])	\
-	AS2(	pmuludq		xmm0, xmm1)				\
-	AS2(	pmuludq		xmm1, [edx-i/2*(1-(i-2*(i/2))*2)*16])		\
-	AS2(	paddq		xmm4, xmm0)				\
-	AS2(	paddd		xmm6, xmm1)
-
-#define Bot_SaveAcc(k)					\
-	SSE2_SaveShift(k)							\
-	AS2(	add			edi, 16)	\
-	AS2(	add			edx, 16)	\
-	AS2(	movdqa		xmm6, [esi])	\
-	AS2(	movdqa		xmm0, [edi])	\
-	AS2(	pmuludq		xmm0, xmm6)				\
-	AS2(	paddq		xmm4, xmm0)				\
-	AS2(	psllq		xmm5, 16)				\
-	AS2(	paddq		xmm4, xmm5)				\
-	AS2(	pmuludq		xmm6, [edx])
-
-#define Bot_End(n)							\
-	AS2(	movhlps		xmm7, xmm6)			\
-	AS2(	paddd		xmm6, xmm7)			\
-	AS2(	psllq		xmm6, 32)			\
-	AS2(	paddd		xmm4, xmm6)			\
-	AS2(	movq		QWORD PTR [ecx+8*((n)-1)], xmm4)	\
-	AS1(	pop		esp)\
-	MulEpilogue
-
-#define Top_Begin(n)							\
-	TopPrologue									\
-	AS2(	mov		edx, esp)\
-	AS2(	and		esp, 0xfffffff0)\
-	AS2(	sub		esp, 48*n+16)\
-	AS1(	push	edx)\
-	AS2(	xor		edx, edx)					\
-	ASL(1)										\
-	ASS(	pshufd	xmm0, [eax+edx], 3,1,2,0)	\
-	ASS(	pshufd	xmm1, [eax+edx], 2,0,3,1)	\
-	ASS(	pshufd	xmm2, [edi+edx], 3,1,2,0)	\
-	AS2(	movdqa	[esp+20+2*edx], xmm0)		\
-	AS2(	psrlq	xmm0, 32)					\
-	AS2(	movdqa	[esp+20+2*edx+16], xmm0)	\
-	AS2(	movdqa	[esp+20+16*n+2*edx], xmm1)		\
-	AS2(	psrlq	xmm1, 32)					\
-	AS2(	movdqa	[esp+20+16*n+2*edx+16], xmm1)	\
-	AS2(	movdqa	[esp+20+32*n+2*edx], xmm2)		\
-	AS2(	psrlq	xmm2, 32)					\
-	AS2(	movdqa	[esp+20+32*n+2*edx+16], xmm2)	\
-	AS2(	add		edx, 16)					\
-	AS2(	cmp		edx, 8*(n))					\
-	ASJ(	jne,	1, b)						\
-	AS2(	mov		eax, esi)					\
-	AS2(	lea		edi, [esp+20+00*n+16*(n/2-1)])\
-	AS2(	lea		edx, [esp+20+16*n+16*(n/2-1)])\
-	AS2(	lea		esi, [esp+20+32*n+16*(n/2-1)])\
-	AS2(	pxor	xmm4, xmm4)\
-	AS2(	pxor	xmm5, xmm5)
-
-#define Top_Acc(i)							\
-	AS2(	movq		xmm0, QWORD PTR [esi+i/2*(1-(i-2*(i/2))*2)*16+8])	\
-	AS2(	pmuludq		xmm0, [edx-i/2*(1-(i-2*(i/2))*2)*16])	\
-	AS2(	psrlq		xmm0, 48)				\
-	AS2(	paddd		xmm5, xmm0)\
-
-#define Top_Column0(i)	\
-	AS2(	psllq		xmm5, 32)				\
-	AS2(	add			edi, 16)	\
-	AS2(	add			edx, 16)	\
-	SSE2_MulAdd45\
-	Mul_Acc##i(i)	\
-
-#define Top_Column1(i)	\
-	SSE2_SaveShift(0)					\
-	AS2(	add			esi, 16)	\
-	SSE2_MulAdd45\
-	Mul_Acc##i(i)	\
-	AS2(	shr			eax, 16)	\
-	AS2(	movd		xmm0, eax)\
-	AS2(	movd		xmm1, [ecx+4])\
-	AS2(	psrld		xmm1, 16)\
-	AS2(	pcmpgtd		xmm1, xmm0)\
-	AS2(	psrld		xmm1, 31)\
-	AS2(	paddd		xmm4, xmm1)\
-
-void SSE2_Square4(word *C, const word *A)
-{
-	Squ_Begin(2)
-	Squ_Column0(0, 1)
-	Squ_End(2)
-}
-
-void SSE2_Square8(word *C, const word *A)
-{
-	Squ_Begin(4)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Squ_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Squ_Column0(0, 1)
-	Squ_Column1(1, 1)
-	Squ_Column0(2, 2)
-	Squ_Column1(3, 1)
-	Squ_Column0(4, 1)
-	Squ_End(4)
-}
-
-void SSE2_Square16(word *C, const word *A)
-{
-	Squ_Begin(8)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Squ_Acc(4) Squ_Acc(3) Squ_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Squ_Column0(0, 1)
-	Squ_Column1(1, 1)
-	Squ_Column0(2, 2)
-	Squ_Column1(3, 2)
-	Squ_Column0(4, 3)
-	Squ_Column1(5, 3)
-	Squ_Column0(6, 4)
-	Squ_Column1(7, 3)
-	Squ_Column0(8, 3)
-	Squ_Column1(9, 2)
-	Squ_Column0(10, 2)
-	Squ_Column1(11, 1)
-	Squ_Column0(12, 1)
-	Squ_End(8)
-}
-
-void SSE2_Square32(word *C, const word *A)
-{
-	Squ_Begin(16)
-	ASJ(	jmp,	0, f)
-	Squ_Acc(8) Squ_Acc(7) Squ_Acc(6) Squ_Acc(5) Squ_Acc(4) Squ_Acc(3) Squ_Acc(2)
-	AS1(	ret) ASL(0)
-	Squ_Column0(0, 1)
-	Squ_Column1(1, 1)
-	Squ_Column0(2, 2)
-	Squ_Column1(3, 2)
-	Squ_Column0(4, 3)
-	Squ_Column1(5, 3)
-	Squ_Column0(6, 4)
-	Squ_Column1(7, 4)
-	Squ_Column0(8, 5)
-	Squ_Column1(9, 5)
-	Squ_Column0(10, 6)
-	Squ_Column1(11, 6)
-	Squ_Column0(12, 7)
-	Squ_Column1(13, 7)
-	Squ_Column0(14, 8)
-	Squ_Column1(15, 7)
-	Squ_Column0(16, 7)
-	Squ_Column1(17, 6)
-	Squ_Column0(18, 6)
-	Squ_Column1(19, 5)
-	Squ_Column0(20, 5)
-	Squ_Column1(21, 4)
-	Squ_Column0(22, 4)
-	Squ_Column1(23, 3)
-	Squ_Column0(24, 3)
-	Squ_Column1(25, 2)
-	Squ_Column0(26, 2)
-	Squ_Column1(27, 1)
-	Squ_Column0(28, 1)
-	Squ_End(16)
-}
-
-void SSE2_Multiply4(word *C, const word *A, const word *B)
-{
-	Mul_Begin(2)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Mul_Column0(0, 2)
-	Mul_End(2)
-}
-
-void SSE2_Multiply8(word *C, const word *A, const word *B)
-{
-	Mul_Begin(4)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(4) Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Mul_Column0(0, 2)
-	Mul_Column1(1, 3)
-	Mul_Column0(2, 4)
-	Mul_Column1(3, 3)
-	Mul_Column0(4, 2)
-	Mul_End(4)
-}
-
-void SSE2_Multiply16(word *C, const word *A, const word *B)
-{
-	Mul_Begin(8)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(8) Mul_Acc(7) Mul_Acc(6) Mul_Acc(5) Mul_Acc(4) Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Mul_Column0(0, 2)
-	Mul_Column1(1, 3)
-	Mul_Column0(2, 4)
-	Mul_Column1(3, 5)
-	Mul_Column0(4, 6)
-	Mul_Column1(5, 7)
-	Mul_Column0(6, 8)
-	Mul_Column1(7, 7)
-	Mul_Column0(8, 6)
-	Mul_Column1(9, 5)
-	Mul_Column0(10, 4)
-	Mul_Column1(11, 3)
-	Mul_Column0(12, 2)
-	Mul_End(8)
-}
-
-void SSE2_Multiply32(word *C, const word *A, const word *B)
-{
-	Mul_Begin(16)
-	ASJ(	jmp,	0, f)
-	Mul_Acc(16) Mul_Acc(15) Mul_Acc(14) Mul_Acc(13) Mul_Acc(12) Mul_Acc(11) Mul_Acc(10) Mul_Acc(9) Mul_Acc(8) Mul_Acc(7) Mul_Acc(6) Mul_Acc(5) Mul_Acc(4) Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-	Mul_Column0(0, 2)
-	Mul_Column1(1, 3)
-	Mul_Column0(2, 4)
-	Mul_Column1(3, 5)
-	Mul_Column0(4, 6)
-	Mul_Column1(5, 7)
-	Mul_Column0(6, 8)
-	Mul_Column1(7, 9)
-	Mul_Column0(8, 10)
-	Mul_Column1(9, 11)
-	Mul_Column0(10, 12)
-	Mul_Column1(11, 13)
-	Mul_Column0(12, 14)
-	Mul_Column1(13, 15)
-	Mul_Column0(14, 16)
-	Mul_Column1(15, 15)
-	Mul_Column0(16, 14)
-	Mul_Column1(17, 13)
-	Mul_Column0(18, 12)
-	Mul_Column1(19, 11)
-	Mul_Column0(20, 10)
-	Mul_Column1(21, 9)
-	Mul_Column0(22, 8)
-	Mul_Column1(23, 7)
-	Mul_Column0(24, 6)
-	Mul_Column1(25, 5)
-	Mul_Column0(26, 4)
-	Mul_Column1(27, 3)
-	Mul_Column0(28, 2)
-	Mul_End(16)
-}
-
-void SSE2_MultiplyBottom4(word *C, const word *A, const word *B)
-{
-	Mul_Begin(2)
-	Bot_SaveAcc(0) Bot_Acc(2)
-	Bot_End(2)
-}
-
-void SSE2_MultiplyBottom8(word *C, const word *A, const word *B)
-{
-	Mul_Begin(4)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Mul_Column0(0, 2)
-	Mul_Column1(1, 3)
-	Bot_SaveAcc(2) Bot_Acc(4) Bot_Acc(3) Bot_Acc(2)
-	Bot_End(4)
-}
-
-void SSE2_MultiplyBottom16(word *C, const word *A, const word *B)
-{
-	Mul_Begin(8)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(7) Mul_Acc(6) Mul_Acc(5) Mul_Acc(4) Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Mul_Column0(0, 2)
-	Mul_Column1(1, 3)
-	Mul_Column0(2, 4)
-	Mul_Column1(3, 5)
-	Mul_Column0(4, 6)
-	Mul_Column1(5, 7)
-	Bot_SaveAcc(6) Bot_Acc(8) Bot_Acc(7) Bot_Acc(6) Bot_Acc(5) Bot_Acc(4) Bot_Acc(3) Bot_Acc(2)
-	Bot_End(8)
-}
-
-void SSE2_MultiplyBottom32(word *C, const word *A, const word *B)
-{
-	Mul_Begin(16)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(15) Mul_Acc(14) Mul_Acc(13) Mul_Acc(12) Mul_Acc(11) Mul_Acc(10) Mul_Acc(9) Mul_Acc(8) Mul_Acc(7) Mul_Acc(6) Mul_Acc(5) Mul_Acc(4) Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Mul_Column0(0, 2)
-	Mul_Column1(1, 3)
-	Mul_Column0(2, 4)
-	Mul_Column1(3, 5)
-	Mul_Column0(4, 6)
-	Mul_Column1(5, 7)
-	Mul_Column0(6, 8)
-	Mul_Column1(7, 9)
-	Mul_Column0(8, 10)
-	Mul_Column1(9, 11)
-	Mul_Column0(10, 12)
-	Mul_Column1(11, 13)
-	Mul_Column0(12, 14)
-	Mul_Column1(13, 15)
-	Bot_SaveAcc(14) Bot_Acc(16) Bot_Acc(15) Bot_Acc(14) Bot_Acc(13) Bot_Acc(12) Bot_Acc(11) Bot_Acc(10) Bot_Acc(9) Bot_Acc(8) Bot_Acc(7) Bot_Acc(6) Bot_Acc(5) Bot_Acc(4) Bot_Acc(3) Bot_Acc(2)
-	Bot_End(16)
-}
-
-void SSE2_MultiplyTop8(word *C, const word *A, const word *B, word L)
-{
-	Top_Begin(4)
-	Top_Acc(3) Top_Acc(2) Top_Acc(1)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(4) Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Top_Column0(4)
-	Top_Column1(3)
-	Mul_Column0(0, 2)
-	Top_End(2)
-}
-
-void SSE2_MultiplyTop16(word *C, const word *A, const word *B, word L)
-{
-	Top_Begin(8)
-	Top_Acc(7) Top_Acc(6) Top_Acc(5) Top_Acc(4) Top_Acc(3) Top_Acc(2) Top_Acc(1)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(8) Mul_Acc(7) Mul_Acc(6) Mul_Acc(5) Mul_Acc(4) Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Top_Column0(8)
-	Top_Column1(7)
-	Mul_Column0(0, 6)
-	Mul_Column1(1, 5)
-	Mul_Column0(2, 4)
-	Mul_Column1(3, 3)
-	Mul_Column0(4, 2)
-	Top_End(4)
-}
-
-void SSE2_MultiplyTop32(word *C, const word *A, const word *B, word L)
-{
-	Top_Begin(16)
-	Top_Acc(15) Top_Acc(14) Top_Acc(13) Top_Acc(12) Top_Acc(11) Top_Acc(10) Top_Acc(9) Top_Acc(8) Top_Acc(7) Top_Acc(6) Top_Acc(5) Top_Acc(4) Top_Acc(3) Top_Acc(2) Top_Acc(1)
-#ifndef __GNUC__
-	ASJ(	jmp,	0, f)
-	Mul_Acc(16) Mul_Acc(15) Mul_Acc(14) Mul_Acc(13) Mul_Acc(12) Mul_Acc(11) Mul_Acc(10) Mul_Acc(9) Mul_Acc(8) Mul_Acc(7) Mul_Acc(6) Mul_Acc(5) Mul_Acc(4) Mul_Acc(3) Mul_Acc(2)
-	AS1(	ret) ASL(0)
-#endif
-	Top_Column0(16)
-	Top_Column1(15)
-	Mul_Column0(0, 14)
-	Mul_Column1(1, 13)
-	Mul_Column0(2, 12)
-	Mul_Column1(3, 11)
-	Mul_Column0(4, 10)
-	Mul_Column1(5, 9)
-	Mul_Column0(6, 8)
-	Mul_Column1(7, 7)
-	Mul_Column0(8, 6)
-	Mul_Column1(9, 5)
-	Mul_Column0(10, 4)
-	Mul_Column1(11, 3)
-	Mul_Column0(12, 2)
-	Top_End(8)
-}
-
-#endif	// #if CRYPTOPP_INTEGER_SSE2
-
-// ********************************************************
-
-typedef int (CRYPTOPP_FASTCALL * PAdd)(size_t N, word *C, const word *A, const word *B);
-typedef void (* PMul)(word *C, const word *A, const word *B);
-typedef void (* PSqu)(word *C, const word *A);
-typedef void (* PMulTop)(word *C, const word *A, const word *B, word L);
-
-#if CRYPTOPP_INTEGER_SSE2
-static PAdd s_pAdd = &Baseline_Add, s_pSub = &Baseline_Sub;
-static size_t s_recursionLimit = 8;
-#else
-static const size_t s_recursionLimit = 16;
-#endif
-
-static PMul s_pMul[9], s_pBot[9];
-static PSqu s_pSqu[9];
-static PMulTop s_pTop[9];
-
-static void SetFunctionPointers()
-{
-	s_pMul[0] = &Baseline_Multiply2;
-	s_pBot[0] = &Baseline_MultiplyBottom2;
-	s_pSqu[0] = &Baseline_Square2;
-	s_pTop[0] = &Baseline_MultiplyTop2;
-	s_pTop[1] = &Baseline_MultiplyTop4;
-
-#if CRYPTOPP_INTEGER_SSE2
-	if (HasSSE2())
-	{
-#if _MSC_VER != 1200 || !(CRYPTOPP_DEBUG)
-		if (IsP4())
-		{
-			s_pAdd = &SSE2_Add;
-			s_pSub = &SSE2_Sub;
-		}
-#endif
-
-		s_recursionLimit = 32;
-
-		s_pMul[1] = &SSE2_Multiply4;
-		s_pMul[2] = &SSE2_Multiply8;
-		s_pMul[4] = &SSE2_Multiply16;
-		s_pMul[8] = &SSE2_Multiply32;
-
-		s_pBot[1] = &SSE2_MultiplyBottom4;
-		s_pBot[2] = &SSE2_MultiplyBottom8;
-		s_pBot[4] = &SSE2_MultiplyBottom16;
-		s_pBot[8] = &SSE2_MultiplyBottom32;
-
-		s_pSqu[1] = &SSE2_Square4;
-		s_pSqu[2] = &SSE2_Square8;
-		s_pSqu[4] = &SSE2_Square16;
-		s_pSqu[8] = &SSE2_Square32;
-
-		s_pTop[2] = &SSE2_MultiplyTop8;
-		s_pTop[4] = &SSE2_MultiplyTop16;
-		s_pTop[8] = &SSE2_MultiplyTop32;
-	}
-	else
-#endif
-	{
-		s_pMul[1] = &Baseline_Multiply4;
-		s_pMul[2] = &Baseline_Multiply8;
-
-		s_pBot[1] = &Baseline_MultiplyBottom4;
-		s_pBot[2] = &Baseline_MultiplyBottom8;
-
-		s_pSqu[1] = &Baseline_Square4;
-		s_pSqu[2] = &Baseline_Square8;
-
-		s_pTop[2] = &Baseline_MultiplyTop8;
-
-#if	!CRYPTOPP_INTEGER_SSE2
-		s_pMul[4] = &Baseline_Multiply16;
-		s_pBot[4] = &Baseline_MultiplyBottom16;
-		s_pSqu[4] = &Baseline_Square16;
-		s_pTop[4] = &Baseline_MultiplyTop16;
-#endif
-	}
-}
-
-inline int Add(word *C, const word *A, const word *B, size_t N)
-{
-#if CRYPTOPP_INTEGER_SSE2
-	return s_pAdd(N, C, A, B);
-#else
-	return Baseline_Add(N, C, A, B);
-#endif
-}
-
-inline int Subtract(word *C, const word *A, const word *B, size_t N)
-{
-#if CRYPTOPP_INTEGER_SSE2
-	return s_pSub(N, C, A, B);
-#else
-	return Baseline_Sub(N, C, A, B);
-#endif
-}
-
-// ********************************************************
-
-
-#define A0		A
-#define A1		(A+N2)
-#define B0		B
-#define B1		(B+N2)
-
-#define T0		T
-#define T1		(T+N2)
-#define T2		(T+N)
-#define T3		(T+N+N2)
-
-#define R0		R
-#define R1		(R+N2)
-#define R2		(R+N)
-#define R3		(R+N+N2)
-
-// R[2*N] - result = A*B
-// T[2*N] - temporary work space
-// A[N] --- multiplier
-// B[N] --- multiplicant
-
-void RecursiveMultiply(word *R, word *T, const word *A, const word *B, size_t N)
-{
-	CRYPTOPP_ASSERT(N>=2 && N%2==0);
-
-	if (N <= s_recursionLimit)
-		s_pMul[N/4](R, A, B);
-	else
-	{
-		const size_t N2 = N/2;
-
-		size_t AN2 = Compare(A0, A1, N2) > 0 ?  0 : N2;
-		Subtract(R0, A + AN2, A + (N2 ^ AN2), N2);
-
-		size_t BN2 = Compare(B0, B1, N2) > 0 ?  0 : N2;
-		Subtract(R1, B + BN2, B + (N2 ^ BN2), N2);
-
-		RecursiveMultiply(R2, T2, A1, B1, N2);
-		RecursiveMultiply(T0, T2, R0, R1, N2);
-		RecursiveMultiply(R0, T2, A0, B0, N2);
-
-		// now T[01] holds (A1-A0)*(B0-B1), R[01] holds A0*B0, R[23] holds A1*B1
-
-		int c2 = Add(R2, R2, R1, N2);
-		int c3 = c2;
-		c2 += Add(R1, R2, R0, N2);
-		c3 += Add(R2, R2, R3, N2);
-
-		if (AN2 == BN2)
-			c3 -= Subtract(R1, R1, T0, N);
-		else
-			c3 += Add(R1, R1, T0, N);
-
-		c3 += Increment(R2, N2, c2);
-		CRYPTOPP_ASSERT (c3 >= 0 && c3 <= 2);
-		Increment(R3, N2, c3);
-	}
-}
-
-// R[2*N] - result = A*A
-// T[2*N] - temporary work space
-// A[N] --- number to be squared
-
-void RecursiveSquare(word *R, word *T, const word *A, size_t N)
-{
-	CRYPTOPP_ASSERT(N && N%2==0);
-
-	if (N <= s_recursionLimit)
-		s_pSqu[N/4](R, A);
-	else
-	{
-		const size_t N2 = N/2;
-
-		RecursiveSquare(R0, T2, A0, N2);
-		RecursiveSquare(R2, T2, A1, N2);
-		RecursiveMultiply(T0, T2, A0, A1, N2);
-
-		int carry = Add(R1, R1, T0, N);
-		carry += Add(R1, R1, T0, N);
-		Increment(R3, N2, carry);
-	}
-}
-
-// R[N] - bottom half of A*B
-// T[3*N/2] - temporary work space
-// A[N] - multiplier
-// B[N] - multiplicant
-
-void RecursiveMultiplyBottom(word *R, word *T, const word *A, const word *B, size_t N)
-{
-	CRYPTOPP_ASSERT(N>=2 && N%2==0);
-
-	if (N <= s_recursionLimit)
-		s_pBot[N/4](R, A, B);
-	else
-	{
-		const size_t N2 = N/2;
-
-		RecursiveMultiply(R, T, A0, B0, N2);
-		RecursiveMultiplyBottom(T0, T1, A1, B0, N2);
-		Add(R1, R1, T0, N2);
-		RecursiveMultiplyBottom(T0, T1, A0, B1, N2);
-		Add(R1, R1, T0, N2);
-	}
-}
-
-// R[N] --- upper half of A*B
-// T[2*N] - temporary work space
-// L[N] --- lower half of A*B
-// A[N] --- multiplier
-// B[N] --- multiplicant
-
-void MultiplyTop(word *R, word *T, const word *L, const word *A, const word *B, size_t N)
-{
-	CRYPTOPP_ASSERT(N>=2 && N%2==0);
-
-	if (N <= s_recursionLimit)
-		s_pTop[N/4](R, A, B, L[N-1]);
-	else
-	{
-		const size_t N2 = N/2;
-
-		size_t AN2 = Compare(A0, A1, N2) > 0 ?  0 : N2;
-		Subtract(R0, A + AN2, A + (N2 ^ AN2), N2);
-
-		size_t BN2 = Compare(B0, B1, N2) > 0 ?  0 : N2;
-		Subtract(R1, B + BN2, B + (N2 ^ BN2), N2);
-
-		RecursiveMultiply(T0, T2, R0, R1, N2);
-		RecursiveMultiply(R0, T2, A1, B1, N2);
-
-		// now T[01] holds (A1-A0)*(B0-B1) = A1*B0+A0*B1-A1*B1-A0*B0, R[01] holds A1*B1
-
-		int t, c3;
-		int c2 = Subtract(T2, L+N2, L, N2);
-
-		if (AN2 == BN2)
-		{
-			c2 -= Add(T2, T2, T0, N2);
-			t = (Compare(T2, R0, N2) == -1);
-			c3 = t - Subtract(T2, T2, T1, N2);
-		}
-		else
-		{
-			c2 += Subtract(T2, T2, T0, N2);
-			t = (Compare(T2, R0, N2) == -1);
-			c3 = t + Add(T2, T2, T1, N2);
-		}
-
-		c2 += t;
-		if (c2 >= 0)
-			c3 += Increment(T2, N2, c2);
-		else
-			c3 -= Decrement(T2, N2, -c2);
-		c3 += Add(R0, T2, R1, N2);
-
-		CRYPTOPP_ASSERT (c3 >= 0 && c3 <= 2);
-		Increment(R1, N2, c3);
-	}
-}
-
-inline void Multiply(word *R, word *T, const word *A, const word *B, size_t N)
-{
-	RecursiveMultiply(R, T, A, B, N);
-}
-
-inline void Square(word *R, word *T, const word *A, size_t N)
-{
-	RecursiveSquare(R, T, A, N);
-}
-
-inline void MultiplyBottom(word *R, word *T, const word *A, const word *B, size_t N)
-{
-	RecursiveMultiplyBottom(R, T, A, B, N);
-}
-
-// R[NA+NB] - result = A*B
-// T[NA+NB] - temporary work space
-// A[NA] ---- multiplier
-// B[NB] ---- multiplicant
-
-void AsymmetricMultiply(word *R, word *T, const word *A, size_t NA, const word *B, size_t NB)
-{
-	if (NA == NB)
-	{
-		// Profiling tells us the original second case was dominant, so it was promoted to the first If statement.
-		// The code change occurred at Commit dc99266599a0e72d.
-		if (A != B)
-			Multiply(R, T, A, B, NA);
-		else
-			Square(R, T, A, NA);
-
-		return;
-	}
-
-	if (NA > NB)
-	{
-		std::swap(A, B);
-		std::swap(NA, NB);
-	}
-
-	CRYPTOPP_ASSERT(NB % NA == 0);
-
-	if (NA==2 && !A[1])
-	{
-		// Profiling tells us the original Default case was dominant, so it was promoted to the first Case statement.
-		// The code change occurred at Commit dc99266599a0e72d.
-		switch (A[0])
-		{
-		default:
-			R[NB] = LinearMultiply(R, B, A[0], NB);
-			R[NB+1] = 0;
-			return;
-		case 0:
-			SetWords(R, 0, NB+2);
-			return;
-		case 1:
-			CopyWords(R, B, NB);
-			R[NB] = R[NB+1] = 0;
-			return;
-		}
-	}
-
-	size_t i;
-	if ((NB/NA)%2 == 0)
-	{
-		Multiply(R, T, A, B, NA);
-		CopyWords(T+2*NA, R+NA, NA);
-
-		for (i=2*NA; i<NB; i+=2*NA)
-			Multiply(T+NA+i, T, A, B+i, NA);
-		for (i=NA; i<NB; i+=2*NA)
-			Multiply(R+i, T, A, B+i, NA);
-	}
-	else
-	{
-		for (i=0; i<NB; i+=2*NA)
-			Multiply(R+i, T, A, B+i, NA);
-		for (i=NA; i<NB; i+=2*NA)
-			Multiply(T+NA+i, T, A, B+i, NA);
-	}
-
-	if (Add(R+NA, R+NA, T+2*NA, NB-NA))
-		Increment(R+NB, NA);
-}
-
-// R[N] ----- result = A inverse mod 2**(WORD_BITS*N)
-// T[3*N/2] - temporary work space
-// A[N] ----- an odd number as input
-
-void RecursiveInverseModPower2(word *R, word *T, const word *A, size_t N)
-{
-	// Profiling tells us the original Else was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-	if (N!=2)
-	{
-		const size_t N2 = N/2;
-		RecursiveInverseModPower2(R0, T0, A0, N2);
-		T0[0] = 1;
-		SetWords(T0+1, 0, N2-1);
-		MultiplyTop(R1, T1, T0, R0, A0, N2);
-		MultiplyBottom(T0, T1, R0, A1, N2);
-		Add(T0, R1, T0, N2);
-		TwosComplement(T0, N2);
-		MultiplyBottom(R1, T1, R0, T0, N2);
-	}
-	else
-	{
-		T[0] = AtomicInverseModPower2(A[0]);
-		T[1] = 0;
-		s_pBot[0](T+2, T, A);
-		TwosComplement(T+2, 2);
-		Increment(T+2, 2, 2);
-		s_pBot[0](R, T, T+2);
-	}
-}
-
-// R[N] --- result = X/(2**(WORD_BITS*N)) mod M
-// T[3*N] - temporary work space
-// X[2*N] - number to be reduced
-// M[N] --- modulus
-// U[N] --- multiplicative inverse of M mod 2**(WORD_BITS*N)
-
-void MontgomeryReduce(word *R, word *T, word *X, const word *M, const word *U, size_t N)
-{
-#if 1
-	MultiplyBottom(R, T, X, U, N);
-	MultiplyTop(T, T+N, X, R, M, N);
-	word borrow = Subtract(T, X+N, T, N);
-	// defend against timing attack by doing this Add even when not needed
-	word carry = Add(T+N, T, M, N);
-	CRYPTOPP_ASSERT(carry | !borrow);
-	CRYPTOPP_UNUSED(carry), CRYPTOPP_UNUSED(borrow);
-	CopyWords(R, T + ((0-borrow) & N), N);
-#elif 0
-	const word u = 0-U[0];
-	Declare2Words(p)
-	for (size_t i=0; i<N; i++)
-	{
-		const word t = u * X[i];
-		word c = 0;
-		for (size_t j=0; j<N; j+=2)
-		{
-			MultiplyWords(p, t, M[j]);
-			Acc2WordsBy1(p, X[i+j]);
-			Acc2WordsBy1(p, c);
-			X[i+j] = LowWord(p);
-			c = HighWord(p);
-			MultiplyWords(p, t, M[j+1]);
-			Acc2WordsBy1(p, X[i+j+1]);
-			Acc2WordsBy1(p, c);
-			X[i+j+1] = LowWord(p);
-			c = HighWord(p);
-		}
-
-		if (Increment(X+N+i, N-i, c))
-			while (!Subtract(X+N, X+N, M, N)) {}
-	}
-
-	memcpy(R, X+N, N*WORD_SIZE);
-#else
-	__m64 u = _mm_cvtsi32_si64(0-U[0]), p;
-	for (size_t i=0; i<N; i++)
-	{
-		__m64 t = _mm_cvtsi32_si64(X[i]);
-		t = _mm_mul_su32(t, u);
-		__m64 c = _mm_setzero_si64();
-		for (size_t j=0; j<N; j+=2)
-		{
-			p = _mm_mul_su32(t, _mm_cvtsi32_si64(M[j]));
-			p = _mm_add_si64(p, _mm_cvtsi32_si64(X[i+j]));
-			c = _mm_add_si64(c, p);
-			X[i+j] = _mm_cvtsi64_si32(c);
-			c = _mm_srli_si64(c, 32);
-			p = _mm_mul_su32(t, _mm_cvtsi32_si64(M[j+1]));
-			p = _mm_add_si64(p, _mm_cvtsi32_si64(X[i+j+1]));
-			c = _mm_add_si64(c, p);
-			X[i+j+1] = _mm_cvtsi64_si32(c);
-			c = _mm_srli_si64(c, 32);
-		}
-
-		if (Increment(X+N+i, N-i, _mm_cvtsi64_si32(c)))
-			while (!Subtract(X+N, X+N, M, N)) {}
-	}
-
-	memcpy(R, X+N, N*WORD_SIZE);
-	_mm_empty();
-#endif
-}
-
-// R[N] --- result = X/(2**(WORD_BITS*N/2)) mod M
-// T[2*N] - temporary work space
-// X[2*N] - number to be reduced
-// M[N] --- modulus
-// U[N/2] - multiplicative inverse of M mod 2**(WORD_BITS*N/2)
-// V[N] --- 2**(WORD_BITS*3*N/2) mod M
-
-void HalfMontgomeryReduce(word *R, word *T, const word *X, const word *M, const word *U, const word *V, size_t N)
-{
-	CRYPTOPP_ASSERT(N%2==0 && N>=4);
-
-#define M0		M
-#define M1		(M+N2)
-#define V0		V
-#define V1		(V+N2)
-
-#define X0		X
-#define X1		(X+N2)
-#define X2		(X+N)
-#define X3		(X+N+N2)
-
-	const size_t N2 = N/2;
-	Multiply(T0, T2, V0, X3, N2);
-	int c2 = Add(T0, T0, X0, N);
-	MultiplyBottom(T3, T2, T0, U, N2);
-	MultiplyTop(T2, R, T0, T3, M0, N2);
-	c2 -= Subtract(T2, T1, T2, N2);
-	Multiply(T0, R, T3, M1, N2);
-	c2 -= Subtract(T0, T2, T0, N2);
-	int c3 = -(int)Subtract(T1, X2, T1, N2);
-	Multiply(R0, T2, V1, X3, N2);
-	c3 += Add(R, R, T, N);
-
-	if (c2>0)
-		c3 += Increment(R1, N2);
-	else if (c2<0)
-		c3 -= Decrement(R1, N2, -c2);
-
-	CRYPTOPP_ASSERT(c3>=-1 && c3<=1);
-	if (c3>0)
-		Subtract(R, R, M, N);
-	else if (c3<0)
-		Add(R, R, M, N);
-
-#undef M0
-#undef M1
-#undef V0
-#undef V1
-
-#undef X0
-#undef X1
-#undef X2
-#undef X3
-}
-
-#undef A0
-#undef A1
-#undef B0
-#undef B1
-
-#undef T0
-#undef T1
-#undef T2
-#undef T3
-
-#undef R0
-#undef R1
-#undef R2
-#undef R3
-
-/*
-// do a 3 word by 2 word divide, returns quotient and leaves remainder in A
-static word SubatomicDivide(word *A, word B0, word B1)
-{
-	// CRYPTOPP_ASSERT {A[2],A[1]} < {B1,B0}, so quotient can fit in a word
-	CRYPTOPP_ASSERT(A[2] < B1 || (A[2]==B1 && A[1] < B0));
-
-	// estimate the quotient: do a 2 word by 1 word divide
-	word Q;
-	if (B1+1 == 0)
-		Q = A[2];
-	else
-		Q = DWord(A[1], A[2]).DividedBy(B1+1);
-
-	// now subtract Q*B from A
-	DWord p = DWord::Multiply(B0, Q);
-	DWord u = (DWord) A[0] - p.GetLowHalf();
-	A[0] = u.GetLowHalf();
-	u = (DWord) A[1] - p.GetHighHalf() - u.GetHighHalfAsBorrow() - DWord::Multiply(B1, Q);
-	A[1] = u.GetLowHalf();
-	A[2] += u.GetHighHalf();
-
-	// Q <= actual quotient, so fix it
-	while (A[2] || A[1] > B1 || (A[1]==B1 && A[0]>=B0))
-	{
-		u = (DWord) A[0] - B0;
-		A[0] = u.GetLowHalf();
-		u = (DWord) A[1] - B1 - u.GetHighHalfAsBorrow();
-		A[1] = u.GetLowHalf();
-		A[2] += u.GetHighHalf();
-		Q++;
-		CRYPTOPP_ASSERT(Q);	// shouldn't overflow
-	}
-
-	return Q;
-}
-
-// do a 4 word by 2 word divide, returns 2 word quotient in Q0 and Q1
-static inline void AtomicDivide(word *Q, const word *A, const word *B)
-{
-	if (!B[0] && !B[1]) // if divisor is 0, we assume divisor==2**(2*WORD_BITS)
-	{
-		Q[0] = A[2];
-		Q[1] = A[3];
-	}
-	else
-	{
-		word T[4];
-		T[0] = A[0]; T[1] = A[1]; T[2] = A[2]; T[3] = A[3];
-		Q[1] = SubatomicDivide(T+1, B[0], B[1]);
-		Q[0] = SubatomicDivide(T, B[0], B[1]);
-
-#if CRYPTOPP_DEBUG
-		// multiply quotient and divisor and add remainder, make sure it equals dividend
-		CRYPTOPP_ASSERT(!T[2] && !T[3] && (T[1] < B[1] || (T[1]==B[1] && T[0]<B[0])));
-		word P[4];
-		LowLevel::Multiply2(P, Q, B);
-		Add(P, P, T, 4);
-		CRYPTOPP_ASSERT(memcmp(P, A, 4*WORD_SIZE)==0);
-#endif
-	}
-}
-*/
-
-static inline void AtomicDivide(word *Q, const word *A, const word *B)
-{
-	word T[4];
-	DWord q = DivideFourWordsByTwo<word, DWord>(T, DWord(A[0], A[1]), DWord(A[2], A[3]), DWord(B[0], B[1]));
-	Q[0] = q.GetLowHalf();
-	Q[1] = q.GetHighHalf();
-
-#if CRYPTOPP_DEBUG
-	if (B[0] || B[1])
-	{
-		// multiply quotient and divisor and add remainder, make sure it equals dividend
-		CRYPTOPP_ASSERT(!T[2] && !T[3] && (T[1] < B[1] || (T[1]==B[1] && T[0]<B[0])));
-		word P[4];
-		s_pMul[0](P, Q, B);
-		Add(P, P, T, 4);
-		CRYPTOPP_ASSERT(memcmp(P, A, 4*WORD_SIZE)==0);
-	}
-#endif
-}
-
-// for use by Divide(), corrects the underestimated quotient {Q1,Q0}
-static void CorrectQuotientEstimate(word *R, word *T, word *Q, const word *B, size_t N)
-{
-	CRYPTOPP_ASSERT(N && N%2==0);
-
-	AsymmetricMultiply(T, T+N+2, Q, 2, B, N);
-
-	word borrow = Subtract(R, R, T, N+2);
-	CRYPTOPP_ASSERT(!borrow && !R[N+1]);
-	CRYPTOPP_UNUSED(borrow);
-
-	while (R[N] || Compare(R, B, N) >= 0)
-	{
-		R[N] -= Subtract(R, R, B, N);
-		Q[1] += (++Q[0]==0);
-		CRYPTOPP_ASSERT(Q[0] || Q[1]); // no overflow
-	}
-}
-
-// R[NB] -------- remainder = A%B
-// Q[NA-NB+2] --- quotient	= A/B
-// T[NA+3*(NB+2)] - temp work space
-// A[NA] -------- dividend
-// B[NB] -------- divisor
-
-void Divide(word *R, word *Q, word *T, const word *A, size_t NA, const word *B, size_t NB)
-{
-	CRYPTOPP_ASSERT(NA && NB && NA%2==0 && NB%2==0);
-	CRYPTOPP_ASSERT(B[NB-1] || B[NB-2]);
-	CRYPTOPP_ASSERT(NB <= NA);
-
-	// set up temporary work space
-	word *const TA=T;
-	word *const TB=T+NA+2;
-	word *const TP=T+NA+2+NB;
-
-	// copy B into TB and normalize it so that TB has highest bit set to 1
-	unsigned shiftWords = (B[NB-1]==0);
-	TB[0] = TB[NB-1] = 0;
-	CopyWords(TB+shiftWords, B, NB-shiftWords);
-	unsigned shiftBits = WORD_BITS - BitPrecision(TB[NB-1]);
-	CRYPTOPP_ASSERT(shiftBits < WORD_BITS);
-	ShiftWordsLeftByBits(TB, NB, shiftBits);
-
-	// copy A into TA and normalize it
-	TA[0] = TA[NA] = TA[NA+1] = 0;
-	CopyWords(TA+shiftWords, A, NA);
-	ShiftWordsLeftByBits(TA, NA+2, shiftBits);
-
-	if (TA[NA+1]==0 && TA[NA] <= 1)
-	{
-		Q[NA-NB+1] = Q[NA-NB] = 0;
-		while (TA[NA] || Compare(TA+NA-NB, TB, NB) >= 0)
-		{
-			TA[NA] -= Subtract(TA+NA-NB, TA+NA-NB, TB, NB);
-			++Q[NA-NB];
-		}
-	}
-	else
-	{
-		NA+=2;
-		CRYPTOPP_ASSERT(Compare(TA+NA-NB, TB, NB) < 0);
-	}
-
-	word BT[2];
-	BT[0] = TB[NB-2] + 1;
-	BT[1] = TB[NB-1] + (BT[0]==0);
-
-	// start reducing TA mod TB, 2 words at a time
-	for (size_t i=NA-2; i>=NB; i-=2)
-	{
-		AtomicDivide(Q+i-NB, TA+i-2, BT);
-		CorrectQuotientEstimate(TA+i-NB, TP, Q+i-NB, TB, NB);
-	}
-
-	// copy TA into R, and denormalize it
-	CopyWords(R, TA+shiftWords, NB);
-	ShiftWordsRightByBits(R, NB, shiftBits);
-}
-
-static inline size_t EvenWordCount(const word *X, size_t N)
-{
-	while (N && X[N-2]==0 && X[N-1]==0)
-		N-=2;
-	return N;
-}
-
-// return k
-// R[N] --- result = A^(-1) * 2^k mod M
-// T[4*N] - temporary work space
-// A[NA] -- number to take inverse of
-// M[N] --- modulus
-
-unsigned int AlmostInverse(word *R, word *T, const word *A, size_t NA, const word *M, size_t N)
-{
-	CRYPTOPP_ASSERT(NA<=N && N && N%2==0);
-
-	word *b = T;
-	word *c = T+N;
-	word *f = T+2*N;
-	word *g = T+3*N;
-	size_t bcLen=2, fgLen=EvenWordCount(M, N);
-	unsigned int k=0;
-	bool s=false;
-
-	SetWords(T, 0, 3*N);
-	b[0]=1;
-	CopyWords(f, A, NA);
-	CopyWords(g, M, N);
-
-	while (1)
-	{
-		word t=f[0];
-		while (!t)
-		{
-			if (EvenWordCount(f, fgLen)==0)
-			{
-				SetWords(R, 0, N);
-				return 0;
-			}
-
-			ShiftWordsRightByWords(f, fgLen, 1);
-			bcLen += 2 * (c[bcLen-1] != 0);
-			CRYPTOPP_ASSERT(bcLen <= N);
-			ShiftWordsLeftByWords(c, bcLen, 1);
-			k+=WORD_BITS;
-			t=f[0];
-		}
-
-		// t must be non-0; otherwise undefined.
-		unsigned int i = TrailingZeros(t);
-		t >>= i;
-		k += i;
-
-		if (t==1 && f[1]==0 && EvenWordCount(f+2, fgLen-2)==0)
-		{
-			if (s)
-				Subtract(R, M, b, N);
-			else
-				CopyWords(R, b, N);
-			return k;
-		}
-
-		ShiftWordsRightByBits(f, fgLen, i);
-		t = ShiftWordsLeftByBits(c, bcLen, i);
-		c[bcLen] += t;
-		bcLen += 2 * (t!=0);
-		CRYPTOPP_ASSERT(bcLen <= N);
-
-		bool swap = Compare(f, g, fgLen)==-1;
-		ConditionalSwapPointers(swap, f, g);
-		ConditionalSwapPointers(swap, b, c);
-		s ^= swap;
-
-		fgLen -= 2 * !(f[fgLen-2] | f[fgLen-1]);
-
-		Subtract(f, f, g, fgLen);
-		t = Add(b, b, c, bcLen);
-		b[bcLen] += t;
-		bcLen += 2*t;
-		CRYPTOPP_ASSERT(bcLen <= N);
-	}
-}
-
-// R[N] - result = A/(2^k) mod M
-// A[N] - input
-// M[N] - modulus
-
-void DivideByPower2Mod(word *R, const word *A, size_t k, const word *M, size_t N)
-{
-	CopyWords(R, A, N);
-
-	while (k--)
-	{
-		if (R[0]%2==0)
-			ShiftWordsRightByBits(R, N, 1);
-		else
-		{
-			word carry = Add(R, R, M, N);
-			ShiftWordsRightByBits(R, N, 1);
-			R[N-1] += carry<<(WORD_BITS-1);
-		}
-	}
-}
-
-// R[N] - result = A*(2^k) mod M
-// A[N] - input
-// M[N] - modulus
-
-void MultiplyByPower2Mod(word *R, const word *A, size_t k, const word *M, size_t N)
-{
-	CopyWords(R, A, N);
-
-	while (k--)
-		if (ShiftWordsLeftByBits(R, N, 1) || Compare(R, M, N)>=0)
-			Subtract(R, R, M, N);
-}
-
-// ******************************************************************
-
-InitializeInteger::InitializeInteger()
-{
-	if (!g_pAssignIntToInteger)
-	{
-		SetFunctionPointers();
-		g_pAssignIntToInteger = (CryptoPP::PAssignIntToInteger)AssignIntToInteger;
-	}
-}
-
-static const unsigned int RoundupSizeTable[] = {2, 2, 2, 4, 4, 8, 8, 8, 8};
-
-static inline size_t RoundupSize(size_t n)
-{
-	if (n<=8)
-		return RoundupSizeTable[n];
-	else if (n<=16)
-		return 16;
-	else if (n<=32)
-		return 32;
-	else if (n<=64)
-		return 64;
-	else
-		return size_t(1) << BitPrecision(n-1);
-}
-
-Integer::Integer()
-	: reg(2), sign(POSITIVE)
-{
-	reg[0] = reg[1] = 0;
-}
-
-Integer::Integer(const Integer& t)
-	: reg(RoundupSize(t.WordCount())), sign(t.sign)
-{
-	CopyWords(reg, t.reg, reg.size());
-}
-
-Integer::Integer(Sign s, lword value)
-	: reg(2), sign(s)
-{
-	reg[0] = word(value);
-	reg[1] = word(SafeRightShift<WORD_BITS>(value));
-}
-
-Integer::Integer(signed long value)
-	: reg(2)
-{
-	if (value >= 0)
-		sign = POSITIVE;
-	else
-	{
-		sign = NEGATIVE;
-		value = -value;
-	}
-	reg[0] = word(value);
-	reg[1] = word(SafeRightShift<WORD_BITS>((unsigned long)value));
-}
-
-Integer::Integer(Sign s, word high, word low)
-	: reg(2), sign(s)
-{
-	reg[0] = low;
-	reg[1] = high;
-}
-
-bool Integer::IsConvertableToLong() const
-{
-	if (ByteCount() > sizeof(long))
-		return false;
-
-	unsigned long value = (unsigned long)reg[0];
-	value += SafeLeftShift<WORD_BITS, unsigned long>((unsigned long)reg[1]);
-
-	if (sign==POSITIVE)
-		return (signed long)value >= 0;
-	else
-		return -(signed long)value < 0;
-}
-
-signed long Integer::ConvertToLong() const
-{
-	CRYPTOPP_ASSERT(IsConvertableToLong());
-
-	unsigned long value = (unsigned long)reg[0];
-	value += SafeLeftShift<WORD_BITS, unsigned long>((unsigned long)reg[1]);
-	return sign==POSITIVE ? value : -(signed long)value;
-}
-
-Integer::Integer(BufferedTransformation &encodedInteger, size_t byteCount, Signedness s, ByteOrder o)
-{
-	CRYPTOPP_ASSERT(o == BIG_ENDIAN_ORDER || o == LITTLE_ENDIAN_ORDER);
-
-	if (o == LITTLE_ENDIAN_ORDER)
-	{
-		SecByteBlock block(byteCount);
-		encodedInteger.Get(block, block.size());
-		std::reverse(block.begin(), block.begin()+block.size());
-
-		Decode(block.begin(), block.size(), s);
-		return;
-	}
-
-	Decode(encodedInteger, byteCount, s);
-}
-
-Integer::Integer(const byte *encodedInteger, size_t byteCount, Signedness s, ByteOrder o)
-{
-	CRYPTOPP_ASSERT(o == BIG_ENDIAN_ORDER || o == LITTLE_ENDIAN_ORDER);
-
-	if (o == LITTLE_ENDIAN_ORDER)
-	{
-		SecByteBlock block(byteCount);
-#if (CRYPTOPP_MSC_VERSION >= 1400)
-		std::reverse_copy(encodedInteger, encodedInteger+byteCount,
-			stdext::make_checked_array_iterator(block.begin(), block.size()));
-#else
-		std::reverse_copy(encodedInteger, encodedInteger+byteCount, block.begin());
-#endif
-		Decode(block.begin(), block.size(), s);
-		return;
-	}
-
-	Decode(encodedInteger, byteCount, s);
-}
-
-Integer::Integer(BufferedTransformation &bt)
-{
-	BERDecode(bt);
-}
-
-Integer::Integer(RandomNumberGenerator &rng, size_t bitcount)
-{
-	Randomize(rng, bitcount);
-}
-
-Integer::Integer(RandomNumberGenerator &rng, const Integer &min, const Integer &max, RandomNumberType rnType, const Integer &equiv, const Integer &mod)
-{
-	if (!Randomize(rng, min, max, rnType, equiv, mod))
-		throw Integer::RandomNumberNotFound();
-}
-
-Integer Integer::Power2(size_t e)
-{
-	Integer r((word)0, BitsToWords(e+1));
-	r.SetBit(e);
-	return r;
-}
-
-template <long i>
-struct NewInteger
-{
-	Integer * operator()() const
-	{
-		return new Integer(i);
-	}
-};
-
-// File scope static due to subtle initialization problems in a threaded
-//   Windows environment. See the comments for Singleton. Thanks DB.
-namespace { const Integer& s_zero = Singleton<Integer>().Ref(); }
-const Integer &Integer::Zero()
-{
-	return s_zero;
-}
-
-// File scope static due to subtle initialization problems in a threaded
-//   Windows environment. See the comments for Singleton. Thanks DB.
-namespace { const Integer& s_one = Singleton<Integer, NewInteger<1> >().Ref(); }
-const Integer &Integer::One()
-{
-	return s_one;
-}
-
-// File scope static due to subtle initialization problems in a threaded
-//   Windows environment. See the comments for Singleton. Thanks DB.
-namespace { const Integer& s_two = Singleton<Integer, NewInteger<2> >().Ref(); }
-const Integer &Integer::Two()
-{
-	return s_two;
-}
-
-bool Integer::operator!() const
-{
-	return IsNegative() ? false : (reg[0]==0 && WordCount()==0);
-}
-
-Integer& Integer::operator=(const Integer& t)
-{
-	if (this != &t)
-	{
-		if (reg.size() != t.reg.size() || t.reg[t.reg.size()/2] == 0)
-			reg.New(RoundupSize(t.WordCount()));
-		CopyWords(reg, t.reg, reg.size());
-		sign = t.sign;
-	}
-	return *this;
-}
-
-bool Integer::GetBit(size_t n) const
-{
-	// Profiling tells us the original Else was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-	if (n/WORD_BITS < reg.size())
-		return bool((reg[n/WORD_BITS] >> (n % WORD_BITS)) & 1);
-	else
-		return 0;
-}
-
-void Integer::SetBit(size_t n, bool value)
-{
-	if (value)
-	{
-		reg.CleanGrow(RoundupSize(BitsToWords(n+1)));
-		reg[n/WORD_BITS] |= (word(1) << (n%WORD_BITS));
-	}
-	else
-	{
-		if (n/WORD_BITS < reg.size())
-			reg[n/WORD_BITS] &= ~(word(1) << (n%WORD_BITS));
-	}
-}
-
-byte Integer::GetByte(size_t n) const
-{
-	// Profiling tells us the original Else was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-	if (n/WORD_SIZE < reg.size())
-		return byte(reg[n/WORD_SIZE] >> ((n%WORD_SIZE)*8));
-	else
-		return 0;
-}
-
-void Integer::SetByte(size_t n, byte value)
-{
-	reg.CleanGrow(RoundupSize(BytesToWords(n+1)));
-	reg[n/WORD_SIZE] &= ~(word(0xff) << 8*(n%WORD_SIZE));
-	reg[n/WORD_SIZE] |= (word(value) << 8*(n%WORD_SIZE));
-}
-
-lword Integer::GetBits(size_t i, size_t n) const
-{
-	lword v = 0;
-	CRYPTOPP_ASSERT(n <= sizeof(v)*8);
-	for (unsigned int j=0; j<n; j++)
-		v |= lword(GetBit(i+j)) << j;
-	return v;
-}
-
-Integer Integer::operator-() const
-{
-	Integer result(*this);
-	result.Negate();
-	return result;
-}
-
-Integer Integer::AbsoluteValue() const
-{
-	Integer result(*this);
-	result.sign = POSITIVE;
-	return result;
-}
-
-void Integer::swap(Integer &a)
-{
-	reg.swap(a.reg);
-	std::swap(sign, a.sign);
-}
-
-Integer::Integer(word value, size_t length)
-	: reg(RoundupSize(length)), sign(POSITIVE)
-{
-	reg[0] = value;
-	SetWords(reg+1, 0, reg.size()-1);
-}
-
-template <class T>
-static Integer StringToInteger(const T *str, ByteOrder order)
-{
-	CRYPTOPP_ASSERT( order == BIG_ENDIAN_ORDER || order == LITTLE_ENDIAN_ORDER );
-
-	int radix, sign = 1;
-	// GCC workaround
-	// std::char_traits<wchar_t>::length() not defined in GCC 3.2 and STLport 4.5.3
-	unsigned int length;
-	for (length = 0; str[length] != 0; length++) {}
-
-	Integer v;
-
-	if (length == 0)
-		return Integer::Zero();
-
-	switch (str[length-1])
-	{
-	case 'h':
-	case 'H':
-		radix=16;
-		break;
-	case 'o':
-	case 'O':
-		radix=8;
-		break;
-	case 'b':
-	case 'B':
-		radix=2;
-		break;
-	default:
-		radix=10;
-	}
-
-	// 'str' is of length 1 or more
-	if (str[0] == '-')
-	{
-		sign = -1;
-		str += 1, length -= 1;
-	}
-
-	if (length > 2 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
-	{
-		radix = 16;
-		str += 2, length -= 2;
-	}
-
-	if (order == BIG_ENDIAN_ORDER)
-	{
-		for (unsigned int i=0; i<length; i++)
-		{
-			int digit, ch = static_cast<int>(str[i]);
-
-			//  Profiling showd the second and third Else needed to be swapped
-			// The code change occurred at Commit dc99266599a0e72d.
-			if (ch >= '0' && ch <= '9')
-				digit = ch - '0';
-			else if (ch >= 'a' && ch <= 'f')
-				digit = ch - 'a' + 10;
-			else if (ch >= 'A' && ch <= 'F')
-				digit = ch - 'A' + 10;
-			else
-				digit = radix;
-
-			if (digit < radix)
-			{
-				v *= radix;
-				v += digit;
-			}
-		}
-	}
-	else if (radix == 16 && order == LITTLE_ENDIAN_ORDER)
-	{
-		// Nibble high, low and count
-		unsigned int nh = 0, nl = 0, nc = 0;
-		Integer position(Integer::One());
-
-		for (unsigned int i=0; i<length; i++)
-		{
-			int digit, ch = static_cast<int>(str[i]);
-
-			if (ch >= '0' && ch <= '9')
-				digit = ch - '0';
-			else if (ch >= 'a' && ch <= 'f')
-				digit = ch - 'a' + 10;
-			else if (ch >= 'A' && ch <= 'F')
-				digit = ch - 'A' + 10;
-			else
-				digit = radix;
-
-			if (digit < radix)
-			{
-				if (nc++ == 0)
-					nh = digit;
-				else
-					nl = digit;
-
-				if (nc == 2)
-				{
-					v += position * (nh << 4 | nl);
-					nc = 0, position <<= 8;
-				}
-			}
-		}
-
-		if (nc == 1)
-			v += nh * position;
-	}
-	else // LITTLE_ENDIAN_ORDER && radix != 16
-	{
-		for (int i=static_cast<int>(length)-1; i>=0; i--)
-		{
-			int digit, ch = static_cast<int>(str[i]);
-
-			if (ch >= '0' && ch <= '9')
-				digit = ch - '0';
-			else if (ch >= 'a' && ch <= 'f')
-				digit = ch - 'a' + 10;
-			else if (ch >= 'A' && ch <= 'F')
-				digit = ch - 'A' + 10;
-			else
-				digit = radix;
-
-			if (digit < radix)
-			{
-				v *= radix;
-				v += digit;
-			}
-		}
-	}
-
-	if (sign == -1)
-		v.Negate();
-
-	return v;
-}
-
-Integer::Integer(const char *str, ByteOrder order)
-	: reg(2), sign(POSITIVE)
-{
-	*this = StringToInteger(str,order);
-}
-
-Integer::Integer(const wchar_t *str, ByteOrder order)
-	: reg(2), sign(POSITIVE)
-{
-	*this = StringToInteger(str,order);
-}
-
-unsigned int Integer::WordCount() const
-{
-	return (unsigned int)CountWords(reg, reg.size());
-}
-
-unsigned int Integer::ByteCount() const
-{
-	unsigned wordCount = WordCount();
-	if (wordCount)
-		return (wordCount-1)*WORD_SIZE + BytePrecision(reg[wordCount-1]);
-	else
-		return 0;
-}
-
-unsigned int Integer::BitCount() const
-{
-	unsigned wordCount = WordCount();
-	if (wordCount)
-		return (wordCount-1)*WORD_BITS + BitPrecision(reg[wordCount-1]);
-	else
-		return 0;
-}
-
-void Integer::Decode(const byte *input, size_t inputLen, Signedness s)
-{
-	StringStore store(input, inputLen);
-	Decode(store, inputLen, s);
-}
-
-void Integer::Decode(BufferedTransformation &bt, size_t inputLen, Signedness s)
-{
-	CRYPTOPP_ASSERT(bt.MaxRetrievable() >= inputLen);
-
-	byte b;
-	bt.Peek(b);
-	sign = ((s==SIGNED) && (b & 0x80)) ? NEGATIVE : POSITIVE;
-
-	while (inputLen>0 && (sign==POSITIVE ? b==0 : b==0xff))
-	{
-		bt.Skip(1);
-		inputLen--;
-		bt.Peek(b);
-	}
-
-	// The call to CleanNew is optimized away above -O0/-Og.
-	const size_t size = RoundupSize(BytesToWords(inputLen));
-	reg.CleanNew(size);
-
-	CRYPTOPP_ASSERT(reg.SizeInBytes() >= inputLen);
-	for (size_t i=inputLen; i > 0; i--)
-	{
-		bt.Get(b);
-		reg[(i-1)/WORD_SIZE] |= word(b) << ((i-1)%WORD_SIZE)*8;
-	}
-
-	if (sign == NEGATIVE)
-	{
-		for (size_t i=inputLen; i<reg.size()*WORD_SIZE; i++)
-			reg[i/WORD_SIZE] |= word(0xff) << (i%WORD_SIZE)*8;
-		TwosComplement(reg, reg.size());
-	}
-}
-
-size_t Integer::MinEncodedSize(Signedness signedness) const
-{
-	// Profiling tells us the original second If was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-	unsigned int outputLen = STDMAX(1U, ByteCount());
-	const bool pre = (signedness == UNSIGNED);
-	if (!pre && NotNegative() && (GetByte(outputLen-1) & 0x80))
-		outputLen++;
-	if (pre)
-		return outputLen;
-	if (IsNegative() && *this < -Power2(outputLen*8-1))
-		outputLen++;
-	return outputLen;
-}
-
-void Integer::Encode(byte *output, size_t outputLen, Signedness signedness) const
-{
-	CRYPTOPP_ASSERT(output && outputLen);
-	ArraySink sink(output, outputLen);
-	Encode(sink, outputLen, signedness);
-}
-
-void Integer::Encode(BufferedTransformation &bt, size_t outputLen, Signedness signedness) const
-{
-	if (signedness == UNSIGNED || NotNegative())
-	{
-		for (size_t i=outputLen; i > 0; i--)
-			bt.Put(GetByte(i-1));
-	}
-	else
-	{
-		// take two's complement of *this
-		Integer temp = Integer::Power2(8*STDMAX((size_t)ByteCount(), outputLen)) + *this;
-		temp.Encode(bt, outputLen, UNSIGNED);
-	}
-}
-
-void Integer::DEREncode(BufferedTransformation &bt) const
-{
-	DERGeneralEncoder enc(bt, INTEGER);
-	Encode(enc, MinEncodedSize(SIGNED), SIGNED);
-	enc.MessageEnd();
-}
-
-void Integer::BERDecode(const byte *input, size_t len)
-{
-	StringStore store(input, len);
-	BERDecode(store);
-}
-
-void Integer::BERDecode(BufferedTransformation &bt)
-{
-	BERGeneralDecoder dec(bt, INTEGER);
-	if (!dec.IsDefiniteLength() || dec.MaxRetrievable() < dec.RemainingLength())
-		BERDecodeError();
-	Decode(dec, (size_t)dec.RemainingLength(), SIGNED);
-	dec.MessageEnd();
-}
-
-void Integer::DEREncodeAsOctetString(BufferedTransformation &bt, size_t length) const
-{
-	DERGeneralEncoder enc(bt, OCTET_STRING);
-	Encode(enc, length);
-	enc.MessageEnd();
-}
-
-void Integer::BERDecodeAsOctetString(BufferedTransformation &bt, size_t length)
-{
-	BERGeneralDecoder dec(bt, OCTET_STRING);
-	if (!dec.IsDefiniteLength() || dec.RemainingLength() != length)
-		BERDecodeError();
-	Decode(dec, length);
-	dec.MessageEnd();
-}
-
-size_t Integer::OpenPGPEncode(byte *output, size_t len) const
-{
-	ArraySink sink(output, len);
-	return OpenPGPEncode(sink);
-}
-
-size_t Integer::OpenPGPEncode(BufferedTransformation &bt) const
-{
-	word16 bitCount = word16(BitCount());
-	bt.PutWord16(bitCount);
-	size_t byteCount = BitsToBytes(bitCount);
-	Encode(bt, byteCount);
-	return 2 + byteCount;
-}
-
-void Integer::OpenPGPDecode(const byte *input, size_t len)
-{
-	StringStore store(input, len);
-	OpenPGPDecode(store);
-}
-
-void Integer::OpenPGPDecode(BufferedTransformation &bt)
-{
-	word16 bitCount;
-	if (bt.GetWord16(bitCount) != 2 || bt.MaxRetrievable() < BitsToBytes(bitCount))
-		throw OpenPGPDecodeErr();
-	Decode(bt, BitsToBytes(bitCount));
-}
-
-void Integer::Randomize(RandomNumberGenerator &rng, size_t nbits)
-{
-	const size_t nbytes = nbits/8 + 1;
-	SecByteBlock buf(nbytes);
-	rng.GenerateBlock(buf, nbytes);
-	if (nbytes)
-		buf[0] = (byte)Crop(buf[0], nbits % 8);
-	Decode(buf, nbytes, UNSIGNED);
-}
-
-void Integer::Randomize(RandomNumberGenerator &rng, const Integer &min, const Integer &max)
-{
-	if (min > max)
-		throw InvalidArgument("Integer: Min must be no greater than Max");
-
-	Integer range = max - min;
-	const unsigned int nbits = range.BitCount();
-
-	do
-	{
-		Randomize(rng, nbits);
-	}
-	while (*this > range);
-
-	*this += min;
-}
-
-bool Integer::Randomize(RandomNumberGenerator &rng, const Integer &min, const Integer &max, RandomNumberType rnType, const Integer &equiv, const Integer &mod)
-{
-	return GenerateRandomNoThrow(rng, MakeParameters("Min", min)("Max", max)("RandomNumberType", rnType)("EquivalentTo", equiv)("Mod", mod));
-}
-
-class KDF2_RNG : public RandomNumberGenerator
-{
-public:
-	KDF2_RNG(const byte *seed, size_t seedSize)
-		: m_counter(0), m_counterAndSeed(seedSize + 4)
-	{
-		memcpy(m_counterAndSeed + 4, seed, seedSize);
-	}
-
-	void GenerateBlock(byte *output, size_t size)
-	{
-		PutWord(false, BIG_ENDIAN_ORDER, m_counterAndSeed, m_counter);
-		++m_counter;
-		P1363_KDF2<SHA1>::DeriveKey(output, size, m_counterAndSeed, m_counterAndSeed.size(), NULL, 0);
-	}
-
-private:
-	word32 m_counter;
-	SecByteBlock m_counterAndSeed;
-};
-
-bool Integer::GenerateRandomNoThrow(RandomNumberGenerator &i_rng, const NameValuePairs &params)
-{
-	Integer min = params.GetValueWithDefault("Min", Integer::Zero());
-	Integer max;
-	if (!params.GetValue("Max", max))
-	{
-		int bitLength;
-		if (params.GetIntValue("BitLength", bitLength))
-			max = Integer::Power2(bitLength);
-		else
-			throw InvalidArgument("Integer: missing Max argument");
-	}
-	if (min > max)
-		throw InvalidArgument("Integer: Min must be no greater than Max");
-
-	Integer equiv = params.GetValueWithDefault("EquivalentTo", Integer::Zero());
-	Integer mod = params.GetValueWithDefault("Mod", Integer::One());
-
-	if (equiv.IsNegative() || equiv >= mod)
-		throw InvalidArgument("Integer: invalid EquivalentTo and/or Mod argument");
-
-	Integer::RandomNumberType rnType = params.GetValueWithDefault("RandomNumberType", Integer::ANY);
-
-	member_ptr<KDF2_RNG> kdf2Rng;
-	ConstByteArrayParameter seed;
-	if (params.GetValue(Name::Seed(), seed))
-	{
-		ByteQueue bq;
-		DERSequenceEncoder seq(bq);
-		min.DEREncode(seq);
-		max.DEREncode(seq);
-		equiv.DEREncode(seq);
-		mod.DEREncode(seq);
-		DEREncodeUnsigned(seq, rnType);
-		DEREncodeOctetString(seq, seed.begin(), seed.size());
-		seq.MessageEnd();
-
-		SecByteBlock finalSeed((size_t)bq.MaxRetrievable());
-		bq.Get(finalSeed, finalSeed.size());
-		kdf2Rng.reset(new KDF2_RNG(finalSeed.begin(), finalSeed.size()));
-	}
-	RandomNumberGenerator &rng = kdf2Rng.get() ? (RandomNumberGenerator &)*kdf2Rng : i_rng;
-
-	switch (rnType)
-	{
-		case ANY:
-			if (mod == One())
-				Randomize(rng, min, max);
-			else
-			{
-				Integer min1 = min + (equiv-min)%mod;
-				if (max < min1)
-					return false;
-				Randomize(rng, Zero(), (max - min1) / mod);
-				*this *= mod;
-				*this += min1;
-			}
-			return true;
-
-		case PRIME:
-		{
-			const PrimeSelector *pSelector = params.GetValueWithDefault(Name::PointerToPrimeSelector(), (const PrimeSelector *)NULL);
-
-			int i;
-			i = 0;
-			while (1)
-			{
-				if (++i==16)
-				{
-					// check if there are any suitable primes in [min, max]
-					Integer first = min;
-					if (FirstPrime(first, max, equiv, mod, pSelector))
-					{
-						// if there is only one suitable prime, we're done
-						*this = first;
-						if (!FirstPrime(first, max, equiv, mod, pSelector))
-							return true;
-					}
-					else
-						return false;
-				}
-
-				Randomize(rng, min, max);
-				if (FirstPrime(*this, STDMIN(*this+mod*PrimeSearchInterval(max), max), equiv, mod, pSelector))
-					return true;
-			}
-		}
-
-		default:
-			throw InvalidArgument("Integer: invalid RandomNumberType argument");
-	}
-}
-
-std::istream& operator>>(std::istream& in, Integer &a)
-{
-	char c;
-	unsigned int length = 0;
-	SecBlock<char> str(length + 16);
-
-	std::ws(in);
-
-	do
-	{
-		in.read(&c, 1);
-		str[length++] = c;
-		if (length >= str.size())
-			str.Grow(length + 16);
-	}
-	while (in && (c=='-' || c=='x' || (c>='0' && c<='9') || (c>='a' && c<='f') || (c>='A' && c<='F') || c=='h' || c=='H' || c=='o' || c=='O' || c==',' || c=='.'));
-
-	if (in.gcount())
-		in.putback(c);
-	str[length-1] = '\0';
-	a = Integer(str);
-
-	return in;
-}
-
-std::ostream& operator<<(std::ostream& out, const Integer &a)
-{
-	// Get relevant conversion specifications from ostream.
-	const long f = out.flags() & std::ios::basefield; // Get base digits.
-	int base, block;
-	char suffix;
-	switch(f)
-	{
-	case std::ios::oct :
-		base = 8;
-		block = 8;
-		suffix = 'o';
-		break;
-	case std::ios::hex :
-		base = 16;
-		block = 4;
-		suffix = 'h';
-		break;
-	default :
-		base = 10;
-		block = 3;
-		suffix = '.';
-	}
-
-	Integer temp1=a, temp2;
-
-	if (a.IsNegative())
-	{
-		out << '-';
-		temp1.Negate();
-	}
-
-	if (!a)
-		out << '0';
-
-	static const char upper[]="0123456789ABCDEF";
-	static const char lower[]="0123456789abcdef";
-
-	const char* vec = (out.flags() & std::ios::uppercase) ? upper : lower;
-	unsigned int i=0;
-	SecBlock<char> s(a.BitCount() / (SaturatingSubtract1(BitPrecision(base),1U)) + 1);
-
-	while (!!temp1)
-	{
-		word digit;
-		Integer::Divide(digit, temp2, temp1, base);
-		s[i++]=vec[digit];
-		temp1.swap(temp2);
-	}
-
-	while (i--)
-	{
-		out << s[i];
-//		if (i && !(i%block))
-//			out << ",";
-	}
-
-#ifdef CRYPTOPP_USE_STD_SHOWBASE
-	if (out.flags() & std::ios_base::showbase)
-		out << suffix;
-
-	return out;
-#else
- 	return out << suffix;
-#endif
-}
-
-Integer& Integer::operator++()
-{
-	if (NotNegative())
-	{
-		if (Increment(reg, reg.size()))
-		{
-			reg.CleanGrow(2*reg.size());
-			reg[reg.size()/2]=1;
-		}
-	}
-	else
-	{
-		word borrow = Decrement(reg, reg.size());
-		CRYPTOPP_ASSERT(!borrow);
-		CRYPTOPP_UNUSED(borrow);
-
-		if (WordCount()==0)
-			*this = Zero();
-	}
-	return *this;
-}
-
-Integer& Integer::operator--()
-{
-	if (IsNegative())
-	{
-		if (Increment(reg, reg.size()))
-		{
-			reg.CleanGrow(2*reg.size());
-			reg[reg.size()/2]=1;
-		}
-	}
-	else
-	{
-		if (Decrement(reg, reg.size()))
-			*this = -One();
-	}
-	return *this;
-}
-
-void PositiveAdd(Integer &sum, const Integer &a, const Integer& b)
-{
-	// Profiling tells us the original second Else If was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-	int carry; const bool pre = (a.reg.size() == b.reg.size());
-	if (!pre && a.reg.size() > b.reg.size())
-	{
-		carry = Add(sum.reg, a.reg, b.reg, b.reg.size());
-		CopyWords(sum.reg+b.reg.size(), a.reg+b.reg.size(), a.reg.size()-b.reg.size());
-		carry = Increment(sum.reg+b.reg.size(), a.reg.size()-b.reg.size(), carry);
-	}
-	else if (pre)
-	{
-		carry = Add(sum.reg, a.reg, b.reg, a.reg.size());
-	}
-	else
-	{
-		carry = Add(sum.reg, a.reg, b.reg, a.reg.size());
-		CopyWords(sum.reg+a.reg.size(), b.reg+a.reg.size(), b.reg.size()-a.reg.size());
-		carry = Increment(sum.reg+a.reg.size(), b.reg.size()-a.reg.size(), carry);
-	}
-
-	if (carry)
-	{
-		sum.reg.CleanGrow(2*sum.reg.size());
-		sum.reg[sum.reg.size()/2] = 1;
-	}
-	sum.sign = Integer::POSITIVE;
-}
-
-void PositiveSubtract(Integer &diff, const Integer &a, const Integer& b)
-{
-	unsigned aSize = a.WordCount();
-	aSize += aSize%2;
-	unsigned bSize = b.WordCount();
-	bSize += bSize%2;
-
-	// Profiling tells us the original second Else If was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-	if (aSize > bSize)
-	{
-		word borrow = Subtract(diff.reg, a.reg, b.reg, bSize);
-		CopyWords(diff.reg+bSize, a.reg+bSize, aSize-bSize);
-		borrow = Decrement(diff.reg+bSize, aSize-bSize, borrow);
-		CRYPTOPP_ASSERT(!borrow);
-		diff.sign = Integer::POSITIVE;
-	}
-	else if (aSize == bSize)
-	{
-		if (Compare(a.reg, b.reg, aSize) >= 0)
-		{
-			Subtract(diff.reg, a.reg, b.reg, aSize);
-			diff.sign = Integer::POSITIVE;
-		}
-		else
-		{
-			Subtract(diff.reg, b.reg, a.reg, aSize);
-			diff.sign = Integer::NEGATIVE;
-		}
-	}
-	else
-	{
-		word borrow = Subtract(diff.reg, b.reg, a.reg, aSize);
-		CopyWords(diff.reg+aSize, b.reg+aSize, bSize-aSize);
-		borrow = Decrement(diff.reg+aSize, bSize-aSize, borrow);
-		CRYPTOPP_ASSERT(!borrow);
-		diff.sign = Integer::NEGATIVE;
-	}
-}
-
-// MSVC .NET 2003 workaround
-template <class T> inline const T& STDMAX2(const T& a, const T& b)
-{
-	return a < b ? b : a;
-}
-
-Integer Integer::Plus(const Integer& b) const
-{
-	Integer sum((word)0, STDMAX2(reg.size(), b.reg.size()));
-	if (NotNegative())
-	{
-		if (b.NotNegative())
-			PositiveAdd(sum, *this, b);
-		else
-			PositiveSubtract(sum, *this, b);
-	}
-	else
-	{
-		if (b.NotNegative())
-			PositiveSubtract(sum, b, *this);
-		else
-		{
-			PositiveAdd(sum, *this, b);
-			sum.sign = Integer::NEGATIVE;
-		}
-	}
-	return sum;
-}
-
-Integer& Integer::operator+=(const Integer& t)
-{
-	reg.CleanGrow(t.reg.size());
-	if (NotNegative())
-	{
-		if (t.NotNegative())
-			PositiveAdd(*this, *this, t);
-		else
-			PositiveSubtract(*this, *this, t);
-	}
-	else
-	{
-		if (t.NotNegative())
-			PositiveSubtract(*this, t, *this);
-		else
-		{
-			PositiveAdd(*this, *this, t);
-			sign = Integer::NEGATIVE;
-		}
-	}
-	return *this;
-}
-
-Integer Integer::Minus(const Integer& b) const
-{
-	Integer diff((word)0, STDMAX2(reg.size(), b.reg.size()));
-	if (NotNegative())
-	{
-		if (b.NotNegative())
-			PositiveSubtract(diff, *this, b);
-		else
-			PositiveAdd(diff, *this, b);
-	}
-	else
-	{
-		if (b.NotNegative())
-		{
-			PositiveAdd(diff, *this, b);
-			diff.sign = Integer::NEGATIVE;
-		}
-		else
-			PositiveSubtract(diff, b, *this);
-	}
-	return diff;
-}
-
-Integer& Integer::operator-=(const Integer& t)
-{
-	reg.CleanGrow(t.reg.size());
-	if (NotNegative())
-	{
-		if (t.NotNegative())
-			PositiveSubtract(*this, *this, t);
-		else
-			PositiveAdd(*this, *this, t);
-	}
-	else
-	{
-		if (t.NotNegative())
-		{
-			PositiveAdd(*this, *this, t);
-			sign = Integer::NEGATIVE;
-		}
-		else
-			PositiveSubtract(*this, t, *this);
-	}
-	return *this;
-}
-
-Integer& Integer::operator<<=(size_t n)
-{
-	const size_t wordCount = WordCount();
-	const size_t shiftWords = n / WORD_BITS;
-	const unsigned int shiftBits = (unsigned int)(n % WORD_BITS);
-
-	reg.CleanGrow(RoundupSize(wordCount+BitsToWords(n)));
-	ShiftWordsLeftByWords(reg, wordCount + shiftWords, shiftWords);
-	ShiftWordsLeftByBits(reg+shiftWords, wordCount+BitsToWords(shiftBits), shiftBits);
-	return *this;
-}
-
-Integer& Integer::operator>>=(size_t n)
-{
-	const size_t wordCount = WordCount();
-	const size_t shiftWords = n / WORD_BITS;
-	const unsigned int shiftBits = (unsigned int)(n % WORD_BITS);
-
-	ShiftWordsRightByWords(reg, wordCount, shiftWords);
-	if (wordCount > shiftWords)
-		ShiftWordsRightByBits(reg, wordCount-shiftWords, shiftBits);
-	if (IsNegative() && WordCount()==0)   // avoid -0
-		*this = Zero();
-	return *this;
-}
-
-void PositiveMultiply(Integer &product, const Integer &a, const Integer &b)
-{
-	size_t aSize = RoundupSize(a.WordCount());
-	size_t bSize = RoundupSize(b.WordCount());
-
-	product.reg.CleanNew(RoundupSize(aSize+bSize));
-	product.sign = Integer::POSITIVE;
-
-	IntegerSecBlock workspace(aSize + bSize);
-	AsymmetricMultiply(product.reg, workspace, a.reg, aSize, b.reg, bSize);
-}
-
-void Multiply(Integer &product, const Integer &a, const Integer &b)
-{
-	PositiveMultiply(product, a, b);
-
-	if (a.NotNegative() != b.NotNegative())
-		product.Negate();
-}
-
-Integer Integer::Times(const Integer &b) const
-{
-	Integer product;
-	Multiply(product, *this, b);
-	return product;
-}
-
-/*
-void PositiveDivide(Integer &remainder, Integer &quotient,
-				   const Integer &dividend, const Integer &divisor)
-{
-	remainder.reg.CleanNew(divisor.reg.size());
-	remainder.sign = Integer::POSITIVE;
-	quotient.reg.New(0);
-	quotient.sign = Integer::POSITIVE;
-	unsigned i=dividend.BitCount();
-	while (i--)
-	{
-		word overflow = ShiftWordsLeftByBits(remainder.reg, remainder.reg.size(), 1);
-		remainder.reg[0] |= dividend[i];
-		if (overflow || remainder >= divisor)
-		{
-			Subtract(remainder.reg, remainder.reg, divisor.reg, remainder.reg.size());
-			quotient.SetBit(i);
-		}
-	}
-}
-*/
-
-void PositiveDivide(Integer &remainder, Integer &quotient,
-				   const Integer &a, const Integer &b)
-{
-	unsigned aSize = a.WordCount();
-	unsigned bSize = b.WordCount();
-
-	if (!bSize)
-		throw Integer::DivideByZero();
-
-	if (aSize < bSize)
-	{
-		remainder = a;
-		remainder.sign = Integer::POSITIVE;
-		quotient = Integer::Zero();
-		return;
-	}
-
-	aSize += aSize%2;	// round up to next even number
-	bSize += bSize%2;
-
-	remainder.reg.CleanNew(RoundupSize(bSize));
-	remainder.sign = Integer::POSITIVE;
-	quotient.reg.CleanNew(RoundupSize(aSize-bSize+2));
-	quotient.sign = Integer::POSITIVE;
-
-	IntegerSecBlock T(aSize+3*(bSize+2));
-	Divide(remainder.reg, quotient.reg, T, a.reg, aSize, b.reg, bSize);
-}
-
-void Integer::Divide(Integer &remainder, Integer &quotient, const Integer &dividend, const Integer &divisor)
-{
-	PositiveDivide(remainder, quotient, dividend, divisor);
-
-	if (dividend.IsNegative())
-	{
-		quotient.Negate();
-		if (remainder.NotZero())
-		{
-			--quotient;
-			remainder = divisor.AbsoluteValue() - remainder;
-		}
-	}
-
-	if (divisor.IsNegative())
-		quotient.Negate();
-}
-
-void Integer::DivideByPowerOf2(Integer &r, Integer &q, const Integer &a, unsigned int n)
-{
-	q = a;
-	q >>= n;
-
-	const size_t wordCount = BitsToWords(n);
-	if (wordCount <= a.WordCount())
-	{
-		r.reg.resize(RoundupSize(wordCount));
-		CopyWords(r.reg, a.reg, wordCount);
-		SetWords(r.reg+wordCount, 0, r.reg.size()-wordCount);
-		if (n % WORD_BITS != 0)
-			r.reg[wordCount-1] %= (word(1) << (n % WORD_BITS));
-	}
-	else
-	{
-		r.reg.resize(RoundupSize(a.WordCount()));
-		CopyWords(r.reg, a.reg, r.reg.size());
-	}
-	r.sign = POSITIVE;
-
-	if (a.IsNegative() && r.NotZero())
-	{
-		--q;
-		r = Power2(n) - r;
-	}
-}
-
-Integer Integer::DividedBy(const Integer &b) const
-{
-	Integer remainder, quotient;
-	Integer::Divide(remainder, quotient, *this, b);
-	return quotient;
-}
-
-Integer Integer::Modulo(const Integer &b) const
-{
-	Integer remainder, quotient;
-	Integer::Divide(remainder, quotient, *this, b);
-	return remainder;
-}
-
-void Integer::Divide(word &remainder, Integer &quotient, const Integer &dividend, word divisor)
-{
-	if (!divisor)
-		throw Integer::DivideByZero();
-
-	if ((divisor & (divisor-1)) == 0)	// divisor is a power of 2
-	{
-		quotient = dividend >> (BitPrecision(divisor)-1);
-		remainder = dividend.reg[0] & (divisor-1);
-		return;
-	}
-
-	unsigned int i = dividend.WordCount();
-	quotient.reg.CleanNew(RoundupSize(i));
-	remainder = 0;
-	while (i--)
-	{
-		quotient.reg[i] = DWord(dividend.reg[i], remainder) / divisor;
-		remainder = DWord(dividend.reg[i], remainder) % divisor;
-	}
-
-	if (dividend.NotNegative())
-		quotient.sign = POSITIVE;
-	else
-	{
-		quotient.sign = NEGATIVE;
-		if (remainder)
-		{
-			--quotient;
-			remainder = divisor - remainder;
-		}
-	}
-}
-
-Integer Integer::DividedBy(word b) const
-{
-	word remainder;
-	Integer quotient;
-	Integer::Divide(remainder, quotient, *this, b);
-	return quotient;
-}
-
-word Integer::Modulo(word divisor) const
-{
-	if (!divisor)
-		throw Integer::DivideByZero();
-
-	word remainder;
-
-	// Profiling tells us the original Else was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-	if ((divisor & (divisor-1)) != 0)	// divisor is not a power of 2
-	{
-		// Profiling tells us the original Else was dominant, so it was promoted to the first If statement.
-		// The code change occurred at Commit dc99266599a0e72d.
-		unsigned int i = WordCount();
-		if (divisor > 5)
-		{
-			remainder = 0;
-			while (i--)
-				remainder = DWord(reg[i], remainder) % divisor;
-		}
-		else
-		{
-			DWord sum(0, 0);
-			while (i--)
-				sum += reg[i];
-			remainder = sum % divisor;
-		}
-	}
-	else  // divisor is a power of 2
-	{
-		remainder = reg[0] & (divisor-1);
-	}
-
-	if (IsNegative() && remainder)
-		remainder = divisor - remainder;
-
-	return remainder;
-}
-
-void Integer::Negate()
-{
-	if (!!(*this))	// don't flip sign if *this==0
-		sign = Sign(1-sign);
-}
-
-int Integer::PositiveCompare(const Integer& t) const
-{
-	// Profiling tells us the original Else was dominant, so it was promoted to the first If statement.
-	// The code change occurred at Commit dc99266599a0e72d.
-	const unsigned size = WordCount(), tSize = t.WordCount();
-	if (size != tSize)
-		return size > tSize ? 1 : -1;
-	else
-		return CryptoPP::Compare(reg, t.reg, size);
-}
-
-int Integer::Compare(const Integer& t) const
-{
-	if (NotNegative())
-	{
-		if (t.NotNegative())
-			return PositiveCompare(t);
-		else
-			return 1;
-	}
-	else
-	{
-		if (t.NotNegative())
-			return -1;
-		else
-			return -PositiveCompare(t);
-	}
-}
-
-Integer Integer::SquareRoot() const
-{
-	if (!IsPositive())
-		return Zero();
-
-	// overestimate square root
-	Integer x, y = Power2((BitCount()+1)/2);
-	CRYPTOPP_ASSERT(y*y >= *this);
-
-	do
-	{
-		x = y;
-		y = (x + *this/x) >> 1;
-	} while (y<x);
-
-	return x;
-}
-
-bool Integer::IsSquare() const
-{
-	Integer r = SquareRoot();
-	return *this == r.Squared();
-}
-
-bool Integer::IsUnit() const
-{
-	return (WordCount() == 1) && (reg[0] == 1);
-}
-
-Integer Integer::MultiplicativeInverse() const
-{
-	return IsUnit() ? *this : Zero();
-}
-
-Integer a_times_b_mod_c(const Integer &x, const Integer& y, const Integer& m)
-{
-	return x*y%m;
-}
-
-Integer a_exp_b_mod_c(const Integer &x, const Integer& e, const Integer& m)
-{
-	ModularArithmetic mr(m);
-	return mr.Exponentiate(x, e);
-}
-
-Integer Integer::Gcd(const Integer &a, const Integer &b)
-{
-	return EuclideanDomainOf<Integer>().Gcd(a, b);
-}
-
-Integer Integer::InverseMod(const Integer &m) const
-{
-	CRYPTOPP_ASSERT(m.NotNegative());
-
-	if (IsNegative())
-		return Modulo(m).InverseMod(m);
-
-	if (m.IsEven())
-	{
-		if (!m || IsEven())
-			return Zero();	// no inverse
-		if (*this == One())
-			return One();
-
-		Integer u = m.Modulo(*this).InverseMod(*this);
-		return !u ? Zero() : (m*(*this-u)+1)/(*this);
-	}
-
-	SecBlock<word> T(m.reg.size() * 4);
-	Integer r((word)0, m.reg.size());
-	unsigned k = AlmostInverse(r.reg, T, reg, reg.size(), m.reg, m.reg.size());
-	DivideByPower2Mod(r.reg, r.reg, k, m.reg, m.reg.size());
-	return r;
-}
-
-word Integer::InverseMod(word mod) const
-{
-	word g0 = mod, g1 = *this % mod;
-	word v0 = 0, v1 = 1;
-	word y;
-
-	while (g1)
-	{
-		if (g1 == 1)
-			return v1;
-		y = g0 / g1;
-		g0 = g0 % g1;
-		v0 += y * v1;
-
-		if (!g0)
-			break;
-		if (g0 == 1)
-			return mod-v0;
-		y = g1 / g0;
-		g1 = g1 % g0;
-		v1 += y * v0;
-	}
-	return 0;
-}
-
-// ********************************************************
-
-ModularArithmetic::ModularArithmetic(BufferedTransformation &bt)
-{
-	BERSequenceDecoder seq(bt);
-	OID oid(seq);
-	if (oid != ASN1::prime_field())
-		BERDecodeError();
-	m_modulus.BERDecode(seq);
-	seq.MessageEnd();
-	m_result.reg.resize(m_modulus.reg.size());
-}
-
-void ModularArithmetic::DEREncode(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder seq(bt);
-	ASN1::prime_field().DEREncode(seq);
-	m_modulus.DEREncode(seq);
-	seq.MessageEnd();
-}
-
-void ModularArithmetic::DEREncodeElement(BufferedTransformation &out, const Element &a) const
-{
-	a.DEREncodeAsOctetString(out, MaxElementByteLength());
-}
-
-void ModularArithmetic::BERDecodeElement(BufferedTransformation &in, Element &a) const
-{
-	a.BERDecodeAsOctetString(in, MaxElementByteLength());
-}
-
-const Integer& ModularArithmetic::Half(const Integer &a) const
-{
-	if (a.reg.size()==m_modulus.reg.size())
-	{
-		CryptoPP::DivideByPower2Mod(m_result.reg.begin(), a.reg, 1, m_modulus.reg, a.reg.size());
-		return m_result;
-	}
-	else
-		return m_result1 = (a.IsEven() ? (a >> 1) : ((a+m_modulus) >> 1));
-}
-
-const Integer& ModularArithmetic::Add(const Integer &a, const Integer &b) const
-{
-	if (a.reg.size()==m_modulus.reg.size() && b.reg.size()==m_modulus.reg.size())
-	{
-		if (CryptoPP::Add(m_result.reg.begin(), a.reg, b.reg, a.reg.size())
-			|| Compare(m_result.reg, m_modulus.reg, a.reg.size()) >= 0)
-		{
-			CryptoPP::Subtract(m_result.reg.begin(), m_result.reg, m_modulus.reg, a.reg.size());
-		}
-		return m_result;
-	}
-	else
-	{
-		m_result1 = a+b;
-		if (m_result1 >= m_modulus)
-			m_result1 -= m_modulus;
-		return m_result1;
-	}
-}
-
-Integer& ModularArithmetic::Accumulate(Integer &a, const Integer &b) const
-{
-	if (a.reg.size()==m_modulus.reg.size() && b.reg.size()==m_modulus.reg.size())
-	{
-		if (CryptoPP::Add(a.reg, a.reg, b.reg, a.reg.size())
-			|| Compare(a.reg, m_modulus.reg, a.reg.size()) >= 0)
-		{
-			CryptoPP::Subtract(a.reg, a.reg, m_modulus.reg, a.reg.size());
-		}
-	}
-	else
-	{
-		a+=b;
-		if (a>=m_modulus)
-			a-=m_modulus;
-	}
-
-	return a;
-}
-
-const Integer& ModularArithmetic::Subtract(const Integer &a, const Integer &b) const
-{
-	if (a.reg.size()==m_modulus.reg.size() && b.reg.size()==m_modulus.reg.size())
-	{
-		if (CryptoPP::Subtract(m_result.reg.begin(), a.reg, b.reg, a.reg.size()))
-			CryptoPP::Add(m_result.reg.begin(), m_result.reg, m_modulus.reg, a.reg.size());
-		return m_result;
-	}
-	else
-	{
-		m_result1 = a-b;
-		if (m_result1.IsNegative())
-			m_result1 += m_modulus;
-		return m_result1;
-	}
-}
-
-Integer& ModularArithmetic::Reduce(Integer &a, const Integer &b) const
-{
-	if (a.reg.size()==m_modulus.reg.size() && b.reg.size()==m_modulus.reg.size())
-	{
-		if (CryptoPP::Subtract(a.reg, a.reg, b.reg, a.reg.size()))
-			CryptoPP::Add(a.reg, a.reg, m_modulus.reg, a.reg.size());
-	}
-	else
-	{
-		a-=b;
-		if (a.IsNegative())
-			a+=m_modulus;
-	}
-
-	return a;
-}
-
-const Integer& ModularArithmetic::Inverse(const Integer &a) const
-{
-	if (!a)
-		return a;
-
-	CopyWords(m_result.reg.begin(), m_modulus.reg, m_modulus.reg.size());
-	if (CryptoPP::Subtract(m_result.reg.begin(), m_result.reg, a.reg, a.reg.size()))
-		Decrement(m_result.reg.begin()+a.reg.size(), m_modulus.reg.size()-a.reg.size());
-
-	return m_result;
-}
-
-Integer ModularArithmetic::CascadeExponentiate(const Integer &x, const Integer &e1, const Integer &y, const Integer &e2) const
-{
-	if (m_modulus.IsOdd())
-	{
-		MontgomeryRepresentation dr(m_modulus);
-		return dr.ConvertOut(dr.CascadeExponentiate(dr.ConvertIn(x), e1, dr.ConvertIn(y), e2));
-	}
-	else
-		return AbstractRing<Integer>::CascadeExponentiate(x, e1, y, e2);
-}
-
-void ModularArithmetic::SimultaneousExponentiate(Integer *results, const Integer &base, const Integer *exponents, unsigned int exponentsCount) const
-{
-	if (m_modulus.IsOdd())
-	{
-		MontgomeryRepresentation dr(m_modulus);
-		dr.SimultaneousExponentiate(results, dr.ConvertIn(base), exponents, exponentsCount);
-		for (unsigned int i=0; i<exponentsCount; i++)
-			results[i] = dr.ConvertOut(results[i]);
-	}
-	else
-		AbstractRing<Integer>::SimultaneousExponentiate(results, base, exponents, exponentsCount);
-}
-
-MontgomeryRepresentation::MontgomeryRepresentation(const Integer &m)	// modulus must be odd
-	: ModularArithmetic(m),
-	  m_u((word)0, m_modulus.reg.size()),
-	  m_workspace(5*m_modulus.reg.size())
-{
-	if (!m_modulus.IsOdd())
-		throw InvalidArgument("MontgomeryRepresentation: Montgomery representation requires an odd modulus");
-
-	RecursiveInverseModPower2(m_u.reg, m_workspace, m_modulus.reg, m_modulus.reg.size());
-}
-
-const Integer& MontgomeryRepresentation::Multiply(const Integer &a, const Integer &b) const
-{
-	word *const T = m_workspace.begin();
-	word *const R = m_result.reg.begin();
-	const size_t N = m_modulus.reg.size();
-	CRYPTOPP_ASSERT(a.reg.size()<=N && b.reg.size()<=N);
-
-	AsymmetricMultiply(T, T+2*N, a.reg, a.reg.size(), b.reg, b.reg.size());
-	SetWords(T+a.reg.size()+b.reg.size(), 0, 2*N-a.reg.size()-b.reg.size());
-	MontgomeryReduce(R, T+2*N, T, m_modulus.reg, m_u.reg, N);
-	return m_result;
-}
-
-const Integer& MontgomeryRepresentation::Square(const Integer &a) const
-{
-	word *const T = m_workspace.begin();
-	word *const R = m_result.reg.begin();
-	const size_t N = m_modulus.reg.size();
-	CRYPTOPP_ASSERT(a.reg.size()<=N);
-
-	CryptoPP::Square(T, T+2*N, a.reg, a.reg.size());
-	SetWords(T+2*a.reg.size(), 0, 2*N-2*a.reg.size());
-	MontgomeryReduce(R, T+2*N, T, m_modulus.reg, m_u.reg, N);
-	return m_result;
-}
-
-Integer MontgomeryRepresentation::ConvertOut(const Integer &a) const
-{
-	word *const T = m_workspace.begin();
-	word *const R = m_result.reg.begin();
-	const size_t N = m_modulus.reg.size();
-	CRYPTOPP_ASSERT(a.reg.size()<=N);
-
-	CopyWords(T, a.reg, a.reg.size());
-	SetWords(T+a.reg.size(), 0, 2*N-a.reg.size());
-	MontgomeryReduce(R, T+2*N, T, m_modulus.reg, m_u.reg, N);
-	return m_result;
-}
-
-const Integer& MontgomeryRepresentation::MultiplicativeInverse(const Integer &a) const
-{
-//	  return (EuclideanMultiplicativeInverse(a, modulus)<<(2*WORD_BITS*modulus.reg.size()))%modulus;
-	word *const T = m_workspace.begin();
-	word *const R = m_result.reg.begin();
-	const size_t N = m_modulus.reg.size();
-	CRYPTOPP_ASSERT(a.reg.size()<=N);
-
-	CopyWords(T, a.reg, a.reg.size());
-	SetWords(T+a.reg.size(), 0, 2*N-a.reg.size());
-	MontgomeryReduce(R, T+2*N, T, m_modulus.reg, m_u.reg, N);
-	unsigned k = AlmostInverse(R, T, R, N, m_modulus.reg, N);
-
-//	cout << "k=" << k << " N*32=" << 32*N << endl;
-
-	if (k>N*WORD_BITS)
-		DivideByPower2Mod(R, R, k-N*WORD_BITS, m_modulus.reg, N);
-	else
-		MultiplyByPower2Mod(R, R, N*WORD_BITS-k, m_modulus.reg, N);
-
-	return m_result;
-}
-
-// Specialization declared in misc.h to allow us to print integers
-//  with additional control options, like arbirary bases and uppercase.
-template <> CRYPTOPP_DLL
-std::string IntToString<Integer>(Integer value, unsigned int base)
-{
-	// Hack... set the high bit for uppercase. Set the next bit fo a suffix.
-	static const unsigned int BIT_32 = (1U << 31);
-	const bool UPPER = !!(base & BIT_32);
-	static const unsigned int BIT_31 = (1U << 30);
-	const bool BASE = !!(base & BIT_31);
-
-	const char CH = UPPER ? 'A' : 'a';
-	base &= ~(BIT_32|BIT_31);
-	CRYPTOPP_ASSERT(base >= 2 && base <= 32);
-
-	if (value == 0)
-		return "0";
-
-	bool negative = false, zero = false;
-	if (value.IsNegative())
-	{
-		negative = true;
-		value.Negate();
-	}
-
-	if (!value)
-		zero = true;
-
-	SecBlock<char> s(value.BitCount() / (SaturatingSubtract1(BitPrecision(base),1U)) + 1);
-	Integer temp;
-
-	unsigned int i=0;
-	while (!!value)
-	{
-		word digit;
-		Integer::Divide(digit, temp, value, word(base));
-		s[i++]=char((digit < 10 ? '0' : (CH - 10)) + digit);
-		value.swap(temp);
-	}
-
-	std::string result;
-	result.reserve(i+2);
-
-	if (negative)
-		result += '-';
-
-	if (zero)
-		result += '0';
-
-	while (i--)
-		result += s[i];
-
-	if (BASE)
-	{
-		if (base == 10)
-			result += '.';
-		else if (base == 16)
-			result += 'h';
-		else if (base == 8)
-			result += 'o';
-		else if (base == 2)
-			result += 'b';
-	}
-
-	return result;
-}
-
-// Specialization declared in misc.h to avoid Coverity findings.
-template <> CRYPTOPP_DLL
-std::string IntToString<word64>(word64 value, unsigned int base)
-{
-	// Hack... set the high bit for uppercase.
-	static const unsigned int HIGH_BIT = (1U << 31);
-	const char CH = !!(base & HIGH_BIT) ? 'A' : 'a';
-	base &= ~HIGH_BIT;
-
-	CRYPTOPP_ASSERT(base >= 2);
-	if (value == 0)
-		return "0";
-
-	std::string result;
-	while (value > 0)
-	{
-		word64 digit = value % base;
-		result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result;
-		value /= base;
-	}
-	return result;
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/integer.h b/src-cryptopp/integer.h
deleted file mode 100644
index f289779..0000000
--- a/src-cryptopp/integer.h
+++ /dev/null
@@ -1,614 +0,0 @@
-// integer.h - written and placed in the public domain by Wei Dai
-
-//! \file integer.h
-//! \brief Multiple precision integer with arithmetic operations
-//! \details The Integer class can represent positive and negative integers
-//!   with absolute value less than (256**sizeof(word))<sup>(256**sizeof(int))</sup>.
-//! \details Internally, the library uses a sign magnitude representation, and the class
-//!   has two data members. The first is a IntegerSecBlock (a SecBlock<word>) and it is
-//!   used to hold the representation. The second is a Sign, and its is used to track
-//!   the sign of the Integer.
-
-#ifndef CRYPTOPP_INTEGER_H
-#define CRYPTOPP_INTEGER_H
-
-#include "cryptlib.h"
-#include "secblock.h"
-#include "stdcpp.h"
-
-#include <iosfwd>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \struct InitializeInteger
-//! Performs static intialization of the Integer class
-struct InitializeInteger
-{
-	InitializeInteger();
-};
-
-// http://github.com/weidai11/cryptopp/issues/256
-#if defined(CRYPTOPP_WORD128_AVAILABLE)
-typedef SecBlock<word, AllocatorWithCleanup<word, true> > IntegerSecBlock;
-#else
-typedef SecBlock<word, AllocatorWithCleanup<word, CRYPTOPP_BOOL_X86> > IntegerSecBlock;
-#endif
-
-//! \brief Multiple precision integer with arithmetic operations
-//! \details The Integer class can represent positive and negative integers
-//!   with absolute value less than (256**sizeof(word))<sup>(256**sizeof(int))</sup>.
-//! \details Internally, the library uses a sign magnitude representation, and the class
-//!   has two data members. The first is a IntegerSecBlock (a SecBlock<word>) and it is
-//!   used to hold the representation. The second is a Sign, and its is used to track
-//!   the sign of the Integer.
-//! \nosubgrouping
-class CRYPTOPP_DLL Integer : private InitializeInteger, public ASN1Object
-{
-public:
-	//! \name ENUMS, EXCEPTIONS, and TYPEDEFS
-	//@{
-		//! \brief Exception thrown when division by 0 is encountered
-		class DivideByZero : public Exception
-		{
-		public:
-			DivideByZero() : Exception(OTHER_ERROR, "Integer: division by zero") {}
-		};
-
-		//! \brief Exception thrown when a random number cannot be found that
-		//!   satisfies the condition
-		class RandomNumberNotFound : public Exception
-		{
-		public:
-			RandomNumberNotFound() : Exception(OTHER_ERROR, "Integer: no integer satisfies the given parameters") {}
-		};
-
-		//! \enum Sign
-		//! \brief Used internally to represent the integer
-		//! \details Sign is used internally to represent the integer. It is also used in a few API functions.
-		//! \sa Signedness
-		enum Sign {
-			//! \brief the value is positive or 0
-			POSITIVE=0,
-			//! \brief the value is negative
-			NEGATIVE=1};
-
-		//! \enum Signedness
-		//! \brief Used when importing and exporting integers
-		//! \details Signedness is usually used in API functions.
-		//! \sa Sign
-		enum Signedness {
-			//! \brief an unsigned value
-			UNSIGNED,
-			//! \brief a signed value
-			SIGNED};
-
-		//! \enum RandomNumberType
-		//! \brief Properties of a random integer
-		enum RandomNumberType {
-			//! \brief a number with no special properties
-			ANY,
-			//! \brief a number which is probabilistically prime
-			PRIME};
-	//@}
-
-	//! \name CREATORS
-	//@{
-		//! \brief Creates the zero integer
-		Integer();
-
-		//! copy constructor
-		Integer(const Integer& t);
-
-		//! \brief Convert from signed long
-		Integer(signed long value);
-
-		//! \brief Convert from lword
-		//! \param sign enumeration indicating Sign
-		//! \param value the long word
-		Integer(Sign sign, lword value);
-
-		//! \brief Convert from two words
-		//! \param sign enumeration indicating Sign
-		//! \param highWord the high word
-		//! \param lowWord the low word
-		Integer(Sign sign, word highWord, word lowWord);
-
-		//! \brief Convert from a C-string
-		//! \param str C-string value
-		//! \param order byte order
-		//! \details \p str can be in base 2, 8, 10, or 16. Base is determined by a case
-		//!   insensitive suffix of 'h', 'o', or 'b'.  No suffix means base 10.
-		//! \details Byte order was added at Crypto++ 5.7 to allow use of little-endian
-		//!   integers with curve25519, Poly1305 and Microsoft CAPI.
-		explicit Integer(const char *str, ByteOrder order = BIG_ENDIAN_ORDER);
-
-		//! \brief Convert from a wide C-string
-		//! \param str wide C-string value
-		//! \param order byte order
-		//! \details \p str can be in base 2, 8, 10, or 16. Base is determined by a case
-		//!   insensitive suffix of 'h', 'o', or 'b'.  No suffix means base 10.
-		//! \details Byte order was added at Crypto++ 5.7 to allow use of little-endian
-		//!   integers with curve25519, Poly1305 and Microsoft CAPI.
-		explicit Integer(const wchar_t *str, ByteOrder order = BIG_ENDIAN_ORDER);
-
-		//! \brief Convert from a big-endian byte array
-		//! \param encodedInteger big-endian byte array
-		//! \param byteCount length of the byte array
-		//! \param sign enumeration indicating Signedness
-		//! \param order byte order
-		//! \details Byte order was added at Crypto++ 5.7 to allow use of little-endian
-		//!   integers with curve25519, Poly1305 and Microsoft CAPI.
-		Integer(const byte *encodedInteger, size_t byteCount, Signedness sign=UNSIGNED, ByteOrder order = BIG_ENDIAN_ORDER);
-
-		//! \brief Convert from a big-endian array
-		//! \param bt BufferedTransformation object with big-endian byte array
-		//! \param byteCount length of the byte array
-		//! \param sign enumeration indicating Signedness
-		//! \param order byte order
-		//! \details Byte order was added at Crypto++ 5.7 to allow use of little-endian
-		//!   integers with curve25519, Poly1305 and Microsoft CAPI.
-		Integer(BufferedTransformation &bt, size_t byteCount, Signedness sign=UNSIGNED, ByteOrder order = BIG_ENDIAN_ORDER);
-
-		//! \brief Convert from a BER encoded byte array
-		//! \param bt BufferedTransformation object with BER encoded byte array
-		explicit Integer(BufferedTransformation &bt);
-
-		//! \brief Create a random integer
-		//! \param rng RandomNumberGenerator used to generate material
-		//! \param bitCount the number of bits in the resulting integer
-		//! \details The random integer created is uniformly distributed over <tt>[0, 2<sup>bitCount</sup>]</tt>.
-		Integer(RandomNumberGenerator &rng, size_t bitCount);
-
-		//! \brief Integer representing 0
-		//! \returns an Integer representing 0
-		//! \details Zero() avoids calling constructors for frequently used integers
-		static const Integer & CRYPTOPP_API Zero();
-		//! \brief Integer representing 1
-		//! \returns an Integer representing 1
-		//! \details One() avoids calling constructors for frequently used integers
-		static const Integer & CRYPTOPP_API One();
-		//! \brief Integer representing 2
-		//! \returns an Integer representing 2
-		//! \details Two() avoids calling constructors for frequently used integers
-		static const Integer & CRYPTOPP_API Two();
-
-		//! \brief Create a random integer of special form
-		//! \param rng RandomNumberGenerator used to generate material
-		//! \param min the minimum value
-		//! \param max the maximum value
-		//! \param rnType RandomNumberType to specify the type
-		//! \param equiv the equivalence class based on the parameter \p mod
-		//! \param mod the modulus used to reduce the equivalence class
-		//! \throw RandomNumberNotFound if the set is empty.
-		//! \details Ideally, the random integer created should be uniformly distributed
-		//!   over <tt>{x | min \<= x \<= max</tt> and \p x is of rnType and <tt>x \% mod == equiv}</tt>.
-		//!   However the actual distribution may not be uniform because sequential
-		//!   search is used to find an appropriate number from a random starting
-		//!   point.
-		//! \details May return (with very small probability) a pseudoprime when a prime
-		//!   is requested and <tt>max \> lastSmallPrime*lastSmallPrime</tt>. \p lastSmallPrime
-		//!   is declared in nbtheory.h.
-		Integer(RandomNumberGenerator &rng, const Integer &min, const Integer &max, RandomNumberType rnType=ANY, const Integer &equiv=Zero(), const Integer &mod=One());
-
-		//! \brief Exponentiates to a power of 2
-		//! \returns the Integer 2<sup>e</sup>
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		static Integer CRYPTOPP_API Power2(size_t e);
-	//@}
-
-	//! \name ENCODE/DECODE
-	//@{
-		//! \brief The minimum number of bytes to encode this integer
-		//! \param sign enumeration indicating Signedness
-		//! \note The MinEncodedSize() of 0 is 1.
-		size_t MinEncodedSize(Signedness sign=UNSIGNED) const;
-
-		//! \brief Encode in big-endian format
-		//! \param output big-endian byte array
-		//! \param outputLen length of the byte array
-		//! \param sign enumeration indicating Signedness
-		//! \details Unsigned means encode absolute value, signed means encode two's complement if negative.
-		//! \details outputLen can be used to ensure an Integer is encoded to an exact size (rather than a
-		//!   minimum size). An exact size is useful, for example, when encoding to a field element size.
-		void Encode(byte *output, size_t outputLen, Signedness sign=UNSIGNED) const;
-
-		//! \brief Encode in big-endian format
-		//! \param bt BufferedTransformation object
-		//! \param outputLen length of the encoding
-		//! \param sign enumeration indicating Signedness
-		//! \details Unsigned means encode absolute value, signed means encode two's complement if negative.
-		//! \details outputLen can be used to ensure an Integer is encoded to an exact size (rather than a
-		//!   minimum size). An exact size is useful, for example, when encoding to a field element size.
-		void Encode(BufferedTransformation &bt, size_t outputLen, Signedness sign=UNSIGNED) const;
-
-		//! \brief Encode in DER format
-		//! \param bt BufferedTransformation object
-		//! \details Encodes the Integer using Distinguished Encoding Rules
-		//!   The result is placed into a BufferedTransformation object
-		void DEREncode(BufferedTransformation &bt) const;
-
-		//! encode absolute value as big-endian octet string
-		//! \param bt BufferedTransformation object
-		//! \param length the number of mytes to decode
-		void DEREncodeAsOctetString(BufferedTransformation &bt, size_t length) const;
-
-		//! \brief Encode absolute value in OpenPGP format
-		//! \param output big-endian byte array
-		//! \param bufferSize length of the byte array
-		//! \returns length of the output
-		//! \details OpenPGPEncode places result into a BufferedTransformation object and returns the
-		//!   number of bytes used for the encoding
-		size_t OpenPGPEncode(byte *output, size_t bufferSize) const;
-
-		//! \brief Encode absolute value in OpenPGP format
-		//! \param bt BufferedTransformation object
-		//! \returns length of the output
-		//! \details OpenPGPEncode places result into a BufferedTransformation object and returns the
-		//!   number of bytes used for the encoding
-		size_t OpenPGPEncode(BufferedTransformation &bt) const;
-
-		//! \brief Decode from big-endian byte array
-		//! \param input big-endian byte array
-		//! \param inputLen length of the byte array
-		//! \param sign enumeration indicating Signedness
-		void Decode(const byte *input, size_t inputLen, Signedness sign=UNSIGNED);
-
-		//! \brief Decode nonnegative value from big-endian byte array
-		//! \param bt BufferedTransformation object
-		//! \param inputLen length of the byte array
-		//! \param sign enumeration indicating Signedness
-		//! \note <tt>bt.MaxRetrievable() \>= inputLen</tt>.
-		void Decode(BufferedTransformation &bt, size_t inputLen, Signedness sign=UNSIGNED);
-
-		//! \brief Decode from BER format
-		//! \param input big-endian byte array
-		//! \param inputLen length of the byte array
-		void BERDecode(const byte *input, size_t inputLen);
-
-		//! \brief Decode from BER format
-		//! \param bt BufferedTransformation object
-		void BERDecode(BufferedTransformation &bt);
-
-		//! \brief Decode nonnegative value from big-endian octet string
-		//! \param bt BufferedTransformation object
-		//! \param length length of the byte array
-		void BERDecodeAsOctetString(BufferedTransformation &bt, size_t length);
-
-		//! \brief Exception thrown when an error is encountered decoding an OpenPGP integer
-		class OpenPGPDecodeErr : public Exception
-		{
-		public:
-			OpenPGPDecodeErr() : Exception(INVALID_DATA_FORMAT, "OpenPGP decode error") {}
-		};
-
-		//! \brief Decode from OpenPGP format
-		//! \param input big-endian byte array
-		//! \param inputLen length of the byte array
-		void OpenPGPDecode(const byte *input, size_t inputLen);
-		//! \brief Decode from OpenPGP format
-		//! \param bt BufferedTransformation object
-		void OpenPGPDecode(BufferedTransformation &bt);
-	//@}
-
-	//! \name ACCESSORS
-	//@{
-		//! \brief Determines if the Integer is convertable to Long
-		//! \returns true if *this can be represented as a signed long
-		//! \sa ConvertToLong()
-		bool IsConvertableToLong() const;
-		//! \brief Convert the Integer to Long
-		//! \return equivalent signed long if possible, otherwise undefined
-		//! \sa IsConvertableToLong()
-		signed long ConvertToLong() const;
-
-		//! \brief Determines the number of bits required to represent the Integer
-		//! \returns number of significant bits = floor(log2(abs(*this))) + 1
-		unsigned int BitCount() const;
-		//! \brief Determines the number of bytes required to represent the Integer
-		//! \returns number of significant bytes = ceiling(BitCount()/8)
-		unsigned int ByteCount() const;
-		//! \brief Determines the number of words required to represent the Integer
-		//! \returns number of significant words = ceiling(ByteCount()/sizeof(word))
-		unsigned int WordCount() const;
-
-		//! \brief Provides the i-th bit of the Integer
-		//! \returns the i-th bit, i=0 being the least significant bit
-		bool GetBit(size_t i) const;
-		//! \brief Provides the i-th byte of the Integer
-		//! \returns the i-th byte
-		byte GetByte(size_t i) const;
-		//! \brief Provides the low order bits of the Integer
-		//! \returns n lowest bits of *this >> i
-		lword GetBits(size_t i, size_t n) const;
-
-		//! \brief Determines if the Integer is 0
-		//! \returns true if the Integer is 0, false otherwise
-		bool IsZero() const {return !*this;}
-		//! \brief Determines if the Integer is non-0
-		//! \returns true if the Integer is non-0, false otherwise
-		bool NotZero() const {return !IsZero();}
-		//! \brief Determines if the Integer is negative
-		//! \returns true if the Integer is negative, false otherwise
-		bool IsNegative() const {return sign == NEGATIVE;}
-		//! \brief Determines if the Integer is non-negative
-		//! \returns true if the Integer is non-negative, false otherwise
-		bool NotNegative() const {return !IsNegative();}
-		//! \brief Determines if the Integer is positive
-		//! \returns true if the Integer is positive, false otherwise
-		bool IsPositive() const {return NotNegative() && NotZero();}
-		//! \brief Determines if the Integer is non-positive
-		//! \returns true if the Integer is non-positive, false otherwise
-		bool NotPositive() const {return !IsPositive();}
-		//! \brief Determines if the Integer is even parity
-		//! \returns true if the Integer is even, false otherwise
-		bool IsEven() const {return GetBit(0) == 0;}
-		//! \brief Determines if the Integer is odd parity
-		//! \returns true if the Integer is odd, false otherwise
-		bool IsOdd() const	{return GetBit(0) == 1;}
-	//@}
-
-	//! \name MANIPULATORS
-	//@{
-		//!
-		Integer&  operator=(const Integer& t);
-
-		//!
-		Integer&  operator+=(const Integer& t);
-		//!
-		Integer&  operator-=(const Integer& t);
-		//!
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		Integer&  operator*=(const Integer& t)	{return *this = Times(t);}
-		//!
-		Integer&  operator/=(const Integer& t)	{return *this = DividedBy(t);}
-		//!
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		Integer&  operator%=(const Integer& t)	{return *this = Modulo(t);}
-		//!
-		Integer&  operator/=(word t)  {return *this = DividedBy(t);}
-		//!
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		Integer&  operator%=(word t)  {return *this = Integer(POSITIVE, 0, Modulo(t));}
-
-		//!
-		Integer&  operator<<=(size_t);
-		//!
-		Integer&  operator>>=(size_t);
-
-		//! \brief Set this Integer to random integer
-		//! \param rng RandomNumberGenerator used to generate material
-		//! \param bitCount the number of bits in the resulting integer
-		//! \details The random integer created is uniformly distributed over <tt>[0, 2<sup>bitCount</sup>]</tt>.
-		void Randomize(RandomNumberGenerator &rng, size_t bitCount);
-
-		//! \brief Set this Integer to random integer
-		//! \param rng RandomNumberGenerator used to generate material
-		//! \param min the minimum value
-		//! \param max the maximum value
-		//! \details The random integer created is uniformly distributed over <tt>[min, max]</tt>.
-		void Randomize(RandomNumberGenerator &rng, const Integer &min, const Integer &max);
-
-		//! \brief Set this Integer to random integer of special form
-		//! \param rng RandomNumberGenerator used to generate material
-		//! \param min the minimum value
-		//! \param max the maximum value
-		//! \param rnType RandomNumberType to specify the type
-		//! \param equiv the equivalence class based on the parameter \p mod
-		//! \param mod the modulus used to reduce the equivalence class
-		//! \throw RandomNumberNotFound if the set is empty.
-		//! \details Ideally, the random integer created should be uniformly distributed
-		//!   over <tt>{x | min \<= x \<= max</tt> and \p x is of rnType and <tt>x \% mod == equiv}</tt>.
-		//!   However the actual distribution may not be uniform because sequential
-		//!   search is used to find an appropriate number from a random starting
-		//!   point.
-		//! \details May return (with very small probability) a pseudoprime when a prime
-		//!   is requested and <tt>max \> lastSmallPrime*lastSmallPrime</tt>. \p lastSmallPrime
-		//!   is declared in nbtheory.h.
-		bool Randomize(RandomNumberGenerator &rng, const Integer &min, const Integer &max, RandomNumberType rnType, const Integer &equiv=Zero(), const Integer &mod=One());
-
-		bool GenerateRandomNoThrow(RandomNumberGenerator &rng, const NameValuePairs &params = g_nullNameValuePairs);
-		void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &params = g_nullNameValuePairs)
-		{
-			if (!GenerateRandomNoThrow(rng, params))
-				throw RandomNumberNotFound();
-		}
-
-		//! \brief Set the n-th bit to value
-		//! \details 0-based numbering.
-		void SetBit(size_t n, bool value=1);
-
-		//! \brief Set the n-th byte to value
-		//! \details 0-based numbering.
-		void SetByte(size_t n, byte value);
-
-		//! \brief Reverse the Sign of the Integer
-		void Negate();
-
-		//! \brief Sets the Integer to positive
-		void SetPositive() {sign = POSITIVE;}
-
-		//! \brief Sets the Integer to negative
-		void SetNegative() {if (!!(*this)) sign = NEGATIVE;}
-
-		//! \brief Swaps this Integer with another Integer
-		void swap(Integer &a);
-	//@}
-
-	//! \name UNARY OPERATORS
-	//@{
-		//!
-		bool		operator!() const;
-		//!
-		Integer 	operator+() const {return *this;}
-		//!
-		Integer 	operator-() const;
-		//!
-		Integer&	operator++();
-		//!
-		Integer&	operator--();
-		//!
-		Integer 	operator++(int) {Integer temp = *this; ++*this; return temp;}
-		//!
-		Integer 	operator--(int) {Integer temp = *this; --*this; return temp;}
-	//@}
-
-	//! \name BINARY OPERATORS
-	//@{
-		//! \brief Perform signed comparison
-		//! \param a the Integer to comapre
-		//!   \retval -1 if <tt>*this < a</tt>
-		//!   \retval  0 if <tt>*this = a</tt>
-		//!   \retval  1 if <tt>*this > a</tt>
-		int Compare(const Integer& a) const;
-
-		//!
-		Integer Plus(const Integer &b) const;
-		//!
-		Integer Minus(const Integer &b) const;
-		//!
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		Integer Times(const Integer &b) const;
-		//!
-		Integer DividedBy(const Integer &b) const;
-		//!
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		Integer Modulo(const Integer &b) const;
-		//!
-		Integer DividedBy(word b) const;
-		//!
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		word Modulo(word b) const;
-
-		//!
-		Integer operator>>(size_t n) const	{return Integer(*this)>>=n;}
-		//!
-		Integer operator<<(size_t n) const	{return Integer(*this)<<=n;}
-	//@}
-
-	//! \name OTHER ARITHMETIC FUNCTIONS
-	//@{
-		//!
-		Integer AbsoluteValue() const;
-		//!
-		Integer Doubled() const {return Plus(*this);}
-		//!
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		Integer Squared() const {return Times(*this);}
-		//! extract square root, if negative return 0, else return floor of square root
-		Integer SquareRoot() const;
-		//! return whether this integer is a perfect square
-		bool IsSquare() const;
-
-		//! is 1 or -1
-		bool IsUnit() const;
-		//! return inverse if 1 or -1, otherwise return 0
-		Integer MultiplicativeInverse() const;
-
-		//! calculate r and q such that (a == d*q + r) && (0 <= r < abs(d))
-		static void CRYPTOPP_API Divide(Integer &r, Integer &q, const Integer &a, const Integer &d);
-		//! use a faster division algorithm when divisor is short
-		static void CRYPTOPP_API Divide(word &r, Integer &q, const Integer &a, word d);
-
-		//! returns same result as Divide(r, q, a, Power2(n)), but faster
-		static void CRYPTOPP_API DivideByPowerOf2(Integer &r, Integer &q, const Integer &a, unsigned int n);
-
-		//! greatest common divisor
-		static Integer CRYPTOPP_API Gcd(const Integer &a, const Integer &n);
-		//! calculate multiplicative inverse of *this mod n
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		Integer InverseMod(const Integer &n) const;
-		//!
-		//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-		word InverseMod(word n) const;
-	//@}
-
-	//! \name INPUT/OUTPUT
-	//@{
-		//! \brief Extraction operator
-		//! \param in a reference to a std::istream
-		//! \param a a reference to an Integer
-		//! \returns a reference to a std::istream reference
-		friend CRYPTOPP_DLL std::istream& CRYPTOPP_API operator>>(std::istream& in, Integer &a);
-		//!
-		//! \brief Insertion operator
-		//! \param out a reference to a std::ostream
-		//! \param a a constant reference to an Integer
-		//! \returns a reference to a std::ostream reference
-		//! \details The output integer responds to std::hex, std::oct, std::hex, std::upper and
-		//!   std::lower. The output includes the suffix \a \b h (for hex), \a \b . (\a \b dot, for dec)
-		//!   and \a \b o (for octal). There is currently no way to supress the suffix.
-		//! \details If you want to print an Integer without the suffix or using an arbitrary base, then
-		//!   use IntToString<Integer>().
-		//! \sa IntToString<Integer>
-		friend CRYPTOPP_DLL std::ostream& CRYPTOPP_API operator<<(std::ostream& out, const Integer &a);
-	//@}
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-	//! modular multiplication
-	CRYPTOPP_DLL friend Integer CRYPTOPP_API a_times_b_mod_c(const Integer &x, const Integer& y, const Integer& m);
-	//! modular exponentiation
-	CRYPTOPP_DLL friend Integer CRYPTOPP_API a_exp_b_mod_c(const Integer &x, const Integer& e, const Integer& m);
-#endif
-
-private:
-
-	Integer(word value, size_t length);
-	int PositiveCompare(const Integer &t) const;
-
-	IntegerSecBlock reg;
-	Sign sign;
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-	friend class ModularArithmetic;
-	friend class MontgomeryRepresentation;
-	friend class HalfMontgomeryRepresentation;
-
-	friend void PositiveAdd(Integer &sum, const Integer &a, const Integer &b);
-	friend void PositiveSubtract(Integer &diff, const Integer &a, const Integer &b);
-	friend void PositiveMultiply(Integer &product, const Integer &a, const Integer &b);
-	friend void PositiveDivide(Integer &remainder, Integer &quotient, const Integer &dividend, const Integer &divisor);
-#endif
-};
-
-//!
-inline bool operator==(const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)==0;}
-//!
-inline bool operator!=(const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)!=0;}
-//!
-inline bool operator> (const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)> 0;}
-//!
-inline bool operator>=(const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)>=0;}
-//!
-inline bool operator< (const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)< 0;}
-//!
-inline bool operator<=(const CryptoPP::Integer& a, const CryptoPP::Integer& b) {return a.Compare(b)<=0;}
-//!
-inline CryptoPP::Integer operator+(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.Plus(b);}
-//!
-inline CryptoPP::Integer operator-(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.Minus(b);}
-//!
-//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-inline CryptoPP::Integer operator*(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.Times(b);}
-//!
-inline CryptoPP::Integer operator/(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.DividedBy(b);}
-//!
-//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-inline CryptoPP::Integer operator%(const CryptoPP::Integer &a, const CryptoPP::Integer &b) {return a.Modulo(b);}
-//!
-inline CryptoPP::Integer operator/(const CryptoPP::Integer &a, CryptoPP::word b) {return a.DividedBy(b);}
-//!
-//! \sa a_times_b_mod_c() and a_exp_b_mod_c()
-inline CryptoPP::word    operator%(const CryptoPP::Integer &a, CryptoPP::word b) {return a.Modulo(b);}
-
-NAMESPACE_END
-
-#ifndef __BORLANDC__
-NAMESPACE_BEGIN(std)
-inline void swap(CryptoPP::Integer &a, CryptoPP::Integer &b)
-{
-	a.swap(b);
-}
-NAMESPACE_END
-#endif
-
-#endif
diff --git a/src-cryptopp/iterhash.cpp b/src-cryptopp/iterhash.cpp
deleted file mode 100644
index a757a3e..0000000
--- a/src-cryptopp/iterhash.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// iterhash.cpp - written and placed in the public domain by Wei Dai
-
-#ifndef __GNUC__
-#define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
-#endif
-
-#include "iterhash.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-template <class T, class BASE> void IteratedHashBase<T, BASE>::Update(const byte *input, size_t len)
-{
-	HashWordType oldCountLo = m_countLo, oldCountHi = m_countHi;
-	if ((m_countLo = oldCountLo + HashWordType(len)) < oldCountLo)
-		m_countHi++;             // carry from low to high
-	m_countHi += (HashWordType)SafeRightShift<8*sizeof(HashWordType)>(len);
-	if (m_countHi < oldCountHi || SafeRightShift<2*8*sizeof(HashWordType)>(len) != 0)
-		throw HashInputTooLong(this->AlgorithmName());
-
-	const unsigned int blockSize = this->BlockSize();
-	unsigned int num = ModPowerOf2(oldCountLo, blockSize);
-
-	T* dataBuf = this->DataBuf();
-	byte* data = (byte *)dataBuf;
-	CRYPTOPP_ASSERT(dataBuf && data);
-
-	if (num != 0)	// process left over data
-	{
-		if (num+len >= blockSize)
-		{
-			if (data && input) {memcpy(data+num, input, blockSize-num);}
-			HashBlock(dataBuf);
-			input += (blockSize-num);
-			len -= (blockSize-num);
-			num = 0;
-			// drop through and do the rest
-		}
-		else
-		{
-			if (data && input && len) {memcpy(data+num, input, len);}
-			return;
-		}
-	}
-
-	// now process the input data in blocks of blockSize bytes and save the leftovers to m_data
-	if (len >= blockSize)
-	{
-		if (input == data)
-		{
-			CRYPTOPP_ASSERT(len == blockSize);
-			HashBlock(dataBuf);
-			return;
-		}
-		else if (IsAligned<T>(input))
-		{
-			size_t leftOver = HashMultipleBlocks((T *)(void*)input, len);
-			input += (len - leftOver);
-			len = leftOver;
-		}
-		else
-			do
-			{   // copy input first if it's not aligned correctly
-				if (data && input) memcpy(data, input, blockSize);
-				HashBlock(dataBuf);
-				input+=blockSize;
-				len-=blockSize;
-			} while (len >= blockSize);
-	}
-
-	if (data && input && len && data != input)
-		memcpy(data, input, len);
-}
-
-template <class T, class BASE> byte * IteratedHashBase<T, BASE>::CreateUpdateSpace(size_t &size)
-{
-	unsigned int blockSize = this->BlockSize();
-	unsigned int num = ModPowerOf2(m_countLo, blockSize);
-	size = blockSize - num;
-	return (byte *)DataBuf() + num;
-}
-
-template <class T, class BASE> size_t IteratedHashBase<T, BASE>::HashMultipleBlocks(const T *input, size_t length)
-{
-	unsigned int blockSize = this->BlockSize();
-	bool noReverse = NativeByteOrderIs(this->GetByteOrder());
-	T* dataBuf = this->DataBuf();
-	do
-	{
-		if (noReverse)
-			this->HashEndianCorrectedBlock(input);
-		else
-		{
-			ByteReverse(dataBuf, input, this->BlockSize());
-			this->HashEndianCorrectedBlock(dataBuf);
-		}
-
-		input += blockSize/sizeof(T);
-		length -= blockSize;
-	}
-	while (length >= blockSize);
-	return length;
-}
-
-template <class T, class BASE> void IteratedHashBase<T, BASE>::PadLastBlock(unsigned int lastBlockSize, byte padFirst)
-{
-	unsigned int blockSize = this->BlockSize();
-	unsigned int num = ModPowerOf2(m_countLo, blockSize);
-	T* dataBuf = this->DataBuf();
-	byte* data = (byte *)dataBuf;
-	data[num++] = padFirst;
-	if (num <= lastBlockSize)
-		memset(data+num, 0, lastBlockSize-num);
-	else
-	{
-		memset(data+num, 0, blockSize-num);
-		HashBlock(dataBuf);
-		memset(data, 0, lastBlockSize);
-	}
-}
-
-template <class T, class BASE> void IteratedHashBase<T, BASE>::Restart()
-{
-	m_countLo = m_countHi = 0;
-	Init();
-}
-
-template <class T, class BASE> void IteratedHashBase<T, BASE>::TruncatedFinal(byte *digest, size_t size)
-{
-	this->ThrowIfInvalidTruncatedSize(size);
-
-	T* dataBuf = this->DataBuf();
-	T* stateBuf = this->StateBuf();
-	unsigned int blockSize = this->BlockSize();
-	ByteOrder order = this->GetByteOrder();
-
-	PadLastBlock(blockSize - 2*sizeof(HashWordType));
-	dataBuf[blockSize/sizeof(T)-2+order] = ConditionalByteReverse(order, this->GetBitCountLo());
-	dataBuf[blockSize/sizeof(T)-1-order] = ConditionalByteReverse(order, this->GetBitCountHi());
-
-	HashBlock(dataBuf);
-
-	if (IsAligned<HashWordType>(digest) && size%sizeof(HashWordType)==0)
-		ConditionalByteReverse<HashWordType>(order, (HashWordType *)(void*)digest, stateBuf, size);
-	else
-	{
-		ConditionalByteReverse<HashWordType>(order, stateBuf, stateBuf, this->DigestSize());
-		memcpy(digest, stateBuf, size);
-	}
-
-	this->Restart();		// reinit for next use
-}
-
-#ifdef __GNUC__
-	template class IteratedHashBase<word64, HashTransformation>;
-	template class IteratedHashBase<word64, MessageAuthenticationCode>;
-
-	template class IteratedHashBase<word32, HashTransformation>;
-	template class IteratedHashBase<word32, MessageAuthenticationCode>;
-#endif
-
-NAMESPACE_END
diff --git a/src-cryptopp/iterhash.h b/src-cryptopp/iterhash.h
deleted file mode 100644
index 43d58d9..0000000
--- a/src-cryptopp/iterhash.h
+++ /dev/null
@@ -1,187 +0,0 @@
-#ifndef CRYPTOPP_ITERHASH_H
-#define CRYPTOPP_ITERHASH_H
-
-#include "cryptlib.h"
-#include "secblock.h"
-#include "misc.h"
-#include "simple.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class HashInputTooLong
-//! \brief Exception thrown when trying to hash more data than is allowed by a hash function
-class CRYPTOPP_DLL HashInputTooLong : public InvalidDataFormat
-{
-public:
-	explicit HashInputTooLong(const std::string &alg)
-		: InvalidDataFormat("IteratedHashBase: input data exceeds maximum allowed by hash function " + alg) {}
-};
-
-//! \class IteratedHashBase
-//! \brief Iterated hash base class
-//! \tparam T Hash word type
-//! \tparam BASE HashTransformation derived class
-//! \details IteratedHashBase provides an interface for block-based iterated hashes
-//! \sa HashTransformation, MessageAuthenticationCode
-template <class T, class BASE>
-class CRYPTOPP_NO_VTABLE IteratedHashBase : public BASE
-{
-public:
-	typedef T HashWordType;
-
-	//! \brief Construct an IteratedHashBase
-	IteratedHashBase() : m_countLo(0), m_countHi(0) {}
-
-	//! \brief Provides the input block size most efficient for this cipher.
-	//! \return The input block size that is most efficient for the cipher
-	//! \details The base class implementation returns MandatoryBlockSize().
-	//! \note Optimal input length is
-	//!   <tt>n * OptimalBlockSize() - GetOptimalBlockSizeUsed()</tt> for any <tt>n \> 0</tt>.
-	unsigned int OptimalBlockSize() const {return this->BlockSize();}
-
-	//! \brief Provides input and output data alignment for optimal performance.
-	//! \return the input data alignment that provides optimal performance
-	//! \details OptimalDataAlignment returnes the natural alignment of the hash word.
-	unsigned int OptimalDataAlignment() const {return GetAlignmentOf<T>();}
-
-	//! \brief Updates a hash with additional input
-	//! \param input the additional input as a buffer
-	//! \param length the size of the buffer, in bytes
-	void Update(const byte *input, size_t length);
-
-	//! \brief Requests space which can be written into by the caller
-	//! \param size the requested size of the buffer
-	//! \details The purpose of this method is to help avoid extra memory allocations.
-	//! \details size is an \a IN and \a OUT parameter and used as a hint. When the call is made,
-	//!   size is the requested size of the buffer. When the call returns, size is the size of
-	//!   the array returned to the caller.
-	//! \details The base class implementation sets  size to 0 and returns  NULL.
-	//! \note Some objects, like ArraySink, cannot create a space because its fixed.
-	byte * CreateUpdateSpace(size_t &size);
-
-	//! \brief Restart the hash
-	//! \details Discards the current state, and restart for a new message
-	void Restart();
-
-	//! \brief Computes the hash of the current message
-	//! \param digest a pointer to the buffer to receive the hash
-	//! \param digestSize the size of the truncated digest, in bytes
-	//! \details TruncatedFinal() call Final() and then copies digestSize bytes to digest.
-	//!   The hash is restarted the hash for the next message.
-	void TruncatedFinal(byte *digest, size_t digestSize);
-
-protected:
-	inline T GetBitCountHi() const {return (m_countLo >> (8*sizeof(T)-3)) + (m_countHi << 3);}
-	inline T GetBitCountLo() const {return m_countLo << 3;}
-
-	void PadLastBlock(unsigned int lastBlockSize, byte padFirst=0x80);
-	virtual void Init() =0;
-
-	virtual ByteOrder GetByteOrder() const =0;
-	virtual void HashEndianCorrectedBlock(const HashWordType *data) =0;
-	virtual size_t HashMultipleBlocks(const T *input, size_t length);
-	void HashBlock(const HashWordType *input) {HashMultipleBlocks(input, this->BlockSize());}
-
-	virtual T* DataBuf() =0;
-	virtual T* StateBuf() =0;
-
-private:
-	T m_countLo, m_countHi;
-};
-
-//! \class IteratedHash
-//! \brief Iterated hash base class
-//! \tparam T_HashWordType Hash word type
-//! \tparam T_Endianness Endianness type of hash
-//! \tparam T_BlockSize Block size of the hash
-//! \tparam T_Base HashTransformation derived class
-//! \details IteratedHash provides a default implementation for block-based iterated hashes
-//! \sa HashTransformation, MessageAuthenticationCode
-template <class T_HashWordType, class T_Endianness, unsigned int T_BlockSize, class T_Base = HashTransformation>
-class CRYPTOPP_NO_VTABLE IteratedHash : public IteratedHashBase<T_HashWordType, T_Base>
-{
-public:
-	typedef T_Endianness ByteOrderClass;
-	typedef T_HashWordType HashWordType;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~IteratedHash() { }
-#endif
-
-	CRYPTOPP_CONSTANT(BLOCKSIZE = T_BlockSize)
-	// BCB2006 workaround: can't use BLOCKSIZE here
-	CRYPTOPP_COMPILE_ASSERT((T_BlockSize & (T_BlockSize - 1)) == 0);	// blockSize is a power of 2
-
-	//! \brief Provides the block size of the hash
-	//! \return the block size of the hash, in bytes
-	//! \details BlockSize() returns <tt>T_BlockSize</tt>.
-	unsigned int BlockSize() const {return T_BlockSize;}
-
-	//! \brief Provides the byte order of the hash
-	//! \returns the byte order of the hash as an enumeration
-	//! \details GetByteOrder() returns <tt>T_Endianness::ToEnum()</tt>.
-	//! \sa ByteOrder()
-	ByteOrder GetByteOrder() const {return T_Endianness::ToEnum();}
-
-	//! \brief Adjusts the byte ordering of the hash
-	//! \param out the output buffer
-	//! \param in the input buffer
-	//! \param byteCount the size of the buffers, in bytes
-	//! \details CorrectEndianess() calls ConditionalByteReverse() using <tt>T_Endianness</tt>.
-	inline void CorrectEndianess(HashWordType *out, const HashWordType *in, size_t byteCount)
-	{
-		ConditionalByteReverse(T_Endianness::ToEnum(), out, in, byteCount);
-	}
-
-protected:
-	T_HashWordType* DataBuf() {return this->m_data;}
-	FixedSizeSecBlock<T_HashWordType, T_BlockSize/sizeof(T_HashWordType)> m_data;
-};
-
-//! \class IteratedHashWithStaticTransform
-//! \brief Iterated hash with a static transformation function
-//! \tparam T_HashWordType Hash word type
-//! \tparam T_Endianness Endianness type of hash
-//! \tparam T_BlockSize Block size of the hash
-//! \tparam T_StateSize Internal state size of the hash
-//! \tparam T_Transform HashTransformation derived class
-//! \tparam T_DigestSize Digest size of the hash
-//! \tparam T_StateAligned Flag indicating if state is 16-byte aligned
-//! \sa HashTransformation, MessageAuthenticationCode
-template <class T_HashWordType, class T_Endianness, unsigned int T_BlockSize, unsigned int T_StateSize, class T_Transform, unsigned int T_DigestSize = 0, bool T_StateAligned = false>
-class CRYPTOPP_NO_VTABLE IteratedHashWithStaticTransform
-	: public ClonableImpl<T_Transform, AlgorithmImpl<IteratedHash<T_HashWordType, T_Endianness, T_BlockSize>, T_Transform> >
-{
-public:
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~IteratedHashWithStaticTransform() { }
-#endif
-
-	CRYPTOPP_CONSTANT(DIGESTSIZE = T_DigestSize ? T_DigestSize : T_StateSize)
-
-	//! \brief Provides the digest size of the hash
-	//! \return the digest size of the hash, in bytes
-	//! \details DigestSize() returns <tt>DIGESTSIZE</tt>.
-	unsigned int DigestSize() const {return DIGESTSIZE;};
-
-protected:
-	IteratedHashWithStaticTransform() {this->Init();}
-	void HashEndianCorrectedBlock(const T_HashWordType *data) {T_Transform::Transform(this->m_state, data);}
-	void Init() {T_Transform::InitState(this->m_state);}
-
-	T_HashWordType* StateBuf() {return this->m_state;}
-	FixedSizeAlignedSecBlock<T_HashWordType, T_BlockSize/sizeof(T_HashWordType), T_StateAligned> m_state;
-};
-
-#ifndef __GNUC__
-	CRYPTOPP_DLL_TEMPLATE_CLASS IteratedHashBase<word64, HashTransformation>;
-	CRYPTOPP_STATIC_TEMPLATE_CLASS IteratedHashBase<word64, MessageAuthenticationCode>;
-
-	CRYPTOPP_DLL_TEMPLATE_CLASS IteratedHashBase<word32, HashTransformation>;
-	CRYPTOPP_STATIC_TEMPLATE_CLASS IteratedHashBase<word32, MessageAuthenticationCode>;
-#endif
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/misc.cpp b/src-cryptopp/misc.cpp
deleted file mode 100644
index dda2154..0000000
--- a/src-cryptopp/misc.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-// misc.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4189)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6237)
-# endif
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "misc.h"
-#include "words.h"
-#include "words.h"
-#include "stdcpp.h"
-#include "integer.h"
-
-// for memalign
-#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)
-# include <malloc.h>
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-void xorbuf(byte *buf, const byte *mask, size_t count)
-{
-	CRYPTOPP_ASSERT(buf != NULL);
-	CRYPTOPP_ASSERT(mask != NULL);
-	CRYPTOPP_ASSERT(count > 0);
-
-	size_t i=0;
-	if (IsAligned<word32>(buf) && IsAligned<word32>(mask))
-	{
-		if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(buf) && IsAligned<word64>(mask))
-		{
-			for (i=0; i<count/8; i++)
-				((word64*)(void*)buf)[i] ^= ((word64*)(void*)mask)[i];
-			count -= 8*i;
-			if (!count)
-				return;
-			buf += 8*i;
-			mask += 8*i;
-		}
-
-		for (i=0; i<count/4; i++)
-			((word32*)(void*)buf)[i] ^= ((word32*)(void*)mask)[i];
-		count -= 4*i;
-		if (!count)
-			return;
-		buf += 4*i;
-		mask += 4*i;
-	}
-
-	for (i=0; i<count; i++)
-		buf[i] ^= mask[i];
-}
-
-void xorbuf(byte *output, const byte *input, const byte *mask, size_t count)
-{
-	CRYPTOPP_ASSERT(output != NULL);
-	CRYPTOPP_ASSERT(input != NULL);
-	CRYPTOPP_ASSERT(count > 0);
-
-	size_t i=0;
-	if (IsAligned<word32>(output) && IsAligned<word32>(input) && IsAligned<word32>(mask))
-	{
-		if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(output) && IsAligned<word64>(input) && IsAligned<word64>(mask))
-		{
-			for (i=0; i<count/8; i++)
-				((word64*)(void*)output)[i] = ((word64*)(void*)input)[i] ^ ((word64*)(void*)mask)[i];
-			count -= 8*i;
-			if (!count)
-				return;
-			output += 8*i;
-			input += 8*i;
-			mask += 8*i;
-		}
-
-		for (i=0; i<count/4; i++)
-			((word32*)(void*)output)[i] = ((word32*)(void*)input)[i] ^ ((word32*)(void*)mask)[i];
-		count -= 4*i;
-		if (!count)
-			return;
-		output += 4*i;
-		input += 4*i;
-		mask += 4*i;
-	}
-
-	for (i=0; i<count; i++)
-		output[i] = input[i] ^ mask[i];
-}
-
-bool VerifyBufsEqual(const byte *buf, const byte *mask, size_t count)
-{
-	CRYPTOPP_ASSERT(buf != NULL);
-	CRYPTOPP_ASSERT(mask != NULL);
-	CRYPTOPP_ASSERT(count > 0);
-
-	size_t i=0;
-	byte acc8 = 0;
-
-	if (IsAligned<word32>(buf) && IsAligned<word32>(mask))
-	{
-		word32 acc32 = 0;
-		if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(buf) && IsAligned<word64>(mask))
-		{
-			word64 acc64 = 0;
-			for (i=0; i<count/8; i++)
-				acc64 |= ((word64*)(void*)buf)[i] ^ ((word64*)(void*)mask)[i];
-			count -= 8*i;
-			if (!count)
-				return acc64 == 0;
-			buf += 8*i;
-			mask += 8*i;
-			acc32 = word32(acc64) | word32(acc64>>32);
-		}
-
-		for (i=0; i<count/4; i++)
-			acc32 |= ((word32*)(void*)buf)[i] ^ ((word32*)(void*)mask)[i];
-		count -= 4*i;
-		if (!count)
-			return acc32 == 0;
-		buf += 4*i;
-		mask += 4*i;
-		acc8 = byte(acc32) | byte(acc32>>8) | byte(acc32>>16) | byte(acc32>>24);
-	}
-
-	for (i=0; i<count; i++)
-		acc8 |= buf[i] ^ mask[i];
-	return acc8 == 0;
-}
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-std::string StringNarrow(const wchar_t *str, bool throwOnError)
-{
-	CRYPTOPP_ASSERT(str);
-	std::string result;
-
-	// Safer functions on Windows for C&A, https://github.com/weidai11/cryptopp/issues/55
-#if (CRYPTOPP_MSC_VERSION >= 1400)
-	size_t len=0, size=0;
-	errno_t err = 0;
-
-	//const wchar_t* ptr = str;
-	//while (*ptr++) len++;
-	len = wcslen(str)+1;
-
-	err = wcstombs_s(&size, NULL, 0, str, len*sizeof(wchar_t));
-	CRYPTOPP_ASSERT(err == 0);
-	if (err != 0) {goto CONVERSION_ERROR;}
-
-	result.resize(size);
-	err = wcstombs_s(&size, &result[0], size, str, len*sizeof(wchar_t));
-	CRYPTOPP_ASSERT(err == 0);
-
-	if (err != 0)
-	{
-CONVERSION_ERROR:
-		if (throwOnError)
-			throw InvalidArgument("StringNarrow: wcstombs_s() call failed with error " + IntToString(err));
-		else
-			return std::string();
-	}
-
-	// The safe routine's size includes the NULL.
-	if (!result.empty() && result[size - 1] == '\0')
-		result.erase(size - 1);
-#else
-	size_t size = wcstombs(NULL, str, 0);
-	CRYPTOPP_ASSERT(size != (size_t)-1);
-	if (size == (size_t)-1) {goto CONVERSION_ERROR;}
-
-	result.resize(size);
-	size = wcstombs(&result[0], str, size);
-	CRYPTOPP_ASSERT(size != (size_t)-1);
-
-	if (size == (size_t)-1)
-	{
-CONVERSION_ERROR:
-		if (throwOnError)
-			throw InvalidArgument("StringNarrow: wcstombs() call failed");
-		else
-			return std::string();
-	}
-#endif
-
-	return result;
-}
-#endif // StringNarrow and CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-
-#if !(defined(_MSC_VER) && (_MSC_VER < 1300))
-using std::new_handler;
-using std::set_new_handler;
-#endif
-
-void CallNewHandler()
-{
-	new_handler newHandler = set_new_handler(NULL);
-	if (newHandler)
-		set_new_handler(newHandler);
-
-	if (newHandler)
-		newHandler();
-	else
-		throw std::bad_alloc();
-}
-
-#if CRYPTOPP_BOOL_ALIGN16
-
-void * AlignedAllocate(size_t size)
-{
-	byte *p;
-#if defined(CRYPTOPP_APPLE_ALLOC_AVAILABLE)
-	while ((p = (byte *)calloc(1, size)) == NULL)
-#elif defined(CRYPTOPP_MM_MALLOC_AVAILABLE)
-	while ((p = (byte *)_mm_malloc(size, 16)) == NULL)
-#elif defined(CRYPTOPP_MEMALIGN_AVAILABLE)
-	while ((p = (byte *)memalign(16, size)) == NULL)
-#elif defined(CRYPTOPP_MALLOC_ALIGNMENT_IS_16)
-	while ((p = (byte *)malloc(size)) == NULL)
-#else
-	while ((p = (byte *)malloc(size + 16)) == NULL)
-#endif
-		CallNewHandler();
-
-#ifdef CRYPTOPP_NO_ALIGNED_ALLOC
-	size_t adjustment = 16-((size_t)p%16);
-	p += adjustment;
-	p[-1] = (byte)adjustment;
-#endif
-
-	CRYPTOPP_ASSERT(IsAlignedOn(p, 16));
-	return p;
-}
-
-void AlignedDeallocate(void *p)
-{
-#ifdef CRYPTOPP_MM_MALLOC_AVAILABLE
-	_mm_free(p);
-#elif defined(CRYPTOPP_NO_ALIGNED_ALLOC)
-	p = (byte *)p - ((byte *)p)[-1];
-	free(p);
-#else
-	free(p);
-#endif
-}
-
-#endif
-
-void * UnalignedAllocate(size_t size)
-{
-	void *p;
-	while ((p = malloc(size)) == NULL)
-		CallNewHandler();
-	return p;
-}
-
-void UnalignedDeallocate(void *p)
-{
-	free(p);
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/misc.h b/src-cryptopp/misc.h
deleted file mode 100644
index 21c3f39..0000000
--- a/src-cryptopp/misc.h
+++ /dev/null
@@ -1,2402 +0,0 @@
-
-// misc.h - written and placed in the public domain by Wei Dai
-
-//! \file misc.h
-//! \brief Utility functions for the Crypto++ library.
-
-#ifndef CRYPTOPP_MISC_H
-#define CRYPTOPP_MISC_H
-
-#include "config.h"
-
-#if !CRYPTOPP_DOXYGEN_PROCESSING
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4146 4514)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6326)
-# endif
-#endif
-
-#include "cryptlib.h"
-#include "stdcpp.h"
-#include "smartptr.h"
-
-#ifdef _MSC_VER
-	#if _MSC_VER >= 1400
-		// VC2005 workaround: disable declarations that conflict with winnt.h
-		#define _interlockedbittestandset CRYPTOPP_DISABLED_INTRINSIC_1
-		#define _interlockedbittestandreset CRYPTOPP_DISABLED_INTRINSIC_2
-		#define _interlockedbittestandset64 CRYPTOPP_DISABLED_INTRINSIC_3
-		#define _interlockedbittestandreset64 CRYPTOPP_DISABLED_INTRINSIC_4
-		#include <intrin.h>
-		#undef _interlockedbittestandset
-		#undef _interlockedbittestandreset
-		#undef _interlockedbittestandset64
-		#undef _interlockedbittestandreset64
-		#define CRYPTOPP_FAST_ROTATE(x) 1
-	#elif _MSC_VER >= 1300
-		#define CRYPTOPP_FAST_ROTATE(x) ((x) == 32 | (x) == 64)
-	#else
-		#define CRYPTOPP_FAST_ROTATE(x) ((x) == 32)
-	#endif
-#elif (defined(__MWERKS__) && TARGET_CPU_PPC) || \
-	(defined(__GNUC__) && (defined(_ARCH_PWR2) || defined(_ARCH_PWR) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || defined(_ARCH_COM)))
-	#define CRYPTOPP_FAST_ROTATE(x) ((x) == 32)
-#elif defined(__GNUC__) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86)	// depend on GCC's peephole optimization to generate rotate instructions
-	#define CRYPTOPP_FAST_ROTATE(x) 1
-#else
-	#define CRYPTOPP_FAST_ROTATE(x) 0
-#endif
-
-#ifdef __BORLANDC__
-#include <mem.h>
-#include <stdlib.h>
-#endif
-
-#if defined(__GNUC__) && defined(__linux__)
-#define CRYPTOPP_BYTESWAP_AVAILABLE
-#include <byteswap.h>
-#endif
-
-#if defined(__GNUC__) && defined(__BMI__)
-# include <immintrin.h>
-# if defined(__clang__)
-#  ifndef _tzcnt_u32
-#   define _tzcnt_u32(x) __tzcnt_u32(x)
-#  endif
-#  ifndef _blsr_u32
-#    define  _blsr_u32(x)  __blsr_u32(x)
-#  endif
-#  ifdef __x86_64__
-#   ifndef _tzcnt_u64
-#    define _tzcnt_u64(x) __tzcnt_u64(x)
-#   endif
-#   ifndef _blsr_u64
-#     define  _blsr_u64(x)  __blsr_u64(x)
-#   endif
-#  endif  // x86_64
-# endif  // Clang
-#endif  // GNUC and BMI
-
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-#if CRYPTOPP_DOXYGEN_PROCESSING
-//! \brief The maximum value of a machine word
-//! \details SIZE_MAX provides the maximum value of a machine word. The value is
-//!   \p 0xffffffff on 32-bit machines, and \p 0xffffffffffffffff on 64-bit machines.
-//! Internally, SIZE_MAX is defined as __SIZE_MAX__ if __SIZE_MAX__ is defined. If not
-//!   defined, then SIZE_T_MAX is tried. If neither __SIZE_MAX__ nor SIZE_T_MAX is
-//!   is defined, the library uses std::numeric_limits<size_t>::max(). The library
-//!   prefers __SIZE_MAX__ because its a constexpr that is optimized well
-//!   by all compilers. std::numeric_limits<size_t>::max() is \a not a constexpr,
-//!   and it is \a not always optimized well.
-#  define SIZE_MAX ...
-#else
-// Its amazing portability problems still plague this simple concept in 2015.
-//   http://stackoverflow.com/questions/30472731/which-c-standard-header-defines-size-max
-// Avoid NOMINMAX macro on Windows. http://support.microsoft.com/en-us/kb/143208
-#ifndef SIZE_MAX
-# if defined(__SIZE_MAX__) && (__SIZE_MAX__ > 0)
-#  define SIZE_MAX __SIZE_MAX__
-# elif defined(SIZE_T_MAX) && (SIZE_T_MAX > 0)
-#  define SIZE_MAX SIZE_T_MAX
-# else
-#  define SIZE_MAX ((std::numeric_limits<size_t>::max)())
-# endif
-#endif
-
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// Forward declaration for IntToString specialization
-class Integer;
-
-// ************** compile-time assertion ***************
-
-#if CRYPTOPP_DOXYGEN_PROCESSING
-//! \brief Compile time assertion
-//! \param expr the expression to evaluate
-//! \details Asserts the expression expr though a dummy struct.
-#define CRYPTOPP_COMPILE_ASSERT(expr) { ... }
-#else // CRYPTOPP_DOXYGEN_PROCESSING
-template <bool b>
-struct CompileAssert
-{
-	static char dummy[2*b-1];
-};
-//! \endif
-
-#define CRYPTOPP_COMPILE_ASSERT(assertion) CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, __LINE__)
-#if defined(CRYPTOPP_EXPORTS) || defined(CRYPTOPP_IMPORTS)
-#define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance)
-#else
-# if defined(__GNUC__)
-#  define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance) \
-		static CompileAssert<(assertion)> \
-		CRYPTOPP_ASSERT_JOIN(cryptopp_CRYPTOPP_ASSERT_, instance) __attribute__ ((unused))
-# else
-#  define CRYPTOPP_COMPILE_ASSERT_INSTANCE(assertion, instance) \
-		static CompileAssert<(assertion)> \
-		CRYPTOPP_ASSERT_JOIN(cryptopp_CRYPTOPP_ASSERT_, instance)
-# endif // __GNUC__
-#endif
-#define CRYPTOPP_ASSERT_JOIN(X, Y) CRYPTOPP_DO_ASSERT_JOIN(X, Y)
-#define CRYPTOPP_DO_ASSERT_JOIN(X, Y) X##Y
-
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-// ************** count elements in an array ***************
-
-#if CRYPTOPP_DOXYGEN_PROCESSING
-//! \brief Counts elements in an array
-//! \param arr an array of elements
-//! \details COUNTOF counts elements in an array. On Windows COUNTOF(x) is defined
-//!   to <tt>_countof(x)</tt> to ensure correct results for pointers.
-//! \note COUNTOF does not produce correct results with pointers, and an array must be used.
-//!   <tt>sizeof(x)/sizeof(x[0])</tt> suffers the same problem. The risk is eliminated by using
-//!   <tt>_countof(x)</tt> on Windows. Windows will provide the immunity for other platforms.
-# define COUNTOF(arr)
-#else
-// VS2005 added _countof
-#ifndef COUNTOF
-# if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#  define COUNTOF(x) _countof(x)
-# else
-#  define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
-# endif
-#endif // COUNTOF
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-// ************** misc classes ***************
-
-//! \brief An Empty class
-//! \details The Empty class can be used as a template parameter <tt>BASE</tt> when no base class exists.
-class CRYPTOPP_DLL Empty
-{
-};
-
-#if !CRYPTOPP_DOXYGEN_PROCESSING
-template <class BASE1, class BASE2>
-class CRYPTOPP_NO_VTABLE TwoBases : public BASE1, public BASE2
-{
-};
-
-template <class BASE1, class BASE2, class BASE3>
-class CRYPTOPP_NO_VTABLE ThreeBases : public BASE1, public BASE2, public BASE3
-{
-};
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-//! \class ObjectHolder
-//! \tparam the class or type
-//! \brief Uses encapsulation to hide an object in derived classes
-//! \details The object T is declared as protected.
-template <class T>
-class ObjectHolder
-{
-protected:
-	T m_object;
-};
-
-//! \class NotCopyable
-//! \brief Ensures an object is not copyable
-//! \details NotCopyable ensures an object is not copyable by making the
-//!   copy constructor and assignment operator private. Deleters are not
-//!   used under C++11.
-//! \sa Clonable class
-class NotCopyable
-{
-public:
-	NotCopyable() {}
-private:
-    NotCopyable(const NotCopyable &);
-    void operator=(const NotCopyable &);
-};
-
-//! \class NewObject
-//! \brief An object factory function
-//! \details NewObject overloads operator()().
-template <class T>
-struct NewObject
-{
-	T* operator()() const {return new T;}
-};
-
-#if CRYPTOPP_DOXYGEN_PROCESSING
-//! \brief A memory barrier
-//! \details MEMORY_BARRIER attempts to ensure reads and writes are completed
-//!   in the absence of a language synchronization point. It is used by the
-//!   Singleton class if the compiler supports it. The barrier is provided at the
-//!   customary places in a double-checked initialization.
-//! \details Internally, MEMORY_BARRIER uses <tt>std::atomic_thread_fence</tt> if
-//!   C++11 atomics are available. Otherwise, <tt>intrinsic(_ReadWriteBarrier)</tt>,
-//!   <tt>_ReadWriteBarrier()</tt> or <tt>__asm__("" ::: "memory")</tt> is used.
-#define MEMORY_BARRIER ...
-#else
-#if defined(CRYPTOPP_CXX11_ATOMICS)
-# define MEMORY_BARRIER() std::atomic_thread_fence(std::memory_order_acq_rel)
-#elif (_MSC_VER >= 1400)
-# pragma intrinsic(_ReadWriteBarrier)
-# define MEMORY_BARRIER() _ReadWriteBarrier()
-#elif defined(__INTEL_COMPILER)
-# define MEMORY_BARRIER() __memory_barrier()
-#elif defined(__GNUC__) || defined(__clang__)
-# define MEMORY_BARRIER() __asm__ __volatile__ ("" ::: "memory")
-#else
-# define MEMORY_BARRIER()
-#endif
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-//! \brief Restricts the instantiation of a class to one static object without locks
-//! \tparam T the class or type
-//! \tparam F the object factory for T
-//! \tparam instance the initiali instance count
-//! \details This class safely initializes a static object in a multithreaded environment. For C++03
-//!   and below it will do so without using locks for portability. If two threads call Ref() at the same
-//!   time, they may get back different references, and one object may end up being memory leaked. This
-//!   is by design and it avoids a subltle initialization problem ina multithreaded environment with thread
-//!   local storage on early Windows platforms, like Windows XP and Windows 2003.
-//! \details For C++11 and above, a standard double-checked locking pattern with thread fences
-//!   are used. The locks and fences are standard and do not hinder portability.
-//! \sa <A HREF="http://preshing.com/20130930/double-checked-locking-is-fixed-in-cpp11/">Double-Checked
-//!   Locking is Fixed In C++11</A>
-template <class T, class F = NewObject<T>, int instance=0>
-class Singleton
-{
-public:
-	Singleton(F objectFactory = F()) : m_objectFactory(objectFactory) {}
-
-	// prevent this function from being inlined
-	CRYPTOPP_NOINLINE const T & Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const;
-
-private:
-	F m_objectFactory;
-};
-
-//! \brief Return a reference to the inner Singleton object
-//! \details Ref() is used to create the object using the object factory. The
-//!   object is only created once with the limitations discussed in the class documentation.
-//! \sa <A HREF="http://preshing.com/20130930/double-checked-locking-is-fixed-in-cpp11/">Double-Checked Locking is Fixed In C++11</A>
-#if defined(CRYPTOPP_CXX11_ATOMICS) && defined(CRYPTOPP_CXX11_SYNCHRONIZATION)
-template <class T, class F, int instance>
-  const T & Singleton<T, F, instance>::Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const
-{
-	static std::mutex s_mutex;
-	static std::atomic<T*> s_pObject;
-
-	T *p = s_pObject.load(std::memory_order_relaxed);
-	std::atomic_thread_fence(std::memory_order_acquire);
-
-	if (p)
-		return *p;
-
-	std::lock_guard<std::mutex> lock(s_mutex);
-	p = s_pObject.load(std::memory_order_relaxed);
-	std::atomic_thread_fence(std::memory_order_acquire);
-
-	if (p)
-		return *p;
-
-	T *newObject = m_objectFactory();
-	s_pObject.store(newObject, std::memory_order_relaxed);
-	std::atomic_thread_fence(std::memory_order_release);
-
-	return *newObject;
-}
-#else
-template <class T, class F, int instance>
-const T & Singleton<T, F, instance>::Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const
-{
-	static volatile simple_ptr<T> s_pObject;
-	T *p = s_pObject.m_p;
-	MEMORY_BARRIER();
-
-	if (p)
-		return *p;
-
-	T *newObject = m_objectFactory();
-	p = s_pObject.m_p;
-	MEMORY_BARRIER();
-
-	if (p)
-	{
-		delete newObject;
-		return *p;
-	}
-
-	s_pObject.m_p = newObject;
-	MEMORY_BARRIER();
-
-	return *newObject;
-}
-#endif
-
-// ************** misc functions ***************
-
-#if (!__STDC_WANT_SECURE_LIB__ && !defined(_MEMORY_S_DEFINED)) || defined(CRYPTOPP_WANT_SECURE_LIB)
-
-//! \brief Bounds checking replacement for memcpy()
-//! \param dest pointer to the desination memory block
-//! \param sizeInBytes the size of the desination memory block, in bytes
-//! \param src pointer to the source memory block
-//! \param count the size of the source memory block, in bytes
-//! \throws InvalidArgument
-//! \details ISO/IEC TR-24772 provides bounds checking interfaces for potentially
-//!   unsafe functions like memcpy(), strcpy() and memmove(). However,
-//!   not all standard libraries provides them, like Glibc. The library's
-//!   memcpy_s() is a near-drop in replacement. Its only a near-replacement
-//!   because the library's version throws an InvalidArgument on a bounds violation.
-//! \details memcpy_s() and memmove_s() are guarded by __STDC_WANT_SECURE_LIB__.
-//!   If __STDC_WANT_SECURE_LIB__ is \a not defined or defined to 0, then the library
-//!   makes memcpy_s() and memmove_s() available. The library will also optionally
-//!   make the symbols available if <tt>CRYPTOPP_WANT_SECURE_LIB</tt> is defined.
-//!   <tt>CRYPTOPP_WANT_SECURE_LIB</tt> is in config.h, but it is disabled by default.
-//! \details memcpy_s() will assert the pointers src and dest are not NULL
-//!   in debug builds. Passing NULL for either pointer is undefined behavior.
-inline void memcpy_s(void *dest, size_t sizeInBytes, const void *src, size_t count)
-{
-	// Safer functions on Windows for C&A, http://github.com/weidai11/cryptopp/issues/55
-
-	// Pointers must be valid; otherwise undefined behavior
-	CRYPTOPP_ASSERT(dest != NULL); CRYPTOPP_ASSERT(src != NULL);
-	// Destination buffer must be large enough to satsify request
-	CRYPTOPP_ASSERT(sizeInBytes >= count);
-	if (count > sizeInBytes)
-		throw InvalidArgument("memcpy_s: buffer overflow");
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4996)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6386)
-# endif
-#endif
-	memcpy(dest, src, count);
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-}
-
-//! \brief Bounds checking replacement for memmove()
-//! \param dest pointer to the desination memory block
-//! \param sizeInBytes the size of the desination memory block, in bytes
-//! \param src pointer to the source memory block
-//! \param count the size of the source memory block, in bytes
-//! \throws InvalidArgument
-//! \details ISO/IEC TR-24772 provides bounds checking interfaces for potentially
-//!   unsafe functions like memcpy(), strcpy() and memmove(). However,
-//!   not all standard libraries provides them, like Glibc. The library's
-//!   memmove_s() is a near-drop in replacement. Its only a near-replacement
-//!   because the library's version throws an InvalidArgument on a bounds violation.
-//! \details memcpy_s() and memmove_s() are guarded by __STDC_WANT_SECURE_LIB__.
-//!   If __STDC_WANT_SECURE_LIB__ is \a not defined or defined to 0, then the library
-//!   makes memcpy_s() and memmove_s() available. The library will also optionally
-//!   make the symbols available if <tt>CRYPTOPP_WANT_SECURE_LIB</tt> is defined.
-//!   <tt>CRYPTOPP_WANT_SECURE_LIB</tt> is in config.h, but it is disabled by default.
-//! \details memmove_s() will assert the pointers src and dest are not NULL
-//!   in debug builds. Passing NULL for either pointer is undefined behavior.
-inline void memmove_s(void *dest, size_t sizeInBytes, const void *src, size_t count)
-{
-	// Safer functions on Windows for C&A, http://github.com/weidai11/cryptopp/issues/55
-
-	// Pointers must be valid; otherwise undefined behavior
-	CRYPTOPP_ASSERT(dest != NULL); CRYPTOPP_ASSERT(src != NULL);
-	// Destination buffer must be large enough to satsify request
-	CRYPTOPP_ASSERT(sizeInBytes >= count);
-	if (count > sizeInBytes)
-		throw InvalidArgument("memmove_s: buffer overflow");
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4996)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6386)
-# endif
-#endif
-	memmove(dest, src, count);
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-}
-
-#if __BORLANDC__ >= 0x620
-// C++Builder 2010 workaround: can't use std::memcpy_s because it doesn't allow 0 lengths
-# define memcpy_s CryptoPP::memcpy_s
-# define memmove_s CryptoPP::memmove_s
-#endif
-
-#endif // __STDC_WANT_SECURE_LIB__
-
-//! \brief Swaps two variables which are arrays
-//! \param a the first value
-//! \param b the second value
-//! \details C++03 does not provide support for <tt>std::swap(__m128i a, __m128i b)</tt>
-//!   because <tt>__m128i</tt> is an <tt>unsigned long long[2]</tt>. Most compilers
-//!   support it out of the box, but Sun Studio C++ compilers 12.2 and 12.3 do not.
-//! \sa <A HREF="http://stackoverflow.com/q/38417413">How to swap two __m128i variables
-//!   in C++03 given its an opaque type and an array?</A> on Stack Overflow.
-template <class T>
-inline void vec_swap(T& a, T& b)
-{
-	T t;
-	t=a, a=b, b=t;
-}
-
-//! \brief Memory block initializer and eraser that attempts to survive optimizations
-//! \param ptr pointer to the memory block being written
-//! \param value the integer value to write for each byte
-//! \param num the size of the source memory block, in bytes
-//! \details Internally the function calls memset with the value value, and receives the
-//!   return value from memset as a <tt>volatile</tt> pointer.
-inline void * memset_z(void *ptr, int value, size_t num)
-{
-// avoid extranous warning on GCC 4.3.2 Ubuntu 8.10
-#if CRYPTOPP_GCC_VERSION >= 30001
-	if (__builtin_constant_p(num) && num==0)
-		return ptr;
-#endif
-	volatile void* x = memset(ptr, value, num);
-	return const_cast<void*>(x);
-}
-
-//! \brief Replacement function for std::min
-//! \param a the first value
-//! \param b the second value
-//! \returns the minimum value based on a comparison of <tt>b \< a</tt> using <tt>operator\<</tt>
-//! \details STDMIN was provided because the library could not use std::min or std::max in MSVC60 or Cygwin 1.1.0
-template <class T> inline const T& STDMIN(const T& a, const T& b)
-{
-	return b < a ? b : a;
-}
-
-//! \brief Replacement function for std::max
-//! \param a the first value
-//! \param b the second value
-//! \returns the minimum value based on a comparison of <tt>a \< b</tt> using <tt>operator\<</tt>
-//! \details STDMAX was provided because the library could not use std::min or std::max in MSVC60 or Cygwin 1.1.0
-template <class T> inline const T& STDMAX(const T& a, const T& b)
-{
-	// can't use std::min or std::max in MSVC60 or Cygwin 1.1.0
-	return a < b ? b : a;
-}
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4389)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wsign-compare"
-# if (CRYPTOPP_LLVM_CLANG_VERSION >= 20800) || (CRYPTOPP_APPLE_CLANG_VERSION >= 30000)
-#  pragma GCC diagnostic ignored "-Wtautological-compare"
-# elif (CRYPTOPP_GCC_VERSION >= 40300)
-#  pragma GCC diagnostic ignored "-Wtype-limits"
-# endif
-#endif
-
-//! \brief Safe comparison of values that could be neagtive and incorrectly promoted
-//! \param a the first value
-//! \param b the second value
-//! \returns the minimum value based on a comparison a and b using <tt>operator&lt;</tt>.
-//! \details The comparison <tt>b \< a</tt> is performed and the value returned is a's type T1.
-template <class T1, class T2> inline const T1 UnsignedMin(const T1& a, const T2& b)
-{
-	CRYPTOPP_COMPILE_ASSERT((sizeof(T1)<=sizeof(T2) && T2(-1)>0) || (sizeof(T1)>sizeof(T2) && T1(-1)>0));
-	if (sizeof(T1)<=sizeof(T2))
-		return b < (T2)a ? (T1)b : a;
-	else
-		return (T1)b < a ? (T1)b : a;
-}
-
-//! \brief Tests whether a conversion from -> to is safe to perform
-//! \param from the first value
-//! \param to the second value
-//! \returns true if its safe to convert from into to, false otherwise.
-template <class T1, class T2>
-inline bool SafeConvert(T1 from, T2 &to)
-{
-	to = (T2)from;
-	if (from != to || (from > 0) != (to > 0))
-		return false;
-	return true;
-}
-
-//! \brief Converts a value to a string
-//! \param value the value to convert
-//! \param base the base to use during the conversion
-//! \returns the string representation of value in base.
-template <class T>
-std::string IntToString(T value, unsigned int base = 10)
-{
-	// Hack... set the high bit for uppercase.
-	static const unsigned int HIGH_BIT = (1U << 31);
-	const char CH = !!(base & HIGH_BIT) ? 'A' : 'a';
-	base &= ~HIGH_BIT;
-
-	CRYPTOPP_ASSERT(base >= 2);
-	if (value == 0)
-		return "0";
-
-	bool negate = false;
-	if (value < 0)
-	{
-		negate = true;
-		value = 0-value;	// VC .NET does not like -a
-	}
-	std::string result;
-	while (value > 0)
-	{
-		T digit = value % base;
-		result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result;
-		value /= base;
-	}
-	if (negate)
-		result = "-" + result;
-	return result;
-}
-
-//! \brief Converts an unsigned value to a string
-//! \param value the value to convert
-//! \param base the base to use during the conversion
-//! \returns the string representation of value in base.
-//! \details this template function specialization was added to suppress
-//!    Coverity findings on IntToString() with unsigned types.
-template <> CRYPTOPP_DLL
-std::string IntToString<word64>(word64 value, unsigned int base);
-
-//! \brief Converts an Integer to a string
-//! \param value the Integer to convert
-//! \param base the base to use during the conversion
-//! \returns the string representation of value in base.
-//! \details This is a template specialization of IntToString(). Use it
-//!   like IntToString():
-//! <pre>
-//!   // Print integer in base 10
-//!   Integer n...
-//!   std::string s = IntToString(n, 10);
-//! </pre>
-//! \details The string is presented with lowercase letters by default. A
-//!   hack is available to switch to uppercase letters without modifying
-//!   the function signature.
-//! <pre>
-//!   // Print integer in base 16, uppercase letters
-//!   Integer n...
-//!   const unsigned int UPPER = (1 << 31);
-//!   std::string s = IntToString(n, (UPPER | 16));</pre>
-template <> CRYPTOPP_DLL
-std::string IntToString<Integer>(Integer value, unsigned int base);
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic pop
-#endif
-
-#define RETURN_IF_NONZERO(x) size_t returnedValue = x; if (returnedValue) return returnedValue
-
-// this version of the macro is fastest on Pentium 3 and Pentium 4 with MSVC 6 SP5 w/ Processor Pack
-#define GETBYTE(x, y) (unsigned int)byte((x)>>(8*(y)))
-// these may be faster on other CPUs/compilers
-// #define GETBYTE(x, y) (unsigned int)(((x)>>(8*(y)))&255)
-// #define GETBYTE(x, y) (((byte *)&(x))[y])
-
-#define CRYPTOPP_GET_BYTE_AS_BYTE(x, y) byte((x)>>(8*(y)))
-
-//! \brief Returns the parity of a value
-//! \param value the value to provide the parity
-//! \returns 1 if the number 1-bits in the value is odd, 0 otherwise
-template <class T>
-unsigned int Parity(T value)
-{
-	for (unsigned int i=8*sizeof(value)/2; i>0; i/=2)
-		value ^= value >> i;
-	return (unsigned int)value&1;
-}
-
-//! \brief Returns the number of 8-bit bytes or octets required for a value
-//! \param value the value to test
-//! \returns the minimum number of 8-bit bytes or octets required to represent a value
-template <class T>
-unsigned int BytePrecision(const T &value)
-{
-	if (!value)
-		return 0;
-
-	unsigned int l=0, h=8*sizeof(value);
-	while (h-l > 8)
-	{
-		unsigned int t = (l+h)/2;
-		if (value >> t)
-			l = t;
-		else
-			h = t;
-	}
-
-	return h/8;
-}
-
-//! \brief Returns the number of bits required for a value
-//! \param value the value to test
-//! \returns the maximum number of bits required to represent a value.
-template <class T>
-unsigned int BitPrecision(const T &value)
-{
-	if (!value)
-		return 0;
-
-	unsigned int l=0, h=8*sizeof(value);
-
-	while (h-l > 1)
-	{
-		unsigned int t = (l+h)/2;
-		if (value >> t)
-			l = t;
-		else
-			h = t;
-	}
-
-	return h;
-}
-
-//! Determines the number of trailing 0-bits in a value
-//! \param v the 32-bit value to test
-//! \returns the number of trailing 0-bits in v, starting at the least significant bit position
-//! \details TrailingZeros returns the number of trailing 0-bits in v, starting at the least
-//!   significant bit position. The return value is undefined if there are no 1-bits set in the value v.
-//! \note The function does \a not return 0 if no 1-bits are set because 0 collides with a 1-bit at the 0-th position.
-inline unsigned int TrailingZeros(word32 v)
-{
-	// GCC 4.7 and VS2012 provides tzcnt on AVX2/BMI enabled processors
-	// We don't enable for Microsoft because it requires a runtime check.
-	// http://msdn.microsoft.com/en-us/library/hh977023%28v=vs.110%29.aspx
-	CRYPTOPP_ASSERT(v != 0);
-#if defined(__GNUC__) && defined(__BMI__)
-	return (unsigned int)_tzcnt_u32(v);
-#elif defined(__GNUC__) && (CRYPTOPP_GCC_VERSION >= 30400)
-	return (unsigned int)__builtin_ctz(v);
-#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
-	unsigned long result;
-	_BitScanForward(&result, v);
-	return (unsigned int)result;
-#else
-	// from http://graphics.stanford.edu/~seander/bithacks.html#ZerosOnRightMultLookup
-	static const int MultiplyDeBruijnBitPosition[32] =
-	{
-	  0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
-	  31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
-	};
-	return MultiplyDeBruijnBitPosition[((word32)((v & -v) * 0x077CB531U)) >> 27];
-#endif
-}
-
-//! Determines the number of trailing 0-bits in a value
-//! \param v the 64-bit value to test
-//! \returns the number of trailing 0-bits in v, starting at the least significant bit position
-//! \details TrailingZeros returns the number of trailing 0-bits in v, starting at the least
-//!   significant bit position. The return value is undefined if there are no 1-bits set in the value v.
-//! \note The function does \a not return 0 if no 1-bits are set because 0 collides with a 1-bit at the 0-th position.
-inline unsigned int TrailingZeros(word64 v)
-{
-	// GCC 4.7 and VS2012 provides tzcnt on AVX2/BMI enabled processors
-	// We don't enable for Microsoft because it requires a runtime check.
-	// http://msdn.microsoft.com/en-us/library/hh977023%28v=vs.110%29.aspx
-	CRYPTOPP_ASSERT(v != 0);
-#if defined(__GNUC__) && defined(__BMI__) && defined(__x86_64__)
-	return (unsigned int)_tzcnt_u64(v);
-#elif defined(__GNUC__) && (CRYPTOPP_GCC_VERSION >= 30400)
-	return (unsigned int)__builtin_ctzll(v);
-#elif defined(_MSC_VER) && (_MSC_VER >= 1400) && (defined(_M_X64) || defined(_M_IA64))
-	unsigned long result;
-	_BitScanForward64(&result, v);
-	return (unsigned int)result;
-#else
-	return word32(v) ? TrailingZeros(word32(v)) : 32 + TrailingZeros(word32(v>>32));
-#endif
-}
-
-//! \brief Truncates the value to the specified number of bits.
-//! \param value the value to truncate or mask
-//! \param bits the number of bits to truncate or mask
-//! \returns the value truncated to the specified number of bits, starting at the least
-//!   significant bit position
-//! \details This function masks the low-order bits of value and returns the result. The
-//!   mask is created with <tt>(1 << bits) - 1</tt>.
-template <class T>
-inline T Crop(T value, size_t bits)
-{
-	if (bits < 8*sizeof(value))
-    	return T(value & ((T(1) << bits) - 1));
-	else
-		return value;
-}
-
-//! \brief Returns the number of 8-bit bytes or octets required for the specified number of bits
-//! \param bitCount the number of bits
-//! \returns the minimum number of 8-bit bytes or octets required by bitCount
-//! \details BitsToBytes is effectively a ceiling function based on 8-bit bytes.
-inline size_t BitsToBytes(size_t bitCount)
-{
-	return ((bitCount+7)/(8));
-}
-
-//! \brief Returns the number of words required for the specified number of bytes
-//! \param byteCount the number of bytes
-//! \returns the minimum number of words required by byteCount
-//! \details BytesToWords is effectively a ceiling function based on <tt>WORD_SIZE</tt>.
-//!   <tt>WORD_SIZE</tt> is defined in config.h
-inline size_t BytesToWords(size_t byteCount)
-{
-	return ((byteCount+WORD_SIZE-1)/WORD_SIZE);
-}
-
-//! \brief Returns the number of words required for the specified number of bits
-//! \param bitCount the number of bits
-//! \returns the minimum number of words required by bitCount
-//! \details BitsToWords is effectively a ceiling function based on <tt>WORD_BITS</tt>.
-//!   <tt>WORD_BITS</tt> is defined in config.h
-inline size_t BitsToWords(size_t bitCount)
-{
-	return ((bitCount+WORD_BITS-1)/(WORD_BITS));
-}
-
-//! \brief Returns the number of double words required for the specified number of bits
-//! \param bitCount the number of bits
-//! \returns the minimum number of double words required by bitCount
-//! \details BitsToDwords is effectively a ceiling function based on <tt>2*WORD_BITS</tt>.
-//!   <tt>WORD_BITS</tt> is defined in config.h
-inline size_t BitsToDwords(size_t bitCount)
-{
-	return ((bitCount+2*WORD_BITS-1)/(2*WORD_BITS));
-}
-
-//! Performs an XOR of a buffer with a mask
-//! \param buf the buffer to XOR with the mask
-//! \param mask the mask to XOR with the buffer
-//! \param count the size of the buffers, in bytes
-//! \details The function effectively visits each element in the buffers and performs
-//!   <tt>buf[i] ^= mask[i]</tt>. buf and mask must be of equal size.
-CRYPTOPP_DLL void CRYPTOPP_API xorbuf(byte *buf, const byte *mask, size_t count);
-
-//! Performs an XOR of an input buffer with a mask and stores the result in an output buffer
-//! \param output the destination buffer
-//! \param input the source buffer to XOR with the mask
-//! \param mask the mask buffer to XOR with the input buffer
-//! \param count the size of the buffers, in bytes
-//! \details The function effectively visits each element in the buffers and performs
-//!   <tt>output[i] = input[i] ^ mask[i]</tt>. output, input and mask must be of equal size.
-CRYPTOPP_DLL void CRYPTOPP_API xorbuf(byte *output, const byte *input, const byte *mask, size_t count);
-
-//! \brief Performs a near constant-time comparison of two equally sized buffers
-//! \param buf1 the first buffer
-//! \param buf2 the second buffer
-//! \param count the size of the buffers, in bytes
-//! \details The function effectively performs an XOR of the elements in two equally sized buffers
-//!   and retruns a result based on the XOR operation. The function is near constant-time because
-//!   CPU micro-code timings could affect the "constant-ness". Calling code is responsible for
-//!   mitigating timing attacks if the buffers are \a not equally sized.
-//! \sa ModPowerOf2
-CRYPTOPP_DLL bool CRYPTOPP_API VerifyBufsEqual(const byte *buf1, const byte *buf2, size_t count);
-
-//! \brief Tests whether a value is a power of 2
-//! \param value the value to test
-//! \returns true if value is a power of 2, false otherwise
-//! \details The function creates a mask of <tt>value - 1</tt> and returns the result of
-//!   an AND operation compared to 0. If value is 0 or less than 0, then the function returns false.
-template <class T>
-inline bool IsPowerOf2(const T &value)
-{
-	return value > 0 && (value & (value-1)) == 0;
-}
-
-#if defined(__GNUC__) && defined(__BMI__)
-template <>
-inline bool IsPowerOf2<word32>(const word32 &value)
-{
-	return value > 0 && _blsr_u32(value) == 0;
-}
-
-# if defined(__x86_64__)
-template <>
-inline bool IsPowerOf2<word64>(const word64 &value)
-{
-	return value > 0 && _blsr_u64(value) == 0;
-}
-# endif
-#endif
-
-//! \brief Performs a saturating subtract clamped at 0
-//! \param a the minuend
-//! \param b the subtrahend
-//! \returns the difference produced by the saturating subtract
-//! \details Saturating arithmetic restricts results to a fixed range. Results that are less than 0 are clamped at 0.
-//! \details Use of saturating arithmetic in places can be advantageous because it can
-//!   avoid a branch by using an instruction like a conditional move (<tt>CMOVE</tt>).
-template <class T1, class T2>
-inline T1 SaturatingSubtract(const T1 &a, const T2 &b)
-{
-	// Generated ASM of a typical clamp, http://gcc.gnu.org/ml/gcc-help/2014-10/msg00112.html
-	return T1((a > b) ? (a - b) : 0);
-}
-
-//! \brief Performs a saturating subtract clamped at 1
-//! \param a the minuend
-//! \param b the subtrahend
-//! \returns the difference produced by the saturating subtract
-//! \details Saturating arithmetic restricts results to a fixed range. Results that are less than
-//!   1 are clamped at 1.
-//! \details Use of saturating arithmetic in places can be advantageous because it can
-//!   avoid a branch by using an instruction like a conditional move (<tt>CMOVE</tt>).
-template <class T1, class T2>
-inline T1 SaturatingSubtract1(const T1 &a, const T2 &b)
-{
-	// Generated ASM of a typical clamp, http://gcc.gnu.org/ml/gcc-help/2014-10/msg00112.html
-	return T1((a > b) ? (a - b) : 1);
-}
-
-//! \brief Reduces a value to a power of 2
-//! \param a the first value
-//! \param b the second value
-//! \returns ModPowerOf2() returns <tt>a & (b-1)</tt>. <tt>b</tt> must be a power of 2.
-//!   Use IsPowerOf2() to determine if <tt>b</tt> is a suitable candidate.
-//! \sa IsPowerOf2
-template <class T1, class T2>
-inline T2 ModPowerOf2(const T1 &a, const T2 &b)
-{
-	CRYPTOPP_ASSERT(IsPowerOf2(b));
-	// Coverity finding CID 170383 Overflowed return value (INTEGER_OVERFLOW)
-	return T2(a) & SaturatingSubtract(b,1U);
-}
-
-//! \brief Rounds a value down to a multiple of a second value
-//! \param n the value to reduce
-//! \param m the value to reduce \n to to a multiple
-//! \returns the possibly unmodified value \n
-//! \details RoundDownToMultipleOf is effectively a floor function based on m. The function returns
-//!   the value <tt>n - n\%m</tt>. If n is a multiple of m, then the original value is returned.
-template <class T1, class T2>
-inline T1 RoundDownToMultipleOf(const T1 &n, const T2 &m)
-{
-	if (IsPowerOf2(m))
-		return n - ModPowerOf2(n, m);
-	else
-		return n - n%m;
-}
-
-//! \brief Rounds a value up to a multiple of a second value
-//! \param n the value to reduce
-//! \param m the value to reduce \n to to a multiple
-//! \returns the possibly unmodified value \n
-//! \details RoundUpToMultipleOf is effectively a ceiling function based on m. The function
-//!   returns the value <tt>n + n\%m</tt>. If n is a multiple of m, then the original value is
-//!   returned. If the value n would overflow, then an InvalidArgument exception is thrown.
-template <class T1, class T2>
-inline T1 RoundUpToMultipleOf(const T1 &n, const T2 &m)
-{
-	if (n > (SIZE_MAX/sizeof(T1))-m-1)
-		throw InvalidArgument("RoundUpToMultipleOf: integer overflow");
-	return RoundDownToMultipleOf(T1(n+m-1), m);
-}
-
-//! \brief Returns the minimum alignment requirements of a type
-//! \param dummy an unused Visual C++ 6.0 workaround
-//! \returns the minimum alignment requirements of a type, in bytes
-//! \details Internally the function calls C++11's <tt>alignof</tt> if available. If not available,
-//!   then the function uses compiler specific extensions such as <tt>__alignof</tt> and
-//!   <tt>_alignof_</tt>. If an extension is not available, then the function uses
-//!   <tt>__BIGGEST_ALIGNMENT__</tt> if <tt>__BIGGEST_ALIGNMENT__</tt> is smaller than <tt>sizeof(T)</tt>.
-//!   <tt>sizeof(T)</tt> is used if all others are not available.
-//!   In <em>all</em> cases, if <tt>CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS</tt> is defined, then the
-//!   function returns 1.
-template <class T>
-inline unsigned int GetAlignmentOf(T *dummy=NULL)	// VC60 workaround
-{
-// GCC 4.6 (circa 2008) and above aggressively uses vectorization.
-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)
-	if (sizeof(T) < 16)
-		return 1;
-#endif
-	CRYPTOPP_UNUSED(dummy);
-#if defined(CRYPTOPP_CXX11_ALIGNOF)
-	return alignof(T);
-#elif (_MSC_VER >= 1300)
-	return __alignof(T);
-#elif defined(__GNUC__)
-	return __alignof__(T);
-#elif CRYPTOPP_BOOL_SLOW_WORD64
-	return UnsignedMin(4U, sizeof(T));
-#else
-# if __BIGGEST_ALIGNMENT__
-	if (__BIGGEST_ALIGNMENT__ < sizeof(T))
-		return __BIGGEST_ALIGNMENT__;
-	else
-# endif
-	return sizeof(T);
-#endif
-}
-
-//! \brief Determines whether ptr is aligned to a minimum value
-//! \param ptr the pointer being checked for alignment
-//! \param alignment the alignment value to test the pointer against
-//! \returns true if ptr is aligned on at least align boundary
-//! \details Internally the function tests whether alignment is 1. If so, the function returns true.
-//!   If not, then the function effectively performs a modular reduction and returns true if the residue is 0
-inline bool IsAlignedOn(const void *ptr, unsigned int alignment)
-{
-	return alignment==1 || (IsPowerOf2(alignment) ? ModPowerOf2((size_t)ptr, alignment) == 0 : (size_t)ptr % alignment == 0);
-}
-
-//! \brief Determines whether ptr is minimally aligned
-//! \param ptr the pointer to check for alignment
-//! \param dummy an unused Visual C++ 6.0 workaround
-//! \returns true if ptr follows native byte ordering, false otherwise
-//! \details Internally the function calls IsAlignedOn with a second parameter of GetAlignmentOf<T>
-template <class T>
-inline bool IsAligned(const void *ptr, T *dummy=NULL)	// VC60 workaround
-{
-	CRYPTOPP_UNUSED(dummy);
-	return IsAlignedOn(ptr, GetAlignmentOf<T>());
-}
-
-#if defined(IS_LITTLE_ENDIAN)
-	typedef LittleEndian NativeByteOrder;
-#elif defined(IS_BIG_ENDIAN)
-	typedef BigEndian NativeByteOrder;
-#else
-# error "Unable to determine endian-ness"
-#endif
-
-//! \brief Returns NativeByteOrder as an enumerated ByteOrder value
-//! \returns LittleEndian if the native byte order is little-endian, and BigEndian if the
-	//!   native byte order is big-endian
-//! \details NativeByteOrder is a typedef depending on the platform. If IS_LITTLE_ENDIAN is
-	//!   set in config.h, then GetNativeByteOrder returns LittleEndian. If
-	//!   IS_BIG_ENDIAN is set, then GetNativeByteOrder returns BigEndian.
-//! \note There are other byte orders besides little- and big-endian, and they include bi-endian
-	//!   and PDP-endian. If a system is neither little-endian nor big-endian, then a compile time error occurs.
-inline ByteOrder GetNativeByteOrder()
-{
-	return NativeByteOrder::ToEnum();
-}
-
-//! \brief Determines whether order follows native byte ordering
-//! \param order the ordering being tested against native byte ordering
-//! \returns true if order follows native byte ordering, false otherwise
-inline bool NativeByteOrderIs(ByteOrder order)
-{
-	return order == GetNativeByteOrder();
-}
-
-//! \brief Returns the direction the cipher is being operated
-//! \param obj the cipher object being queried
-//! \returns \p ENCRYPTION if the cipher obj is being operated in its forward direction,
-//!   \p DECRYPTION otherwise
-//! \details A cipher can be operated in a "forward" direction (encryption) or a "reverse"
-//!   direction (decryption). The operations do not have to be symmetric, meaning a second
-//!   application of the transformation does not necessariy return the original message.
-//!   That is, <tt>E(D(m))</tt> may not equal <tt>E(E(m))</tt>; and <tt>D(E(m))</tt> may not
-//!   equal <tt>D(D(m))</tt>.
-template <class T>
-inline CipherDir GetCipherDir(const T &obj)
-{
-	return obj.IsForwardTransformation() ? ENCRYPTION : DECRYPTION;
-}
-
-//! \brief Attempts to reclaim unused memory
-//! \throws bad_alloc
-//! \details In the normal course of running a program, a request for memory normally succeeds. If a
-//!   call to AlignedAllocate or UnalignedAllocate fails, then CallNewHandler is called in
-//!   an effort to recover. Internally, CallNewHandler calls set_new_handler(NULL) in an effort
-//!   to free memory. There is no guarantee CallNewHandler will be able to procure more memory so
-//!   an allocation succeeds. If the call to set_new_handler fails, then CallNewHandler throws
-//!   a bad_alloc exception.
-CRYPTOPP_DLL void CRYPTOPP_API CallNewHandler();
-
-//! \brief Performs an addition with carry on a block of bytes
-//! \param inout the byte block
-//! \param size the size of the block, in bytes
-//! \details Performs an addition with carry by adding 1 on a block of bytes starting at the least
-//!   significant byte. Once carry is 0, the function terminates and returns to the caller.
-//! \note The function is not constant time because it stops processing when the carry is 0.
-inline void IncrementCounterByOne(byte *inout, unsigned int size)
-{
-	CRYPTOPP_ASSERT(inout != NULL); CRYPTOPP_ASSERT(size < INT_MAX);
-	for (int i=int(size-1), carry=1; i>=0 && carry; i--)
-		carry = !++inout[i];
-}
-
-//! \brief Performs an addition with carry on a block of bytes
-//! \param output the destination block of bytes
-//! \param input the source block of bytes
-//! \param size the size of the block
-//! \details Performs an addition with carry on a block of bytes starting at the least significant
-//!   byte. Once carry is 0, the remaining bytes from input are copied to output using memcpy.
-//! \details The function is \a close to near-constant time because it operates on all the bytes in the blocks.
-inline void IncrementCounterByOne(byte *output, const byte *input, unsigned int size)
-{
-	CRYPTOPP_ASSERT(output != NULL); CRYPTOPP_ASSERT(input != NULL); CRYPTOPP_ASSERT(size < INT_MAX);
-
-	int i, carry;
-	for (i=int(size-1), carry=1; i>=0 && carry; i--)
-		carry = ((output[i] = input[i]+1) == 0);
-	memcpy_s(output, size, input, size_t(i)+1);
-}
-
-//! \brief Performs a branchless swap of values a and b if condition c is true
-//! \param c the condition to perform the swap
-//! \param a the first value
-//! \param b the second value
-template <class T>
-inline void ConditionalSwap(bool c, T &a, T &b)
-{
-	T t = c * (a ^ b);
-	a ^= t;
-	b ^= t;
-}
-
-//! \brief Performs a branchless swap of pointers a and b if condition c is true
-//! \param c the condition to perform the swap
-//! \param a the first pointer
-//! \param b the second pointer
-template <class T>
-inline void ConditionalSwapPointers(bool c, T &a, T &b)
-{
-	ptrdiff_t t = size_t(c) * (a - b);
-	a -= t;
-	b += t;
-}
-
-// see http://www.dwheeler.com/secure-programs/Secure-Programs-HOWTO/protect-secrets.html
-// and https://www.securecoding.cert.org/confluence/display/cplusplus/MSC06-CPP.+Be+aware+of+compiler+optimization+when+dealing+with+sensitive+data
-
-//! \brief Sets each element of an array to 0
-//! \param buf an array of elements
-//! \param n the number of elements in the array
-//! \details The operation performs a wipe or zeroization. The function attempts to survive optimizations and dead code removal
-template <class T>
-void SecureWipeBuffer(T *buf, size_t n)
-{
-	// GCC 4.3.2 on Cygwin optimizes away the first store if this loop is done in the forward direction
-	volatile T *p = buf+n;
-	while (n--)
-		*((volatile T*)(--p)) = 0;
-}
-
-#if (_MSC_VER >= 1400 || defined(__GNUC__)) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86)
-
-//! \brief Sets each byte of an array to 0
-//! \param buf an array of bytes
-//! \param n the number of elements in the array
-//! \details The operation performs a wipe or zeroization. The function attempts to survive optimizations and dead code removal.
-template<> inline void SecureWipeBuffer(byte *buf, size_t n)
-{
-	volatile byte *p = buf;
-#ifdef __GNUC__
-	asm volatile("rep stosb" : "+c"(n), "+D"(p) : "a"(0) : "memory");
-#else
-	__stosb((byte *)(size_t)p, 0, n);
-#endif
-}
-
-//! \brief Sets each 16-bit element of an array to 0
-//! \param buf an array of 16-bit words
-//! \param n the number of elements in the array
-//! \details The operation performs a wipe or zeroization. The function attempts to survive optimizations and dead code removal.
-template<> inline void SecureWipeBuffer(word16 *buf, size_t n)
-{
-	volatile word16 *p = buf;
-#ifdef __GNUC__
-	asm volatile("rep stosw" : "+c"(n), "+D"(p) : "a"(0) : "memory");
-#else
-	__stosw((word16 *)(size_t)p, 0, n);
-#endif
-}
-
-//! \brief Sets each 32-bit element of an array to 0
-//! \param buf an array of 32-bit words
-//! \param n the number of elements in the array
-//! \details The operation performs a wipe or zeroization. The function attempts to survive optimizations and dead code removal.
-template<> inline void SecureWipeBuffer(word32 *buf, size_t n)
-{
-	volatile word32 *p = buf;
-#ifdef __GNUC__
-	asm volatile("rep stosl" : "+c"(n), "+D"(p) : "a"(0) : "memory");
-#else
-	__stosd((unsigned long *)(size_t)p, 0, n);
-#endif
-}
-
-//! \brief Sets each 64-bit element of an array to 0
-//! \param buf an array of 64-bit words
-//! \param n the number of elements in the array
-//! \details The operation performs a wipe or zeroization. The function attempts to survive optimizations and dead code removal.
-template<> inline void SecureWipeBuffer(word64 *buf, size_t n)
-{
-#if CRYPTOPP_BOOL_X64
-	volatile word64 *p = buf;
-#ifdef __GNUC__
-	asm volatile("rep stosq" : "+c"(n), "+D"(p) : "a"(0) : "memory");
-#else
-	__stosq((word64 *)(size_t)p, 0, n);
-#endif
-#else
-	SecureWipeBuffer((word32 *)buf, 2*n);
-#endif
-}
-
-#endif	// #if (_MSC_VER >= 1400 || defined(__GNUC__)) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86)
-
-#if (_MSC_VER >= 1700) && defined(_M_ARM)
-template<> inline void SecureWipeBuffer(byte *buf, size_t n)
-{
-	char *p = reinterpret_cast<char*>(buf+n);
-	while (n--)
-		__iso_volatile_store8(--p, 0);
-}
-
-template<> inline void SecureWipeBuffer(word16 *buf, size_t n)
-{
-	short *p = reinterpret_cast<short*>(buf+n);
-	while (n--)
-		__iso_volatile_store16(--p, 0);
-}
-
-template<> inline void SecureWipeBuffer(word32 *buf, size_t n)
-{
-	int *p = reinterpret_cast<int*>(buf+n);
-	while (n--)
-		__iso_volatile_store32(--p, 0);
-}
-
-template<> inline void SecureWipeBuffer(word64 *buf, size_t n)
-{
-	__int64 *p = reinterpret_cast<__int64*>(buf+n);
-	while (n--)
-		__iso_volatile_store64(--p, 0);
-}
-#endif
-
-//! \brief Sets each element of an array to 0
-//! \param buf an array of elements
-//! \param n the number of elements in the array
-//! \details The operation performs a wipe or zeroization. The function attempts to survive optimizations and dead code removal.
-template <class T>
-inline void SecureWipeArray(T *buf, size_t n)
-{
-	if (sizeof(T) % 8 == 0 && GetAlignmentOf<T>() % GetAlignmentOf<word64>() == 0)
-		SecureWipeBuffer((word64 *)(void *)buf, n * (sizeof(T)/8));
-	else if (sizeof(T) % 4 == 0 && GetAlignmentOf<T>() % GetAlignmentOf<word32>() == 0)
-		SecureWipeBuffer((word32 *)(void *)buf, n * (sizeof(T)/4));
-	else if (sizeof(T) % 2 == 0 && GetAlignmentOf<T>() % GetAlignmentOf<word16>() == 0)
-		SecureWipeBuffer((word16 *)(void *)buf, n * (sizeof(T)/2));
-	else
-		SecureWipeBuffer((byte *)(void *)buf, n * sizeof(T));
-}
-
-//! \brief Converts a wide character C-string to a multibyte string
-//! \param str C-string consisting of wide characters
-//! \param throwOnError flag indication the function should throw on error
-//! \returns str converted to a multibyte string or an empty string.
-//! \details StringNarrow converts a wide string to a narrow string using C++ std::wcstombs() under
-//!   the executing thread's locale. A locale must be set before using this function, and it can be
-//!   set with std::setlocale() if needed. Upon success, the converted string is returned.
-//! \details Upon failure with throwOnError as false, the function returns an empty string. If
-//!   throwOnError as true, the function throws an InvalidArgument() exception.
-//! \note If you try to convert, say, the Chinese character for "bone" from UTF-16 (0x9AA8) to UTF-8
-//!   (0xE9 0xAA 0xA8), then you must ensure the locale is available. If the locale is not available,
-//!   then a 0x21 error is returned on Windows which eventually results in an InvalidArgument() exception.
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-std::string StringNarrow(const wchar_t *str, bool throwOnError = true);
-#else
-static std::string StringNarrow(const wchar_t *str, bool throwOnError = true)
-{
-	CRYPTOPP_ASSERT(str);
-	std::string result;
-
-	// Safer functions on Windows for C&A, https://github.com/weidai11/cryptopp/issues/55
-#if (CRYPTOPP_MSC_VERSION >= 1400)
-	size_t len=0, size=0;
-	errno_t err = 0;
-
-	//const wchar_t* ptr = str;
-	//while (*ptr++) len++;
-	len = wcslen(str)+1;
-
-	err = wcstombs_s(&size, NULL, 0, str, len*sizeof(wchar_t));
-	CRYPTOPP_ASSERT(err == 0);
-	if (err != 0) {goto CONVERSION_ERROR;}
-
-	result.resize(size);
-	err = wcstombs_s(&size, &result[0], size, str, len*sizeof(wchar_t));
-	CRYPTOPP_ASSERT(err == 0);
-
-	if (err != 0)
-	{
-CONVERSION_ERROR:
-		if (throwOnError)
-			throw InvalidArgument("StringNarrow: wcstombs_s() call failed with error " + IntToString(err));
-		else
-			return std::string();
-	}
-
-	// The safe routine's size includes the NULL.
-	if (!result.empty() && result[size - 1] == '\0')
-		result.erase(size - 1);
-#else
-	size_t size = wcstombs(NULL, str, 0);
-	CRYPTOPP_ASSERT(size != (size_t)-1);
-	if (size == (size_t)-1) {goto CONVERSION_ERROR;}
-
-	result.resize(size);
-	size = wcstombs(&result[0], str, size);
-	CRYPTOPP_ASSERT(size != (size_t)-1);
-
-	if (size == (size_t)-1)
-	{
-CONVERSION_ERROR:
-		if (throwOnError)
-			throw InvalidArgument("StringNarrow: wcstombs() call failed");
-		else
-			return std::string();
-	}
-#endif
-
-	return result;
-}
-#endif // StringNarrow and CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-
-#ifdef CRYPTOPP_DOXYGEN_PROCESSING
-
-//! \brief Allocates a buffer on 16-byte boundary
-//! \param size the size of the buffer
-//! \details AlignedAllocate is primarily used when the data will be proccessed by MMX, SSE2 and NEON
-//!   instructions. The assembly language routines rely on the alignment. If the alignment is not
-//!   respected, then a SIGBUS could be generated on Unix and Linux, and an
-//!   EXCEPTION_DATATYPE_MISALIGNMENT could be generated on Windows.
-//! \note AlignedAllocate and AlignedDeallocate are available when CRYPTOPP_BOOL_ALIGN16 is
-//!   defined. CRYPTOPP_BOOL_ALIGN16 is defined in config.h
-CRYPTOPP_DLL void* CRYPTOPP_API AlignedAllocate(size_t size);
-
-//! \brief Frees a buffer allocated with AlignedAllocate
-//! \param ptr the buffer to free
-//! \note AlignedAllocate and AlignedDeallocate are available when CRYPTOPP_BOOL_ALIGN16 is
-//!   defined. CRYPTOPP_BOOL_ALIGN16 is defined in config.h
-CRYPTOPP_DLL void CRYPTOPP_API AlignedDeallocate(void *ptr);
-
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-#if CRYPTOPP_BOOL_ALIGN16
-CRYPTOPP_DLL void* CRYPTOPP_API AlignedAllocate(size_t size);
-CRYPTOPP_DLL void CRYPTOPP_API AlignedDeallocate(void *ptr);
-#endif // CRYPTOPP_BOOL_ALIGN16
-
-//! \brief Allocates a buffer
-//! \param size the size of the buffer
-CRYPTOPP_DLL void * CRYPTOPP_API UnalignedAllocate(size_t size);
-
-//! \brief Frees a buffer allocated with UnalignedAllocate
-//! \param ptr the buffer to free
-CRYPTOPP_DLL void CRYPTOPP_API UnalignedDeallocate(void *ptr);
-
-// ************** rotate functions ***************
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a portable C/C++ implementation. The value x to be rotated can be 8 to 64-bits wide.
-//! \details y must be in the range <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//!   Use rotlMod if the rotate amount y is outside the range.
-//! \note rotlFixed attempts to enlist a <tt>rotate IMM</tt> instruction because its often faster
-//!   than a <tt>rotate REG</tt>. Immediate rotates can be up to three times faster than their register
-//!   counterparts.
-template <class T> inline T rotlFixed(T x, unsigned int y)
-{
-	// Portable rotate that reduces to single instruction...
-	// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57157,
-	// https://software.intel.com/en-us/forums/topic/580884
-	// and https://llvm.org/bugs/show_bug.cgi?id=24226
-	static const unsigned int THIS_SIZE = sizeof(T)*8;
-	static const unsigned int MASK = THIS_SIZE-1;
-	CRYPTOPP_ASSERT(y < THIS_SIZE);
-	return T((x<<y)|(x>>(-y&MASK)));
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a portable C/C++ implementation. The value x to be rotated can be 8 to 64-bits wide.
-//! \details y must be in the range <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//!   Use rotrMod if the rotate amount y is outside the range.
-//! \note rotrFixed attempts to enlist a <tt>rotate IMM</tt> instruction because its often faster
-//!   than a <tt>rotate REG</tt>. Immediate rotates can be up to three times faster than their register
-//!   counterparts.
-template <class T> inline T rotrFixed(T x, unsigned int y)
-{
-	// Portable rotate that reduces to single instruction...
-	// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57157,
-	// https://software.intel.com/en-us/forums/topic/580884
-	// and https://llvm.org/bugs/show_bug.cgi?id=24226
-	static const unsigned int THIS_SIZE = sizeof(T)*8;
-	static const unsigned int MASK = THIS_SIZE-1;
-	CRYPTOPP_ASSERT(y < THIS_SIZE);
-	return T((x >> y)|(x<<(-y&MASK)));
-}
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a portable C/C++ implementation. The value x to be rotated can be 8 to 64-bits wide.
-//! \details y must be in the range <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//!   Use rotlMod if the rotate amount y is outside the range.
-//! \note rotlVariable attempts to enlist a <tt>rotate IMM</tt> instruction because its often faster
-//!   than a <tt>rotate REG</tt>. Immediate rotates can be up to three times faster than their register
-//!   counterparts.
-template <class T> inline T rotlVariable(T x, unsigned int y)
-{
-	static const unsigned int THIS_SIZE = sizeof(T)*8;
-	static const unsigned int MASK = THIS_SIZE-1;
-	CRYPTOPP_ASSERT(y < THIS_SIZE);
-	return T((x<<y)|(x>>(-y&MASK)));
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a portable C/C++ implementation. The value x to be rotated can be 8 to 64-bits wide.
-//! \details y must be in the range <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//!   Use rotrMod if the rotate amount y is outside the range.
-//! \note rotrVariable attempts to enlist a <tt>rotate IMM</tt> instruction because its often faster
-//!   than a <tt>rotate REG</tt>. Immediate rotates can be up to three times faster than their register
-//!   counterparts.
-template <class T> inline T rotrVariable(T x, unsigned int y)
-{
-	static const unsigned int THIS_SIZE = sizeof(T)*8;
-	static const unsigned int MASK = THIS_SIZE-1;
-	CRYPTOPP_ASSERT(y < THIS_SIZE);
-	return T((x>>y)|(x<<(-y&MASK)));
-}
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a portable C/C++ implementation. The value x to be rotated can be 8 to 64-bits wide.
-//! \details y is reduced to the range <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotrVariable will use either <tt>rotate IMM</tt> or <tt>rotate REG</tt>.
-template <class T> inline T rotlMod(T x, unsigned int y)
-{
-	static const unsigned int THIS_SIZE = sizeof(T)*8;
-	static const unsigned int MASK = THIS_SIZE-1;
-	return T((x<<(y&MASK))|(x>>(-y&MASK)));
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a portable C/C++ implementation. The value x to be rotated can be 8 to 64-bits wide.
-//! \details y is reduced to the range <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotrVariable will use either <tt>rotate IMM</tt> or <tt>rotate REG</tt>.
-template <class T> inline T rotrMod(T x, unsigned int y)
-{
-	static const unsigned int THIS_SIZE = sizeof(T)*8;
-	static const unsigned int MASK = THIS_SIZE-1;
-	return T((x>>(y&MASK))|(x<<(-y&MASK)));
-}
-
-#ifdef _MSC_VER
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the 32-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotl</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 32-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotlFixed will assert in Debug builds if is outside the allowed range.
-template<> inline word32 rotlFixed<word32>(word32 x, unsigned int y)
-{
-	// Uses Microsoft <stdlib.h> call, bound to C/C++ language rules.
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return y ? _lrotl(x, static_cast<byte>(y)) : x;
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the 32-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotr</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 32-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotrFixed will assert in Debug builds if is outside the allowed range.
-template<> inline word32 rotrFixed<word32>(word32 x, unsigned int y)
-{
-	// Uses Microsoft <stdlib.h> call, bound to C/C++ language rules.
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return y ? _lrotr(x, static_cast<byte>(y)) : x;
-}
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the 32-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotl</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 32-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotlVariable will assert in Debug builds if is outside the allowed range.
-template<> inline word32 rotlVariable<word32>(word32 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return _lrotl(x, static_cast<byte>(y));
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the 32-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotr</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 32-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotrVariable will assert in Debug builds if is outside the allowed range.
-template<> inline word32 rotrVariable<word32>(word32 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return _lrotr(x, static_cast<byte>(y));
-}
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the 32-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotl</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 32-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-template<> inline word32 rotlMod<word32>(word32 x, unsigned int y)
-{
-	y %= 8*sizeof(x);
-	return _lrotl(x, static_cast<byte>(y));
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the 32-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotr</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 32-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-template<> inline word32 rotrMod<word32>(word32 x, unsigned int y)
-{
-	y %= 8*sizeof(x);
-	return _lrotr(x, static_cast<byte>(y));
-}
-
-#endif // #ifdef _MSC_VER
-
-#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
-// Intel C++ Compiler 10.0 calls a function instead of using the rotate instruction when using these instructions
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the 64-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotl</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 64-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotrFixed will assert in Debug builds if is outside the allowed range.
-template<> inline word64 rotlFixed<word64>(word64 x, unsigned int y)
-{
-	// Uses Microsoft <stdlib.h> call, bound to C/C++ language rules.
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return y ? _rotl64(x, static_cast<byte>(y)) : x;
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the 64-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotr</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 64-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotrFixed will assert in Debug builds if is outside the allowed range.
-template<> inline word64 rotrFixed<word64>(word64 x, unsigned int y)
-{
-	// Uses Microsoft <stdlib.h> call, bound to C/C++ language rules.
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return y ? _rotr64(x, static_cast<byte>(y)) : x;
-}
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the 64-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotl</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 64-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotlVariable will assert in Debug builds if is outside the allowed range.
-template<> inline word64 rotlVariable<word64>(word64 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return _rotl64(x, static_cast<byte>(y));
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the 64-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotr</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 64-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-//! \note rotrVariable will assert in Debug builds if is outside the allowed range.
-template<> inline word64 rotrVariable<word64>(word64 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return y ? _rotr64(x, static_cast<byte>(y)) : x;
-}
-
-//! \brief Performs a left rotate
-//! \tparam T the word type
-//! \param x the 64-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotl</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 64-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-template<> inline word64 rotlMod<word64>(word64 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return y ? _rotl64(x, static_cast<byte>(y)) : x;
-}
-
-//! \brief Performs a right rotate
-//! \tparam T the word type
-//! \param x the 64-bit value to rotate
-//! \param y the number of bit positions to rotate the value
-//! \details This is a Microsoft specific implementation using <tt>_lrotr</tt> provided by
-//!   <stdlib.h>. The value x to be rotated is 64-bits. y must be in the range
-//!   <tt>[0, sizeof(T)*8 - 1]</tt> to avoid undefined behavior.
-template<> inline word64 rotrMod<word64>(word64 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 8*sizeof(x));
-	return y ? _rotr64(x, static_cast<byte>(y)) : x;
-}
-
-#endif // #if _MSC_VER >= 1310
-
-#if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER)
-// Intel C++ Compiler 10.0 gives undefined externals with these
-
-template<> inline word16 rotlFixed<word16>(word16 x, unsigned int y)
-{
-	// Intrinsic, not bound to C/C++ language rules.
-	return _rotl16(x, static_cast<byte>(y));
-}
-
-template<> inline word16 rotrFixed<word16>(word16 x, unsigned int y)
-{
-	// Intrinsic, not bound to C/C++ language rules.
-	return _rotr16(x, static_cast<byte>(y));
-}
-
-template<> inline word16 rotlVariable<word16>(word16 x, unsigned int y)
-{
-	return _rotl16(x, static_cast<byte>(y));
-}
-
-template<> inline word16 rotrVariable<word16>(word16 x, unsigned int y)
-{
-	return _rotr16(x, static_cast<byte>(y));
-}
-
-template<> inline word16 rotlMod<word16>(word16 x, unsigned int y)
-{
-	return _rotl16(x, static_cast<byte>(y));
-}
-
-template<> inline word16 rotrMod<word16>(word16 x, unsigned int y)
-{
-	return _rotr16(x, static_cast<byte>(y));
-}
-
-template<> inline byte rotlFixed<byte>(byte x, unsigned int y)
-{
-	// Intrinsic, not bound to C/C++ language rules.
-	return _rotl8(x, static_cast<byte>(y));
-}
-
-template<> inline byte rotrFixed<byte>(byte x, unsigned int y)
-{
-	// Intrinsic, not bound to C/C++ language rules.
-	return _rotr8(x, static_cast<byte>(y));
-}
-
-template<> inline byte rotlVariable<byte>(byte x, unsigned int y)
-{
-	return _rotl8(x, static_cast<byte>(y));
-}
-
-template<> inline byte rotrVariable<byte>(byte x, unsigned int y)
-{
-	return _rotr8(x, static_cast<byte>(y));
-}
-
-template<> inline byte rotlMod<byte>(byte x, unsigned int y)
-{
-	return _rotl8(x, static_cast<byte>(y));
-}
-
-template<> inline byte rotrMod<byte>(byte x, unsigned int y)
-{
-	return _rotr8(x, static_cast<byte>(y));
-}
-
-#endif // #if _MSC_VER >= 1400
-
-#if (defined(__MWERKS__) && TARGET_CPU_PPC)
-
-template<> inline word32 rotlFixed<word32>(word32 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 32);
-	return y ? __rlwinm(x,y,0,31) : x;
-}
-
-template<> inline word32 rotrFixed<word32>(word32 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 32);
-	return y ? __rlwinm(x,32-y,0,31) : x;
-}
-
-template<> inline word32 rotlVariable<word32>(word32 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 32);
-	return (__rlwnm(x,y,0,31));
-}
-
-template<> inline word32 rotrVariable<word32>(word32 x, unsigned int y)
-{
-	CRYPTOPP_ASSERT(y < 32);
-	return (__rlwnm(x,32-y,0,31));
-}
-
-template<> inline word32 rotlMod<word32>(word32 x, unsigned int y)
-{
-	return (__rlwnm(x,y,0,31));
-}
-
-template<> inline word32 rotrMod<word32>(word32 x, unsigned int y)
-{
-	return (__rlwnm(x,32-y,0,31));
-}
-
-#endif // #if (defined(__MWERKS__) && TARGET_CPU_PPC)
-
-// ************** endian reversal ***************
-
-//! \brief Gets a byte from a value
-//! \param order the ByteOrder of the value
-//! \param value the value to retrieve the byte
-//! \param index the location of the byte to retrieve
-template <class T>
-inline unsigned int GetByte(ByteOrder order, T value, unsigned int index)
-{
-	if (order == LITTLE_ENDIAN_ORDER)
-		return GETBYTE(value, index);
-	else
-		return GETBYTE(value, sizeof(T)-index-1);
-}
-
-//! \brief Reverses bytes in a 8-bit value
-//! \param value the 8-bit value to reverse
-//! \note ByteReverse returns the value passed to it since there is nothing to reverse
-inline byte ByteReverse(byte value)
-{
-	return value;
-}
-
-//! \brief Reverses bytes in a 16-bit value
-//! \brief Performs an endian reversal
-//! \param value the 16-bit value to reverse
-//! \details ByteReverse calls bswap if available. Otherwise the function performs a 8-bit rotate on the word16
-inline word16 ByteReverse(word16 value)
-{
-#ifdef CRYPTOPP_BYTESWAP_AVAILABLE
-	return bswap_16(value);
-#elif defined(_MSC_VER) && _MSC_VER >= 1300
-	return _byteswap_ushort(value);
-#else
-	return rotlFixed(value, 8U);
-#endif
-}
-
-//! \brief Reverses bytes in a 32-bit value
-//! \brief Performs an endian reversal
-//! \param value the 32-bit value to reverse
-//! \details ByteReverse calls bswap if available. Otherwise the function uses a combination of rotates on the word32
-inline word32 ByteReverse(word32 value)
-{
-#if defined(__GNUC__) && defined(CRYPTOPP_X86_ASM_AVAILABLE)
-	__asm__ ("bswap %0" : "=r" (value) : "0" (value));
-	return value;
-#elif defined(CRYPTOPP_BYTESWAP_AVAILABLE)
-	return bswap_32(value);
-#elif defined(__MWERKS__) && TARGET_CPU_PPC
-	return (word32)__lwbrx(&value,0);
-#elif _MSC_VER >= 1400 || (_MSC_VER >= 1300 && !defined(_DLL))
-	return _byteswap_ulong(value);
-#elif CRYPTOPP_FAST_ROTATE(32)
-	// 5 instructions with rotate instruction, 9 without
-	return (rotrFixed(value, 8U) & 0xff00ff00) | (rotlFixed(value, 8U) & 0x00ff00ff);
-#else
-	// 6 instructions with rotate instruction, 8 without
-	value = ((value & 0xFF00FF00) >> 8) | ((value & 0x00FF00FF) << 8);
-	return rotlFixed(value, 16U);
-#endif
-}
-
-//! \brief Reverses bytes in a 64-bit value
-//! \brief Performs an endian reversal
-//! \param value the 64-bit value to reverse
-//! \details ByteReverse calls bswap if available. Otherwise the function uses a combination of rotates on the word64
-inline word64 ByteReverse(word64 value)
-{
-#if defined(__GNUC__) && defined(CRYPTOPP_X86_ASM_AVAILABLE) && defined(__x86_64__)
-	__asm__ ("bswap %0" : "=r" (value) : "0" (value));
-	return value;
-#elif defined(CRYPTOPP_BYTESWAP_AVAILABLE)
-	return bswap_64(value);
-#elif defined(_MSC_VER) && _MSC_VER >= 1300
-	return _byteswap_uint64(value);
-#elif CRYPTOPP_BOOL_SLOW_WORD64
-	return (word64(ByteReverse(word32(value))) << 32) | ByteReverse(word32(value>>32));
-#else
-	value = ((value & W64LIT(0xFF00FF00FF00FF00)) >> 8) | ((value & W64LIT(0x00FF00FF00FF00FF)) << 8);
-	value = ((value & W64LIT(0xFFFF0000FFFF0000)) >> 16) | ((value & W64LIT(0x0000FFFF0000FFFF)) << 16);
-	return rotlFixed(value, 32U);
-#endif
-}
-
-//! \brief Reverses bits in a 8-bit value
-//! \param value the 8-bit value to reverse
-//! \details BitReverse performs a combination of shifts on the byte
-inline byte BitReverse(byte value)
-{
-	value = byte((value & 0xAA) >> 1) | byte((value & 0x55) << 1);
-	value = byte((value & 0xCC) >> 2) | byte((value & 0x33) << 2);
-	return rotlFixed(value, 4U);
-}
-
-//! \brief Reverses bits in a 16-bit value
-//! \param value the 16-bit value to reverse
-//! \details BitReverse performs a combination of shifts on the word16
-inline word16 BitReverse(word16 value)
-{
-	value = word16((value & 0xAAAA) >> 1) | word16((value & 0x5555) << 1);
-	value = word16((value & 0xCCCC) >> 2) | word16((value & 0x3333) << 2);
-	value = word16((value & 0xF0F0) >> 4) | word16((value & 0x0F0F) << 4);
-	return ByteReverse(value);
-}
-
-//! \brief Reverses bits in a 32-bit value
-//! \param value the 32-bit value to reverse
-//! \details BitReverse performs a combination of shifts on the word32
-inline word32 BitReverse(word32 value)
-{
-	value = word32((value & 0xAAAAAAAA) >> 1) | word32((value & 0x55555555) << 1);
-	value = word32((value & 0xCCCCCCCC) >> 2) | word32((value & 0x33333333) << 2);
-	value = word32((value & 0xF0F0F0F0) >> 4) | word32((value & 0x0F0F0F0F) << 4);
-	return ByteReverse(value);
-}
-
-//! \brief Reverses bits in a 64-bit value
-//! \param value the 64-bit value to reverse
-//! \details BitReverse performs a combination of shifts on the word64
-inline word64 BitReverse(word64 value)
-{
-#if CRYPTOPP_BOOL_SLOW_WORD64
-	return (word64(BitReverse(word32(value))) << 32) | BitReverse(word32(value>>32));
-#else
-	value = word64((value & W64LIT(0xAAAAAAAAAAAAAAAA)) >> 1) | word64((value & W64LIT(0x5555555555555555)) << 1);
-	value = word64((value & W64LIT(0xCCCCCCCCCCCCCCCC)) >> 2) | word64((value & W64LIT(0x3333333333333333)) << 2);
-	value = word64((value & W64LIT(0xF0F0F0F0F0F0F0F0)) >> 4) | word64((value & W64LIT(0x0F0F0F0F0F0F0F0F)) << 4);
-	return ByteReverse(value);
-#endif
-}
-
-//! \brief Reverses bits in a value
-//! \param value the value to reverse
-//! \details The template overload of BitReverse operates on signed and unsigned values.
-//!   Internally the size of T is checked, and then value is cast to a byte,
-//!   word16, word32 or word64. After the cast, the appropriate BitReverse
-//!   overload is called.
-template <class T>
-inline T BitReverse(T value)
-{
-	if (sizeof(T) == 1)
-		return (T)BitReverse((byte)value);
-	else if (sizeof(T) == 2)
-		return (T)BitReverse((word16)value);
-	else if (sizeof(T) == 4)
-		return (T)BitReverse((word32)value);
-	else
-	{
-		CRYPTOPP_ASSERT(sizeof(T) == 8);
-		return (T)BitReverse((word64)value);
-	}
-}
-
-//! \brief Reverses bytes in a value depending upon endianess
-//! \tparam T the class or type
-//! \param order the ByteOrder the data is represented
-//! \param value the value to conditionally reverse
-//! \details Internally, the ConditionalByteReverse calls NativeByteOrderIs.
-//!   If order matches native byte order, then the original value is returned.
-//!   If not, then ByteReverse is called on the value before returning to the caller.
-template <class T>
-inline T ConditionalByteReverse(ByteOrder order, T value)
-{
-	return NativeByteOrderIs(order) ? value : ByteReverse(value);
-}
-
-//! \brief Reverses bytes in an element from an array of elements
-//! \tparam T the class or type
-//! \param out the output array of elements
-//! \param in the input array of elements
-//! \param byteCount the total number of bytes in the array
-//! \details Internally, ByteReverse visits each element in the in array
-//!   calls ByteReverse on it, and writes the result to out.
-//! \details ByteReverse does not process tail byes, or bytes that are
-//!   \a not part of a full element. If T is int (and int is 4 bytes), then
-//!   <tt>byteCount = 10</tt> means only the first 2 elements or 8 bytes are
-//!   reversed.
-//! \details The follwoing program should help illustrate the behavior.
-//! <pre>vector<word32> v1, v2;
-//!
-//! v1.push_back(1);
-//! v1.push_back(2);
-//! v1.push_back(3);
-//! v1.push_back(4);
-//!
-//! v2.resize(v1.size());
-//! ByteReverse<word32>(&v2[0], &v1[0], 16);
-//!
-//! cout << "V1: ";
-//! for(unsigned int i = 0; i < v1.size(); i++)
-//!   cout << std::hex << v1[i] << " ";
-//! cout << endl;
-//!
-//! cout << "V2: ";
-//! for(unsigned int i = 0; i < v2.size(); i++)
-//!   cout << std::hex << v2[i] << " ";
-//! cout << endl;</pre>
-//! The program above results in the follwoing output.
-//! <pre>V1: 00000001 00000002 00000003 00000004
-//! V2: 01000000 02000000 03000000 04000000</pre>
-//! \sa ConditionalByteReverse
-template <class T>
-void ByteReverse(T *out, const T *in, size_t byteCount)
-{
-	CRYPTOPP_ASSERT(byteCount % sizeof(T) == 0);
-	size_t count = byteCount/sizeof(T);
-	for (size_t i=0; i<count; i++)
-		out[i] = ByteReverse(in[i]);
-}
-
-//! \brief Conditionally reverses bytes in an element from an array of elements
-//! \tparam T the class or type
-//! \param order the ByteOrder the data is represented
-//! \param out the output array of elements
-//! \param in the input array of elements
-//! \param byteCount the byte count of the arrays
-//! \details Internally, ByteReverse visits each element in the in array
-//!   calls ByteReverse on it depending on the desired endianess, and writes the result to out.
-//! \details ByteReverse does not process tail byes, or bytes that are
-//!   \a not part of a full element. If T is int (and int is 4 bytes), then
-//!   <tt>byteCount = 10</tt> means only the first 2 elements or 8 bytes are
-//!   reversed.
-//! \sa ByteReverse
-template <class T>
-inline void ConditionalByteReverse(ByteOrder order, T *out, const T *in, size_t byteCount)
-{
-	if (!NativeByteOrderIs(order))
-		ByteReverse(out, in, byteCount);
-	else if (in != out)
-		memcpy_s(out, byteCount, in, byteCount);
-}
-
-template <class T>
-inline void GetUserKey(ByteOrder order, T *out, size_t outlen, const byte *in, size_t inlen)
-{
-	const size_t U = sizeof(T);
-	CRYPTOPP_ASSERT(inlen <= outlen*U);
-	memcpy_s(out, outlen*U, in, inlen);
-	memset_z((byte *)out+inlen, 0, outlen*U-inlen);
-	ConditionalByteReverse(order, out, out, RoundUpToMultipleOf(inlen, U));
-}
-
-#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-inline byte UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const byte *)
-{
-	CRYPTOPP_UNUSED(order);
-	return block[0];
-}
-
-inline word16 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word16 *)
-{
-	return (order == BIG_ENDIAN_ORDER)
-		? block[1] | (block[0] << 8)
-		: block[0] | (block[1] << 8);
-}
-
-inline word32 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word32 *)
-{
-	return (order == BIG_ENDIAN_ORDER)
-		? word32(block[3]) | (word32(block[2]) << 8) | (word32(block[1]) << 16) | (word32(block[0]) << 24)
-		: word32(block[0]) | (word32(block[1]) << 8) | (word32(block[2]) << 16) | (word32(block[3]) << 24);
-}
-
-inline word64 UnalignedGetWordNonTemplate(ByteOrder order, const byte *block, const word64 *)
-{
-	return (order == BIG_ENDIAN_ORDER)
-		?
-		(word64(block[7]) |
-		(word64(block[6]) <<  8) |
-		(word64(block[5]) << 16) |
-		(word64(block[4]) << 24) |
-		(word64(block[3]) << 32) |
-		(word64(block[2]) << 40) |
-		(word64(block[1]) << 48) |
-		(word64(block[0]) << 56))
-		:
-		(word64(block[0]) |
-		(word64(block[1]) <<  8) |
-		(word64(block[2]) << 16) |
-		(word64(block[3]) << 24) |
-		(word64(block[4]) << 32) |
-		(word64(block[5]) << 40) |
-		(word64(block[6]) << 48) |
-		(word64(block[7]) << 56));
-}
-
-inline void UnalignedbyteNonTemplate(ByteOrder order, byte *block, byte value, const byte *xorBlock)
-{
-	CRYPTOPP_UNUSED(order);
-	block[0] = (byte)(xorBlock ? (value ^ xorBlock[0]) : value);
-}
-
-inline void UnalignedbyteNonTemplate(ByteOrder order, byte *block, word16 value, const byte *xorBlock)
-{
-	if (order == BIG_ENDIAN_ORDER)
-	{
-		if (xorBlock)
-		{
-			block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-		}
-		else
-		{
-			block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-		}
-	}
-	else
-	{
-		if (xorBlock)
-		{
-			block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-			block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-		}
-		else
-		{
-			block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-			block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-		}
-	}
-}
-
-inline void UnalignedbyteNonTemplate(ByteOrder order, byte *block, word32 value, const byte *xorBlock)
-{
-	if (order == BIG_ENDIAN_ORDER)
-	{
-		if (xorBlock)
-		{
-			block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3);
-			block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2);
-			block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-		}
-		else
-		{
-			block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3);
-			block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2);
-			block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-		}
-	}
-	else
-	{
-		if (xorBlock)
-		{
-			block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-			block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2);
-			block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3);
-		}
-		else
-		{
-			block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-			block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2);
-			block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3);
-		}
-	}
-}
-
-inline void UnalignedbyteNonTemplate(ByteOrder order, byte *block, word64 value, const byte *xorBlock)
-{
-	if (order == BIG_ENDIAN_ORDER)
-	{
-		if (xorBlock)
-		{
-			block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 7);
-			block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 6);
-			block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 5);
-			block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 4);
-			block[4] = xorBlock[4] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3);
-			block[5] = xorBlock[5] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2);
-			block[6] = xorBlock[6] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[7] = xorBlock[7] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-		}
-		else
-		{
-			block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 7);
-			block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 6);
-			block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 5);
-			block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 4);
-			block[4] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3);
-			block[5] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2);
-			block[6] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[7] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-		}
-	}
-	else
-	{
-		if (xorBlock)
-		{
-			block[0] = xorBlock[0] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-			block[1] = xorBlock[1] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[2] = xorBlock[2] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 2);
-			block[3] = xorBlock[3] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 3);
-			block[4] = xorBlock[4] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 4);
-			block[5] = xorBlock[5] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 5);
-			block[6] = xorBlock[6] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 6);
-			block[7] = xorBlock[7] ^ CRYPTOPP_GET_BYTE_AS_BYTE(value, 7);
-		}
-		else
-		{
-			block[0] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 0);
-			block[1] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 1);
-			block[2] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 2);
-			block[3] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 3);
-			block[4] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 4);
-			block[5] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 5);
-			block[6] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 6);
-			block[7] = CRYPTOPP_GET_BYTE_AS_BYTE(value, 7);
-		}
-	}
-}
-#endif	// #ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-
-template <class T>
-inline T GetWord(bool assumeAligned, ByteOrder order, const byte *block)
-{
-//#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-//	if (!assumeAligned)
-//		return UnalignedGetWordNonTemplate(order, block, (T*)NULL);
-//	CRYPTOPP_ASSERT(IsAligned<T>(block));
-//#endif
-//	return ConditionalByteReverse(order, *reinterpret_cast<const T *>(block));
-	CRYPTOPP_UNUSED(assumeAligned);
-#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-	return ConditionalByteReverse(order, *reinterpret_cast<const T *>((const void *)block));
-#else
-	T temp;
-	memcpy(&temp, block, sizeof(T));
-	return ConditionalByteReverse(order, temp);
-#endif
-}
-
-template <class T>
-inline void GetWord(bool assumeAligned, ByteOrder order, T &result, const byte *block)
-{
-	result = GetWord<T>(assumeAligned, order, block);
-}
-
-template <class T>
-inline void PutWord(bool assumeAligned, ByteOrder order, byte *block, T value, const byte *xorBlock = NULL)
-{
-//#ifndef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-//	if (!assumeAligned)
-//		return UnalignedbyteNonTemplate(order, block, value, xorBlock);
-//	CRYPTOPP_ASSERT(IsAligned<T>(block));
-//	CRYPTOPP_ASSERT(IsAligned<T>(xorBlock));
-//#endif
-//	*reinterpret_cast<T *>(block) = ConditionalByteReverse(order, value) ^ (xorBlock ? *reinterpret_cast<const T *>(xorBlock) : 0);
-	CRYPTOPP_UNUSED(assumeAligned);
-#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-	*reinterpret_cast<T *>((void *)block) = ConditionalByteReverse(order, value) ^ (xorBlock ? *reinterpret_cast<const T *>((const void *)xorBlock) : 0);
-#else
-	T t1, t2 = 0;
-	t1 = ConditionalByteReverse(order, value);
-	if (xorBlock) memcpy(&t2, xorBlock, sizeof(T));
-	memmove(block, &(t1 ^= t2), sizeof(T));
-#endif
-}
-
-//! \class GetBlock
-//! \brief Access a block of memory
-//! \tparam T class or type
-//! \tparam B enumeration indicating endianess
-//! \tparam A flag indicating alignment
-//! \details GetBlock() provides alternate read access to a block of memory. The enumeration B is
-//!   BigEndian or LittleEndian. The flag A indicates if the memory block is aligned for class or type T.
-//!   Repeatedly applying operator() results in advancing in the block of memory.
-//! \details An example of reading two word32 values from a block of memory is shown below. <tt>w1</tt>
-//!   will be <tt>0x03020100</tt> and <tt>w1</tt> will be <tt>0x07060504</tt>.
-//! <pre>
-//!    word32 w1, w2;
-//!    byte buffer[8] = {0,1,2,3,4,5,6,7};
-//!    GetBlock<word32, LittleEndian> block(buffer);
-//!    block(w1)(w2);
-//! </pre>
-template <class T, class B, bool A=false>
-class GetBlock
-{
-public:
-	//! \brief Construct a GetBlock
-	//! \param block the memory block
-	GetBlock(const void *block)
-		: m_block((const byte *)block) {}
-
-	//! \brief Access a block of memory
-	//! \tparam U class or type
-	//! \param x the value to read
-	//! \returns pointer to the remainder of the block after reading x
-	template <class U>
-	inline GetBlock<T, B, A> & operator()(U &x)
-	{
-		CRYPTOPP_COMPILE_ASSERT(sizeof(U) >= sizeof(T));
-		x = GetWord<T>(A, B::ToEnum(), m_block);
-		m_block += sizeof(T);
-		return *this;
-	}
-
-private:
-	const byte *m_block;
-};
-
-//! \class PutBlock
-//! \brief Access a block of memory
-//! \tparam T class or type
-//! \tparam B enumeration indicating endianess
-//! \tparam A flag indicating alignment
-//! \details PutBlock() provides alternate write access to a block of memory. The enumeration B is
-//!   BigEndian or LittleEndian. The flag A indicates if the memory block is aligned for class or type T.
-//!   Repeatedly applying operator() results in advancing in the block of memory.
-//! \details An example of writing two word32 values from a block of memory is shown below. After the code
-//!   executes, the byte buffer will be <tt>{0,1,2,3,4,5,6,7}</tt>.
-//! <pre>
-//!    word32 w1=0x03020100, w2=0x07060504;
-//!    byte buffer[8];
-//!    PutBlock<word32, LittleEndian> block(NULL, buffer);
-//!    block(w1)(w2);
-//! </pre>
-template <class T, class B, bool A=false>
-class PutBlock
-{
-public:
-	//! \brief Construct a PutBlock
-	//! \param block the memory block
-	//! \param xorBlock optional mask
-	PutBlock(const void *xorBlock, void *block)
-		: m_xorBlock((const byte *)xorBlock), m_block((byte *)block) {}
-
-	//! \brief Access a block of memory
-	//! \tparam U class or type
-	//! \param x the value to write
-	//! \returns pointer to the remainder of the block after writing x
-	template <class U>
-	inline PutBlock<T, B, A> & operator()(U x)
-	{
-		PutWord(A, B::ToEnum(), m_block, (T)x, m_xorBlock);
-		m_block += sizeof(T);
-		if (m_xorBlock)
-			m_xorBlock += sizeof(T);
-		return *this;
-	}
-
-private:
-	const byte *m_xorBlock;
-	byte *m_block;
-};
-
-//! \class BlockGetAndPut
-//! \brief Access a block of memory
-//! \tparam T class or type
-//! \tparam B enumeration indicating endianess
-//! \tparam GA flag indicating alignment for the Get operation
-//! \tparam PA flag indicating alignment for the Put operation
-//! \details GetBlock() provides alternate write access to a block of memory. The enumeration B is
-//!   BigEndian or LittleEndian. The flag A indicates if the memory block is aligned for class or type T.
-//! \sa GetBlock() and PutBlock().
-template <class T, class B, bool GA=false, bool PA=false>
-struct BlockGetAndPut
-{
-	// function needed because of C++ grammatical ambiguity between expression-statements and declarations
-	static inline GetBlock<T, B, GA> Get(const void *block) {return GetBlock<T, B, GA>(block);}
-	typedef PutBlock<T, B, PA> Put;
-};
-
-template <class T>
-std::string WordToString(T value, ByteOrder order = BIG_ENDIAN_ORDER)
-{
-	if (!NativeByteOrderIs(order))
-		value = ByteReverse(value);
-
-	return std::string((char *)&value, sizeof(value));
-}
-
-template <class T>
-T StringToWord(const std::string &str, ByteOrder order = BIG_ENDIAN_ORDER)
-{
-	T value = 0;
-	memcpy_s(&value, sizeof(value), str.data(), UnsignedMin(str.size(), sizeof(value)));
-	return NativeByteOrderIs(order) ? value : ByteReverse(value);
-}
-
-// ************** help remove warning on g++ ***************
-
-//! \class SafeShifter
-//! \brief Safely shift values when undefined behavior could occur
-//! \tparam overflow boolean flag indicating if overflow is present
-//! \details SafeShifter safely shifts values when undefined behavior could occur under C/C++ rules.
-//!   The class behaves much like a saturating arithmetic class, clamping values rather than allowing
-//!   the compiler to remove undefined behavior.
-//! \sa SafeShifter<true>, SafeShifter<false>
-template <bool overflow> struct SafeShifter;
-
-//! \class SafeShifter<true>
-//! \brief Shifts a value in the presence of overflow
-//! \details the \p true template parameter indicates overflow would occur.
-//!   In this case, SafeShifter clamps the value and returns 0.
-template<> struct SafeShifter<true>
-{
-	//! \brief Right shifts a value that overflows
-	//! \tparam T class or type
-	//! \return 0
-	//! \details Since <tt>overflow == true</tt>, the value 0 is always returned.
-	//! \sa SafeLeftShift
-	template <class T>
-	static inline T RightShift(T value, unsigned int bits)
-	{
-		CRYPTOPP_UNUSED(value); CRYPTOPP_UNUSED(bits);
-		return 0;
-	}
-
-	//! \brief Left shifts a value that overflows
-	//! \tparam T class or type
-	//! \return 0
-	//! \details Since <tt>overflow == true</tt>, the value 0 is always returned.
-	//! \sa SafeRightShift
-	template <class T>
-	static inline T LeftShift(T value, unsigned int bits)
-	{
-		CRYPTOPP_UNUSED(value); CRYPTOPP_UNUSED(bits);
-		return 0;
-	}
-};
-
-//! \class SafeShifter<false>
-//! \brief Shifts a value in the absence of overflow
-//! \details the \p false template parameter indicates overflow would \a not occur.
-//!   In this case, SafeShifter returns the shfted value.
-template<> struct SafeShifter<false>
-{
-	//! \brief Right shifts a value that does not overflow
-	//! \tparam T class or type
-	//! \return the shifted value
-	//! \details Since <tt>overflow == false</tt>, the shifted value is returned.
-	//! \sa SafeLeftShift
-	template <class T>
-	static inline T RightShift(T value, unsigned int bits)
-	{
-		return value >> bits;
-	}
-
-	//! \brief Left shifts a value that does not overflow
-	//! \tparam T class or type
-	//! \return the shifted value
-	//! \details Since <tt>overflow == false</tt>, the shifted value is returned.
-	//! \sa SafeRightShift
-	template <class T>
-	static inline T LeftShift(T value, unsigned int bits)
-	{
-		return value << bits;
-	}
-};
-
-//! \class SafeRightShift
-//! \brief Safely right shift values when undefined behavior could occur
-//! \tparam bits the number of bit positions to shift the value
-//! \tparam T class or type
-//! \param value the value to right shift
-//! \result the shifted value or 0
-//! \details SafeRightShift safely shifts the value to the right when undefined behavior
-//!   could occur under C/C++ rules. SafeRightShift will return the shifted value or 0
-//!   if undefined behavior would occur.
-template <unsigned int bits, class T>
-inline T SafeRightShift(T value)
-{
-	return SafeShifter<(bits>=(8*sizeof(T)))>::RightShift(value, bits);
-}
-
-//! \class SafeLeftShift
-//! \brief Safely left shift values when undefined behavior could occur
-//! \tparam bits the number of bit positions to shift the value
-//! \tparam T class or type
-//! \param value the value to left shift
-//! \result the shifted value or 0
-//! \details SafeLeftShift safely shifts the value to the left when undefined behavior
-//!   could occur under C/C++ rules. SafeLeftShift will return the shifted value or 0
-//!   if undefined behavior would occur.
-template <unsigned int bits, class T>
-inline T SafeLeftShift(T value)
-{
-	return SafeShifter<(bits>=(8*sizeof(T)))>::LeftShift(value, bits);
-}
-
-// ************** use one buffer for multiple data members ***************
-
-#define CRYPTOPP_BLOCK_1(n, t, s) t* m_##n() {return (t *)(void *)(m_aggregate+0);}     size_t SS1() {return       sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCK_2(n, t, s) t* m_##n() {return (t *)(void *)(m_aggregate+SS1());} size_t SS2() {return SS1()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCK_3(n, t, s) t* m_##n() {return (t *)(void *)(m_aggregate+SS2());} size_t SS3() {return SS2()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCK_4(n, t, s) t* m_##n() {return (t *)(void *)(m_aggregate+SS3());} size_t SS4() {return SS3()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCK_5(n, t, s) t* m_##n() {return (t *)(void *)(m_aggregate+SS4());} size_t SS5() {return SS4()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCK_6(n, t, s) t* m_##n() {return (t *)(void *)(m_aggregate+SS5());} size_t SS6() {return SS5()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCK_7(n, t, s) t* m_##n() {return (t *)(void *)(m_aggregate+SS6());} size_t SS7() {return SS6()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCK_8(n, t, s) t* m_##n() {return (t *)(void *)(m_aggregate+SS7());} size_t SS8() {return SS7()+sizeof(t)*(s);} size_t m_##n##Size() {return (s);}
-#define CRYPTOPP_BLOCKS_END(i) size_t SST() {return SS##i();} void AllocateBlocks() {m_aggregate.New(SST());} AlignedSecByteBlock m_aggregate;
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/modarith.h b/src-cryptopp/modarith.h
deleted file mode 100644
index c906269..0000000
--- a/src-cryptopp/modarith.h
+++ /dev/null
@@ -1,321 +0,0 @@
-// modarith.h - written and placed in the public domain by Wei Dai
-
-//! \file modarith.h
-//! \brief Class file for performing modular arithmetic.
-
-#ifndef CRYPTOPP_MODARITH_H
-#define CRYPTOPP_MODARITH_H
-
-// implementations are in integer.cpp
-
-#include "cryptlib.h"
-#include "integer.h"
-#include "algebra.h"
-#include "secblock.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractGroup<Integer>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractRing<Integer>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractEuclideanDomain<Integer>;
-
-//! \class ModularArithmetic
-//! \brief Ring of congruence classes modulo n
-//! \details This implementation represents each congruence class as the smallest
-//!   non-negative integer in that class.
-//! \details <tt>const Element&</tt> returned by member functions are references
-//!   to internal data members. Since each object may have only
-//!   one such data member for holding results, the following code
-//!   will produce incorrect results:
-//!   <pre>    abcd = group.Add(group.Add(a,b), group.Add(c,d));</pre>
-//!   But this should be fine:
-//!   <pre>    abcd = group.Add(a, group.Add(b, group.Add(c,d));</pre>
-class CRYPTOPP_DLL ModularArithmetic : public AbstractRing<Integer>
-{
-public:
-
-	typedef int RandomizationParameter;
-	typedef Integer Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ModularArithmetic() {}
-#endif
-
-	//! \brief Construct a ModularArithmetic
-	//! \param modulus congruence class modulus
-	ModularArithmetic(const Integer &modulus = Integer::One())
-		: AbstractRing<Integer>(), m_modulus(modulus), m_result((word)0, modulus.reg.size()) {}
-
-	//! \brief Copy construct a ModularArithmetic
-	//! \param ma other ModularArithmetic
-	ModularArithmetic(const ModularArithmetic &ma)
-		: AbstractRing<Integer>(), m_modulus(ma.m_modulus), m_result((word)0, ma.m_modulus.reg.size()) {}
-
-	//! \brief Construct a ModularArithmetic
-	//! \param bt BER encoded ModularArithmetic
-	ModularArithmetic(BufferedTransformation &bt);	// construct from BER encoded parameters
-
-	//! \brief Clone a ModularArithmetic
-	//! \returns pointer to a new ModularArithmetic
-	//! \details Clone effectively copy constructs a new ModularArithmetic. The caller is
-	//!   responsible for deleting the pointer returned from this method.
-	virtual ModularArithmetic * Clone() const {return new ModularArithmetic(*this);}
-
-	//! \brief Encodes in DER format
-	//! \param bt BufferedTransformation object
-	void DEREncode(BufferedTransformation &bt) const;
-
-	//! \brief Encodes element in DER format
-	//! \param out BufferedTransformation object
-	//! \param a Element to encode
-	void DEREncodeElement(BufferedTransformation &out, const Element &a) const;
-
-	//! \brief Decodes element in DER format
-	//! \param in BufferedTransformation object
-	//! \param a Element to decode
-	void BERDecodeElement(BufferedTransformation &in, Element &a) const;
-
-	//! \brief Retrieves the modulus
-	//! \returns the modulus
-	const Integer& GetModulus() const {return m_modulus;}
-
-	//! \brief Sets the modulus
-	//! \param newModulus the new modulus
-	void SetModulus(const Integer &newModulus)
-		{m_modulus = newModulus; m_result.reg.resize(m_modulus.reg.size());}
-
-	//! \brief Retrieves the representation
-	//! \returns true if the representation is MontgomeryRepresentation, false otherwise
-	virtual bool IsMontgomeryRepresentation() const {return false;}
-
-	//! \brief Reduces an element in the congruence class
-	//! \param a element to convert
-	//! \returns the reduced element
-	//! \details ConvertIn is useful for derived classes, like MontgomeryRepresentation, which
-	//!   must convert between representations.
-	virtual Integer ConvertIn(const Integer &a) const
-		{return a%m_modulus;}
-
-	//! \brief Reduces an element in the congruence class
-	//! \param a element to convert
-	//! \returns the reduced element
-	//! \details ConvertOut is useful for derived classes, like MontgomeryRepresentation, which
-	//!   must convert between representations.
-	virtual Integer ConvertOut(const Integer &a) const
-		{return a;}
-
-	//! \brief TODO
-	//! \param a element to convert
-	const Integer& Half(const Integer &a) const;
-
-	//! \brief Compare two elements for equality
-	//! \param a first element
-	//! \param b second element
-	//! \returns true if the elements are equal, false otherwise
-	//! \details Equal() tests the elements for equality using <tt>a==b</tt>
-	bool Equal(const Integer &a, const Integer &b) const
-		{return a==b;}
-
-	//! \brief Provides the Identity element
-	//! \returns the Identity element
-	const Integer& Identity() const
-		{return Integer::Zero();}
-
-	//! \brief Adds elements in the ring
-	//! \param a first element
-	//! \param b second element
-	//! \returns the sum of <tt>a</tt> and <tt>b</tt>
-	const Integer& Add(const Integer &a, const Integer &b) const;
-
-	//! \brief TODO
-	//! \param a first element
-	//! \param b second element
-	//! \returns TODO
-	Integer& Accumulate(Integer &a, const Integer &b) const;
-
-	//! \brief Inverts the element in the ring
-	//! \param a first element
-	//! \returns the inverse of the element
-	const Integer& Inverse(const Integer &a) const;
-
-	//! \brief Subtracts elements in the ring
-	//! \param a first element
-	//! \param b second element
-	//! \returns the difference of <tt>a</tt> and <tt>b</tt>. The element <tt>a</tt> must provide a Subtract member function.
-	const Integer& Subtract(const Integer &a, const Integer &b) const;
-
-	//! \brief TODO
-	//! \param a first element
-	//! \param b second element
-	//! \returns TODO
-	Integer& Reduce(Integer &a, const Integer &b) const;
-
-	//! \brief Doubles an element in the ring
-	//! \param a the element
-	//! \returns the element doubled
-	//! \details Double returns <tt>Add(a, a)</tt>. The element <tt>a</tt> must provide an Add member function.
-	const Integer& Double(const Integer &a) const
-		{return Add(a, a);}
-
-	//! \brief Retrieves the multiplicative identity
-	//! \returns the multiplicative identity
-	//! \details the base class implementations returns 1.
-	const Integer& MultiplicativeIdentity() const
-		{return Integer::One();}
-
-	//! \brief Multiplies elements in the ring
-	//! \param a the multiplicand
-	//! \param b the multiplier
-	//! \returns the product of a and b
-	//! \details Multiply returns <tt>a*b\%n</tt>.
-	const Integer& Multiply(const Integer &a, const Integer &b) const
-		{return m_result1 = a*b%m_modulus;}
-
-	//! \brief Square an element in the ring
-	//! \param a the element
-	//! \returns the element squared
-	//! \details Square returns <tt>a*a\%n</tt>. The element <tt>a</tt> must provide a Square member function.
-	const Integer& Square(const Integer &a) const
-		{return m_result1 = a.Squared()%m_modulus;}
-
-	//! \brief Determines whether an element is a unit in the ring
-	//! \param a the element
-	//! \returns true if the element is a unit after reduction, false otherwise.
-	bool IsUnit(const Integer &a) const
-		{return Integer::Gcd(a, m_modulus).IsUnit();}
-
-	//! \brief Calculate the multiplicative inverse of an element in the ring
-	//! \param a the element
-	//! \details MultiplicativeInverse returns <tt>a<sup>-1</sup>\%n</tt>. The element <tt>a</tt> must
-	//!   provide a InverseMod member function.
-	const Integer& MultiplicativeInverse(const Integer &a) const
-		{return m_result1 = a.InverseMod(m_modulus);}
-
-	//! \brief Divides elements in the ring
-	//! \param a the dividend
-	//! \param b the divisor
-	//! \returns the quotient
-	//! \details Divide returns <tt>a*b<sup>-1</sup>\%n</tt>.
-	const Integer& Divide(const Integer &a, const Integer &b) const
-		{return Multiply(a, MultiplicativeInverse(b));}
-
-	//! \brief TODO
-	//! \param x first element
-	//! \param e1 first exponent
-	//! \param y second element
-	//! \param e2 second exponent
-	//! \returns TODO
-	Integer CascadeExponentiate(const Integer &x, const Integer &e1, const Integer &y, const Integer &e2) const;
-
-	//! \brief Exponentiates a base to multiple exponents in the ring
-	//! \param results an array of Elements
-	//! \param base the base to raise to the exponents
-	//! \param exponents an array of exponents
-	//! \param exponentsCount the number of exponents in the array
-	//! \details SimultaneousExponentiate() raises the base to each exponent in the exponents array and stores the
-	//!   result at the respective position in the results array.
-	//! \details SimultaneousExponentiate() must be implemented in a derived class.
-	//! \pre <tt>COUNTOF(results) == exponentsCount</tt>
-	//! \pre <tt>COUNTOF(exponents) == exponentsCount</tt>
-	void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const;
-
-	//! \brief Provides the maximum bit size of an element in the ring
-	//! \returns maximum bit size of an element
-	unsigned int MaxElementBitLength() const
-		{return (m_modulus-1).BitCount();}
-
-	//! \brief Provides the maximum byte size of an element in the ring
-	//! \returns maximum byte size of an element
-	unsigned int MaxElementByteLength() const
-		{return (m_modulus-1).ByteCount();}
-
-	//! \brief Provides a random element in the ring
-	//! \param rng RandomNumberGenerator used to generate material
-	//! \param ignore_for_now unused
-	//! \returns a random element that is uniformly distributed
-	//! \details RandomElement constructs a new element in the range <tt>[0,n-1]</tt>, inclusive.
-	//!   The element's class must provide a constructor with the signature <tt>Element(RandomNumberGenerator rng,
-	//!   Element min, Element max)</tt>.
-	Element RandomElement( RandomNumberGenerator &rng , const RandomizationParameter &ignore_for_now = 0) const
-		// left RandomizationParameter arg as ref in case RandomizationParameter becomes a more complicated struct
-	{
-		CRYPTOPP_UNUSED(ignore_for_now);
-		return Element(rng, Integer::Zero(), m_modulus - Integer::One()) ;
-	}
-
-	//! \brief Compares two ModularArithmetic for equality
-	//! \param rhs other ModularArithmetic
-	//! \returns true if this is equal to the other, false otherwise
-	//! \details The operator tests for equality using <tt>this.m_modulus == rhs.m_modulus</tt>.
-	bool operator==(const ModularArithmetic &rhs) const
-		{return m_modulus == rhs.m_modulus;}
-
-	static const RandomizationParameter DefaultRandomizationParameter ;
-
-protected:
-	Integer m_modulus;
-	mutable Integer m_result, m_result1;
-};
-
-// const ModularArithmetic::RandomizationParameter ModularArithmetic::DefaultRandomizationParameter = 0 ;
-
-//! \class MontgomeryRepresentation
-//! \brief Performs modular arithmetic in Montgomery representation for increased speed
-//! \details The Montgomery representation represents each congruence class <tt>[a]</tt> as
-//!   <tt>a*r\%n</tt>, where <tt>r</tt> is a convenient power of 2.
-//! \details <tt>const Element&</tt> returned by member functions are references
-//!   to internal data members. Since each object may have only
-//!   one such data member for holding results, the following code
-//!   will produce incorrect results:
-//!   <pre>    abcd = group.Add(group.Add(a,b), group.Add(c,d));</pre>
-//!   But this should be fine:
-//!   <pre>    abcd = group.Add(a, group.Add(b, group.Add(c,d));</pre>
-class CRYPTOPP_DLL MontgomeryRepresentation : public ModularArithmetic
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~MontgomeryRepresentation() {}
-#endif
-
-	//! \brief Construct a IsMontgomeryRepresentation
-	//! \param modulus congruence class modulus
-	//! \note The modulus must be odd.
-	MontgomeryRepresentation(const Integer &modulus);
-
-	//! \brief Clone a MontgomeryRepresentation
-	//! \returns pointer to a new MontgomeryRepresentation
-	//! \details Clone effectively copy constructs a new MontgomeryRepresentation. The caller is
-	//!   responsible for deleting the pointer returned from this method.
-	virtual ModularArithmetic * Clone() const {return new MontgomeryRepresentation(*this);}
-
-	bool IsMontgomeryRepresentation() const {return true;}
-
-	Integer ConvertIn(const Integer &a) const
-		{return (a<<(WORD_BITS*m_modulus.reg.size()))%m_modulus;}
-
-	Integer ConvertOut(const Integer &a) const;
-
-	const Integer& MultiplicativeIdentity() const
-		{return m_result1 = Integer::Power2(WORD_BITS*m_modulus.reg.size())%m_modulus;}
-
-	const Integer& Multiply(const Integer &a, const Integer &b) const;
-
-	const Integer& Square(const Integer &a) const;
-
-	const Integer& MultiplicativeInverse(const Integer &a) const;
-
-	Integer CascadeExponentiate(const Integer &x, const Integer &e1, const Integer &y, const Integer &e2) const
-		{return AbstractRing<Integer>::CascadeExponentiate(x, e1, y, e2);}
-
-	void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const
-		{AbstractRing<Integer>::SimultaneousExponentiate(results, base, exponents, exponentsCount);}
-
-private:
-	Integer m_u;
-	mutable IntegerSecBlock m_workspace;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/modes.cpp b/src-cryptopp/modes.cpp
deleted file mode 100644
index 5937588..0000000
--- a/src-cryptopp/modes.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-// modes.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "modes.h"
-#include "misc.h"
-
-//#if CRYPTOPP_DEBUG
-#include "des.h"
-//#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#if CRYPTOPP_DEBUG && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
-void Modes_TestInstantiations()
-{
-	CFB_Mode<DES>::Encryption m0;
-	CFB_Mode<DES>::Decryption m1;
-	OFB_Mode<DES>::Encryption m2;
-	CTR_Mode<DES>::Encryption m3;
-	ECB_Mode<DES>::Encryption m4;
-	CBC_Mode<DES>::Encryption m5;
-}
-#endif
-
-// Thanks to Zireael, http://github.com/weidai11/cryptopp/pull/46
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-void CipherModeBase::ResizeBuffers()
-{
-	m_register.New(m_cipher->BlockSize());
-}
-#endif
-
-void CFB_ModePolicy::Iterate(byte *output, const byte *input, CipherDir dir, size_t iterationCount)
-{
-	CRYPTOPP_ASSERT(input);
-	CRYPTOPP_ASSERT(output);
-	CRYPTOPP_ASSERT(m_cipher->IsForwardTransformation());	// CFB mode needs the "encrypt" direction of the underlying block cipher, even to decrypt
-	CRYPTOPP_ASSERT(m_feedbackSize == BlockSize());
-
-	const unsigned int s = BlockSize();
-	if (dir == ENCRYPTION)
-	{
-		m_cipher->ProcessAndXorBlock(m_register, input, output);
-		if (iterationCount > 1)
-			m_cipher->AdvancedProcessBlocks(output, input+s, output+s, (iterationCount-1)*s, 0);
-		memcpy(m_register, output+(iterationCount-1)*s, s);
-	}
-	else
-	{
-		memcpy(m_temp, input+(iterationCount-1)*s, s);	// make copy first in case of in-place decryption
-		if (iterationCount > 1)
-			m_cipher->AdvancedProcessBlocks(input, input+s, output+s, (iterationCount-1)*s, BlockTransformation::BT_ReverseDirection);
-		m_cipher->ProcessAndXorBlock(m_register, input, output);
-		memcpy(m_register, m_temp, s);
-	}
-}
-
-void CFB_ModePolicy::TransformRegister()
-{
-	CRYPTOPP_ASSERT(m_cipher->IsForwardTransformation());	// CFB mode needs the "encrypt" direction of the underlying block cipher, even to decrypt
-	m_cipher->ProcessBlock(m_register, m_temp);
-	unsigned int updateSize = BlockSize()-m_feedbackSize;
-	memmove_s(m_register, m_register.size(), m_register+m_feedbackSize, updateSize);
-	memcpy_s(m_register+updateSize, m_register.size()-updateSize, m_temp, m_feedbackSize);
-}
-
-void CFB_ModePolicy::CipherResynchronize(const byte *iv, size_t length)
-{
-	CRYPTOPP_ASSERT(length == BlockSize());
-	CopyOrZero(m_register, iv, length);
-	TransformRegister();
-}
-
-void CFB_ModePolicy::SetFeedbackSize(unsigned int feedbackSize)
-{
-	if (feedbackSize > BlockSize())
-		throw InvalidArgument("CFB_Mode: invalid feedback size");
-	m_feedbackSize = feedbackSize ? feedbackSize : BlockSize();
-}
-
-void CFB_ModePolicy::ResizeBuffers()
-{
-	CipherModeBase::ResizeBuffers();
-	m_temp.New(BlockSize());
-}
-
-void OFB_ModePolicy::WriteKeystream(byte *keystreamBuffer, size_t iterationCount)
-{
-	CRYPTOPP_ASSERT(m_cipher->IsForwardTransformation());	// OFB mode needs the "encrypt" direction of the underlying block cipher, even to decrypt
-	unsigned int s = BlockSize();
-	m_cipher->ProcessBlock(m_register, keystreamBuffer);
-	if (iterationCount > 1)
-		m_cipher->AdvancedProcessBlocks(keystreamBuffer, NULL, keystreamBuffer+s, s*(iterationCount-1), 0);
-	memcpy(m_register, keystreamBuffer+s*(iterationCount-1), s);
-}
-
-void OFB_ModePolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length)
-{
-	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(length);
-	CRYPTOPP_ASSERT(length == BlockSize());
-
-	CopyOrZero(m_register, iv, length);
-}
-
-void CTR_ModePolicy::SeekToIteration(lword iterationCount)
-{
-	int carry=0;
-	for (int i=BlockSize()-1; i>=0; i--)
-	{
-		unsigned int sum = m_register[i] + byte(iterationCount) + carry;
-		m_counterArray[i] = (byte) sum;
-		carry = sum >> 8;
-		iterationCount >>= 8;
-	}
-}
-
-void CTR_ModePolicy::IncrementCounterBy256()
-{
-	IncrementCounterByOne(m_counterArray, BlockSize()-1);
-}
-
-void CTR_ModePolicy::OperateKeystream(KeystreamOperation /*operation*/, byte *output, const byte *input, size_t iterationCount)
-{
-	CRYPTOPP_ASSERT(m_cipher->IsForwardTransformation());	// CTR mode needs the "encrypt" direction of the underlying block cipher, even to decrypt
-	unsigned int s = BlockSize();
-	unsigned int inputIncrement = input ? s : 0;
-
-	while (iterationCount)
-	{
-		byte lsb = m_counterArray[s-1];
-		size_t blocks = UnsignedMin(iterationCount, 256U-lsb);
-		m_cipher->AdvancedProcessBlocks(m_counterArray, input, output, blocks*s, BlockTransformation::BT_InBlockIsCounter|BlockTransformation::BT_AllowParallel);
-		if ((m_counterArray[s-1] = lsb + (byte)blocks) == 0)
-			IncrementCounterBy256();
-
-		output += blocks*s;
-		input += blocks*inputIncrement;
-		iterationCount -= blocks;
-	}
-}
-
-void CTR_ModePolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length)
-{
-	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(length);
-	CRYPTOPP_ASSERT(length == BlockSize());
-
-	CopyOrZero(m_register, iv, length);
-	m_counterArray = m_register;
-}
-
-void BlockOrientedCipherModeBase::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
-{
-	m_cipher->SetKey(key, length, params);
-	ResizeBuffers();
-	if (IsResynchronizable())
-	{
-		size_t ivLength;
-		const byte *iv = GetIVAndThrowIfInvalid(params, ivLength);
-		Resynchronize(iv, (int)ivLength);
-	}
-}
-
-// Thanks to Zireael, http://github.com/weidai11/cryptopp/pull/46
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-void BlockOrientedCipherModeBase::ResizeBuffers()
-{
-	CipherModeBase::ResizeBuffers();
-	m_buffer.New(BlockSize());
-}
-#endif
-
-void ECB_OneWay::ProcessData(byte *outString, const byte *inString, size_t length)
-{
-	CRYPTOPP_ASSERT(length%BlockSize()==0);
-	m_cipher->AdvancedProcessBlocks(inString, NULL, outString, length, BlockTransformation::BT_AllowParallel);
-}
-
-void CBC_Encryption::ProcessData(byte *outString, const byte *inString, size_t length)
-{
-	if (!length)
-		return;
-	CRYPTOPP_ASSERT(length%BlockSize()==0);
-
-	unsigned int blockSize = BlockSize();
-	m_cipher->AdvancedProcessBlocks(inString, m_register, outString, blockSize, BlockTransformation::BT_XorInput);
-	if (length > blockSize)
-		m_cipher->AdvancedProcessBlocks(inString+blockSize, outString, outString+blockSize, length-blockSize, BlockTransformation::BT_XorInput);
-	memcpy(m_register, outString + length - blockSize, blockSize);
-}
-
-void CBC_CTS_Encryption::ProcessLastBlock(byte *outString, const byte *inString, size_t length)
-{
-	if (length <= BlockSize())
-	{
-		if (!m_stolenIV)
-			throw InvalidArgument("CBC_Encryption: message is too short for ciphertext stealing");
-
-		// steal from IV
-		memcpy(outString, m_register, length);
-		outString = m_stolenIV;
-	}
-	else
-	{
-		// steal from next to last block
-		xorbuf(m_register, inString, BlockSize());
-		m_cipher->ProcessBlock(m_register);
-		inString += BlockSize();
-		length -= BlockSize();
-		memcpy(outString+BlockSize(), m_register, length);
-	}
-
-	// output last full ciphertext block
-	xorbuf(m_register, inString, length);
-	m_cipher->ProcessBlock(m_register);
-	memcpy(outString, m_register, BlockSize());
-}
-
-// Thanks to Zireael, http://github.com/weidai11/cryptopp/pull/46
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-void CBC_Decryption::ResizeBuffers()
-{
-	BlockOrientedCipherModeBase::ResizeBuffers();
-	m_temp.New(BlockSize());
-}
-#endif
-
-void CBC_Decryption::ProcessData(byte *outString, const byte *inString, size_t length)
-{
-	if (!length)
-		return;
-	CRYPTOPP_ASSERT(length%BlockSize()==0);
-
-	unsigned int blockSize = BlockSize();
-	memcpy(m_temp, inString+length-blockSize, blockSize);	// save copy now in case of in-place decryption
-	if (length > blockSize)
-		m_cipher->AdvancedProcessBlocks(inString+blockSize, inString, outString+blockSize, length-blockSize, BlockTransformation::BT_ReverseDirection|BlockTransformation::BT_AllowParallel);
-	m_cipher->ProcessAndXorBlock(inString, m_register, outString);
-	m_register.swap(m_temp);
-}
-
-void CBC_CTS_Decryption::ProcessLastBlock(byte *outString, const byte *inString, size_t length)
-{
-	const byte *pn, *pn1;
-	bool stealIV = length <= BlockSize();
-
-	if (stealIV)
-	{
-		pn = inString;
-		pn1 = m_register;
-	}
-	else
-	{
-		pn = inString + BlockSize();
-		pn1 = inString;
-		length -= BlockSize();
-	}
-
-	// decrypt last partial plaintext block
-	memcpy(m_temp, pn1, BlockSize());
-	m_cipher->ProcessBlock(m_temp);
-	xorbuf(m_temp, pn, length);
-
-	if (stealIV)
-		memcpy(outString, m_temp, length);
-	else
-	{
-		memcpy(outString+BlockSize(), m_temp, length);
-		// decrypt next to last plaintext block
-		memcpy(m_temp, pn, length);
-		m_cipher->ProcessBlock(m_temp);
-		xorbuf(outString, m_temp, m_register, BlockSize());
-	}
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/modes.h b/src-cryptopp/modes.h
deleted file mode 100644
index ceac7ce..0000000
--- a/src-cryptopp/modes.h
+++ /dev/null
@@ -1,485 +0,0 @@
-// modes.h - written and placed in the public domain by Wei Dai
-
-//! \file modes.h
-//! \brief Class file for modes of operation.
-
-#ifndef CRYPTOPP_MODES_H
-#define CRYPTOPP_MODES_H
-
-#include "cryptlib.h"
-#include "secblock.h"
-#include "misc.h"
-#include "strciphr.h"
-#include "argnames.h"
-#include "algparam.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class CipherModeDocumentation
-//! \brief Block cipher mode of operation information
-//! \details Each class derived from this one defines two types, Encryption and Decryption,
-//!   both of which implement the SymmetricCipher interface.
-//!   For each mode there are two classes, one of which is a template class,
-//!   and the other one has a name that ends in "_ExternalCipher".
-//!   The "external cipher" mode objects hold a reference to the underlying block cipher,
-//!   instead of holding an instance of it. The reference must be passed in to the constructor.
-//!   For the "cipher holder" classes, the CIPHER template parameter should be a class
-//!   derived from BlockCipherDocumentation, for example DES or AES.
-//! \details See NIST SP 800-38A for definitions of these modes. See
-//!   AuthenticatedSymmetricCipherDocumentation for authenticated encryption modes.
-struct CipherModeDocumentation : public SymmetricCipherDocumentation
-{
-};
-
-//! \class CipherModeBase
-//! \brief Block cipher mode of operation information
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CipherModeBase : public SymmetricCipher
-{
-public:
-	size_t MinKeyLength() const {return m_cipher->MinKeyLength();}
-	size_t MaxKeyLength() const {return m_cipher->MaxKeyLength();}
-	size_t DefaultKeyLength() const {return m_cipher->DefaultKeyLength();}
-	size_t GetValidKeyLength(size_t n) const {return m_cipher->GetValidKeyLength(n);}
-	bool IsValidKeyLength(size_t n) const {return m_cipher->IsValidKeyLength(n);}
-
-	unsigned int OptimalDataAlignment() const {return m_cipher->OptimalDataAlignment();}
-
-	unsigned int IVSize() const {return BlockSize();}
-	virtual IV_Requirement IVRequirement() const =0;
-
-	void SetCipher(BlockCipher &cipher)
-	{
-		this->ThrowIfResynchronizable();
-		this->m_cipher = &cipher;
-		this->ResizeBuffers();
-	}
-
-	void SetCipherWithIV(BlockCipher &cipher, const byte *iv, int feedbackSize = 0)
-	{
-		this->ThrowIfInvalidIV(iv);
-		this->m_cipher = &cipher;
-		this->ResizeBuffers();
-		this->SetFeedbackSize(feedbackSize);
-		if (this->IsResynchronizable())
-			this->Resynchronize(iv);
-	}
-
-protected:
-	CipherModeBase() : m_cipher(NULL) {}
-	inline unsigned int BlockSize() const {CRYPTOPP_ASSERT(m_register.size() > 0); return (unsigned int)m_register.size();}
-	virtual void SetFeedbackSize(unsigned int feedbackSize)
-	{
-		if (!(feedbackSize == 0 || feedbackSize == BlockSize()))
-			throw InvalidArgument("CipherModeBase: feedback size cannot be specified for this cipher mode");
-	}
-
-// Thanks to Zireael, http://github.com/weidai11/cryptopp/pull/46
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual void ResizeBuffers();
-#else
-	virtual void ResizeBuffers()
-	{
-		m_register.New(m_cipher->BlockSize());
-	}
-#endif
-
-	BlockCipher *m_cipher;
-	AlignedSecByteBlock m_register;
-};
-
-//! \class ModePolicyCommonTemplate
-//! \brief Block cipher mode of operation common operations
-//! \tparam POLICY_INTERFACE common operations
-template <class POLICY_INTERFACE>
-class CRYPTOPP_NO_VTABLE ModePolicyCommonTemplate : public CipherModeBase, public POLICY_INTERFACE
-{
-	unsigned int GetAlignment() const {return m_cipher->OptimalDataAlignment();}
-	void CipherSetKey(const NameValuePairs &params, const byte *key, size_t length);
-};
-
-template <class POLICY_INTERFACE>
-void ModePolicyCommonTemplate<POLICY_INTERFACE>::CipherSetKey(const NameValuePairs &params, const byte *key, size_t length)
-{
-	m_cipher->SetKey(key, length, params);
-	ResizeBuffers();
-	int feedbackSize = params.GetIntValueWithDefault(Name::FeedbackSize(), 0);
-	SetFeedbackSize(feedbackSize);
-}
-
-//! \class CFB_ModePolicy
-//! \brief CFB block cipher mode of operation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CFB_ModePolicy : public ModePolicyCommonTemplate<CFB_CipherAbstractPolicy>
-{
-public:
-	IV_Requirement IVRequirement() const {return RANDOM_IV;}
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "CFB";}
-
-protected:
-	unsigned int GetBytesPerIteration() const {return m_feedbackSize;}
-	byte * GetRegisterBegin() {return m_register + BlockSize() - m_feedbackSize;}
-	bool CanIterate() const {return m_feedbackSize == BlockSize();}
-	void Iterate(byte *output, const byte *input, CipherDir dir, size_t iterationCount);
-	void TransformRegister();
-	void CipherResynchronize(const byte *iv, size_t length);
-	void SetFeedbackSize(unsigned int feedbackSize);
-	void ResizeBuffers();
-
-	SecByteBlock m_temp;
-	unsigned int m_feedbackSize;
-};
-
-inline void CopyOrZero(void *dest, const void *src, size_t s)
-{
-	if (src)
-		memcpy_s(dest, s, src, s);
-	else
-		memset(dest, 0, s);
-}
-
-//! \class OFB_ModePolicy
-//! \brief OFB block cipher mode of operation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE OFB_ModePolicy : public ModePolicyCommonTemplate<AdditiveCipherAbstractPolicy>
-{
-public:
-	bool CipherIsRandomAccess() const {return false;}
-	IV_Requirement IVRequirement() const {return UNIQUE_IV;}
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "OFB";}
-
-private:
-	unsigned int GetBytesPerIteration() const {return BlockSize();}
-	unsigned int GetIterationsToBuffer() const {return m_cipher->OptimalNumberOfParallelBlocks();}
-	void WriteKeystream(byte *keystreamBuffer, size_t iterationCount);
-	void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length);
-};
-
-//! \class CTR_ModePolicy
-//! \brief CTR block cipher mode of operation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CTR_ModePolicy : public ModePolicyCommonTemplate<AdditiveCipherAbstractPolicy>
-{
-public:
-	bool CipherIsRandomAccess() const {return true;}
-	IV_Requirement IVRequirement() const {return RANDOM_IV;}
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "CTR";}
-
-protected:
-	virtual void IncrementCounterBy256();
-
-	unsigned int GetAlignment() const {return m_cipher->OptimalDataAlignment();}
-	unsigned int GetBytesPerIteration() const {return BlockSize();}
-	unsigned int GetIterationsToBuffer() const {return m_cipher->OptimalNumberOfParallelBlocks();}
-	void WriteKeystream(byte *buffer, size_t iterationCount)
-		{OperateKeystream(WRITE_KEYSTREAM, buffer, NULL, iterationCount);}
-	bool CanOperateKeystream() const {return true;}
-	void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount);
-	void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length);
-	void SeekToIteration(lword iterationCount);
-
-	AlignedSecByteBlock m_counterArray;
-};
-
-//! \class BlockOrientedCipherModeBase
-//! \brief Block cipher mode of operation default implementation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BlockOrientedCipherModeBase : public CipherModeBase
-{
-public:
-	void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
-	unsigned int MandatoryBlockSize() const {return BlockSize();}
-	bool IsRandomAccess() const {return false;}
-	bool IsSelfInverting() const {return false;}
-	bool IsForwardTransformation() const {return m_cipher->IsForwardTransformation();}
-	void Resynchronize(const byte *iv, int length=-1) {memcpy_s(m_register, m_register.size(), iv, ThrowIfInvalidIVLength(length));}
-
-protected:
-	bool RequireAlignedInput() const {return true;}
-
-	// Thanks to Zireael, http://github.com/weidai11/cryptopp/pull/46
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	void ResizeBuffers();
-#else
-	void ResizeBuffers()
-	{
-		CipherModeBase::ResizeBuffers();
-		m_buffer.New(BlockSize());
-	}
-#endif
-
-	SecByteBlock m_buffer;
-};
-
-//! \class ECB_OneWay
-//! \brief ECB block cipher mode of operation default implementation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE ECB_OneWay : public BlockOrientedCipherModeBase
-{
-public:
-	void SetKey(const byte *key, size_t length, const NameValuePairs &params = g_nullNameValuePairs)
-		{m_cipher->SetKey(key, length, params); BlockOrientedCipherModeBase::ResizeBuffers();}
-	IV_Requirement IVRequirement() const {return NOT_RESYNCHRONIZABLE;}
-	unsigned int OptimalBlockSize() const {return BlockSize() * m_cipher->OptimalNumberOfParallelBlocks();}
-	void ProcessData(byte *outString, const byte *inString, size_t length);
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "ECB";}
-};
-
-//! \class CBC_ModeBase
-//! \brief CBC block cipher mode of operation default implementation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_ModeBase : public BlockOrientedCipherModeBase
-{
-public:
-	IV_Requirement IVRequirement() const {return UNPREDICTABLE_RANDOM_IV;}
-	bool RequireAlignedInput() const {return false;}
-	unsigned int MinLastBlockSize() const {return 0;}
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "CBC";}
-};
-
-//! \class CBC_Encryption
-//! \brief CBC block cipher mode of operation encryption operation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_Encryption : public CBC_ModeBase
-{
-public:
-	void ProcessData(byte *outString, const byte *inString, size_t length);
-};
-
-//! \class CBC_CTS_Encryption
-//! \brief CBC-CTS block cipher mode of operation encryption operation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_CTS_Encryption : public CBC_Encryption
-{
-public:
-	void SetStolenIV(byte *iv) {m_stolenIV = iv;}
-	unsigned int MinLastBlockSize() const {return BlockSize()+1;}
-	void ProcessLastBlock(byte *outString, const byte *inString, size_t length);
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "CBC/CTS";}
-
-protected:
-	void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
-	{
-		CBC_Encryption::UncheckedSetKey(key, length, params);
-		m_stolenIV = params.GetValueWithDefault(Name::StolenIV(), (byte *)NULL);
-	}
-
-	byte *m_stolenIV;
-};
-
-//! \class CBC_Decryption
-//! \brief CBC block cipher mode of operation decryption operation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_Decryption : public CBC_ModeBase
-{
-public:
-	void ProcessData(byte *outString, const byte *inString, size_t length);
-
-protected:
-
-	// Thanks to Zireael, http://github.com/weidai11/cryptopp/pull/46
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	void ResizeBuffers();
-#else
-	void ResizeBuffers()
-	{
-		BlockOrientedCipherModeBase::ResizeBuffers();
-		m_temp.New(BlockSize());
-	}
-#endif
-
-	AlignedSecByteBlock m_temp;
-};
-
-//! \class CBC_CTS_Decryption
-//! \brief CBC-CTS block cipher mode of operation decryption operation
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_CTS_Decryption : public CBC_Decryption
-{
-public:
-	unsigned int MinLastBlockSize() const {return BlockSize()+1;}
-	void ProcessLastBlock(byte *outString, const byte *inString, size_t length);
-};
-
-//! \class CipherModeFinalTemplate_CipherHolder
-//! \brief Block cipher mode of operation aggregate
-template <class CIPHER, class BASE>
-class CipherModeFinalTemplate_CipherHolder : protected ObjectHolder<CIPHER>, public AlgorithmImpl<BASE, CipherModeFinalTemplate_CipherHolder<CIPHER, BASE> >
-{
-public:
-	CipherModeFinalTemplate_CipherHolder()
-	{
-		this->m_cipher = &this->m_object;
-		this->ResizeBuffers();
-	}
-	CipherModeFinalTemplate_CipherHolder(const byte *key, size_t length)
-	{
-		this->m_cipher = &this->m_object;
-		this->SetKey(key, length);
-	}
-	CipherModeFinalTemplate_CipherHolder(const byte *key, size_t length, const byte *iv)
-	{
-		this->m_cipher = &this->m_object;
-		this->SetKey(key, length, MakeParameters(Name::IV(), ConstByteArrayParameter(iv, this->m_cipher->BlockSize())));
-	}
-	CipherModeFinalTemplate_CipherHolder(const byte *key, size_t length, const byte *iv, int feedbackSize)
-	{
-		this->m_cipher = &this->m_object;
-		this->SetKey(key, length, MakeParameters(Name::IV(), ConstByteArrayParameter(iv, this->m_cipher->BlockSize()))(Name::FeedbackSize(), feedbackSize));
-	}
-
-	static std::string CRYPTOPP_API StaticAlgorithmName()
-		{return CIPHER::StaticAlgorithmName() + "/" + BASE::StaticAlgorithmName();}
-};
-
-//! \class CipherModeFinalTemplate_ExternalCipher
-//! \tparam BASE CipherModeFinalTemplate_CipherHolder base class
-//! \details
-template <class BASE>
-class CipherModeFinalTemplate_ExternalCipher : public BASE
-{
-public:
-	CipherModeFinalTemplate_ExternalCipher() {}
-	CipherModeFinalTemplate_ExternalCipher(BlockCipher &cipher)
-		{this->SetCipher(cipher);}
-	CipherModeFinalTemplate_ExternalCipher(BlockCipher &cipher, const byte *iv, int feedbackSize = 0)
-		{this->SetCipherWithIV(cipher, iv, feedbackSize);}
-
-	std::string AlgorithmName() const
-		{return (this->m_cipher ? this->m_cipher->AlgorithmName() + "/" : std::string("")) + BASE::StaticAlgorithmName();}
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS CFB_CipherTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS CFB_EncryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS CFB_DecryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> >;
-
-//! \class CFB_Mode
-//! \brief CFB block cipher mode of operation.
-template <class CIPHER>
-struct CFB_Mode : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, ConcretePolicyHolder<Empty, CFB_EncryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> > > > Encryption;
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, ConcretePolicyHolder<Empty, CFB_DecryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> > > > Decryption;
-};
-
-//! \class CFB_Mode_ExternalCipher
-//! \brief CFB mode, external cipher.
-struct CFB_Mode_ExternalCipher : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_ExternalCipher<ConcretePolicyHolder<Empty, CFB_EncryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> > > > Encryption;
-	typedef CipherModeFinalTemplate_ExternalCipher<ConcretePolicyHolder<Empty, CFB_DecryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> > > > Decryption;
-};
-
-//! \class CFB_FIPS_Mode
-//! \brief CFB block cipher mode of operation providing FIPS validated cryptography.
-//! \details Requires full block plaintext according to FIPS 800-38A
-template <class CIPHER>
-struct CFB_FIPS_Mode : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, ConcretePolicyHolder<Empty, CFB_RequireFullDataBlocks<CFB_EncryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> > > > > Encryption;
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, ConcretePolicyHolder<Empty, CFB_RequireFullDataBlocks<CFB_DecryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> > > > > Decryption;
-};
-
-//! \class CFB_FIPS_Mode_ExternalCipher
-//! \brief CFB mode, external cipher, providing FIPS validated cryptography.
-//! \details Requires full block plaintext according to FIPS 800-38A
-struct CFB_FIPS_Mode_ExternalCipher : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_ExternalCipher<ConcretePolicyHolder<Empty, CFB_RequireFullDataBlocks<CFB_EncryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> > > > > Encryption;
-	typedef CipherModeFinalTemplate_ExternalCipher<ConcretePolicyHolder<Empty, CFB_RequireFullDataBlocks<CFB_DecryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> > > > > Decryption;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, OFB_ModePolicy> >;
-
-//! \class OFB_Mode
-//! \brief OFB block cipher mode of operation.
-template <class CIPHER>
-struct OFB_Mode : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, ConcretePolicyHolder<Empty, AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, OFB_ModePolicy> > > > Encryption;
-	typedef Encryption Decryption;
-};
-
-//! \class OFB_Mode_ExternalCipher
-//! \brief OFB mode, external cipher.
-struct OFB_Mode_ExternalCipher : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_ExternalCipher<ConcretePolicyHolder<Empty, AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, OFB_ModePolicy> > > > Encryption;
-	typedef Encryption Decryption;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, CTR_ModePolicy> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher<ConcretePolicyHolder<Empty, AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, CTR_ModePolicy> > > >;
-
-//! \class CTR_Mode
-//! \brief CTR block cipher mode of operation.
-template <class CIPHER>
-struct CTR_Mode : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, ConcretePolicyHolder<Empty, AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, CTR_ModePolicy> > > > Encryption;
-	typedef Encryption Decryption;
-};
-
-//! \class CTR_Mode_ExternalCipher
-//! \brief CTR mode, external cipher.
-struct CTR_Mode_ExternalCipher : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_ExternalCipher<ConcretePolicyHolder<Empty, AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, CTR_ModePolicy> > > > Encryption;
-	typedef Encryption Decryption;
-};
-
-//! \class ECB_Mode
-//! \brief ECB block cipher mode of operation.
-template <class CIPHER>
-struct ECB_Mode : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, ECB_OneWay> Encryption;
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Decryption, ECB_OneWay> Decryption;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher<ECB_OneWay>;
-
-//! \class ECB_Mode_ExternalCipher
-//! \brief ECB mode, external cipher.
-struct ECB_Mode_ExternalCipher : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_ExternalCipher<ECB_OneWay> Encryption;
-	typedef Encryption Decryption;
-};
-
-//! CBC mode
-template <class CIPHER>
-struct CBC_Mode : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, CBC_Encryption> Encryption;
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Decryption, CBC_Decryption> Decryption;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher<CBC_Encryption>;
-CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher<CBC_Decryption>;
-
-//! CBC mode, external cipher
-struct CBC_Mode_ExternalCipher : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_ExternalCipher<CBC_Encryption> Encryption;
-	typedef CipherModeFinalTemplate_ExternalCipher<CBC_Decryption> Decryption;
-};
-
-//! CBC mode with ciphertext stealing
-template <class CIPHER>
-struct CBC_CTS_Mode : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Encryption, CBC_CTS_Encryption> Encryption;
-	typedef CipherModeFinalTemplate_CipherHolder<CPP_TYPENAME CIPHER::Decryption, CBC_CTS_Decryption> Decryption;
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher<CBC_CTS_Encryption>;
-CRYPTOPP_DLL_TEMPLATE_CLASS CipherModeFinalTemplate_ExternalCipher<CBC_CTS_Decryption>;
-
-//! \class CBC_CTS_Mode_ExternalCipher
-//! \brief CBC mode with ciphertext stealing, external cipher
-struct CBC_CTS_Mode_ExternalCipher : public CipherModeDocumentation
-{
-	typedef CipherModeFinalTemplate_ExternalCipher<CBC_CTS_Encryption> Encryption;
-	typedef CipherModeFinalTemplate_ExternalCipher<CBC_CTS_Decryption> Decryption;
-};
-
-#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
-typedef CFB_Mode_ExternalCipher::Encryption CFBEncryption;
-typedef CFB_Mode_ExternalCipher::Decryption CFBDecryption;
-typedef OFB_Mode_ExternalCipher::Encryption OFB;
-typedef CTR_Mode_ExternalCipher::Encryption CounterMode;
-#endif
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/modexppc.h b/src-cryptopp/modexppc.h
deleted file mode 100644
index a1a0a9c..0000000
--- a/src-cryptopp/modexppc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef CRYPTOPP_MODEXPPC_H
-#define CRYPTOPP_MODEXPPC_H
-
-#include "cryptlib.h"
-#include "modarith.h"
-#include "integer.h"
-#include "algebra.h"
-#include "eprecomp.h"
-#include "smartptr.h"
-#include "pubkey.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-CRYPTOPP_DLL_TEMPLATE_CLASS DL_FixedBasePrecomputationImpl<Integer>;
-
-class ModExpPrecomputation : public DL_GroupPrecomputation<Integer>
-{
-public:
-	// DL_GroupPrecomputation
-	bool NeedConversions() const {return true;}
-	Element ConvertIn(const Element &v) const {return m_mr->ConvertIn(v);}
-	virtual Element ConvertOut(const Element &v) const {return m_mr->ConvertOut(v);}
-	const AbstractGroup<Element> & GetGroup() const {return m_mr->MultiplicativeGroup();}
-	Element BERDecodeElement(BufferedTransformation &bt) const {return Integer(bt);}
-	void DEREncodeElement(BufferedTransformation &bt, const Element &v) const {v.DEREncode(bt);}
-
-	// non-inherited
-	void SetModulus(const Integer &v) {m_mr.reset(new MontgomeryRepresentation(v));}
-	const Integer & GetModulus() const {return m_mr->GetModulus();}
-
-private:
-	value_ptr<MontgomeryRepresentation> m_mr;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/mqueue.cpp b/src-cryptopp/mqueue.cpp
deleted file mode 100644
index 8c071e2..0000000
--- a/src-cryptopp/mqueue.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// mqueue.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "mqueue.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-MessageQueue::MessageQueue(unsigned int nodeSize)
-	: m_queue(nodeSize), m_lengths(1, 0U), m_messageCounts(1, 0U)
-{
-}
-
-size_t MessageQueue::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const
-{
-	if (begin >= MaxRetrievable())
-		return 0;
-
-	return m_queue.CopyRangeTo2(target, begin, STDMIN(MaxRetrievable(), end), channel, blocking);
-}
-
-size_t MessageQueue::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking)
-{
-	transferBytes = STDMIN(MaxRetrievable(), transferBytes);
-	size_t blockedBytes = m_queue.TransferTo2(target, transferBytes, channel, blocking);
-	m_lengths.front() -= transferBytes;
-	return blockedBytes;
-}
-
-bool MessageQueue::GetNextMessage()
-{
-	if (NumberOfMessages() > 0 && !AnyRetrievable())
-	{
-		m_lengths.pop_front();
-		if (m_messageCounts[0] == 0 && m_messageCounts.size() > 1)
-			m_messageCounts.pop_front();
-		return true;
-	}
-	else
-		return false;
-}
-
-unsigned int MessageQueue::CopyMessagesTo(BufferedTransformation &target, unsigned int count, const std::string &channel) const
-{
-	ByteQueue::Walker walker(m_queue);
-	std::deque<lword>::const_iterator it = m_lengths.begin();
-	unsigned int i;
-	for (i=0; i<count && it != --m_lengths.end(); ++i, ++it)
-	{
-		walker.TransferTo(target, *it, channel);
-		if (GetAutoSignalPropagation())
-			target.ChannelMessageEnd(channel, GetAutoSignalPropagation()-1);
-	}
-	return i;
-}
-
-void MessageQueue::swap(MessageQueue &rhs)
-{
-	m_queue.swap(rhs.m_queue);
-	m_lengths.swap(rhs.m_lengths);
-}
-
-const byte * MessageQueue::Spy(size_t &contiguousSize) const
-{
-	const byte *result = m_queue.Spy(contiguousSize);
-	contiguousSize = UnsignedMin(contiguousSize, MaxRetrievable());
-	return result;
-}
-
-// *************************************************************
-
-unsigned int EqualityComparisonFilter::MapChannel(const std::string &channel) const
-{
-	if (channel == m_firstChannel)
-		return 0;
-	else if (channel == m_secondChannel)
-		return 1;
-	else
-		return 2;
-}
-
-size_t EqualityComparisonFilter::ChannelPut2(const std::string &channel, const byte *inString, size_t length, int messageEnd, bool blocking)
-{
-	if (!blocking)
-		throw BlockingInputOnly("EqualityComparisonFilter");
-
-	unsigned int i = MapChannel(channel);
-
-	if (i == 2)
-		return Output(3, inString, length, messageEnd, blocking, channel);
-	else if (m_mismatchDetected)
-		return 0;
-	else
-	{
-		MessageQueue &q1 = m_q[i], &q2 = m_q[1-i];
-
-		if (q2.AnyMessages() && q2.MaxRetrievable() < length)
-			goto mismatch;
-
-		while (length > 0 && q2.AnyRetrievable())
-		{
-			size_t len = length;
-			const byte *data = q2.Spy(len);
-			len = STDMIN(len, length);
-			if (memcmp(inString, data, len) != 0)
-				goto mismatch;
-			inString += len;
-			length -= len;
-			q2.Skip(len);
-		}
-
-		q1.Put(inString, length);
-
-		if (messageEnd)
-		{
-			if (q2.AnyRetrievable())
-				goto mismatch;
-			else if (q2.AnyMessages())
-				q2.GetNextMessage();
-			else if (q2.NumberOfMessageSeries() > 0)
-				goto mismatch;
-			else
-				q1.MessageEnd();
-		}
-
-		return 0;
-
-mismatch:
-		return HandleMismatchDetected(blocking);
-	}
-}
-
-bool EqualityComparisonFilter::ChannelMessageSeriesEnd(const std::string &channel, int propagation, bool blocking)
-{
-	unsigned int i = MapChannel(channel);
-
-	if (i == 2)
-	{
-		OutputMessageSeriesEnd(4, propagation, blocking, channel);
-		return false;
-	}
-	else if (m_mismatchDetected)
-		return false;
-	else
-	{
-		MessageQueue &q1 = m_q[i], &q2 = m_q[1-i];
-
-		if (q2.AnyRetrievable() || q2.AnyMessages())
-			goto mismatch;
-		else if (q2.NumberOfMessageSeries() > 0)
-			return Output(2, (const byte *)"\1", 1, 0, blocking) != 0;
-		else
-			q1.MessageSeriesEnd();
-
-		return false;
-
-mismatch:
-		return HandleMismatchDetected(blocking);
-	}
-}
-
-bool EqualityComparisonFilter::HandleMismatchDetected(bool blocking)
-{
-	m_mismatchDetected = true;
-	if (m_throwIfNotEqual)
-		throw MismatchDetected();
-	return Output(1, (const byte *)"\0", 1, 0, blocking) != 0;
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/mqueue.h b/src-cryptopp/mqueue.h
deleted file mode 100644
index 0800798..0000000
--- a/src-cryptopp/mqueue.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef CRYPTOPP_MQUEUE_H
-#define CRYPTOPP_MQUEUE_H
-
-#include "cryptlib.h"
-#include "queue.h"
-#include "filters.h"
-#include "misc.h"
-
-#include <deque>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! Message Queue
-class CRYPTOPP_DLL MessageQueue : public AutoSignaling<BufferedTransformation>
-{
-public:
-	MessageQueue(unsigned int nodeSize=256);
-
-	void IsolatedInitialize(const NameValuePairs &parameters)
-		{m_queue.IsolatedInitialize(parameters); m_lengths.assign(1, 0U); m_messageCounts.assign(1, 0U);}
-	size_t Put2(const byte *begin, size_t length, int messageEnd, bool blocking)
-	{
-		CRYPTOPP_UNUSED(blocking);
-		m_queue.Put(begin, length);
-		m_lengths.back() += length;
-		if (messageEnd)
-		{
-			m_lengths.push_back(0);
-			m_messageCounts.back()++;
-		}
-		return 0;
-	}
-	bool IsolatedFlush(bool hardFlush, bool blocking)
-		{CRYPTOPP_UNUSED(hardFlush), CRYPTOPP_UNUSED(blocking); return false;}
-	bool IsolatedMessageSeriesEnd(bool blocking)
-		{CRYPTOPP_UNUSED(blocking); m_messageCounts.push_back(0); return false;}
-
-	lword MaxRetrievable() const
-		{return m_lengths.front();}
-	bool AnyRetrievable() const
-		{return m_lengths.front() > 0;}
-
-	size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const;
-
-	lword TotalBytesRetrievable() const
-		{return m_queue.MaxRetrievable();}
-	unsigned int NumberOfMessages() const
-		{return (unsigned int)m_lengths.size()-1;}
-	bool GetNextMessage();
-
-	unsigned int NumberOfMessagesInThisSeries() const
-		{return m_messageCounts[0];}
-	unsigned int NumberOfMessageSeries() const
-		{return (unsigned int)m_messageCounts.size()-1;}
-
-	unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) const;
-
-	const byte * Spy(size_t &contiguousSize) const;
-
-	void swap(MessageQueue &rhs);
-
-private:
-	ByteQueue m_queue;
-	std::deque<lword> m_lengths;
-	std::deque<unsigned int> m_messageCounts;
-};
-
-
-//! A filter that checks messages on two channels for equality
-class CRYPTOPP_DLL EqualityComparisonFilter : public Unflushable<Multichannel<Filter> >
-{
-public:
-	struct MismatchDetected : public Exception {MismatchDetected() : Exception(DATA_INTEGRITY_CHECK_FAILED, "EqualityComparisonFilter: did not receive the same data on two channels") {}};
-
-	/*! if throwIfNotEqual is false, this filter will output a '\\0' byte when it detects a mismatch, '\\1' otherwise */
-	EqualityComparisonFilter(BufferedTransformation *attachment=NULL, bool throwIfNotEqual=true, const std::string &firstChannel="0", const std::string &secondChannel="1")
-		: m_throwIfNotEqual(throwIfNotEqual), m_mismatchDetected(false)
-		, m_firstChannel(firstChannel), m_secondChannel(secondChannel)
-		{Detach(attachment);}
-
-	size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking);
-	bool ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1, bool blocking=true);
-
-private:
-	unsigned int MapChannel(const std::string &channel) const;
-	bool HandleMismatchDetected(bool blocking);
-
-	bool m_throwIfNotEqual, m_mismatchDetected;
-	std::string m_firstChannel, m_secondChannel;
-	MessageQueue m_q[2];
-};
-
-NAMESPACE_END
-
-#ifndef __BORLANDC__
-NAMESPACE_BEGIN(std)
-template<> inline void swap(CryptoPP::MessageQueue &a, CryptoPP::MessageQueue &b)
-{
-	a.swap(b);
-}
-NAMESPACE_END
-#endif
-
-#endif
diff --git a/src-cryptopp/mqv.h b/src-cryptopp/mqv.h
deleted file mode 100644
index cad3011..0000000
--- a/src-cryptopp/mqv.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// mqv.h - written and placed in the public domain by Wei Dai
-
-//! \file mqv.h
-//! \brief Classes for Menezes–Qu–Vanstone (MQV) key agreement
-
-#ifndef CRYPTOPP_MQV_H
-#define CRYPTOPP_MQV_H
-
-#include "cryptlib.h"
-#include "gfpcrypt.h"
-#include "modarith.h"
-#include "integer.h"
-#include "algebra.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class MQV_Domain
-//! \brief MQV domain for performing authenticated key agreement
-//! \tparam GROUP_PARAMETERS doamin parameters
-//! \tparam COFACTOR_OPTION cofactor option
-//! \details GROUP_PARAMETERS paramters include the curve coefcients and the base point.
-//!   Binary curves use a polynomial to represent its characteristic, while prime curves
-//!   use a prime number.
-//! \sa MQV, HMQV, FHMQV, and AuthenticatedKeyAgreementDomain
-template <class GROUP_PARAMETERS, class COFACTOR_OPTION = CPP_TYPENAME GROUP_PARAMETERS::DefaultCofactorOption>
-class MQV_Domain : public AuthenticatedKeyAgreementDomain
-{
-public:
-	typedef GROUP_PARAMETERS GroupParameters;
-	typedef typename GroupParameters::Element Element;
-	typedef MQV_Domain<GROUP_PARAMETERS, COFACTOR_OPTION> Domain;
-
-	//! \brief Construct a MQV domain
-	MQV_Domain() {}
-
-	//! \brief Construct a MQV domain
-	//! \param params group parameters and options
-	MQV_Domain(const GroupParameters &params)
-		: m_groupParameters(params) {}
-
-	//! \brief Construct a MQV domain
-	//! \param bt BufferedTransformation with group parameters and options
-	MQV_Domain(BufferedTransformation &bt)
-		{m_groupParameters.BERDecode(bt);}
-
-	//! \brief Construct a MQV domain
-	//! \tparam T1 template parameter used as a constructor parameter
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \param v1 first parameter
-	//! \param v2 second parameter
-	//! \details v1 and v2 are passed directly to the GROUP_PARAMETERS object.
-	template <class T1, class T2>
-	MQV_Domain(T1 v1, T2 v2)
-		{m_groupParameters.Initialize(v1, v2);}
-
-	//! \brief Construct a MQV domain
-	//! \tparam T1 template parameter used as a constructor parameter
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \tparam T3 template parameter used as a constructor parameter
-	//! \param v1 first parameter
-	//! \param v2 second parameter
-	//! \param v3 third parameter
-	//! \details v1, v2 and v3 are passed directly to the GROUP_PARAMETERS object.
-	template <class T1, class T2, class T3>
-	MQV_Domain(T1 v1, T2 v2, T3 v3)
-		{m_groupParameters.Initialize(v1, v2, v3);}
-
-	//! \brief Construct a MQV domain
-	//! \tparam T1 template parameter used as a constructor parameter
-	//! \tparam T2 template parameter used as a constructor parameter
-	//! \tparam T3 template parameter used as a constructor parameter
-	//! \tparam T4 template parameter used as a constructor parameter
-	//! \param v1 first parameter
-	//! \param v2 second parameter
-	//! \param v3 third parameter
-	//! \param v4 third parameter
-	//! \details v1, v2, v3 and v4 are passed directly to the GROUP_PARAMETERS object.
-	template <class T1, class T2, class T3, class T4>
-	MQV_Domain(T1 v1, T2 v2, T3 v3, T4 v4)
-		{m_groupParameters.Initialize(v1, v2, v3, v4);}
-
-	//! \brief Retrieves the group parameters for this domain
-	//! \return the group parameters for this domain as a const reference
-	const GroupParameters & GetGroupParameters() const {return m_groupParameters;}
-
-	//! \brief Retrieves the group parameters for this domain
-	//! \return the group parameters for this domain as a non-const reference
-	GroupParameters & AccessGroupParameters() {return m_groupParameters;}
-
-	//! \brief Retrieves the crypto parameters for this domain
-	//! \return the crypto parameters for this domain as a non-const reference
-	CryptoParameters & AccessCryptoParameters() {return AccessAbstractGroupParameters();}
-
-	//! \brief Provides the size of the agreed value
-	//! \return size of agreed value produced  in this domain
-	//! \details The length is calculated using <tt>GetEncodedElementSize(false)</tt>, which means the
-	//!   element is encoded in a non-reversible format. A non-reversible format means its a raw byte array,
-	//!   and it lacks presentation format like an ASN.1 BIT_STRING or OCTET_STRING.
-	unsigned int AgreedValueLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(false);}
-
-	//! \brief Provides the size of the static private key
-	//! \return size of static private keys in this domain
-	//! \details The length is calculated using the byte count of the subgroup order.
-	unsigned int StaticPrivateKeyLength() const {return GetAbstractGroupParameters().GetSubgroupOrder().ByteCount();}
-
-	//! \brief Provides the size of the static public key
-	//! \return size of static public keys in this domain
-	//! \details The length is calculated using <tt>GetEncodedElementSize(true)</tt>, which means the
-	//!   element is encoded in a reversible format. A reversible format means it has a presentation format,
-	//!   and its an ANS.1 encoded element or point.
-	unsigned int StaticPublicKeyLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(true);}
-
-	//! \brief Generate static private key in this domain
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer for the generated private key in this domain
-	//! \details The private key is a random scalar used as an exponent in the range <tt>[1,MaxExponent()]</tt>.
-	//! \pre <tt>COUNTOF(privateKey) == PrivateStaticKeyLength()</tt>
-	void GenerateStaticPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const
-	{
-		Integer x(rng, Integer::One(), GetAbstractGroupParameters().GetMaxExponent());
-		x.Encode(privateKey, StaticPrivateKeyLength());
-	}
-
-	//! \brief Generate a static public key from a private key in this domain
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param privateKey a byte buffer with the previously generated private key
-	//! \param publicKey a byte buffer for the generated public key in this domain
-	//! \details The public key is an element or point on the curve, and its stored in a revrsible format.
-	//!    A reversible format means it has a presentation format, and its an ANS.1 encoded element or point.
-	//! \pre <tt>COUNTOF(publicKey) == PublicStaticKeyLength()</tt>
-	void GenerateStaticPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const
-	{
-		CRYPTOPP_UNUSED(rng);
-		const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-		Integer x(privateKey, StaticPrivateKeyLength());
-		Element y = params.ExponentiateBase(x);
-		params.EncodeElement(true, y, publicKey);
-	}
-
-	unsigned int EphemeralPrivateKeyLength() const {return StaticPrivateKeyLength() + StaticPublicKeyLength();}
-	unsigned int EphemeralPublicKeyLength() const {return StaticPublicKeyLength();}
-
-	void GenerateEphemeralPrivateKey(RandomNumberGenerator &rng, byte *privateKey) const
-	{
-		const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-		Integer x(rng, Integer::One(), params.GetMaxExponent());
-		x.Encode(privateKey, StaticPrivateKeyLength());
-		Element y = params.ExponentiateBase(x);
-		params.EncodeElement(true, y, privateKey+StaticPrivateKeyLength());
-	}
-
-	void GenerateEphemeralPublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const
-	{
-		CRYPTOPP_UNUSED(rng);
-		memcpy(publicKey, privateKey+StaticPrivateKeyLength(), EphemeralPublicKeyLength());
-	}
-
-	bool Agree(byte *agreedValue,
-		const byte *staticPrivateKey, const byte *ephemeralPrivateKey,
-		const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey,
-		bool validateStaticOtherPublicKey=true) const
-	{
-		try
-		{
-			const DL_GroupParameters<Element> &params = GetAbstractGroupParameters();
-			Element WW = params.DecodeElement(staticOtherPublicKey, validateStaticOtherPublicKey);
-			Element VV = params.DecodeElement(ephemeralOtherPublicKey, true);
-
-			Integer s(staticPrivateKey, StaticPrivateKeyLength());
-			Integer u(ephemeralPrivateKey, StaticPrivateKeyLength());
-			Element V = params.DecodeElement(ephemeralPrivateKey+StaticPrivateKeyLength(), false);
-
-			const Integer &r = params.GetSubgroupOrder();
-			Integer h2 = Integer::Power2((r.BitCount()+1)/2);
-			Integer e = ((h2+params.ConvertElementToInteger(V)%h2)*s+u) % r;
-			Integer tt = h2 + params.ConvertElementToInteger(VV) % h2;
-
-			if (COFACTOR_OPTION::ToEnum() == NO_COFACTOR_MULTIPLICTION)
-			{
-				Element P = params.ExponentiateElement(WW, tt);
-				P = m_groupParameters.MultiplyElements(P, VV);
-				Element R[2];
-				const Integer e2[2] = {r, e};
-				params.SimultaneousExponentiate(R, P, e2, 2);
-				if (!params.IsIdentity(R[0]) || params.IsIdentity(R[1]))
-					return false;
-				params.EncodeElement(false, R[1], agreedValue);
-			}
-			else
-			{
-				const Integer &k = params.GetCofactor();
-				if (COFACTOR_OPTION::ToEnum() == COMPATIBLE_COFACTOR_MULTIPLICTION)
-					e = ModularArithmetic(r).Divide(e, k);
-				Element P = m_groupParameters.CascadeExponentiate(VV, k*e, WW, k*(e*tt%r));
-				if (params.IsIdentity(P))
-					return false;
-				params.EncodeElement(false, P, agreedValue);
-			}
-		}
-		catch (DL_BadElement &)
-		{
-			return false;
-		}
-		return true;
-	}
-
-private:
-	DL_GroupParameters<Element> & AccessAbstractGroupParameters() {return m_groupParameters;}
-	const DL_GroupParameters<Element> & GetAbstractGroupParameters() const {return m_groupParameters;}
-
-	GroupParameters m_groupParameters;
-};
-
-//! Menezes-Qu-Vanstone in GF(p) with key validation, AKA <a href="http://www.weidai.com/scan-mirror/ka.html#MQV">MQV</a>
-//! \sa MQV, HMQV_Domain, FHMQV_Domain, AuthenticatedKeyAgreementDomain
-typedef MQV_Domain<DL_GroupParameters_GFP_DefaultSafePrime> MQV;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/nbtheory.cpp b/src-cryptopp/nbtheory.cpp
deleted file mode 100644
index d7a4a15..0000000
--- a/src-cryptopp/nbtheory.cpp
+++ /dev/null
@@ -1,1125 +0,0 @@
-// nbtheory.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "nbtheory.h"
-#include "integer.h"
-#include "modarith.h"
-#include "algparam.h"
-#include "smartptr.h"
-#include "misc.h"
-
-#include <math.h>
-#include <vector>
-
-#ifdef _OPENMP
-# include <omp.h>
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-const word s_lastSmallPrime = 32719;
-
-struct NewPrimeTable
-{
-	std::vector<word16> * operator()() const
-	{
-		const unsigned int maxPrimeTableSize = 3511;
-
-		member_ptr<std::vector<word16> > pPrimeTable(new std::vector<word16>);
-		std::vector<word16> &primeTable = *pPrimeTable;
-		primeTable.reserve(maxPrimeTableSize);
-
-		primeTable.push_back(2);
-		unsigned int testEntriesEnd = 1;
-
-		for (unsigned int p=3; p<=s_lastSmallPrime; p+=2)
-		{
-			unsigned int j;
-			for (j=1; j<testEntriesEnd; j++)
-				if (p%primeTable[j] == 0)
-					break;
-			if (j == testEntriesEnd)
-			{
-				primeTable.push_back(word16(p));
-				testEntriesEnd = UnsignedMin(54U, primeTable.size());
-			}
-		}
-
-		return pPrimeTable.release();
-	}
-};
-
-const word16 * GetPrimeTable(unsigned int &size)
-{
-	const std::vector<word16> &primeTable = Singleton<std::vector<word16>, NewPrimeTable>().Ref();
-	size = (unsigned int)primeTable.size();
-	return &primeTable[0];
-}
-
-bool IsSmallPrime(const Integer &p)
-{
-	unsigned int primeTableSize;
-	const word16 * primeTable = GetPrimeTable(primeTableSize);
-
-	if (p.IsPositive() && p <= primeTable[primeTableSize-1])
-		return std::binary_search(primeTable, primeTable+primeTableSize, (word16)p.ConvertToLong());
-	else
-		return false;
-}
-
-bool TrialDivision(const Integer &p, unsigned bound)
-{
-	unsigned int primeTableSize;
-	const word16 * primeTable = GetPrimeTable(primeTableSize);
-
-	CRYPTOPP_ASSERT(primeTable[primeTableSize-1] >= bound);
-
-	unsigned int i;
-	for (i = 0; primeTable[i]<bound; i++)
-		if ((p % primeTable[i]) == 0)
-			return true;
-
-	if (bound == primeTable[i])
-		return (p % bound == 0);
-	else
-		return false;
-}
-
-bool SmallDivisorsTest(const Integer &p)
-{
-	unsigned int primeTableSize;
-	const word16 * primeTable = GetPrimeTable(primeTableSize);
-	return !TrialDivision(p, primeTable[primeTableSize-1]);
-}
-
-bool IsFermatProbablePrime(const Integer &n, const Integer &b)
-{
-	if (n <= 3)
-		return n==2 || n==3;
-
-	CRYPTOPP_ASSERT(n>3 && b>1 && b<n-1);
-	return a_exp_b_mod_c(b, n-1, n)==1;
-}
-
-bool IsStrongProbablePrime(const Integer &n, const Integer &b)
-{
-	if (n <= 3)
-		return n==2 || n==3;
-
-	CRYPTOPP_ASSERT(n>3 && b>1 && b<n-1);
-
-	if ((n.IsEven() && n!=2) || GCD(b, n) != 1)
-		return false;
-
-	Integer nminus1 = (n-1);
-	unsigned int a;
-
-	// calculate a = largest power of 2 that divides (n-1)
-	for (a=0; ; a++)
-		if (nminus1.GetBit(a))
-			break;
-	Integer m = nminus1>>a;
-
-	Integer z = a_exp_b_mod_c(b, m, n);
-	if (z==1 || z==nminus1)
-		return true;
-	for (unsigned j=1; j<a; j++)
-	{
-		z = z.Squared()%n;
-		if (z==nminus1)
-			return true;
-		if (z==1)
-			return false;
-	}
-	return false;
-}
-
-bool RabinMillerTest(RandomNumberGenerator &rng, const Integer &n, unsigned int rounds)
-{
-	if (n <= 3)
-		return n==2 || n==3;
-
-	CRYPTOPP_ASSERT(n>3);
-
-	Integer b;
-	for (unsigned int i=0; i<rounds; i++)
-	{
-		b.Randomize(rng, 2, n-2);
-		if (!IsStrongProbablePrime(n, b))
-			return false;
-	}
-	return true;
-}
-
-bool IsLucasProbablePrime(const Integer &n)
-{
-	if (n <= 1)
-		return false;
-
-	if (n.IsEven())
-		return n==2;
-
-	CRYPTOPP_ASSERT(n>2);
-
-	Integer b=3;
-	unsigned int i=0;
-	int j;
-
-	while ((j=Jacobi(b.Squared()-4, n)) == 1)
-	{
-		if (++i==64 && n.IsSquare())	// avoid infinite loop if n is a square
-			return false;
-		++b; ++b;
-	}
-
-	if (j==0)
-		return false;
-	else
-		return Lucas(n+1, b, n)==2;
-}
-
-bool IsStrongLucasProbablePrime(const Integer &n)
-{
-	if (n <= 1)
-		return false;
-
-	if (n.IsEven())
-		return n==2;
-
-	CRYPTOPP_ASSERT(n>2);
-
-	Integer b=3;
-	unsigned int i=0;
-	int j;
-
-	while ((j=Jacobi(b.Squared()-4, n)) == 1)
-	{
-		if (++i==64 && n.IsSquare())	// avoid infinite loop if n is a square
-			return false;
-		++b; ++b;
-	}
-
-	if (j==0)
-		return false;
-
-	Integer n1 = n+1;
-	unsigned int a;
-
-	// calculate a = largest power of 2 that divides n1
-	for (a=0; ; a++)
-		if (n1.GetBit(a))
-			break;
-	Integer m = n1>>a;
-
-	Integer z = Lucas(m, b, n);
-	if (z==2 || z==n-2)
-		return true;
-	for (i=1; i<a; i++)
-	{
-		z = (z.Squared()-2)%n;
-		if (z==n-2)
-			return true;
-		if (z==2)
-			return false;
-	}
-	return false;
-}
-
-struct NewLastSmallPrimeSquared
-{
-	Integer * operator()() const
-	{
-		return new Integer(Integer(s_lastSmallPrime).Squared());
-	}
-};
-
-bool IsPrime(const Integer &p)
-{
-	if (p <= s_lastSmallPrime)
-		return IsSmallPrime(p);
-	else if (p <= Singleton<Integer, NewLastSmallPrimeSquared>().Ref())
-		return SmallDivisorsTest(p);
-	else
-		return SmallDivisorsTest(p) && IsStrongProbablePrime(p, 3) && IsStrongLucasProbablePrime(p);
-}
-
-bool VerifyPrime(RandomNumberGenerator &rng, const Integer &p, unsigned int level)
-{
-	bool pass = IsPrime(p) && RabinMillerTest(rng, p, 1);
-	if (level >= 1)
-		pass = pass && RabinMillerTest(rng, p, 10);
-	return pass;
-}
-
-unsigned int PrimeSearchInterval(const Integer &max)
-{
-	return max.BitCount();
-}
-
-static inline bool FastProbablePrimeTest(const Integer &n)
-{
-	return IsStrongProbablePrime(n,2);
-}
-
-AlgorithmParameters MakeParametersForTwoPrimesOfEqualSize(unsigned int productBitLength)
-{
-	if (productBitLength < 16)
-		throw InvalidArgument("invalid bit length");
-
-	Integer minP, maxP;
-
-	if (productBitLength%2==0)
-	{
-		minP = Integer(182) << (productBitLength/2-8);
-		maxP = Integer::Power2(productBitLength/2)-1;
-	}
-	else
-	{
-		minP = Integer::Power2((productBitLength-1)/2);
-		maxP = Integer(181) << ((productBitLength+1)/2-8);
-	}
-
-	return MakeParameters("RandomNumberType", Integer::PRIME)("Min", minP)("Max", maxP);
-}
-
-class PrimeSieve
-{
-public:
-	// delta == 1 or -1 means double sieve with p = 2*q + delta
-	PrimeSieve(const Integer &first, const Integer &last, const Integer &step, signed int delta=0);
-	bool NextCandidate(Integer &c);
-
-	void DoSieve();
-	static void SieveSingle(std::vector<bool> &sieve, word16 p, const Integer &first, const Integer &step, word16 stepInv);
-
-	Integer m_first, m_last, m_step;
-	signed int m_delta;
-	word m_next;
-	std::vector<bool> m_sieve;
-};
-
-PrimeSieve::PrimeSieve(const Integer &first, const Integer &last, const Integer &step, signed int delta)
-	: m_first(first), m_last(last), m_step(step), m_delta(delta), m_next(0)
-{
-	DoSieve();
-}
-
-bool PrimeSieve::NextCandidate(Integer &c)
-{
-	bool safe = SafeConvert(std::find(m_sieve.begin()+m_next, m_sieve.end(), false) - m_sieve.begin(), m_next);
-	CRYPTOPP_UNUSED(safe); CRYPTOPP_ASSERT(safe);
-	if (m_next == m_sieve.size())
-	{
-		m_first += long(m_sieve.size())*m_step;
-		if (m_first > m_last)
-			return false;
-		else
-		{
-			m_next = 0;
-			DoSieve();
-			return NextCandidate(c);
-		}
-	}
-	else
-	{
-		c = m_first + long(m_next)*m_step;
-		++m_next;
-		return true;
-	}
-}
-
-void PrimeSieve::SieveSingle(std::vector<bool> &sieve, word16 p, const Integer &first, const Integer &step, word16 stepInv)
-{
-	if (stepInv)
-	{
-		size_t sieveSize = sieve.size();
-		size_t j = (word32(p-(first%p))*stepInv) % p;
-		// if the first multiple of p is p, skip it
-		if (first.WordCount() <= 1 && first + step*long(j) == p)
-			j += p;
-		for (; j < sieveSize; j += p)
-			sieve[j] = true;
-	}
-}
-
-void PrimeSieve::DoSieve()
-{
-	unsigned int primeTableSize;
-	const word16 * primeTable = GetPrimeTable(primeTableSize);
-
-	const unsigned int maxSieveSize = 32768;
-	unsigned int sieveSize = STDMIN(Integer(maxSieveSize), (m_last-m_first)/m_step+1).ConvertToLong();
-
-	m_sieve.clear();
-	m_sieve.resize(sieveSize, false);
-
-	if (m_delta == 0)
-	{
-		for (unsigned int i = 0; i < primeTableSize; ++i)
-			SieveSingle(m_sieve, primeTable[i], m_first, m_step, (word16)m_step.InverseMod(primeTable[i]));
-	}
-	else
-	{
-		CRYPTOPP_ASSERT(m_step%2==0);
-		Integer qFirst = (m_first-m_delta) >> 1;
-		Integer halfStep = m_step >> 1;
-		for (unsigned int i = 0; i < primeTableSize; ++i)
-		{
-			word16 p = primeTable[i];
-			word16 stepInv = (word16)m_step.InverseMod(p);
-			SieveSingle(m_sieve, p, m_first, m_step, stepInv);
-
-			word16 halfStepInv = 2*stepInv < p ? 2*stepInv : 2*stepInv-p;
-			SieveSingle(m_sieve, p, qFirst, halfStep, halfStepInv);
-		}
-	}
-}
-
-bool FirstPrime(Integer &p, const Integer &max, const Integer &equiv, const Integer &mod, const PrimeSelector *pSelector)
-{
-	CRYPTOPP_ASSERT(!equiv.IsNegative() && equiv < mod);
-
-	Integer gcd = GCD(equiv, mod);
-	if (gcd != Integer::One())
-	{
-		// the only possible prime p such that p%mod==equiv where GCD(mod,equiv)!=1 is GCD(mod,equiv)
-		if (p <= gcd && gcd <= max && IsPrime(gcd) && (!pSelector || pSelector->IsAcceptable(gcd)))
-		{
-			p = gcd;
-			return true;
-		}
-		else
-			return false;
-	}
-
-	unsigned int primeTableSize;
-	const word16 * primeTable = GetPrimeTable(primeTableSize);
-
-	if (p <= primeTable[primeTableSize-1])
-	{
-		const word16 *pItr;
-
-		--p;
-		if (p.IsPositive())
-			pItr = std::upper_bound(primeTable, primeTable+primeTableSize, (word)p.ConvertToLong());
-		else
-			pItr = primeTable;
-
-		while (pItr < primeTable+primeTableSize && !(*pItr%mod == equiv && (!pSelector || pSelector->IsAcceptable(*pItr))))
-			++pItr;
-
-		if (pItr < primeTable+primeTableSize)
-		{
-			p = *pItr;
-			return p <= max;
-		}
-
-		p = primeTable[primeTableSize-1]+1;
-	}
-
-	CRYPTOPP_ASSERT(p > primeTable[primeTableSize-1]);
-
-	if (mod.IsOdd())
-		return FirstPrime(p, max, CRT(equiv, mod, 1, 2, 1), mod<<1, pSelector);
-
-	p += (equiv-p)%mod;
-
-	if (p>max)
-		return false;
-
-	PrimeSieve sieve(p, max, mod);
-
-	while (sieve.NextCandidate(p))
-	{
-		if ((!pSelector || pSelector->IsAcceptable(p)) && FastProbablePrimeTest(p) && IsPrime(p))
-			return true;
-	}
-
-	return false;
-}
-
-// the following two functions are based on code and comments provided by Preda Mihailescu
-static bool ProvePrime(const Integer &p, const Integer &q)
-{
-	CRYPTOPP_ASSERT(p < q*q*q);
-	CRYPTOPP_ASSERT(p % q == 1);
-
-// this is the Quisquater test. Numbers p having passed the Lucas - Lehmer test
-// for q and verifying p < q^3 can only be built up of two factors, both = 1 mod q,
-// or be prime. The next two lines build the discriminant of a quadratic equation
-// which holds iff p is built up of two factors (excercise ... )
-
-	Integer r = (p-1)/q;
-	if (((r%q).Squared()-4*(r/q)).IsSquare())
-		return false;
-
-	unsigned int primeTableSize;
-	const word16 * primeTable = GetPrimeTable(primeTableSize);
-
-	CRYPTOPP_ASSERT(primeTableSize >= 50);
-	for (int i=0; i<50; i++)
-	{
-		Integer b = a_exp_b_mod_c(primeTable[i], r, p);
-		if (b != 1)
-			return a_exp_b_mod_c(b, q, p) == 1;
-	}
-	return false;
-}
-
-Integer MihailescuProvablePrime(RandomNumberGenerator &rng, unsigned int pbits)
-{
-	Integer p;
-	Integer minP = Integer::Power2(pbits-1);
-	Integer maxP = Integer::Power2(pbits) - 1;
-
-	if (maxP <= Integer(s_lastSmallPrime).Squared())
-	{
-		// Randomize() will generate a prime provable by trial division
-		p.Randomize(rng, minP, maxP, Integer::PRIME);
-		return p;
-	}
-
-	unsigned int qbits = (pbits+2)/3 + 1 + rng.GenerateWord32(0, pbits/36);
-	Integer q = MihailescuProvablePrime(rng, qbits);
-	Integer q2 = q<<1;
-
-	while (true)
-	{
-		// this initializes the sieve to search in the arithmetic
-		// progression p = p_0 + \lambda * q2 = p_0 + 2 * \lambda * q,
-		// with q the recursively generated prime above. We will be able
-		// to use Lucas tets for proving primality. A trick of Quisquater
-		// allows taking q > cubic_root(p) rather then square_root: this
-		// decreases the recursion.
-
-		p.Randomize(rng, minP, maxP, Integer::ANY, 1, q2);
-		PrimeSieve sieve(p, STDMIN(p+PrimeSearchInterval(maxP)*q2, maxP), q2);
-
-		while (sieve.NextCandidate(p))
-		{
-			if (FastProbablePrimeTest(p) && ProvePrime(p, q))
-				return p;
-		}
-	}
-
-	// not reached
-	return p;
-}
-
-Integer MaurerProvablePrime(RandomNumberGenerator &rng, unsigned int bits)
-{
-	const unsigned smallPrimeBound = 29, c_opt=10;
-	Integer p;
-
-	unsigned int primeTableSize;
-	const word16 * primeTable = GetPrimeTable(primeTableSize);
-
-	if (bits < smallPrimeBound)
-	{
-		do
-			p.Randomize(rng, Integer::Power2(bits-1), Integer::Power2(bits)-1, Integer::ANY, 1, 2);
-		while (TrialDivision(p, 1 << ((bits+1)/2)));
-	}
-	else
-	{
-		const unsigned margin = bits > 50 ? 20 : (bits-10)/2;
-		double relativeSize;
-		do
-			relativeSize = pow(2.0, double(rng.GenerateWord32())/0xffffffff - 1);
-		while (bits * relativeSize >= bits - margin);
-
-		Integer a,b;
-		Integer q = MaurerProvablePrime(rng, unsigned(bits*relativeSize));
-		Integer I = Integer::Power2(bits-2)/q;
-		Integer I2 = I << 1;
-		unsigned int trialDivisorBound = (unsigned int)STDMIN((unsigned long)primeTable[primeTableSize-1], (unsigned long)bits*bits/c_opt);
-		bool success = false;
-		while (!success)
-		{
-			p.Randomize(rng, I, I2, Integer::ANY);
-			p *= q; p <<= 1; ++p;
-			if (!TrialDivision(p, trialDivisorBound))
-			{
-				a.Randomize(rng, 2, p-1, Integer::ANY);
-				b = a_exp_b_mod_c(a, (p-1)/q, p);
-				success = (GCD(b-1, p) == 1) && (a_exp_b_mod_c(b, q, p) == 1);
-			}
-		}
-	}
-	return p;
-}
-
-Integer CRT(const Integer &xp, const Integer &p, const Integer &xq, const Integer &q, const Integer &u)
-{
-	// isn't operator overloading great?
-	return p * (u * (xq-xp) % q) + xp;
-/*
-	Integer t1 = xq-xp;
-	cout << hex << t1 << endl;
-	Integer t2 = u * t1;
-	cout << hex << t2 << endl;
-	Integer t3 = t2 % q;
-	cout << hex << t3 << endl;
-	Integer t4 = p * t3;
-	cout << hex << t4 << endl;
-	Integer t5 = t4 + xp;
-	cout << hex << t5 << endl;
-	return t5;
-*/
-}
-
-Integer ModularSquareRoot(const Integer &a, const Integer &p)
-{
-	if (p%4 == 3)
-		return a_exp_b_mod_c(a, (p+1)/4, p);
-
-	Integer q=p-1;
-	unsigned int r=0;
-	while (q.IsEven())
-	{
-		r++;
-		q >>= 1;
-	}
-
-	Integer n=2;
-	while (Jacobi(n, p) != -1)
-		++n;
-
-	Integer y = a_exp_b_mod_c(n, q, p);
-	Integer x = a_exp_b_mod_c(a, (q-1)/2, p);
-	Integer b = (x.Squared()%p)*a%p;
-	x = a*x%p;
-	Integer tempb, t;
-
-	while (b != 1)
-	{
-		unsigned m=0;
-		tempb = b;
-		do
-		{
-			m++;
-			b = b.Squared()%p;
-			if (m==r)
-				return Integer::Zero();
-		}
-		while (b != 1);
-
-		t = y;
-		for (unsigned i=0; i<r-m-1; i++)
-			t = t.Squared()%p;
-		y = t.Squared()%p;
-		r = m;
-		x = x*t%p;
-		b = tempb*y%p;
-	}
-
-	CRYPTOPP_ASSERT(x.Squared()%p == a);
-	return x;
-}
-
-bool SolveModularQuadraticEquation(Integer &r1, Integer &r2, const Integer &a, const Integer &b, const Integer &c, const Integer &p)
-{
-	Integer D = (b.Squared() - 4*a*c) % p;
-	switch (Jacobi(D, p))
-	{
-	default:
-		CRYPTOPP_ASSERT(false);	// not reached
-		return false;
-	case -1:
-		return false;
-	case 0:
-		r1 = r2 = (-b*(a+a).InverseMod(p)) % p;
-		CRYPTOPP_ASSERT(((r1.Squared()*a + r1*b + c) % p).IsZero());
-		return true;
-	case 1:
-		Integer s = ModularSquareRoot(D, p);
-		Integer t = (a+a).InverseMod(p);
-		r1 = (s-b)*t % p;
-		r2 = (-s-b)*t % p;
-		CRYPTOPP_ASSERT(((r1.Squared()*a + r1*b + c) % p).IsZero());
-		CRYPTOPP_ASSERT(((r2.Squared()*a + r2*b + c) % p).IsZero());
-		return true;
-	}
-}
-
-Integer ModularRoot(const Integer &a, const Integer &dp, const Integer &dq,
-					const Integer &p, const Integer &q, const Integer &u)
-{
-	Integer p2, q2;
-	#pragma omp parallel
-		#pragma omp sections
-		{
-			#pragma omp section
-				p2 = ModularExponentiation((a % p), dp, p);
-			#pragma omp section
-				q2 = ModularExponentiation((a % q), dq, q);
-		}
-	return CRT(p2, p, q2, q, u);
-}
-
-Integer ModularRoot(const Integer &a, const Integer &e,
-					const Integer &p, const Integer &q)
-{
-	Integer dp = EuclideanMultiplicativeInverse(e, p-1);
-	Integer dq = EuclideanMultiplicativeInverse(e, q-1);
-	Integer u = EuclideanMultiplicativeInverse(p, q);
-	CRYPTOPP_ASSERT(!!dp && !!dq && !!u);
-	return ModularRoot(a, dp, dq, p, q, u);
-}
-
-/*
-Integer GCDI(const Integer &x, const Integer &y)
-{
-	Integer a=x, b=y;
-	unsigned k=0;
-
-	CRYPTOPP_ASSERT(!!a && !!b);
-
-	while (a[0]==0 && b[0]==0)
-	{
-		a >>= 1;
-		b >>= 1;
-		k++;
-	}
-
-	while (a[0]==0)
-		a >>= 1;
-
-	while (b[0]==0)
-		b >>= 1;
-
-	while (1)
-	{
-		switch (a.Compare(b))
-		{
-			case -1:
-				b -= a;
-				while (b[0]==0)
-					b >>= 1;
-				break;
-
-			case 0:
-				return (a <<= k);
-
-			case 1:
-				a -= b;
-				while (a[0]==0)
-					a >>= 1;
-				break;
-
-			default:
-				CRYPTOPP_ASSERT(false);
-		}
-	}
-}
-
-Integer EuclideanMultiplicativeInverse(const Integer &a, const Integer &b)
-{
-	CRYPTOPP_ASSERT(b.Positive());
-
-	if (a.Negative())
-		return EuclideanMultiplicativeInverse(a%b, b);
-
-	if (b[0]==0)
-	{
-		if (!b || a[0]==0)
-			return Integer::Zero();       // no inverse
-		if (a==1)
-			return 1;
-		Integer u = EuclideanMultiplicativeInverse(b, a);
-		if (!u)
-			return Integer::Zero();       // no inverse
-		else
-			return (b*(a-u)+1)/a;
-	}
-
-	Integer u=1, d=a, v1=b, v3=b, t1, t3, b2=(b+1)>>1;
-
-	if (a[0])
-	{
-		t1 = Integer::Zero();
-		t3 = -b;
-	}
-	else
-	{
-		t1 = b2;
-		t3 = a>>1;
-	}
-
-	while (!!t3)
-	{
-		while (t3[0]==0)
-		{
-			t3 >>= 1;
-			if (t1[0]==0)
-				t1 >>= 1;
-			else
-			{
-				t1 >>= 1;
-				t1 += b2;
-			}
-		}
-		if (t3.Positive())
-		{
-			u = t1;
-			d = t3;
-		}
-		else
-		{
-			v1 = b-t1;
-			v3 = -t3;
-		}
-		t1 = u-v1;
-		t3 = d-v3;
-		if (t1.Negative())
-			t1 += b;
-	}
-	if (d==1)
-		return u;
-	else
-		return Integer::Zero();   // no inverse
-}
-*/
-
-int Jacobi(const Integer &aIn, const Integer &bIn)
-{
-	CRYPTOPP_ASSERT(bIn.IsOdd());
-
-	Integer b = bIn, a = aIn%bIn;
-	int result = 1;
-
-	while (!!a)
-	{
-		unsigned i=0;
-		while (a.GetBit(i)==0)
-			i++;
-		a>>=i;
-
-		if (i%2==1 && (b%8==3 || b%8==5))
-			result = -result;
-
-		if (a%4==3 && b%4==3)
-			result = -result;
-
-		std::swap(a, b);
-		a %= b;
-	}
-
-	return (b==1) ? result : 0;
-}
-
-Integer Lucas(const Integer &e, const Integer &pIn, const Integer &n)
-{
-	unsigned i = e.BitCount();
-	if (i==0)
-		return Integer::Two();
-
-	MontgomeryRepresentation m(n);
-	Integer p=m.ConvertIn(pIn%n), two=m.ConvertIn(Integer::Two());
-	Integer v=p, v1=m.Subtract(m.Square(p), two);
-
-	i--;
-	while (i--)
-	{
-		if (e.GetBit(i))
-		{
-			// v = (v*v1 - p) % m;
-			v = m.Subtract(m.Multiply(v,v1), p);
-			// v1 = (v1*v1 - 2) % m;
-			v1 = m.Subtract(m.Square(v1), two);
-		}
-		else
-		{
-			// v1 = (v*v1 - p) % m;
-			v1 = m.Subtract(m.Multiply(v,v1), p);
-			// v = (v*v - 2) % m;
-			v = m.Subtract(m.Square(v), two);
-		}
-	}
-	return m.ConvertOut(v);
-}
-
-// This is Peter Montgomery's unpublished Lucas sequence evalutation algorithm.
-// The total number of multiplies and squares used is less than the binary
-// algorithm (see above).  Unfortunately I can't get it to run as fast as
-// the binary algorithm because of the extra overhead.
-/*
-Integer Lucas(const Integer &n, const Integer &P, const Integer &modulus)
-{
-	if (!n)
-		return 2;
-
-#define f(A, B, C)	m.Subtract(m.Multiply(A, B), C)
-#define X2(A) m.Subtract(m.Square(A), two)
-#define X3(A) m.Multiply(A, m.Subtract(m.Square(A), three))
-
-	MontgomeryRepresentation m(modulus);
-	Integer two=m.ConvertIn(2), three=m.ConvertIn(3);
-	Integer A=m.ConvertIn(P), B, C, p, d=n, e, r, t, T, U;
-
-	while (d!=1)
-	{
-		p = d;
-		unsigned int b = WORD_BITS * p.WordCount();
-		Integer alpha = (Integer(5)<<(2*b-2)).SquareRoot() - Integer::Power2(b-1);
-		r = (p*alpha)>>b;
-		e = d-r;
-		B = A;
-		C = two;
-		d = r;
-
-		while (d!=e)
-		{
-			if (d<e)
-			{
-				swap(d, e);
-				swap(A, B);
-			}
-
-			unsigned int dm2 = d[0], em2 = e[0];
-			unsigned int dm3 = d%3, em3 = e%3;
-
-//			if ((dm6+em6)%3 == 0 && d <= e + (e>>2))
-			if ((dm3+em3==0 || dm3+em3==3) && (t = e, t >>= 2, t += e, d <= t))
-			{
-				// #1
-//				t = (d+d-e)/3;
-//				t = d; t += d; t -= e; t /= 3;
-//				e = (e+e-d)/3;
-//				e += e; e -= d; e /= 3;
-//				d = t;
-
-//				t = (d+e)/3
-				t = d; t += e; t /= 3;
-				e -= t;
-				d -= t;
-
-				T = f(A, B, C);
-				U = f(T, A, B);
-				B = f(T, B, A);
-				A = U;
-				continue;
-			}
-
-//			if (dm6 == em6 && d <= e + (e>>2))
-			if (dm3 == em3 && dm2 == em2 && (t = e, t >>= 2, t += e, d <= t))
-			{
-				// #2
-//				d = (d-e)>>1;
-				d -= e; d >>= 1;
-				B = f(A, B, C);
-				A = X2(A);
-				continue;
-			}
-
-//			if (d <= (e<<2))
-			if (d <= (t = e, t <<= 2))
-			{
-				// #3
-				d -= e;
-				C = f(A, B, C);
-				swap(B, C);
-				continue;
-			}
-
-			if (dm2 == em2)
-			{
-				// #4
-//				d = (d-e)>>1;
-				d -= e; d >>= 1;
-				B = f(A, B, C);
-				A = X2(A);
-				continue;
-			}
-
-			if (dm2 == 0)
-			{
-				// #5
-				d >>= 1;
-				C = f(A, C, B);
-				A = X2(A);
-				continue;
-			}
-
-			if (dm3 == 0)
-			{
-				// #6
-//				d = d/3 - e;
-				d /= 3; d -= e;
-				T = X2(A);
-				C = f(T, f(A, B, C), C);
-				swap(B, C);
-				A = f(T, A, A);
-				continue;
-			}
-
-			if (dm3+em3==0 || dm3+em3==3)
-			{
-				// #7
-//				d = (d-e-e)/3;
-				d -= e; d -= e; d /= 3;
-				T = f(A, B, C);
-				B = f(T, A, B);
-				A = X3(A);
-				continue;
-			}
-
-			if (dm3 == em3)
-			{
-				// #8
-//				d = (d-e)/3;
-				d -= e; d /= 3;
-				T = f(A, B, C);
-				C = f(A, C, B);
-				B = T;
-				A = X3(A);
-				continue;
-			}
-
-			CRYPTOPP_ASSERT(em2 == 0);
-			// #9
-			e >>= 1;
-			C = f(C, B, A);
-			B = X2(B);
-		}
-
-		A = f(A, B, C);
-	}
-
-#undef f
-#undef X2
-#undef X3
-
-	return m.ConvertOut(A);
-}
-*/
-
-Integer InverseLucas(const Integer &e, const Integer &m, const Integer &p, const Integer &q, const Integer &u)
-{
-	Integer d = (m*m-4);
-	Integer p2, q2;
-	#pragma omp parallel
-		#pragma omp sections
-		{
-			#pragma omp section
-			{
-				p2 = p-Jacobi(d,p);
-				p2 = Lucas(EuclideanMultiplicativeInverse(e,p2), m, p);
-			}
-			#pragma omp section
-			{
-				q2 = q-Jacobi(d,q);
-				q2 = Lucas(EuclideanMultiplicativeInverse(e,q2), m, q);
-			}
-		}
-	return CRT(p2, p, q2, q, u);
-}
-
-unsigned int FactoringWorkFactor(unsigned int n)
-{
-	// extrapolated from the table in Odlyzko's "The Future of Integer Factorization"
-	// updated to reflect the factoring of RSA-130
-	if (n<5) return 0;
-	else return (unsigned int)(2.4 * pow((double)n, 1.0/3.0) * pow(log(double(n)), 2.0/3.0) - 5);
-}
-
-unsigned int DiscreteLogWorkFactor(unsigned int n)
-{
-	// assuming discrete log takes about the same time as factoring
-	if (n<5) return 0;
-	else return (unsigned int)(2.4 * pow((double)n, 1.0/3.0) * pow(log(double(n)), 2.0/3.0) - 5);
-}
-
-// ********************************************************
-
-void PrimeAndGenerator::Generate(signed int delta, RandomNumberGenerator &rng, unsigned int pbits, unsigned int qbits)
-{
-	// no prime exists for delta = -1, qbits = 4, and pbits = 5
-	CRYPTOPP_ASSERT(qbits > 4);
-	CRYPTOPP_ASSERT(pbits > qbits);
-
-	if (qbits+1 == pbits)
-	{
-		Integer minP = Integer::Power2(pbits-1);
-		Integer maxP = Integer::Power2(pbits) - 1;
-		bool success = false;
-
-		while (!success)
-		{
-			p.Randomize(rng, minP, maxP, Integer::ANY, 6+5*delta, 12);
-			PrimeSieve sieve(p, STDMIN(p+PrimeSearchInterval(maxP)*12, maxP), 12, delta);
-
-			while (sieve.NextCandidate(p))
-			{
-				CRYPTOPP_ASSERT(IsSmallPrime(p) || SmallDivisorsTest(p));
-				q = (p-delta) >> 1;
-				CRYPTOPP_ASSERT(IsSmallPrime(q) || SmallDivisorsTest(q));
-				if (FastProbablePrimeTest(q) && FastProbablePrimeTest(p) && IsPrime(q) && IsPrime(p))
-				{
-					success = true;
-					break;
-				}
-			}
-		}
-
-		if (delta == 1)
-		{
-			// find g such that g is a quadratic residue mod p, then g has order q
-			// g=4 always works, but this way we get the smallest quadratic residue (other than 1)
-			for (g=2; Jacobi(g, p) != 1; ++g) {}
-			// contributed by Walt Tuvell: g should be the following according to the Law of Quadratic Reciprocity
-			CRYPTOPP_ASSERT((p%8==1 || p%8==7) ? g==2 : (p%12==1 || p%12==11) ? g==3 : g==4);
-		}
-		else
-		{
-			CRYPTOPP_ASSERT(delta == -1);
-			// find g such that g*g-4 is a quadratic non-residue,
-			// and such that g has order q
-			for (g=3; ; ++g)
-				if (Jacobi(g*g-4, p)==-1 && Lucas(q, g, p)==2)
-					break;
-		}
-	}
-	else
-	{
-		Integer minQ = Integer::Power2(qbits-1);
-		Integer maxQ = Integer::Power2(qbits) - 1;
-		Integer minP = Integer::Power2(pbits-1);
-		Integer maxP = Integer::Power2(pbits) - 1;
-
-		do
-		{
-			q.Randomize(rng, minQ, maxQ, Integer::PRIME);
-		} while (!p.Randomize(rng, minP, maxP, Integer::PRIME, delta%q, q));
-
-		// find a random g of order q
-		if (delta==1)
-		{
-			do
-			{
-				Integer h(rng, 2, p-2, Integer::ANY);
-				g = a_exp_b_mod_c(h, (p-1)/q, p);
-			} while (g <= 1);
-			CRYPTOPP_ASSERT(a_exp_b_mod_c(g, q, p)==1);
-		}
-		else
-		{
-			CRYPTOPP_ASSERT(delta==-1);
-			do
-			{
-				Integer h(rng, 3, p-1, Integer::ANY);
-				if (Jacobi(h*h-4, p)==1)
-					continue;
-				g = Lucas((p+1)/q, h, p);
-			} while (g <= 2);
-			CRYPTOPP_ASSERT(Lucas(q, g, p) == 2);
-		}
-	}
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/nbtheory.h b/src-cryptopp/nbtheory.h
deleted file mode 100644
index c32e2ed..0000000
--- a/src-cryptopp/nbtheory.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// nbtheory.h - written and placed in the public domain by Wei Dai
-
-//! \file nbtheory.h
-//! \brief Classes and functions  for number theoretic operations
-
-#ifndef CRYPTOPP_NBTHEORY_H
-#define CRYPTOPP_NBTHEORY_H
-
-#include "cryptlib.h"
-#include "integer.h"
-#include "algparam.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// obtain pointer to small prime table and get its size
-CRYPTOPP_DLL const word16 * CRYPTOPP_API GetPrimeTable(unsigned int &size);
-
-// ************ primality testing ****************
-
-//! \brief Generates a provable prime
-//! \param rng a RandomNumberGenerator to produce keying material
-//! \param bits the number of bits in the prime number
-//! \returns Integer() meeting Maurer's tests for primality
-CRYPTOPP_DLL Integer CRYPTOPP_API MaurerProvablePrime(RandomNumberGenerator &rng, unsigned int bits);
-
-//! \brief Generates a provable prime
-//! \param rng a RandomNumberGenerator to produce keying material
-//! \param bits the number of bits in the prime number
-//! \returns Integer() meeting Mihailescu's tests for primality
-//! \details Mihailescu's methods performs a search using algorithmic progressions.
-CRYPTOPP_DLL Integer CRYPTOPP_API MihailescuProvablePrime(RandomNumberGenerator &rng, unsigned int bits);
-
-//! \brief Tests whether a number is a small prime
-//! \param p a candidate prime to test
-//! \returns true if p is a small prime, false otherwise
-//! \details Internally, the library maintains a table fo the first 32719 prime numbers
-//!   in sorted order. IsSmallPrime() searches the table and returns true if p is
-//!   in the table.
-CRYPTOPP_DLL bool CRYPTOPP_API IsSmallPrime(const Integer &p);
-
-//!
-//! \returns true if p is divisible by some prime less than bound.
-//! \details TrialDivision() true if p is divisible by some prime less than bound. bound not be
-//!   greater than the largest entry in the prime table, which is 32719.
-CRYPTOPP_DLL bool CRYPTOPP_API TrialDivision(const Integer &p, unsigned bound);
-
-// returns true if p is NOT divisible by small primes
-CRYPTOPP_DLL bool CRYPTOPP_API SmallDivisorsTest(const Integer &p);
-
-// These is no reason to use these two, use the ones below instead
-CRYPTOPP_DLL bool CRYPTOPP_API IsFermatProbablePrime(const Integer &n, const Integer &b);
-CRYPTOPP_DLL bool CRYPTOPP_API IsLucasProbablePrime(const Integer &n);
-
-CRYPTOPP_DLL bool CRYPTOPP_API IsStrongProbablePrime(const Integer &n, const Integer &b);
-CRYPTOPP_DLL bool CRYPTOPP_API IsStrongLucasProbablePrime(const Integer &n);
-
-// Rabin-Miller primality test, i.e. repeating the strong probable prime test
-// for several rounds with random bases
-CRYPTOPP_DLL bool CRYPTOPP_API RabinMillerTest(RandomNumberGenerator &rng, const Integer &w, unsigned int rounds);
-
-//! \brief Verifies a prime number
-//! \param p a candidate prime to test
-//! \returns true if p is a probable prime, false otherwise
-//! \details IsPrime() is suitable for testing candidate primes when creating them. Internally,
-//!   IsPrime() utilizes SmallDivisorsTest(), IsStrongProbablePrime() and IsStrongLucasProbablePrime().
-CRYPTOPP_DLL bool CRYPTOPP_API IsPrime(const Integer &p);
-
-//! \brief Verifies a prime number
-//! \param rng a RandomNumberGenerator for randomized testing
-//! \param p a candidate prime to test
-//! \param level the level of thoroughness of testing
-//! \returns true if p is a strong probable prime, false otherwise
-//! \details VerifyPrime() is suitable for testing candidate primes created by others. Internally,
-//!   VerifyPrime() utilizes IsPrime() and one-round RabinMillerTest(). If the candiate passes and
-//!   level is greater than 1, then 10 round RabinMillerTest() primality testing is performed.
-CRYPTOPP_DLL bool CRYPTOPP_API VerifyPrime(RandomNumberGenerator &rng, const Integer &p, unsigned int level = 1);
-
-//! \class PrimeSelector
-//! \brief Application callback to signal suitability of a cabdidate prime
-class CRYPTOPP_DLL PrimeSelector
-{
-public:
-	const PrimeSelector *GetSelectorPointer() const {return this;}
-	virtual bool IsAcceptable(const Integer &candidate) const =0;
-};
-
-//! \brief Finds a random prime of special form
-//! \param p an Integer reference to receive the prime
-//! \param max the maximum value
-//! \param equiv the equivalence class based on the parameter mod
-//! \param mod the modulus used to reduce the equivalence class
-//! \param pSelector pointer to a PrimeSelector function for the application to signal suitability
-//! \returns true if and only if FirstPrime() finds a prime and returns the prime through p. If FirstPrime()
-//!   returns false, then no such prime exists and the value of p is undefined
-//! \details FirstPrime() uses a fast sieve to find the first probable prime
-//!   in <tt>{x | p<=x<=max and x%mod==equiv}</tt>
-CRYPTOPP_DLL bool CRYPTOPP_API FirstPrime(Integer &p, const Integer &max, const Integer &equiv, const Integer &mod, const PrimeSelector *pSelector);
-
-CRYPTOPP_DLL unsigned int CRYPTOPP_API PrimeSearchInterval(const Integer &max);
-
-CRYPTOPP_DLL AlgorithmParameters CRYPTOPP_API MakeParametersForTwoPrimesOfEqualSize(unsigned int productBitLength);
-
-// ********** other number theoretic functions ************
-
-inline Integer GCD(const Integer &a, const Integer &b)
-	{return Integer::Gcd(a,b);}
-inline bool RelativelyPrime(const Integer &a, const Integer &b)
-	{return Integer::Gcd(a,b) == Integer::One();}
-inline Integer LCM(const Integer &a, const Integer &b)
-	{return a/Integer::Gcd(a,b)*b;}
-inline Integer EuclideanMultiplicativeInverse(const Integer &a, const Integer &b)
-	{return a.InverseMod(b);}
-
-// use Chinese Remainder Theorem to calculate x given x mod p and x mod q, and u = inverse of p mod q
-CRYPTOPP_DLL Integer CRYPTOPP_API CRT(const Integer &xp, const Integer &p, const Integer &xq, const Integer &q, const Integer &u);
-
-// if b is prime, then Jacobi(a, b) returns 0 if a%b==0, 1 if a is quadratic residue mod b, -1 otherwise
-// check a number theory book for what Jacobi symbol means when b is not prime
-CRYPTOPP_DLL int CRYPTOPP_API Jacobi(const Integer &a, const Integer &b);
-
-// calculates the Lucas function V_e(p, 1) mod n
-CRYPTOPP_DLL Integer CRYPTOPP_API Lucas(const Integer &e, const Integer &p, const Integer &n);
-// calculates x such that m==Lucas(e, x, p*q), p q primes, u=inverse of p mod q
-CRYPTOPP_DLL Integer CRYPTOPP_API InverseLucas(const Integer &e, const Integer &m, const Integer &p, const Integer &q, const Integer &u);
-
-inline Integer ModularExponentiation(const Integer &a, const Integer &e, const Integer &m)
-	{return a_exp_b_mod_c(a, e, m);}
-// returns x such that x*x%p == a, p prime
-CRYPTOPP_DLL Integer CRYPTOPP_API ModularSquareRoot(const Integer &a, const Integer &p);
-// returns x such that a==ModularExponentiation(x, e, p*q), p q primes,
-// and e relatively prime to (p-1)*(q-1)
-// dp=d%(p-1), dq=d%(q-1), (d is inverse of e mod (p-1)*(q-1))
-// and u=inverse of p mod q
-CRYPTOPP_DLL Integer CRYPTOPP_API ModularRoot(const Integer &a, const Integer &dp, const Integer &dq, const Integer &p, const Integer &q, const Integer &u);
-
-// find r1 and r2 such that ax^2 + bx + c == 0 (mod p) for x in {r1, r2}, p prime
-// returns true if solutions exist
-CRYPTOPP_DLL bool CRYPTOPP_API SolveModularQuadraticEquation(Integer &r1, Integer &r2, const Integer &a, const Integer &b, const Integer &c, const Integer &p);
-
-// returns log base 2 of estimated number of operations to calculate discrete log or factor a number
-CRYPTOPP_DLL unsigned int CRYPTOPP_API DiscreteLogWorkFactor(unsigned int bitlength);
-CRYPTOPP_DLL unsigned int CRYPTOPP_API FactoringWorkFactor(unsigned int bitlength);
-
-// ********************************************************
-
-//! generator of prime numbers of special forms
-class CRYPTOPP_DLL PrimeAndGenerator
-{
-public:
-	PrimeAndGenerator() {}
-	// generate a random prime p of the form 2*q+delta, where delta is 1 or -1 and q is also prime
-	// Precondition: pbits > 5
-	// warning: this is slow, because primes of this form are harder to find
-	PrimeAndGenerator(signed int delta, RandomNumberGenerator &rng, unsigned int pbits)
-		{Generate(delta, rng, pbits, pbits-1);}
-	// generate a random prime p of the form 2*r*q+delta, where q is also prime
-	// Precondition: qbits > 4 && pbits > qbits
-	PrimeAndGenerator(signed int delta, RandomNumberGenerator &rng, unsigned int pbits, unsigned qbits)
-		{Generate(delta, rng, pbits, qbits);}
-
-	void Generate(signed int delta, RandomNumberGenerator &rng, unsigned int pbits, unsigned qbits);
-
-	const Integer& Prime() const {return p;}
-	const Integer& SubPrime() const {return q;}
-	const Integer& Generator() const {return g;}
-
-private:
-	Integer p, q, g;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/oaep.cpp b/src-cryptopp/oaep.cpp
deleted file mode 100644
index d2be610..0000000
--- a/src-cryptopp/oaep.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// oaep.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "oaep.h"
-#include "stdcpp.h"
-#include "smartptr.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// ********************************************************
-
-size_t OAEP_Base::MaxUnpaddedLength(size_t paddedLength) const
-{
-	return SaturatingSubtract(paddedLength/8, 1+2*DigestSize());
-}
-
-void OAEP_Base::Pad(RandomNumberGenerator &rng, const byte *input, size_t inputLength, byte *oaepBlock, size_t oaepBlockLen, const NameValuePairs &parameters) const
-{
-	CRYPTOPP_ASSERT (inputLength <= MaxUnpaddedLength(oaepBlockLen));
-
-	// convert from bit length to byte length
-	if (oaepBlockLen % 8 != 0)
-	{
-		oaepBlock[0] = 0;
-		oaepBlock++;
-	}
-	oaepBlockLen /= 8;
-
-	member_ptr<HashTransformation> pHash(NewHash());
-	const size_t hLen = pHash->DigestSize();
-	const size_t seedLen = hLen, dbLen = oaepBlockLen-seedLen;
-	byte *const maskedSeed = oaepBlock;
-	byte *const maskedDB = oaepBlock+seedLen;
-
-	ConstByteArrayParameter encodingParameters;
-	parameters.GetValue(Name::EncodingParameters(), encodingParameters);
-
-	// DB = pHash || 00 ... || 01 || M
-	pHash->CalculateDigest(maskedDB, encodingParameters.begin(), encodingParameters.size());
-	memset(maskedDB+hLen, 0, dbLen-hLen-inputLength-1);
-	maskedDB[dbLen-inputLength-1] = 0x01;
-	memcpy(maskedDB+dbLen-inputLength, input, inputLength);
-
-	rng.GenerateBlock(maskedSeed, seedLen);
-	member_ptr<MaskGeneratingFunction> pMGF(NewMGF());
-	pMGF->GenerateAndMask(*pHash, maskedDB, dbLen, maskedSeed, seedLen);
-	pMGF->GenerateAndMask(*pHash, maskedSeed, seedLen, maskedDB, dbLen);
-}
-
-DecodingResult OAEP_Base::Unpad(const byte *oaepBlock, size_t oaepBlockLen, byte *output, const NameValuePairs &parameters) const
-{
-	bool invalid = false;
-
-	// convert from bit length to byte length
-	if (oaepBlockLen % 8 != 0)
-	{
-		invalid = (oaepBlock[0] != 0) || invalid;
-		oaepBlock++;
-	}
-	oaepBlockLen /= 8;
-
-	member_ptr<HashTransformation> pHash(NewHash());
-	const size_t hLen = pHash->DigestSize();
-	const size_t seedLen = hLen, dbLen = oaepBlockLen-seedLen;
-
-	invalid = (oaepBlockLen < 2*hLen+1) || invalid;
-
-	SecByteBlock t(oaepBlock, oaepBlockLen);
-	byte *const maskedSeed = t;
-	byte *const maskedDB = t+seedLen;
-
-	member_ptr<MaskGeneratingFunction> pMGF(NewMGF());
-	pMGF->GenerateAndMask(*pHash, maskedSeed, seedLen, maskedDB, dbLen);
-	pMGF->GenerateAndMask(*pHash, maskedDB, dbLen, maskedSeed, seedLen);
-
-	ConstByteArrayParameter encodingParameters;
-	parameters.GetValue(Name::EncodingParameters(), encodingParameters);
-
-	// DB = pHash' || 00 ... || 01 || M
-	byte *M = std::find(maskedDB+hLen, maskedDB+dbLen, 0x01);
-	invalid = (M == maskedDB+dbLen) || invalid;
-	invalid = (std::find_if(maskedDB+hLen, M, std::bind2nd(std::not_equal_to<byte>(), byte(0))) != M) || invalid;
-	invalid = !pHash->VerifyDigest(maskedDB, encodingParameters.begin(), encodingParameters.size()) || invalid;
-
-	if (invalid)
-		return DecodingResult();
-
-	M++;
-	memcpy(output, M, maskedDB+dbLen-M);
-	return DecodingResult(maskedDB+dbLen-M);
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/oaep.h b/src-cryptopp/oaep.h
deleted file mode 100644
index 732f54d..0000000
--- a/src-cryptopp/oaep.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef CRYPTOPP_OAEP_H
-#define CRYPTOPP_OAEP_H
-
-#include "cryptlib.h"
-#include "pubkey.h"
-#include "sha.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! _
-class CRYPTOPP_DLL OAEP_Base : public PK_EncryptionMessageEncodingMethod
-{
-public:
-	bool ParameterSupported(const char *name) const {return strcmp(name, Name::EncodingParameters()) == 0;}
-	size_t MaxUnpaddedLength(size_t paddedLength) const;
-	void Pad(RandomNumberGenerator &rng, const byte *raw, size_t inputLength, byte *padded, size_t paddedLength, const NameValuePairs &parameters) const;
-	DecodingResult Unpad(const byte *padded, size_t paddedLength, byte *raw, const NameValuePairs &parameters) const;
-
-protected:
-	virtual unsigned int DigestSize() const =0;
-	virtual HashTransformation * NewHash() const =0;
-	virtual MaskGeneratingFunction * NewMGF() const =0;
-};
-
-//! <a href="http://www.weidai.com/scan-mirror/ca.html#cem_OAEP-MGF1">EME-OAEP</a>, for use with classes derived from TF_ES
-template <class H, class MGF=P1363_MGF1>
-class OAEP : public OAEP_Base, public EncryptionStandard
-{
-public:
-	static std::string CRYPTOPP_API StaticAlgorithmName() {return std::string("OAEP-") + MGF::StaticAlgorithmName() + "(" + H::StaticAlgorithmName() + ")";}
-	typedef OAEP<H, MGF> EncryptionMessageEncodingMethod;
-
-protected:
-	unsigned int DigestSize() const {return H::DIGESTSIZE;}
-	HashTransformation * NewHash() const {return new H;}
-	MaskGeneratingFunction * NewMGF() const {return new MGF;}
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS OAEP<SHA>;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/oids.h b/src-cryptopp/oids.h
deleted file mode 100644
index ddc1a49..0000000
--- a/src-cryptopp/oids.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// oids.h - written and placed in the public domain by Wei Dai
-
-//! \file oids.h
-//! \brief ASN.1 object identifiers for algorthms and schemes
-
-#ifndef CRYPTOPP_OIDS_H
-#define CRYPTOPP_OIDS_H
-
-#include "asn.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-NAMESPACE_BEGIN(ASN1)
-
-#define DEFINE_OID(value, name)	inline OID name() {return value;}
-
-DEFINE_OID(1, iso)
-	DEFINE_OID(iso()+2, member_body)
-		DEFINE_OID(member_body()+840, iso_us)
-			DEFINE_OID(iso_us()+10040, ansi_x9_57)
-				DEFINE_OID(ansi_x9_57()+4+1, id_dsa)
-			DEFINE_OID(iso_us()+10045, ansi_x9_62)
-				DEFINE_OID(ansi_x9_62()+1, id_fieldType)
-					DEFINE_OID(id_fieldType()+1, prime_field)
-					DEFINE_OID(id_fieldType()+2, characteristic_two_field)
-						DEFINE_OID(characteristic_two_field()+3, id_characteristic_two_basis)
-							DEFINE_OID(id_characteristic_two_basis()+1, gnBasis)
-							DEFINE_OID(id_characteristic_two_basis()+2, tpBasis)
-							DEFINE_OID(id_characteristic_two_basis()+3, ppBasis)
-				DEFINE_OID(ansi_x9_62()+2, id_publicKeyType)
-					DEFINE_OID(id_publicKeyType()+1, id_ecPublicKey)
-				DEFINE_OID(ansi_x9_62()+3, ansi_x9_62_curves)
-					DEFINE_OID(ansi_x9_62_curves()+1, ansi_x9_62_curves_prime)
-						DEFINE_OID(ansi_x9_62_curves_prime()+1, secp192r1)
-						DEFINE_OID(ansi_x9_62_curves_prime()+7, secp256r1)
-			DEFINE_OID(iso_us()+113549, rsadsi)
-				DEFINE_OID(rsadsi()+1, pkcs)
-					DEFINE_OID(pkcs()+1, pkcs_1)
-						DEFINE_OID(pkcs_1()+1, rsaEncryption);
-				DEFINE_OID(rsadsi()+2, rsadsi_digestAlgorithm)
-					DEFINE_OID(rsadsi_digestAlgorithm()+2, id_md2)
-					DEFINE_OID(rsadsi_digestAlgorithm()+5, id_md5)
-	DEFINE_OID(iso()+3, identified_organization)
-		// Arc from http://tools.ietf.org/html/draft-josefsson-pkix-newcurves
-		DEFINE_OID(identified_organization()+6, dod)
-			DEFINE_OID(dod()+1, internet)
-				DEFINE_OID(internet()+4, internet_private)
-					DEFINE_OID(internet_private()+1, enterprise)
-						DEFINE_OID(enterprise()+11591,GNU)
-							DEFINE_OID(GNU()+15,ellipticCurve)
-								DEFINE_OID(ellipticCurve()+1,id_curve25519)
-								DEFINE_OID(ellipticCurve()+2,id_curve448)
-								DEFINE_OID(ellipticCurve()+3,id_curve25519ph)
-								DEFINE_OID(ellipticCurve()+4,id_curve448ph)
-		DEFINE_OID(identified_organization()+14, oiw);
-			DEFINE_OID(oiw()+3, oiw_secsig);
-				DEFINE_OID(oiw_secsig()+2, oiw_secsig_algorithms);
-					DEFINE_OID(oiw_secsig_algorithms()+26, id_sha1);
-		DEFINE_OID(identified_organization()+36, teletrust);
-			DEFINE_OID(teletrust()+3, teletrust_algorithm)
-				DEFINE_OID(teletrust_algorithm()+2+1, id_ripemd160)
-				DEFINE_OID(teletrust_algorithm()+3+2+8+1, teletrust_ellipticCurve)
-					DEFINE_OID(teletrust_ellipticCurve()+1+1, brainpoolP160r1)
-					DEFINE_OID(teletrust_ellipticCurve()+1+3, brainpoolP192r1)
-					DEFINE_OID(teletrust_ellipticCurve()+1+5, brainpoolP224r1)
-					DEFINE_OID(teletrust_ellipticCurve()+1+7, brainpoolP256r1)
-					DEFINE_OID(teletrust_ellipticCurve()+1+9, brainpoolP320r1)
-					DEFINE_OID(teletrust_ellipticCurve()+1+11, brainpoolP384r1)
-					DEFINE_OID(teletrust_ellipticCurve()+1+13, brainpoolP512r1)
-		DEFINE_OID(identified_organization()+132, certicom);
-			DEFINE_OID(certicom()+0, certicom_ellipticCurve);
-				// these are sorted by curve type and then by OID
-				// first curves based on GF(p)
-				DEFINE_OID(certicom_ellipticCurve()+6, secp112r1);
-				DEFINE_OID(certicom_ellipticCurve()+7, secp112r2);
-				DEFINE_OID(certicom_ellipticCurve()+8, secp160r1);
-				DEFINE_OID(certicom_ellipticCurve()+9, secp160k1);
-				DEFINE_OID(certicom_ellipticCurve()+10, secp256k1);
-				DEFINE_OID(certicom_ellipticCurve()+28, secp128r1);
-				DEFINE_OID(certicom_ellipticCurve()+29, secp128r2);
-				DEFINE_OID(certicom_ellipticCurve()+30, secp160r2);
-				DEFINE_OID(certicom_ellipticCurve()+31, secp192k1);
-				DEFINE_OID(certicom_ellipticCurve()+32, secp224k1);
-				DEFINE_OID(certicom_ellipticCurve()+33, secp224r1);
-				DEFINE_OID(certicom_ellipticCurve()+34, secp384r1);
-				DEFINE_OID(certicom_ellipticCurve()+35, secp521r1);
-				// then curves based on GF(2^n)
-				DEFINE_OID(certicom_ellipticCurve()+1, sect163k1);
-				DEFINE_OID(certicom_ellipticCurve()+2, sect163r1);
-				DEFINE_OID(certicom_ellipticCurve()+3, sect239k1);
-				DEFINE_OID(certicom_ellipticCurve()+4, sect113r1);
-				DEFINE_OID(certicom_ellipticCurve()+5, sect113r2);
-				DEFINE_OID(certicom_ellipticCurve()+15, sect163r2);
-				DEFINE_OID(certicom_ellipticCurve()+16, sect283k1);
-				DEFINE_OID(certicom_ellipticCurve()+17, sect283r1);
-				DEFINE_OID(certicom_ellipticCurve()+22, sect131r1);
-				DEFINE_OID(certicom_ellipticCurve()+23, sect131r2);
-				DEFINE_OID(certicom_ellipticCurve()+24, sect193r1);
-				DEFINE_OID(certicom_ellipticCurve()+25, sect193r2);
-				DEFINE_OID(certicom_ellipticCurve()+26, sect233k1);
-				DEFINE_OID(certicom_ellipticCurve()+27, sect233r1);
-				DEFINE_OID(certicom_ellipticCurve()+36, sect409k1);
-				DEFINE_OID(certicom_ellipticCurve()+37, sect409r1);
-				DEFINE_OID(certicom_ellipticCurve()+38, sect571k1);
-				DEFINE_OID(certicom_ellipticCurve()+39, sect571r1);
-DEFINE_OID(2, joint_iso_ccitt)
-	DEFINE_OID(joint_iso_ccitt()+16, country)
-		DEFINE_OID(country()+840, joint_iso_ccitt_us)
-			DEFINE_OID(joint_iso_ccitt_us()+1, us_organization)
-				DEFINE_OID(us_organization()+101, us_gov)
-					DEFINE_OID(us_gov()+3, csor)
-						DEFINE_OID(csor()+4, nistalgorithms)
-							DEFINE_OID(nistalgorithms()+1, aes)
-								DEFINE_OID(aes()+1, id_aes128_ECB)
-								DEFINE_OID(aes()+2, id_aes128_cbc)
-								DEFINE_OID(aes()+3, id_aes128_ofb)
-								DEFINE_OID(aes()+4, id_aes128_cfb)
-								DEFINE_OID(aes()+21, id_aes192_ECB)
-								DEFINE_OID(aes()+22, id_aes192_cbc)
-								DEFINE_OID(aes()+23, id_aes192_ofb)
-								DEFINE_OID(aes()+24, id_aes192_cfb)
-								DEFINE_OID(aes()+41, id_aes256_ECB)
-								DEFINE_OID(aes()+42, id_aes256_cbc)
-								DEFINE_OID(aes()+43, id_aes256_ofb)
-								DEFINE_OID(aes()+44, id_aes256_cfb)
-							DEFINE_OID(nistalgorithms()+2, nist_hashalgs)
-								DEFINE_OID(nist_hashalgs()+1, id_sha256)
-								DEFINE_OID(nist_hashalgs()+2, id_sha384)
-								DEFINE_OID(nist_hashalgs()+3, id_sha512)
-
-NAMESPACE_END
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/osrng.cpp b/src-cryptopp/osrng.cpp
deleted file mode 100644
index 337976c..0000000
--- a/src-cryptopp/osrng.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-// osrng.cpp - written and placed in the public domain by Wei Dai
-
-// Thanks to Leonard Janke for the suggestion for AutoSeededRandomPool.
-
-#include "pch.h"
-#include "config.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-// Win32 has CryptoAPI and <wincrypt.h>. Windows 10 and Windows Store 10 have CNG and <bcrypt.h>.
-//  There's a hole for Windows Phone 8 and Windows Store 8. There is no userland crypto available.
-//  Also see http://stackoverflow.com/questions/36974545/random-numbers-for-windows-phone-8-and-windows-store-8
-#if defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(OS_RNG_AVAILABLE)
-# pragma message("WARNING: Compiling for Windows but an OS RNG is not available. This is likely a Windows Phone 8 or Windows Store 8 app.")
-#endif
-
-#if !defined(OS_NO_DEPENDENCE) && defined(OS_RNG_AVAILABLE)
-
-#include "osrng.h"
-#include "rng.h"
-
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-//#ifndef _WIN32_WINNT
-//#define _WIN32_WINNT 0x0400
-//#endif
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#if defined(USE_MS_CRYPTOAPI)
-#include <wincrypt.h>
-#ifndef CRYPT_NEWKEYSET
-# define CRYPT_NEWKEYSET 0x00000008
-#endif
-#ifndef CRYPT_MACHINE_KEYSET
-# define CRYPT_MACHINE_KEYSET 0x00000020
-#endif
-#elif defined(USE_MS_CNGAPI)
-//#include <ntdef.h>
-#include <bcrypt.h>
-#ifndef BCRYPT_SUCCESS
-# define BCRYPT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0)
-#endif
-#ifndef STATUS_INVALID_PARAMETER
-# define STATUS_INVALID_PARAMETER 0xC000000D
-#endif
-#ifndef STATUS_INVALID_HANDLE
-# define STATUS_INVALID_HANDLE 0xC0000008
-#endif
-#endif
-#endif
-
-#ifdef CRYPTOPP_UNIX_AVAILABLE
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#if defined(NONBLOCKING_RNG_AVAILABLE) || defined(BLOCKING_RNG_AVAILABLE)
-OS_RNG_Err::OS_RNG_Err(const std::string &operation)
-	: Exception(OTHER_ERROR, "OS_Rng: " + operation + " operation failed with error " +
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-		"0x" + IntToString(GetLastError(), 16)
-#else
-		IntToString(errno)
-#endif
-		)
-{
-}
-#endif
-
-#ifdef NONBLOCKING_RNG_AVAILABLE
-
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-
-#if defined(USE_MS_CNGAPI)
-inline DWORD NtStatusToErrorCode(NTSTATUS status)
-{
-	if (status == STATUS_INVALID_PARAMETER)
-		return ERROR_INVALID_PARAMETER;
-	else if (status == STATUS_INVALID_HANDLE)
-		return ERROR_INVALID_HANDLE;
-	else
-		return (DWORD)status;
-}
-#endif
-
-#if defined(UNICODE) || defined(_UNICODE)
-# define CRYPTOPP_CONTAINER L"Crypto++ RNG"
-#else
-# define CRYPTOPP_CONTAINER "Crypto++ RNG"
-#endif
-
-MicrosoftCryptoProvider::MicrosoftCryptoProvider() : m_hProvider(0)
-{
-#if defined(USE_MS_CRYPTOAPI)
-	// See http://support.microsoft.com/en-us/kb/238187 for CRYPT_NEWKEYSET fallback strategy
-	if (!CryptAcquireContext(&m_hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
-	{
-		const DWORD firstErr = GetLastError();
-		if (!CryptAcquireContext(&m_hProvider, CRYPTOPP_CONTAINER, 0, PROV_RSA_FULL, CRYPT_NEWKEYSET /*user*/) &&
-		    !CryptAcquireContext(&m_hProvider, CRYPTOPP_CONTAINER, 0, PROV_RSA_FULL, CRYPT_MACHINE_KEYSET|CRYPT_NEWKEYSET))
-		{
-			// Set original error with original code
-			SetLastError(firstErr);
-			throw OS_RNG_Err("CryptAcquireContext");
-		}
-	}
-#elif defined(USE_MS_CNGAPI)
-	NTSTATUS ret = BCryptOpenAlgorithmProvider(&m_hProvider, BCRYPT_RNG_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0);
-	if (!(BCRYPT_SUCCESS(ret)))
-	{
-		// Hack... OS_RNG_Err calls GetLastError()
-		SetLastError(NtStatusToErrorCode(ret));
-		throw OS_RNG_Err("BCryptOpenAlgorithmProvider");
-	}
-#endif
-}
-
-MicrosoftCryptoProvider::~MicrosoftCryptoProvider()
-{
-#if defined(USE_MS_CRYPTOAPI)
-	if (m_hProvider)
-		CryptReleaseContext(m_hProvider, 0);
-#elif defined(USE_MS_CNGAPI)
-	if (m_hProvider)
-		BCryptCloseAlgorithmProvider(m_hProvider, 0);
-#endif
-}
-
-#endif  // CRYPTOPP_WIN32_AVAILABLE
-
-NonblockingRng::NonblockingRng()
-{
-#ifndef CRYPTOPP_WIN32_AVAILABLE
-	m_fd = open("/dev/urandom",O_RDONLY);
-	if (m_fd == -1)
-		throw OS_RNG_Err("open /dev/urandom");
-#endif
-}
-
-NonblockingRng::~NonblockingRng()
-{
-#ifndef CRYPTOPP_WIN32_AVAILABLE
-	close(m_fd);
-#endif
-}
-
-void NonblockingRng::GenerateBlock(byte *output, size_t size)
-{
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-	// Acquiring a provider is expensive. Do it once and retain the reference.
-	static const MicrosoftCryptoProvider &hProvider = Singleton<MicrosoftCryptoProvider>().Ref();
-# if defined(USE_MS_CRYPTOAPI)
-	if (!CryptGenRandom(hProvider.GetProviderHandle(), (DWORD)size, output))
-		throw OS_RNG_Err("CryptGenRandom");
-# elif defined(USE_MS_CNGAPI)
-	NTSTATUS ret = BCryptGenRandom(hProvider.GetProviderHandle(), output, (ULONG)size, 0);
-	if (!(BCRYPT_SUCCESS(ret)))
-	{
-		// Hack... OS_RNG_Err calls GetLastError()
-		SetLastError(NtStatusToErrorCode(ret));
-		throw OS_RNG_Err("BCryptGenRandom");
-	}
-# endif
-#else
-	while (size)
-	{
-		ssize_t len = read(m_fd, output, size);
-		if (len < 0)
-		{
-			// /dev/urandom reads CAN give EAGAIN errors! (maybe EINTR as well)
-			if (errno != EINTR && errno != EAGAIN)
-				throw OS_RNG_Err("read /dev/urandom");
-
-			continue;
-		}
-
-		output += len;
-		size -= len;
-	}
-#endif  // CRYPTOPP_WIN32_AVAILABLE
-}
-
-#endif  // NONBLOCKING_RNG_AVAILABLE
-
-// *************************************************************
-
-#ifdef BLOCKING_RNG_AVAILABLE
-
-#ifndef CRYPTOPP_BLOCKING_RNG_FILENAME
-#ifdef __OpenBSD__
-#define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/srandom"
-#else
-#define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/random"
-#endif
-#endif
-
-BlockingRng::BlockingRng()
-{
-	m_fd = open(CRYPTOPP_BLOCKING_RNG_FILENAME,O_RDONLY);
-	if (m_fd == -1)
-		throw OS_RNG_Err("open " CRYPTOPP_BLOCKING_RNG_FILENAME);
-}
-
-BlockingRng::~BlockingRng()
-{
-	close(m_fd);
-}
-
-void BlockingRng::GenerateBlock(byte *output, size_t size)
-{
-	while (size)
-	{
-		// on some systems /dev/random will block until all bytes
-		// are available, on others it returns immediately
-		ssize_t len = read(m_fd, output, size);
-		if (len < 0)
-		{
-			// /dev/random reads CAN give EAGAIN errors! (maybe EINTR as well)
-			if (errno != EINTR && errno != EAGAIN)
-				throw OS_RNG_Err("read " CRYPTOPP_BLOCKING_RNG_FILENAME);
-
-			continue;
-		}
-
-		size -= len;
-		output += len;
-		if (size)
-			sleep(1);
-	}
-}
-
-#endif  // BLOCKING_RNG_AVAILABLE
-
-// *************************************************************
-
-void OS_GenerateRandomBlock(bool blocking, byte *output, size_t size)
-{
-#ifdef NONBLOCKING_RNG_AVAILABLE
-	if (blocking)
-#endif
-	{
-#ifdef BLOCKING_RNG_AVAILABLE
-		BlockingRng rng;
-		rng.GenerateBlock(output, size);
-#endif
-	}
-
-#ifdef BLOCKING_RNG_AVAILABLE
-	if (!blocking)
-#endif
-	{
-#ifdef NONBLOCKING_RNG_AVAILABLE
-		NonblockingRng rng;
-		rng.GenerateBlock(output, size);
-#endif
-	}
-}
-
-void AutoSeededRandomPool::Reseed(bool blocking, unsigned int seedSize)
-{
-	SecByteBlock seed(seedSize);
-	OS_GenerateRandomBlock(blocking, seed, seedSize);
-	IncorporateEntropy(seed, seedSize);
-}
-
-NAMESPACE_END
-
-#endif  // OS_RNG_AVAILABLE
-
-#endif  // CRYPTOPP_IMPORTS
diff --git a/src-cryptopp/osrng.h b/src-cryptopp/osrng.h
deleted file mode 100644
index c4631d8..0000000
--- a/src-cryptopp/osrng.h
+++ /dev/null
@@ -1,267 +0,0 @@
-// osrng.h - written and placed in the public domain by Wei Dai
-
-//! \file osrng.h
-//! \brief Classes for access to the operating system's random number generators
-
-#ifndef CRYPTOPP_OSRNG_H
-#define CRYPTOPP_OSRNG_H
-
-#include "config.h"
-
-#if !defined(OS_NO_DEPENDENCE) && defined(OS_RNG_AVAILABLE)
-
-#include "cryptlib.h"
-#include "randpool.h"
-#include "smartptr.h"
-#include "fips140.h"
-#include "rng.h"
-#include "aes.h"
-#include "sha.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class OS_RNG_Err
-//! \brief Exception thrown when an operating system error is encountered
-class CRYPTOPP_DLL OS_RNG_Err : public Exception
-{
-public:
-	//! \brief Constructs an OS_RNG_Err
-	//! \param operation the operation or API call when the error occurs
-	OS_RNG_Err(const std::string &operation);
-};
-
-#ifdef NONBLOCKING_RNG_AVAILABLE
-
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-//! \class MicrosoftCryptoProvider
-//! \brief Wrapper for Microsoft crypto service provider
-//! \sa \def USE_MS_CRYPTOAPI, \def USE_MS_CNGAPI, \def WORKAROUND_MS_BUG_Q258000
-class CRYPTOPP_DLL MicrosoftCryptoProvider
-{
-public:
-	//! \brief Construct a MicrosoftCryptoProvider
-	MicrosoftCryptoProvider();
-	~MicrosoftCryptoProvider();
-
-// type HCRYPTPROV and BCRYPT_ALG_HANDLE, avoid #include <windows.h>
-#if defined(USE_MS_CRYPTOAPI)
-# if defined(__CYGWIN__) && defined(__x86_64__)
-	typedef unsigned long long ProviderHandle;
-# elif defined(WIN64) || defined(_WIN64)
-	typedef unsigned __int64 ProviderHandle;
-# else
-	typedef unsigned long ProviderHandle;
-# endif
-#elif defined(USE_MS_CNGAPI)
-	typedef void *PVOID;
-	typedef PVOID ProviderHandle;
-#endif // USE_MS_CRYPTOAPI or USE_MS_CNGAPI
-
-	//! \brief Retrieves the provider handle
-	//! \returns CryptoAPI provider handle
-	//! \details If USE_MS_CRYPTOAPI is in effect, then CryptAcquireContext()
-	//!   acquires then handle and CryptReleaseContext() releases the handle
-	//!   upon destruction. If USE_MS_CNGAPI is in effect, then
-	//!   BCryptOpenAlgorithmProvider() acquires then handle and
-	//!   BCryptCloseAlgorithmProvider() releases the handle upon destruction.
-	ProviderHandle GetProviderHandle() const {return m_hProvider;}
-
-private:
-	ProviderHandle m_hProvider;
-};
-
-#if defined(_MSC_VER) && defined(USE_MS_CRYPTOAPI)
-# pragma comment(lib, "advapi32.lib")
-#endif
-
-#if defined(_MSC_VER) && defined(USE_MS_CNGAPI)
-# pragma comment(lib, "bcrypt.lib")
-#endif
-
-#endif //CRYPTOPP_WIN32_AVAILABLE
-
-//! \class NonblockingRng
-//! \brief Wrapper class for /dev/random and /dev/srandom
-//! \details Encapsulates CryptoAPI's CryptGenRandom() or CryptoNG's BCryptGenRandom()
-//!   on Windows, or /dev/urandom on Unix and compatibles.
-class CRYPTOPP_DLL NonblockingRng : public RandomNumberGenerator
-{
-public:
-	//! \brief Construct a NonblockingRng
-	NonblockingRng();
-	~NonblockingRng();
-
-	//! \brief Generate random array of bytes
-	//! \param output the byte buffer
-	//! \param size the length of the buffer, in bytes
-	//! \details GenerateIntoBufferedTransformation() calls are routed to GenerateBlock().
-	void GenerateBlock(byte *output, size_t size);
-
-protected:
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-	MicrosoftCryptoProvider m_Provider;
-#else
-	int m_fd;
-#endif
-};
-
-#endif
-
-#if defined(BLOCKING_RNG_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
-
-//! \class BlockingRng
-//! \brief Wrapper class for /dev/random and /dev/srandom
-//! \details Encapsulates /dev/random on Linux, OS X and Unix; and /dev/srandom on the BSDs.
-class CRYPTOPP_DLL BlockingRng : public RandomNumberGenerator
-{
-public:
-	//! \brief Construct a BlockingRng
-	BlockingRng();
-	~BlockingRng();
-
-	//! \brief Generate random array of bytes
-	//! \param output the byte buffer
-	//! \param size the length of the buffer, in bytes
-	//! \details GenerateIntoBufferedTransformation() calls are routed to GenerateBlock().
-	void GenerateBlock(byte *output, size_t size);
-
-protected:
-	int m_fd;
-};
-
-#endif
-
-//! OS_GenerateRandomBlock
-//! \brief Generate random array of bytes
-//! \param blocking specifies whther a bobcking or non-blocking generator should be used
-//! \param output the byte buffer
-//! \param size the length of the buffer, in bytes
-//! \details OS_GenerateRandomBlock() uses the underlying operating system's
-//!   random number generator. On Windows, CryptGenRandom() is called using NonblockingRng.
-//! \details On Unix and compatibles, /dev/urandom is called if blocking is false using
-//!   NonblockingRng. If blocking is true, then either /dev/randomd or /dev/srandom is used
-//!  by way of BlockingRng, if available.
-CRYPTOPP_DLL void CRYPTOPP_API OS_GenerateRandomBlock(bool blocking, byte *output, size_t size);
-
-
-//! \class AutoSeededRandomPool
-//! \brief Automatically Seeded Randomness Pool
-//! \details This class seeds itself using an operating system provided RNG.
-//!    AutoSeededRandomPool was suggested by Leonard Janke.
-class CRYPTOPP_DLL AutoSeededRandomPool : public RandomPool
-{
-public:
-	//! \brief Construct an AutoSeededRandomPool
-	//! \param blocking controls seeding with BlockingRng or NonblockingRng
-	//! \param seedSize the size of the seed, in bytes
-	//! \details Use blocking to choose seeding with BlockingRng or NonblockingRng.
-	//!   The parameter is ignored if only one of these is available.
-	explicit AutoSeededRandomPool(bool blocking = false, unsigned int seedSize = 32)
-		{Reseed(blocking, seedSize);}
-
-	//! \brief Reseed an AutoSeededRandomPool
-	//! \param blocking controls seeding with BlockingRng or NonblockingRng
-	//! \param seedSize the size of the seed, in bytes
-	void Reseed(bool blocking = false, unsigned int seedSize = 32);
-};
-
-//! \class AutoSeededX917RNG
-//! \tparam BLOCK_CIPHER a block cipher
-//! \brief Automatically Seeded X9.17 RNG
-//! \details AutoSeededX917RNG is from ANSI X9.17 Appendix C, seeded using an OS provided RNG.
-//!   If 3-key TripleDES (DES_EDE3) is used, then its a X9.17 conforming generator. If AES is
-//!   used, then its a X9.31 conforming generator.
-//! \details Though ANSI X9 prescribes 3-key TripleDES, the template parameter BLOCK_CIPHER can be any
-//!   BlockTransformation derived class.
-//! \sa X917RNG, DefaultAutoSeededRNG
-template <class BLOCK_CIPHER>
-class AutoSeededX917RNG : public RandomNumberGenerator, public NotCopyable
-{
-public:
-	//! \brief Construct an AutoSeededX917RNG
-	//! \param blocking controls seeding with BlockingRng or NonblockingRng
-	//! \param autoSeed controls auto seeding of the generator
-	//! \details Use blocking to choose seeding with BlockingRng or NonblockingRng.
-	//!   The parameter is ignored if only one of these is available.
-	//! \sa X917RNG
-	explicit AutoSeededX917RNG(bool blocking = false, bool autoSeed = true)
-		{if (autoSeed) Reseed(blocking);}
-
-	//! \brief Reseed an AutoSeededX917RNG
-	//! \param blocking controls seeding with BlockingRng or NonblockingRng
-	//! \param additionalEntropy additional entropy to add to the generator
-	//! \param length the size of the additional entropy, in bytes
-	//! \details Internally, the generator uses SHA256 to extract the entropy from
-	//!   from the seed and then stretch the material for the block cipher's key
-	//!   and initialization vector.
-	void Reseed(bool blocking = false, const byte *additionalEntropy = NULL, size_t length = 0);
-
-	//! \brief Deterministically reseed an AutoSeededX917RNG for testing
-	//! \param key the key to use for the deterministic reseeding
-	//! \param keylength the size of the key, in bytes
-	//! \param seed the seed to use for the deterministic reseeding
-	//! \param timeVector a time vector to use for deterministic reseeding
-	//! \details This is a testing interface for testing purposes, and should \a NOT
-	//!   be used in production.
-	void Reseed(const byte *key, size_t keylength, const byte *seed, const byte *timeVector);
-
-	bool CanIncorporateEntropy() const {return true;}
-	void IncorporateEntropy(const byte *input, size_t length) {Reseed(false, input, length);}
-	void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword length)
-		{m_rng->GenerateIntoBufferedTransformation(target, channel, length);}
-
-private:
-	member_ptr<RandomNumberGenerator> m_rng;
-};
-
-template <class BLOCK_CIPHER>
-void AutoSeededX917RNG<BLOCK_CIPHER>::Reseed(const byte *key, size_t keylength, const byte *seed, const byte *timeVector)
-{
-	m_rng.reset(new X917RNG(new typename BLOCK_CIPHER::Encryption(key, keylength), seed, timeVector));
-}
-
-template <class BLOCK_CIPHER>
-void AutoSeededX917RNG<BLOCK_CIPHER>::Reseed(bool blocking, const byte *input, size_t length)
-{
-	SecByteBlock seed(BLOCK_CIPHER::BLOCKSIZE + BLOCK_CIPHER::DEFAULT_KEYLENGTH);
-	const byte *key;
-	do
-	{
-		OS_GenerateRandomBlock(blocking, seed, seed.size());
-		if (length > 0)
-		{
-			SHA256 hash;
-			hash.Update(seed, seed.size());
-			hash.Update(input, length);
-			hash.TruncatedFinal(seed, UnsignedMin(hash.DigestSize(), seed.size()));
-		}
-		key = seed + BLOCK_CIPHER::BLOCKSIZE;
-	}	// check that seed and key don't have same value
-	while (memcmp(key, seed, STDMIN((unsigned int)BLOCK_CIPHER::BLOCKSIZE, (unsigned int)BLOCK_CIPHER::DEFAULT_KEYLENGTH)) == 0);
-
-	Reseed(key, BLOCK_CIPHER::DEFAULT_KEYLENGTH, seed, NULL);
-}
-
-CRYPTOPP_DLL_TEMPLATE_CLASS AutoSeededX917RNG<AES>;
-
-#if defined(CRYPTOPP_DOXYGEN_PROCESSING)
-//! \class DefaultAutoSeededRNG
-//! \brief A typedef providing a default generator
-//! \details DefaultAutoSeededRNG is a typedef of either AutoSeededX917RNG<AES> or AutoSeededRandomPool.
-//!   If CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2 is defined, then DefaultAutoSeededRNG is
-//!   AutoSeededX917RNG<AES>. Otherwise, DefaultAutoSeededRNG is AutoSeededRandomPool.
-class DefaultAutoSeededRNG {}
-#else
-// AutoSeededX917RNG<AES> in FIPS mode, otherwise it's AutoSeededRandomPool
-#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
-typedef AutoSeededX917RNG<AES> DefaultAutoSeededRNG;
-#else
-typedef AutoSeededRandomPool DefaultAutoSeededRNG;
-#endif
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-NAMESPACE_END
-
-#endif
-
-#endif
diff --git a/src-cryptopp/pch.h b/src-cryptopp/pch.h
deleted file mode 100644
index 4be2900..0000000
--- a/src-cryptopp/pch.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// pch.h - written and placed in the public domain by Wei Dai
-
-//! \headerfile pch.h
-//! \brief Precompiled header file
-
-#ifndef CRYPTOPP_PCH_H
-#define CRYPTOPP_PCH_H
-
-# ifdef CRYPTOPP_GENERATE_X64_MASM
-	#include "cpu.h"
-
-# else
-	#include "config.h"
-
-	#ifdef USE_PRECOMPILED_HEADERS
-		#include "simple.h"
-		#include "secblock.h"
-		#include "misc.h"
-		#include "smartptr.h"
-		#include "stdcpp.h"
-	#endif
-# endif
-
-// Enable file and line numbers, if available.
-// #if defined(_MSC_VER) && defined(_DEBUG) && defined(USE_PRECOMPILED_HEADERS)
-// # define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
-// # define new DEBUG_NEW
-// #endif
-
-#endif	// CRYPTOPP_PCH_H
diff --git a/src-cryptopp/pkcspad.cpp b/src-cryptopp/pkcspad.cpp
deleted file mode 100644
index a45751f..0000000
--- a/src-cryptopp/pkcspad.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-// pkcspad.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_PKCSPAD_CPP	// SunCC workaround: compiler could cause this file to be included twice
-#define CRYPTOPP_PKCSPAD_CPP
-
-#include "pkcspad.h"
-#include "emsa2.h"
-#include "misc.h"
-#include "trap.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// More in dll.cpp. Typedef/cast change due to Clang, http://github.com/weidai11/cryptopp/issues/300
-template<> const byte PKCS_DigestDecoration<Weak1::MD2>::decoration[] = {0x30,0x20,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x02,0x05,0x00,0x04,0x10};
-template<> const unsigned int PKCS_DigestDecoration<Weak1::MD2>::length = (unsigned int)sizeof(PKCS_DigestDecoration<Weak1::MD2>::decoration);
-
-template<> const byte PKCS_DigestDecoration<Weak1::MD5>::decoration[] = {0x30,0x20,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x04,0x10};
-template<> const unsigned int PKCS_DigestDecoration<Weak1::MD5>::length = (unsigned int)sizeof(PKCS_DigestDecoration<Weak1::MD5>::decoration);
-
-template<> const byte PKCS_DigestDecoration<RIPEMD160>::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2b,0x24,0x03,0x02,0x01,0x05,0x00,0x04,0x14};
-template<> const unsigned int PKCS_DigestDecoration<RIPEMD160>::length = (unsigned int)sizeof(PKCS_DigestDecoration<RIPEMD160>::decoration);
-
-template<> const byte PKCS_DigestDecoration<Tiger>::decoration[] = {0x30,0x29,0x30,0x0D,0x06,0x09,0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0C,0x02,0x05,0x00,0x04,0x18};
-template<> const unsigned int PKCS_DigestDecoration<Tiger>::length = (unsigned int)sizeof(PKCS_DigestDecoration<Tiger>::decoration);
-
-// Inclusion based on DLL due to Clang, http://github.com/weidai11/cryptopp/issues/300
-#ifndef CRYPTOPP_IS_DLL
-template<> const byte PKCS_DigestDecoration<SHA1>::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x04,0x14};
-template<> const unsigned int PKCS_DigestDecoration<SHA1>::length = (unsigned int)sizeof(PKCS_DigestDecoration<SHA1>::decoration);
-
-template<> const byte PKCS_DigestDecoration<SHA224>::decoration[] = {0x30,0x2d,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,0x05,0x00,0x04,0x1c};
-template<> const unsigned int PKCS_DigestDecoration<SHA224>::length = (unsigned int)sizeof(PKCS_DigestDecoration<SHA224>::decoration);
-
-template<> const byte PKCS_DigestDecoration<SHA256>::decoration[] = {0x30,0x31,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,0x05,0x00,0x04,0x20};
-template<> const unsigned int PKCS_DigestDecoration<SHA256>::length = (unsigned int)sizeof(PKCS_DigestDecoration<SHA256>::decoration);
-
-template<> const byte PKCS_DigestDecoration<SHA384>::decoration[] = {0x30,0x41,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,0x05,0x00,0x04,0x30};
-template<> const unsigned int PKCS_DigestDecoration<SHA384>::length = (unsigned int)sizeof(PKCS_DigestDecoration<SHA384>::decoration);
-
-template<> const byte PKCS_DigestDecoration<SHA512>::decoration[] = {0x30,0x51,0x30,0x0d,0x06,0x09,0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,0x05,0x00,0x04,0x40};
-template<> const unsigned int PKCS_DigestDecoration<SHA512>::length = (unsigned int)sizeof(PKCS_DigestDecoration<SHA512>::decoration);
-
-template<> const byte EMSA2HashId<SHA1>::id = 0x33;
-template<> const byte EMSA2HashId<SHA224>::id = 0x38;
-template<> const byte EMSA2HashId<SHA256>::id = 0x34;
-template<> const byte EMSA2HashId<SHA384>::id = 0x36;
-template<> const byte EMSA2HashId<SHA512>::id = 0x35;
-#endif
-
-size_t PKCS_EncryptionPaddingScheme::MaxUnpaddedLength(size_t paddedLength) const
-{
-	return SaturatingSubtract(paddedLength/8, 10U);
-}
-
-void PKCS_EncryptionPaddingScheme::Pad(RandomNumberGenerator& rng, const byte *input, size_t inputLen, byte *pkcsBlock, size_t pkcsBlockLen, const NameValuePairs& parameters) const
-{
-	CRYPTOPP_UNUSED(parameters);
-	CRYPTOPP_ASSERT (inputLen <= MaxUnpaddedLength(pkcsBlockLen));	// this should be checked by caller
-
-	// convert from bit length to byte length
-	if (pkcsBlockLen % 8 != 0)
-	{
-		pkcsBlock[0] = 0;
-		pkcsBlock++;
-	}
-	pkcsBlockLen /= 8;
-
-	pkcsBlock[0] = 2;  // block type 2
-
-	// pad with non-zero random bytes
-	for (unsigned i = 1; i < pkcsBlockLen-inputLen-1; i++)
-		pkcsBlock[i] = (byte)rng.GenerateWord32(1, 0xff);
-
-	pkcsBlock[pkcsBlockLen-inputLen-1] = 0;     // separator
-	memcpy(pkcsBlock+pkcsBlockLen-inputLen, input, inputLen);
-}
-
-DecodingResult PKCS_EncryptionPaddingScheme::Unpad(const byte *pkcsBlock, size_t pkcsBlockLen, byte *output, const NameValuePairs& parameters) const
-{
-	CRYPTOPP_UNUSED(parameters);
-	bool invalid = false;
-	size_t maxOutputLen = MaxUnpaddedLength(pkcsBlockLen);
-
-	// convert from bit length to byte length
-	if (pkcsBlockLen % 8 != 0)
-	{
-		invalid = (pkcsBlock[0] != 0) || invalid;
-		pkcsBlock++;
-	}
-	pkcsBlockLen /= 8;
-
-	// Require block type 2.
-	invalid = (pkcsBlock[0] != 2) || invalid;
-
-	// skip past the padding until we find the separator
-	size_t i=1;
-	while (i<pkcsBlockLen && pkcsBlock[i++]) { // null body
-		}
-	CRYPTOPP_ASSERT(i==pkcsBlockLen || pkcsBlock[i-1]==0);
-
-	size_t outputLen = pkcsBlockLen - i;
-	invalid = (outputLen > maxOutputLen) || invalid;
-
-	if (invalid)
-		return DecodingResult();
-
-	memcpy (output, pkcsBlock+i, outputLen);
-	return DecodingResult(outputLen);
-}
-
-// ********************************************************
-
-#ifndef CRYPTOPP_IMPORTS
-
-void PKCS1v15_SignatureMessageEncodingMethod::ComputeMessageRepresentative(RandomNumberGenerator &rng,
-	const byte *recoverableMessage, size_t recoverableMessageLength,
-	HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-	byte *representative, size_t representativeBitLength) const
-{
-	CRYPTOPP_UNUSED(rng), CRYPTOPP_UNUSED(recoverableMessage), CRYPTOPP_UNUSED(recoverableMessageLength);
-	CRYPTOPP_UNUSED(messageEmpty), CRYPTOPP_UNUSED(hashIdentifier);
-	CRYPTOPP_ASSERT(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize()));
-
-	size_t pkcsBlockLen = representativeBitLength;
-	// convert from bit length to byte length
-	if (pkcsBlockLen % 8 != 0)
-	{
-		representative[0] = 0;
-		representative++;
-	}
-	pkcsBlockLen /= 8;
-
-	representative[0] = 1;   // block type 1
-
-	unsigned int digestSize = hash.DigestSize();
-	byte *pPadding = representative + 1;
-	byte *pDigest = representative + pkcsBlockLen - digestSize;
-	byte *pHashId = pDigest - hashIdentifier.second;
-	byte *pSeparator = pHashId - 1;
-
-	// pad with 0xff
-	memset(pPadding, 0xff, pSeparator-pPadding);
-	*pSeparator = 0;
-	memcpy(pHashId, hashIdentifier.first, hashIdentifier.second);
-	hash.Final(pDigest);
-}
-
-#endif
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/pkcspad.h b/src-cryptopp/pkcspad.h
deleted file mode 100644
index a31548d..0000000
--- a/src-cryptopp/pkcspad.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// pkcspad.h - written and placed in the public domain by Wei Dai
-
-//! \file pkcspad.h
-//! \brief Classes for PKCS padding schemes
-//! \details PKCS#1 v1.5, v2.0 and P1363a allow MD2, MD5, SHA1, SHA224, SHA256, SHA384, SHA512, Tiger and RipeMd-160 to be instantiated.
-
-#ifndef CRYPTOPP_PKCSPAD_H
-#define CRYPTOPP_PKCSPAD_H
-
-#include "cryptlib.h"
-#include "pubkey.h"
-
-#ifdef CRYPTOPP_IS_DLL
-#include "sha.h"
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class PKCS_EncryptionPaddingScheme
-//! \brief PKCS#1 v1.5 Encryption Padding Scheme
-//! \sa <a href="http://www.weidai.com/scan-mirror/ca.html#cem_PKCS1-1.5">EME-PKCS1-v1_5</a>
-class PKCS_EncryptionPaddingScheme : public PK_EncryptionMessageEncodingMethod
-{
-public:
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "EME-PKCS1-v1_5";}
-
-	size_t MaxUnpaddedLength(size_t paddedLength) const;
-	void Pad(RandomNumberGenerator &rng, const byte *raw, size_t inputLength, byte *padded, size_t paddedLength, const NameValuePairs &parameters) const;
-	DecodingResult Unpad(const byte *padded, size_t paddedLength, byte *raw, const NameValuePairs &parameters) const;
-};
-
-//! \class PKCS_DigestDecoration
-//! \brief PKCS#1 decoration data structure
-template <class H> class PKCS_DigestDecoration
-{
-public:
-	static const byte decoration[];
-	static const unsigned int length;
-};
-
-// PKCS_DigestDecoration can be instantiated with the following
-// classes as specified in PKCS#1 v2.0 and P1363a
-class SHA1;
-class SHA224;
-class SHA256;
-class SHA384;
-class SHA512;
-class Tiger;
-class RIPEMD160;
-namespace Weak1 {
-class MD2;
-class MD5;
-}
-// end of list
-
-#ifdef CRYPTOPP_IS_DLL
-CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration<SHA1>;
-CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration<SHA224>;
-CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration<SHA256>;
-CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration<SHA384>;
-CRYPTOPP_DLL_TEMPLATE_CLASS PKCS_DigestDecoration<SHA512>;
-#endif
-
-//! \class PKCS1v15_SignatureMessageEncodingMethod
-//! \brief PKCS#1 v1.5 Signature Encoding Scheme
-//! \sa <a href="http://www.weidai.com/scan-mirror/sig.html#sem_PKCS1-1.5">EMSA-PKCS1-v1_5</a>
-class CRYPTOPP_DLL PKCS1v15_SignatureMessageEncodingMethod : public PK_DeterministicSignatureMessageEncodingMethod
-{
-public:
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "EMSA-PKCS1-v1_5";}
-
-	size_t MinRepresentativeBitLength(size_t hashIdentifierSize, size_t digestSize) const
-		{return 8 * (digestSize + hashIdentifierSize + 10);}
-
-	void ComputeMessageRepresentative(RandomNumberGenerator &rng,
-		const byte *recoverableMessage, size_t recoverableMessageLength,
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const;
-
-	struct HashIdentifierLookup
-	{
-		template <class H> struct HashIdentifierLookup2
-		{
-			static HashIdentifier Lookup()
-			{
-				return HashIdentifier(PKCS_DigestDecoration<H>::decoration, PKCS_DigestDecoration<H>::length);
-			}
-		};
-	};
-};
-
-//! PKCS #1 version 1.5, for use with RSAES and RSASS
-/*! Only the following hash functions are supported by this signature standard:
-	\dontinclude pkcspad.h
-	\skip can be instantiated
-	\until end of list
-*/
-struct PKCS1v15 : public SignatureStandard, public EncryptionStandard
-{
-	typedef PKCS_EncryptionPaddingScheme EncryptionMessageEncodingMethod;
-	typedef PKCS1v15_SignatureMessageEncodingMethod SignatureMessageEncodingMethod;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/pssr.cpp b/src-cryptopp/pssr.cpp
deleted file mode 100644
index 559408d..0000000
--- a/src-cryptopp/pssr.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// pssr.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "pssr.h"
-#include "misc.h"
-
-#include <functional>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// more in dll.cpp
-template<> const byte EMSA2HashId<RIPEMD160>::id = 0x31;
-template<> const byte EMSA2HashId<RIPEMD128>::id = 0x32;
-template<> const byte EMSA2HashId<Whirlpool>::id = 0x37;
-
-#ifndef CRYPTOPP_IMPORTS
-
-size_t PSSR_MEM_Base::MinRepresentativeBitLength(size_t hashIdentifierLength, size_t digestLength) const
-{
-	size_t saltLen = SaltLen(digestLength);
-	size_t minPadLen = MinPadLen(digestLength);
-	return 9 + 8*(minPadLen + saltLen + digestLength + hashIdentifierLength);
-}
-
-size_t PSSR_MEM_Base::MaxRecoverableLength(size_t representativeBitLength, size_t hashIdentifierLength, size_t digestLength) const
-{
-	if (AllowRecovery())
-		return SaturatingSubtract(representativeBitLength, MinRepresentativeBitLength(hashIdentifierLength, digestLength)) / 8;
-	return 0;
-}
-
-bool PSSR_MEM_Base::IsProbabilistic() const
-{
-	return SaltLen(1) > 0;
-}
-
-bool PSSR_MEM_Base::AllowNonrecoverablePart() const
-{
-	return true;
-}
-
-bool PSSR_MEM_Base::RecoverablePartFirst() const
-{
-	return false;
-}
-
-void PSSR_MEM_Base::ComputeMessageRepresentative(RandomNumberGenerator &rng,
-	const byte *recoverableMessage, size_t recoverableMessageLength,
-	HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-	byte *representative, size_t representativeBitLength) const
-{
-	CRYPTOPP_UNUSED(rng), CRYPTOPP_UNUSED(recoverableMessage), CRYPTOPP_UNUSED(recoverableMessageLength);
-	CRYPTOPP_UNUSED(messageEmpty), CRYPTOPP_UNUSED(hashIdentifier);
-	CRYPTOPP_ASSERT(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize()));
-
-	const size_t u = hashIdentifier.second + 1;
-	const size_t representativeByteLength = BitsToBytes(representativeBitLength);
-	const size_t digestSize = hash.DigestSize();
-	const size_t saltSize = SaltLen(digestSize);
-	byte *const h = representative + representativeByteLength - u - digestSize;
-
-	SecByteBlock digest(digestSize), salt(saltSize);
-	hash.Final(digest);
-	rng.GenerateBlock(salt, saltSize);
-
-	// compute H = hash of M'
-	byte c[8];
-	PutWord(false, BIG_ENDIAN_ORDER, c, (word32)SafeRightShift<29>(recoverableMessageLength));
-	PutWord(false, BIG_ENDIAN_ORDER, c+4, word32(recoverableMessageLength << 3));
-	hash.Update(c, 8);
-	hash.Update(recoverableMessage, recoverableMessageLength);
-	hash.Update(digest, digestSize);
-	hash.Update(salt, saltSize);
-	hash.Final(h);
-
-	// compute representative
-	GetMGF().GenerateAndMask(hash, representative, representativeByteLength - u - digestSize, h, digestSize, false);
-	byte *xorStart = representative + representativeByteLength - u - digestSize - salt.size() - recoverableMessageLength - 1;
-	xorStart[0] ^= 1;
-	if (recoverableMessage && recoverableMessageLength)
-		xorbuf(xorStart + 1, recoverableMessage, recoverableMessageLength);
-	xorbuf(xorStart + 1 + recoverableMessageLength, salt, salt.size());
-	if (hashIdentifier.first && hashIdentifier.second)
-	{
-		memcpy(representative + representativeByteLength - u, hashIdentifier.first, hashIdentifier.second);
-		representative[representativeByteLength - 1] = 0xcc;
-	}
-	else
-	{
-		representative[representativeByteLength - 1] = 0xbc;
-	}
-	if (representativeBitLength % 8 != 0)
-		representative[0] = (byte)Crop(representative[0], representativeBitLength % 8);
-}
-
-DecodingResult PSSR_MEM_Base::RecoverMessageFromRepresentative(
-	HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-	byte *representative, size_t representativeBitLength,
-	byte *recoverableMessage) const
-{
-	CRYPTOPP_UNUSED(recoverableMessage), CRYPTOPP_UNUSED(messageEmpty), CRYPTOPP_UNUSED(hashIdentifier);
-	CRYPTOPP_ASSERT(representativeBitLength >= MinRepresentativeBitLength(hashIdentifier.second, hash.DigestSize()));
-
-	const size_t u = hashIdentifier.second + 1;
-	const size_t representativeByteLength = BitsToBytes(representativeBitLength);
-	const size_t digestSize = hash.DigestSize();
-	const size_t saltSize = SaltLen(digestSize);
-	const byte *const h = representative + representativeByteLength - u - digestSize;
-
-	SecByteBlock digest(digestSize);
-	hash.Final(digest);
-
-	DecodingResult result(0);
-	bool &valid = result.isValidCoding;
-	size_t &recoverableMessageLength = result.messageLength;
-
-	valid = (representative[representativeByteLength - 1] == (hashIdentifier.second ? 0xcc : 0xbc)) && valid;
-
-	if (hashIdentifier.first && hashIdentifier.second)
-		valid = VerifyBufsEqual(representative + representativeByteLength - u, hashIdentifier.first, hashIdentifier.second) && valid;
-
-	GetMGF().GenerateAndMask(hash, representative, representativeByteLength - u - digestSize, h, digestSize);
-	if (representativeBitLength % 8 != 0)
-		representative[0] = (byte)Crop(representative[0], representativeBitLength % 8);
-
-	// extract salt and recoverableMessage from DB = 00 ... || 01 || M || salt
-	byte *salt = representative + representativeByteLength - u - digestSize - saltSize;
-	byte *M = std::find_if(representative, salt-1, std::bind2nd(std::not_equal_to<byte>(), byte(0)));
-	recoverableMessageLength = salt-M-1;
-	if (*M == 0x01 &&
-	   (size_t)(M - representative - (representativeBitLength % 8 != 0)) >= MinPadLen(digestSize) &&
-	   recoverableMessageLength <= MaxRecoverableLength(representativeBitLength, hashIdentifier.second, digestSize))
-	{
-		if (recoverableMessage)
-			memcpy(recoverableMessage, M+1, recoverableMessageLength);
-	}
-	else
-	{
-		recoverableMessageLength = 0;
-		valid = false;
-	}
-
-	// verify H = hash of M'
-	byte c[8];
-	PutWord(false, BIG_ENDIAN_ORDER, c, (word32)SafeRightShift<29>(recoverableMessageLength));
-	PutWord(false, BIG_ENDIAN_ORDER, c+4, word32(recoverableMessageLength << 3));
-	hash.Update(c, 8);
-	hash.Update(recoverableMessage, recoverableMessageLength);
-	hash.Update(digest, digestSize);
-	hash.Update(salt, saltSize);
-	valid = hash.Verify(h) && valid;
-
-	if (!AllowRecovery() && valid && recoverableMessageLength != 0)
-		{throw NotImplemented("PSSR_MEM: message recovery disabled");}
-
-	return result;
-}
-
-#endif
-
-NAMESPACE_END
diff --git a/src-cryptopp/pssr.h b/src-cryptopp/pssr.h
deleted file mode 100644
index 54622d4..0000000
--- a/src-cryptopp/pssr.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// pssr.h - written and placed in the public domain by Wei Dai
-
-//! \file pssr.h
-//! \brief Classes for probablistic signature schemes
-
-#ifndef CRYPTOPP_PSSR_H
-#define CRYPTOPP_PSSR_H
-
-#include "cryptlib.h"
-#include "pubkey.h"
-#include "emsa2.h"
-
-#ifdef CRYPTOPP_IS_DLL
-#include "sha.h"
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief PSSR Message Encoding Method interface
-class CRYPTOPP_DLL PSSR_MEM_Base : public PK_RecoverableSignatureMessageEncodingMethod
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PSSR_MEM_Base() {}
-#endif
-
-private:
-	virtual bool AllowRecovery() const =0;
-	virtual size_t SaltLen(size_t hashLen) const =0;
-	virtual size_t MinPadLen(size_t hashLen) const =0;
-	virtual const MaskGeneratingFunction & GetMGF() const =0;
-
-public:
-	size_t MinRepresentativeBitLength(size_t hashIdentifierLength, size_t digestLength) const;
-	size_t MaxRecoverableLength(size_t representativeBitLength, size_t hashIdentifierLength, size_t digestLength) const;
-	bool IsProbabilistic() const;
-	bool AllowNonrecoverablePart() const;
-	bool RecoverablePartFirst() const;
-	void ComputeMessageRepresentative(RandomNumberGenerator &rng,
-		const byte *recoverableMessage, size_t recoverableMessageLength,
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const;
-	DecodingResult RecoverMessageFromRepresentative(
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength,
-		byte *recoverableMessage) const;
-};
-
-//! \brief PSSR Message Encoding Method with Hash Identifier
-//! \tparam USE_HASH_ID flag indicating whether the HashId is used
-template <bool USE_HASH_ID> class PSSR_MEM_BaseWithHashId;
-
-//! \brief PSSR Message Encoding Method with Hash Identifier
-//! \tparam true flag indicating HashId is used
-template<> class PSSR_MEM_BaseWithHashId<true> : public EMSA2HashIdLookup<PSSR_MEM_Base> {};
-
-//! \brief PSSR Message Encoding Method without Hash Identifier
-//! \tparam false flag indicating HashId is not used
-template<> class PSSR_MEM_BaseWithHashId<false> : public PSSR_MEM_Base {};
-
-//! \brief PSSR Message Encoding Method
-//! \tparam ALLOW_RECOVERY flag indicating whether the scheme provides message recovery
-//! \tparam MGF mask generation function
-//! \tparam SALT_LEN length of the salt
-//! \tparam MIN_PAD_LEN minimum length of the pad
-//! \tparam USE_HASH_ID flag indicating whether the HashId is used
-//! \details If ALLOW_RECOVERY is true, the the signature scheme provides message recovery. If
-//!  ALLOW_RECOVERY is false, the the signature scheme is appendix, and the message must be
-//!  provided during verification.
-template <bool ALLOW_RECOVERY, class MGF=P1363_MGF1, int SALT_LEN=-1, int MIN_PAD_LEN=0, bool USE_HASH_ID=false>
-class PSSR_MEM : public PSSR_MEM_BaseWithHashId<USE_HASH_ID>
-{
-	virtual bool AllowRecovery() const {return ALLOW_RECOVERY;}
-	virtual size_t SaltLen(size_t hashLen) const {return SALT_LEN < 0 ? hashLen : SALT_LEN;}
-	virtual size_t MinPadLen(size_t hashLen) const {return MIN_PAD_LEN < 0 ? hashLen : MIN_PAD_LEN;}
-	virtual const MaskGeneratingFunction & GetMGF() const {static MGF mgf; return mgf;}
-
-public:
-	static std::string CRYPTOPP_API StaticAlgorithmName() {return std::string(ALLOW_RECOVERY ? "PSSR-" : "PSS-") + MGF::StaticAlgorithmName();}
-};
-
-//! \brief Probabilistic Signature Scheme with Recovery
-//! \details Signature Schemes with Recovery encode the message with the signature.
-//! \sa <a href="http://www.weidai.com/scan-mirror/sig.html#sem_PSSR-MGF1">PSSR-MGF1</a>
-struct PSSR : public SignatureStandard
-{
-	typedef PSSR_MEM<true> SignatureMessageEncodingMethod;
-};
-
-//! \brief Probabilistic Signature Scheme with Appendix
-//! \details Signature Schemes with Appendix require the message to be provided during verification.
-//! \sa <a href="http://www.weidai.com/scan-mirror/sig.html#sem_PSS-MGF1">PSS-MGF1</a>
-struct PSS : public SignatureStandard
-{
-	typedef PSSR_MEM<false> SignatureMessageEncodingMethod;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/pubkey.cpp b/src-cryptopp/pubkey.cpp
deleted file mode 100644
index 773c868..0000000
--- a/src-cryptopp/pubkey.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-// pubkey.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "pubkey.h"
-#include "integer.h"
-#include "filters.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-void P1363_MGF1KDF2_Common(HashTransformation &hash, byte *output, size_t outputLength, const byte *input, size_t inputLength, const byte *derivationParams, size_t derivationParamsLength, bool mask, unsigned int counterStart)
-{
-	ArraySink *sink;
-	HashFilter filter(hash, sink = mask ? new ArrayXorSink(output, outputLength) : new ArraySink(output, outputLength));
-	word32 counter = counterStart;
-	while (sink->AvailableSize() > 0)
-	{
-		filter.Put(input, inputLength);
-		filter.PutWord32(counter++);
-		filter.Put(derivationParams, derivationParamsLength);
-		filter.MessageEnd();
-	}
-}
-
-bool PK_DeterministicSignatureMessageEncodingMethod::VerifyMessageRepresentative(
-	HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-	byte *representative, size_t representativeBitLength) const
-{
-	SecByteBlock computedRepresentative(BitsToBytes(representativeBitLength));
-	ComputeMessageRepresentative(NullRNG(), NULL, 0, hash, hashIdentifier, messageEmpty, computedRepresentative, representativeBitLength);
-	return VerifyBufsEqual(representative, computedRepresentative, computedRepresentative.size());
-}
-
-bool PK_RecoverableSignatureMessageEncodingMethod::VerifyMessageRepresentative(
-	HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-	byte *representative, size_t representativeBitLength) const
-{
-	SecByteBlock recoveredMessage(MaxRecoverableLength(representativeBitLength, hashIdentifier.second, hash.DigestSize()));
-	DecodingResult result = RecoverMessageFromRepresentative(
-		hash, hashIdentifier, messageEmpty, representative, representativeBitLength, recoveredMessage);
-	return result.isValidCoding && result.messageLength == 0;
-}
-
-void TF_SignerBase::InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const
-{
-	PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-	HashIdentifier id = GetHashIdentifier();
-	const MessageEncodingInterface &encoding = GetMessageEncodingInterface();
-
-	if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize()))
-		throw PK_SignatureScheme::KeyTooShort();
-
-	size_t maxRecoverableLength = encoding.MaxRecoverableLength(MessageRepresentativeBitLength(), GetHashIdentifier().second, ma.AccessHash().DigestSize());
-
-	if (maxRecoverableLength == 0)
-		{throw NotImplemented("TF_SignerBase: this algorithm does not support messsage recovery or the key is too short");}
-	if (recoverableMessageLength > maxRecoverableLength)
-		throw InvalidArgument("TF_SignerBase: the recoverable message part is too long for the given key and algorithm");
-
-	ma.m_recoverableMessage.Assign(recoverableMessage, recoverableMessageLength);
-	encoding.ProcessRecoverableMessage(
-		ma.AccessHash(),
-		recoverableMessage, recoverableMessageLength,
-		NULL, 0, ma.m_semisignature);
-}
-
-size_t TF_SignerBase::SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart) const
-{
-	CRYPTOPP_UNUSED(restart);
-
-	PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-	HashIdentifier id = GetHashIdentifier();
-	const MessageEncodingInterface &encoding = GetMessageEncodingInterface();
-
-	if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize()))
-		throw PK_SignatureScheme::KeyTooShort();
-
-	SecByteBlock representative(MessageRepresentativeLength());
-	encoding.ComputeMessageRepresentative(rng,
-		ma.m_recoverableMessage, ma.m_recoverableMessage.size(),
-		ma.AccessHash(), id, ma.m_empty,
-		representative, MessageRepresentativeBitLength());
-	ma.m_empty = true;
-
-	Integer r(representative, representative.size());
-	size_t signatureLength = SignatureLength();
-	GetTrapdoorFunctionInterface().CalculateRandomizedInverse(rng, r).Encode(signature, signatureLength);
-	return signatureLength;
-}
-
-void TF_VerifierBase::InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const
-{
-	PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-	HashIdentifier id = GetHashIdentifier();
-	const MessageEncodingInterface &encoding = GetMessageEncodingInterface();
-
-	if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize()))
-		throw PK_SignatureScheme::KeyTooShort();
-
-	ma.m_representative.New(MessageRepresentativeLength());
-	Integer x = GetTrapdoorFunctionInterface().ApplyFunction(Integer(signature, signatureLength));
-	if (x.BitCount() > MessageRepresentativeBitLength())
-		x = Integer::Zero();	// don't return false here to prevent timing attack
-	x.Encode(ma.m_representative, ma.m_representative.size());
-}
-
-bool TF_VerifierBase::VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const
-{
-	PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-	HashIdentifier id = GetHashIdentifier();
-	const MessageEncodingInterface &encoding = GetMessageEncodingInterface();
-
-	if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize()))
-		throw PK_SignatureScheme::KeyTooShort();
-
-	bool result = encoding.VerifyMessageRepresentative(
-		ma.AccessHash(), id, ma.m_empty, ma.m_representative, MessageRepresentativeBitLength());
-	ma.m_empty = true;
-	return result;
-}
-
-DecodingResult TF_VerifierBase::RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &messageAccumulator) const
-{
-	PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-	HashIdentifier id = GetHashIdentifier();
-	const MessageEncodingInterface &encoding = GetMessageEncodingInterface();
-
-	if (MessageRepresentativeBitLength() < encoding.MinRepresentativeBitLength(id.second, ma.AccessHash().DigestSize()))
-		throw PK_SignatureScheme::KeyTooShort();
-
-	DecodingResult result = encoding.RecoverMessageFromRepresentative(
-		ma.AccessHash(), id, ma.m_empty, ma.m_representative, MessageRepresentativeBitLength(), recoveredMessage);
-	ma.m_empty = true;
-	return result;
-}
-
-DecodingResult TF_DecryptorBase::Decrypt(RandomNumberGenerator &rng, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs &parameters) const
-{
-	if (ciphertextLength != FixedCiphertextLength())
-			throw InvalidArgument(AlgorithmName() + ": ciphertext length of " + IntToString(ciphertextLength) + " doesn't match the required length of " + IntToString(FixedCiphertextLength()) + " for this key");
-
-	SecByteBlock paddedBlock(PaddedBlockByteLength());
-	Integer x = GetTrapdoorFunctionInterface().CalculateInverse(rng, Integer(ciphertext, ciphertextLength));
-	if (x.ByteCount() > paddedBlock.size())
-		x = Integer::Zero();	// don't return false here to prevent timing attack
-	x.Encode(paddedBlock, paddedBlock.size());
-	return GetMessageEncodingInterface().Unpad(paddedBlock, PaddedBlockBitLength(), plaintext, parameters);
-}
-
-void TF_EncryptorBase::Encrypt(RandomNumberGenerator &rng, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs &parameters) const
-{
-	if (plaintextLength > FixedMaxPlaintextLength())
-	{
-		if (FixedMaxPlaintextLength() < 1)
-			throw InvalidArgument(AlgorithmName() + ": this key is too short to encrypt any messages");
-		else
-			throw InvalidArgument(AlgorithmName() + ": message length of " + IntToString(plaintextLength) + " exceeds the maximum of " + IntToString(FixedMaxPlaintextLength()) + " for this public key");
-	}
-
-	SecByteBlock paddedBlock(PaddedBlockByteLength());
-	GetMessageEncodingInterface().Pad(rng, plaintext, plaintextLength, paddedBlock, PaddedBlockBitLength(), parameters);
-	GetTrapdoorFunctionInterface().ApplyRandomizedFunction(rng, Integer(paddedBlock, paddedBlock.size())).Encode(ciphertext, FixedCiphertextLength());
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/pubkey.h b/src-cryptopp/pubkey.h
deleted file mode 100644
index 9a89d38..0000000
--- a/src-cryptopp/pubkey.h
+++ /dev/null
@@ -1,2255 +0,0 @@
-// pubkey.h - written and placed in the public domain by Wei Dai
-
-//! \file pubkey.h
-//! \brief This file contains helper classes/functions for implementing public key algorithms.
-//! \details The class hierachies in this header file tend to look like this:
-//!
-//! <pre>
-//!                   x1
-//!                  +--+
-//!                  |  |
-//!                 y1  z1
-//!                  |  |
-//!             x2<y1>  x2<z1>
-//!                  |  |
-//!                 y2  z2
-//!                  |  |
-//!             x3<y2>  x3<z2>
-//!                  |  |
-//!                 y3  z3
-//! </pre>
-//!
-//! <ul>
-//!   <li>x1, y1, z1 are abstract interface classes defined in cryptlib.h
-//!   <li>x2, y2, z2 are implementations of the interfaces using "abstract policies", which
-//! 	  are pure virtual functions that should return interfaces to interchangeable algorithms.
-//! 	  These classes have \p Base suffixes.
-//!   <li>x3, y3, z3 hold actual algorithms and implement those virtual functions.
-//! 	  These classes have \p Impl suffixes.
-//! </ul>
-//!
-//! \details The \p TF_ prefix means an implementation using trapdoor functions on integers.
-//! \details The \p DL_ prefix means an implementation using group operations in groups where discrete log is hard.
-
-#ifndef CRYPTOPP_PUBKEY_H
-#define CRYPTOPP_PUBKEY_H
-
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4702)
-#endif
-
-#include "cryptlib.h"
-#include "integer.h"
-#include "algebra.h"
-#include "modarith.h"
-#include "filters.h"
-#include "eprecomp.h"
-#include "fips140.h"
-#include "argnames.h"
-#include "smartptr.h"
-#include "stdcpp.h"
-
-// VC60 workaround: this macro is defined in shlobj.h and conflicts with a template parameter used in this file
-#undef INTERFACE
-
-#if defined(__SUNPRO_CC)
-# define MAYBE_RETURN(x) return x
-#else
-# define MAYBE_RETURN(x) CRYPTOPP_UNUSED(x)
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class TrapdoorFunctionBounds
-//! \brief Provides range for plaintext and ciphertext lengths
-//! \details A trapdoor function is a function that is easy to compute in one direction,
-//!   but difficult to compute in the opposite direction without special knowledge.
-//!   The special knowledge is usually the private key.
-//! \details Trapdoor functions only handle messages of a limited length or size.
-//!   \p MaxPreimage is the plaintext's maximum length, and \p MaxImage is the
-//!   ciphertext's maximum length.
-//! \sa TrapdoorFunctionBounds(), RandomizedTrapdoorFunction(), TrapdoorFunction(),
-//!   RandomizedTrapdoorFunctionInverse() and TrapdoorFunctionInverse()
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TrapdoorFunctionBounds
-{
-public:
-	virtual ~TrapdoorFunctionBounds() {}
-
-	//! \brief Returns the maximum size of a message before the trapdoor function is applied
-	//! \returns the maximum size of a message before the trapdoor function is applied
-	//! \details Derived classes must implement \p PreimageBound().
-	virtual Integer PreimageBound() const =0;
-	//! \brief Returns the maximum size of a message after the trapdoor function is applied
-	//! \returns the maximum size of a message after the trapdoor function is applied
-	//! \details Derived classes must implement \p ImageBound().
-	virtual Integer ImageBound() const =0;
-	//! \brief Returns the maximum size of a message before the trapdoor function is applied bound to a public key
-	//! \returns the maximum size of a message before the trapdoor function is applied bound to a public key
-	//! \details The default implementation returns <tt>PreimageBound() - 1</tt>.
-	virtual Integer MaxPreimage() const {return --PreimageBound();}
-	//! \brief Returns the maximum size of a message after the trapdoor function is applied bound to a public key
-	//! \returns the the maximum size of a message after the trapdoor function is applied bound to a public key
-	//! \details The default implementation returns <tt>ImageBound() - 1</tt>.
-	virtual Integer MaxImage() const {return --ImageBound();}
-};
-
-//! \class RandomizedTrapdoorFunction
-//! \brief Applies the trapdoor function, using random data if required
-//! \details \p ApplyFunction() is the foundation for encrypting a message under a public key.
-//!   Derived classes will override it at some point.
-//! \sa TrapdoorFunctionBounds(), RandomizedTrapdoorFunction(), TrapdoorFunction(),
-//!   RandomizedTrapdoorFunctionInverse() and TrapdoorFunctionInverse()
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE RandomizedTrapdoorFunction : public TrapdoorFunctionBounds
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~RandomizedTrapdoorFunction() { }
-#endif
-
-	//! \brief Applies the trapdoor function, using random data if required
-	//! \param rng a \p RandomNumberGenerator derived class
-	//! \param x the message on which the encryption function is applied
-	//! \returns the message \p x encrypted under the public key
-	//! \details \p ApplyRandomizedFunction is a generalization of encryption under a public key
-	//!    cryptosystem. The \p RandomNumberGenerator may (or may not) be required.
-	//!    Derived classes must implement it.
-	virtual Integer ApplyRandomizedFunction(RandomNumberGenerator &rng, const Integer &x) const =0;
-
-	//! \brief Determines if the encryption algorithm is randomized
-	//! \returns \p true if the encryption algorithm is randomized, \p false otherwise
-	//! \details If \p IsRandomized() returns \p false, then \p NullRNG() can be used.
-	virtual bool IsRandomized() const {return true;}
-};
-
-//! \class TrapdoorFunction
-//! \brief Applies the trapdoor function
-//! \details \p ApplyFunction() is the foundation for encrypting a message under a public key.
-//!    Derived classes will override it at some point.
-//! \sa TrapdoorFunctionBounds(), RandomizedTrapdoorFunction(), TrapdoorFunction(),
-//!   RandomizedTrapdoorFunctionInverse() and TrapdoorFunctionInverse()
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TrapdoorFunction : public RandomizedTrapdoorFunction
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TrapdoorFunction() { }
-#endif
-
-	//! \brief Applies the trapdoor function
-	//! \param rng a \p RandomNumberGenerator derived class
-	//! \param x the message on which the encryption function is applied
-	//! \details \p ApplyRandomizedFunction is a generalization of encryption under a public key
-	//!    cryptosystem. The \p RandomNumberGenerator may (or may not) be required.
-	//! \details Internally, \p ApplyRandomizedFunction() calls \p ApplyFunction() \a
-	//!   without the \p RandomNumberGenerator.
-	Integer ApplyRandomizedFunction(RandomNumberGenerator &rng, const Integer &x) const
-		{CRYPTOPP_UNUSED(rng); return ApplyFunction(x);}
-	bool IsRandomized() const {return false;}
-
-	//! \brief Applies the trapdoor
-	//! \param x the message on which the encryption function is applied
-	//! \returns the message \p x encrypted under the public key
-	//! \details \p ApplyFunction is a generalization of encryption under a public key
-	//!    cryptosystem. Derived classes must implement it.
-	virtual Integer ApplyFunction(const Integer &x) const =0;
-};
-
-//! \class RandomizedTrapdoorFunctionInverse
-//! \brief Applies the inverse of the trapdoor function, using random data if required
-//! \details \p CalculateInverse() is the foundation for decrypting a message under a private key
-//!   in a public key cryptosystem. Derived classes will override it at some point.
-//! \sa TrapdoorFunctionBounds(), RandomizedTrapdoorFunction(), TrapdoorFunction(),
-//!   RandomizedTrapdoorFunctionInverse() and TrapdoorFunctionInverse()
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE RandomizedTrapdoorFunctionInverse
-{
-public:
-	virtual ~RandomizedTrapdoorFunctionInverse() {}
-
-	//! \brief Applies the inverse of the trapdoor function, using random data if required
-	//! \param rng a \p RandomNumberGenerator derived class
-	//! \param x the message on which the decryption function is applied
-	//! \returns the message \p x decrypted under the private key
-	//! \details \p CalculateRandomizedInverse is a generalization of decryption using the private key
-	//!    The \p RandomNumberGenerator may (or may not) be required. Derived classes must implement it.
-	virtual Integer CalculateRandomizedInverse(RandomNumberGenerator &rng, const Integer &x) const =0;
-
-	//! \brief Determines if the decryption algorithm is randomized
-	//! \returns \p true if the decryption algorithm is randomized, \p false otherwise
-	//! \details If \p IsRandomized() returns \p false, then \p NullRNG() can be used.
-	virtual bool IsRandomized() const {return true;}
-};
-
-//! \class TrapdoorFunctionInverse
-//! \brief Applies the inverse of the trapdoor function
-//! \details \p CalculateInverse() is the foundation for decrypting a message under a private key
-//!   in a public key cryptosystem. Derived classes will override it at some point.
-//! \sa TrapdoorFunctionBounds(), RandomizedTrapdoorFunction(), TrapdoorFunction(),
-//!   RandomizedTrapdoorFunctionInverse() and TrapdoorFunctionInverse()
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TrapdoorFunctionInverse : public RandomizedTrapdoorFunctionInverse
-{
-public:
-	virtual ~TrapdoorFunctionInverse() {}
-
-	//! \brief Applies the inverse of the trapdoor function
-	//! \param rng a \p RandomNumberGenerator derived class
-	//! \param x the message on which the decryption function is applied
-	//! \returns the message \p x decrypted under the private key
-	//! \details \p CalculateRandomizedInverse is a generalization of decryption using the private key
-	//! \details Internally, \p CalculateRandomizedInverse() calls \p CalculateInverse() \a
-	//!   without the \p RandomNumberGenerator.
-	Integer CalculateRandomizedInverse(RandomNumberGenerator &rng, const Integer &x) const
-		{return CalculateInverse(rng, x);}
-
-	//! \brief Determines if the decryption algorithm is randomized
-	//! \returns \p true if the decryption algorithm is randomized, \p false otherwise
-	//! \details If \p IsRandomized() returns \p false, then \p NullRNG() can be used.
-	bool IsRandomized() const {return false;}
-
-	//! \brief Calculates the inverse of an element
-	//! \param rng a \p RandomNumberGenerator derived class
-	//! \param x the element
-	//! \returns the inverse of the element in the group
-	virtual Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const =0;
-};
-
-// ********************************************************
-
-//! \class PK_EncryptionMessageEncodingMethod
-//! \brief Message encoding method for public key encryption
-class CRYPTOPP_NO_VTABLE PK_EncryptionMessageEncodingMethod
-{
-public:
-	virtual ~PK_EncryptionMessageEncodingMethod() {}
-
-	virtual bool ParameterSupported(const char *name) const
-		{CRYPTOPP_UNUSED(name); return false;}
-
-	//! max size of unpadded message in bytes, given max size of padded message in bits (1 less than size of modulus)
-	virtual size_t MaxUnpaddedLength(size_t paddedLength) const =0;
-
-	virtual void Pad(RandomNumberGenerator &rng, const byte *raw, size_t inputLength, byte *padded, size_t paddedBitLength, const NameValuePairs &parameters) const =0;
-
-	virtual DecodingResult Unpad(const byte *padded, size_t paddedBitLength, byte *raw, const NameValuePairs &parameters) const =0;
-};
-
-// ********************************************************
-
-//! \class TF_Base
-//! \brief The base for trapdoor based cryptosystems
-//! \tparam TFI trapdoor function interface derived class
-//! \tparam MEI message encoding interface derived class
-template <class TFI, class MEI>
-class CRYPTOPP_NO_VTABLE TF_Base
-{
-protected:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_Base() { }
-#endif
-
-	virtual const TrapdoorFunctionBounds & GetTrapdoorFunctionBounds() const =0;
-
-	typedef TFI TrapdoorFunctionInterface;
-	virtual const TrapdoorFunctionInterface & GetTrapdoorFunctionInterface() const =0;
-
-	typedef MEI MessageEncodingInterface;
-	virtual const MessageEncodingInterface & GetMessageEncodingInterface() const =0;
-};
-
-// ********************************************************
-
-//! \class PK_FixedLengthCryptoSystemImpl
-//! \brief Public key trapdoor function default implementation
-//! \tparam BASE public key cryptosystem with a fixed length
-template <class BASE>
-class CRYPTOPP_NO_VTABLE PK_FixedLengthCryptoSystemImpl : public BASE
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~PK_FixedLengthCryptoSystemImpl() { }
-#endif
-
-	size_t MaxPlaintextLength(size_t ciphertextLength) const
-		{return ciphertextLength == FixedCiphertextLength() ? FixedMaxPlaintextLength() : 0;}
-	size_t CiphertextLength(size_t plaintextLength) const
-		{return plaintextLength <= FixedMaxPlaintextLength() ? FixedCiphertextLength() : 0;}
-
-	virtual size_t FixedMaxPlaintextLength() const =0;
-	virtual size_t FixedCiphertextLength() const =0;
-};
-
-//! \class TF_CryptoSystemBase
-//! \brief Trapdoor function cryptosystem base class
-//! \tparam INTERFACE public key cryptosystem base interface
-//! \tparam BASE public key cryptosystem implementation base
-template <class INTERFACE, class BASE>
-class CRYPTOPP_NO_VTABLE TF_CryptoSystemBase : public PK_FixedLengthCryptoSystemImpl<INTERFACE>, protected BASE
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_CryptoSystemBase() { }
-#endif
-
-	bool ParameterSupported(const char *name) const {return this->GetMessageEncodingInterface().ParameterSupported(name);}
-	size_t FixedMaxPlaintextLength() const {return this->GetMessageEncodingInterface().MaxUnpaddedLength(PaddedBlockBitLength());}
-	size_t FixedCiphertextLength() const {return this->GetTrapdoorFunctionBounds().MaxImage().ByteCount();}
-
-protected:
-	size_t PaddedBlockByteLength() const {return BitsToBytes(PaddedBlockBitLength());}
-	// Coverity finding on potential overflow/underflow.
-	size_t PaddedBlockBitLength() const {return SaturatingSubtract(this->GetTrapdoorFunctionBounds().PreimageBound().BitCount(),1U);}
-};
-
-//! \class TF_DecryptorBase
-//! \brief Trapdoor function cryptosystems decryption base class
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TF_DecryptorBase : public TF_CryptoSystemBase<PK_Decryptor, TF_Base<TrapdoorFunctionInverse, PK_EncryptionMessageEncodingMethod> >
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_DecryptorBase() { }
-#endif
-
-	DecodingResult Decrypt(RandomNumberGenerator &rng, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs &parameters = g_nullNameValuePairs) const;
-};
-
-//! \class TF_DecryptorBase
-//! \brief Trapdoor function cryptosystems encryption base class
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TF_EncryptorBase : public TF_CryptoSystemBase<PK_Encryptor, TF_Base<RandomizedTrapdoorFunction, PK_EncryptionMessageEncodingMethod> >
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_EncryptorBase() { }
-#endif
-
-	void Encrypt(RandomNumberGenerator &rng, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs &parameters = g_nullNameValuePairs) const;
-};
-
-// ********************************************************
-
-// Typedef change due to Clang, http://github.com/weidai11/cryptopp/issues/300
-typedef std::pair<const byte *, unsigned int> HashIdentifier;
-
-//! \class PK_SignatureMessageEncodingMethod
-//! \brief Interface for message encoding method for public key signature schemes.
-//! \details \p PK_SignatureMessageEncodingMethod provides interfaces for message
-//!   encoding method for public key signature schemes. The methods support both
-//!   trapdoor functions (<tt>TF_*</tt>) and discrete logarithm (<tt>DL_*</tt>)
-//!   based schemes.
-class CRYPTOPP_NO_VTABLE PK_SignatureMessageEncodingMethod
-{
-public:
-	virtual ~PK_SignatureMessageEncodingMethod() {}
-
-	virtual size_t MinRepresentativeBitLength(size_t hashIdentifierLength, size_t digestLength) const
-		{CRYPTOPP_UNUSED(hashIdentifierLength); CRYPTOPP_UNUSED(digestLength); return 0;}
-	virtual size_t MaxRecoverableLength(size_t representativeBitLength, size_t hashIdentifierLength, size_t digestLength) const
-		{CRYPTOPP_UNUSED(representativeBitLength); CRYPTOPP_UNUSED(representativeBitLength); CRYPTOPP_UNUSED(hashIdentifierLength); CRYPTOPP_UNUSED(digestLength); return 0;}
-
-	bool IsProbabilistic() const
-		{return true;}
-	bool AllowNonrecoverablePart() const
-		{throw NotImplemented("PK_MessageEncodingMethod: this signature scheme does not support message recovery");}
-	virtual bool RecoverablePartFirst() const
-		{throw NotImplemented("PK_MessageEncodingMethod: this signature scheme does not support message recovery");}
-
-	// for verification, DL
-	virtual void ProcessSemisignature(HashTransformation &hash, const byte *semisignature, size_t semisignatureLength) const
-		{CRYPTOPP_UNUSED(hash); CRYPTOPP_UNUSED(semisignature); CRYPTOPP_UNUSED(semisignatureLength);}
-
-	// for signature
-	virtual void ProcessRecoverableMessage(HashTransformation &hash,
-		const byte *recoverableMessage, size_t recoverableMessageLength,
-		const byte *presignature, size_t presignatureLength,
-		SecByteBlock &semisignature) const
-	{
-		CRYPTOPP_UNUSED(hash);CRYPTOPP_UNUSED(recoverableMessage); CRYPTOPP_UNUSED(recoverableMessageLength);
-		CRYPTOPP_UNUSED(presignature); CRYPTOPP_UNUSED(presignatureLength); CRYPTOPP_UNUSED(semisignature);
-		if (RecoverablePartFirst())
-			CRYPTOPP_ASSERT(!"ProcessRecoverableMessage() not implemented");
-	}
-
-	virtual void ComputeMessageRepresentative(RandomNumberGenerator &rng,
-		const byte *recoverableMessage, size_t recoverableMessageLength,
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const =0;
-
-	virtual bool VerifyMessageRepresentative(
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const =0;
-
-	virtual DecodingResult RecoverMessageFromRepresentative(	// for TF
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength,
-		byte *recoveredMessage) const
-		{CRYPTOPP_UNUSED(hash);CRYPTOPP_UNUSED(hashIdentifier); CRYPTOPP_UNUSED(messageEmpty);
-		CRYPTOPP_UNUSED(representative); CRYPTOPP_UNUSED(representativeBitLength); CRYPTOPP_UNUSED(recoveredMessage);
-		throw NotImplemented("PK_MessageEncodingMethod: this signature scheme does not support message recovery");}
-
-	virtual DecodingResult RecoverMessageFromSemisignature(		// for DL
-		HashTransformation &hash, HashIdentifier hashIdentifier,
-		const byte *presignature, size_t presignatureLength,
-		const byte *semisignature, size_t semisignatureLength,
-		byte *recoveredMessage) const
-		{CRYPTOPP_UNUSED(hash);CRYPTOPP_UNUSED(hashIdentifier); CRYPTOPP_UNUSED(presignature); CRYPTOPP_UNUSED(presignatureLength);
-		CRYPTOPP_UNUSED(semisignature); CRYPTOPP_UNUSED(semisignatureLength); CRYPTOPP_UNUSED(recoveredMessage);
-		throw NotImplemented("PK_MessageEncodingMethod: this signature scheme does not support message recovery");}
-
-	// VC60 workaround
-	struct HashIdentifierLookup
-	{
-		template <class H> struct HashIdentifierLookup2
-		{
-			static HashIdentifier CRYPTOPP_API Lookup()
-			{
-				return HashIdentifier((const byte *)NULL, 0);
-			}
-		};
-	};
-};
-
-//! \class PK_DeterministicSignatureMessageEncodingMethod
-//! \brief Interface for message encoding method for public key signature schemes.
-//! \details \p PK_DeterministicSignatureMessageEncodingMethod provides interfaces
-//!   for message encoding method for public key signature schemes.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_DeterministicSignatureMessageEncodingMethod : public PK_SignatureMessageEncodingMethod
-{
-public:
-	bool VerifyMessageRepresentative(
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const;
-};
-
-//! \class PK_RecoverableSignatureMessageEncodingMethod
-//! \brief Interface for message encoding method for public key signature schemes.
-//! \details \p PK_RecoverableSignatureMessageEncodingMethod provides interfaces
-//!   for message encoding method for public key signature schemes.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_RecoverableSignatureMessageEncodingMethod : public PK_SignatureMessageEncodingMethod
-{
-public:
-	bool VerifyMessageRepresentative(
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const;
-};
-
-//! \class DL_SignatureMessageEncodingMethod_DSA
-//! \brief Interface for message encoding method for public key signature schemes.
-//! \details \p DL_SignatureMessageEncodingMethod_DSA provides interfaces
-//!   for message encoding method for DSA.
-class CRYPTOPP_DLL DL_SignatureMessageEncodingMethod_DSA : public PK_DeterministicSignatureMessageEncodingMethod
-{
-public:
-	void ComputeMessageRepresentative(RandomNumberGenerator &rng,
-		const byte *recoverableMessage, size_t recoverableMessageLength,
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const;
-};
-
-//! \class DL_SignatureMessageEncodingMethod_NR
-//! \brief Interface for message encoding method for public key signature schemes.
-//! \details \p DL_SignatureMessageEncodingMethod_NR provides interfaces
-//!   for message encoding method for Nyberg-Rueppel.
-class CRYPTOPP_DLL DL_SignatureMessageEncodingMethod_NR : public PK_DeterministicSignatureMessageEncodingMethod
-{
-public:
-	void ComputeMessageRepresentative(RandomNumberGenerator &rng,
-		const byte *recoverableMessage, size_t recoverableMessageLength,
-		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
-		byte *representative, size_t representativeBitLength) const;
-};
-
-//! \class PK_MessageAccumulatorBase
-//! \brief Interface for message encoding method for public key signature schemes.
-//! \details \p PK_MessageAccumulatorBase provides interfaces
-//!   for message encoding method.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_MessageAccumulatorBase : public PK_MessageAccumulator
-{
-public:
-	PK_MessageAccumulatorBase() : m_empty(true) {}
-
-	virtual HashTransformation & AccessHash() =0;
-
-	void Update(const byte *input, size_t length)
-	{
-		AccessHash().Update(input, length);
-		m_empty = m_empty && length == 0;
-	}
-
-	SecByteBlock m_recoverableMessage, m_representative, m_presignature, m_semisignature;
-	Integer m_k, m_s;
-	bool m_empty;
-};
-
-//! \class PK_MessageAccumulatorImpl
-//! \brief Interface for message encoding method for public key signature schemes.
-//! \details \p PK_MessageAccumulatorBase provides interfaces
-//!   for message encoding method.
-template <class HASH_ALGORITHM>
-class PK_MessageAccumulatorImpl : public PK_MessageAccumulatorBase, protected ObjectHolder<HASH_ALGORITHM>
-{
-public:
-	HashTransformation & AccessHash() {return this->m_object;}
-};
-
-//! _
-template <class INTERFACE, class BASE>
-class CRYPTOPP_NO_VTABLE TF_SignatureSchemeBase : public INTERFACE, protected BASE
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_SignatureSchemeBase() { }
-#endif
-
-	size_t SignatureLength() const
-		{return this->GetTrapdoorFunctionBounds().MaxPreimage().ByteCount();}
-	size_t MaxRecoverableLength() const
-		{return this->GetMessageEncodingInterface().MaxRecoverableLength(MessageRepresentativeBitLength(), GetHashIdentifier().second, GetDigestSize());}
-	size_t MaxRecoverableLengthFromSignatureLength(size_t signatureLength) const
-		{CRYPTOPP_UNUSED(signatureLength); return this->MaxRecoverableLength();}
-
-	bool IsProbabilistic() const
-		{return this->GetTrapdoorFunctionInterface().IsRandomized() || this->GetMessageEncodingInterface().IsProbabilistic();}
-	bool AllowNonrecoverablePart() const
-		{return this->GetMessageEncodingInterface().AllowNonrecoverablePart();}
-	bool RecoverablePartFirst() const
-		{return this->GetMessageEncodingInterface().RecoverablePartFirst();}
-
-protected:
-	size_t MessageRepresentativeLength() const {return BitsToBytes(MessageRepresentativeBitLength());}
-	// Coverity finding on potential overflow/underflow.
-	size_t MessageRepresentativeBitLength() const {return SaturatingSubtract(this->GetTrapdoorFunctionBounds().ImageBound().BitCount(),1U);}
-	virtual HashIdentifier GetHashIdentifier() const =0;
-	virtual size_t GetDigestSize() const =0;
-};
-
-//! _
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TF_SignerBase : public TF_SignatureSchemeBase<PK_Signer, TF_Base<RandomizedTrapdoorFunctionInverse, PK_SignatureMessageEncodingMethod> >
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_SignerBase() { }
-#endif
-
-	void InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const;
-	size_t SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart=true) const;
-};
-
-//! _
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE TF_VerifierBase : public TF_SignatureSchemeBase<PK_Verifier, TF_Base<TrapdoorFunction, PK_SignatureMessageEncodingMethod> >
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_VerifierBase() { }
-#endif
-
-	void InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const;
-	bool VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const;
-	DecodingResult RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &recoveryAccumulator) const;
-};
-
-// ********************************************************
-
-//! _
-template <class T1, class T2, class T3>
-struct TF_CryptoSchemeOptions
-{
-	typedef T1 AlgorithmInfo;
-	typedef T2 Keys;
-	typedef typename Keys::PrivateKey PrivateKey;
-	typedef typename Keys::PublicKey PublicKey;
-	typedef T3 MessageEncodingMethod;
-};
-
-//! _
-template <class T1, class T2, class T3, class T4>
-struct TF_SignatureSchemeOptions : public TF_CryptoSchemeOptions<T1, T2, T3>
-{
-	typedef T4 HashFunction;
-};
-
-//! _
-template <class BASE, class SCHEME_OPTIONS, class KEY_CLASS>
-class CRYPTOPP_NO_VTABLE TF_ObjectImplBase : public AlgorithmImpl<BASE, typename SCHEME_OPTIONS::AlgorithmInfo>
-{
-public:
-	typedef SCHEME_OPTIONS SchemeOptions;
-	typedef KEY_CLASS KeyClass;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_ObjectImplBase() { }
-#endif
-
-	PublicKey & AccessPublicKey() {return AccessKey();}
-	const PublicKey & GetPublicKey() const {return GetKey();}
-
-	PrivateKey & AccessPrivateKey() {return AccessKey();}
-	const PrivateKey & GetPrivateKey() const {return GetKey();}
-
-	virtual const KeyClass & GetKey() const =0;
-	virtual KeyClass & AccessKey() =0;
-
-	const KeyClass & GetTrapdoorFunction() const {return GetKey();}
-
-	PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const
-	{
-		CRYPTOPP_UNUSED(rng);
-		return new PK_MessageAccumulatorImpl<CPP_TYPENAME SCHEME_OPTIONS::HashFunction>;
-	}
-	PK_MessageAccumulator * NewVerificationAccumulator() const
-	{
-		return new PK_MessageAccumulatorImpl<CPP_TYPENAME SCHEME_OPTIONS::HashFunction>;
-	}
-
-protected:
-	const typename BASE::MessageEncodingInterface & GetMessageEncodingInterface() const
-		{return Singleton<CPP_TYPENAME SCHEME_OPTIONS::MessageEncodingMethod>().Ref();}
-	const TrapdoorFunctionBounds & GetTrapdoorFunctionBounds() const
-		{return GetKey();}
-	const typename BASE::TrapdoorFunctionInterface & GetTrapdoorFunctionInterface() const
-		{return GetKey();}
-
-	// for signature scheme
-	HashIdentifier GetHashIdentifier() const
-	{
-        typedef CPP_TYPENAME SchemeOptions::MessageEncodingMethod::HashIdentifierLookup::template HashIdentifierLookup2<CPP_TYPENAME SchemeOptions::HashFunction> L;
-        return L::Lookup();
-	}
-	size_t GetDigestSize() const
-	{
-		typedef CPP_TYPENAME SchemeOptions::HashFunction H;
-		return H::DIGESTSIZE;
-	}
-};
-
-//! _
-template <class BASE, class SCHEME_OPTIONS, class KEY>
-class TF_ObjectImplExtRef : public TF_ObjectImplBase<BASE, SCHEME_OPTIONS, KEY>
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_ObjectImplExtRef() { }
-#endif
-
-	TF_ObjectImplExtRef(const KEY *pKey = NULL) : m_pKey(pKey) {}
-	void SetKeyPtr(const KEY *pKey) {m_pKey = pKey;}
-
-	const KEY & GetKey() const {return *m_pKey;}
-	KEY & AccessKey() {throw NotImplemented("TF_ObjectImplExtRef: cannot modify refererenced key");}
-
-private:
-	const KEY * m_pKey;
-};
-
-//! _
-template <class BASE, class SCHEME_OPTIONS, class KEY_CLASS>
-class CRYPTOPP_NO_VTABLE TF_ObjectImpl : public TF_ObjectImplBase<BASE, SCHEME_OPTIONS, KEY_CLASS>
-{
-public:
-	typedef KEY_CLASS KeyClass;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~TF_ObjectImpl() { }
-#endif
-
-	const KeyClass & GetKey() const {return m_trapdoorFunction;}
-	KeyClass & AccessKey() {return m_trapdoorFunction;}
-
-private:
-	KeyClass m_trapdoorFunction;
-};
-
-//! _
-template <class SCHEME_OPTIONS>
-class TF_DecryptorImpl : public TF_ObjectImpl<TF_DecryptorBase, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PrivateKey>
-{
-};
-
-//! _
-template <class SCHEME_OPTIONS>
-class TF_EncryptorImpl : public TF_ObjectImpl<TF_EncryptorBase, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PublicKey>
-{
-};
-
-//! _
-template <class SCHEME_OPTIONS>
-class TF_SignerImpl : public TF_ObjectImpl<TF_SignerBase, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PrivateKey>
-{
-};
-
-//! _
-template <class SCHEME_OPTIONS>
-class TF_VerifierImpl : public TF_ObjectImpl<TF_VerifierBase, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PublicKey>
-{
-};
-
-// ********************************************************
-
-//! \class MaskGeneratingFunction
-//! \brief Mask generation function interface
-class CRYPTOPP_NO_VTABLE MaskGeneratingFunction
-{
-public:
-	virtual ~MaskGeneratingFunction() {}
-
-	//! \brief Generate and apply mask
-	//! \param hash HashTransformation derived class
-	//! \param output the destination byte array
-	//! \param outputLength the size fo the the destination byte array
-	//! \param input the message to hash
-	//! \param inputLength the size of the message
-	//! \param mask flag indicating whether to apply the mask
-	virtual void GenerateAndMask(HashTransformation &hash, byte *output, size_t outputLength, const byte *input, size_t inputLength, bool mask = true) const =0;
-};
-
-//! \fn P1363_MGF1KDF2_Common
-//! \brief P1363 mask generation function
-//! \param hash HashTransformation derived class
-//! \param output the destination byte array
-//! \param outputLength the size fo the the destination byte array
-//! \param input the message to hash
-//! \param inputLength the size of the message
-//! \param derivationParams additional derivation parameters
-//! \param derivationParamsLength the size of the additional derivation parameters
-//! \param mask flag indicating whether to apply the mask
-//! \param counterStart starting counter value used in generation function
-CRYPTOPP_DLL void CRYPTOPP_API P1363_MGF1KDF2_Common(HashTransformation &hash, byte *output, size_t outputLength, const byte *input, size_t inputLength, const byte *derivationParams, size_t derivationParamsLength, bool mask, unsigned int counterStart);
-
-//! \class P1363_MGF1
-//! \brief P1363 mask generation function
-class P1363_MGF1 : public MaskGeneratingFunction
-{
-public:
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "MGF1";}
-	void GenerateAndMask(HashTransformation &hash, byte *output, size_t outputLength, const byte *input, size_t inputLength, bool mask = true) const
-	{
-		P1363_MGF1KDF2_Common(hash, output, outputLength, input, inputLength, NULL, 0, mask, 0);
-	}
-};
-
-// ********************************************************
-
-//! \class MaskGeneratingFunction
-//! \brief P1363 key derivation function
-//! \tparam H hash function used in the derivation
-template <class H>
-class P1363_KDF2
-{
-public:
-	static void CRYPTOPP_API DeriveKey(byte *output, size_t outputLength, const byte *input, size_t inputLength, const byte *derivationParams, size_t derivationParamsLength)
-	{
-		H h;
-		P1363_MGF1KDF2_Common(h, output, outputLength, input, inputLength, derivationParams, derivationParamsLength, false, 1);
-	}
-};
-
-// ********************************************************
-
-//! \brief Exception thrown when an invalid group element is encountered
-//! \details Thrown by DecodeElement and AgreeWithStaticPrivateKey
-class DL_BadElement : public InvalidDataFormat
-{
-public:
-	DL_BadElement() : InvalidDataFormat("CryptoPP: invalid group element") {}
-};
-
-//! \brief Interface for Discrete Log (DL) group parameters
-//! \tparam T element in the group
-//! \details The element is usually an Integer, \ref ECP "ECP::Point" or \ref EC2N "EC2N::Point"
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_GroupParameters : public CryptoParameters
-{
-	typedef DL_GroupParameters<T> ThisClass;
-
-public:
-	typedef T Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupParameters() { }
-#endif
-
-	DL_GroupParameters() : m_validationLevel(0) {}
-
-	// CryptoMaterial
-	bool Validate(RandomNumberGenerator &rng, unsigned int level) const
-	{
-		if (!GetBasePrecomputation().IsInitialized())
-			return false;
-
-		if (m_validationLevel > level)
-			return true;
-
-		bool pass = ValidateGroup(rng, level);
-		pass = pass && ValidateElement(level, GetSubgroupGenerator(), &GetBasePrecomputation());
-
-		m_validationLevel = pass ? level+1 : 0;
-
-		return pass;
-	}
-
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-	{
-		return GetValueHelper(this, name, valueType, pValue)
-			CRYPTOPP_GET_FUNCTION_ENTRY(SubgroupOrder)
-			CRYPTOPP_GET_FUNCTION_ENTRY(SubgroupGenerator)
-			;
-	}
-
-	bool SupportsPrecomputation() const {return true;}
-
-	void Precompute(unsigned int precomputationStorage=16)
-	{
-		AccessBasePrecomputation().Precompute(GetGroupPrecomputation(), GetSubgroupOrder().BitCount(), precomputationStorage);
-	}
-
-	void LoadPrecomputation(BufferedTransformation &storedPrecomputation)
-	{
-		AccessBasePrecomputation().Load(GetGroupPrecomputation(), storedPrecomputation);
-		m_validationLevel = 0;
-	}
-
-	void SavePrecomputation(BufferedTransformation &storedPrecomputation) const
-	{
-		GetBasePrecomputation().Save(GetGroupPrecomputation(), storedPrecomputation);
-	}
-
-	//! \brief Retrieves the subgroup generator
-	//! \return the subgroup generator
-	//! \details The subgroup generator is retrieved from the base precomputation
-	virtual const Element & GetSubgroupGenerator() const {return GetBasePrecomputation().GetBase(GetGroupPrecomputation());}
-
-	//! \brief Set the subgroup generator
-	//! \param base the new subgroup generator
-	//! \details The subgroup generator is set in the base precomputation
-	virtual void SetSubgroupGenerator(const Element &base) {AccessBasePrecomputation().SetBase(GetGroupPrecomputation(), base);}
-
-	//! \brief Retrieves the subgroup generator
-	//! \return the subgroup generator
-	//! \details The subgroup generator is retrieved from the base precomputation.
-	virtual Element ExponentiateBase(const Integer &exponent) const
-	{
-		return GetBasePrecomputation().Exponentiate(GetGroupPrecomputation(), exponent);
-	}
-
-	//! \brief Exponentiates an element
-	//! \param base the base elemenet
-	//! \param exponent the exponent to raise the base
-	//! \return the result of the exponentiation
-	//! \details Internally, ExponentiateElement() calls SimultaneousExponentiate().
-	virtual Element ExponentiateElement(const Element &base, const Integer &exponent) const
-	{
-		Element result;
-		SimultaneousExponentiate(&result, base, &exponent, 1);
-		return result;
-	}
-
-	//! \brief Retrieves the group precomputation
-	//! \return a const reference to the group precomputation
-	virtual const DL_GroupPrecomputation<Element> & GetGroupPrecomputation() const =0;
-
-	//! \brief Retrieves the group precomputation
-	//! \return a const reference to the group precomputation using a fixed base
-	virtual const DL_FixedBasePrecomputation<Element> & GetBasePrecomputation() const =0;
-
-	//! \brief Retrieves the group precomputation
-	//! \return a non-const reference to the group precomputation using a fixed base
-	virtual DL_FixedBasePrecomputation<Element> & AccessBasePrecomputation() =0;
-
-	//! \brief Retrieves the subgroup order
-	//! \return the order of subgroup generated by the base element
-	virtual const Integer & GetSubgroupOrder() const =0;
-
-	//! \brief Retrieves the maximum exponent for the group
-	//! \return the maximum exponent for the group
-	virtual Integer GetMaxExponent() const =0;
-
-	//! \brief Retrieves the order of the group
-	//! \return the order of the group
-	//! \details Either GetGroupOrder() or GetCofactor() must be overriden in a derived class.
-	virtual Integer GetGroupOrder() const {return GetSubgroupOrder()*GetCofactor();}
-
-	//! \brief Retrieves the cofactor
-	//! \return the cofactor
-	//! \details Either GetGroupOrder() or GetCofactor() must be overriden in a derived class.
-	virtual Integer GetCofactor() const {return GetGroupOrder()/GetSubgroupOrder();}
-
-	//! \brief Retrieves the encoded element's size
-	//! \param reversible flag indicating the encoding format
-	//! \return encoded element's size, in bytes
-	//! \details The format of the encoded element varies by the underlyinhg type of the element and the
-	//!   reversible flag. GetEncodedElementSize() must be implemented in a derived class.
-	//! \sa GetEncodedElementSize(), EncodeElement(), DecodeElement()
-	virtual unsigned int GetEncodedElementSize(bool reversible) const =0;
-
-	//! \brief Encodes the element
-	//! \param reversible flag indicating the encoding format
-	//! \param element reference to the element to encode
-	//! \param encoded destination byte array for the encoded element
-	//! \details EncodeElement() must be implemented in a derived class.
-	//! \pre <tt>COUNTOF(encoded) == GetEncodedElementSize()</tt>
-	virtual void EncodeElement(bool reversible, const Element &element, byte *encoded) const =0;
-
-	//! \brief Decodes the element
-	//! \param encoded byte array with the encoded element
-	//! \param checkForGroupMembership flag indicating if the element should be validated
-	//! \return Element after decoding
-	//! \details DecodeElement() must be implemented in a derived class.
-	//! \pre <tt>COUNTOF(encoded) == GetEncodedElementSize()</tt>
-	virtual Element DecodeElement(const byte *encoded, bool checkForGroupMembership) const =0;
-
-	//! \brief Converts an element to an Integer
-	//! \param element the element to convert to an Integer
-	//! \return Element after converting to an Integer
-	//! \details ConvertElementToInteger() must be implemented in a derived class.
-	virtual Integer ConvertElementToInteger(const Element &element) const =0;
-
-	//! \brief Check the group for errors
-	//! \param rng RandomNumberGenerator for objects which use randomized testing
-	//! \param level level of thoroughness
-	//! \return true if the tests succeed, false otherwise
-	//! \details There are four levels of thoroughness:
-	//!   <ul>
-	//!   <li>0 - using this object won't cause a crash or exception
-	//!   <li>1 - this object will probably function, and encrypt, sign, other operations correctly
-	//!   <li>2 - ensure this object will function correctly, and perform reasonable security checks
-	//!   <li>3 - perform reasonable security checks, and do checks that may take a long time
-	//!   </ul>
-	//! \details Level 0 does not require a RandomNumberGenerator. A NullRNG() can be used for level 0.
-	//!   Level 1 may not check for weak keys and such. Levels 2 and 3 are recommended.
-	//! \details ValidateGroup() must be implemented in a derived class.
-	virtual bool ValidateGroup(RandomNumberGenerator &rng, unsigned int level) const =0;
-
-	//! \brief Check the element for errors
-	//! \param level level of thoroughness
-	//! \param element element to check
-	//! \param precomp optional pointer to DL_FixedBasePrecomputation
-	//! \return true if the tests succeed, false otherwise
-	//! \details There are four levels of thoroughness:
-	//!   <ul>
-	//!   <li>0 - using this object won't cause a crash or exception
-	//!   <li>1 - this object will probably function, and encrypt, sign, other operations correctly
-	//!   <li>2 - ensure this object will function correctly, and perform reasonable security checks
-	//!   <li>3 - perform reasonable security checks, and do checks that may take a long time
-	//!   </ul>
-	//! \details Level 0 performs group membership checks. Level 1 may not check for weak keys and such.
-	//!   Levels 2 and 3 are recommended.
-	//! \details ValidateElement() must be implemented in a derived class.
-	virtual bool ValidateElement(unsigned int level, const Element &element, const DL_FixedBasePrecomputation<Element> *precomp) const =0;
-
-	virtual bool FastSubgroupCheckAvailable() const =0;
-
-	//! \brief Determines if an element is an identity
-	//! \param element element to check
-	//! \return true if the element is an identity, false otherwise
-	//! \details The identity element or or neutral element is a special element in a group that leaves
-	//!   other elements unchanged when combined with it.
-	//! \details IsIdentity() must be implemented in a derived class.
-	virtual bool IsIdentity(const Element &element) const =0;
-
-	//! \brief Exponentiates a base to multiple exponents
-	//! \param results an array of Elements
-	//! \param base the base to raise to the exponents
-	//! \param exponents an array of exponents
-	//! \param exponentsCount the number of exponents in the array
-	//! \details SimultaneousExponentiate() raises the base to each exponent in the exponents array and stores the
-	//!   result at the respective position in the results array.
-	//! \details SimultaneousExponentiate() must be implemented in a derived class.
-	//! \pre <tt>COUNTOF(results) == exponentsCount</tt>
-	//! \pre <tt>COUNTOF(exponents) == exponentsCount</tt>
-	virtual void SimultaneousExponentiate(Element *results, const Element &base, const Integer *exponents, unsigned int exponentsCount) const =0;
-
-protected:
-	void ParametersChanged() {m_validationLevel = 0;}
-
-private:
-	mutable unsigned int m_validationLevel;
-};
-
-//! \brief Base implmentation of Discrete Log (DL) group parameters
-//! \tparam GROUP_PRECOMP group precomputation class
-//! \tparam BASE_PRECOMP fixed base precomputation class
-//! \tparam BASE class or type of an element
-template <class GROUP_PRECOMP, class BASE_PRECOMP = DL_FixedBasePrecomputationImpl<CPP_TYPENAME GROUP_PRECOMP::Element>, class BASE = DL_GroupParameters<CPP_TYPENAME GROUP_PRECOMP::Element> >
-class DL_GroupParametersImpl : public BASE
-{
-public:
-	typedef GROUP_PRECOMP GroupPrecomputation;
-	typedef typename GROUP_PRECOMP::Element Element;
-	typedef BASE_PRECOMP BasePrecomputation;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_GroupParametersImpl() { }
-#endif
-
-	//! \brief Retrieves the group precomputation
-	//! \return a const reference to the group precomputation
-	const DL_GroupPrecomputation<Element> & GetGroupPrecomputation() const {return m_groupPrecomputation;}
-
-	//! \brief Retrieves the group precomputation
-	//! \return a const reference to the group precomputation using a fixed base
-	const DL_FixedBasePrecomputation<Element> & GetBasePrecomputation() const {return m_gpc;}
-
-	//! \brief Retrieves the group precomputation
-	//! \return a non-const reference to the group precomputation using a fixed base
-	DL_FixedBasePrecomputation<Element> & AccessBasePrecomputation() {return m_gpc;}
-
-protected:
-	GROUP_PRECOMP m_groupPrecomputation;
-	BASE_PRECOMP m_gpc;
-};
-
-//! \brief Base class for a Discrete Log (DL) key
-//! \tparam T class or type of an element
-//! \details The element is usually an Integer, \ref ECP "ECP::Point" or \ref EC2N "EC2N::Point"
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_Key
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Key() { }
-#endif
-
-	//! \brief Retrieves abstract group parameters
-	//! \return a const reference to the group parameters
-	virtual const DL_GroupParameters<T> & GetAbstractGroupParameters() const =0;
-	//! \brief Retrieves abstract group parameters
-	//! \return a non-const reference to the group parameters
-	virtual DL_GroupParameters<T> & AccessAbstractGroupParameters() =0;
-};
-
-//! \brief Interface for Discrete Log (DL) public keys
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_PublicKey : public DL_Key<T>
-{
-	typedef DL_PublicKey<T> ThisClass;
-
-public:
-	typedef T Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PublicKey() { }
-#endif
-
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-	{
-		return GetValueHelper(this, name, valueType, pValue, &this->GetAbstractGroupParameters())
-				CRYPTOPP_GET_FUNCTION_ENTRY(PublicElement);
-	}
-
-	void AssignFrom(const NameValuePairs &source);
-
-	// non-inherited
-	virtual const Element & GetPublicElement() const {return GetPublicPrecomputation().GetBase(this->GetAbstractGroupParameters().GetGroupPrecomputation());}
-	virtual void SetPublicElement(const Element &y) {AccessPublicPrecomputation().SetBase(this->GetAbstractGroupParameters().GetGroupPrecomputation(), y);}
-	virtual Element ExponentiatePublicElement(const Integer &exponent) const
-	{
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-		return GetPublicPrecomputation().Exponentiate(params.GetGroupPrecomputation(), exponent);
-	}
-	virtual Element CascadeExponentiateBaseAndPublicElement(const Integer &baseExp, const Integer &publicExp) const
-	{
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-		return params.GetBasePrecomputation().CascadeExponentiate(params.GetGroupPrecomputation(), baseExp, GetPublicPrecomputation(), publicExp);
-	}
-
-	virtual const DL_FixedBasePrecomputation<T> & GetPublicPrecomputation() const =0;
-	virtual DL_FixedBasePrecomputation<T> & AccessPublicPrecomputation() =0;
-};
-
-//! \brief Interface for Discrete Log (DL) private keys
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_PrivateKey : public DL_Key<T>
-{
-	typedef DL_PrivateKey<T> ThisClass;
-
-public:
-	typedef T Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PrivateKey() { }
-#endif
-
-	void MakePublicKey(DL_PublicKey<T> &pub) const
-	{
-		pub.AccessAbstractGroupParameters().AssignFrom(this->GetAbstractGroupParameters());
-		pub.SetPublicElement(this->GetAbstractGroupParameters().ExponentiateBase(GetPrivateExponent()));
-	}
-
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-	{
-		return GetValueHelper(this, name, valueType, pValue, &this->GetAbstractGroupParameters())
-				CRYPTOPP_GET_FUNCTION_ENTRY(PrivateExponent);
-	}
-
-	void AssignFrom(const NameValuePairs &source)
-	{
-		this->AccessAbstractGroupParameters().AssignFrom(source);
-		AssignFromHelper(this, source)
-			CRYPTOPP_SET_FUNCTION_ENTRY(PrivateExponent);
-	}
-
-	virtual const Integer & GetPrivateExponent() const =0;
-	virtual void SetPrivateExponent(const Integer &x) =0;
-};
-
-template <class T>
-void DL_PublicKey<T>::AssignFrom(const NameValuePairs &source)
-{
-	DL_PrivateKey<T> *pPrivateKey = NULL;
-	if (source.GetThisPointer(pPrivateKey))
-		pPrivateKey->MakePublicKey(*this);
-	else
-	{
-		this->AccessAbstractGroupParameters().AssignFrom(source);
-		AssignFromHelper(this, source)
-			CRYPTOPP_SET_FUNCTION_ENTRY(PublicElement);
-	}
-}
-
-class OID;
-
-//! _
-template <class PK, class GP, class O = OID>
-class DL_KeyImpl : public PK
-{
-public:
-	typedef GP GroupParameters;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_KeyImpl() { }
-#endif
-
-	O GetAlgorithmID() const {return GetGroupParameters().GetAlgorithmID();}
-//	void BERDecode(BufferedTransformation &bt)
-//		{PK::BERDecode(bt);}
-//	void DEREncode(BufferedTransformation &bt) const
-//		{PK::DEREncode(bt);}
-	bool BERDecodeAlgorithmParameters(BufferedTransformation &bt)
-		{AccessGroupParameters().BERDecode(bt); return true;}
-	bool DEREncodeAlgorithmParameters(BufferedTransformation &bt) const
-		{GetGroupParameters().DEREncode(bt); return true;}
-
-	const GP & GetGroupParameters() const {return m_groupParameters;}
-	GP & AccessGroupParameters() {return m_groupParameters;}
-
-private:
-	GP m_groupParameters;
-};
-
-class X509PublicKey;
-class PKCS8PrivateKey;
-
-//! _
-template <class GP>
-class DL_PrivateKeyImpl : public DL_PrivateKey<CPP_TYPENAME GP::Element>, public DL_KeyImpl<PKCS8PrivateKey, GP>
-{
-public:
-	typedef typename GP::Element Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PrivateKeyImpl() { }
-#endif
-
-	// GeneratableCryptoMaterial
-	bool Validate(RandomNumberGenerator &rng, unsigned int level) const
-	{
-		bool pass = GetAbstractGroupParameters().Validate(rng, level);
-
-		const Integer &q = GetAbstractGroupParameters().GetSubgroupOrder();
-		const Integer &x = GetPrivateExponent();
-
-		pass = pass && x.IsPositive() && x < q;
-		if (level >= 1)
-			pass = pass && Integer::Gcd(x, q) == Integer::One();
-		return pass;
-	}
-
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-	{
-		return GetValueHelper<DL_PrivateKey<Element> >(this, name, valueType, pValue).Assignable();
-	}
-
-	void AssignFrom(const NameValuePairs &source)
-	{
-		AssignFromHelper<DL_PrivateKey<Element> >(this, source);
-	}
-
-	void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &params)
-	{
-		if (!params.GetThisObject(this->AccessGroupParameters()))
-			this->AccessGroupParameters().GenerateRandom(rng, params);
-//		std::pair<const byte *, int> seed;
-		Integer x(rng, Integer::One(), GetAbstractGroupParameters().GetMaxExponent());
-//			Integer::ANY, Integer::Zero(), Integer::One(),
-//			params.GetValue("DeterministicKeyGenerationSeed", seed) ? &seed : NULL);
-		SetPrivateExponent(x);
-	}
-
-	bool SupportsPrecomputation() const {return true;}
-
-	void Precompute(unsigned int precomputationStorage=16)
-		{AccessAbstractGroupParameters().Precompute(precomputationStorage);}
-
-	void LoadPrecomputation(BufferedTransformation &storedPrecomputation)
-		{AccessAbstractGroupParameters().LoadPrecomputation(storedPrecomputation);}
-
-	void SavePrecomputation(BufferedTransformation &storedPrecomputation) const
-		{GetAbstractGroupParameters().SavePrecomputation(storedPrecomputation);}
-
-	// DL_Key
-	const DL_GroupParameters<Element> & GetAbstractGroupParameters() const {return this->GetGroupParameters();}
-	DL_GroupParameters<Element> & AccessAbstractGroupParameters() {return this->AccessGroupParameters();}
-
-	// DL_PrivateKey
-	const Integer & GetPrivateExponent() const {return m_x;}
-	void SetPrivateExponent(const Integer &x) {m_x = x;}
-
-	// PKCS8PrivateKey
-	void BERDecodePrivateKey(BufferedTransformation &bt, bool, size_t)
-		{m_x.BERDecode(bt);}
-	void DEREncodePrivateKey(BufferedTransformation &bt) const
-		{m_x.DEREncode(bt);}
-
-private:
-	Integer m_x;
-};
-
-//! _
-template <class BASE, class SIGNATURE_SCHEME>
-class DL_PrivateKey_WithSignaturePairwiseConsistencyTest : public BASE
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PrivateKey_WithSignaturePairwiseConsistencyTest() { }
-#endif
-
-	void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &params)
-	{
-		BASE::GenerateRandom(rng, params);
-
-		if (FIPS_140_2_ComplianceEnabled())
-		{
-			typename SIGNATURE_SCHEME::Signer signer(*this);
-			typename SIGNATURE_SCHEME::Verifier verifier(signer);
-			SignaturePairwiseConsistencyTest_FIPS_140_Only(signer, verifier);
-		}
-	}
-};
-
-//! _
-template <class GP>
-class DL_PublicKeyImpl : public DL_PublicKey<typename GP::Element>, public DL_KeyImpl<X509PublicKey, GP>
-{
-public:
-	typedef typename GP::Element Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_PublicKeyImpl() { }
-#endif
-
-	// CryptoMaterial
-	bool Validate(RandomNumberGenerator &rng, unsigned int level) const
-	{
-		bool pass = GetAbstractGroupParameters().Validate(rng, level);
-		pass = pass && GetAbstractGroupParameters().ValidateElement(level, this->GetPublicElement(), &GetPublicPrecomputation());
-		return pass;
-	}
-
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-	{
-		return GetValueHelper<DL_PublicKey<Element> >(this, name, valueType, pValue).Assignable();
-	}
-
-	void AssignFrom(const NameValuePairs &source)
-	{
-		AssignFromHelper<DL_PublicKey<Element> >(this, source);
-	}
-
-	bool SupportsPrecomputation() const {return true;}
-
-	void Precompute(unsigned int precomputationStorage=16)
-	{
-		AccessAbstractGroupParameters().Precompute(precomputationStorage);
-		AccessPublicPrecomputation().Precompute(GetAbstractGroupParameters().GetGroupPrecomputation(), GetAbstractGroupParameters().GetSubgroupOrder().BitCount(), precomputationStorage);
-	}
-
-	void LoadPrecomputation(BufferedTransformation &storedPrecomputation)
-	{
-		AccessAbstractGroupParameters().LoadPrecomputation(storedPrecomputation);
-		AccessPublicPrecomputation().Load(GetAbstractGroupParameters().GetGroupPrecomputation(), storedPrecomputation);
-	}
-
-	void SavePrecomputation(BufferedTransformation &storedPrecomputation) const
-	{
-		GetAbstractGroupParameters().SavePrecomputation(storedPrecomputation);
-		GetPublicPrecomputation().Save(GetAbstractGroupParameters().GetGroupPrecomputation(), storedPrecomputation);
-	}
-
-	// DL_Key
-	const DL_GroupParameters<Element> & GetAbstractGroupParameters() const {return this->GetGroupParameters();}
-	DL_GroupParameters<Element> & AccessAbstractGroupParameters() {return this->AccessGroupParameters();}
-
-	// DL_PublicKey
-	const DL_FixedBasePrecomputation<Element> & GetPublicPrecomputation() const {return m_ypc;}
-	DL_FixedBasePrecomputation<Element> & AccessPublicPrecomputation() {return m_ypc;}
-
-	// non-inherited
-	bool operator==(const DL_PublicKeyImpl<GP> &rhs) const
-		{return this->GetGroupParameters() == rhs.GetGroupParameters() && this->GetPublicElement() == rhs.GetPublicElement();}
-
-private:
-	typename GP::BasePrecomputation m_ypc;
-};
-
-//! \brief Interface for Elgamal-like signature algorithms
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_ElgamalLikeSignatureAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_ElgamalLikeSignatureAlgorithm() { }
-#endif
-
-	virtual void Sign(const DL_GroupParameters<T> &params, const Integer &privateKey, const Integer &k, const Integer &e, Integer &r, Integer &s) const =0;
-	virtual bool Verify(const DL_GroupParameters<T> &params, const DL_PublicKey<T> &publicKey, const Integer &e, const Integer &r, const Integer &s) const =0;
-	virtual Integer RecoverPresignature(const DL_GroupParameters<T> &params, const DL_PublicKey<T> &publicKey, const Integer &r, const Integer &s) const
-	{
-		CRYPTOPP_UNUSED(params); CRYPTOPP_UNUSED(publicKey); CRYPTOPP_UNUSED(r); CRYPTOPP_UNUSED(s);
-		throw NotImplemented("DL_ElgamalLikeSignatureAlgorithm: this signature scheme does not support message recovery");
-		MAYBE_RETURN(Integer::Zero());
-	}
-	virtual size_t RLen(const DL_GroupParameters<T> &params) const
-		{return params.GetSubgroupOrder().ByteCount();}
-	virtual size_t SLen(const DL_GroupParameters<T> &params) const
-		{return params.GetSubgroupOrder().ByteCount();}
-};
-
-//! \brief Interface for DL key agreement algorithms
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_KeyAgreementAlgorithm
-{
-public:
-	typedef T Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_KeyAgreementAlgorithm() { }
-#endif
-
-	virtual Element AgreeWithEphemeralPrivateKey(const DL_GroupParameters<Element> &params, const DL_FixedBasePrecomputation<Element> &publicPrecomputation, const Integer &privateExponent) const =0;
-	virtual Element AgreeWithStaticPrivateKey(const DL_GroupParameters<Element> &params, const Element &publicElement, bool validateOtherPublicKey, const Integer &privateExponent) const =0;
-};
-
-//! \brief Interface for key derivation algorithms used in DL cryptosystems
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_KeyDerivationAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_KeyDerivationAlgorithm() { }
-#endif
-
-	virtual bool ParameterSupported(const char *name) const
-		{CRYPTOPP_UNUSED(name); return false;}
-	virtual void Derive(const DL_GroupParameters<T> &groupParams, byte *derivedKey, size_t derivedLength, const T &agreedElement, const T &ephemeralPublicKey, const NameValuePairs &derivationParams) const =0;
-};
-
-//! \brief Interface for symmetric encryption algorithms used in DL cryptosystems
-class CRYPTOPP_NO_VTABLE DL_SymmetricEncryptionAlgorithm
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_SymmetricEncryptionAlgorithm() { }
-#endif
-
-	virtual bool ParameterSupported(const char *name) const
-		{CRYPTOPP_UNUSED(name); return false;}
-	virtual size_t GetSymmetricKeyLength(size_t plaintextLength) const =0;
-	virtual size_t GetSymmetricCiphertextLength(size_t plaintextLength) const =0;
-	virtual size_t GetMaxSymmetricPlaintextLength(size_t ciphertextLength) const =0;
-	virtual void SymmetricEncrypt(RandomNumberGenerator &rng, const byte *key, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs &parameters) const =0;
-	virtual DecodingResult SymmetricDecrypt(const byte *key, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs &parameters) const =0;
-};
-
-//! \brief Discrete Log (DL) base interface
-//! \tparam KI public or private key interface
-template <class KI>
-class CRYPTOPP_NO_VTABLE DL_Base
-{
-protected:
-	typedef KI KeyInterface;
-	typedef typename KI::Element Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_Base() { }
-#endif
-
-	const DL_GroupParameters<Element> & GetAbstractGroupParameters() const {return GetKeyInterface().GetAbstractGroupParameters();}
-	DL_GroupParameters<Element> & AccessAbstractGroupParameters() {return AccessKeyInterface().AccessAbstractGroupParameters();}
-
-	virtual KeyInterface & AccessKeyInterface() =0;
-	virtual const KeyInterface & GetKeyInterface() const =0;
-};
-
-//! \brief Discrete Log (DL) signature scheme base implementation
-//! \tparam INTERFACE PK_Signer or PK_Verifier derived class
-//! \tparam DL_Base key base used in the scheme
-//! \details DL_SignatureSchemeBase provides common functions for signers and verifiers.
-//!   DL_Base<DL_PrivateKey> is used for signers, and DL_Base<DL_PublicKey> is used for verifiers.
-template <class INTERFACE, class KEY_INTERFACE>
-class CRYPTOPP_NO_VTABLE DL_SignatureSchemeBase : public INTERFACE, public DL_Base<KEY_INTERFACE>
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_SignatureSchemeBase() { }
-#endif
-
-	//! \brief Provides the signature length
-	//! \returns signature length, in bytes
-	//! \details SignatureLength returns the size required for <tt>r+s</tt>.
-	size_t SignatureLength() const
-	{
-		return GetSignatureAlgorithm().RLen(this->GetAbstractGroupParameters())
-			+ GetSignatureAlgorithm().SLen(this->GetAbstractGroupParameters());
-	}
-
-	//! \brief Provides the maximum recoverable length
-	//! \returns maximum recoverable length, in bytes
-	size_t MaxRecoverableLength() const
-		{return GetMessageEncodingInterface().MaxRecoverableLength(0, GetHashIdentifier().second, GetDigestSize());}
-
-	//! \brief Provides the maximum recoverable length
-	//! \param signatureLength the size fo the signature
-	//! \returns maximum recoverable length based on signature length, in bytes
-	//! \details this function is not implemented and always returns 0.
-	size_t MaxRecoverableLengthFromSignatureLength(size_t signatureLength) const
-		{CRYPTOPP_UNUSED(signatureLength); CRYPTOPP_ASSERT(false); return 0;}	// TODO
-
-	//! \brief Determines if the scheme is probabilistic
-	//! \returns true if the scheme is probabilistic, false otherwise
-	bool IsProbabilistic() const
-		{return true;}
-
-	//! \brief Determines if the scheme has non-recoverable part
-	//! \returns true if the message encoding has a non-recoverable part, false otherwise.
-	bool AllowNonrecoverablePart() const
-		{return GetMessageEncodingInterface().AllowNonrecoverablePart();}
-
-	//! \brief Determines if the scheme allows recoverable part first
-	//! \returns true if the message encoding allows the recoverable part, false otherwise.
-	bool RecoverablePartFirst() const
-		{return GetMessageEncodingInterface().RecoverablePartFirst();}
-
-protected:
-	size_t MessageRepresentativeLength() const {return BitsToBytes(MessageRepresentativeBitLength());}
-	size_t MessageRepresentativeBitLength() const {return this->GetAbstractGroupParameters().GetSubgroupOrder().BitCount();}
-
-	virtual const DL_ElgamalLikeSignatureAlgorithm<CPP_TYPENAME KEY_INTERFACE::Element> & GetSignatureAlgorithm() const =0;
-	virtual const PK_SignatureMessageEncodingMethod & GetMessageEncodingInterface() const =0;
-	virtual HashIdentifier GetHashIdentifier() const =0;
-	virtual size_t GetDigestSize() const =0;
-};
-
-//! \brief Discrete Log (DL) signature scheme signer base implementation
-//! \tparam T
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_SignerBase : public DL_SignatureSchemeBase<PK_Signer, DL_PrivateKey<T> >
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_SignerBase() { }
-#endif
-
-	//! \brief Testing interface
-	//! \param k Integer
-	//! \param e Integer
-	//! \param r Integer
-	//! \param s Integer
-	void RawSign(const Integer &k, const Integer &e, Integer &r, Integer &s) const
-	{
-		const DL_ElgamalLikeSignatureAlgorithm<T> &alg = this->GetSignatureAlgorithm();
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-		const DL_PrivateKey<T> &key = this->GetKeyInterface();
-
-		r = params.ConvertElementToInteger(params.ExponentiateBase(k));
-		alg.Sign(params, key.GetPrivateExponent(), k, e, r, s);
-	}
-
-	void InputRecoverableMessage(PK_MessageAccumulator &messageAccumulator, const byte *recoverableMessage, size_t recoverableMessageLength) const
-	{
-		PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-		ma.m_recoverableMessage.Assign(recoverableMessage, recoverableMessageLength);
-		this->GetMessageEncodingInterface().ProcessRecoverableMessage(ma.AccessHash(),
-			recoverableMessage, recoverableMessageLength,
-			ma.m_presignature, ma.m_presignature.size(),
-			ma.m_semisignature);
-	}
-
-	size_t SignAndRestart(RandomNumberGenerator &rng, PK_MessageAccumulator &messageAccumulator, byte *signature, bool restart) const
-	{
-		this->GetMaterial().DoQuickSanityCheck();
-
-		PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-		const DL_ElgamalLikeSignatureAlgorithm<T> &alg = this->GetSignatureAlgorithm();
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-		const DL_PrivateKey<T> &key = this->GetKeyInterface();
-
-		SecByteBlock representative(this->MessageRepresentativeLength());
-		this->GetMessageEncodingInterface().ComputeMessageRepresentative(
-			rng,
-			ma.m_recoverableMessage, ma.m_recoverableMessage.size(),
-			ma.AccessHash(), this->GetHashIdentifier(), ma.m_empty,
-			representative, this->MessageRepresentativeBitLength());
-		ma.m_empty = true;
-		Integer e(representative, representative.size());
-
-		// hash message digest into random number k to prevent reusing the same k on a different messages
-		// after virtual machine rollback
-		if (rng.CanIncorporateEntropy())
-			rng.IncorporateEntropy(representative, representative.size());
-		Integer k(rng, 1, params.GetSubgroupOrder()-1);
-		Integer r, s;
-		r = params.ConvertElementToInteger(params.ExponentiateBase(k));
-		alg.Sign(params, key.GetPrivateExponent(), k, e, r, s);
-
-		/*
-		Integer r, s;
-		if (this->MaxRecoverableLength() > 0)
-			r.Decode(ma.m_semisignature, ma.m_semisignature.size());
-		else
-			r.Decode(ma.m_presignature, ma.m_presignature.size());
-		alg.Sign(params, key.GetPrivateExponent(), ma.m_k, e, r, s);
-		*/
-
-		size_t rLen = alg.RLen(params);
-		r.Encode(signature, rLen);
-		s.Encode(signature+rLen, alg.SLen(params));
-
-		if (restart)
-			RestartMessageAccumulator(rng, ma);
-
-		return this->SignatureLength();
-	}
-
-protected:
-	void RestartMessageAccumulator(RandomNumberGenerator &rng, PK_MessageAccumulatorBase &ma) const
-	{
-		// k needs to be generated before hashing for signature schemes with recovery
-		// but to defend against VM rollbacks we need to generate k after hashing.
-		// so this code is commented out, since no DL-based signature scheme with recovery
-		// has been implemented in Crypto++ anyway
-		/*
-		const DL_ElgamalLikeSignatureAlgorithm<T> &alg = this->GetSignatureAlgorithm();
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-		ma.m_k.Randomize(rng, 1, params.GetSubgroupOrder()-1);
-		ma.m_presignature.New(params.GetEncodedElementSize(false));
-		params.ConvertElementToInteger(params.ExponentiateBase(ma.m_k)).Encode(ma.m_presignature, ma.m_presignature.size());
-		*/
-		CRYPTOPP_UNUSED(rng); CRYPTOPP_UNUSED(ma);
-	}
-};
-
-//! _
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_VerifierBase : public DL_SignatureSchemeBase<PK_Verifier, DL_PublicKey<T> >
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_VerifierBase() { }
-#endif
-
-	void InputSignature(PK_MessageAccumulator &messageAccumulator, const byte *signature, size_t signatureLength) const
-	{
-		CRYPTOPP_UNUSED(signature); CRYPTOPP_UNUSED(signatureLength);
-		PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-		const DL_ElgamalLikeSignatureAlgorithm<T> &alg = this->GetSignatureAlgorithm();
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-
-		size_t rLen = alg.RLen(params);
-		ma.m_semisignature.Assign(signature, rLen);
-		ma.m_s.Decode(signature+rLen, alg.SLen(params));
-
-		this->GetMessageEncodingInterface().ProcessSemisignature(ma.AccessHash(), ma.m_semisignature, ma.m_semisignature.size());
-	}
-
-	bool VerifyAndRestart(PK_MessageAccumulator &messageAccumulator) const
-	{
-		this->GetMaterial().DoQuickSanityCheck();
-
-		PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-		const DL_ElgamalLikeSignatureAlgorithm<T> &alg = this->GetSignatureAlgorithm();
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-		const DL_PublicKey<T> &key = this->GetKeyInterface();
-
-		SecByteBlock representative(this->MessageRepresentativeLength());
-		this->GetMessageEncodingInterface().ComputeMessageRepresentative(NullRNG(), ma.m_recoverableMessage, ma.m_recoverableMessage.size(),
-			ma.AccessHash(), this->GetHashIdentifier(), ma.m_empty,
-			representative, this->MessageRepresentativeBitLength());
-		ma.m_empty = true;
-		Integer e(representative, representative.size());
-
-		Integer r(ma.m_semisignature, ma.m_semisignature.size());
-		return alg.Verify(params, key, e, r, ma.m_s);
-	}
-
-	DecodingResult RecoverAndRestart(byte *recoveredMessage, PK_MessageAccumulator &messageAccumulator) const
-	{
-		this->GetMaterial().DoQuickSanityCheck();
-
-		PK_MessageAccumulatorBase &ma = static_cast<PK_MessageAccumulatorBase &>(messageAccumulator);
-		const DL_ElgamalLikeSignatureAlgorithm<T> &alg = this->GetSignatureAlgorithm();
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-		const DL_PublicKey<T> &key = this->GetKeyInterface();
-
-		SecByteBlock representative(this->MessageRepresentativeLength());
-		this->GetMessageEncodingInterface().ComputeMessageRepresentative(
-			NullRNG(),
-			ma.m_recoverableMessage, ma.m_recoverableMessage.size(),
-			ma.AccessHash(), this->GetHashIdentifier(), ma.m_empty,
-			representative, this->MessageRepresentativeBitLength());
-		ma.m_empty = true;
-		Integer e(representative, representative.size());
-
-		ma.m_presignature.New(params.GetEncodedElementSize(false));
-		Integer r(ma.m_semisignature, ma.m_semisignature.size());
-		alg.RecoverPresignature(params, key, r, ma.m_s).Encode(ma.m_presignature, ma.m_presignature.size());
-
-		return this->GetMessageEncodingInterface().RecoverMessageFromSemisignature(
-			ma.AccessHash(), this->GetHashIdentifier(),
-			ma.m_presignature, ma.m_presignature.size(),
-			ma.m_semisignature, ma.m_semisignature.size(),
-			recoveredMessage);
-	}
-};
-
-//! \brief Discrete Log (DL) cryptosystem base implementation
-//! \tparam PK field element type
-//! \tparam KI public or private key interface
-template <class PK, class KI>
-class CRYPTOPP_NO_VTABLE DL_CryptoSystemBase : public PK, public DL_Base<KI>
-{
-public:
-	typedef typename DL_Base<KI>::Element Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_CryptoSystemBase() { }
-#endif
-
-	size_t MaxPlaintextLength(size_t ciphertextLength) const
-	{
-		unsigned int minLen = this->GetAbstractGroupParameters().GetEncodedElementSize(true);
-		return ciphertextLength < minLen ? 0 : GetSymmetricEncryptionAlgorithm().GetMaxSymmetricPlaintextLength(ciphertextLength - minLen);
-	}
-
-	size_t CiphertextLength(size_t plaintextLength) const
-	{
-		size_t len = GetSymmetricEncryptionAlgorithm().GetSymmetricCiphertextLength(plaintextLength);
-		return len == 0 ? 0 : this->GetAbstractGroupParameters().GetEncodedElementSize(true) + len;
-	}
-
-	bool ParameterSupported(const char *name) const
-		{return GetKeyDerivationAlgorithm().ParameterSupported(name) || GetSymmetricEncryptionAlgorithm().ParameterSupported(name);}
-
-protected:
-	virtual const DL_KeyAgreementAlgorithm<Element> & GetKeyAgreementAlgorithm() const =0;
-	virtual const DL_KeyDerivationAlgorithm<Element> & GetKeyDerivationAlgorithm() const =0;
-	virtual const DL_SymmetricEncryptionAlgorithm & GetSymmetricEncryptionAlgorithm() const =0;
-};
-
-//! \brief Discrete Log (DL) decryptor base implementation
-//! \tparam T field element type
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_DecryptorBase : public DL_CryptoSystemBase<PK_Decryptor, DL_PrivateKey<T> >
-{
-public:
-	typedef T Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_DecryptorBase() { }
-#endif
-
-	DecodingResult Decrypt(RandomNumberGenerator &rng, const byte *ciphertext, size_t ciphertextLength, byte *plaintext, const NameValuePairs &parameters = g_nullNameValuePairs) const
-	{
-		try
-		{
-			CRYPTOPP_UNUSED(rng);
-			const DL_KeyAgreementAlgorithm<T> &agreeAlg = this->GetKeyAgreementAlgorithm();
-			const DL_KeyDerivationAlgorithm<T> &derivAlg = this->GetKeyDerivationAlgorithm();
-			const DL_SymmetricEncryptionAlgorithm &encAlg = this->GetSymmetricEncryptionAlgorithm();
-			const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-			const DL_PrivateKey<T> &key = this->GetKeyInterface();
-
-			Element q = params.DecodeElement(ciphertext, true);
-			size_t elementSize = params.GetEncodedElementSize(true);
-			ciphertext += elementSize;
-			ciphertextLength -= elementSize;
-
-			Element z = agreeAlg.AgreeWithStaticPrivateKey(params, q, true, key.GetPrivateExponent());
-
-			SecByteBlock derivedKey(encAlg.GetSymmetricKeyLength(encAlg.GetMaxSymmetricPlaintextLength(ciphertextLength)));
-			derivAlg.Derive(params, derivedKey, derivedKey.size(), z, q, parameters);
-
-			return encAlg.SymmetricDecrypt(derivedKey, ciphertext, ciphertextLength, plaintext, parameters);
-		}
-		catch (DL_BadElement &)
-		{
-			return DecodingResult();
-		}
-	}
-};
-
-//! \brief Discrete Log (DL) encryptor base implementation
-//! \tparam T field element type
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_EncryptorBase : public DL_CryptoSystemBase<PK_Encryptor, DL_PublicKey<T> >
-{
-public:
-	typedef T Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_EncryptorBase() { }
-#endif
-
-	void Encrypt(RandomNumberGenerator &rng, const byte *plaintext, size_t plaintextLength, byte *ciphertext, const NameValuePairs &parameters = g_nullNameValuePairs) const
-	{
-		const DL_KeyAgreementAlgorithm<T> &agreeAlg = this->GetKeyAgreementAlgorithm();
-		const DL_KeyDerivationAlgorithm<T> &derivAlg = this->GetKeyDerivationAlgorithm();
-		const DL_SymmetricEncryptionAlgorithm &encAlg = this->GetSymmetricEncryptionAlgorithm();
-		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
-		const DL_PublicKey<T> &key = this->GetKeyInterface();
-
-		Integer x(rng, Integer::One(), params.GetMaxExponent());
-		Element q = params.ExponentiateBase(x);
-		params.EncodeElement(true, q, ciphertext);
-		unsigned int elementSize = params.GetEncodedElementSize(true);
-		ciphertext += elementSize;
-
-		Element z = agreeAlg.AgreeWithEphemeralPrivateKey(params, key.GetPublicPrecomputation(), x);
-
-		SecByteBlock derivedKey(encAlg.GetSymmetricKeyLength(plaintextLength));
-		derivAlg.Derive(params, derivedKey, derivedKey.size(), z, q, parameters);
-
-		encAlg.SymmetricEncrypt(rng, derivedKey, plaintext, plaintextLength, ciphertext, parameters);
-	}
-};
-
-//! \brief Discrete Log (DL) scheme options
-//! \tparam T1 algorithm information
-//! \tparam T2 group paramters for the scheme
-template <class T1, class T2>
-struct DL_SchemeOptionsBase
-{
-	typedef T1 AlgorithmInfo;
-	typedef T2 GroupParameters;
-	typedef typename GroupParameters::Element Element;
-};
-
-//! \brief Discrete Log (DL) key options
-//! \tparam T1 algorithm information
-//! \tparam T2 keys used in the scheme
-template <class T1, class T2>
-struct DL_KeyedSchemeOptions : public DL_SchemeOptionsBase<T1, typename T2::PublicKey::GroupParameters>
-{
-	typedef T2 Keys;
-	typedef typename Keys::PrivateKey PrivateKey;
-	typedef typename Keys::PublicKey PublicKey;
-};
-
-//! \brief Discrete Log (DL) signature scheme options
-//! \tparam T1 algorithm information
-//! \tparam T2 keys used in the scheme
-//! \tparam T3 signature algorithm
-//! \tparam T4 message encoding method
-//! \tparam T5 hash function
-template <class T1, class T2, class T3, class T4, class T5>
-struct DL_SignatureSchemeOptions : public DL_KeyedSchemeOptions<T1, T2>
-{
-	typedef T3 SignatureAlgorithm;
-	typedef T4 MessageEncodingMethod;
-	typedef T5 HashFunction;
-};
-
-//! \brief Discrete Log (DL) crypto scheme options
-//! \tparam T1 algorithm information
-//! \tparam T2 keys used in the scheme
-//! \tparam T3 key agreement algorithm
-//! \tparam T4 key derivation algorithm
-//! \tparam T5 symmetric encryption algorithm
-template <class T1, class T2, class T3, class T4, class T5>
-struct DL_CryptoSchemeOptions : public DL_KeyedSchemeOptions<T1, T2>
-{
-	typedef T3 KeyAgreementAlgorithm;
-	typedef T4 KeyDerivationAlgorithm;
-	typedef T5 SymmetricEncryptionAlgorithm;
-};
-
-//! \brief Discrete Log (DL) base object implementation
-//! \tparam BASE TODO
-//! \tparam SCHEME_OPTIONS options for the scheme
-//! \tparam KEY key used in the scheme
-template <class BASE, class SCHEME_OPTIONS, class KEY>
-class CRYPTOPP_NO_VTABLE DL_ObjectImplBase : public AlgorithmImpl<BASE, typename SCHEME_OPTIONS::AlgorithmInfo>
-{
-public:
-	typedef SCHEME_OPTIONS SchemeOptions;
-	typedef typename KEY::Element Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_ObjectImplBase() { }
-#endif
-
-	PrivateKey & AccessPrivateKey() {return m_key;}
-	PublicKey & AccessPublicKey() {return m_key;}
-
-	// KeyAccessor
-	const KEY & GetKey() const {return m_key;}
-	KEY & AccessKey() {return m_key;}
-
-protected:
-	typename BASE::KeyInterface & AccessKeyInterface() {return m_key;}
-	const typename BASE::KeyInterface & GetKeyInterface() const {return m_key;}
-
-	// for signature scheme
-	HashIdentifier GetHashIdentifier() const
-	{
-		typedef typename SchemeOptions::MessageEncodingMethod::HashIdentifierLookup HashLookup;
-		return HashLookup::template HashIdentifierLookup2<CPP_TYPENAME SchemeOptions::HashFunction>::Lookup();
-	}
-	size_t GetDigestSize() const
-	{
-		typedef CPP_TYPENAME SchemeOptions::HashFunction H;
-		return H::DIGESTSIZE;
-	}
-
-private:
-	KEY m_key;
-};
-
-//! \brief Discrete Log (DL) object implementation
-//! \tparam BASE TODO
-//! \tparam SCHEME_OPTIONS options for the scheme
-//! \tparam KEY key used in the scheme
-template <class BASE, class SCHEME_OPTIONS, class KEY>
-class CRYPTOPP_NO_VTABLE DL_ObjectImpl : public DL_ObjectImplBase<BASE, SCHEME_OPTIONS, KEY>
-{
-public:
-	typedef typename KEY::Element Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_ObjectImpl() { }
-#endif
-
-protected:
-	const DL_ElgamalLikeSignatureAlgorithm<Element> & GetSignatureAlgorithm() const
-		{return Singleton<CPP_TYPENAME SCHEME_OPTIONS::SignatureAlgorithm>().Ref();}
-	const DL_KeyAgreementAlgorithm<Element> & GetKeyAgreementAlgorithm() const
-		{return Singleton<CPP_TYPENAME SCHEME_OPTIONS::KeyAgreementAlgorithm>().Ref();}
-	const DL_KeyDerivationAlgorithm<Element> & GetKeyDerivationAlgorithm() const
-		{return Singleton<CPP_TYPENAME SCHEME_OPTIONS::KeyDerivationAlgorithm>().Ref();}
-	const DL_SymmetricEncryptionAlgorithm & GetSymmetricEncryptionAlgorithm() const
-		{return Singleton<CPP_TYPENAME SCHEME_OPTIONS::SymmetricEncryptionAlgorithm>().Ref();}
-	HashIdentifier GetHashIdentifier() const
-		{return HashIdentifier();}
-	const PK_SignatureMessageEncodingMethod & GetMessageEncodingInterface() const
-		{return Singleton<CPP_TYPENAME SCHEME_OPTIONS::MessageEncodingMethod>().Ref();}
-};
-
-//! \brief Discrete Log (DL) signer implementation
-//! \tparam SCHEME_OPTIONS options for the scheme
-template <class SCHEME_OPTIONS>
-class DL_SignerImpl : public DL_ObjectImpl<DL_SignerBase<typename SCHEME_OPTIONS::Element>, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PrivateKey>
-{
-public:
-	PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const
-	{
-		member_ptr<PK_MessageAccumulatorBase> p(new PK_MessageAccumulatorImpl<CPP_TYPENAME SCHEME_OPTIONS::HashFunction>);
-		this->RestartMessageAccumulator(rng, *p);
-		return p.release();
-	}
-};
-
-//! \brief Discrete Log (DL) verifier implementation
-//! \tparam SCHEME_OPTIONS options for the scheme
-template <class SCHEME_OPTIONS>
-class DL_VerifierImpl : public DL_ObjectImpl<DL_VerifierBase<typename SCHEME_OPTIONS::Element>, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PublicKey>
-{
-public:
-	PK_MessageAccumulator * NewVerificationAccumulator() const
-	{
-		return new PK_MessageAccumulatorImpl<CPP_TYPENAME SCHEME_OPTIONS::HashFunction>;
-	}
-};
-
-//! \brief Discrete Log (DL) encryptor implementation
-//! \tparam SCHEME_OPTIONS options for the scheme
-template <class SCHEME_OPTIONS>
-class DL_EncryptorImpl : public DL_ObjectImpl<DL_EncryptorBase<typename SCHEME_OPTIONS::Element>, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PublicKey>
-{
-};
-
-//! \brief Discrete Log (DL) decryptor implementation
-//! \tparam SCHEME_OPTIONS options for the scheme
-template <class SCHEME_OPTIONS>
-class DL_DecryptorImpl : public DL_ObjectImpl<DL_DecryptorBase<typename SCHEME_OPTIONS::Element>, SCHEME_OPTIONS, typename SCHEME_OPTIONS::PrivateKey>
-{
-};
-
-// ********************************************************
-
-//! \brief Discrete Log (DL) simple key agreement base implementation
-//! \tparam T class or type
-template <class T>
-class CRYPTOPP_NO_VTABLE DL_SimpleKeyAgreementDomainBase : public SimpleKeyAgreementDomain
-{
-public:
-	typedef T Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_SimpleKeyAgreementDomainBase() { }
-#endif
-
-	CryptoParameters & AccessCryptoParameters() {return AccessAbstractGroupParameters();}
-	unsigned int AgreedValueLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(false);}
-	unsigned int PrivateKeyLength() const {return GetAbstractGroupParameters().GetSubgroupOrder().ByteCount();}
-	unsigned int PublicKeyLength() const {return GetAbstractGroupParameters().GetEncodedElementSize(true);}
-
-	void GeneratePrivateKey(RandomNumberGenerator &rng, byte *privateKey) const
-	{
-		Integer x(rng, Integer::One(), GetAbstractGroupParameters().GetMaxExponent());
-		x.Encode(privateKey, PrivateKeyLength());
-	}
-
-	void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const
-	{
-		CRYPTOPP_UNUSED(rng);
-		const DL_GroupParameters<T> &params = GetAbstractGroupParameters();
-		Integer x(privateKey, PrivateKeyLength());
-		Element y = params.ExponentiateBase(x);
-		params.EncodeElement(true, y, publicKey);
-	}
-
-	bool Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey=true) const
-	{
-		try
-		{
-			const DL_GroupParameters<T> &params = GetAbstractGroupParameters();
-			Integer x(privateKey, PrivateKeyLength());
-			Element w = params.DecodeElement(otherPublicKey, validateOtherPublicKey);
-
-			Element z = GetKeyAgreementAlgorithm().AgreeWithStaticPrivateKey(
-				GetAbstractGroupParameters(), w, validateOtherPublicKey, x);
-			params.EncodeElement(false, z, agreedValue);
-		}
-		catch (DL_BadElement &)
-		{
-			return false;
-		}
-		return true;
-	}
-
-	//! \brief Retrieves a reference to the group generator
-	//! \returns const reference to the group generator
-	const Element &GetGenerator() const {return GetAbstractGroupParameters().GetSubgroupGenerator();}
-
-protected:
-	virtual const DL_KeyAgreementAlgorithm<Element> & GetKeyAgreementAlgorithm() const =0;
-	virtual DL_GroupParameters<Element> & AccessAbstractGroupParameters() =0;
-	const DL_GroupParameters<Element> & GetAbstractGroupParameters() const {return const_cast<DL_SimpleKeyAgreementDomainBase<Element> *>(this)->AccessAbstractGroupParameters();}
-};
-
-//! \brief Methods for avoiding "Small-Subgroup" attacks on Diffie-Hellman Key Agreement
-//! \details Additional methods exist and include public key validation and choice of prime p.
-//! \sa <A HREF="http://tools.ietf.org/html/rfc2785">Methods for Avoiding the "Small-Subgroup" Attacks on the
-//!   Diffie-Hellman Key Agreement Method for S/MIME</A>
-enum CofactorMultiplicationOption {
-	//! \brief No cofactor multiplication applied
-	NO_COFACTOR_MULTIPLICTION,
-	//! \brief Cofactor multiplication compatible with ordinary Diffie-Hellman
-	//! \details Modifies the computation of ZZ by including j (the cofactor) in the computations and is
-	//!   compatible with ordinary Diffie-Hellman.
-	COMPATIBLE_COFACTOR_MULTIPLICTION,
-	//! \brief Cofactor multiplication incompatible with ordinary Diffie-Hellman
-	//! \details Modifies the computation of ZZ by including j (the cofactor) in the computations but is
-	//!   not compatible with ordinary Diffie-Hellman.
-	INCOMPATIBLE_COFACTOR_MULTIPLICTION};
-
-typedef EnumToType<CofactorMultiplicationOption, NO_COFACTOR_MULTIPLICTION> NoCofactorMultiplication;
-typedef EnumToType<CofactorMultiplicationOption, COMPATIBLE_COFACTOR_MULTIPLICTION> CompatibleCofactorMultiplication;
-typedef EnumToType<CofactorMultiplicationOption, INCOMPATIBLE_COFACTOR_MULTIPLICTION> IncompatibleCofactorMultiplication;
-
-//! \details Diffie-Hellman key agreement algorithm
-template <class ELEMENT, class COFACTOR_OPTION>
-class DL_KeyAgreementAlgorithm_DH : public DL_KeyAgreementAlgorithm<ELEMENT>
-{
-public:
-	typedef ELEMENT Element;
-
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~DL_KeyAgreementAlgorithm_DH() {}
-#endif
-
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName()
-		{return COFACTOR_OPTION::ToEnum() == INCOMPATIBLE_COFACTOR_MULTIPLICTION ? "DHC" : "DH";}
-
-	Element AgreeWithEphemeralPrivateKey(const DL_GroupParameters<Element> &params, const DL_FixedBasePrecomputation<Element> &publicPrecomputation, const Integer &privateExponent) const
-	{
-		return publicPrecomputation.Exponentiate(params.GetGroupPrecomputation(),
-			COFACTOR_OPTION::ToEnum() == INCOMPATIBLE_COFACTOR_MULTIPLICTION ? privateExponent*params.GetCofactor() : privateExponent);
-	}
-
-	Element AgreeWithStaticPrivateKey(const DL_GroupParameters<Element> &params, const Element &publicElement, bool validateOtherPublicKey, const Integer &privateExponent) const
-	{
-		if (COFACTOR_OPTION::ToEnum() == COMPATIBLE_COFACTOR_MULTIPLICTION)
-		{
-			const Integer &k = params.GetCofactor();
-			return params.ExponentiateElement(publicElement,
-				ModularArithmetic(params.GetSubgroupOrder()).Divide(privateExponent, k)*k);
-		}
-		else if (COFACTOR_OPTION::ToEnum() == INCOMPATIBLE_COFACTOR_MULTIPLICTION)
-			return params.ExponentiateElement(publicElement, privateExponent*params.GetCofactor());
-		else
-		{
-			CRYPTOPP_ASSERT(COFACTOR_OPTION::ToEnum() == NO_COFACTOR_MULTIPLICTION);
-
-			if (!validateOtherPublicKey)
-				return params.ExponentiateElement(publicElement, privateExponent);
-
-			if (params.FastSubgroupCheckAvailable())
-			{
-				if (!params.ValidateElement(2, publicElement, NULL))
-					throw DL_BadElement();
-				return params.ExponentiateElement(publicElement, privateExponent);
-			}
-			else
-			{
-				const Integer e[2] = {params.GetSubgroupOrder(), privateExponent};
-				Element r[2];
-				params.SimultaneousExponentiate(r, publicElement, e, 2);
-				if (!params.IsIdentity(r[0]))
-					throw DL_BadElement();
-				return r[1];
-			}
-		}
-	}
-};
-
-// ********************************************************
-
-//! \brief Template implementing constructors for public key algorithm classes
-template <class BASE>
-class CRYPTOPP_NO_VTABLE PK_FinalTemplate : public BASE
-{
-public:
-	PK_FinalTemplate() {}
-
-	PK_FinalTemplate(const CryptoMaterial &key)
-		{this->AccessKey().AssignFrom(key);}
-
-	PK_FinalTemplate(BufferedTransformation &bt)
-		{this->AccessKey().BERDecode(bt);}
-
-	PK_FinalTemplate(const AsymmetricAlgorithm &algorithm)
-		{this->AccessKey().AssignFrom(algorithm.GetMaterial());}
-
-	PK_FinalTemplate(const Integer &v1)
-		{this->AccessKey().Initialize(v1);}
-
-#if (defined(_MSC_VER) && _MSC_VER < 1300)
-
-	template <class T1, class T2>
-	PK_FinalTemplate(T1 &v1, T2 &v2)
-		{this->AccessKey().Initialize(v1, v2);}
-
-	template <class T1, class T2, class T3>
-	PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3)
-		{this->AccessKey().Initialize(v1, v2, v3);}
-
-	template <class T1, class T2, class T3, class T4>
-	PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4)
-		{this->AccessKey().Initialize(v1, v2, v3, v4);}
-
-	template <class T1, class T2, class T3, class T4, class T5>
-	PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4, T5 &v5)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6>
-	PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4, T5 &v5, T6 &v6)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-	PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4, T5 &v5, T6 &v6, T7 &v7)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-	PK_FinalTemplate(T1 &v1, T2 &v2, T3 &v3, T4 &v4, T5 &v5, T6 &v6, T7 &v7, T8 &v8)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7, v8);}
-
-#else
-
-	template <class T1, class T2>
-	PK_FinalTemplate(const T1 &v1, const T2 &v2)
-		{this->AccessKey().Initialize(v1, v2);}
-
-	template <class T1, class T2, class T3>
-	PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3)
-		{this->AccessKey().Initialize(v1, v2, v3);}
-
-	template <class T1, class T2, class T3, class T4>
-	PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4)
-		{this->AccessKey().Initialize(v1, v2, v3, v4);}
-
-	template <class T1, class T2, class T3, class T4, class T5>
-	PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6>
-	PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-	PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6, const T7 &v7)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-	PK_FinalTemplate(const T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6, const T7 &v7, const T8 &v8)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7, v8);}
-
-	template <class T1, class T2>
-	PK_FinalTemplate(T1 &v1, const T2 &v2)
-		{this->AccessKey().Initialize(v1, v2);}
-
-	template <class T1, class T2, class T3>
-	PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3)
-		{this->AccessKey().Initialize(v1, v2, v3);}
-
-	template <class T1, class T2, class T3, class T4>
-	PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4)
-		{this->AccessKey().Initialize(v1, v2, v3, v4);}
-
-	template <class T1, class T2, class T3, class T4, class T5>
-	PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6>
-	PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-	PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6, const T7 &v7)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7);}
-
-	template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-	PK_FinalTemplate(T1 &v1, const T2 &v2, const T3 &v3, const T4 &v4, const T5 &v5, const T6 &v6, const T7 &v7, const T8 &v8)
-		{this->AccessKey().Initialize(v1, v2, v3, v4, v5, v6, v7, v8);}
-
-#endif
-};
-
-//! \brief Base class for public key encryption standard classes.
-//! \details These classes are used to select from variants of algorithms.
-//!   Not all standards apply to all algorithms.
-struct EncryptionStandard {};
-
-//! \brief Base class for public key signature standard classes.
-//! \details These classes are used to select from variants of algorithms.
-//!   Not all standards apply to all algorithms.
-struct SignatureStandard {};
-
-//! \brief Trapdoor Function (TF) encryption scheme
-//! \tparam STANDARD standard
-//! \tparam KEYS keys used in the encryption scheme
-//! \tparam ALG_INFO algorithm information
-template <class STANDARD, class KEYS, class ALG_INFO>
-class TF_ES;
-
-template <class STANDARD, class KEYS, class ALG_INFO = TF_ES<STANDARD, KEYS, int> >
-class TF_ES : public KEYS
-{
-	typedef typename STANDARD::EncryptionMessageEncodingMethod MessageEncodingMethod;
-
-public:
-	//! see EncryptionStandard for a list of standards
-	typedef STANDARD Standard;
-	typedef TF_CryptoSchemeOptions<ALG_INFO, KEYS, MessageEncodingMethod> SchemeOptions;
-
-	static std::string CRYPTOPP_API StaticAlgorithmName() {return std::string(KEYS::StaticAlgorithmName()) + "/" + MessageEncodingMethod::StaticAlgorithmName();}
-
-	//! implements PK_Decryptor interface
-	typedef PK_FinalTemplate<TF_DecryptorImpl<SchemeOptions> > Decryptor;
-	//! implements PK_Encryptor interface
-	typedef PK_FinalTemplate<TF_EncryptorImpl<SchemeOptions> > Encryptor;
-};
-
-//! \class TF_SS
-//! \brief Trapdoor Function (TF) Signature Scheme
-//! \tparam STANDARD standard
-//! \tparam H hash function
-//! \tparam KEYS keys used in the signature scheme
-//! \tparam ALG_INFO algorithm information
-template <class STANDARD, class H, class KEYS, class ALG_INFO>	// VC60 workaround: doesn't work if KEYS is first parameter
-class TF_SS;
-
-template <class STANDARD, class H, class KEYS, class ALG_INFO = TF_SS<STANDARD, H, KEYS, int> >	// VC60 workaround: doesn't work if KEYS is first parameter
-class TF_SS : public KEYS
-{
-public:
-	//! see SignatureStandard for a list of standards
-	typedef STANDARD Standard;
-	typedef typename Standard::SignatureMessageEncodingMethod MessageEncodingMethod;
-	typedef TF_SignatureSchemeOptions<ALG_INFO, KEYS, MessageEncodingMethod, H> SchemeOptions;
-
-	static std::string CRYPTOPP_API StaticAlgorithmName() {return std::string(KEYS::StaticAlgorithmName()) + "/" + MessageEncodingMethod::StaticAlgorithmName() + "(" + H::StaticAlgorithmName() + ")";}
-
-	//! implements PK_Signer interface
-	typedef PK_FinalTemplate<TF_SignerImpl<SchemeOptions> > Signer;
-	//! implements PK_Verifier interface
-	typedef PK_FinalTemplate<TF_VerifierImpl<SchemeOptions> > Verifier;
-};
-
-//! \class DL_SS
-//! \brief Discrete Log (DL) signature scheme
-//! \tparam KEYS keys used in the signature scheme
-//! \tparam SA signature algorithm
-//! \tparam MEM message encoding method
-//! \tparam H hash function
-//! \tparam ALG_INFO algorithm information
-template <class KEYS, class SA, class MEM, class H, class ALG_INFO>
-class DL_SS;
-
-template <class KEYS, class SA, class MEM, class H, class ALG_INFO = DL_SS<KEYS, SA, MEM, H, int> >
-class DL_SS : public KEYS
-{
-	typedef DL_SignatureSchemeOptions<ALG_INFO, KEYS, SA, MEM, H> SchemeOptions;
-
-public:
-	static std::string StaticAlgorithmName() {return SA::StaticAlgorithmName() + std::string("/EMSA1(") + H::StaticAlgorithmName() + ")";}
-
-	//! implements PK_Signer interface
-	typedef PK_FinalTemplate<DL_SignerImpl<SchemeOptions> > Signer;
-	//! implements PK_Verifier interface
-	typedef PK_FinalTemplate<DL_VerifierImpl<SchemeOptions> > Verifier;
-};
-
-//! \brief Discrete Log (DL) encryption scheme
-//! \tparam KEYS keys used in the encryption scheme
-//! \tparam AA key agreement algorithm
-//! \tparam DA key derivation algorithm
-//! \tparam EA encryption algorithm
-//! \tparam ALG_INFO algorithm information
-template <class KEYS, class AA, class DA, class EA, class ALG_INFO>
-class DL_ES : public KEYS
-{
-	typedef DL_CryptoSchemeOptions<ALG_INFO, KEYS, AA, DA, EA> SchemeOptions;
-
-public:
-	//! implements PK_Decryptor interface
-	typedef PK_FinalTemplate<DL_DecryptorImpl<SchemeOptions> > Decryptor;
-	//! implements PK_Encryptor interface
-	typedef PK_FinalTemplate<DL_EncryptorImpl<SchemeOptions> > Encryptor;
-};
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/queue.cpp b/src-cryptopp/queue.cpp
deleted file mode 100644
index fd23638..0000000
--- a/src-cryptopp/queue.cpp
+++ /dev/null
@@ -1,574 +0,0 @@
-// queue.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "queue.h"
-#include "filters.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-static const unsigned int s_maxAutoNodeSize = 16*1024;
-
-// this class for use by ByteQueue only
-class ByteQueueNode
-{
-public:
-	ByteQueueNode(size_t maxSize)
-		: buf(maxSize)
-	{
-		m_head = m_tail = 0;
-		next = 0;
-	}
-
-	inline size_t MaxSize() const {return buf.size();}
-
-	inline size_t CurrentSize() const
-	{
-		return m_tail-m_head;
-	}
-
-	inline bool UsedUp() const
-	{
-		return (m_head==MaxSize());
-	}
-
-	inline void Clear()
-	{
-		m_head = m_tail = 0;
-	}
-
-	inline size_t Put(const byte *begin, size_t length)
-	{
-		// Avoid passing NULL to memcpy
-		if (!begin || !length) return length;
-		size_t l = STDMIN(length, MaxSize()-m_tail);
-		if (buf+m_tail != begin)
-			memcpy(buf+m_tail, begin, l);
-		m_tail += l;
-		return l;
-	}
-
-	inline size_t Peek(byte &outByte) const
-	{
-		if (m_tail==m_head)
-			return 0;
-
-		outByte=buf[m_head];
-		return 1;
-	}
-
-	inline size_t Peek(byte *target, size_t copyMax) const
-	{
-		size_t len = STDMIN(copyMax, m_tail-m_head);
-		memcpy(target, buf+m_head, len);
-		return len;
-	}
-
-	inline size_t CopyTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL) const
-	{
-		size_t len = m_tail-m_head;
-		target.ChannelPut(channel, buf+m_head, len);
-		return len;
-	}
-
-	inline size_t CopyTo(BufferedTransformation &target, size_t copyMax, const std::string &channel=DEFAULT_CHANNEL) const
-	{
-		size_t len = STDMIN(copyMax, m_tail-m_head);
-		target.ChannelPut(channel, buf+m_head, len);
-		return len;
-	}
-
-	inline size_t Get(byte &outByte)
-	{
-		size_t len = Peek(outByte);
-		m_head += len;
-		return len;
-	}
-
-	inline size_t Get(byte *outString, size_t getMax)
-	{
-		size_t len = Peek(outString, getMax);
-		m_head += len;
-		return len;
-	}
-
-	inline size_t TransferTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL)
-	{
-		size_t len = m_tail-m_head;
-		target.ChannelPutModifiable(channel, buf+m_head, len);
-		m_head = m_tail;
-		return len;
-	}
-
-	inline size_t TransferTo(BufferedTransformation &target, lword transferMax, const std::string &channel=DEFAULT_CHANNEL)
-	{
-		size_t len = UnsignedMin(m_tail-m_head, transferMax);
-		target.ChannelPutModifiable(channel, buf+m_head, len);
-		m_head += len;
-		return len;
-	}
-
-	inline size_t Skip(size_t skipMax)
-	{
-		size_t len = STDMIN(skipMax, m_tail-m_head);
-		m_head += len;
-		return len;
-	}
-
-	inline byte operator[](size_t i) const
-	{
-		return buf[m_head+i];
-	}
-
-	ByteQueueNode *next;
-
-	SecByteBlock buf;
-	size_t m_head, m_tail;
-};
-
-// ********************************************************
-
-ByteQueue::ByteQueue(size_t nodeSize)
-	: Bufferless<BufferedTransformation>(), m_autoNodeSize(!nodeSize), m_nodeSize(nodeSize)
-	, m_head(NULL), m_tail(NULL), m_lazyString(NULL), m_lazyLength(0), m_lazyStringModifiable(false)
-{
-	SetNodeSize(nodeSize);
-	m_head = m_tail = new ByteQueueNode(m_nodeSize);
-}
-
-void ByteQueue::SetNodeSize(size_t nodeSize)
-{
-	m_autoNodeSize = !nodeSize;
-	m_nodeSize = m_autoNodeSize ? 256 : nodeSize;
-}
-
-ByteQueue::ByteQueue(const ByteQueue &copy)
-	: Bufferless<BufferedTransformation>(copy), m_lazyString(NULL), m_lazyLength(0)
-{
-	CopyFrom(copy);
-}
-
-void ByteQueue::CopyFrom(const ByteQueue &copy)
-{
-	m_lazyLength = 0;
-	m_autoNodeSize = copy.m_autoNodeSize;
-	m_nodeSize = copy.m_nodeSize;
-	m_head = m_tail = new ByteQueueNode(*copy.m_head);
-
-	for (ByteQueueNode *current=copy.m_head->next; current; current=current->next)
-	{
-		m_tail->next = new ByteQueueNode(*current);
-		m_tail = m_tail->next;
-	}
-
-	m_tail->next = NULL;
-
-	Put(copy.m_lazyString, copy.m_lazyLength);
-}
-
-ByteQueue::~ByteQueue()
-{
-	Destroy();
-}
-
-void ByteQueue::Destroy()
-{
-	for (ByteQueueNode *next, *current=m_head; current; current=next)
-	{
-		next=current->next;
-		delete current;
-	}
-}
-
-void ByteQueue::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	m_nodeSize = parameters.GetIntValueWithDefault("NodeSize", 256);
-	Clear();
-}
-
-lword ByteQueue::CurrentSize() const
-{
-	lword size=0;
-
-	for (ByteQueueNode *current=m_head; current; current=current->next)
-		size += current->CurrentSize();
-
-	return size + m_lazyLength;
-}
-
-bool ByteQueue::IsEmpty() const
-{
-	return m_head==m_tail && m_head->CurrentSize()==0 && m_lazyLength==0;
-}
-
-void ByteQueue::Clear()
-{
-	for (ByteQueueNode *next, *current=m_head->next; current; current=next)
-	{
-		next=current->next;
-		delete current;
-	}
-
-	m_tail = m_head;
-	m_head->Clear();
-	m_head->next = NULL;
-	m_lazyLength = 0;
-}
-
-size_t ByteQueue::Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-{
-	CRYPTOPP_UNUSED(messageEnd), CRYPTOPP_UNUSED(blocking);
-
-	if (m_lazyLength > 0)
-		FinalizeLazyPut();
-
-	size_t len;
-	while ((len=m_tail->Put(inString, length)) < length)
-	{
-		inString += len;
-		length -= len;
-		if (m_autoNodeSize && m_nodeSize < s_maxAutoNodeSize)
-			do
-			{
-				m_nodeSize *= 2;
-			}
-			while (m_nodeSize < length && m_nodeSize < s_maxAutoNodeSize);
-		m_tail->next = new ByteQueueNode(STDMAX(m_nodeSize, length));
-		m_tail = m_tail->next;
-	}
-
-	return 0;
-}
-
-void ByteQueue::CleanupUsedNodes()
-{
-	// Test for m_head due to Enterprise Anlysis finding
-	while (m_head && m_head != m_tail && m_head->UsedUp())
-	{
-		ByteQueueNode *temp=m_head;
-		m_head=m_head->next;
-		delete temp;
-	}
-
-	// Test for m_head due to Enterprise Anlysis finding
-	if (m_head && m_head->CurrentSize() == 0)
-		m_head->Clear();
-}
-
-void ByteQueue::LazyPut(const byte *inString, size_t size)
-{
-	if (m_lazyLength > 0)
-		FinalizeLazyPut();
-
-	if (inString == m_tail->buf+m_tail->m_tail)
-		Put(inString, size);
-	else
-	{
-		m_lazyString = const_cast<byte *>(inString);
-		m_lazyLength = size;
-		m_lazyStringModifiable = false;
-	}
-}
-
-void ByteQueue::LazyPutModifiable(byte *inString, size_t size)
-{
-	if (m_lazyLength > 0)
-		FinalizeLazyPut();
-	m_lazyString = inString;
-	m_lazyLength = size;
-	m_lazyStringModifiable = true;
-}
-
-void ByteQueue::UndoLazyPut(size_t size)
-{
-	if (m_lazyLength < size)
-		throw InvalidArgument("ByteQueue: size specified for UndoLazyPut is too large");
-
-	m_lazyLength -= size;
-}
-
-void ByteQueue::FinalizeLazyPut()
-{
-	size_t len = m_lazyLength;
-	m_lazyLength = 0;
-	if (len)
-		Put(m_lazyString, len);
-}
-
-size_t ByteQueue::Get(byte &outByte)
-{
-	if (m_head->Get(outByte))
-	{
-		if (m_head->UsedUp())
-			CleanupUsedNodes();
-		return 1;
-	}
-	else if (m_lazyLength > 0)
-	{
-		outByte = *m_lazyString++;
-		m_lazyLength--;
-		return 1;
-	}
-	else
-		return 0;
-}
-
-size_t ByteQueue::Get(byte *outString, size_t getMax)
-{
-	ArraySink sink(outString, getMax);
-	return (size_t)TransferTo(sink, getMax);
-}
-
-size_t ByteQueue::Peek(byte &outByte) const
-{
-	if (m_head->Peek(outByte))
-		return 1;
-	else if (m_lazyLength > 0)
-	{
-		outByte = *m_lazyString;
-		return 1;
-	}
-	else
-		return 0;
-}
-
-size_t ByteQueue::Peek(byte *outString, size_t peekMax) const
-{
-	ArraySink sink(outString, peekMax);
-	return (size_t)CopyTo(sink, peekMax);
-}
-
-size_t ByteQueue::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking)
-{
-	if (blocking)
-	{
-		lword bytesLeft = transferBytes;
-		for (ByteQueueNode *current=m_head; bytesLeft && current; current=current->next)
-			bytesLeft -= current->TransferTo(target, bytesLeft, channel);
-		CleanupUsedNodes();
-
-		size_t len = (size_t)STDMIN(bytesLeft, (lword)m_lazyLength);
-		if (len)
-		{
-			if (m_lazyStringModifiable)
-				target.ChannelPutModifiable(channel, m_lazyString, len);
-			else
-				target.ChannelPut(channel, m_lazyString, len);
-			m_lazyString += len;
-			m_lazyLength -= len;
-			bytesLeft -= len;
-		}
-		transferBytes -= bytesLeft;
-		return 0;
-	}
-	else
-	{
-		Walker walker(*this);
-		size_t blockedBytes = walker.TransferTo2(target, transferBytes, channel, blocking);
-		Skip(transferBytes);
-		return blockedBytes;
-	}
-}
-
-size_t ByteQueue::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const
-{
-	Walker walker(*this);
-	walker.Skip(begin);
-	lword transferBytes = end-begin;
-	size_t blockedBytes = walker.TransferTo2(target, transferBytes, channel, blocking);
-	begin += transferBytes;
-	return blockedBytes;
-}
-
-void ByteQueue::Unget(byte inByte)
-{
-	Unget(&inByte, 1);
-}
-
-void ByteQueue::Unget(const byte *inString, size_t length)
-{
-	size_t len = STDMIN(length, m_head->m_head);
-	length -= len;
-	m_head->m_head -= len;
-	memcpy(m_head->buf + m_head->m_head, inString + length, len);
-
-	if (length > 0)
-	{
-		ByteQueueNode *newHead = new ByteQueueNode(length);
-		newHead->next = m_head;
-		m_head = newHead;
-		m_head->Put(inString, length);
-	}
-}
-
-const byte * ByteQueue::Spy(size_t &contiguousSize) const
-{
-	contiguousSize = m_head->m_tail - m_head->m_head;
-	if (contiguousSize == 0 && m_lazyLength > 0)
-	{
-		contiguousSize = m_lazyLength;
-		return m_lazyString;
-	}
-	else
-		return m_head->buf + m_head->m_head;
-}
-
-byte * ByteQueue::CreatePutSpace(size_t &size)
-{
-	if (m_lazyLength > 0)
-		FinalizeLazyPut();
-
-	if (m_tail->m_tail == m_tail->MaxSize())
-	{
-		m_tail->next = new ByteQueueNode(STDMAX(m_nodeSize, size));
-		m_tail = m_tail->next;
-	}
-
-	size = m_tail->MaxSize() - m_tail->m_tail;
-	return m_tail->buf + m_tail->m_tail;
-}
-
-ByteQueue & ByteQueue::operator=(const ByteQueue &rhs)
-{
-	Destroy();
-	CopyFrom(rhs);
-	return *this;
-}
-
-bool ByteQueue::operator==(const ByteQueue &rhs) const
-{
-	const lword currentSize = CurrentSize();
-
-	if (currentSize != rhs.CurrentSize())
-		return false;
-
-	Walker walker1(*this), walker2(rhs);
-	byte b1, b2;
-
-	while (walker1.Get(b1) && walker2.Get(b2))
-		if (b1 != b2)
-			return false;
-
-	return true;
-}
-
-byte ByteQueue::operator[](lword i) const
-{
-	for (ByteQueueNode *current=m_head; current; current=current->next)
-	{
-		if (i < current->CurrentSize())
-			return (*current)[(size_t)i];
-
-		i -= current->CurrentSize();
-	}
-
-	CRYPTOPP_ASSERT(i < m_lazyLength);
-	return m_lazyString[i];
-}
-
-void ByteQueue::swap(ByteQueue &rhs)
-{
-	std::swap(m_autoNodeSize, rhs.m_autoNodeSize);
-	std::swap(m_nodeSize, rhs.m_nodeSize);
-	std::swap(m_head, rhs.m_head);
-	std::swap(m_tail, rhs.m_tail);
-	std::swap(m_lazyString, rhs.m_lazyString);
-	std::swap(m_lazyLength, rhs.m_lazyLength);
-	std::swap(m_lazyStringModifiable, rhs.m_lazyStringModifiable);
-}
-
-// ********************************************************
-
-void ByteQueue::Walker::IsolatedInitialize(const NameValuePairs &parameters)
-{
-	CRYPTOPP_UNUSED(parameters);
-
-	m_node = m_queue.m_head;
-	m_position = 0;
-	m_offset = 0;
-	m_lazyString = m_queue.m_lazyString;
-	m_lazyLength = m_queue.m_lazyLength;
-}
-
-size_t ByteQueue::Walker::Get(byte &outByte)
-{
-	ArraySink sink(&outByte, 1);
-	return (size_t)TransferTo(sink, 1);
-}
-
-size_t ByteQueue::Walker::Get(byte *outString, size_t getMax)
-{
-	ArraySink sink(outString, getMax);
-	return (size_t)TransferTo(sink, getMax);
-}
-
-size_t ByteQueue::Walker::Peek(byte &outByte) const
-{
-	ArraySink sink(&outByte, 1);
-	return (size_t)CopyTo(sink, 1);
-}
-
-size_t ByteQueue::Walker::Peek(byte *outString, size_t peekMax) const
-{
-	ArraySink sink(outString, peekMax);
-	return (size_t)CopyTo(sink, peekMax);
-}
-
-size_t ByteQueue::Walker::TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel, bool blocking)
-{
-	lword bytesLeft = transferBytes;
-	size_t blockedBytes = 0;
-
-	while (m_node)
-	{
-		size_t len = (size_t)STDMIN(bytesLeft, (lword)m_node->CurrentSize()-m_offset);
-		blockedBytes = target.ChannelPut2(channel, m_node->buf+m_node->m_head+m_offset, len, 0, blocking);
-
-		if (blockedBytes)
-			goto done;
-
-		m_position += len;
-		bytesLeft -= len;
-
-		if (!bytesLeft)
-		{
-			m_offset += len;
-			goto done;
-		}
-
-		m_node = m_node->next;
-		m_offset = 0;
-	}
-
-	if (bytesLeft && m_lazyLength)
-	{
-		size_t len = (size_t)STDMIN(bytesLeft, (lword)m_lazyLength);
-		blockedBytes = target.ChannelPut2(channel, m_lazyString, len, 0, blocking);
-		if (blockedBytes)
-			goto done;
-
-		m_lazyString += len;
-		m_lazyLength -= len;
-		bytesLeft -= len;
-	}
-
-done:
-	transferBytes -= bytesLeft;
-	return blockedBytes;
-}
-
-size_t ByteQueue::Walker::CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end, const std::string &channel, bool blocking) const
-{
-	Walker walker(*this);
-	walker.Skip(begin);
-	lword transferBytes = end-begin;
-	size_t blockedBytes = walker.TransferTo2(target, transferBytes, channel, blocking);
-	begin += transferBytes;
-	return blockedBytes;
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/queue.h b/src-cryptopp/queue.h
deleted file mode 100644
index e1ed4da..0000000
--- a/src-cryptopp/queue.h
+++ /dev/null
@@ -1,161 +0,0 @@
-// queue.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile queue.h
-//! \brief Classes for an unlimited queue to store bytes
-
-#ifndef CRYPTOPP_QUEUE_H
-#define CRYPTOPP_QUEUE_H
-
-#include "cryptlib.h"
-#include "simple.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-class ByteQueueNode;
-
-//! \class ByteQueue
-//! \brief Data structure used to store byte strings
-//! \details The queue is implemented as a linked list of byte arrays
-class CRYPTOPP_DLL ByteQueue : public Bufferless<BufferedTransformation>
-{
-public:
-	//! \brief Construct a ByteQueue
-	//! \param nodeSize the initial node size
-	//! \details Internally, ByteQueue uses a ByteQueueNode to store bytes, and \p nodeSize determines the
-	//!   size of the ByteQueueNode. A value of 0 indicates the ByteQueueNode should be automatically sized,
-	//!   which means a value of 256 is used.
-	ByteQueue(size_t nodeSize=0);
-
-	//! \brief Copy construct a ByteQueue
-	//! \param copy the other ByteQueue
-	ByteQueue(const ByteQueue &copy);
-	~ByteQueue();
-
-	lword MaxRetrievable() const
-		{return CurrentSize();}
-	bool AnyRetrievable() const
-		{return !IsEmpty();}
-
-	void IsolatedInitialize(const NameValuePairs &parameters);
-	byte * CreatePutSpace(size_t &size);
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-
-	size_t Get(byte &outByte);
-	size_t Get(byte *outString, size_t getMax);
-
-	size_t Peek(byte &outByte) const;
-	size_t Peek(byte *outString, size_t peekMax) const;
-
-	size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-	size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const;
-
-	// these member functions are not inherited
-	void SetNodeSize(size_t nodeSize);
-
-	lword CurrentSize() const;
-	bool IsEmpty() const;
-
-	void Clear();
-
-	void Unget(byte inByte);
-	void Unget(const byte *inString, size_t length);
-
-	const byte * Spy(size_t &contiguousSize) const;
-
-	void LazyPut(const byte *inString, size_t size);
-	void LazyPutModifiable(byte *inString, size_t size);
-	void UndoLazyPut(size_t size);
-	void FinalizeLazyPut();
-
-	ByteQueue & operator=(const ByteQueue &rhs);
-	bool operator==(const ByteQueue &rhs) const;
-	bool operator!=(const ByteQueue &rhs) const {return !operator==(rhs);}
-	byte operator[](lword i) const;
-	void swap(ByteQueue &rhs);
-
-	//! \class Walker
-	//! \brief A ByteQueue iterator
-	class Walker : public InputRejecting<BufferedTransformation>
-	{
-	public:
-		//! \brief Construct a ByteQueue Walker
-		//! \param queue a ByteQueue
-		Walker(const ByteQueue &queue)
-			: m_queue(queue), m_node(NULL), m_position(0), m_offset(0), m_lazyString(NULL), m_lazyLength(0)
-				{Initialize();}
-
-		lword GetCurrentPosition() {return m_position;}
-
-		lword MaxRetrievable() const
-			{return m_queue.CurrentSize() - m_position;}
-
-		void IsolatedInitialize(const NameValuePairs &parameters);
-
-		size_t Get(byte &outByte);
-		size_t Get(byte *outString, size_t getMax);
-
-		size_t Peek(byte &outByte) const;
-		size_t Peek(byte *outString, size_t peekMax) const;
-
-		size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true);
-		size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const;
-
-	private:
-		const ByteQueue &m_queue;
-		const ByteQueueNode *m_node;
-		lword m_position;
-		size_t m_offset;
-		const byte *m_lazyString;
-		size_t m_lazyLength;
-	};
-
-	friend class Walker;
-
-private:
-	void CleanupUsedNodes();
-	void CopyFrom(const ByteQueue &copy);
-	void Destroy();
-
-	bool m_autoNodeSize;
-	size_t m_nodeSize;
-	ByteQueueNode *m_head, *m_tail;
-	byte *m_lazyString;
-	size_t m_lazyLength;
-	bool m_lazyStringModifiable;
-};
-
-//! use this to make sure LazyPut is finalized in event of exception
-class CRYPTOPP_DLL LazyPutter
-{
-public:
-	LazyPutter(ByteQueue &bq, const byte *inString, size_t size)
-		: m_bq(bq) {bq.LazyPut(inString, size);}
-	~LazyPutter()
-		{try {m_bq.FinalizeLazyPut();} catch(const Exception&) {CRYPTOPP_ASSERT(0);}}
-protected:
-	LazyPutter(ByteQueue &bq) : m_bq(bq) {}
-private:
-	ByteQueue &m_bq;
-};
-
-//! like LazyPutter, but does a LazyPutModifiable instead
-class LazyPutterModifiable : public LazyPutter
-{
-public:
-	LazyPutterModifiable(ByteQueue &bq, byte *inString, size_t size)
-		: LazyPutter(bq) {bq.LazyPutModifiable(inString, size);}
-};
-
-NAMESPACE_END
-
-#ifndef __BORLANDC__
-NAMESPACE_BEGIN(std)
-template<> inline void swap(CryptoPP::ByteQueue &a, CryptoPP::ByteQueue &b)
-{
-	a.swap(b);
-}
-NAMESPACE_END
-#endif
-
-#endif
diff --git a/src-cryptopp/randpool.cpp b/src-cryptopp/randpool.cpp
deleted file mode 100644
index ad27270..0000000
--- a/src-cryptopp/randpool.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// randpool.cpp - written and placed in the public domain by Wei Dai
-// RandomPool used to follow the design of randpool in PGP 2.6.x,
-// but as of version 5.5 it has been redesigned to reduce the risk
-// of reusing random numbers after state rollback (which may occur
-// when running in a virtual machine like VMware).
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "randpool.h"
-#include "aes.h"
-#include "sha.h"
-#include "hrtimer.h"
-#include <time.h>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-RandomPool::RandomPool()
-	: m_pCipher(new AES::Encryption), m_keySet(false)
-{
-	memset(m_key, 0, m_key.SizeInBytes());
-	memset(m_seed, 0, m_seed.SizeInBytes());
-}
-
-void RandomPool::IncorporateEntropy(const byte *input, size_t length)
-{
-	SHA256 hash;
-	hash.Update(m_key, 32);
-	hash.Update(input, length);
-	hash.Final(m_key);
-	m_keySet = false;
-}
-
-void RandomPool::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size)
-{
-	if (size > 0)
-	{
-		if (!m_keySet)
-			m_pCipher->SetKey(m_key, 32);
-
-		CRYPTOPP_COMPILE_ASSERT(sizeof(TimerWord) <= 16);
-		CRYPTOPP_COMPILE_ASSERT(sizeof(time_t) <= 8);
-
-		Timer timer;
-		TimerWord tw = timer.GetCurrentTimerValue();
-
-		*(TimerWord *)(void*)m_seed.data() += tw;
-		time_t t = time(NULL);
-
-		// UBsan finding: signed integer overflow: 1876017710 + 1446085457 cannot be represented in type 'long int'
-		// *(time_t *)(m_seed.data()+8) += t;
-		word64 tt1 = 0, tt2 = (word64)t;
-		memcpy(&tt1, m_seed.data()+8, 8);
-		memcpy(m_seed.data()+8, &(tt2 += tt1), 8);
-
-		// Wipe the intermediates
-		*((volatile TimerWord*)&tw) = 0;
-		*((volatile word64*)&tt1) = 0;
-		*((volatile word64*)&tt2) = 0;
-
-		do
-		{
-			m_pCipher->ProcessBlock(m_seed);
-			size_t len = UnsignedMin(16, size);
-			target.ChannelPut(channel, m_seed, len);
-			size -= len;
-		} while (size > 0);
-	}
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/randpool.h b/src-cryptopp/randpool.h
deleted file mode 100644
index 86d1750..0000000
--- a/src-cryptopp/randpool.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// randpool.h - written and placed in the public domain by Wei Dai
-
-//! \file randpool.h
-//! \brief Class file for Randomness Pool
-//! \details RandomPool can be used to generate cryptographic quality pseudorandom bytes
-//!   after seeding the pool with IncorporateEntropy(). Internally, the generator uses
-//!   AES-256 to produce the stream. Entropy is stirred in using SHA-256.
-//! \details RandomPool used to follow the design of randpool in PGP 2.6.x. At version 5.5
-//!   RandomPool was redesigned to reduce the risk of reusing random numbers after state
-//!   rollback (which may occur when running in a virtual machine like VMware or a hosted
-//!   environment).
-//! \details If you need the pre-Crypto++ 5.5 generator then you can find it with:
-//! <pre>
-//!    $ git clone https://github.com/weidai11/cryptopp cryptopp-ancient
-//!    $ cryptopp-ancient
-//!
-//!    # Checkout the RandomPool change
-//!    $ git checkout f41245df6fb9b85574260eca9cd32777e8ab5136
-//!
-//!    # Go back one more
-//!    git checkout HEAD~1
-//!
-//!    $ grep 'MDC<SHA>' *.h *.cpp
-//!    randpool.cpp:typedef MDC<SHA> RandomPoolCipher;
-//! </pre>
-//! \since Crypto++ 4.0 (PGP 2.6.x style), Crypto++ 5.5 (AES-256 based)
-
-#ifndef CRYPTOPP_RANDPOOL_H
-#define CRYPTOPP_RANDPOOL_H
-
-#include "cryptlib.h"
-#include "filters.h"
-#include "secblock.h"
-#include "smartptr.h"
-#include "aes.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class RandomPool
-//! \brief Randomness Pool based on AES-256
-//! \details RandomPool can be used to generate cryptographic quality pseudorandom bytes
-//!   after seeding the pool with IncorporateEntropy(). Internally, the generator uses
-//!   AES-256 to produce the stream. Entropy is stirred in using SHA-256.
-//! \details RandomPool used to follow the design of randpool in PGP 2.6.x. At version 5.5
-//!   RandomPool was redesigned to reduce the risk of reusing random numbers after state
-//!   rollback (which may occur when running in a virtual machine like VMware or a hosted
-//!   environment).
-//! \since Crypto++ 4.0 (PGP 2.6.x style), Crypto++ 5.5 (AES-256 based)
-class CRYPTOPP_DLL RandomPool : public RandomNumberGenerator, public NotCopyable
-{
-public:
-	//! \brief Construct a RandomPool
-	RandomPool();
-
-	bool CanIncorporateEntropy() const {return true;}
-	void IncorporateEntropy(const byte *input, size_t length);
-	void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size);
-
-	// for backwards compatibility. use RandomNumberSource, RandomNumberStore, and RandomNumberSink for other BufferTransformation functionality
-	void Put(const byte *input, size_t length) {IncorporateEntropy(input, length);}
-
-private:
-	FixedSizeAlignedSecBlock<byte, 16, true> m_seed;
-	FixedSizeAlignedSecBlock<byte, 32> m_key;
-	member_ptr<BlockCipher> m_pCipher;
-	bool m_keySet;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/rdtables.cpp b/src-cryptopp/rdtables.cpp
deleted file mode 100644
index 870f648..0000000
--- a/src-cryptopp/rdtables.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-// Rijndael tables
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "rijndael.h"
-
-// VC60 workaround: gives a C4786 warning without this function
-// when runtime lib is set to multithread debug DLL
-// even though warning 4786 is disabled!
-void Rijndael_VC60Workaround()
-{
-}
-
-NAMESPACE_BEGIN(CryptoPP)
-
-/*
-Te0[x] = S [x].[02, 01, 01, 03];
-Te1[x] = S [x].[03, 02, 01, 01];
-Te2[x] = S [x].[01, 03, 02, 01];
-Te3[x] = S [x].[01, 01, 03, 02];
-
-Td0[x] = Si[x].[0e, 09, 0d, 0b];
-Td1[x] = Si[x].[0b, 0e, 09, 0d];
-Td2[x] = Si[x].[0d, 0b, 0e, 09];
-Td3[x] = Si[x].[09, 0d, 0b, 0e];
-*/
-
-const byte Rijndael::Base::Se[256] = {
-    0x63, 0x7c, 0x77, 0x7b,
-    0xf2, 0x6b, 0x6f, 0xc5,
-    0x30, 0x01, 0x67, 0x2b,
-    0xfe, 0xd7, 0xab, 0x76,
-    0xca, 0x82, 0xc9, 0x7d,
-    0xfa, 0x59, 0x47, 0xf0,
-    0xad, 0xd4, 0xa2, 0xaf,
-    0x9c, 0xa4, 0x72, 0xc0,
-    0xb7, 0xfd, 0x93, 0x26,
-    0x36, 0x3f, 0xf7, 0xcc,
-    0x34, 0xa5, 0xe5, 0xf1,
-    0x71, 0xd8, 0x31, 0x15,
-    0x04, 0xc7, 0x23, 0xc3,
-    0x18, 0x96, 0x05, 0x9a,
-    0x07, 0x12, 0x80, 0xe2,
-    0xeb, 0x27, 0xb2, 0x75,
-    0x09, 0x83, 0x2c, 0x1a,
-    0x1b, 0x6e, 0x5a, 0xa0,
-    0x52, 0x3b, 0xd6, 0xb3,
-    0x29, 0xe3, 0x2f, 0x84,
-    0x53, 0xd1, 0x00, 0xed,
-    0x20, 0xfc, 0xb1, 0x5b,
-    0x6a, 0xcb, 0xbe, 0x39,
-    0x4a, 0x4c, 0x58, 0xcf,
-    0xd0, 0xef, 0xaa, 0xfb,
-    0x43, 0x4d, 0x33, 0x85,
-    0x45, 0xf9, 0x02, 0x7f,
-    0x50, 0x3c, 0x9f, 0xa8,
-    0x51, 0xa3, 0x40, 0x8f,
-    0x92, 0x9d, 0x38, 0xf5,
-    0xbc, 0xb6, 0xda, 0x21,
-    0x10, 0xff, 0xf3, 0xd2,
-    0xcd, 0x0c, 0x13, 0xec,
-    0x5f, 0x97, 0x44, 0x17,
-    0xc4, 0xa7, 0x7e, 0x3d,
-    0x64, 0x5d, 0x19, 0x73,
-    0x60, 0x81, 0x4f, 0xdc,
-    0x22, 0x2a, 0x90, 0x88,
-    0x46, 0xee, 0xb8, 0x14,
-    0xde, 0x5e, 0x0b, 0xdb,
-    0xe0, 0x32, 0x3a, 0x0a,
-    0x49, 0x06, 0x24, 0x5c,
-    0xc2, 0xd3, 0xac, 0x62,
-    0x91, 0x95, 0xe4, 0x79,
-    0xe7, 0xc8, 0x37, 0x6d,
-    0x8d, 0xd5, 0x4e, 0xa9,
-    0x6c, 0x56, 0xf4, 0xea,
-    0x65, 0x7a, 0xae, 0x08,
-    0xba, 0x78, 0x25, 0x2e,
-    0x1c, 0xa6, 0xb4, 0xc6,
-    0xe8, 0xdd, 0x74, 0x1f,
-    0x4b, 0xbd, 0x8b, 0x8a,
-    0x70, 0x3e, 0xb5, 0x66,
-    0x48, 0x03, 0xf6, 0x0e,
-    0x61, 0x35, 0x57, 0xb9,
-    0x86, 0xc1, 0x1d, 0x9e,
-    0xe1, 0xf8, 0x98, 0x11,
-    0x69, 0xd9, 0x8e, 0x94,
-    0x9b, 0x1e, 0x87, 0xe9,
-    0xce, 0x55, 0x28, 0xdf,
-    0x8c, 0xa1, 0x89, 0x0d,
-    0xbf, 0xe6, 0x42, 0x68,
-    0x41, 0x99, 0x2d, 0x0f,
-    0xb0, 0x54, 0xbb, 0x16,
-};
-
-const byte Rijndael::Base::Sd[256] = {
-    0x52, 0x09, 0x6a, 0xd5,
-    0x30, 0x36, 0xa5, 0x38,
-    0xbf, 0x40, 0xa3, 0x9e,
-    0x81, 0xf3, 0xd7, 0xfb,
-    0x7c, 0xe3, 0x39, 0x82,
-    0x9b, 0x2f, 0xff, 0x87,
-    0x34, 0x8e, 0x43, 0x44,
-    0xc4, 0xde, 0xe9, 0xcb,
-    0x54, 0x7b, 0x94, 0x32,
-    0xa6, 0xc2, 0x23, 0x3d,
-    0xee, 0x4c, 0x95, 0x0b,
-    0x42, 0xfa, 0xc3, 0x4e,
-    0x08, 0x2e, 0xa1, 0x66,
-    0x28, 0xd9, 0x24, 0xb2,
-    0x76, 0x5b, 0xa2, 0x49,
-    0x6d, 0x8b, 0xd1, 0x25,
-    0x72, 0xf8, 0xf6, 0x64,
-    0x86, 0x68, 0x98, 0x16,
-    0xd4, 0xa4, 0x5c, 0xcc,
-    0x5d, 0x65, 0xb6, 0x92,
-    0x6c, 0x70, 0x48, 0x50,
-    0xfd, 0xed, 0xb9, 0xda,
-    0x5e, 0x15, 0x46, 0x57,
-    0xa7, 0x8d, 0x9d, 0x84,
-    0x90, 0xd8, 0xab, 0x00,
-    0x8c, 0xbc, 0xd3, 0x0a,
-    0xf7, 0xe4, 0x58, 0x05,
-    0xb8, 0xb3, 0x45, 0x06,
-    0xd0, 0x2c, 0x1e, 0x8f,
-    0xca, 0x3f, 0x0f, 0x02,
-    0xc1, 0xaf, 0xbd, 0x03,
-    0x01, 0x13, 0x8a, 0x6b,
-    0x3a, 0x91, 0x11, 0x41,
-    0x4f, 0x67, 0xdc, 0xea,
-    0x97, 0xf2, 0xcf, 0xce,
-    0xf0, 0xb4, 0xe6, 0x73,
-    0x96, 0xac, 0x74, 0x22,
-    0xe7, 0xad, 0x35, 0x85,
-    0xe2, 0xf9, 0x37, 0xe8,
-    0x1c, 0x75, 0xdf, 0x6e,
-    0x47, 0xf1, 0x1a, 0x71,
-    0x1d, 0x29, 0xc5, 0x89,
-    0x6f, 0xb7, 0x62, 0x0e,
-    0xaa, 0x18, 0xbe, 0x1b,
-    0xfc, 0x56, 0x3e, 0x4b,
-    0xc6, 0xd2, 0x79, 0x20,
-    0x9a, 0xdb, 0xc0, 0xfe,
-    0x78, 0xcd, 0x5a, 0xf4,
-    0x1f, 0xdd, 0xa8, 0x33,
-    0x88, 0x07, 0xc7, 0x31,
-    0xb1, 0x12, 0x10, 0x59,
-    0x27, 0x80, 0xec, 0x5f,
-    0x60, 0x51, 0x7f, 0xa9,
-    0x19, 0xb5, 0x4a, 0x0d,
-    0x2d, 0xe5, 0x7a, 0x9f,
-    0x93, 0xc9, 0x9c, 0xef,
-    0xa0, 0xe0, 0x3b, 0x4d,
-    0xae, 0x2a, 0xf5, 0xb0,
-    0xc8, 0xeb, 0xbb, 0x3c,
-    0x83, 0x53, 0x99, 0x61,
-    0x17, 0x2b, 0x04, 0x7e,
-    0xba, 0x77, 0xd6, 0x26,
-    0xe1, 0x69, 0x14, 0x63,
-    0x55, 0x21, 0x0c, 0x7d,
-};
-
-const word32 Rijndael::Base::rcon[] = {
-	0x01000000, 0x02000000, 0x04000000, 0x08000000,
-	0x10000000, 0x20000000, 0x40000000, 0x80000000,
-	0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/rijndael.cpp b/src-cryptopp/rijndael.cpp
deleted file mode 100644
index fb934d0..0000000
--- a/src-cryptopp/rijndael.cpp
+++ /dev/null
@@ -1,1363 +0,0 @@
-// rijndael.cpp - modified by Chris Morgan <cmorgan@wpi.edu>
-// and Wei Dai from Paulo Baretto's Rijndael implementation
-// The original code and all modifications are in the public domain.
-
-// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM rijndael.cpp" to generate MASM code
-
-/*
-July 2010: Added support for AES-NI instructions via compiler intrinsics.
-*/
-
-/*
-Feb 2009: The x86/x64 assembly code was rewritten in by Wei Dai to do counter mode
-caching, which was invented by Hongjun Wu and popularized by Daniel J. Bernstein
-and Peter Schwabe in their paper "New AES software speed records". The round
-function was also modified to include a trick similar to one in Brian Gladman's
-x86 assembly code, doing an 8-bit register move to minimize the number of
-register spills. Also switched to compressed tables and copying round keys to
-the stack.
-
-The C++ implementation now uses compressed tables if
-CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is defined.
-*/
-
-/*
-July 2006: Defense against timing attacks was added in by Wei Dai.
-
-The code now uses smaller tables in the first and last rounds,
-and preloads them into L1 cache before usage (by loading at least
-one element in each cache line).
-
-We try to delay subsequent accesses to each table (used in the first
-and last rounds) until all of the table has been preloaded. Hopefully
-the compiler isn't smart enough to optimize that code away.
-
-After preloading the table, we also try not to access any memory location
-other than the table and the stack, in order to prevent table entries from
-being unloaded from L1 cache, until that round is finished.
-(Some popular CPUs have 2-way associative caches.)
-*/
-
-// This is the original introductory comment:
-
-/**
- * version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS 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.
- */
-
-#include "pch.h"
-#include "config.h"
-
-#ifndef CRYPTOPP_IMPORTS
-#ifndef CRYPTOPP_GENERATE_X64_MASM
-
-#include "rijndael.h"
-#include "stdcpp.h"		// alloca
-#include "misc.h"
-#include "cpu.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// Hack for http://github.com/weidai11/cryptopp/issues/42 and http://github.com/weidai11/cryptopp/issues/132
-#if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS)
-# define CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS 1
-#endif
-
-// Hack for SunCC, http://github.com/weidai11/cryptopp/issues/224
-#if (__SUNPRO_CC >= 0x5130)
-# define MAYBE_CONST
-#else
-# define MAYBE_CONST const
-#endif
-
-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
-# if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_RIJNDAEL_ASM)
-namespace rdtable {CRYPTOPP_ALIGN_DATA(16) word64 Te[256+2];}
-using namespace rdtable;
-# else
-static word64 Te[256];
-# endif
-static word64 Td[256];
-#else // Not CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-# if defined(CRYPTOPP_X64_MASM_AVAILABLE)
-// Unused; avoids linker error on Microsoft X64 non-AESNI platforms
-namespace rdtable {CRYPTOPP_ALIGN_DATA(16) word64 Te[256+2];}
-# endif
-CRYPTOPP_ALIGN_DATA(16) static word32 Te[256*4];
-CRYPTOPP_ALIGN_DATA(16) static word32 Td[256*4];
-#endif // CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
-
-static volatile bool s_TeFilled = false, s_TdFilled = false;
-
-// ************************* Portable Code ************************************
-
-#define QUARTER_ROUND(L, T, t, a, b, c, d)	\
-	a ^= L(T, 3, byte(t)); t >>= 8;\
-	b ^= L(T, 2, byte(t)); t >>= 8;\
-	c ^= L(T, 1, byte(t)); t >>= 8;\
-	d ^= L(T, 0, t);
-
-#define QUARTER_ROUND_LE(t, a, b, c, d)	\
-	tempBlock[a] = ((byte *)(Te+byte(t)))[1]; t >>= 8;\
-	tempBlock[b] = ((byte *)(Te+byte(t)))[1]; t >>= 8;\
-	tempBlock[c] = ((byte *)(Te+byte(t)))[1]; t >>= 8;\
-	tempBlock[d] = ((byte *)(Te+t))[1];
-
-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
-	#define QUARTER_ROUND_LD(t, a, b, c, d)	\
-		tempBlock[a] = ((byte *)(Td+byte(t)))[GetNativeByteOrder()*7]; t >>= 8;\
-		tempBlock[b] = ((byte *)(Td+byte(t)))[GetNativeByteOrder()*7]; t >>= 8;\
-		tempBlock[c] = ((byte *)(Td+byte(t)))[GetNativeByteOrder()*7]; t >>= 8;\
-		tempBlock[d] = ((byte *)(Td+t))[GetNativeByteOrder()*7];
-#else
-	#define QUARTER_ROUND_LD(t, a, b, c, d)	\
-		tempBlock[a] = Sd[byte(t)]; t >>= 8;\
-		tempBlock[b] = Sd[byte(t)]; t >>= 8;\
-		tempBlock[c] = Sd[byte(t)]; t >>= 8;\
-		tempBlock[d] = Sd[t];
-#endif
-
-#define QUARTER_ROUND_E(t, a, b, c, d)		QUARTER_ROUND(TL_M, Te, t, a, b, c, d)
-#define QUARTER_ROUND_D(t, a, b, c, d)		QUARTER_ROUND(TL_M, Td, t, a, b, c, d)
-
-#ifdef IS_LITTLE_ENDIAN
-	#define QUARTER_ROUND_FE(t, a, b, c, d)		QUARTER_ROUND(TL_F, Te, t, d, c, b, a)
-	#define QUARTER_ROUND_FD(t, a, b, c, d)		QUARTER_ROUND(TL_F, Td, t, d, c, b, a)
-	#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
-		#define TL_F(T, i, x)	(*(word32 *)(void *)((byte *)T + x*8 + (6-i)%4+1))
-		#define TL_M(T, i, x)	(*(word32 *)(void *)((byte *)T + x*8 + (i+3)%4+1))
-	#else
-		#define TL_F(T, i, x)	rotrFixed(T[x], (3-i)*8)
-		#define TL_M(T, i, x)	T[i*256 + x]
-	#endif
-#else
-	#define QUARTER_ROUND_FE(t, a, b, c, d)		QUARTER_ROUND(TL_F, Te, t, a, b, c, d)
-	#define QUARTER_ROUND_FD(t, a, b, c, d)		QUARTER_ROUND(TL_F, Td, t, a, b, c, d)
-	#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
-		#define TL_F(T, i, x)	(*(word32 *)(void *)((byte *)T + x*8 + (4-i)%4))
-		#define TL_M			TL_F
-	#else
-		#define TL_F(T, i, x)	rotrFixed(T[x], i*8)
-		#define TL_M(T, i, x)	T[i*256 + x]
-	#endif
-#endif
-
-
-#define f2(x)   ((x<<1)^(((x>>7)&1)*0x11b))
-#define f4(x)   ((x<<2)^(((x>>6)&1)*0x11b)^(((x>>6)&2)*0x11b))
-#define f8(x)   ((x<<3)^(((x>>5)&1)*0x11b)^(((x>>5)&2)*0x11b)^(((x>>5)&4)*0x11b))
-
-#define f3(x)   (f2(x) ^ x)
-#define f9(x)   (f8(x) ^ x)
-#define fb(x)   (f8(x) ^ f2(x) ^ x)
-#define fd(x)   (f8(x) ^ f4(x) ^ x)
-#define fe(x)   (f8(x) ^ f4(x) ^ f2(x))
-
-void Rijndael::Base::FillEncTable()
-{
-	for (int i=0; i<256; i++)
-	{
-		byte x = Se[i];
-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
-		word32 y = word32(x)<<8 | word32(x)<<16 | word32(f2(x))<<24;
-		Te[i] = word64(y | f3(x))<<32 | y;
-#else
-		word32 y = f3(x) | word32(x)<<8 | word32(x)<<16 | word32(f2(x))<<24;
-		for (int j=0; j<4; j++)
-		{
-			Te[i+j*256] = y;
-			y = rotrFixed(y, 8);
-		}
-#endif
-	}
-#if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_RIJNDAEL_ASM)
-	Te[256] = Te[257] = 0;
-#endif
-	s_TeFilled = true;
-}
-
-void Rijndael::Base::FillDecTable()
-{
-	for (int i=0; i<256; i++)
-	{
-		byte x = Sd[i];
-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
-		word32 y = word32(fd(x))<<8 | word32(f9(x))<<16 | word32(fe(x))<<24;
-		Td[i] = word64(y | fb(x))<<32 | y | x;
-#else
-		word32 y = fb(x) | word32(fd(x))<<8 | word32(f9(x))<<16 | word32(fe(x))<<24;;
-		for (int j=0; j<4; j++)
-		{
-			Td[i+j*256] = y;
-			y = rotrFixed(y, 8);
-		}
-#endif
-	}
-	s_TdFilled = true;
-}
-
-void Rijndael::Base::UncheckedSetKey(const byte *userKey, unsigned int keylen, const NameValuePairs &)
-{
-	AssertValidKeyLength(keylen);
-
-	m_rounds = keylen/4 + 6;
-	m_key.New(4*(m_rounds+1));
-
-	word32 *rk = m_key;
-
-#if (CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE && CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE && (!defined(_MSC_VER) || _MSC_VER >= 1600 || CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32))
-	// MSVC 2008 SP1 generates bad code for _mm_extract_epi32() when compiling for X64
-	if (HasAESNI() && HasSSE4())
-	{
-		static const word32 rcLE[] = {
-			0x01, 0x02, 0x04, 0x08,
-			0x10, 0x20, 0x40, 0x80,
-			0x1B, 0x36, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-		};
-
-		// Coverity finding, appears to be false positive. Assert the condition.
-		const word32 *ro = rcLE, *rc = rcLE;
-		CRYPTOPP_UNUSED(ro);
-
-		__m128i temp = _mm_loadu_si128((__m128i *)(void *)(userKey+keylen-16));
-		memcpy(rk, userKey, keylen);
-
-		while (true)
-		{
-			// Coverity finding, appears to be false positive. Assert the condition.
-			CRYPTOPP_ASSERT(rc < ro + COUNTOF(rcLE));
-			rk[keylen/4] = rk[0] ^ _mm_extract_epi32(_mm_aeskeygenassist_si128(temp, 0), 3) ^ *(rc++);
-			rk[keylen/4+1] = rk[1] ^ rk[keylen/4];
-			rk[keylen/4+2] = rk[2] ^ rk[keylen/4+1];
-			rk[keylen/4+3] = rk[3] ^ rk[keylen/4+2];
-
-			if (rk + keylen/4 + 4 == m_key.end())
-				break;
-
-			if (keylen == 24)
-			{
-				rk[10] = rk[ 4] ^ rk[ 9];
-				rk[11] = rk[ 5] ^ rk[10];
-				// Coverity finding, appears to be false positive. Assert the condition.
-				CRYPTOPP_ASSERT(m_key.size() >= 12);
-				temp = _mm_insert_epi32(temp, rk[11], 3);
-			}
-			else if (keylen == 32)
-			{
-				// Coverity finding, appears to be false positive. Assert the condition.
-				CRYPTOPP_ASSERT(m_key.size() >= 12);
-				temp = _mm_insert_epi32(temp, rk[11], 3);
-    			rk[12] = rk[ 4] ^ _mm_extract_epi32(_mm_aeskeygenassist_si128(temp, 0), 2);
-    			rk[13] = rk[ 5] ^ rk[12];
-    			rk[14] = rk[ 6] ^ rk[13];
-    			rk[15] = rk[ 7] ^ rk[14];
-				// Coverity finding, appears to be false positive. Assert the condition.
-				CRYPTOPP_ASSERT(m_key.size() >= 16);
-				temp = _mm_insert_epi32(temp, rk[15], 3);
-			}
-			else
-			{
-				// Coverity finding, appears to be false positive. Assert the condition.
-				CRYPTOPP_ASSERT(m_key.size() >= 8);
-				temp = _mm_insert_epi32(temp, rk[7], 3);
-			}
-
-			rk += keylen/4;
-		}
-
-		if (!IsForwardTransformation())
-		{
-			rk = m_key;
-			unsigned int i, j;
-
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5120)
-			// __m128i is an unsigned long long[2], and support for swapping it was not added until C++11.
-			// SunCC 12.1 - 12.3 fail to consume the swap; while SunCC 12.4 consumes it without -std=c++11.
-			vec_swap(*(__m128i *)(rk), *(__m128i *)(rk+4*m_rounds));
-#else
-			std::swap(*(__m128i *)(void *)(rk), *(__m128i *)(void *)(rk+4*m_rounds));
-#endif
-			for (i = 4, j = 4*m_rounds-4; i < j; i += 4, j -= 4)
-			{
-				temp = _mm_aesimc_si128(*(__m128i *)(void *)(rk+i));
-				*(__m128i *)(void *)(rk+i) = _mm_aesimc_si128(*(__m128i *)(void *)(rk+j));
-				*(__m128i *)(void *)(rk+j) = temp;
-			}
-
-			*(__m128i *)(void *)(rk+i) = _mm_aesimc_si128(*(__m128i *)(void *)(rk+i));
-		}
-
-		return;
-	}
-#endif
-
-	GetUserKey(BIG_ENDIAN_ORDER, rk, keylen/4, userKey, keylen);
-	const word32 *rc = rcon;
-	word32 temp;
-
-	while (true)
-	{
-		temp  = rk[keylen/4-1];
-		word32 x = (word32(Se[GETBYTE(temp, 2)]) << 24) ^ (word32(Se[GETBYTE(temp, 1)]) << 16) ^ (word32(Se[GETBYTE(temp, 0)]) << 8) ^ Se[GETBYTE(temp, 3)];
-		rk[keylen/4] = rk[0] ^ x ^ *(rc++);
-		rk[keylen/4+1] = rk[1] ^ rk[keylen/4];
-		rk[keylen/4+2] = rk[2] ^ rk[keylen/4+1];
-		rk[keylen/4+3] = rk[3] ^ rk[keylen/4+2];
-
-		if (rk + keylen/4 + 4 == m_key.end())
-			break;
-
-		if (keylen == 24)
-		{
-			rk[10] = rk[ 4] ^ rk[ 9];
-			rk[11] = rk[ 5] ^ rk[10];
-		}
-		else if (keylen == 32)
-		{
-    		temp = rk[11];
-    		rk[12] = rk[ 4] ^ (word32(Se[GETBYTE(temp, 3)]) << 24) ^ (word32(Se[GETBYTE(temp, 2)]) << 16) ^ (word32(Se[GETBYTE(temp, 1)]) << 8) ^ Se[GETBYTE(temp, 0)];
-    		rk[13] = rk[ 5] ^ rk[12];
-    		rk[14] = rk[ 6] ^ rk[13];
-    		rk[15] = rk[ 7] ^ rk[14];
-		}
-		rk += keylen/4;
-	}
-
-	rk = m_key;
-
-	if (IsForwardTransformation())
-	{
-		if (!s_TeFilled)
-			FillEncTable();
-
-		ConditionalByteReverse(BIG_ENDIAN_ORDER, rk, rk, 16);
-		ConditionalByteReverse(BIG_ENDIAN_ORDER, rk + m_rounds*4, rk + m_rounds*4, 16);
-	}
-	else
-	{
-		if (!s_TdFilled)
-			FillDecTable();
-
-		unsigned int i, j;
-
-#define InverseMixColumn(x)		TL_M(Td, 0, Se[GETBYTE(x, 3)]) ^ TL_M(Td, 1, Se[GETBYTE(x, 2)]) ^ TL_M(Td, 2, Se[GETBYTE(x, 1)]) ^ TL_M(Td, 3, Se[GETBYTE(x, 0)])
-
-		for (i = 4, j = 4*m_rounds-4; i < j; i += 4, j -= 4)
-		{
-			temp = InverseMixColumn(rk[i    ]); rk[i    ] = InverseMixColumn(rk[j    ]); rk[j    ] = temp;
-			temp = InverseMixColumn(rk[i + 1]); rk[i + 1] = InverseMixColumn(rk[j + 1]); rk[j + 1] = temp;
-			temp = InverseMixColumn(rk[i + 2]); rk[i + 2] = InverseMixColumn(rk[j + 2]); rk[j + 2] = temp;
-			temp = InverseMixColumn(rk[i + 3]); rk[i + 3] = InverseMixColumn(rk[j + 3]); rk[j + 3] = temp;
-		}
-
-		rk[i+0] = InverseMixColumn(rk[i+0]);
-		rk[i+1] = InverseMixColumn(rk[i+1]);
-		rk[i+2] = InverseMixColumn(rk[i+2]);
-		rk[i+3] = InverseMixColumn(rk[i+3]);
-
-		temp = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[0]); rk[0] = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[4*m_rounds+0]); rk[4*m_rounds+0] = temp;
-		temp = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[1]); rk[1] = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[4*m_rounds+1]); rk[4*m_rounds+1] = temp;
-		temp = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[2]); rk[2] = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[4*m_rounds+2]); rk[4*m_rounds+2] = temp;
-		temp = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[3]); rk[3] = ConditionalByteReverse(BIG_ENDIAN_ORDER, rk[4*m_rounds+3]); rk[4*m_rounds+3] = temp;
-	}
-
-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-	if (HasAESNI())
-		ConditionalByteReverse(BIG_ENDIAN_ORDER, rk+4, rk+4, (m_rounds-1)*16);
-#endif
-}
-
-void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-#if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_RIJNDAEL_ASM)
-	if (HasSSE2())
-#else
-	if (HasAESNI())
-#endif
-	{
-		return (void)Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0);
-	}
-#endif
-
-	typedef BlockGetAndPut<word32, NativeByteOrder> Block;
-
-	word32 s0, s1, s2, s3, t0, t1, t2, t3;
-	Block::Get(inBlock)(s0)(s1)(s2)(s3);
-
-	const word32 *rk = m_key;
-	s0 ^= rk[0];
-	s1 ^= rk[1];
-	s2 ^= rk[2];
-	s3 ^= rk[3];
-	t0 = rk[4];
-	t1 = rk[5];
-	t2 = rk[6];
-	t3 = rk[7];
-	rk += 8;
-
-	// timing attack countermeasure. see comments at top for more details.
-	// also see http://github.com/weidai11/cryptopp/issues/146
-	const int cacheLineSize = GetCacheLineSize();
-	unsigned int i;
-	volatile word32 _u = 0;
-	word32 u = _u;
-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
-	for (i=0; i<2048; i+=cacheLineSize)
-#else
-	for (i=0; i<1024; i+=cacheLineSize)
-#endif
-		u &= *(const word32 *)(const void *)(((const byte *)Te)+i);
-	u &= Te[255];
-	s0 |= u; s1 |= u; s2 |= u; s3 |= u;
-
-	QUARTER_ROUND_FE(s3, t0, t1, t2, t3)
-	QUARTER_ROUND_FE(s2, t3, t0, t1, t2)
-	QUARTER_ROUND_FE(s1, t2, t3, t0, t1)
-	QUARTER_ROUND_FE(s0, t1, t2, t3, t0)
-
-	// Nr - 2 full rounds:
-    unsigned int r = m_rounds/2 - 1;
-    do
-	{
-		s0 = rk[0]; s1 = rk[1]; s2 = rk[2]; s3 = rk[3];
-
-		QUARTER_ROUND_E(t3, s0, s1, s2, s3)
-		QUARTER_ROUND_E(t2, s3, s0, s1, s2)
-		QUARTER_ROUND_E(t1, s2, s3, s0, s1)
-		QUARTER_ROUND_E(t0, s1, s2, s3, s0)
-
-		t0 = rk[4]; t1 = rk[5]; t2 = rk[6]; t3 = rk[7];
-
-		QUARTER_ROUND_E(s3, t0, t1, t2, t3)
-		QUARTER_ROUND_E(s2, t3, t0, t1, t2)
-		QUARTER_ROUND_E(s1, t2, t3, t0, t1)
-		QUARTER_ROUND_E(s0, t1, t2, t3, t0)
-
-        rk += 8;
-    } while (--r);
-
-	word32 tbw[4];
-	byte *const tempBlock = (byte *)tbw;
-
-	QUARTER_ROUND_LE(t2, 15, 2, 5, 8)
-	QUARTER_ROUND_LE(t1, 11, 14, 1, 4)
-	QUARTER_ROUND_LE(t0, 7, 10, 13, 0)
-	QUARTER_ROUND_LE(t3, 3, 6, 9, 12)
-
-	Block::Put(xorBlock, outBlock)(tbw[0]^rk[0])(tbw[1]^rk[1])(tbw[2]^rk[2])(tbw[3]^rk[3]);
-}
-
-void Rijndael::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-{
-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-	if (HasAESNI())
-	{
-		Rijndael::Dec::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0);
-		return;
-	}
-#endif
-
-	typedef BlockGetAndPut<word32, NativeByteOrder> Block;
-
-	word32 s0, s1, s2, s3, t0, t1, t2, t3;
-	Block::Get(inBlock)(s0)(s1)(s2)(s3);
-
-	const word32 *rk = m_key;
-	s0 ^= rk[0];
-	s1 ^= rk[1];
-	s2 ^= rk[2];
-	s3 ^= rk[3];
-	t0 = rk[4];
-	t1 = rk[5];
-	t2 = rk[6];
-	t3 = rk[7];
-	rk += 8;
-
-	// timing attack countermeasure. see comments at top for more details.
-	// also see http://github.com/weidai11/cryptopp/issues/146
-	const int cacheLineSize = GetCacheLineSize();
-	unsigned int i;
-	volatile word32 _u = 0;
-	word32 u = _u;
-#if defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS)
-	for (i=0; i<2048; i+=cacheLineSize)
-#else
-	for (i=0; i<1024; i+=cacheLineSize)
-#endif
-		u &= *(const word32 *)(const void *)(((const byte *)Td)+i);
-	u &= Td[255];
-	s0 |= u; s1 |= u; s2 |= u; s3 |= u;
-
-	QUARTER_ROUND_FD(s3, t2, t1, t0, t3)
-	QUARTER_ROUND_FD(s2, t1, t0, t3, t2)
-	QUARTER_ROUND_FD(s1, t0, t3, t2, t1)
-	QUARTER_ROUND_FD(s0, t3, t2, t1, t0)
-
-	// Nr - 2 full rounds:
-    unsigned int r = m_rounds/2 - 1;
-    do
-	{
-		s0 = rk[0]; s1 = rk[1]; s2 = rk[2]; s3 = rk[3];
-
-		QUARTER_ROUND_D(t3, s2, s1, s0, s3)
-		QUARTER_ROUND_D(t2, s1, s0, s3, s2)
-		QUARTER_ROUND_D(t1, s0, s3, s2, s1)
-		QUARTER_ROUND_D(t0, s3, s2, s1, s0)
-
-		t0 = rk[4]; t1 = rk[5]; t2 = rk[6]; t3 = rk[7];
-
-		QUARTER_ROUND_D(s3, t2, t1, t0, t3)
-		QUARTER_ROUND_D(s2, t1, t0, t3, t2)
-		QUARTER_ROUND_D(s1, t0, t3, t2, t1)
-		QUARTER_ROUND_D(s0, t3, t2, t1, t0)
-
-        rk += 8;
-    } while (--r);
-
-#if !(defined(CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS) || defined(CRYPTOPP_ALLOW_RIJNDAEL_UNALIGNED_DATA_ACCESS))
-	// timing attack countermeasure. see comments at top for more details
-	// If CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is defined,
-	// QUARTER_ROUND_LD will use Td, which is already preloaded.
-	u = _u;
-	for (i=0; i<256; i+=cacheLineSize)
-		u &= *(const word32 *)(const void *)(Sd+i);
-	u &= *(const word32 *)(const void *)(Sd+252);
-	t0 |= u; t1 |= u; t2 |= u; t3 |= u;
-#endif
-
-	word32 tbw[4];
-	byte *const tempBlock = (byte *)tbw;
-
-	QUARTER_ROUND_LD(t2, 7, 2, 13, 8)
-	QUARTER_ROUND_LD(t1, 3, 14, 9, 4)
-	QUARTER_ROUND_LD(t0, 15, 10, 5, 0)
-	QUARTER_ROUND_LD(t3, 11, 6, 1, 12)
-
-	Block::Put(xorBlock, outBlock)(tbw[0]^rk[0])(tbw[1]^rk[1])(tbw[2]^rk[2])(tbw[3]^rk[3]);
-}
-
-// ************************* Assembly Code ************************************
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4731)	// frame pointer register 'ebp' modified by inline assembly code
-#endif
-
-#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && !defined(CRYPTOPP_DISABLE_RIJNDAEL_ASM)
-
-CRYPTOPP_NAKED void CRYPTOPP_FASTCALL Rijndael_Enc_AdvancedProcessBlocks(void *locals, const word32 *k)
-{
-	CRYPTOPP_UNUSED(locals); CRYPTOPP_UNUSED(k);
-
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-
-#define L_REG			esp
-#define L_INDEX(i)		(L_REG+768+i)
-#define L_INXORBLOCKS	L_INBLOCKS+4
-#define L_OUTXORBLOCKS	L_INBLOCKS+8
-#define L_OUTBLOCKS		L_INBLOCKS+12
-#define L_INCREMENTS	L_INDEX(16*15)
-#define L_SP			L_INDEX(16*16)
-#define L_LENGTH		L_INDEX(16*16+4)
-#define L_KEYS_BEGIN	L_INDEX(16*16+8)
-
-#define MOVD			movd
-#define MM(i)			mm##i
-
-#define MXOR(a,b,c)	\
-	AS2(	movzx	esi, b)\
-	AS2(	movd	mm7, DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\
-	AS2(	pxor	MM(a), mm7)\
-
-#define MMOV(a,b,c)	\
-	AS2(	movzx	esi, b)\
-	AS2(	movd	MM(a), DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\
-
-#else
-
-#define L_REG			r8
-#define L_INDEX(i)		(L_REG+i)
-#define L_INXORBLOCKS	L_INBLOCKS+8
-#define L_OUTXORBLOCKS	L_INBLOCKS+16
-#define L_OUTBLOCKS		L_INBLOCKS+24
-#define L_INCREMENTS	L_INDEX(16*16)
-#define L_LENGTH		L_INDEX(16*18+8)
-#define L_KEYS_BEGIN	L_INDEX(16*19)
-
-#define MOVD			mov
-#define MM_0			r9d
-#define MM_1			r12d
-#ifdef __GNUC__
-#define MM_2			r11d
-#else
-#define MM_2			r10d
-#endif
-#define MM(i)			MM_##i
-
-#define MXOR(a,b,c)	\
-	AS2(	movzx	esi, b)\
-	AS2(	xor		MM(a), DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\
-
-#define MMOV(a,b,c)	\
-	AS2(	movzx	esi, b)\
-	AS2(	mov		MM(a), DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\
-
-#endif
-
-#define L_SUBKEYS		L_INDEX(0)
-#define L_SAVED_X		L_SUBKEYS
-#define L_KEY12			L_INDEX(16*12)
-#define L_LASTROUND		L_INDEX(16*13)
-#define L_INBLOCKS		L_INDEX(16*14)
-#define MAP0TO4(i)		(ASM_MOD(i+3,4)+1)
-
-#define XOR(a,b,c)	\
-	AS2(	movzx	esi, b)\
-	AS2(	xor		a, DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\
-
-#define MOV(a,b,c)	\
-	AS2(	movzx	esi, b)\
-	AS2(	mov		a, DWORD PTR [AS_REG_7+8*WORD_REG(si)+MAP0TO4(c)])\
-
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-		ALIGN   8
-	Rijndael_Enc_AdvancedProcessBlocks	PROC FRAME
-		rex_push_reg rsi
-		push_reg rdi
-		push_reg rbx
-		push_reg r12
-		.endprolog
-		mov L_REG, rcx
-		mov AS_REG_7, ?Te@rdtable@CryptoPP@@3PA_KA
-		mov edi, DWORD PTR [?g_cacheLineSize@CryptoPP@@3IA]
-#elif defined(__GNUC__)
-	__asm__ __volatile__
-	(
-	INTEL_NOPREFIX
-	#if CRYPTOPP_BOOL_X64
-	AS2(	mov		L_REG, rcx)
-	#endif
-	AS_PUSH_IF86(bx)
-	AS_PUSH_IF86(bp)
-	AS2(	mov		AS_REG_7, WORD_REG(si))
-#else
-	AS_PUSH_IF86(si)
-	AS_PUSH_IF86(di)
-	AS_PUSH_IF86(bx)
-	AS_PUSH_IF86(bp)
-	AS2(	lea		AS_REG_7, [Te])
-	AS2(	mov		edi, [g_cacheLineSize])
-#endif
-
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	AS2(	mov		[ecx+16*12+16*4], esp)	// save esp to L_SP
-	AS2(	lea		esp, [ecx-768])
-#endif
-
-	// copy subkeys to stack
-	AS2(	mov		WORD_REG(si), [L_KEYS_BEGIN])
-	AS2(	mov		WORD_REG(ax), 16)
-	AS2(	and		WORD_REG(ax), WORD_REG(si))
-	AS2(	movdqa	xmm3, XMMWORD_PTR [WORD_REG(dx)+16+WORD_REG(ax)])	// subkey 1 (non-counter) or 2 (counter)
-	AS2(	movdqa	[L_KEY12], xmm3)
-	AS2(	lea		WORD_REG(ax), [WORD_REG(dx)+WORD_REG(ax)+2*16])
-	AS2(	sub		WORD_REG(ax), WORD_REG(si))
-	ASL(0)
-	AS2(	movdqa	xmm0, [WORD_REG(ax)+WORD_REG(si)])
-	AS2(	movdqa	XMMWORD_PTR [L_SUBKEYS+WORD_REG(si)], xmm0)
-	AS2(	add		WORD_REG(si), 16)
-	AS2(	cmp		WORD_REG(si), 16*12)
-	ATT_NOPREFIX
-	ASJ(	jl,		0, b)
-	INTEL_NOPREFIX
-
-	// read subkeys 0, 1 and last
-	AS2(	movdqa	xmm4, [WORD_REG(ax)+WORD_REG(si)])	// last subkey
-	AS2(	movdqa	xmm1, [WORD_REG(dx)])			// subkey 0
-	AS2(	MOVD	MM(1), [WORD_REG(dx)+4*4])		// 0,1,2,3
-	AS2(	mov		ebx, [WORD_REG(dx)+5*4])		// 4,5,6,7
-	AS2(	mov		ecx, [WORD_REG(dx)+6*4])		// 8,9,10,11
-	AS2(	mov		edx, [WORD_REG(dx)+7*4])		// 12,13,14,15
-
-	// load table into cache
-	AS2(	xor		WORD_REG(ax), WORD_REG(ax))
-	ASL(9)
-	AS2(	mov		esi, [AS_REG_7+WORD_REG(ax)])
-	AS2(	add		WORD_REG(ax), WORD_REG(di))
-	AS2(	mov		esi, [AS_REG_7+WORD_REG(ax)])
-	AS2(	add		WORD_REG(ax), WORD_REG(di))
-	AS2(	mov		esi, [AS_REG_7+WORD_REG(ax)])
-	AS2(	add		WORD_REG(ax), WORD_REG(di))
-	AS2(	mov		esi, [AS_REG_7+WORD_REG(ax)])
-	AS2(	add		WORD_REG(ax), WORD_REG(di))
-	AS2(	cmp		WORD_REG(ax), 2048)
-	ATT_NOPREFIX
-	ASJ(	jl,		9, b)
-	INTEL_NOPREFIX
-	AS1(	lfence)
-
-	AS2(	test	DWORD PTR [L_LENGTH], 1)
-	ATT_NOPREFIX
-	ASJ(	jz,		8, f)
-	INTEL_NOPREFIX
-
-	// counter mode one-time setup
-	AS2(	mov		WORD_REG(si), [L_INBLOCKS])
-	AS2(	movdqu	xmm2, [WORD_REG(si)])	// counter
-	AS2(	pxor	xmm2, xmm1)
-	AS2(	psrldq	xmm1, 14)
-	AS2(	movd	eax, xmm1)
-	AS2(	mov		al, BYTE PTR [WORD_REG(si)+15])
-	AS2(	MOVD	MM(2), eax)
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	AS2(	mov		eax, 1)
-	AS2(	movd	mm3, eax)
-#endif
-
-	// partial first round, in: xmm2(15,14,13,12;11,10,9,8;7,6,5,4;3,2,1,0), out: mm1, ebx, ecx, edx
-	AS2(	movd	eax, xmm2)
-	AS2(	psrldq	xmm2, 4)
-	AS2(	movd	edi, xmm2)
-	AS2(	psrldq	xmm2, 4)
-		MXOR(		1, al, 0)		// 0
-		XOR(		edx, ah, 1)		// 1
-	AS2(	shr		eax, 16)
-		XOR(		ecx, al, 2)		// 2
-		XOR(		ebx, ah, 3)		// 3
-	AS2(	mov		eax, edi)
-	AS2(	movd	edi, xmm2)
-	AS2(	psrldq	xmm2, 4)
-		XOR(		ebx, al, 0)		// 4
-		MXOR(		1, ah, 1)		// 5
-	AS2(	shr		eax, 16)
-		XOR(		edx, al, 2)		// 6
-		XOR(		ecx, ah, 3)		// 7
-	AS2(	mov		eax, edi)
-	AS2(	movd	edi, xmm2)
-		XOR(		ecx, al, 0)		// 8
-		XOR(		ebx, ah, 1)		// 9
-	AS2(	shr		eax, 16)
-		MXOR(		1, al, 2)		// 10
-		XOR(		edx, ah, 3)		// 11
-	AS2(	mov		eax, edi)
-		XOR(		edx, al, 0)		// 12
-		XOR(		ecx, ah, 1)		// 13
-	AS2(	shr		eax, 16)
-		XOR(		ebx, al, 2)		// 14
-	AS2(	psrldq	xmm2, 3)
-
-	// partial second round, in: ebx(4,5,6,7), ecx(8,9,10,11), edx(12,13,14,15), out: eax, ebx, edi, mm0
-	AS2(	mov		eax, [L_KEY12+0*4])
-	AS2(	mov		edi, [L_KEY12+2*4])
-	AS2(	MOVD	MM(0), [L_KEY12+3*4])
-		MXOR(	0, cl, 3)	/* 11 */
-		XOR(	edi, bl, 3)	/* 7 */
-		MXOR(	0, bh, 2)	/* 6 */
-	AS2(	shr ebx, 16)	/* 4,5 */
-		XOR(	eax, bl, 1)	/* 5 */
-		MOV(	ebx, bh, 0)	/* 4 */
-	AS2(	xor		ebx, [L_KEY12+1*4])
-		XOR(	eax, ch, 2)	/* 10 */
-	AS2(	shr ecx, 16)	/* 8,9 */
-		XOR(	eax, dl, 3)	/* 15 */
-		XOR(	ebx, dh, 2)	/* 14 */
-	AS2(	shr edx, 16)	/* 12,13 */
-		XOR(	edi, ch, 0)	/* 8 */
-		XOR(	ebx, cl, 1)	/* 9 */
-		XOR(	edi, dl, 1)	/* 13 */
-		MXOR(	0, dh, 0)	/* 12 */
-
-	AS2(	movd	ecx, xmm2)
-	AS2(	MOVD	edx, MM(1))
-	AS2(	MOVD	[L_SAVED_X+3*4], MM(0))
-	AS2(	mov		[L_SAVED_X+0*4], eax)
-	AS2(	mov		[L_SAVED_X+1*4], ebx)
-	AS2(	mov		[L_SAVED_X+2*4], edi)
-	ATT_NOPREFIX
-	ASJ(	jmp,	5, f)
-	INTEL_NOPREFIX
-	ASL(3)
-	// non-counter mode per-block setup
-	AS2(	MOVD	MM(1), [L_KEY12+0*4])	// 0,1,2,3
-	AS2(	mov		ebx, [L_KEY12+1*4])		// 4,5,6,7
-	AS2(	mov		ecx, [L_KEY12+2*4])		// 8,9,10,11
-	AS2(	mov		edx, [L_KEY12+3*4])		// 12,13,14,15
-	ASL(8)
-	AS2(	mov		WORD_REG(ax), [L_INBLOCKS])
-	AS2(	movdqu	xmm2, [WORD_REG(ax)])
-	AS2(	mov		WORD_REG(si), [L_INXORBLOCKS])
-	AS2(	movdqu	xmm5, [WORD_REG(si)])
-	AS2(	pxor	xmm2, xmm1)
-	AS2(	pxor	xmm2, xmm5)
-
-	// first round, in: xmm2(15,14,13,12;11,10,9,8;7,6,5,4;3,2,1,0), out: eax, ebx, ecx, edx
-	AS2(	movd	eax, xmm2)
-	AS2(	psrldq	xmm2, 4)
-	AS2(	movd	edi, xmm2)
-	AS2(	psrldq	xmm2, 4)
-		MXOR(		1, al, 0)		// 0
-		XOR(		edx, ah, 1)		// 1
-	AS2(	shr		eax, 16)
-		XOR(		ecx, al, 2)		// 2
-		XOR(		ebx, ah, 3)		// 3
-	AS2(	mov		eax, edi)
-	AS2(	movd	edi, xmm2)
-	AS2(	psrldq	xmm2, 4)
-		XOR(		ebx, al, 0)		// 4
-		MXOR(		1, ah, 1)		// 5
-	AS2(	shr		eax, 16)
-		XOR(		edx, al, 2)		// 6
-		XOR(		ecx, ah, 3)		// 7
-	AS2(	mov		eax, edi)
-	AS2(	movd	edi, xmm2)
-		XOR(		ecx, al, 0)		// 8
-		XOR(		ebx, ah, 1)		// 9
-	AS2(	shr		eax, 16)
-		MXOR(		1, al, 2)		// 10
-		XOR(		edx, ah, 3)		// 11
-	AS2(	mov		eax, edi)
-		XOR(		edx, al, 0)		// 12
-		XOR(		ecx, ah, 1)		// 13
-	AS2(	shr		eax, 16)
-		XOR(		ebx, al, 2)		// 14
-		MXOR(		1, ah, 3)		// 15
-	AS2(	MOVD	eax, MM(1))
-
-	AS2(	add		L_REG, [L_KEYS_BEGIN])
-	AS2(	add		L_REG, 4*16)
-	ATT_NOPREFIX
-	ASJ(	jmp,	2, f)
-	INTEL_NOPREFIX
-	ASL(1)
-	// counter-mode per-block setup
-	AS2(	MOVD	ecx, MM(2))
-	AS2(	MOVD	edx, MM(1))
-	AS2(	mov		eax, [L_SAVED_X+0*4])
-	AS2(	mov		ebx, [L_SAVED_X+1*4])
-	AS2(	xor		cl, ch)
-	AS2(	and		WORD_REG(cx), 255)
-	ASL(5)
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	AS2(	paddb	MM(2), mm3)
-#else
-	AS2(	add		MM(2), 1)
-#endif
-	// remaining part of second round, in: edx(previous round),esi(keyed counter byte) eax,ebx,[L_SAVED_X+2*4],[L_SAVED_X+3*4], out: eax,ebx,ecx,edx
-	AS2(	xor		edx, DWORD PTR [AS_REG_7+WORD_REG(cx)*8+3])
-		XOR(		ebx, dl, 3)
-		MOV(		ecx, dh, 2)
-	AS2(	shr		edx, 16)
-	AS2(	xor		ecx, [L_SAVED_X+2*4])
-		XOR(		eax, dh, 0)
-		MOV(		edx, dl, 1)
-	AS2(	xor		edx, [L_SAVED_X+3*4])
-
-	AS2(	add		L_REG, [L_KEYS_BEGIN])
-	AS2(	add		L_REG, 3*16)
-	ATT_NOPREFIX
-	ASJ(	jmp,	4, f)
-	INTEL_NOPREFIX
-
-// in: eax(0,1,2,3), ebx(4,5,6,7), ecx(8,9,10,11), edx(12,13,14,15)
-// out: eax, ebx, edi, mm0
-#define ROUND()		\
-		MXOR(	0, cl, 3)	/* 11 */\
-	AS2(	mov	cl, al)		/* 8,9,10,3 */\
-		XOR(	edi, ah, 2)	/* 2 */\
-	AS2(	shr eax, 16)	/* 0,1 */\
-		XOR(	edi, bl, 3)	/* 7 */\
-		MXOR(	0, bh, 2)	/* 6 */\
-	AS2(	shr ebx, 16)	/* 4,5 */\
-		MXOR(	0, al, 1)	/* 1 */\
-		MOV(	eax, ah, 0)	/* 0 */\
-		XOR(	eax, bl, 1)	/* 5 */\
-		MOV(	ebx, bh, 0)	/* 4 */\
-		XOR(	eax, ch, 2)	/* 10 */\
-		XOR(	ebx, cl, 3)	/* 3 */\
-	AS2(	shr ecx, 16)	/* 8,9 */\
-		XOR(	eax, dl, 3)	/* 15 */\
-		XOR(	ebx, dh, 2)	/* 14 */\
-	AS2(	shr edx, 16)	/* 12,13 */\
-		XOR(	edi, ch, 0)	/* 8 */\
-		XOR(	ebx, cl, 1)	/* 9 */\
-		XOR(	edi, dl, 1)	/* 13 */\
-		MXOR(	0, dh, 0)	/* 12 */\
-
-	ASL(2)	// 2-round loop
-	AS2(	MOVD	MM(0), [L_SUBKEYS-4*16+3*4])
-	AS2(	mov		edi, [L_SUBKEYS-4*16+2*4])
-	ROUND()
-	AS2(	mov		ecx, edi)
-	AS2(	xor		eax, [L_SUBKEYS-4*16+0*4])
-	AS2(	xor		ebx, [L_SUBKEYS-4*16+1*4])
-	AS2(	MOVD	edx, MM(0))
-
-	ASL(4)
-	AS2(	MOVD	MM(0), [L_SUBKEYS-4*16+7*4])
-	AS2(	mov		edi, [L_SUBKEYS-4*16+6*4])
-	ROUND()
-	AS2(	mov		ecx, edi)
-	AS2(	xor		eax, [L_SUBKEYS-4*16+4*4])
-	AS2(	xor		ebx, [L_SUBKEYS-4*16+5*4])
-	AS2(	MOVD	edx, MM(0))
-
-	AS2(	add		L_REG, 32)
-	AS2(	test	L_REG, 255)
-	ATT_NOPREFIX
-	ASJ(	jnz,	2, b)
-	INTEL_NOPREFIX
-	AS2(	sub		L_REG, 16*16)
-
-#define LAST(a, b, c)												\
-	AS2(	movzx	esi, a											)\
-	AS2(	movzx	edi, BYTE PTR [AS_REG_7+WORD_REG(si)*8+1]	)\
-	AS2(	movzx	esi, b											)\
-	AS2(	xor		edi, DWORD PTR [AS_REG_7+WORD_REG(si)*8+0]	)\
-	AS2(	mov		WORD PTR [L_LASTROUND+c], di					)\
-
-	// last round
-	LAST(ch, dl, 2)
-	LAST(dh, al, 6)
-	AS2(	shr		edx, 16)
-	LAST(ah, bl, 10)
-	AS2(	shr		eax, 16)
-	LAST(bh, cl, 14)
-	AS2(	shr		ebx, 16)
-	LAST(dh, al, 12)
-	AS2(	shr		ecx, 16)
-	LAST(ah, bl, 0)
-	LAST(bh, cl, 4)
-	LAST(ch, dl, 8)
-
-	AS2(	mov		WORD_REG(ax), [L_OUTXORBLOCKS])
-	AS2(	mov		WORD_REG(bx), [L_OUTBLOCKS])
-
-	AS2(	mov		WORD_REG(cx), [L_LENGTH])
-	AS2(	sub		WORD_REG(cx), 16)
-
-	AS2(	movdqu	xmm2, [WORD_REG(ax)])
-	AS2(	pxor	xmm2, xmm4)
-
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	AS2(	movdqa	xmm0, [L_INCREMENTS])
-	AS2(	paddd	xmm0, [L_INBLOCKS])
-	AS2(	movdqa	[L_INBLOCKS], xmm0)
-#else
-	AS2(	movdqa	xmm0, [L_INCREMENTS+16])
-	AS2(	paddq	xmm0, [L_INBLOCKS+16])
-	AS2(	movdqa	[L_INBLOCKS+16], xmm0)
-#endif
-
-	AS2(	pxor	xmm2, [L_LASTROUND])
-	AS2(	movdqu	[WORD_REG(bx)], xmm2)
-
-	ATT_NOPREFIX
-	ASJ(	jle,	7, f)
-	INTEL_NOPREFIX
-	AS2(	mov		[L_LENGTH], WORD_REG(cx))
-	AS2(	test	WORD_REG(cx), 1)
-	ATT_NOPREFIX
-	ASJ(	jnz,	1, b)
-	INTEL_NOPREFIX
-#if CRYPTOPP_BOOL_X64
-	AS2(	movdqa	xmm0, [L_INCREMENTS])
-	AS2(	paddq	xmm0, [L_INBLOCKS])
-	AS2(	movdqa	[L_INBLOCKS], xmm0)
-#endif
-	ATT_NOPREFIX
-	ASJ(	jmp,	3, b)
-	INTEL_NOPREFIX
-
-	ASL(7)
-	// erase keys on stack
-	AS2(	xorps	xmm0, xmm0)
-	AS2(	lea		WORD_REG(ax), [L_SUBKEYS+7*16])
-	AS2(	movaps	[WORD_REG(ax)-7*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)-6*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)-5*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)-4*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)-3*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)-2*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)-1*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)+0*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)+1*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)+2*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)+3*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)+4*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)+5*16], xmm0)
-	AS2(	movaps	[WORD_REG(ax)+6*16], xmm0)
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	AS2(	mov		esp, [L_SP])
-	AS1(	emms)
-#endif
-	AS_POP_IF86(bp)
-	AS_POP_IF86(bx)
-#if defined(_MSC_VER) && CRYPTOPP_BOOL_X86
-	AS_POP_IF86(di)
-	AS_POP_IF86(si)
-	AS1(ret)
-#endif
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-	pop r12
-	pop rbx
-	pop rdi
-	pop rsi
-	ret
-	Rijndael_Enc_AdvancedProcessBlocks ENDP
-#endif
-#ifdef __GNUC__
-	ATT_PREFIX
-	:
-	: "c" (locals), "d" (k), "S" (Te), "D" (g_cacheLineSize)
-	: "memory", "cc", "%eax"
-	#if CRYPTOPP_BOOL_X64
-		, "%rbx", "%r8", "%r9", "%r10", "%r11", "%r12"
-	#endif
-	);
-#endif
-}
-
-#endif
-
-#ifndef CRYPTOPP_GENERATE_X64_MASM
-
-#ifdef CRYPTOPP_X64_MASM_AVAILABLE
-extern "C" {
-void Rijndael_Enc_AdvancedProcessBlocks(void *locals, const word32 *k);
-}
-#endif
-
-#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
-
-// Determine whether the range between begin and end overlaps
-//   with the same 4k block offsets as the Te table. Logically,
-//   the code is trying to create the condition:
-//
-// Two sepearate memory pages:
-//
-//  +-----+   +-----+
-//  |XXXXX|   |YYYYY|
-//  |XXXXX|   |YYYYY|
-//  |     |   |     |
-//  |     |   |     |
-//  +-----+   +-----+
-//  Te Table   Locals
-//
-// Have a logical cache view of (X and Y may be inverted):
-//
-// +-----+
-// |XXXXX|
-// |XXXXX|
-// |YYYYY|
-// |YYYYY|
-// +-----+
-//
-static inline bool AliasedWithTable(const byte *begin, const byte *end)
-{
-	ptrdiff_t s0 = uintptr_t(begin)%4096, s1 = uintptr_t(end)%4096;
-	ptrdiff_t t0 = uintptr_t(Te)%4096, t1 = (uintptr_t(Te)+sizeof(Te))%4096;
-	if (t1 > t0)
-		return (s0 >= t0 && s0 < t1) || (s1 > t0 && s1 <= t1);
-	else
-		return (s0 < t1 || s1 <= t1) || (s0 >= t0 || s1 > t0);
-}
-
-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-
-inline void AESNI_Enc_Block(__m128i &block, MAYBE_CONST __m128i *subkeys, unsigned int rounds)
-{
-	block = _mm_xor_si128(block, subkeys[0]);
-	for (unsigned int i=1; i<rounds-1; i+=2)
-	{
-		block = _mm_aesenc_si128(block, subkeys[i]);
-		block = _mm_aesenc_si128(block, subkeys[i+1]);
-	}
-	block = _mm_aesenc_si128(block, subkeys[rounds-1]);
-	block = _mm_aesenclast_si128(block, subkeys[rounds]);
-}
-
-inline void AESNI_Enc_4_Blocks(__m128i &block0, __m128i &block1, __m128i &block2, __m128i &block3, MAYBE_CONST __m128i *subkeys, unsigned int rounds)
-{
-	__m128i rk = subkeys[0];
-	block0 = _mm_xor_si128(block0, rk);
-	block1 = _mm_xor_si128(block1, rk);
-	block2 = _mm_xor_si128(block2, rk);
-	block3 = _mm_xor_si128(block3, rk);
-	for (unsigned int i=1; i<rounds; i++)
-	{
-		rk = subkeys[i];
-		block0 = _mm_aesenc_si128(block0, rk);
-		block1 = _mm_aesenc_si128(block1, rk);
-		block2 = _mm_aesenc_si128(block2, rk);
-		block3 = _mm_aesenc_si128(block3, rk);
-	}
-	rk = subkeys[rounds];
-	block0 = _mm_aesenclast_si128(block0, rk);
-	block1 = _mm_aesenclast_si128(block1, rk);
-	block2 = _mm_aesenclast_si128(block2, rk);
-	block3 = _mm_aesenclast_si128(block3, rk);
-}
-
-inline void AESNI_Dec_Block(__m128i &block, MAYBE_CONST __m128i *subkeys, unsigned int rounds)
-{
-	block = _mm_xor_si128(block, subkeys[0]);
-	for (unsigned int i=1; i<rounds-1; i+=2)
-	{
-		block = _mm_aesdec_si128(block, subkeys[i]);
-		block = _mm_aesdec_si128(block, subkeys[i+1]);
-	}
-	block = _mm_aesdec_si128(block, subkeys[rounds-1]);
-	block = _mm_aesdeclast_si128(block, subkeys[rounds]);
-}
-
-inline void AESNI_Dec_4_Blocks(__m128i &block0, __m128i &block1, __m128i &block2, __m128i &block3, MAYBE_CONST __m128i *subkeys, unsigned int rounds)
-{
-	__m128i rk = subkeys[0];
-	block0 = _mm_xor_si128(block0, rk);
-	block1 = _mm_xor_si128(block1, rk);
-	block2 = _mm_xor_si128(block2, rk);
-	block3 = _mm_xor_si128(block3, rk);
-	for (unsigned int i=1; i<rounds; i++)
-	{
-		rk = subkeys[i];
-		block0 = _mm_aesdec_si128(block0, rk);
-		block1 = _mm_aesdec_si128(block1, rk);
-		block2 = _mm_aesdec_si128(block2, rk);
-		block3 = _mm_aesdec_si128(block3, rk);
-	}
-	rk = subkeys[rounds];
-	block0 = _mm_aesdeclast_si128(block0, rk);
-	block1 = _mm_aesdeclast_si128(block1, rk);
-	block2 = _mm_aesdeclast_si128(block2, rk);
-	block3 = _mm_aesdeclast_si128(block3, rk);
-}
-
-CRYPTOPP_ALIGN_DATA(16)
-static const word32 s_one[] = {0, 0, 0, 1<<24};
-
-template <typename F1, typename F4>
-inline size_t AESNI_AdvancedProcessBlocks(F1 func1, F4 func4, MAYBE_CONST __m128i *subkeys, unsigned int rounds, const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags)
-{
-	size_t blockSize = 16;
-	size_t inIncrement = (flags & (BlockTransformation::BT_InBlockIsCounter|BlockTransformation::BT_DontIncrementInOutPointers)) ? 0 : blockSize;
-	size_t xorIncrement = xorBlocks ? blockSize : 0;
-	size_t outIncrement = (flags & BlockTransformation::BT_DontIncrementInOutPointers) ? 0 : blockSize;
-
-	if (flags & BlockTransformation::BT_ReverseDirection)
-	{
-		CRYPTOPP_ASSERT(length % blockSize == 0);
-		inBlocks += length - blockSize;
-		xorBlocks += length - blockSize;
-		outBlocks += length - blockSize;
-		inIncrement = 0-inIncrement;
-		xorIncrement = 0-xorIncrement;
-		outIncrement = 0-outIncrement;
-	}
-
-	if (flags & BlockTransformation::BT_AllowParallel)
-	{
-		while (length >= 4*blockSize)
-		{
-			__m128i block0 = _mm_loadu_si128((const __m128i *)(const void *)inBlocks), block1, block2, block3;
-			if (flags & BlockTransformation::BT_InBlockIsCounter)
-			{
-				const __m128i be1 = *(const __m128i *)(const void *)s_one;
-				block1 = _mm_add_epi32(block0, be1);
-				block2 = _mm_add_epi32(block1, be1);
-				block3 = _mm_add_epi32(block2, be1);
-				_mm_storeu_si128((__m128i *)(void *)inBlocks, _mm_add_epi32(block3, be1));
-			}
-			else
-			{
-				inBlocks += inIncrement;
-				block1 = _mm_loadu_si128((const __m128i *)(const void *)inBlocks);
-				inBlocks += inIncrement;
-				block2 = _mm_loadu_si128((const __m128i *)(const void *)inBlocks);
-				inBlocks += inIncrement;
-				block3 = _mm_loadu_si128((const __m128i *)(const void *)inBlocks);
-				inBlocks += inIncrement;
-			}
-
-			if (flags & BlockTransformation::BT_XorInput)
-			{
-				// Coverity finding, appears to be false positive. Assert the condition.
-				CRYPTOPP_ASSERT(xorBlocks);
-				block0 = _mm_xor_si128(block0, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-				xorBlocks += xorIncrement;
-				block1 = _mm_xor_si128(block1, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-				xorBlocks += xorIncrement;
-				block2 = _mm_xor_si128(block2, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-				xorBlocks += xorIncrement;
-				block3 = _mm_xor_si128(block3, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-				xorBlocks += xorIncrement;
-			}
-
-			func4(block0, block1, block2, block3, subkeys, rounds);
-
-			if (xorBlocks && !(flags & BlockTransformation::BT_XorInput))
-			{
-				block0 = _mm_xor_si128(block0, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-				xorBlocks += xorIncrement;
-				block1 = _mm_xor_si128(block1, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-				xorBlocks += xorIncrement;
-				block2 = _mm_xor_si128(block2, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-				xorBlocks += xorIncrement;
-				block3 = _mm_xor_si128(block3, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-				xorBlocks += xorIncrement;
-			}
-
-			_mm_storeu_si128((__m128i *)(void *)outBlocks, block0);
-			outBlocks += outIncrement;
-			_mm_storeu_si128((__m128i *)(void *)outBlocks, block1);
-			outBlocks += outIncrement;
-			_mm_storeu_si128((__m128i *)(void *)outBlocks, block2);
-			outBlocks += outIncrement;
-			_mm_storeu_si128((__m128i *)(void *)outBlocks, block3);
-			outBlocks += outIncrement;
-
-			length -= 4*blockSize;
-		}
-	}
-
-	while (length >= blockSize)
-	{
-		__m128i block = _mm_loadu_si128((const __m128i *)(const void *)inBlocks);
-
-		if (flags & BlockTransformation::BT_XorInput)
-			block = _mm_xor_si128(block, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-
-		if (flags & BlockTransformation::BT_InBlockIsCounter)
-			const_cast<byte *>(inBlocks)[15]++;
-
-		func1(block, subkeys, rounds);
-
-		if (xorBlocks && !(flags & BlockTransformation::BT_XorInput))
-			block = _mm_xor_si128(block, _mm_loadu_si128((const __m128i *)(const void *)xorBlocks));
-
-		_mm_storeu_si128((__m128i *)(void *)outBlocks, block);
-
-		inBlocks += inIncrement;
-		outBlocks += outIncrement;
-		xorBlocks += xorIncrement;
-		length -= blockSize;
-	}
-
-	return length;
-}
-#endif
-
-#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
-struct Locals
-{
-	word32 subkeys[4*12], workspace[8];
-	const byte *inBlocks, *inXorBlocks, *outXorBlocks;
-	byte *outBlocks;
-	size_t inIncrement, inXorIncrement, outXorIncrement, outIncrement;
-	size_t regSpill, lengthAndCounterFlag, keysBegin;
-};
-
-const size_t s_aliasPageSize = 4096;
-const size_t s_aliasBlockSize = 256;
-const size_t s_sizeToAllocate = s_aliasPageSize + s_aliasBlockSize + sizeof(Locals);
-
-Rijndael::Enc::Enc() : m_aliasBlock(s_sizeToAllocate) { }
-#endif
-
-size_t Rijndael::Enc::AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const
-{
-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-	if (HasAESNI())
-		return AESNI_AdvancedProcessBlocks(AESNI_Enc_Block, AESNI_Enc_4_Blocks, (MAYBE_CONST __m128i *)(const void *)m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags);
-#endif
-
-#if (CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_RIJNDAEL_ASM)
-	if (HasSSE2())
-	{
-		if (length < BLOCKSIZE)
-			return length;
-
-		static const byte *zeros = (const byte*)(Te+256);
-		byte *space = NULL, *originalSpace = const_cast<byte*>(m_aliasBlock.data());
-
-		// round up to nearest 256 byte boundary
-		space = originalSpace +	(s_aliasBlockSize - (uintptr_t)originalSpace % s_aliasBlockSize) % s_aliasBlockSize;
-		while (AliasedWithTable(space, space + sizeof(Locals)))
-		{
-			space += 256;
-			CRYPTOPP_ASSERT(space < (originalSpace + s_aliasPageSize));
-		}
-
-		size_t increment = BLOCKSIZE;
-		if (flags & BT_ReverseDirection)
-		{
-			CRYPTOPP_ASSERT(length % BLOCKSIZE == 0);
-			inBlocks += length - BLOCKSIZE;
-			xorBlocks += length - BLOCKSIZE;
-			outBlocks += length - BLOCKSIZE;
-			increment = 0-increment;
-		}
-
-		Locals &locals = *(Locals *)(void *)space;
-
-		locals.inBlocks = inBlocks;
-		locals.inXorBlocks = (flags & BT_XorInput) && xorBlocks ? xorBlocks : zeros;
-		locals.outXorBlocks = (flags & BT_XorInput) || !xorBlocks ? zeros : xorBlocks;
-		locals.outBlocks = outBlocks;
-
-		locals.inIncrement = (flags & BT_DontIncrementInOutPointers) ? 0 : increment;
-		locals.inXorIncrement = (flags & BT_XorInput) && xorBlocks ? increment : 0;
-		locals.outXorIncrement = (flags & BT_XorInput) || !xorBlocks ? 0 : increment;
-		locals.outIncrement = (flags & BT_DontIncrementInOutPointers) ? 0 : increment;
-
-		locals.lengthAndCounterFlag = length - (length%16) - bool(flags & BT_InBlockIsCounter);
-		int keysToCopy = m_rounds - (flags & BT_InBlockIsCounter ? 3 : 2);
-		locals.keysBegin = (12-keysToCopy)*16;
-
-		Rijndael_Enc_AdvancedProcessBlocks(&locals, m_key);
-
-		return length % BLOCKSIZE;
-	}
-#endif
-
-	return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags);
-}
-
-#endif
-
-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-
-size_t Rijndael::Dec::AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const
-{
-	if (HasAESNI())
-		return AESNI_AdvancedProcessBlocks(AESNI_Dec_Block, AESNI_Dec_4_Blocks, (MAYBE_CONST __m128i *)(const void *)m_key.begin(), m_rounds, inBlocks, xorBlocks, outBlocks, length, flags);
-
-	return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags);
-}
-
-#endif	// #if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-
-NAMESPACE_END
-
-#endif
-#endif
diff --git a/src-cryptopp/rijndael.h b/src-cryptopp/rijndael.h
deleted file mode 100644
index 5b334ff..0000000
--- a/src-cryptopp/rijndael.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// rijndael.h - written and placed in the public domain by Wei Dai
-
-//! \file rijndael.h
-//! \brief Classes for Rijndael encryption algorithm
-//! \details All key sizes are supported. The library only provides Rijndael with 128-bit blocks,
-//!   and not 192-bit or 256-bit blocks
-
-#ifndef CRYPTOPP_RIJNDAEL_H
-#define CRYPTOPP_RIJNDAEL_H
-
-#include "seckey.h"
-#include "secblock.h"
-
-// Clang 3.3 integrated assembler crash on Linux
-#if CRYPTOPP_BOOL_X32 || (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400))
-# define CRYPTOPP_DISABLE_RIJNDAEL_ASM
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief Rijndael block cipher information
-struct Rijndael_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 32, 8>
-{
-	CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return CRYPTOPP_RIJNDAEL_NAME;}
-};
-
-//! \brief Rijndael block cipher implementation details
-//! \sa <a href="http://www.weidai.com/scan-mirror/cs.html#Rijndael">Rijndael</a>
-class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentation
-{
-	//! \brief Rijndael block cipher data processing functionss
-	//! \details Provides implementation common to encryption and decryption
-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Rijndael_Info>
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-
-	protected:
-		static void FillEncTable();
-		static void FillDecTable();
-
-		// VS2005 workaround: have to put these on seperate lines, or error C2487 is triggered in DLL build
-		static const byte Se[256];
-		static const byte Sd[256];
-
-		static const word32 rcon[];
-
-		unsigned int m_rounds;
-		FixedSizeAlignedSecBlock<word32, 4*15> m_key;
-	};
-
-	//! \brief Rijndael block cipher data processing functions
-	//! \details Provides implementation for encryption transformation
-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Enc : public Base
-	{
-	public:
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
-		Enc();
-		size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
-	private:
-		SecByteBlock m_aliasBlock;
-#endif
-	};
-
-	//! \brief Rijndael block cipher data processing functions
-	//! \details Provides implementation for decryption transformation
-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Dec : public Base
-	{
-	public:
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-		size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
-#endif
-	};
-
-public:
-	typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;
-	typedef BlockCipherFinal<DECRYPTION, Dec> Decryption;
-};
-
-typedef Rijndael::Encryption RijndaelEncryption;
-typedef Rijndael::Decryption RijndaelDecryption;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/rng.cpp b/src-cryptopp/rng.cpp
deleted file mode 100644
index 22141cb..0000000
--- a/src-cryptopp/rng.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// rng.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#include "rng.h"
-#include "fips140.h"
-
-#include <time.h>
-#include <math.h>
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// linear congruential generator
-// originally by William S. England
-
-// do not use for cryptographic purposes
-
-/*
-** Original_numbers are the original published m and q in the
-** ACM article above.  John Burton has furnished numbers for
-** a reportedly better generator.  The new numbers are now
-** used in this program by default.
-*/
-
-#ifndef LCRNG_ORIGINAL_NUMBERS
-const word32 LC_RNG::m=2147483647L;
-const word32 LC_RNG::q=44488L;
-
-const word16 LC_RNG::a=(unsigned int)48271L;
-const word16 LC_RNG::r=3399;
-#else
-const word32 LC_RNG::m=2147483647L;
-const word32 LC_RNG::q=127773L;
-
-const word16 LC_RNG::a=16807;
-const word16 LC_RNG::r=2836;
-#endif
-
-void LC_RNG::GenerateBlock(byte *output, size_t size)
-{
-	while (size--)
-	{
-		word32 hi = seed/q;
-		word32 lo = seed%q;
-
-		long test = a*lo - r*hi;
-
-		if (test > 0)
-			seed = test;
-		else
-			seed = test+ m;
-
-		*output++ = byte((GETBYTE(seed, 0) ^ GETBYTE(seed, 1) ^ GETBYTE(seed, 2) ^ GETBYTE(seed, 3)));
-	}
-}
-
-// ********************************************************
-
-#ifndef CRYPTOPP_IMPORTS
-
-X917RNG::X917RNG(BlockTransformation *c, const byte *seed, const byte *deterministicTimeVector)
-	: m_cipher(c),
-	  m_size(m_cipher->BlockSize()),
-	  m_datetime(m_size),
-	  m_randseed(seed, m_size),
-	  m_lastBlock(m_size),
-	  m_deterministicTimeVector(deterministicTimeVector, deterministicTimeVector ? m_size : 0)
-{
-	// Valgrind finding, http://github.com/weidai11/cryptopp/issues/105
-	// Garbage in the tail creates a non-conforming X9.17 or X9.31 generator.
-	if (m_size > 8)
-	{
-		memset(m_datetime, 0x00, m_size);
-		memset(m_lastBlock, 0x00, m_size);
-	}
-
-	if (!deterministicTimeVector)
-	{
-		time_t tstamp1 = time(0);
-		xorbuf(m_datetime, (byte *)&tstamp1, UnsignedMin(sizeof(tstamp1), m_size));
-		m_cipher->ProcessBlock(m_datetime);
-		clock_t tstamp2 = clock();
-		xorbuf(m_datetime, (byte *)&tstamp2, UnsignedMin(sizeof(tstamp2), m_size));
-		m_cipher->ProcessBlock(m_datetime);
-	}
-
-	// for FIPS 140-2
-	GenerateBlock(m_lastBlock, m_size);
-}
-
-void X917RNG::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size)
-{
-	while (size > 0)
-	{
-		// calculate new enciphered timestamp
-		if (m_deterministicTimeVector.size())
-		{
-			m_cipher->ProcessBlock(m_deterministicTimeVector, m_datetime);
-			IncrementCounterByOne(m_deterministicTimeVector, m_size);
-		}
-		else
-		{
-			clock_t c = clock();
-			xorbuf(m_datetime, (byte *)&c, UnsignedMin(sizeof(c), m_size));
-			time_t t = time(NULL);
-			xorbuf(m_datetime+m_size-UnsignedMin(sizeof(t), m_size), (byte *)&t, UnsignedMin(sizeof(t), m_size));
-			m_cipher->ProcessBlock(m_datetime);
-		}
-
-		// combine enciphered timestamp with seed
-		xorbuf(m_randseed, m_datetime, m_size);
-
-		// generate a new block of random bytes
-		m_cipher->ProcessBlock(m_randseed);
-		if (memcmp(m_lastBlock, m_randseed, m_size) == 0)
-			throw SelfTestFailure("X917RNG: Continuous random number generator test failed.");
-
-		// output random bytes
-		size_t len = UnsignedMin(m_size, size);
-		target.ChannelPut(channel, m_randseed, len);
-		size -= len;
-
-		// compute new seed vector
-		memcpy(m_lastBlock, m_randseed, m_size);
-		xorbuf(m_randseed, m_datetime, m_size);
-		m_cipher->ProcessBlock(m_randseed);
-	}
-}
-
-#endif
-
-MaurerRandomnessTest::MaurerRandomnessTest()
-	: sum(0.0), n(0)
-{
-	for (unsigned i=0; i<V; i++)
-		tab[i] = 0;
-}
-
-size_t MaurerRandomnessTest::Put2(const byte *inString, size_t length, int /*messageEnd*/, bool /*blocking*/)
-{
-	while (length--)
-	{
-		byte inByte = *inString++;
-		if (n >= Q)
-			sum += log(double(n - tab[inByte]));
-		tab[inByte] = n;
-		n++;
-	}
-	return 0;
-}
-
-double MaurerRandomnessTest::GetTestValue() const
-{
-	if (BytesNeeded() > 0)
-		throw Exception(Exception::OTHER_ERROR, "MaurerRandomnessTest: " + IntToString(BytesNeeded()) + " more bytes of input needed");
-
-	double fTu = (sum/(n-Q))/log(2.0);	// this is the test value defined by Maurer
-
-	double value = fTu * 0.1392;		// arbitrarily normalize it to
-	return value > 1.0 ? 1.0 : value;	// a number between 0 and 1
-}
-
-NAMESPACE_END
diff --git a/src-cryptopp/rng.h b/src-cryptopp/rng.h
deleted file mode 100644
index 4a07085..0000000
--- a/src-cryptopp/rng.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// rng.h - written and placed in the public domain by Wei Dai
-
-//! \file rng.h
-//! \brief Miscellaneous classes for RNGs
-//! \details This file contains miscellaneous classes for RNGs, including LC_RNG(),
-//!   X917RNG() and MaurerRandomnessTest()
-//! \sa osrng.h, randpool.h
-
-#ifndef CRYPTOPP_RNG_H
-#define CRYPTOPP_RNG_H
-
-#include "cryptlib.h"
-#include "filters.h"
-#include "smartptr.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief Linear Congruential Generator (LCG)
-//! \details Originally propsed by William S. England.
-//! \warning LC_RNG is suitable for simulations, where uniformaly distrubuted numbers are
-//!   required quickly. It should not be used for cryptographic purposes.
-class LC_RNG : public RandomNumberGenerator
-{
-public:
-	//! \brief Construct a Linear Congruential Generator (LCG)
-	//! \param init_seed the initial value for the generator
-	LC_RNG(word32 init_seed)
-		: seed(init_seed) {}
-
-	void GenerateBlock(byte *output, size_t size);
-
-	word32 GetSeed() {return seed;}
-
-private:
-	word32 seed;
-
-	static const word32 m;
-	static const word32 q;
-	static const word16 a;
-	static const word16 r;
-};
-
-//! \class X917RNG
-//! \brief ANSI X9.17 RNG
-//! \details X917RNG is from ANSI X9.17 Appendix C, and it uses a 64-bit block cipher, like TripleDES.
-//!   If you use a 128-bit block cipher, like AES, then you are effectively using an ANSI X9.31 generator.
-//! \sa AutoSeededX917RNG, DefaultAutoSeededRNG
-class CRYPTOPP_DLL X917RNG : public RandomNumberGenerator, public NotCopyable
-{
-public:
-	//! \brief Construct a X917RNG
-	//! \param cipher the block cipher to use for the generator
-	//! \param seed a byte buffer to use as a seed
-	//! \param deterministicTimeVector additional entropy
-	//! \details <tt>cipher</tt> will be deleted by the destructor. <tt>seed</tt> must be at least
-	//!   BlockSize() in length. <tt>deterministicTimeVector = 0</tt> means obtain time vector
-	//!   from the system.
-	//! \details When constructing a X917RNG, the generator must be keyed or an access
-	//!   violation will occur because the time vector is encrypted using the block cipher.
-	//!   To key the generator during constructions, perform the following:
-	//! <pre>
-	//!   SecByteBlock key(AES::DEFAULT_KEYLENGTH), seed(AES::BLOCKSIZE);
-	//!   OS_GenerateRandomBlock(false, key, key.size());
-	//!   OS_GenerateRandomBlock(false, seed, seed.size());
-	//!   X917RNG prng(new AES::Encryption(key, AES::DEFAULT_KEYLENGTH), seed, NULL);</pre>
-	//! \sa AutoSeededX917RNG
-	X917RNG(BlockTransformation *cipher, const byte *seed, const byte *deterministicTimeVector = 0);
-
-	void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size);
-
-private:
-	member_ptr<BlockTransformation> m_cipher;
-	const unsigned int m_size;  // S, blocksize of cipher
-	SecByteBlock m_datetime;    // DT, buffer for enciphered timestamp
-	SecByteBlock m_randseed, m_lastBlock, m_deterministicTimeVector;
-};
-
-//! \class MaurerRandomnessTest
-//! \brief  Maurer's Universal Statistical Test for Random Bit Generators
-//! \details This class implements Maurer's Universal Statistical Test for
-//!   Random Bit Generators. It is intended for measuring the randomness of
-//!   *PHYSICAL* RNGs.
-//! \details For more details see Maurer's paper in Journal of Cryptology, 1992.
-class MaurerRandomnessTest : public Bufferless<Sink>
-{
-public:
-	//! \brief Contruct a MaurerRandomnessTest
-	MaurerRandomnessTest();
-
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking);
-
-	//! \brief Provides the number of bytes of input is needed by the test
-	//! \returns how many more bytes of input is needed by the test
-	// BytesNeeded() returns how many more bytes of input is needed by the test
-	// GetTestValue() should not be called before BytesNeeded()==0
-	unsigned int BytesNeeded() const {return n >= (Q+K) ? 0 : Q+K-n;}
-
-	// returns a number between 0.0 and 1.0, describing the quality of the
-	// random numbers entered
-	double GetTestValue() const;
-
-private:
-	enum {L=8, V=256, Q=2000, K=2000};
-	double sum;
-	unsigned int n;
-	unsigned int tab[V];
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/rsa.cpp b/src-cryptopp/rsa.cpp
deleted file mode 100644
index f151b40..0000000
--- a/src-cryptopp/rsa.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-// rsa.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "rsa.h"
-#include "asn.h"
-#include "sha.h"
-#include "oids.h"
-#include "modarith.h"
-#include "nbtheory.h"
-#include "algparam.h"
-#include "fips140.h"
-
-#if CRYPTOPP_DEBUG && !defined(CRYPTOPP_DOXYGEN_PROCESSING) && !defined(CRYPTOPP_IS_DLL)
-#include "pssr.h"
-NAMESPACE_BEGIN(CryptoPP)
-void RSA_TestInstantiations()
-{
-	RSASS<PKCS1v15, SHA>::Verifier x1(1, 1);
-	RSASS<PKCS1v15, SHA>::Signer x2(NullRNG(), 1);
-	RSASS<PKCS1v15, SHA>::Verifier x3(x2);
-	RSASS<PKCS1v15, SHA>::Verifier x4(x2.GetKey());
-	RSASS<PSS, SHA>::Verifier x5(x3);
-#ifndef __MWERKS__
-	RSASS<PSSR, SHA>::Signer x6 = x2;
-	x3 = x2;
-	x6 = x2;
-#endif
-	RSAES<PKCS1v15>::Encryptor x7(x2);
-#ifndef __GNUC__
-	RSAES<PKCS1v15>::Encryptor x8(x3);
-#endif
-	RSAES<OAEP<SHA> >::Encryptor x9(x2);
-
-	x4 = x2.GetKey();
-}
-NAMESPACE_END
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-
-NAMESPACE_BEGIN(CryptoPP)
-
-OID RSAFunction::GetAlgorithmID() const
-{
-	return ASN1::rsaEncryption();
-}
-
-void RSAFunction::BERDecodePublicKey(BufferedTransformation &bt, bool, size_t)
-{
-	BERSequenceDecoder seq(bt);
-		m_n.BERDecode(seq);
-		m_e.BERDecode(seq);
-	seq.MessageEnd();
-}
-
-void RSAFunction::DEREncodePublicKey(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder seq(bt);
-		m_n.DEREncode(seq);
-		m_e.DEREncode(seq);
-	seq.MessageEnd();
-}
-
-Integer RSAFunction::ApplyFunction(const Integer &x) const
-{
-	DoQuickSanityCheck();
-	return a_exp_b_mod_c(x, m_e, m_n);
-}
-
-bool RSAFunction::Validate(RandomNumberGenerator& rng, unsigned int level) const
-{
-	CRYPTOPP_UNUSED(rng), CRYPTOPP_UNUSED(level);
-
-	bool pass = true;
-	pass = pass && m_n > Integer::One() && m_n.IsOdd();
-	pass = pass && m_e > Integer::One() && m_e.IsOdd() && m_e < m_n;
-	return pass;
-}
-
-bool RSAFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-{
-	return GetValueHelper(this, name, valueType, pValue).Assignable()
-		CRYPTOPP_GET_FUNCTION_ENTRY(Modulus)
-		CRYPTOPP_GET_FUNCTION_ENTRY(PublicExponent)
-		;
-}
-
-void RSAFunction::AssignFrom(const NameValuePairs &source)
-{
-	AssignFromHelper(this, source)
-		CRYPTOPP_SET_FUNCTION_ENTRY(Modulus)
-		CRYPTOPP_SET_FUNCTION_ENTRY(PublicExponent)
-		;
-}
-
-// *****************************************************************************
-
-class RSAPrimeSelector : public PrimeSelector
-{
-public:
-	RSAPrimeSelector(const Integer &e) : m_e(e) {}
-	bool IsAcceptable(const Integer &candidate) const {return RelativelyPrime(m_e, candidate-Integer::One());}
-	Integer m_e;
-};
-
-void InvertibleRSAFunction::GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg)
-{
-	int modulusSize = 2048;
-	alg.GetIntValue(Name::ModulusSize(), modulusSize) || alg.GetIntValue(Name::KeySize(), modulusSize);
-
-	CRYPTOPP_ASSERT(modulusSize >= 16);
-	if (modulusSize < 16)
-		throw InvalidArgument("InvertibleRSAFunction: specified modulus size is too small");
-
-	m_e = alg.GetValueWithDefault(Name::PublicExponent(), Integer(17));
-
-	CRYPTOPP_ASSERT(m_e >= 3); CRYPTOPP_ASSERT(!m_e.IsEven());
-	if (m_e < 3 || m_e.IsEven())
-		throw InvalidArgument("InvertibleRSAFunction: invalid public exponent");
-
-	RSAPrimeSelector selector(m_e);
-	AlgorithmParameters primeParam = MakeParametersForTwoPrimesOfEqualSize(modulusSize)
-		(Name::PointerToPrimeSelector(), selector.GetSelectorPointer());
-	m_p.GenerateRandom(rng, primeParam);
-	m_q.GenerateRandom(rng, primeParam);
-
-	m_d = m_e.InverseMod(LCM(m_p-1, m_q-1));
-	CRYPTOPP_ASSERT(m_d.IsPositive());
-
-	m_dp = m_d % (m_p-1);
-	m_dq = m_d % (m_q-1);
-	m_n = m_p * m_q;
-	m_u = m_q.InverseMod(m_p);
-
-	if (FIPS_140_2_ComplianceEnabled())
-	{
-		RSASS<PKCS1v15, SHA>::Signer signer(*this);
-		RSASS<PKCS1v15, SHA>::Verifier verifier(signer);
-		SignaturePairwiseConsistencyTest_FIPS_140_Only(signer, verifier);
-
-		RSAES<OAEP<SHA> >::Decryptor decryptor(*this);
-		RSAES<OAEP<SHA> >::Encryptor encryptor(decryptor);
-		EncryptionPairwiseConsistencyTest_FIPS_140_Only(encryptor, decryptor);
-	}
-}
-
-void InvertibleRSAFunction::Initialize(RandomNumberGenerator &rng, unsigned int keybits, const Integer &e)
-{
-	GenerateRandom(rng, MakeParameters(Name::ModulusSize(), (int)keybits)(Name::PublicExponent(), e+e.IsEven()));
-}
-
-void InvertibleRSAFunction::Initialize(const Integer &n, const Integer &e, const Integer &d)
-{
-	if (n.IsEven() || e.IsEven() | d.IsEven())
-		throw InvalidArgument("InvertibleRSAFunction: input is not a valid RSA private key");
-
-	m_n = n;
-	m_e = e;
-	m_d = d;
-
-	Integer r = --(d*e);
-	unsigned int s = 0;
-	while (r.IsEven())
-	{
-		r >>= 1;
-		s++;
-	}
-
-	ModularArithmetic modn(n);
-	for (Integer i = 2; ; ++i)
-	{
-		Integer a = modn.Exponentiate(i, r);
-		if (a == 1)
-			continue;
-		Integer b;
-		unsigned int j = 0;
-		while (a != n-1)
-		{
-			b = modn.Square(a);
-			if (b == 1)
-			{
-				m_p = GCD(a-1, n);
-				m_q = n/m_p;
-				m_dp = m_d % (m_p-1);
-				m_dq = m_d % (m_q-1);
-				m_u = m_q.InverseMod(m_p);
-				return;
-			}
-			if (++j == s)
-				throw InvalidArgument("InvertibleRSAFunction: input is not a valid RSA private key");
-			a = b;
-		}
-	}
-}
-
-void InvertibleRSAFunction::BERDecodePrivateKey(BufferedTransformation &bt, bool, size_t)
-{
-	BERSequenceDecoder privateKey(bt);
-		word32 version;
-		BERDecodeUnsigned<word32>(privateKey, version, INTEGER, 0, 0);	// check version
-		m_n.BERDecode(privateKey);
-		m_e.BERDecode(privateKey);
-		m_d.BERDecode(privateKey);
-		m_p.BERDecode(privateKey);
-		m_q.BERDecode(privateKey);
-		m_dp.BERDecode(privateKey);
-		m_dq.BERDecode(privateKey);
-		m_u.BERDecode(privateKey);
-	privateKey.MessageEnd();
-}
-
-void InvertibleRSAFunction::DEREncodePrivateKey(BufferedTransformation &bt) const
-{
-	DERSequenceEncoder privateKey(bt);
-		DEREncodeUnsigned<word32>(privateKey, 0);	// version
-		m_n.DEREncode(privateKey);
-		m_e.DEREncode(privateKey);
-		m_d.DEREncode(privateKey);
-		m_p.DEREncode(privateKey);
-		m_q.DEREncode(privateKey);
-		m_dp.DEREncode(privateKey);
-		m_dq.DEREncode(privateKey);
-		m_u.DEREncode(privateKey);
-	privateKey.MessageEnd();
-}
-
-Integer InvertibleRSAFunction::CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const
-{
-	DoQuickSanityCheck();
-	ModularArithmetic modn(m_n);
-	Integer r, rInv;
-	do {	// do this in a loop for people using small numbers for testing
-		r.Randomize(rng, Integer::One(), m_n - Integer::One());
-		rInv = modn.MultiplicativeInverse(r);
-	} while (rInv.IsZero());
-	Integer re = modn.Exponentiate(r, m_e);
-	re = modn.Multiply(re, x);			// blind
-	// here we follow the notation of PKCS #1 and let u=q inverse mod p
-	// but in ModRoot, u=p inverse mod q, so we reverse the order of p and q
-	Integer y = ModularRoot(re, m_dq, m_dp, m_q, m_p, m_u);
-	y = modn.Multiply(y, rInv);				// unblind
-	if (modn.Exponentiate(y, m_e) != x)		// check
-		throw Exception(Exception::OTHER_ERROR, "InvertibleRSAFunction: computational error during private key operation");
-	return y;
-}
-
-bool InvertibleRSAFunction::Validate(RandomNumberGenerator &rng, unsigned int level) const
-{
-	bool pass = RSAFunction::Validate(rng, level);
-	pass = pass && m_p > Integer::One() && m_p.IsOdd() && m_p < m_n;
-	pass = pass && m_q > Integer::One() && m_q.IsOdd() && m_q < m_n;
-	pass = pass && m_d > Integer::One() && m_d.IsOdd() && m_d < m_n;
-	pass = pass && m_dp > Integer::One() && m_dp.IsOdd() && m_dp < m_p;
-	pass = pass && m_dq > Integer::One() && m_dq.IsOdd() && m_dq < m_q;
-	pass = pass && m_u.IsPositive() && m_u < m_p;
-	if (level >= 1)
-	{
-		pass = pass && m_p * m_q == m_n;
-		pass = pass && m_e*m_d % LCM(m_p-1, m_q-1) == 1;
-		pass = pass && m_dp == m_d%(m_p-1) && m_dq == m_d%(m_q-1);
-		pass = pass && m_u * m_q % m_p == 1;
-	}
-	if (level >= 2)
-		pass = pass && VerifyPrime(rng, m_p, level-2) && VerifyPrime(rng, m_q, level-2);
-	return pass;
-}
-
-bool InvertibleRSAFunction::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-{
-	return GetValueHelper<RSAFunction>(this, name, valueType, pValue).Assignable()
-		CRYPTOPP_GET_FUNCTION_ENTRY(Prime1)
-		CRYPTOPP_GET_FUNCTION_ENTRY(Prime2)
-		CRYPTOPP_GET_FUNCTION_ENTRY(PrivateExponent)
-		CRYPTOPP_GET_FUNCTION_ENTRY(ModPrime1PrivateExponent)
-		CRYPTOPP_GET_FUNCTION_ENTRY(ModPrime2PrivateExponent)
-		CRYPTOPP_GET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1)
-		;
-}
-
-void InvertibleRSAFunction::AssignFrom(const NameValuePairs &source)
-{
-	AssignFromHelper<RSAFunction>(this, source)
-		CRYPTOPP_SET_FUNCTION_ENTRY(Prime1)
-		CRYPTOPP_SET_FUNCTION_ENTRY(Prime2)
-		CRYPTOPP_SET_FUNCTION_ENTRY(PrivateExponent)
-		CRYPTOPP_SET_FUNCTION_ENTRY(ModPrime1PrivateExponent)
-		CRYPTOPP_SET_FUNCTION_ENTRY(ModPrime2PrivateExponent)
-		CRYPTOPP_SET_FUNCTION_ENTRY(MultiplicativeInverseOfPrime2ModPrime1)
-		;
-}
-
-// *****************************************************************************
-
-Integer RSAFunction_ISO::ApplyFunction(const Integer &x) const
-{
-	Integer t = RSAFunction::ApplyFunction(x);
-	return t % 16 == 12 ? t : m_n - t;
-}
-
-Integer InvertibleRSAFunction_ISO::CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const
-{
-	Integer t = InvertibleRSAFunction::CalculateInverse(rng, x);
-	return STDMIN(t, m_n-t);
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/rsa.h b/src-cryptopp/rsa.h
deleted file mode 100644
index df40104..0000000
--- a/src-cryptopp/rsa.h
+++ /dev/null
@@ -1,250 +0,0 @@
-// rsa.h - written and placed in the public domain by Wei Dai
-
-//! \file rsa.h
-//! \brief Classes for the RSA cryptosystem
-//! \details This file contains classes that implement the RSA
-//!   ciphers and signature schemes as defined in PKCS #1 v2.0.
-
-#ifndef CRYPTOPP_RSA_H
-#define CRYPTOPP_RSA_H
-
-#include "cryptlib.h"
-#include "pubkey.h"
-#include "integer.h"
-#include "pkcspad.h"
-#include "oaep.h"
-#include "emsa2.h"
-#include "asn.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class RSAFunction
-//! \brief RSA trapdoor function using the public key
-class CRYPTOPP_DLL RSAFunction : public TrapdoorFunction, public X509PublicKey
-{
-	typedef RSAFunction ThisClass;
-
-public:
-	//! \brief Initialize a RSA public key with {n,e}
-	//! \param n the modulus
-	//! \param e the public exponent
-	void Initialize(const Integer &n, const Integer &e)
-		{m_n = n; m_e = e;}
-
-	// X509PublicKey
-	OID GetAlgorithmID() const;
-	void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
-	void DEREncodePublicKey(BufferedTransformation &bt) const;
-
-	// CryptoMaterial
-	bool Validate(RandomNumberGenerator &rng, unsigned int level) const;
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-	void AssignFrom(const NameValuePairs &source);
-
-	// TrapdoorFunction
-	Integer ApplyFunction(const Integer &x) const;
-	Integer PreimageBound() const {return m_n;}
-	Integer ImageBound() const {return m_n;}
-
-	// non-derived
-	const Integer & GetModulus() const {return m_n;}
-	const Integer & GetPublicExponent() const {return m_e;}
-
-	void SetModulus(const Integer &n) {m_n = n;}
-	void SetPublicExponent(const Integer &e) {m_e = e;}
-
-protected:
-	Integer m_n, m_e;
-};
-
-//! \class InvertibleRSAFunction
-//! \brief RSA trapdoor function using the private key
-class CRYPTOPP_DLL InvertibleRSAFunction : public RSAFunction, public TrapdoorFunctionInverse, public PKCS8PrivateKey
-{
-	typedef InvertibleRSAFunction ThisClass;
-
-public:
-	//! \brief Create a RSA private key
-	//! \param rng a RandomNumberGenerator derived class
-	//! \param modulusBits the size of the modulud, in bits
-	//! \param e the desired public exponent
-	void Initialize(RandomNumberGenerator &rng, unsigned int modulusBits, const Integer &e = 17);
-
-	//! \brief Initialize a RSA private key with {n,e,d,p,q,dp,dq,u}
-	//! \param n modulus
-	//! \param e public exponent
-	//! \param d private exponent
-	//! \param p first prime factor
-	//! \param q second prime factor
-	//! \param dp d mod p
-	//! \param dq d mod q
-	//! \param u q<sup>-1</sup> mod p
-	void Initialize(const Integer &n, const Integer &e, const Integer &d, const Integer &p, const Integer &q, const Integer &dp, const Integer &dq, const Integer &u)
-		{m_n = n; m_e = e; m_d = d; m_p = p; m_q = q; m_dp = dp; m_dq = dq; m_u = u;}
-	//! \brief Initialize a RSA private key with {n,e,d}
-	//! \param n modulus
-	//! \param e public exponent
-	//! \param d private exponent
-	//! \details Initialize() will factor n using d and populate {p,q,dp,dq,u}.
-	void Initialize(const Integer &n, const Integer &e, const Integer &d);
-
-	// PKCS8PrivateKey
-	void BERDecode(BufferedTransformation &bt)
-		{PKCS8PrivateKey::BERDecode(bt);}
-	void DEREncode(BufferedTransformation &bt) const
-		{PKCS8PrivateKey::DEREncode(bt);}
-	void Load(BufferedTransformation &bt)
-		{PKCS8PrivateKey::BERDecode(bt);}
-	void Save(BufferedTransformation &bt) const
-		{PKCS8PrivateKey::DEREncode(bt);}
-	OID GetAlgorithmID() const {return RSAFunction::GetAlgorithmID();}
-	void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
-	void DEREncodePrivateKey(BufferedTransformation &bt) const;
-
-	// TrapdoorFunctionInverse
-	Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const;
-
-	// GeneratableCryptoMaterial
-	bool Validate(RandomNumberGenerator &rng, unsigned int level) const;
-	/*! parameters: (ModulusSize, PublicExponent (default 17)) */
-	void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg);
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-	void AssignFrom(const NameValuePairs &source);
-
-	// non-derived interface
-	const Integer& GetPrime1() const {return m_p;}
-	const Integer& GetPrime2() const {return m_q;}
-	const Integer& GetPrivateExponent() const {return m_d;}
-	const Integer& GetModPrime1PrivateExponent() const {return m_dp;}
-	const Integer& GetModPrime2PrivateExponent() const {return m_dq;}
-	const Integer& GetMultiplicativeInverseOfPrime2ModPrime1() const {return m_u;}
-
-	void SetPrime1(const Integer &p) {m_p = p;}
-	void SetPrime2(const Integer &q) {m_q = q;}
-	void SetPrivateExponent(const Integer &d) {m_d = d;}
-	void SetModPrime1PrivateExponent(const Integer &dp) {m_dp = dp;}
-	void SetModPrime2PrivateExponent(const Integer &dq) {m_dq = dq;}
-	void SetMultiplicativeInverseOfPrime2ModPrime1(const Integer &u) {m_u = u;}
-
-protected:
-	Integer m_d, m_p, m_q, m_dp, m_dq, m_u;
-};
-
-//! \class RSAFunction_ISO
-//! \brief RSA trapdoor function using the public key
-class CRYPTOPP_DLL RSAFunction_ISO : public RSAFunction
-{
-public:
-	Integer ApplyFunction(const Integer &x) const;
-	Integer PreimageBound() const {return ++(m_n>>1);}
-};
-
-//! \class InvertibleRSAFunction_ISO
-//! \brief RSA trapdoor function using the private key
-class CRYPTOPP_DLL InvertibleRSAFunction_ISO : public InvertibleRSAFunction
-{
-public:
-	Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const;
-	Integer PreimageBound() const {return ++(m_n>>1);}
-};
-
-//! \class RSA
-//! \brief RSA algorithm
-struct CRYPTOPP_DLL RSA
-{
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "RSA";}
-	typedef RSAFunction PublicKey;
-	typedef InvertibleRSAFunction PrivateKey;
-};
-
-//! \class RSAES
-//! \brief RSA encryption algorithm
-//! \tparam STANDARD signature standard
-//! \sa <a href="http://www.weidai.com/scan-mirror/ca.html#RSA">RSA cryptosystem</a>
-template <class STANDARD>
-struct RSAES : public TF_ES<STANDARD, RSA>
-{
-};
-
-//! \class RSASS
-//! \brief RSA signature algorithm
-//! \tparam STANDARD signature standard
-//! \tparam H hash transformation
-//! \details See documentation of PKCS1v15 for a list of hash functions that can be used with it.
-//! \sa <a href="http://www.weidai.com/scan-mirror/sig.html#RSA">RSA signature scheme with appendix</a>
-template <class STANDARD, class H>
-struct RSASS : public TF_SS<STANDARD, H, RSA>
-{
-};
-
-//! \class RSA_ISO
-//! \brief RSA algorithm
-struct CRYPTOPP_DLL RSA_ISO
-{
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "RSA-ISO";}
-	typedef RSAFunction_ISO PublicKey;
-	typedef InvertibleRSAFunction_ISO PrivateKey;
-};
-
-//! \class RSASS_ISO
-//! \brief RSA signature algorithm
-//! \tparam H hash transformation
-template <class H>
-struct RSASS_ISO : public TF_SS<P1363_EMSA2, H, RSA_ISO>
-{
-};
-
-//! \brief \ref RSAES<STANDARD> "RSAES<PKCS1v15>::Decryptor" typedef
-//! \details RSA encryption scheme defined in PKCS #1 v2.0
-DOCUMENTED_TYPEDEF(RSAES<PKCS1v15>::Decryptor, RSAES_PKCS1v15_Decryptor);
-//! \brief \ref RSAES<STANDARD> "RSAES<PKCS1v15>::Encryptor" typedef
-//! \details RSA encryption scheme defined in PKCS #1 v2.0
-DOCUMENTED_TYPEDEF(RSAES<PKCS1v15>::Encryptor, RSAES_PKCS1v15_Encryptor);
-
-//! \brief \ref RSAES<STANDARD> "RSAES<OAEP<SHA>>::Decryptor" typedef
-//! \details RSA encryption scheme defined in PKCS #1 v2.0
-DOCUMENTED_TYPEDEF(RSAES<OAEP<SHA> >::Decryptor, RSAES_OAEP_SHA_Decryptor);
-//! \brief \ref RSAES<STANDARD> "RSAES<OAEP<SHA>>::Encryptor" typedef
-//! \details RSA encryption scheme defined in PKCS #1 v2.0
-DOCUMENTED_TYPEDEF(RSAES<OAEP<SHA> >::Encryptor, RSAES_OAEP_SHA_Encryptor);
-
-#ifdef CRYPTOPP_DOXYGEN_PROCESSING
-//! \brief \ref RSASS<STANDARD,HASH> "RSASS<PKCS1v15,SHA>::Signer" typedef
-//! \details RSA signature schemes defined in PKCS #1 v2.0
-class RSASSA_PKCS1v15_SHA_Signer : public RSASS<PKCS1v15,SHA>::Signer {};
-//! \brief \ref RSASS<STANDARD,HASH> "RSASS<PKCS1v15,SHA>::Verifier" typedef
-//! \details RSA signature schemes defined in PKCS #1 v2.0
-class RSASSA_PKCS1v15_SHA_Verifier : public RSASS<PKCS1v15,SHA>::Verifier {};
-
-namespace Weak {
-
-//! \brief \ref RSASS<STANDARD,HASH> "RSASS<PKCS1v15, Weak::MD2>::Signer" typedef
-//! \details RSA signature schemes defined in PKCS #1 v2.0
-class RSASSA_PKCS1v15_MD2_Signer : public RSASS<PKCS1v15, Weak1::MD2>::Signer {};
-//! \brief \ref RSASS<STANDARD,HASH> "RSASS<PKCS1v15, Weak::MD2>::Verifier" typedef
-//! \details RSA signature schemes defined in PKCS #1 v2.0
-class RSASSA_PKCS1v15_MD2_Verifier : public RSASS<PKCS1v15, Weak1::MD2>::Verifier {};
-
-//! \brief \ref RSASS<STANDARD,HASH> "RSASS<PKCS1v15, Weak::MD5>::Signer" typedef
-//! \details RSA signature schemes defined in PKCS #1 v2.0
-class RSASSA_PKCS1v15_MD5_Signer : public RSASS<PKCS1v15, Weak1::MD5>::Signer {};
-//! \brief \ref RSASS<STANDARD,HASH> "RSASS<PKCS1v15, Weak::MD5>::Verifier" typedef
-//! \details RSA signature schemes defined in PKCS #1 v2.0
-class RSASSA_PKCS1v15_MD5_Verifier : public RSASS<PKCS1v15, Weak1::MD5>::Verifier {};
-}
-
-#else
-typedef RSASS<PKCS1v15,SHA>::Signer RSASSA_PKCS1v15_SHA_Signer;
-typedef RSASS<PKCS1v15,SHA>::Verifier RSASSA_PKCS1v15_SHA_Verifier;
-
-namespace Weak {
-	typedef RSASS<PKCS1v15, Weak1::MD2>::Signer RSASSA_PKCS1v15_MD2_Signer;
-	typedef RSASS<PKCS1v15, Weak1::MD2>::Verifier RSASSA_PKCS1v15_MD2_Verifier;
-	typedef RSASS<PKCS1v15, Weak1::MD5>::Signer RSASSA_PKCS1v15_MD5_Signer;
-	typedef RSASS<PKCS1v15, Weak1::MD5>::Verifier RSASSA_PKCS1v15_MD5_Verifier;
-}
-#endif // CRYPTOPP_DOXYGEN_PROCESSING
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/rw.h b/src-cryptopp/rw.h
deleted file mode 100644
index 140dbe9..0000000
--- a/src-cryptopp/rw.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// rw.h - written and placed in the public domain by Wei Dai
-
-//! \file rw.h
-//! \brief Classes for Rabin-Williams signature scheme
-//! \details The implementation provides Rabin-Williams signature schemes as defined in
-//!   IEEE P1363. It uses Bernstein's tweaked square roots in place of square roots to
-//!   speedup calculations.
-//! \sa <A HREF="http://cr.yp.to/sigs/rwsota-20080131.pdf">RSA signatures and Rabin–Williams
-//!   signatures: the state of the art (20080131)</A>, Section 6, <em>The tweaks e and f</em>.
-
-#ifndef CRYPTOPP_RW_H
-#define CRYPTOPP_RW_H
-
-#include "cryptlib.h"
-#include "pubkey.h"
-#include "integer.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class RWFunction
-//! \brief Rabin-Williams trapdoor function using the public key
-class CRYPTOPP_DLL RWFunction : public TrapdoorFunction, public PublicKey
-{
-	typedef RWFunction ThisClass;
-
-public:
-	void Initialize(const Integer &n)
-		{m_n = n;}
-
-	void BERDecode(BufferedTransformation &bt);
-	void DEREncode(BufferedTransformation &bt) const;
-
-	void Save(BufferedTransformation &bt) const
-		{DEREncode(bt);}
-	void Load(BufferedTransformation &bt)
-		{BERDecode(bt);}
-
-	Integer ApplyFunction(const Integer &x) const;
-	Integer PreimageBound() const {return ++(m_n>>1);}
-	Integer ImageBound() const {return m_n;}
-
-	bool Validate(RandomNumberGenerator &rng, unsigned int level) const;
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-	void AssignFrom(const NameValuePairs &source);
-
-	const Integer& GetModulus() const {return m_n;}
-	void SetModulus(const Integer &n) {m_n = n;}
-
-protected:
-	Integer m_n;
-};
-
-//! \class InvertibleRWFunction
-//! \brief Rabin-Williams trapdoor function using the private key
-//! \since Tweaked roots using <em>e</em> and <em>f</em> since Crypto++ 5.6.4
-class CRYPTOPP_DLL InvertibleRWFunction : public RWFunction, public TrapdoorFunctionInverse, public PrivateKey
-{
-	typedef InvertibleRWFunction ThisClass;
-
-public:
-	InvertibleRWFunction() : m_precompute(false) {}
-
-	void Initialize(const Integer &n, const Integer &p, const Integer &q, const Integer &u);
-	// generate a random private key
-	void Initialize(RandomNumberGenerator &rng, unsigned int modulusBits)
-		{GenerateRandomWithKeySize(rng, modulusBits);}
-
-	void BERDecode(BufferedTransformation &bt);
-	void DEREncode(BufferedTransformation &bt) const;
-
-	void Save(BufferedTransformation &bt) const
-		{DEREncode(bt);}
-	void Load(BufferedTransformation &bt)
-		{BERDecode(bt);}
-
-	Integer CalculateInverse(RandomNumberGenerator &rng, const Integer &x) const;
-
-	// GeneratibleCryptoMaterial
-	bool Validate(RandomNumberGenerator &rng, unsigned int level) const;
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const;
-	void AssignFrom(const NameValuePairs &source);
-	/*! parameters: (ModulusSize) */
-	void GenerateRandom(RandomNumberGenerator &rng, const NameValuePairs &alg);
-
-	const Integer& GetPrime1() const {return m_p;}
-	const Integer& GetPrime2() const {return m_q;}
-	const Integer& GetMultiplicativeInverseOfPrime2ModPrime1() const {return m_u;}
-
-	void SetPrime1(const Integer &p) {m_p = p;}
-	void SetPrime2(const Integer &q) {m_q = q;}
-	void SetMultiplicativeInverseOfPrime2ModPrime1(const Integer &u) {m_u = u;}
-
-	virtual bool SupportsPrecomputation() const {return true;}
-	virtual void Precompute(unsigned int unused = 0) {CRYPTOPP_UNUSED(unused); PrecomputeTweakedRoots();}
-	virtual void Precompute(unsigned int unused = 0) const {CRYPTOPP_UNUSED(unused); PrecomputeTweakedRoots();}
-
-	virtual void LoadPrecomputation(BufferedTransformation &storedPrecomputation);
-	virtual void SavePrecomputation(BufferedTransformation &storedPrecomputation) const;
-
-protected:
-	void PrecomputeTweakedRoots() const;
-
-protected:
-	Integer m_p, m_q, m_u;
-
-	mutable Integer m_pre_2_9p, m_pre_2_3q, m_pre_q_p;
-	mutable bool m_precompute;
-};
-
-//! \class RW
-//! \brief Rabin-Williams algorithm
-struct RW
-{
-	static std::string StaticAlgorithmName() {return "RW";}
-	typedef RWFunction PublicKey;
-	typedef InvertibleRWFunction PrivateKey;
-};
-
-//! \class RWSS
-//! \brief Rabin-Williams signature scheme
-template <class STANDARD, class H>
-struct RWSS : public TF_SS<STANDARD, H, RW>
-{
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/salsa.cpp b/src-cryptopp/salsa.cpp
deleted file mode 100644
index 0196627..0000000
--- a/src-cryptopp/salsa.cpp
+++ /dev/null
@@ -1,626 +0,0 @@
-// salsa.cpp - written and placed in the public domain by Wei Dai
-
-// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM salsa.cpp" to generate MASM code
-
-#include "pch.h"
-#include "config.h"
-
-#ifndef CRYPTOPP_GENERATE_X64_MASM
-
-#include "salsa.h"
-#include "argnames.h"
-#include "misc.h"
-#include "cpu.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4702 4740)
-#endif
-
-// TODO: work around GCC 4.8+ issue with SSE2 ASM until the exact details are known
-//   and fix is released. Duplicate with "valgrind ./cryptest.exe tv salsa"
-// Clang due to "Inline assembly operands don't work with .intel_syntax"
-//   https://llvm.org/bugs/show_bug.cgi?id=24232
-#if defined(CRYPTOPP_DISABLE_SALSA_ASM)
-# undef CRYPTOPP_X86_ASM_AVAILABLE
-# undef CRYPTOPP_X32_ASM_AVAILABLE
-# undef CRYPTOPP_X64_ASM_AVAILABLE
-# undef CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-# undef CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE
-# define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0
-# define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-#if CRYPTOPP_DEBUG && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
-void Salsa20_TestInstantiations()
-{
-	Salsa20::Encryption x1;
-	XSalsa20::Encryption x2;
-}
-#endif
-
-void Salsa20_Policy::CipherSetKey(const NameValuePairs &params, const byte *key, size_t length)
-{
-	m_rounds = params.GetIntValueWithDefault(Name::Rounds(), 20);
-
-	if (!(m_rounds == 8 || m_rounds == 12 || m_rounds == 20))
-		throw InvalidRounds(Salsa20::StaticAlgorithmName(), m_rounds);
-
-	// m_state is reordered for SSE2
-	GetBlock<word32, LittleEndian> get1(key);
-	get1(m_state[13])(m_state[10])(m_state[7])(m_state[4]);
-	GetBlock<word32, LittleEndian> get2(key + length - 16);
-	get2(m_state[15])(m_state[12])(m_state[9])(m_state[6]);
-
-	// "expand 16-byte k" or "expand 32-byte k"
-	m_state[0] = 0x61707865;
-	m_state[1] = (length == 16) ? 0x3120646e : 0x3320646e;
-	m_state[2] = (length == 16) ? 0x79622d36 : 0x79622d32;
-	m_state[3] = 0x6b206574;
-}
-
-void Salsa20_Policy::CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length)
-{
-	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(length);
-	CRYPTOPP_ASSERT(length==8);
-
-	GetBlock<word32, LittleEndian> get(IV);
-	get(m_state[14])(m_state[11]);
-	m_state[8] = m_state[5] = 0;
-}
-
-void Salsa20_Policy::SeekToIteration(lword iterationCount)
-{
-	m_state[8] = (word32)iterationCount;
-	m_state[5] = (word32)SafeRightShift<32>(iterationCount);
-}
-
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SALSA_ASM)
-unsigned int Salsa20_Policy::GetAlignment() const
-{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-	if (HasSSE2())
-		return 16;
-	else
-#endif
-		return GetAlignmentOf<word32>();
-}
-
-unsigned int Salsa20_Policy::GetOptimalBlockSize() const
-{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-	if (HasSSE2())
-		return 4*BYTES_PER_ITERATION;
-	else
-#endif
-		return BYTES_PER_ITERATION;
-}
-#endif
-
-#ifdef CRYPTOPP_X64_MASM_AVAILABLE
-extern "C" {
-void Salsa20_OperateKeystream(byte *output, const byte *input, size_t iterationCount, int rounds, void *state);
-}
-#endif
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4731)	// frame pointer register 'ebp' modified by inline assembly code
-#endif
-
-void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount)
-{
-#endif	// #ifdef CRYPTOPP_GENERATE_X64_MASM
-
-#ifdef CRYPTOPP_X64_MASM_AVAILABLE
-	Salsa20_OperateKeystream(output, input, iterationCount, m_rounds, m_state.data());
-	return;
-#endif
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-		ALIGN   8
-	Salsa20_OperateKeystream	PROC FRAME
-		mov		r10, [rsp + 5*8]			; state
-		alloc_stack(10*16 + 32*16 + 8)
-		save_xmm128 xmm6, 0200h
-		save_xmm128 xmm7, 0210h
-		save_xmm128 xmm8, 0220h
-		save_xmm128 xmm9, 0230h
-		save_xmm128 xmm10, 0240h
-		save_xmm128 xmm11, 0250h
-		save_xmm128 xmm12, 0260h
-		save_xmm128 xmm13, 0270h
-		save_xmm128 xmm14, 0280h
-		save_xmm128 xmm15, 0290h
-		.endprolog
-
-	#define REG_output			rcx
-	#define REG_input			rdx
-	#define REG_iterationCount	r8
-	#define REG_state			r10
-	#define REG_rounds			e9d
-	#define REG_roundsLeft		eax
-	#define REG_temp32			r11d
-	#define REG_temp			r11
-	#define SSE2_WORKSPACE		rsp
-#else
-	if (HasSSE2())
-	{
-	#if CRYPTOPP_BOOL_X64
-		#define REG_output			%1
-		#define REG_input			%0
-		#define REG_iterationCount	%2
-		#define REG_state			%4		/* constant */
-		#define REG_rounds			%3		/* constant */
-		#define REG_roundsLeft		eax
-		#define REG_temp32			edx
-		#define REG_temp			rdx
-		#define SSE2_WORKSPACE		%5		/* constant */
-
-		CRYPTOPP_ALIGN_DATA(16) byte workspace[16*32];
-	#else
-		#define REG_output			edi
-		#define REG_input			eax
-		#define REG_iterationCount	ecx
-		#define REG_state			esi
-		#define REG_rounds			edx
-		#define REG_roundsLeft		ebx
-		#define REG_temp32			ebp
-		#define REG_temp			ebp
-		#define SSE2_WORKSPACE		esp + WORD_SZ
-	#endif
-
-	#ifdef __GNUC__
-		__asm__ __volatile__
-		(
-			INTEL_NOPREFIX
-			AS_PUSH_IF86(	bx)
-	#else
-		void *s = m_state.data();
-		word32 r = m_rounds;
-
-		AS2(	mov		REG_iterationCount, iterationCount)
-		AS2(	mov		REG_input, input)
-		AS2(	mov		REG_output, output)
-		AS2(	mov		REG_state, s)
-		AS2(	mov		REG_rounds, r)
-	#endif
-#endif	// #ifndef CRYPTOPP_GENERATE_X64_MASM
-
-		AS_PUSH_IF86(	bp)
-		AS2(	cmp		REG_iterationCount, 4)
-		ASJ(	jl,		5, f)
-
-#if CRYPTOPP_BOOL_X86
-		AS2(	mov		ebx, esp)
-		AS2(	and		esp, -16)
-		AS2(	sub		esp, 32*16)
-		AS1(	push	ebx)
-#endif
-
-#define SSE2_EXPAND_S(i, j)		\
-	ASS(	pshufd	xmm4, xmm##i, j, j, j, j)	\
-	AS2(	movdqa	[SSE2_WORKSPACE + (i*4+j)*16 + 256], xmm4)
-
-		AS2(	movdqa	xmm0, [REG_state + 0*16])
-		AS2(	movdqa	xmm1, [REG_state + 1*16])
-		AS2(	movdqa	xmm2, [REG_state + 2*16])
-		AS2(	movdqa	xmm3, [REG_state + 3*16])
-		SSE2_EXPAND_S(0, 0)
-		SSE2_EXPAND_S(0, 1)
-		SSE2_EXPAND_S(0, 2)
-		SSE2_EXPAND_S(0, 3)
-		SSE2_EXPAND_S(1, 0)
-		SSE2_EXPAND_S(1, 2)
-		SSE2_EXPAND_S(1, 3)
-		SSE2_EXPAND_S(2, 1)
-		SSE2_EXPAND_S(2, 2)
-		SSE2_EXPAND_S(2, 3)
-		SSE2_EXPAND_S(3, 0)
-		SSE2_EXPAND_S(3, 1)
-		SSE2_EXPAND_S(3, 2)
-		SSE2_EXPAND_S(3, 3)
-
-#define SSE2_EXPAND_S85(i)		\
-		AS2(	mov		dword ptr [SSE2_WORKSPACE + 8*16 + i*4 + 256], REG_roundsLeft)	\
-		AS2(	mov		dword ptr [SSE2_WORKSPACE + 5*16 + i*4 + 256], REG_temp32)	\
-		AS2(	add		REG_roundsLeft, 1)	\
-		AS2(	adc		REG_temp32, 0)
-
-		ASL(1)
-		AS2(	mov		REG_roundsLeft, dword ptr [REG_state + 8*4])
-		AS2(	mov		REG_temp32, dword ptr [REG_state + 5*4])
-		SSE2_EXPAND_S85(0)
-		SSE2_EXPAND_S85(1)
-		SSE2_EXPAND_S85(2)
-		SSE2_EXPAND_S85(3)
-		AS2(	mov		dword ptr [REG_state + 8*4], REG_roundsLeft)
-		AS2(	mov		dword ptr [REG_state + 5*4], REG_temp32)
-
-#define SSE2_QUARTER_ROUND(a, b, d, i)		\
-	AS2(	movdqa	xmm4, xmm##d)			\
-	AS2(	paddd	xmm4, xmm##a)			\
-	AS2(	movdqa	xmm5, xmm4)				\
-	AS2(	pslld	xmm4, i)				\
-	AS2(	psrld	xmm5, 32-i)				\
-	AS2(	pxor	xmm##b, xmm4)			\
-	AS2(	pxor	xmm##b, xmm5)
-
-#define L01(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	xmm##A, [SSE2_WORKSPACE + d*16 + i*256])	/* y3 */
-#define L02(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	xmm##C, [SSE2_WORKSPACE + a*16 + i*256])	/* y0 */
-#define L03(A,B,C,D,a,b,c,d,i)		AS2(	paddd	xmm##A, xmm##C)		/* y0+y3 */
-#define L04(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	xmm##B, xmm##A)
-#define L05(A,B,C,D,a,b,c,d,i)		AS2(	pslld	xmm##A, 7)
-#define L06(A,B,C,D,a,b,c,d,i)		AS2(	psrld	xmm##B, 32-7)
-#define L07(A,B,C,D,a,b,c,d,i)		AS2(	pxor	xmm##A, [SSE2_WORKSPACE + b*16 + i*256])
-#define L08(A,B,C,D,a,b,c,d,i)		AS2(	pxor	xmm##A, xmm##B)		/* z1 */
-#define L09(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	[SSE2_WORKSPACE + b*16], xmm##A)
-#define L10(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	xmm##B, xmm##A)
-#define L11(A,B,C,D,a,b,c,d,i)		AS2(	paddd	xmm##A, xmm##C)		/* z1+y0 */
-#define L12(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	xmm##D, xmm##A)
-#define L13(A,B,C,D,a,b,c,d,i)		AS2(	pslld	xmm##A, 9)
-#define L14(A,B,C,D,a,b,c,d,i)		AS2(	psrld	xmm##D, 32-9)
-#define L15(A,B,C,D,a,b,c,d,i)		AS2(	pxor	xmm##A, [SSE2_WORKSPACE + c*16 + i*256])
-#define L16(A,B,C,D,a,b,c,d,i)		AS2(	pxor	xmm##A, xmm##D)		/* z2 */
-#define L17(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	[SSE2_WORKSPACE + c*16], xmm##A)
-#define L18(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	xmm##D, xmm##A)
-#define L19(A,B,C,D,a,b,c,d,i)		AS2(	paddd	xmm##A, xmm##B)		/* z2+z1 */
-#define L20(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	xmm##B, xmm##A)
-#define L21(A,B,C,D,a,b,c,d,i)		AS2(	pslld	xmm##A, 13)
-#define L22(A,B,C,D,a,b,c,d,i)		AS2(	psrld	xmm##B, 32-13)
-#define L23(A,B,C,D,a,b,c,d,i)		AS2(	pxor	xmm##A, [SSE2_WORKSPACE + d*16 + i*256])
-#define L24(A,B,C,D,a,b,c,d,i)		AS2(	pxor	xmm##A, xmm##B)		/* z3 */
-#define L25(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	[SSE2_WORKSPACE + d*16], xmm##A)
-#define L26(A,B,C,D,a,b,c,d,i)		AS2(	paddd	xmm##A, xmm##D)		/* z3+z2 */
-#define L27(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	xmm##D, xmm##A)
-#define L28(A,B,C,D,a,b,c,d,i)		AS2(	pslld	xmm##A, 18)
-#define L29(A,B,C,D,a,b,c,d,i)		AS2(	psrld	xmm##D, 32-18)
-#define L30(A,B,C,D,a,b,c,d,i)		AS2(	pxor	xmm##A, xmm##C)		/* xor y0 */
-#define L31(A,B,C,D,a,b,c,d,i)		AS2(	pxor	xmm##A, xmm##D)		/* z0 */
-#define L32(A,B,C,D,a,b,c,d,i)		AS2(	movdqa	[SSE2_WORKSPACE + a*16], xmm##A)
-
-#define SSE2_QUARTER_ROUND_X8(i, a, b, c, d, e, f, g, h)	\
-	L01(0,1,2,3, a,b,c,d, i)	L01(4,5,6,7, e,f,g,h, i)	\
-	L02(0,1,2,3, a,b,c,d, i)	L02(4,5,6,7, e,f,g,h, i)	\
-	L03(0,1,2,3, a,b,c,d, i)	L03(4,5,6,7, e,f,g,h, i)	\
-	L04(0,1,2,3, a,b,c,d, i)	L04(4,5,6,7, e,f,g,h, i)	\
-	L05(0,1,2,3, a,b,c,d, i)	L05(4,5,6,7, e,f,g,h, i)	\
-	L06(0,1,2,3, a,b,c,d, i)	L06(4,5,6,7, e,f,g,h, i)	\
-	L07(0,1,2,3, a,b,c,d, i)	L07(4,5,6,7, e,f,g,h, i)	\
-	L08(0,1,2,3, a,b,c,d, i)	L08(4,5,6,7, e,f,g,h, i)	\
-	L09(0,1,2,3, a,b,c,d, i)	L09(4,5,6,7, e,f,g,h, i)	\
-	L10(0,1,2,3, a,b,c,d, i)	L10(4,5,6,7, e,f,g,h, i)	\
-	L11(0,1,2,3, a,b,c,d, i)	L11(4,5,6,7, e,f,g,h, i)	\
-	L12(0,1,2,3, a,b,c,d, i)	L12(4,5,6,7, e,f,g,h, i)	\
-	L13(0,1,2,3, a,b,c,d, i)	L13(4,5,6,7, e,f,g,h, i)	\
-	L14(0,1,2,3, a,b,c,d, i)	L14(4,5,6,7, e,f,g,h, i)	\
-	L15(0,1,2,3, a,b,c,d, i)	L15(4,5,6,7, e,f,g,h, i)	\
-	L16(0,1,2,3, a,b,c,d, i)	L16(4,5,6,7, e,f,g,h, i)	\
-	L17(0,1,2,3, a,b,c,d, i)	L17(4,5,6,7, e,f,g,h, i)	\
-	L18(0,1,2,3, a,b,c,d, i)	L18(4,5,6,7, e,f,g,h, i)	\
-	L19(0,1,2,3, a,b,c,d, i)	L19(4,5,6,7, e,f,g,h, i)	\
-	L20(0,1,2,3, a,b,c,d, i)	L20(4,5,6,7, e,f,g,h, i)	\
-	L21(0,1,2,3, a,b,c,d, i)	L21(4,5,6,7, e,f,g,h, i)	\
-	L22(0,1,2,3, a,b,c,d, i)	L22(4,5,6,7, e,f,g,h, i)	\
-	L23(0,1,2,3, a,b,c,d, i)	L23(4,5,6,7, e,f,g,h, i)	\
-	L24(0,1,2,3, a,b,c,d, i)	L24(4,5,6,7, e,f,g,h, i)	\
-	L25(0,1,2,3, a,b,c,d, i)	L25(4,5,6,7, e,f,g,h, i)	\
-	L26(0,1,2,3, a,b,c,d, i)	L26(4,5,6,7, e,f,g,h, i)	\
-	L27(0,1,2,3, a,b,c,d, i)	L27(4,5,6,7, e,f,g,h, i)	\
-	L28(0,1,2,3, a,b,c,d, i)	L28(4,5,6,7, e,f,g,h, i)	\
-	L29(0,1,2,3, a,b,c,d, i)	L29(4,5,6,7, e,f,g,h, i)	\
-	L30(0,1,2,3, a,b,c,d, i)	L30(4,5,6,7, e,f,g,h, i)	\
-	L31(0,1,2,3, a,b,c,d, i)	L31(4,5,6,7, e,f,g,h, i)	\
-	L32(0,1,2,3, a,b,c,d, i)	L32(4,5,6,7, e,f,g,h, i)
-
-#define SSE2_QUARTER_ROUND_X16(i, a, b, c, d, e, f, g, h, A, B, C, D, E, F, G, H)	\
-	L01(0,1,2,3, a,b,c,d, i)	L01(4,5,6,7, e,f,g,h, i)	L01(8,9,10,11, A,B,C,D, i)	L01(12,13,14,15, E,F,G,H, i)	\
-	L02(0,1,2,3, a,b,c,d, i)	L02(4,5,6,7, e,f,g,h, i)	L02(8,9,10,11, A,B,C,D, i)	L02(12,13,14,15, E,F,G,H, i)	\
-	L03(0,1,2,3, a,b,c,d, i)	L03(4,5,6,7, e,f,g,h, i)	L03(8,9,10,11, A,B,C,D, i)	L03(12,13,14,15, E,F,G,H, i)	\
-	L04(0,1,2,3, a,b,c,d, i)	L04(4,5,6,7, e,f,g,h, i)	L04(8,9,10,11, A,B,C,D, i)	L04(12,13,14,15, E,F,G,H, i)	\
-	L05(0,1,2,3, a,b,c,d, i)	L05(4,5,6,7, e,f,g,h, i)	L05(8,9,10,11, A,B,C,D, i)	L05(12,13,14,15, E,F,G,H, i)	\
-	L06(0,1,2,3, a,b,c,d, i)	L06(4,5,6,7, e,f,g,h, i)	L06(8,9,10,11, A,B,C,D, i)	L06(12,13,14,15, E,F,G,H, i)	\
-	L07(0,1,2,3, a,b,c,d, i)	L07(4,5,6,7, e,f,g,h, i)	L07(8,9,10,11, A,B,C,D, i)	L07(12,13,14,15, E,F,G,H, i)	\
-	L08(0,1,2,3, a,b,c,d, i)	L08(4,5,6,7, e,f,g,h, i)	L08(8,9,10,11, A,B,C,D, i)	L08(12,13,14,15, E,F,G,H, i)	\
-	L09(0,1,2,3, a,b,c,d, i)	L09(4,5,6,7, e,f,g,h, i)	L09(8,9,10,11, A,B,C,D, i)	L09(12,13,14,15, E,F,G,H, i)	\
-	L10(0,1,2,3, a,b,c,d, i)	L10(4,5,6,7, e,f,g,h, i)	L10(8,9,10,11, A,B,C,D, i)	L10(12,13,14,15, E,F,G,H, i)	\
-	L11(0,1,2,3, a,b,c,d, i)	L11(4,5,6,7, e,f,g,h, i)	L11(8,9,10,11, A,B,C,D, i)	L11(12,13,14,15, E,F,G,H, i)	\
-	L12(0,1,2,3, a,b,c,d, i)	L12(4,5,6,7, e,f,g,h, i)	L12(8,9,10,11, A,B,C,D, i)	L12(12,13,14,15, E,F,G,H, i)	\
-	L13(0,1,2,3, a,b,c,d, i)	L13(4,5,6,7, e,f,g,h, i)	L13(8,9,10,11, A,B,C,D, i)	L13(12,13,14,15, E,F,G,H, i)	\
-	L14(0,1,2,3, a,b,c,d, i)	L14(4,5,6,7, e,f,g,h, i)	L14(8,9,10,11, A,B,C,D, i)	L14(12,13,14,15, E,F,G,H, i)	\
-	L15(0,1,2,3, a,b,c,d, i)	L15(4,5,6,7, e,f,g,h, i)	L15(8,9,10,11, A,B,C,D, i)	L15(12,13,14,15, E,F,G,H, i)	\
-	L16(0,1,2,3, a,b,c,d, i)	L16(4,5,6,7, e,f,g,h, i)	L16(8,9,10,11, A,B,C,D, i)	L16(12,13,14,15, E,F,G,H, i)	\
-	L17(0,1,2,3, a,b,c,d, i)	L17(4,5,6,7, e,f,g,h, i)	L17(8,9,10,11, A,B,C,D, i)	L17(12,13,14,15, E,F,G,H, i)	\
-	L18(0,1,2,3, a,b,c,d, i)	L18(4,5,6,7, e,f,g,h, i)	L18(8,9,10,11, A,B,C,D, i)	L18(12,13,14,15, E,F,G,H, i)	\
-	L19(0,1,2,3, a,b,c,d, i)	L19(4,5,6,7, e,f,g,h, i)	L19(8,9,10,11, A,B,C,D, i)	L19(12,13,14,15, E,F,G,H, i)	\
-	L20(0,1,2,3, a,b,c,d, i)	L20(4,5,6,7, e,f,g,h, i)	L20(8,9,10,11, A,B,C,D, i)	L20(12,13,14,15, E,F,G,H, i)	\
-	L21(0,1,2,3, a,b,c,d, i)	L21(4,5,6,7, e,f,g,h, i)	L21(8,9,10,11, A,B,C,D, i)	L21(12,13,14,15, E,F,G,H, i)	\
-	L22(0,1,2,3, a,b,c,d, i)	L22(4,5,6,7, e,f,g,h, i)	L22(8,9,10,11, A,B,C,D, i)	L22(12,13,14,15, E,F,G,H, i)	\
-	L23(0,1,2,3, a,b,c,d, i)	L23(4,5,6,7, e,f,g,h, i)	L23(8,9,10,11, A,B,C,D, i)	L23(12,13,14,15, E,F,G,H, i)	\
-	L24(0,1,2,3, a,b,c,d, i)	L24(4,5,6,7, e,f,g,h, i)	L24(8,9,10,11, A,B,C,D, i)	L24(12,13,14,15, E,F,G,H, i)	\
-	L25(0,1,2,3, a,b,c,d, i)	L25(4,5,6,7, e,f,g,h, i)	L25(8,9,10,11, A,B,C,D, i)	L25(12,13,14,15, E,F,G,H, i)	\
-	L26(0,1,2,3, a,b,c,d, i)	L26(4,5,6,7, e,f,g,h, i)	L26(8,9,10,11, A,B,C,D, i)	L26(12,13,14,15, E,F,G,H, i)	\
-	L27(0,1,2,3, a,b,c,d, i)	L27(4,5,6,7, e,f,g,h, i)	L27(8,9,10,11, A,B,C,D, i)	L27(12,13,14,15, E,F,G,H, i)	\
-	L28(0,1,2,3, a,b,c,d, i)	L28(4,5,6,7, e,f,g,h, i)	L28(8,9,10,11, A,B,C,D, i)	L28(12,13,14,15, E,F,G,H, i)	\
-	L29(0,1,2,3, a,b,c,d, i)	L29(4,5,6,7, e,f,g,h, i)	L29(8,9,10,11, A,B,C,D, i)	L29(12,13,14,15, E,F,G,H, i)	\
-	L30(0,1,2,3, a,b,c,d, i)	L30(4,5,6,7, e,f,g,h, i)	L30(8,9,10,11, A,B,C,D, i)	L30(12,13,14,15, E,F,G,H, i)	\
-	L31(0,1,2,3, a,b,c,d, i)	L31(4,5,6,7, e,f,g,h, i)	L31(8,9,10,11, A,B,C,D, i)	L31(12,13,14,15, E,F,G,H, i)	\
-	L32(0,1,2,3, a,b,c,d, i)	L32(4,5,6,7, e,f,g,h, i)	L32(8,9,10,11, A,B,C,D, i)	L32(12,13,14,15, E,F,G,H, i)
-
-#if CRYPTOPP_BOOL_X64
-		SSE2_QUARTER_ROUND_X16(1, 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15)
-#else
-		SSE2_QUARTER_ROUND_X8(1, 2, 6, 10, 14, 3, 7, 11, 15)
-		SSE2_QUARTER_ROUND_X8(1, 0, 4, 8, 12, 1, 5, 9, 13)
-#endif
-		AS2(	mov		REG_roundsLeft, REG_rounds)
-		ASJ(	jmp,	2, f)
-
-		ASL(SSE2_Salsa_Output)
-		AS2(	movdqa		xmm0, xmm4)
-		AS2(	punpckldq	xmm4, xmm5)
-		AS2(	movdqa		xmm1, xmm6)
-		AS2(	punpckldq	xmm6, xmm7)
-		AS2(	movdqa		xmm2, xmm4)
-		AS2(	punpcklqdq	xmm4, xmm6)	// e
-		AS2(	punpckhqdq	xmm2, xmm6)	// f
-		AS2(	punpckhdq	xmm0, xmm5)
-		AS2(	punpckhdq	xmm1, xmm7)
-		AS2(	movdqa		xmm6, xmm0)
-		AS2(	punpcklqdq	xmm0, xmm1)	// g
-		AS2(	punpckhqdq	xmm6, xmm1)	// h
-		AS_XMM_OUTPUT4(SSE2_Salsa_Output_A, REG_input, REG_output, 4, 2, 0, 6, 1, 0, 4, 8, 12, 1)
-		AS1(	ret)
-
-		ASL(6)
-#if CRYPTOPP_BOOL_X64
-		SSE2_QUARTER_ROUND_X16(0, 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15)
-		ASL(2)
-		SSE2_QUARTER_ROUND_X16(0, 0, 13, 10, 7, 1, 14, 11, 4, 2, 15, 8, 5, 3, 12, 9, 6)
-#else
-		SSE2_QUARTER_ROUND_X8(0, 2, 6, 10, 14, 3, 7, 11, 15)
-		SSE2_QUARTER_ROUND_X8(0, 0, 4, 8, 12, 1, 5, 9, 13)
-		ASL(2)
-		SSE2_QUARTER_ROUND_X8(0, 2, 15, 8, 5, 3, 12, 9, 6)
-		SSE2_QUARTER_ROUND_X8(0, 0, 13, 10, 7, 1, 14, 11, 4)
-#endif
-		AS2(	sub		REG_roundsLeft, 2)
-		ASJ(	jnz,	6, b)
-
-#define SSE2_OUTPUT_4(a, b, c, d)	\
-	AS2(	movdqa		xmm4, [SSE2_WORKSPACE + a*16 + 256])\
-	AS2(	paddd		xmm4, [SSE2_WORKSPACE + a*16])\
-	AS2(	movdqa		xmm5, [SSE2_WORKSPACE + b*16 + 256])\
-	AS2(	paddd		xmm5, [SSE2_WORKSPACE + b*16])\
-	AS2(	movdqa		xmm6, [SSE2_WORKSPACE + c*16 + 256])\
-	AS2(	paddd		xmm6, [SSE2_WORKSPACE + c*16])\
-	AS2(	movdqa		xmm7, [SSE2_WORKSPACE + d*16 + 256])\
-	AS2(	paddd		xmm7, [SSE2_WORKSPACE + d*16])\
-	ASC(	call,		SSE2_Salsa_Output)
-
-		SSE2_OUTPUT_4(0, 13, 10, 7)
-		SSE2_OUTPUT_4(4, 1, 14, 11)
-		SSE2_OUTPUT_4(8, 5, 2, 15)
-		SSE2_OUTPUT_4(12, 9, 6, 3)
-		AS2(	test	REG_input, REG_input)
-		ASJ(	jz,		9, f)
-		AS2(	add		REG_input, 12*16)
-		ASL(9)
-		AS2(	add		REG_output, 12*16)
-		AS2(	sub		REG_iterationCount, 4)
-		AS2(	cmp		REG_iterationCount, 4)
-		ASJ(	jge,	1, b)
-		AS_POP_IF86(	sp)
-
-		ASL(5)
-		AS2(	sub		REG_iterationCount, 1)
-		ASJ(	jl,		4, f)
-		AS2(	movdqa	xmm0, [REG_state + 0*16])
-		AS2(	movdqa	xmm1, [REG_state + 1*16])
-		AS2(	movdqa	xmm2, [REG_state + 2*16])
-		AS2(	movdqa	xmm3, [REG_state + 3*16])
-		AS2(	mov		REG_roundsLeft, REG_rounds)
-
-		ASL(0)
-		SSE2_QUARTER_ROUND(0, 1, 3, 7)
-		SSE2_QUARTER_ROUND(1, 2, 0, 9)
-		SSE2_QUARTER_ROUND(2, 3, 1, 13)
-		SSE2_QUARTER_ROUND(3, 0, 2, 18)
-		ASS(	pshufd	xmm1, xmm1, 2, 1, 0, 3)
-		ASS(	pshufd	xmm2, xmm2, 1, 0, 3, 2)
-		ASS(	pshufd	xmm3, xmm3, 0, 3, 2, 1)
-		SSE2_QUARTER_ROUND(0, 3, 1, 7)
-		SSE2_QUARTER_ROUND(3, 2, 0, 9)
-		SSE2_QUARTER_ROUND(2, 1, 3, 13)
-		SSE2_QUARTER_ROUND(1, 0, 2, 18)
-		ASS(	pshufd	xmm1, xmm1, 0, 3, 2, 1)
-		ASS(	pshufd	xmm2, xmm2, 1, 0, 3, 2)
-		ASS(	pshufd	xmm3, xmm3, 2, 1, 0, 3)
-		AS2(	sub		REG_roundsLeft, 2)
-		ASJ(	jnz,	0, b)
-
-		AS2(	paddd	xmm0, [REG_state + 0*16])
-		AS2(	paddd	xmm1, [REG_state + 1*16])
-		AS2(	paddd	xmm2, [REG_state + 2*16])
-		AS2(	paddd	xmm3, [REG_state + 3*16])
-
-		AS2(	add		dword ptr [REG_state + 8*4], 1)
-		AS2(	adc		dword ptr [REG_state + 5*4], 0)
-
-		AS2(	pcmpeqb	xmm6, xmm6)			// all ones
-		AS2(	psrlq	xmm6, 32)			// lo32 mask
-		ASS(	pshufd	xmm7, xmm6, 0, 1, 2, 3)		// hi32 mask
-		AS2(	movdqa	xmm4, xmm0)
-		AS2(	movdqa	xmm5, xmm3)
-		AS2(	pand	xmm0, xmm7)
-		AS2(	pand	xmm4, xmm6)
-		AS2(	pand	xmm3, xmm6)
-		AS2(	pand	xmm5, xmm7)
-		AS2(	por		xmm4, xmm5)			// 0,13,2,15
-		AS2(	movdqa	xmm5, xmm1)
-		AS2(	pand	xmm1, xmm7)
-		AS2(	pand	xmm5, xmm6)
-		AS2(	por		xmm0, xmm5)			// 4,1,6,3
-		AS2(	pand	xmm6, xmm2)
-		AS2(	pand	xmm2, xmm7)
-		AS2(	por		xmm1, xmm6)			// 8,5,10,7
-		AS2(	por		xmm2, xmm3)			// 12,9,14,11
-
-		AS2(	movdqa	xmm5, xmm4)
-		AS2(	movdqa	xmm6, xmm0)
-		AS3(	shufpd	xmm4, xmm1, 2)		// 0,13,10,7
-		AS3(	shufpd	xmm0, xmm2, 2)		// 4,1,14,11
-		AS3(	shufpd	xmm1, xmm5, 2)		// 8,5,2,15
-		AS3(	shufpd	xmm2, xmm6, 2)		// 12,9,6,3
-
-		// output keystream
-		AS_XMM_OUTPUT4(SSE2_Salsa_Output_B, REG_input, REG_output, 4, 0, 1, 2, 3, 0, 1, 2, 3, 4)
-		ASJ(	jmp,	5, b)
-		ASL(4)
-
-		AS_POP_IF86(	bp)
-#ifdef __GNUC__
-		AS_POP_IF86(	bx)
-		ATT_PREFIX
-	#if CRYPTOPP_BOOL_X64
-			: "+r" (input), "+r" (output), "+r" (iterationCount)
-			: "r" (m_rounds), "r" (m_state.m_ptr), "r" (workspace)
-			: "%eax", "%rdx", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15"
-	#else
-			: "+a" (input), "+D" (output), "+c" (iterationCount)
-			: "d" (m_rounds), "S" (m_state.m_ptr)
-			: "memory", "cc"
-	#endif
-		);
-#endif
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-	movdqa	xmm6, [rsp + 0200h]
-	movdqa	xmm7, [rsp + 0210h]
-	movdqa	xmm8, [rsp + 0220h]
-	movdqa	xmm9, [rsp + 0230h]
-	movdqa	xmm10, [rsp + 0240h]
-	movdqa	xmm11, [rsp + 0250h]
-	movdqa	xmm12, [rsp + 0260h]
-	movdqa	xmm13, [rsp + 0270h]
-	movdqa	xmm14, [rsp + 0280h]
-	movdqa	xmm15, [rsp + 0290h]
-	add		rsp, 10*16 + 32*16 + 8
-	ret
-Salsa20_OperateKeystream ENDP
-#else
-	}
-	else
-#endif
-#endif
-#ifndef CRYPTOPP_GENERATE_X64_MASM
-	{
-		word32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
-
-		while (iterationCount--)
-		{
-			x0 = m_state[0];	x1 = m_state[1];	x2 = m_state[2];	x3 = m_state[3];
-			x4 = m_state[4];	x5 = m_state[5];	x6 = m_state[6];	x7 = m_state[7];
-			x8 = m_state[8];	x9 = m_state[9];	x10 = m_state[10];	x11 = m_state[11];
-			x12 = m_state[12];	x13 = m_state[13];	x14 = m_state[14];	x15 = m_state[15];
-
-			for (int i=m_rounds; i>0; i-=2)
-			{
-				#define QUARTER_ROUND(a, b, c, d)	\
-					b = b ^ rotlFixed(a + d, 7);	\
-					c = c ^ rotlFixed(b + a, 9);	\
-					d = d ^ rotlFixed(c + b, 13);	\
-					a = a ^ rotlFixed(d + c, 18);
-
-				QUARTER_ROUND(x0, x4, x8, x12)
-				QUARTER_ROUND(x1, x5, x9, x13)
-				QUARTER_ROUND(x2, x6, x10, x14)
-				QUARTER_ROUND(x3, x7, x11, x15)
-
-				QUARTER_ROUND(x0, x13, x10, x7)
-				QUARTER_ROUND(x1, x14, x11, x4)
-				QUARTER_ROUND(x2, x15, x8, x5)
-				QUARTER_ROUND(x3, x12, x9, x6)
-			}
-
-			#define SALSA_OUTPUT(x)	{\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 0, x0 + m_state[0]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 1, x13 + m_state[13]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 2, x10 + m_state[10]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 3, x7 + m_state[7]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 4, x4 + m_state[4]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 5, x1 + m_state[1]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 6, x14 + m_state[14]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 7, x11 + m_state[11]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 8, x8 + m_state[8]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 9, x5 + m_state[5]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 10, x2 + m_state[2]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 11, x15 + m_state[15]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 12, x12 + m_state[12]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 13, x9 + m_state[9]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 14, x6 + m_state[6]);\
-				CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 15, x3 + m_state[3]);}
-
-#ifndef CRYPTOPP_DOXYGEN_PROCESSING
-			CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(SALSA_OUTPUT, BYTES_PER_ITERATION);
-#endif
-
-			if (++m_state[8] == 0)
-				++m_state[5];
-		}
-	}
-}	// see comment above if an internal compiler error occurs here
-
-void XSalsa20_Policy::CipherSetKey(const NameValuePairs &params, const byte *key, size_t length)
-{
-	m_rounds = params.GetIntValueWithDefault(Name::Rounds(), 20);
-
-	if (!(m_rounds == 8 || m_rounds == 12 || m_rounds == 20))
-		throw InvalidRounds(XSalsa20::StaticAlgorithmName(), m_rounds);
-
-	GetUserKey(LITTLE_ENDIAN_ORDER, m_key.begin(), m_key.size(), key, length);
-	if (length == 16)
-		memcpy(m_key.begin()+4, m_key.begin(), 16);
-
-	// "expand 32-byte k"
-	m_state[0] = 0x61707865;
-	m_state[1] = 0x3320646e;
-	m_state[2] = 0x79622d32;
-	m_state[3] = 0x6b206574;
-}
-
-void XSalsa20_Policy::CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length)
-{
-	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(length);
-	CRYPTOPP_ASSERT(length==24);
-
-	word32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
-
-	GetBlock<word32, LittleEndian> get(IV);
-	get(x14)(x11)(x8)(x5)(m_state[14])(m_state[11]);
-
-	x13 = m_key[0];		x10 = m_key[1];		x7 = m_key[2];		x4 = m_key[3];
-	x15 = m_key[4];		x12 = m_key[5];		x9 = m_key[6];		x6 = m_key[7];
-	x0 = m_state[0];	x1 = m_state[1];	x2 = m_state[2];	x3 = m_state[3];
-
-	for (int i=m_rounds; i>0; i-=2)
-	{
-		QUARTER_ROUND(x0, x4, x8, x12)
-		QUARTER_ROUND(x1, x5, x9, x13)
-		QUARTER_ROUND(x2, x6, x10, x14)
-		QUARTER_ROUND(x3, x7, x11, x15)
-
-		QUARTER_ROUND(x0, x13, x10, x7)
-		QUARTER_ROUND(x1, x14, x11, x4)
-		QUARTER_ROUND(x2, x15, x8, x5)
-		QUARTER_ROUND(x3, x12, x9, x6)
-	}
-
-	m_state[13] = x0;	m_state[10] = x1;	m_state[7] = x2;	m_state[4] = x3;
-	m_state[15] = x14;	m_state[12] = x11;	m_state[9] = x8;	m_state[6] = x5;
-	m_state[8] = m_state[5] = 0;
-}
-
-NAMESPACE_END
-
-#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM
diff --git a/src-cryptopp/salsa.h b/src-cryptopp/salsa.h
deleted file mode 100644
index 623b36f..0000000
--- a/src-cryptopp/salsa.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// salsa.h - written and placed in the public domain by Wei Dai
-
-//! \file salsa.h
-//! \brief Classes for Salsa and Salsa20 stream ciphers
-
-#ifndef CRYPTOPP_SALSA_H
-#define CRYPTOPP_SALSA_H
-
-#include "strciphr.h"
-#include "secblock.h"
-
-// TODO: work around GCC 4.8+ issue with SSE2 ASM until the exact details are known
-//   and fix is released. Duplicate with "valgrind ./cryptest.exe tv salsa"
-// "Inline assembly operands don't work with .intel_syntax", http://llvm.org/bugs/show_bug.cgi?id=24232
-#if CRYPTOPP_BOOL_X32 || defined(CRYPTOPP_DISABLE_INTEL_ASM) || (CRYPTOPP_GCC_VERSION >= 40800)
-# define CRYPTOPP_DISABLE_SALSA_ASM
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class Salsa20_Info
-//! \brief Salsa20 stream cipher information
-struct Salsa20_Info : public VariableKeyLength<32, 16, 32, 16, SimpleKeyingInterface::UNIQUE_IV, 8>
-{
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "Salsa20";}
-};
-
-//! \class Salsa20_Policy
-//! \brief Salsa20 stream cipher operation
-class CRYPTOPP_NO_VTABLE Salsa20_Policy : public AdditiveCipherConcretePolicy<word32, 16>
-{
-protected:
-	void CipherSetKey(const NameValuePairs &params, const byte *key, size_t length);
-	void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount);
-	void CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length);
-	bool CipherIsRandomAccess() const {return true;}
-	void SeekToIteration(lword iterationCount);
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SALSA_ASM)
-	unsigned int GetAlignment() const;
-	unsigned int GetOptimalBlockSize() const;
-#endif
-
-	FixedSizeAlignedSecBlock<word32, 16> m_state;
-	int m_rounds;
-};
-
-//! \class Salsa20
-//! \brief Salsa20 stream cipher
-//! \details Salsa20 provides a variable number of rounds: 8, 12 or 20. The default number of rounds is 20.
-//! \sa <a href="http://www.cryptolounge.org/wiki/XSalsa20">XSalsa20</a>
-struct Salsa20 : public Salsa20_Info, public SymmetricCipherDocumentation
-{
-	typedef SymmetricCipherFinal<ConcretePolicyHolder<Salsa20_Policy, AdditiveCipherTemplate<> >, Salsa20_Info> Encryption;
-	typedef Encryption Decryption;
-};
-
-//! \class XSalsa20_Info
-//! \brief XSalsa20 stream cipher information
-struct XSalsa20_Info : public FixedKeyLength<32, SimpleKeyingInterface::UNIQUE_IV, 24>
-{
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "XSalsa20";}
-};
-
-//! \class XSalsa20_Policy
-//! \brief XSalsa20 stream cipher operation
-class CRYPTOPP_NO_VTABLE XSalsa20_Policy : public Salsa20_Policy
-{
-public:
-	void CipherSetKey(const NameValuePairs &params, const byte *key, size_t length);
-	void CipherResynchronize(byte *keystreamBuffer, const byte *IV, size_t length);
-
-protected:
-	FixedSizeSecBlock<word32, 8> m_key;
-};
-
-//! \class XSalsa20
-//! \brief XSalsa20 stream cipher
-//! \details XSalsa20 provides a variable number of rounds: 8, 12 or 20. The default number of rounds is 20.
-//! \sa <a href="http://www.cryptolounge.org/wiki/XSalsa20">XSalsa20</a>
-struct XSalsa20 : public XSalsa20_Info, public SymmetricCipherDocumentation
-{
-	typedef SymmetricCipherFinal<ConcretePolicyHolder<XSalsa20_Policy, AdditiveCipherTemplate<> >, XSalsa20_Info> Encryption;
-	typedef Encryption Decryption;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/secblock.h b/src-cryptopp/secblock.h
deleted file mode 100644
index 4cf9706..0000000
--- a/src-cryptopp/secblock.h
+++ /dev/null
@@ -1,813 +0,0 @@
-// secblock.h - written and placed in the public domain by Wei Dai
-
-//! \file secblock.h
-//! \brief Classes and functions for secure memory allocations.
-
-#ifndef CRYPTOPP_SECBLOCK_H
-#define CRYPTOPP_SECBLOCK_H
-
-#include "config.h"
-#include "stdcpp.h"
-#include "misc.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4700)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6386)
-# endif
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// ************** secure memory allocation ***************
-
-//! \class AllocatorBase
-//! \brief Base class for all allocators used by SecBlock
-//! \tparam T the class or type
-template<class T>
-class AllocatorBase
-{
-public:
-	typedef T value_type;
-	typedef size_t size_type;
-#ifdef CRYPTOPP_MSVCRT6
-	typedef ptrdiff_t difference_type;
-#else
-	typedef std::ptrdiff_t difference_type;
-#endif
-	typedef T * pointer;
-	typedef const T * const_pointer;
-	typedef T & reference;
-	typedef const T & const_reference;
-
-	pointer address(reference r) const {return (&r);}
-	const_pointer address(const_reference r) const {return (&r); }
-	void construct(pointer p, const T& val) {new (p) T(val);}
-	void destroy(pointer p) {CRYPTOPP_UNUSED(p); p->~T();}
-
-	//! \brief Returns the maximum number of elements the allocator can provide
-	//! \returns the maximum number of elements the allocator can provide
-	//! \details Internally, preprocessor macros are used rather than std::numeric_limits
-	//!   because the latter is \a not a \a constexpr. Some compilers, like Clang, do not
-	//!   optimize it well under all circumstances. Compilers like GCC, ICC and MSVC appear
-	//!   to optimize it well in either form.
-	CRYPTOPP_CONSTEXPR size_type max_size() const {return (SIZE_MAX/sizeof(T));}
-
-#if defined(CRYPTOPP_CXX11_VARIADIC_TEMPLATES) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
-
-	//! \brief Constructs a new U using variadic arguments
-	//! \tparam U the type to be forwarded
-	//! \tparam Args the arguments to be forwarded
-	//! \param ptr pointer to type U
-	//! \param args variadic arguments
-	//! \details This is a C++11 feature. It is available when CRYPTOPP_CXX11_VARIADIC_TEMPLATES
-	//!   is defined. The define is controlled by compiler versions detected in config.h.
-    template<typename U, typename... Args>
-    void construct(U* ptr, Args&&... args) {::new ((void*)ptr) U(std::forward<Args>(args)...);}
-
-	//! \brief Destroys an U constructed with variadic arguments
-	//! \tparam U the type to be forwarded
-	//! \details This is a C++11 feature. It is available when CRYPTOPP_CXX11_VARIADIC_TEMPLATES
-	//!   is defined. The define is controlled by compiler versions detected in config.h.
-    template<typename U>
-    void destroy(U* ptr) {if(ptr) ptr->~U();}
-
-#endif
-
-protected:
-
-	//! \brief Verifies the allocator can satisfy a request based on size
-	//! \param size the size of the allocation, in elements
-	//! \throws InvalidArgument
-	//! \details CheckSize verifies the number of elements requested is valid.
-	//! \details If size is greater than max_size(), then InvalidArgument is thrown.
-	//!   The library throws InvalidArgument if the size is too large to satisfy.
-	//! \details Internally, preprocessor macros are used rather than std::numeric_limits
-	//!   because the latter is \a not a \a constexpr. Some compilers, like Clang, do not
-	//!   optimize it well under all circumstances. Compilers like GCC, ICC and MSVC appear
-	//!   to optimize it well in either form.
-	//! \note size is the count of elements, and not the number of bytes
-	static void CheckSize(size_t size)
-	{
-		// C++ throws std::bad_alloc (C++03) or std::bad_array_new_length (C++11) here.
-		if (size > (SIZE_MAX/sizeof(T)))
-			throw InvalidArgument("AllocatorBase: requested size would cause integer overflow");
-	}
-};
-
-#define CRYPTOPP_INHERIT_ALLOCATOR_TYPES	\
-typedef typename AllocatorBase<T>::value_type value_type;\
-typedef typename AllocatorBase<T>::size_type size_type;\
-typedef typename AllocatorBase<T>::difference_type difference_type;\
-typedef typename AllocatorBase<T>::pointer pointer;\
-typedef typename AllocatorBase<T>::const_pointer const_pointer;\
-typedef typename AllocatorBase<T>::reference reference;\
-typedef typename AllocatorBase<T>::const_reference const_reference;
-
-//! \brief Reallocation function
-//! \tparam T the class or type
-//! \tparam A the class or type's allocator
-//! \param alloc the allocator
-//! \param oldPtr the previous allocation
-//! \param oldSize the size of the previous allocation
-//! \param newSize the new, requested size
-//! \param preserve flag that indicates if the old allocation should be preserved
-//! \note oldSize and newSize are the count of elements, and not the
-//!   number of bytes.
-template <class T, class A>
-typename A::pointer StandardReallocate(A& alloc, T *oldPtr, typename A::size_type oldSize, typename A::size_type newSize, bool preserve)
-{
-	CRYPTOPP_ASSERT((oldPtr && oldSize) || !(oldPtr || oldSize));
-	if (oldSize == newSize)
-		return oldPtr;
-
-	if (preserve)
-	{
-		typename A::pointer newPointer = alloc.allocate(newSize, NULL);
-		const size_t copySize = STDMIN(oldSize, newSize) * sizeof(T);
-
-		if (oldPtr && newPointer) {memcpy_s(newPointer, copySize, oldPtr, copySize);}
-		alloc.deallocate(oldPtr, oldSize);
-		return newPointer;
-	}
-	else
-	{
-		alloc.deallocate(oldPtr, oldSize);
-		return alloc.allocate(newSize, NULL);
-	}
-}
-
-//! \class AllocatorWithCleanup
-//! \brief Allocates a block of memory with cleanup
-//! \tparam T class or type
-//! \tparam T_Align16 boolean that determines whether allocations should be aligned on 16-byte boundaries
-//! \details If T_Align16 is true, then AllocatorWithCleanup calls AlignedAllocate()
-//!    for memory allocations. If T_Align16 is false, then AllocatorWithCleanup() calls
-//!    UnalignedAllocate() for memory allocations.
-//! \details Template parameter T_Align16 is effectively controlled by cryptlib.h and mirrors
-//!    CRYPTOPP_BOOL_ALIGN16. CRYPTOPP_BOOL_ALIGN16 is often used as the template parameter.
-template <class T, bool T_Align16 = false>
-class AllocatorWithCleanup : public AllocatorBase<T>
-{
-public:
-	CRYPTOPP_INHERIT_ALLOCATOR_TYPES
-
-	//! \brief Allocates a block of memory
-	//! \param ptr the size of the allocation
-	//! \param size the size of the allocation, in elements
-	//! \returns a memory block
-	//! \throws InvalidArgument
-	//! \details allocate() first checks the size of the request. If it is non-0
-	//!   and less than max_size(), then an attempt is made to fulfill the request using either
-	//!   AlignedAllocate() or UnalignedAllocate().
-	//! \details AlignedAllocate() is used if T_Align16 is true.
-	//!   UnalignedAllocate() used if T_Align16 is false.
-	//! \details This is the C++ *Placement New* operator. ptr is not used, and the function
-	//!   CRYPTOPP_ASSERTs in Debug builds if ptr is non-NULL.
-	//! \sa CallNewHandler() for the methods used to recover from a failed
-	//!   allocation attempt.
-	//! \note size is the count of elements, and not the number of bytes
-	pointer allocate(size_type size, const void *ptr = NULL)
-	{
-		CRYPTOPP_UNUSED(ptr); CRYPTOPP_ASSERT(ptr == NULL);
-		this->CheckSize(size);
-		if (size == 0)
-			return NULL;
-
-#if CRYPTOPP_BOOL_ALIGN16
-		// TODO: should this need the test 'size*sizeof(T) >= 16'?
-		if (T_Align16 && size*sizeof(T) >= 16)
-			return (pointer)AlignedAllocate(size*sizeof(T));
-#endif
-
-		return (pointer)UnalignedAllocate(size*sizeof(T));
-	}
-
-	//! \brief Deallocates a block of memory
-	//! \param ptr the pointer for the allocation
-	//! \param size the size of the allocation, in elements
-	//! \details Internally, SecureWipeArray() is called before deallocating the memory.
-	//!   Once the memory block is wiped or zeroized, AlignedDeallocate() or
-	//!   UnalignedDeallocate() is called.
-	//! \details AlignedDeallocate() is used if T_Align16 is true.
-	//!   UnalignedDeallocate() used if T_Align16 is false.
-	void deallocate(void *ptr, size_type size)
-	{
-		CRYPTOPP_ASSERT((ptr && size) || !(ptr || size));
-		SecureWipeArray((pointer)ptr, size);
-
-#if CRYPTOPP_BOOL_ALIGN16
-		if (T_Align16 && size*sizeof(T) >= 16)
-			return AlignedDeallocate(ptr);
-#endif
-
-		UnalignedDeallocate(ptr);
-	}
-
-	//! \brief Reallocates a block of memory
-	//! \param oldPtr the previous allocation
-	//! \param oldSize the size of the previous allocation
-	//! \param newSize the new, requested size
-	//! \param preserve flag that indicates if the old allocation should be preserved
-	//! \returns pointer to the new memory block
-	//! \details Internally, reallocate() calls StandardReallocate().
-	//! \details If preserve is true, then index 0 is used to begin copying the
-	//!   old memory block to the new one. If the block grows, then the old array
-	//!   is copied in its entirety. If the block shrinks, then only newSize
-	//!   elements are copied from the old block to the new one.
-	//! \note oldSize and newSize are the count of elements, and not the
-	//!   number of bytes.
-	pointer reallocate(T *oldPtr, size_type oldSize, size_type newSize, bool preserve)
-	{
-		CRYPTOPP_ASSERT((oldPtr && oldSize) || !(oldPtr || oldSize));
-		return StandardReallocate(*this, oldPtr, oldSize, newSize, preserve);
-	}
-
-	//! \brief Template class memeber Rebind
-	//! \tparam T allocated class or type
-	//! \tparam T_Align16 boolean that determines whether allocations should be aligned on 16-byte boundaries
-	//! \tparam U bound class or type
-	//! \details Rebind allows a container class to allocate a different type of object
-	//!   to store elements. For example, a std::list will allocate std::list_node to
-	//!   store elements in the list.
-	//! \details VS.NET STL enforces the policy of "All STL-compliant allocators
-	//!   have to provide a template class member called rebind".
-    template <class U> struct rebind { typedef AllocatorWithCleanup<U, T_Align16> other; };
-#if _MSC_VER >= 1500
-	AllocatorWithCleanup() {}
-	template <class U, bool A> AllocatorWithCleanup(const AllocatorWithCleanup<U, A> &) {}
-#endif
-};
-
-CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<byte>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word16>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word32>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word64>;
-#if defined(CRYPTOPP_WORD128_AVAILABLE)
-CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word128, true>; // for Integer
-#endif
-#if CRYPTOPP_BOOL_X86
-CRYPTOPP_DLL_TEMPLATE_CLASS AllocatorWithCleanup<word, true>;	 // for Integer
-#endif
-
-//! \class NullAllocator
-//! \brief NULL allocator
-//! \tparam T class or type
-//! \details A NullAllocator is useful for fixed-size, stack based allocations
-//!   (i.e., static arrays used by FixedSizeAllocatorWithCleanup).
-//! \details A NullAllocator always returns 0 for max_size(), and always returns
-//!   NULL for allocation requests. Though the allocator does not allocate at
-//!   runtime, it does perform a secure wipe or zeroization during cleanup.
-template <class T>
-class NullAllocator : public AllocatorBase<T>
-{
-public:
-	//LCOV_EXCL_START
-	CRYPTOPP_INHERIT_ALLOCATOR_TYPES
-
-	// TODO: should this return NULL or throw bad_alloc? Non-Windows C++ standard
-	// libraries always throw. And late mode Windows throws. Early model Windows
-	// (circa VC++ 6.0) returned NULL.
-	pointer allocate(size_type n, const void* unused = NULL)
-	{
-		CRYPTOPP_UNUSED(n); CRYPTOPP_UNUSED(unused);
-		CRYPTOPP_ASSERT(false); return NULL;
-	}
-
-	void deallocate(void *p, size_type n)
-	{
-		CRYPTOPP_UNUSED(p); CRYPTOPP_UNUSED(n);
-		CRYPTOPP_ASSERT(false);
-	}
-
-	CRYPTOPP_CONSTEXPR size_type max_size() const {return 0;}
-	//LCOV_EXCL_STOP
-};
-
-//! \class FixedSizeAllocatorWithCleanup
-//! \brief Static secure memory block with cleanup
-//! \tparam T class or type
-//! \tparam S fixed-size of the stack-based memory block, in elements
-//! \tparam A AllocatorBase derived class for allocation and cleanup
-//! \details FixedSizeAllocatorWithCleanup provides a fixed-size, stack-
-//!    based allocation at compile time. The class can grow its memory
-//!    block at runtime if a suitable allocator is available. If size
-//!    grows beyond S and a suitable allocator is available, then the
-//!    statically allocated array is obsoleted.
-//! \note This allocator can't be used with standard collections because
-//!   they require that all objects of the same allocator type are equivalent.
-template <class T, size_t S, class A = NullAllocator<T>, bool T_Align16 = false>
-class FixedSizeAllocatorWithCleanup : public AllocatorBase<T>
-{
-public:
-	CRYPTOPP_INHERIT_ALLOCATOR_TYPES
-
-	//! \brief Constructs a FixedSizeAllocatorWithCleanup
-	FixedSizeAllocatorWithCleanup() : m_allocated(false) {}
-
-	//! \brief Allocates a block of memory
-	//! \param size size of the memory block, in elements
-	//! \details FixedSizeAllocatorWithCleanup provides a fixed-size, stack-based
-	//!   allocation at compile time. If size is less than or equal to
-	//!   <tt>S</tt>, then a pointer to the static array is returned.
-	//! \details The class can grow its memory block at runtime if a suitable
-	//!   allocator is available. If size grows beyond S and a suitable
-	//!   allocator is available, then the statically allocated array is
-	//!   obsoleted. If a suitable allocator is \a not available, as with a
-	//!   NullAllocator, then the function returns NULL and a runtime error
-	//!   eventually occurs.
-	//! \sa reallocate(), SecBlockWithHint
-	pointer allocate(size_type size)
-	{
-		CRYPTOPP_ASSERT(IsAlignedOn(m_array, 8));
-
-		if (size <= S && !m_allocated)
-		{
-			m_allocated = true;
-			return GetAlignedArray();
-		}
-		else
-			return m_fallbackAllocator.allocate(size);
-	}
-
-	//! \brief Allocates a block of memory
-	//! \param size size of the memory block, in elements
-	//! \param hint an unused hint
-	//! \details FixedSizeAllocatorWithCleanup provides a fixed-size, stack-
-	//!   based allocation at compile time. If size is less than or equal to
-	//!   S, then a pointer to the static array is returned.
-	//! \details The class can grow its memory block at runtime if a suitable
-	//!   allocator is available. If size grows beyond S and a suitable
-	//!   allocator is available, then the statically allocated array is
-	//!   obsoleted. If a suitable allocator is \a not available, as with a
-	//!   NullAllocator, then the function returns NULL and a runtime error
-	//!   eventually occurs.
-	//! \sa reallocate(), SecBlockWithHint
-	pointer allocate(size_type size, const void *hint)
-	{
-		if (size <= S && !m_allocated)
-		{
-			m_allocated = true;
-			return GetAlignedArray();
-		}
-		else
-			return m_fallbackAllocator.allocate(size, hint);
-	}
-
-	//! \brief Deallocates a block of memory
-	//! \param ptr a pointer to the memory block to deallocate
-	//! \param size size of the memory block, in elements
-	//! \details The memory block is wiped or zeroized before deallocation.
-	//!   If the statically allocated memory block is active, then no
-	//!   additional actions are taken after the wipe.
-	//! \details If a dynamic memory block is active, then the pointer and
-	//!   size are passed to the allocator for deallocation.
-	void deallocate(void *ptr, size_type size)
-	{
-		if (ptr == GetAlignedArray())
-		{
-			CRYPTOPP_ASSERT(size <= S);
-			CRYPTOPP_ASSERT(m_allocated);
-			m_allocated = false;
-			SecureWipeArray((pointer)ptr, size);
-		}
-		else
-			m_fallbackAllocator.deallocate(ptr, size);
-	}
-
-	//! \brief Reallocates a block of memory
-	//! \param oldPtr the previous allocation
-	//! \param oldSize the size of the previous allocation
-	//! \param newSize the new, requested size
-	//! \param preserve flag that indicates if the old allocation should be preserved
-	//! \returns pointer to the new memory block
-	//! \details FixedSizeAllocatorWithCleanup provides a fixed-size, stack-
-	//!   based allocation at compile time. If size is less than or equal to
-	//!   S, then a pointer to the static array is returned.
-	//! \details The class can grow its memory block at runtime if a suitable
-	//!   allocator is available. If size grows beyond S and a suitable
-	//!   allocator is available, then the statically allocated array is
-	//!   obsoleted. If a suitable allocator is \a not available, as with a
-	//!   NullAllocator, then the function returns NULL and a runtime error
-	//!   eventually occurs.
-	//! \note size is the count of elements, and not the number of bytes.
-	//! \sa reallocate(), SecBlockWithHint
-	pointer reallocate(pointer oldPtr, size_type oldSize, size_type newSize, bool preserve)
-	{
-		if (oldPtr == GetAlignedArray() && newSize <= S)
-		{
-			CRYPTOPP_ASSERT(oldSize <= S);
-			if (oldSize > newSize)
-				SecureWipeArray(oldPtr+newSize, oldSize-newSize);
-			return oldPtr;
-		}
-
-		pointer newPointer = allocate(newSize, NULL);
-		if (preserve && newSize)
-		{
-			const size_t copySize = STDMIN(oldSize, newSize);
-			memcpy_s(newPointer, sizeof(T)*newSize, oldPtr, sizeof(T)*copySize);
-		}
-		deallocate(oldPtr, oldSize);
-		return newPointer;
-	}
-
-	CRYPTOPP_CONSTEXPR size_type max_size() const {return STDMAX(m_fallbackAllocator.max_size(), S);}
-
-private:
-
-#ifdef __BORLANDC__
-	T* GetAlignedArray() {return m_array;}
-	T m_array[S];
-#else
-	T* GetAlignedArray() {return (CRYPTOPP_BOOL_ALIGN16 && T_Align16) ? (T*)(void *)(((byte *)m_array) + (0-(size_t)m_array)%16) : m_array;}
-	CRYPTOPP_ALIGN_DATA(8) T m_array[(CRYPTOPP_BOOL_ALIGN16 && T_Align16) ? S+8/sizeof(T) : S];
-#endif
-
-	A m_fallbackAllocator;
-	bool m_allocated;
-};
-
-//! \class SecBlock
-//! \brief Secure memory block with allocator and cleanup
-//! \tparam T a class or type
-//! \tparam A AllocatorWithCleanup derived class for allocation and cleanup
-template <class T, class A = AllocatorWithCleanup<T> >
-class SecBlock
-{
-public:
-	typedef typename A::value_type value_type;
-	typedef typename A::pointer iterator;
-	typedef typename A::const_pointer const_iterator;
-	typedef typename A::size_type size_type;
-
-	//! \brief Construct a SecBlock with space for size elements.
-	//! \param size the size of the allocation, in elements
-	//! \throws std::bad_alloc
-	//! \details The elements are not initialized.
-	//! \note size is the count of elements, and not the number of bytes
-	explicit SecBlock(size_type size=0)
-		: m_size(size), m_ptr(m_alloc.allocate(size, NULL)) { }
-
-	//! \brief Copy construct a SecBlock from another SecBlock
-	//! \param t the other SecBlock
-	//! \throws std::bad_alloc
-	SecBlock(const SecBlock<T, A> &t)
-		: m_size(t.m_size), m_ptr(m_alloc.allocate(t.m_size, NULL)) {
-			CRYPTOPP_ASSERT((!t.m_ptr && !m_size) || (t.m_ptr && m_size));
-			if (t.m_ptr) {memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, t.m_size*sizeof(T));}
-		}
-
-	//! \brief Construct a SecBlock from an array of elements.
-	//! \param ptr a pointer to an array of T
-	//! \param len the number of elements in the memory block
-	//! \throws std::bad_alloc
-	//! \details If <tt>ptr!=NULL</tt> and <tt>len!=0</tt>, then the block is initialized from the pointer ptr.
-	//!    If <tt>ptr==NULL</tt> and <tt>len!=0</tt>, then the block is initialized to 0.
-	//!    Otherwise, the block is empty and \a not initialized.
-	//! \note size is the count of elements, and not the number of bytes
-	SecBlock(const T *ptr, size_type len)
-		: m_size(len), m_ptr(m_alloc.allocate(len, NULL)) {
-			CRYPTOPP_ASSERT((!m_ptr && !m_size) || (m_ptr && m_size));
-			if (ptr && m_ptr)
-				memcpy_s(m_ptr, m_size*sizeof(T), ptr, len*sizeof(T));
-			else if (m_size)
-				memset(m_ptr, 0, m_size*sizeof(T));
-		}
-
-	~SecBlock()
-		{m_alloc.deallocate(m_ptr, m_size);}
-
-#ifdef __BORLANDC__
-	operator T *() const
-		{return (T*)m_ptr;}
-#else
-	operator const void *() const
-		{return m_ptr;}
-	operator void *()
-		{return m_ptr;}
-
-	operator const T *() const
-		{return m_ptr;}
-	operator T *()
-		{return m_ptr;}
-#endif
-
-	//! \brief Provides an iterator pointing to the first element in the memory block
-	//! \returns iterator pointing to the first element in the memory block
-	iterator begin()
-		{return m_ptr;}
-	//! \brief Provides a constant iterator pointing to the first element in the memory block
-	//! \returns constant iterator pointing to the first element in the memory block
-	const_iterator begin() const
-		{return m_ptr;}
-	//! \brief Provides an iterator pointing beyond the last element in the memory block
-	//! \returns iterator pointing beyond the last element in the memory block
-	iterator end()
-		{return m_ptr+m_size;}
-	//! \brief Provides a constant iterator pointing beyond the last element in the memory block
-	//! \returns constant iterator pointing beyond the last element in the memory block
-	const_iterator end() const
-		{return m_ptr+m_size;}
-
-	//! \brief Provides a pointer to the first element in the memory block
-	//! \returns pointer to the first element in the memory block
-	typename A::pointer data() {return m_ptr;}
-	//! \brief Provides a pointer to the first element in the memory block
-	//! \returns constant pointer to the first element in the memory block
-	typename A::const_pointer data() const {return m_ptr;}
-
-	//! \brief Provides the count of elements in the SecBlock
-	//! \returns number of elements in the memory block
-	//! \note the return value is the count of elements, and not the number of bytes
-	size_type size() const {return m_size;}
-	//! \brief Determines if the SecBlock is empty
-	//! \returns true if number of elements in the memory block is 0, false otherwise
-	bool empty() const {return m_size == 0;}
-
-	//! \brief Provides a byte pointer to the first element in the memory block
-	//! \returns byte pointer to the first element in the memory block
-	byte * BytePtr() {return (byte *)m_ptr;}
-	//! \brief Return a byte pointer to the first element in the memory block
-	//! \returns constant byte pointer to the first element in the memory block
-	const byte * BytePtr() const {return (const byte *)m_ptr;}
-	//! \brief Provides the number of bytes in the SecBlock
-	//! \return the number of bytes in the memory block
-	//! \note the return value is the number of bytes, and not count of elements.
-	size_type SizeInBytes() const {return m_size*sizeof(T);}
-
-	//! \brief Set contents and size from an array
-	//! \param ptr a pointer to an array of T
-	//! \param len the number of elements in the memory block
-	//! \details If the memory block is reduced in size, then the reclaimed memory is set to 0.
-	void Assign(const T *ptr, size_type len)
-	{
-		New(len);
-		if (m_ptr && ptr && len)
-			{memcpy_s(m_ptr, m_size*sizeof(T), ptr, len*sizeof(T));}
-	}
-
-	//! \brief Copy contents from another SecBlock
-	//! \param t the other SecBlock
-	//! \details Assign checks for self assignment.
-	//! \details If the memory block is reduced in size, then the reclaimed memory is set to 0.
-	void Assign(const SecBlock<T, A> &t)
-	{
-		if (this != &t)
-		{
-			New(t.m_size);
-			if (m_ptr && t.m_ptr && t.m_size)
-				{memcpy_s(m_ptr, m_size*sizeof(T), t, t.m_size*sizeof(T));}
-		}
-	}
-
-	//! \brief Assign contents from another SecBlock
-	//! \param t the other SecBlock
-	//! \details Internally, operator=() calls Assign().
-	//! \details If the memory block is reduced in size, then the reclaimed memory is set to 0.
-	SecBlock<T, A>& operator=(const SecBlock<T, A> &t)
-	{
-		// Assign guards for self-assignment
-		Assign(t);
-		return *this;
-	}
-
-	//! \brief Append contents from another SecBlock
-	//! \param t the other SecBlock
-	//! \details Internally, this SecBlock calls Grow and then appends t.
-	SecBlock<T, A>& operator+=(const SecBlock<T, A> &t)
-	{
-		CRYPTOPP_ASSERT((!t.m_ptr && !t.m_size) || (t.m_ptr && t.m_size));
-
-		if(t.m_size)
-		{
-			const size_type oldSize = m_size;
-			if(this != &t)  // s += t
-			{
-				Grow(m_size+t.m_size);
-				memcpy_s(m_ptr+oldSize, (m_size-oldSize)*sizeof(T), t.m_ptr, t.m_size*sizeof(T));
-			}
-			else            // t += t
-			{
-				Grow(m_size*2);
-				memcpy_s(m_ptr+oldSize, (m_size-oldSize)*sizeof(T), m_ptr, oldSize*sizeof(T));
-			}
-		}
-		return *this;
-	}
-
-	//! \brief Construct a SecBlock from this and another SecBlock
-	//! \param t the other SecBlock
-	//! \returns a newly constructed SecBlock that is a conacentation of this and t
-	//! \details Internally, a new SecBlock is created from this and a concatenation of t.
-	SecBlock<T, A> operator+(const SecBlock<T, A> &t)
-	{
-		CRYPTOPP_ASSERT((!m_ptr && !m_size) || (m_ptr && m_size));
-		CRYPTOPP_ASSERT((!t.m_ptr && !t.m_size) || (t.m_ptr && t.m_size));
-		if(!t.m_size) return SecBlock(*this);
-
-		SecBlock<T, A> result(m_size+t.m_size);
-		if(m_size) {memcpy_s(result.m_ptr, result.m_size*sizeof(T), m_ptr, m_size*sizeof(T));}
-		memcpy_s(result.m_ptr+m_size, (result.m_size-m_size)*sizeof(T), t.m_ptr, t.m_size*sizeof(T));
-		return result;
-	}
-
-	//! \brief Bitwise compare two SecBlocks
-	//! \param t the other SecBlock
-	//! \returns true if the size and bits are equal, false otherwise
-	//! \details Uses a constant time compare if the arrays are equal size. The constant time
-	//!    compare is VerifyBufsEqual() found in misc.h.
-	//! \sa operator!=()
-	bool operator==(const SecBlock<T, A> &t) const
-	{
-		return m_size == t.m_size &&
-			VerifyBufsEqual(reinterpret_cast<const byte*>(m_ptr), reinterpret_cast<const byte*>(t.m_ptr), m_size*sizeof(T));
-	}
-
-	//! \brief Bitwise compare two SecBlocks
-	//! \param t the other SecBlock
-	//! \returns true if the size and bits are equal, false otherwise
-	//! \details Uses a constant time compare if the arrays are equal size. The constant time
-	//!    compare is VerifyBufsEqual() found in misc.h.
-	//! \details Internally, operator!=() returns the inverse of operator==().
-	//! \sa operator==()
-	bool operator!=(const SecBlock<T, A> &t) const
-	{
-		return !operator==(t);
-	}
-
-	//! \brief Change size without preserving contents
-	//! \param newSize the new size of the memory block
-	//! \details Old content is \a not preserved. If the memory block is reduced in size,
-	//!    then the reclaimed memory is set to 0. If the memory block grows in size, then
-	//!    the new memory is \a not initialized.
-	//! \details Internally, this SecBlock calls reallocate().
-	//! \sa New(), CleanNew(), Grow(), CleanGrow(), resize()
-	void New(size_type newSize)
-	{
-		m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, false);
-		m_size = newSize;
-	}
-
-	//! \brief Change size without preserving contents
-	//! \param newSize the new size of the memory block
-	//! \details Old content is \a not preserved. If the memory block is reduced in size,
-	//!    then the reclaimed content is set to 0. If the memory block grows in size, then
-	//!    the new memory is initialized to 0.
-	//! \details Internally, this SecBlock calls New().
-	//! \sa New(), CleanNew(), Grow(), CleanGrow(), resize()
-	void CleanNew(size_type newSize)
-	{
-		New(newSize);
-		if (m_ptr) {memset_z(m_ptr, 0, m_size*sizeof(T));}
-	}
-
-	//! \brief Change size and preserve contents
-	//! \param newSize the new size of the memory block
-	//! \details Old content is preserved. New content is not initialized.
-	//! \details Internally, this SecBlock calls reallocate() when size must increase. If the
-	//!    size does not increase, then Grow() does not take action. If the size must
-	//!    change, then use resize().
-	//! \sa New(), CleanNew(), Grow(), CleanGrow(), resize()
-	void Grow(size_type newSize)
-	{
-		if (newSize > m_size)
-		{
-			m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true);
-			m_size = newSize;
-		}
-	}
-
-	//! \brief Change size and preserve contents
-	//! \param newSize the new size of the memory block
-	//! \details Old content is preserved. New content is initialized to 0.
-	//! \details Internally, this SecBlock calls reallocate() when size must increase. If the
-	//!    size does not increase, then CleanGrow() does not take action. If the size must
-	//!    change, then use resize().
-	//! \sa New(), CleanNew(), Grow(), CleanGrow(), resize()
-	void CleanGrow(size_type newSize)
-	{
-		if (newSize > m_size)
-		{
-			m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true);
-			memset_z(m_ptr+m_size, 0, (newSize-m_size)*sizeof(T));
-			m_size = newSize;
-		}
-	}
-
-	//! \brief Change size and preserve contents
-	//! \param newSize the new size of the memory block
-	//! \details Old content is preserved. If the memory block grows in size, then
-	//!    new memory is \a not initialized.
-	//! \details Internally, this SecBlock calls reallocate().
-	//! \sa New(), CleanNew(), Grow(), CleanGrow(), resize()
-	void resize(size_type newSize)
-	{
-		m_ptr = m_alloc.reallocate(m_ptr, m_size, newSize, true);
-		m_size = newSize;
-	}
-
-	//! \brief Swap contents with another SecBlock
-	//! \param b the other SecBlock
-	//! \details Internally, std::swap() is called on m_alloc, m_size and m_ptr.
-	void swap(SecBlock<T, A> &b)
-	{
-		// Swap must occur on the allocator in case its FixedSize that spilled into the heap.
-		std::swap(m_alloc, b.m_alloc);
-		std::swap(m_size, b.m_size);
-		std::swap(m_ptr, b.m_ptr);
-	}
-
-// protected:
-	A m_alloc;
-	size_type m_size;
-	T *m_ptr;
-};
-
-#ifdef CRYPTOPP_DOXYGEN_PROCESSING
-//! \class SecByteBlock
-//! \brief \ref SecBlock "SecBlock<byte>" typedef.
-class SecByteBlock : public SecBlock<byte> {};
-//! \class SecWordBlock
-//! \brief \ref SecBlock "SecBlock<word>" typedef.
-class SecWordBlock : public SecBlock<word> {};
-//! \class AlignedSecByteBlock
-//! \brief SecBlock using \ref AllocatorWithCleanup "AllocatorWithCleanup<byte, true>" typedef
-class AlignedSecByteBlock : public SecBlock<byte, AllocatorWithCleanup<byte, true> > {};
-#else
-typedef SecBlock<byte> SecByteBlock;
-typedef SecBlock<word> SecWordBlock;
-typedef SecBlock<byte, AllocatorWithCleanup<byte, true> > AlignedSecByteBlock;
-#endif
-
-// No need for move semantics on derived class *if* the class does not add any
-//   data members; see http://stackoverflow.com/q/31755703, and Rule of {0|3|5}.
-
-//! \class FixedSizeSecBlock
-//! \brief Fixed size stack-based SecBlock
-//! \tparam T class or type
-//! \tparam S fixed-size of the stack-based memory block, in elements
-//! \tparam A AllocatorBase derived class for allocation and cleanup
-template <class T, unsigned int S, class A = FixedSizeAllocatorWithCleanup<T, S> >
-class FixedSizeSecBlock : public SecBlock<T, A>
-{
-public:
-	//! \brief Construct a FixedSizeSecBlock
-	explicit FixedSizeSecBlock() : SecBlock<T, A>(S) {}
-};
-
-//! \class FixedSizeAlignedSecBlock
-//! \brief Fixed size stack-based SecBlock with 16-byte alignment
-//! \tparam T class or type
-//! \tparam S fixed-size of the stack-based memory block, in elements
-//! \tparam A AllocatorBase derived class for allocation and cleanup
-template <class T, unsigned int S, bool T_Align16 = true>
-class FixedSizeAlignedSecBlock : public FixedSizeSecBlock<T, S, FixedSizeAllocatorWithCleanup<T, S, NullAllocator<T>, T_Align16> >
-{
-};
-
-//! \class SecBlockWithHint
-//! \brief Stack-based SecBlock that grows into the heap
-//! \tparam T class or type
-//! \tparam S fixed-size of the stack-based memory block, in elements
-//! \tparam A AllocatorBase derived class for allocation and cleanup
-template <class T, unsigned int S, class A = FixedSizeAllocatorWithCleanup<T, S, AllocatorWithCleanup<T> > >
-class SecBlockWithHint : public SecBlock<T, A>
-{
-public:
-	//! construct a SecBlockWithHint with a count of elements
-	explicit SecBlockWithHint(size_t size) : SecBlock<T, A>(size) {}
-};
-
-template<class T, bool A, class U, bool B>
-inline bool operator==(const CryptoPP::AllocatorWithCleanup<T, A>&, const CryptoPP::AllocatorWithCleanup<U, B>&) {return (true);}
-template<class T, bool A, class U, bool B>
-inline bool operator!=(const CryptoPP::AllocatorWithCleanup<T, A>&, const CryptoPP::AllocatorWithCleanup<U, B>&) {return (false);}
-
-NAMESPACE_END
-
-NAMESPACE_BEGIN(std)
-template <class T, class A>
-inline void swap(CryptoPP::SecBlock<T, A> &a, CryptoPP::SecBlock<T, A> &b)
-{
-	a.swap(b);
-}
-
-#if defined(_STLP_DONT_SUPPORT_REBIND_MEMBER_TEMPLATE) || (defined(_STLPORT_VERSION) && !defined(_STLP_MEMBER_TEMPLATE_CLASSES))
-// working for STLport 5.1.3 and MSVC 6 SP5
-template <class _Tp1, class _Tp2>
-inline CryptoPP::AllocatorWithCleanup<_Tp2>&
-__stl_alloc_rebind(CryptoPP::AllocatorWithCleanup<_Tp1>& __a, const _Tp2*)
-{
-	return (CryptoPP::AllocatorWithCleanup<_Tp2>&)(__a);
-}
-#endif
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/seckey.h b/src-cryptopp/seckey.h
deleted file mode 100644
index bbf1ea7..0000000
--- a/src-cryptopp/seckey.h
+++ /dev/null
@@ -1,466 +0,0 @@
-// seckey.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \brief Classes and functions for implementing secret key algorithms.
-
-#ifndef CRYPTOPP_SECKEY_H
-#define CRYPTOPP_SECKEY_H
-
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4189)
-#endif
-
-#include "cryptlib.h"
-#include "misc.h"
-#include "simple.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \brief Inverts the cipher's direction
-//! \param dir the cipher's direction
-//! \returns DECRYPTION if \ref CipherDir "dir" is ENCRYPTION, DECRYPTION otherwise
-inline CipherDir ReverseCipherDir(CipherDir dir)
-{
-	return (dir == ENCRYPTION) ? DECRYPTION : ENCRYPTION;
-}
-
-//! \class FixedBlockSize
-//! \brief Inherited by algorithms with fixed block size
-//! \tparam N the blocksize of the algorithm
-template <unsigned int N>
-class FixedBlockSize
-{
-public:
-	//! \brief The block size of the algorithm provided as a constant.
-	CRYPTOPP_CONSTANT(BLOCKSIZE = N)
-};
-
-// ************** rounds ***************
-
-//! \class FixedRounds
-//! \brief Inherited by algorithms with fixed number of rounds
-//! \tparam R the number of rounds used by the algorithm
-template <unsigned int R>
-class FixedRounds
-{
-public:
-	//! \brief The number of rounds for the algorithm provided as a constant.
-	CRYPTOPP_CONSTANT(ROUNDS = R)
-};
-
-//! \class VariableRounds
-//! \brief Inherited by algorithms with variable number of rounds
-//! \tparam D Default number of rounds
-//! \tparam N Minimum number of rounds
-//! \tparam D Maximum number of rounds
-template <unsigned int D, unsigned int N=1, unsigned int M=INT_MAX>		// use INT_MAX here because enums are treated as signed ints
-class VariableRounds
-{
-public:
-	//! \brief The default number of rounds for the algorithm provided as a constant.
-	CRYPTOPP_CONSTANT(DEFAULT_ROUNDS = D)
-	//! \brief The minimum number of rounds for the algorithm provided as a constant.
-	CRYPTOPP_CONSTANT(MIN_ROUNDS = N)
-	//! \brief The maximum number of rounds for the algorithm provided as a constant.
-	CRYPTOPP_CONSTANT(MAX_ROUNDS = M)
-	//! \brief The default number of rounds for the algorithm based on key length
-	//!   provided by a static function.
-	//! \param keylength the size of the key, in bytes
-	//! \details keylength is unused in the default implementation.
-	CRYPTOPP_CONSTEXPR static unsigned int StaticGetDefaultRounds(size_t keylength)
-	{
-		// Comma operator breaks Debug builds with GCC 4.0 - 4.6.
-		// Also see http://github.com/weidai11/cryptopp/issues/255
-#if defined(CRYPTOPP_CXX11_CONSTEXPR)
-		return CRYPTOPP_UNUSED(keylength), static_cast<unsigned int>(DEFAULT_ROUNDS);
-#else
-		CRYPTOPP_UNUSED(keylength);
-		return static_cast<unsigned int>(DEFAULT_ROUNDS);
-#endif
-	}
-
-protected:
-	//! \brief Validates the number of rounds for an algorithm.
-	//! \param rounds the candidate number of rounds
-	//! \param alg an Algorithm object used if the number of rounds are invalid
-	//! \throws InvalidRounds if the number of rounds are invalid
-	//! \details ThrowIfInvalidRounds() validates the number of rounds and throws if invalid.
-	inline void ThrowIfInvalidRounds(int rounds, const Algorithm *alg)
-	{
-		if (M == INT_MAX) // Coverity and result_independent_of_operands
-		{
-			if (rounds < MIN_ROUNDS)
-				throw InvalidRounds(alg ? alg->AlgorithmName() : std::string("VariableRounds"), rounds);
-		}
-		else
-		{
-			if (rounds < MIN_ROUNDS || rounds > MAX_ROUNDS)
-				throw InvalidRounds(alg ? alg->AlgorithmName() : std::string("VariableRounds"), rounds);
-		}
-	}
-
-	//! \brief Validates the number of rounds for an algorithm
-	//! \param param the candidate number of rounds
-	//! \param alg an Algorithm object used if the number of rounds are invalid
-	//! \returns the number of rounds for the algorithm
-	//! \throws InvalidRounds if the number of rounds are invalid
-	//! \details GetRoundsAndThrowIfInvalid() validates the number of rounds and throws if invalid.
-	inline unsigned int GetRoundsAndThrowIfInvalid(const NameValuePairs &param, const Algorithm *alg)
-	{
-		int rounds = param.GetIntValueWithDefault("Rounds", DEFAULT_ROUNDS);
-		ThrowIfInvalidRounds(rounds, alg);
-		return (unsigned int)rounds;
-	}
-};
-
-// ************** key length ***************
-
-//! \class FixedKeyLength
-//! \brief Inherited by keyed algorithms with fixed key length
-//! \tparam N Default key length, in bytes
-//! \tparam IV_REQ the \ref SimpleKeyingInterface::IV_Requirement "IV requirements"
-//! \tparam IV_L default IV length, in bytes
-//! \sa SimpleKeyingInterface
-template <unsigned int N, unsigned int IV_REQ = SimpleKeyingInterface::NOT_RESYNCHRONIZABLE, unsigned int IV_L = 0>
-class FixedKeyLength
-{
-public:
-	//! \brief The default key length used by the algorithm provided as a constant
-	//! \details KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(KEYLENGTH=N)
-	//! \brief The minimum key length used by the algorithm provided as a constant
-	//! \details MIN_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(MIN_KEYLENGTH=N)
-	//! \brief The maximum key length used by the algorithm provided as a constant
-	//! \details MAX_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(MAX_KEYLENGTH=N)
-	//! \brief The default key length used by the algorithm provided as a constant
-	//! \details DEFAULT_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH=N)
-	//! \brief The default IV requirements for the algorithm provided as a constant
-	//! \details The default value is NOT_RESYNCHRONIZABLE. See IV_Requirement
-	//!  in cryptlib.h for allowed values.
-	CRYPTOPP_CONSTANT(IV_REQUIREMENT = IV_REQ)
-	//! \brief The default IV length used by the algorithm provided as a constant
-	//! \details IV_LENGTH is provided in bytes, not bits. The default implementation uses 0.
-	CRYPTOPP_CONSTANT(IV_LENGTH = IV_L)
-	//! \brief The default key length for the algorithm provided by a static function.
-	//! \param keylength the size of the key, in bytes
-	//! \details The default implementation returns KEYLENGTH. keylength is unused
-	//!   in the default implementation.
-	CRYPTOPP_CONSTEXPR static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength)
-	{
-		// Comma operator breaks Debug builds with GCC 4.0 - 4.6.
-		// Also see http://github.com/weidai11/cryptopp/issues/255
-#if defined(CRYPTOPP_CXX11_CONSTEXPR)
-		return CRYPTOPP_UNUSED(keylength), static_cast<size_t>(KEYLENGTH);
-#else
-		CRYPTOPP_UNUSED(keylength);
-		return static_cast<size_t>(KEYLENGTH);
-#endif
-	}
-};
-
-//! \class VariableKeyLength
-//! \brief Inherited by keyed algorithms with variable key length
-//! \tparam D Default key length, in bytes
-//! \tparam N Minimum key length, in bytes
-//! \tparam M Maximum key length, in bytes
-//! \tparam M Default key length multiple, in bytes. The default multiple is 1.
-//! \tparam IV_REQ the \ref SimpleKeyingInterface::IV_Requirement "IV requirements"
-//! \tparam IV_L default IV length, in bytes. The default length is 0.
-//! \sa SimpleKeyingInterface
-template <unsigned int D, unsigned int N, unsigned int M, unsigned int Q = 1, unsigned int IV_REQ = SimpleKeyingInterface::NOT_RESYNCHRONIZABLE, unsigned int IV_L = 0>
-class VariableKeyLength
-{
-	// Make these private to avoid Doxygen documenting them in all derived classes
-	CRYPTOPP_COMPILE_ASSERT(Q > 0);
-	CRYPTOPP_COMPILE_ASSERT(N % Q == 0);
-	CRYPTOPP_COMPILE_ASSERT(M % Q == 0);
-	CRYPTOPP_COMPILE_ASSERT(N < M);
-	CRYPTOPP_COMPILE_ASSERT(D >= N);
-	CRYPTOPP_COMPILE_ASSERT(M >= D);
-
-public:
-	//! \brief The minimum key length used by the algorithm provided as a constant
-	//! \details MIN_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(MIN_KEYLENGTH=N)
-	//! \brief The maximum key length used by the algorithm provided as a constant
-	//! \details MAX_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(MAX_KEYLENGTH=M)
-	//! \brief The default key length used by the algorithm provided as a constant
-	//! \details DEFAULT_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH=D)
-	//! \brief The key length multiple used by the algorithm provided as a constant
-	//! \details MAX_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(KEYLENGTH_MULTIPLE=Q)
-	//! \brief The default IV requirements for the algorithm provided as a constant
-	//! \details The default value is NOT_RESYNCHRONIZABLE. See IV_Requirement
-	//!  in cryptlib.h for allowed values.
-	CRYPTOPP_CONSTANT(IV_REQUIREMENT=IV_REQ)
-	//! \brief The default initialization vector length for the algorithm provided as a constant
-	//! \details IV_LENGTH is provided in bytes, not bits. The default implementation uses 0.
-	CRYPTOPP_CONSTANT(IV_LENGTH=IV_L)
-	//! \brief Provides a valid key length for the algorithm provided by a static function.
-	//! \param keylength the size of the key, in bytes
-	//! \details If keylength is less than MIN_KEYLENGTH, then the function returns
-	//!   MIN_KEYLENGTH. If keylength is greater than MAX_KEYLENGTH, then the function
-	//!   returns MAX_KEYLENGTH. If keylength is a multiple of KEYLENGTH_MULTIPLE,
-	//!   then keylength is returned. Otherwise, the function returns keylength rounded
-	//!   \a down to the next smaller multiple of KEYLENGTH_MULTIPLE.
-	//! \details keylength is provided in bytes, not bits.
-	// TODO: Figure out how to make this CRYPTOPP_CONSTEXPR
-	static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength)
-	{
-		if (keylength < (size_t)MIN_KEYLENGTH)
-			return MIN_KEYLENGTH;
-		else if (keylength > (size_t)MAX_KEYLENGTH)
-			return (size_t)MAX_KEYLENGTH;
-		else
-		{
-			keylength += KEYLENGTH_MULTIPLE-1;
-			return keylength - keylength%KEYLENGTH_MULTIPLE;
-		}
-	}
-};
-
-//! \class SameKeyLengthAs
-//! \brief Provides key lengths based on another class's key length
-//! \tparam T another FixedKeyLength or VariableKeyLength class
-//! \tparam IV_REQ the \ref SimpleKeyingInterface::IV_Requirement "IV requirements"
-//! \tparam IV_L default IV length, in bytes
-//! \sa SimpleKeyingInterface
-template <class T, unsigned int IV_REQ = SimpleKeyingInterface::NOT_RESYNCHRONIZABLE, unsigned int IV_L = 0>
-class SameKeyLengthAs
-{
-public:
-	//! \brief The minimum key length used by the algorithm provided as a constant
-	//! \details MIN_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(MIN_KEYLENGTH=T::MIN_KEYLENGTH)
-	//! \brief The maximum key length used by the algorithm provided as a constant
-	//! \details MIN_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(MAX_KEYLENGTH=T::MAX_KEYLENGTH)
-	//! \brief The default key length used by the algorithm provided as a constant
-	//! \details MIN_KEYLENGTH is provided in bytes, not bits
-	CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH=T::DEFAULT_KEYLENGTH)
-	//! \brief The default IV requirements for the algorithm provided as a constant
-	//! \details The default value is NOT_RESYNCHRONIZABLE. See IV_Requirement
-	//!  in cryptlib.h for allowed values.
-	CRYPTOPP_CONSTANT(IV_REQUIREMENT=IV_REQ)
-	//! \brief The default initialization vector length for the algorithm provided as a constant
-	//! \details IV_LENGTH is provided in bytes, not bits. The default implementation uses 0.
-	CRYPTOPP_CONSTANT(IV_LENGTH=IV_L)
-	//! \brief Provides a valid key length for the algorithm provided by a static function.
-	//! \param keylength the size of the key, in bytes
-	//! \details If keylength is less than MIN_KEYLENGTH, then the function returns
-	//!   MIN_KEYLENGTH. If keylength is greater than MAX_KEYLENGTH, then the function
-	//!   returns MAX_KEYLENGTH. If keylength is a multiple of KEYLENGTH_MULTIPLE,
-	//!   then keylength is returned. Otherwise, the function returns keylength rounded
-	//!   \a down to the next smaller multiple of KEYLENGTH_MULTIPLE.
-	//! \details keylength is provided in bytes, not bits.
-	CRYPTOPP_CONSTEXPR static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength)
-		{return T::StaticGetValidKeyLength(keylength);}
-};
-
-// ************** implementation helper for SimpleKeyingInterface ***************
-
-//! \class SimpleKeyingInterfaceImpl
-//! \brief Provides a base implementation of SimpleKeyingInterface
-//! \tparam BASE a SimpleKeyingInterface derived class
-//! \tparam INFO a SimpleKeyingInterface derived class
-//! \details SimpleKeyingInterfaceImpl() provides a default implementation for ciphers providing a keying interface.
-//!   Functions are virtual and not eligible for C++11 <tt>constexpr</tt>-ness.
-//! \sa Algorithm(), SimpleKeyingInterface()
-template <class BASE, class INFO = BASE>
-class CRYPTOPP_NO_VTABLE SimpleKeyingInterfaceImpl : public BASE
-{
-public:
-	//! \brief The minimum key length used by the algorithm
-	//! \returns minimum key length used by the algorithm, in bytes
-	size_t MinKeyLength() const
-		{return INFO::MIN_KEYLENGTH;}
-
-	//! \brief The maximum key length used by the algorithm
-	//! \returns maximum key length used by the algorithm, in bytes
-	size_t MaxKeyLength() const
-		{return (size_t)INFO::MAX_KEYLENGTH;}
-
-	//! \brief The default key length used by the algorithm
-	//! \returns default key length used by the algorithm, in bytes
-	size_t DefaultKeyLength() const
-		{return INFO::DEFAULT_KEYLENGTH;}
-
-	//! \brief Provides a valid key length for the algorithm
-	//! \param keylength the size of the key, in bytes
-	//! \returns the valid key lenght, in bytes
-	//! \details keylength is provided in bytes, not bits. If keylength is less than MIN_KEYLENGTH,
-	//!   then the function returns MIN_KEYLENGTH. If keylength is greater than MAX_KEYLENGTH,
-	//!   then the function returns MAX_KEYLENGTH. if If keylength is a multiple of KEYLENGTH_MULTIPLE,
-	//!   then keylength is returned. Otherwise, the function returns a \a lower multiple of
-	//!   KEYLENGTH_MULTIPLE.
-	size_t GetValidKeyLength(size_t keylength) const {return INFO::StaticGetValidKeyLength(keylength);}
-
-	//! \brief The default IV requirements for the algorithm
-	//! \details The default value is NOT_RESYNCHRONIZABLE. See IV_Requirement
-	//!  in cryptlib.h for allowed values.
-	SimpleKeyingInterface::IV_Requirement IVRequirement() const
-		{return (SimpleKeyingInterface::IV_Requirement)INFO::IV_REQUIREMENT;}
-
-	//! \brief The default initialization vector length for the algorithm
-	//! \details IVSize is provided in bytes, not bits. The default implementation uses IV_LENGTH, which is 0.
-	unsigned int IVSize() const
-		{return INFO::IV_LENGTH;}
-};
-
-//! \class BlockCipherImpl
-//! \brief Provides a base implementation of Algorithm and SimpleKeyingInterface for block ciphers
-//! \tparam INFO a SimpleKeyingInterface derived class
-//! \tparam BASE a SimpleKeyingInterface derived class
-//! \details BlockCipherImpl() provides a default implementation for block ciphers using AlgorithmImpl()
-//!   and SimpleKeyingInterfaceImpl(). Functions are virtual and not eligible for C++11 <tt>constexpr</tt>-ness.
-//! \sa Algorithm(), SimpleKeyingInterface(), AlgorithmImpl(), SimpleKeyingInterfaceImpl()
-template <class INFO, class BASE = BlockCipher>
-class CRYPTOPP_NO_VTABLE BlockCipherImpl : public AlgorithmImpl<SimpleKeyingInterfaceImpl<TwoBases<BASE, INFO> > >
-{
-public:
-	//! Provides the block size of the algorithm
-	//! \returns the block size of the algorithm, in bytes
-	unsigned int BlockSize() const {return this->BLOCKSIZE;}
-};
-
-//! \class BlockCipherFinal
-//! \brief Provides class member functions to key a block cipher
-//! \tparam DIR a CipherDir
-//! \tparam BASE a BlockCipherImpl derived class
-template <CipherDir DIR, class BASE>
-class BlockCipherFinal : public ClonableImpl<BlockCipherFinal<DIR, BASE>, BASE>
-{
-public:
-	//! \brief Construct a default BlockCipherFinal
-	//! \details The cipher is not keyed.
- 	BlockCipherFinal() {}
-
-	//! \brief Construct a BlockCipherFinal
-	//! \param key a byte array used to key the cipher
-	//! \details key must be at least DEFAULT_KEYLENGTH in length. Internally, the function calls
-	//!    SimpleKeyingInterface::SetKey.
-	BlockCipherFinal(const byte *key)
-		{this->SetKey(key, this->DEFAULT_KEYLENGTH);}
-
-	//! \brief Construct a BlockCipherFinal
-	//! \param key a byte array used to key the cipher
-	//! \param length the length of the byte array
-	//! \details key must be at least DEFAULT_KEYLENGTH in length. Internally, the function calls
-	//!    SimpleKeyingInterface::SetKey.
-	BlockCipherFinal(const byte *key, size_t length)
-		{this->SetKey(key, length);}
-
-	//! \brief Construct a BlockCipherFinal
-	//! \param key a byte array used to key the cipher
-	//! \param length the length of the byte array
-	//! \param rounds the number of rounds
-	//! \details key must be at least DEFAULT_KEYLENGTH in length. Internally, the function calls
-	//!    SimpleKeyingInterface::SetKeyWithRounds.
-	BlockCipherFinal(const byte *key, size_t length, unsigned int rounds)
-		{this->SetKeyWithRounds(key, length, rounds);}
-
-	//! \brief Provides the direction of the cipher
-	//! \returns true if DIR is ENCRYPTION, false otherwise
-	//! \sa GetCipherDirection(), IsPermutation()
-	bool IsForwardTransformation() const {return DIR == ENCRYPTION;}
-};
-
-//! \class MessageAuthenticationCodeImpl
-//! \brief Provides a base implementation of Algorithm and SimpleKeyingInterface for message authentication codes
-//! \tparam INFO a SimpleKeyingInterface derived class
-//! \tparam BASE a SimpleKeyingInterface derived class
-//! \details MessageAuthenticationCodeImpl() provides a default implementation for message authentication codes
-//!   using AlgorithmImpl() and SimpleKeyingInterfaceImpl(). Functions are virtual and not subject to C++11
-//!   <tt>constexpr</tt>.
-//! \sa Algorithm(), SimpleKeyingInterface(), AlgorithmImpl(), SimpleKeyingInterfaceImpl()
-template <class BASE, class INFO = BASE>
-class MessageAuthenticationCodeImpl : public AlgorithmImpl<SimpleKeyingInterfaceImpl<BASE, INFO>, INFO>
-{
-};
-
-//! \class MessageAuthenticationCodeFinal
-//! \brief Provides class member functions to key a message authentication code
-//! \tparam DIR a CipherDir
-//! \tparam BASE a BlockCipherImpl derived class
-template <class BASE>
-class MessageAuthenticationCodeFinal : public ClonableImpl<MessageAuthenticationCodeFinal<BASE>, MessageAuthenticationCodeImpl<BASE> >
-{
-public:
-	//! \brief Construct a default MessageAuthenticationCodeFinal
-	//! \details The message authentication code is not keyed.
- 	MessageAuthenticationCodeFinal() {}
-	//! \brief Construct a BlockCipherFinal
-	//! \param key a byte array used to key the algorithm
-	//! \details key must be at least DEFAULT_KEYLENGTH in length. Internally, the function calls
-	//!    SimpleKeyingInterface::SetKey.
-	MessageAuthenticationCodeFinal(const byte *key)
-		{this->SetKey(key, this->DEFAULT_KEYLENGTH);}
-	//! \brief Construct a BlockCipherFinal
-	//! \param key a byte array used to key the algorithm
-	//! \param length the length of the byte array
-	//! \details key must be at least DEFAULT_KEYLENGTH in length. Internally, the function calls
-	//!    SimpleKeyingInterface::SetKey.
-	MessageAuthenticationCodeFinal(const byte *key, size_t length)
-		{this->SetKey(key, length);}
-};
-
-// ************** documentation ***************
-
-//! \class BlockCipherDocumentation
-//! \brief Provides Encryption and Decryption typedefs used by derived classes to
-//!    implement a block cipher
-//! \details These objects usually should not be used directly. See CipherModeDocumentation
-//!    instead. Each class derived from this one defines two types, Encryption and Decryption,
-//!    both of which implement the BlockCipher interface.
-struct BlockCipherDocumentation
-{
-	//! implements the BlockCipher interface
-	typedef BlockCipher Encryption;
-	//! implements the BlockCipher interface
-	typedef BlockCipher Decryption;
-};
-
-//! \class SymmetricCipherDocumentation
-//! \brief Provides Encryption and Decryption typedefs used by derived classes to
-//!    implement a symmetric cipher
-//! \details Each class derived from this one defines two types, Encryption and Decryption,
-//!    both of which implement the SymmetricCipher interface. Two types of classes derive
-//!    from this class: stream ciphers and block cipher modes. Stream ciphers can be used
-//!    alone, cipher mode classes need to be used with a block cipher. See CipherModeDocumentation
-//!    for more for information about using cipher modes and block ciphers.
-struct SymmetricCipherDocumentation
-{
-	//! implements the SymmetricCipher interface
-	typedef SymmetricCipher Encryption;
-	//! implements the SymmetricCipher interface
-	typedef SymmetricCipher Decryption;
-};
-
-//! \class AuthenticatedSymmetricCipherDocumentation
-//! \brief Provides Encryption and Decryption typedefs used by derived classes to
-//!    implement an authenticated encryption cipher
-//! \details Each class derived from this one defines two types, Encryption and Decryption,
-//!    both of which implement the AuthenticatedSymmetricCipher interface.
-struct AuthenticatedSymmetricCipherDocumentation
-{
-	//! implements the AuthenticatedSymmetricCipher interface
-	typedef AuthenticatedSymmetricCipher Encryption;
-	//! implements the AuthenticatedSymmetricCipher interface
-	typedef AuthenticatedSymmetricCipher Decryption;
-};
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/serpent.cpp b/src-cryptopp/serpent.cpp
deleted file mode 100644
index 3f8b275..0000000
--- a/src-cryptopp/serpent.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// serpent.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#include "serpent.h"
-#include "secblock.h"
-#include "misc.h"
-
-#include "serpentp.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-void Serpent_KeySchedule(word32 *k, unsigned int rounds, const byte *userKey, size_t keylen)
-{
-	FixedSizeSecBlock<word32, 8> k0;
-	GetUserKey(LITTLE_ENDIAN_ORDER, k0.begin(), 8, userKey, keylen);
-	if (keylen < 32)
-		k0[keylen/4] |= word32(1) << ((keylen%4)*8);
-
-	word32 t = k0[7];
-	unsigned int i;
-	for (i = 0; i < 8; ++i)
-		k[i] = k0[i] = t = rotlFixed(k0[i] ^ k0[(i+3)%8] ^ k0[(i+5)%8] ^ t ^ 0x9e3779b9 ^ i, 11);
-	for (i = 8; i < 4*(rounds+1); ++i)
-		k[i] = t = rotlFixed(k[i-8] ^ k[i-5] ^ k[i-3] ^ t ^ 0x9e3779b9 ^ i, 11);
-	k -= 20;
-
-	word32 a,b,c,d,e;
-	for (i=0; i<rounds/8; i++)
-	{
-		afterS2(LK); afterS2(S3); afterS3(SK);
-		afterS1(LK); afterS1(S2); afterS2(SK);
-		afterS0(LK); afterS0(S1); afterS1(SK);
-		beforeS0(LK); beforeS0(S0); afterS0(SK);
-		k += 8*4;
-		afterS6(LK); afterS6(S7); afterS7(SK);
-		afterS5(LK); afterS5(S6); afterS6(SK);
-		afterS4(LK); afterS4(S5); afterS5(SK);
-		afterS3(LK); afterS3(S4); afterS4(SK);
-	}
-	afterS2(LK); afterS2(S3); afterS3(SK);
-}
-
-void Serpent::Base::UncheckedSetKey(const byte *userKey, unsigned int keylen, const NameValuePairs &)
-{
-	AssertValidKeyLength(keylen);
-	Serpent_KeySchedule(m_key, 32, userKey, keylen);
-}
-
-typedef BlockGetAndPut<word32, LittleEndian> Block;
-
-void Serpent::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-{
-	word32 a, b, c, d, e;
-
-	Block::Get(inBlock)(a)(b)(c)(d);
-
-	const word32 *k = m_key;
-	unsigned int i=1;
-
-	do
-	{
-		beforeS0(KX); beforeS0(S0); afterS0(LT);
-		afterS0(KX); afterS0(S1); afterS1(LT);
-		afterS1(KX); afterS1(S2); afterS2(LT);
-		afterS2(KX); afterS2(S3); afterS3(LT);
-		afterS3(KX); afterS3(S4); afterS4(LT);
-		afterS4(KX); afterS4(S5); afterS5(LT);
-		afterS5(KX); afterS5(S6); afterS6(LT);
-		afterS6(KX); afterS6(S7);
-
-		if (i == 4)
-			break;
-
-		++i;
-		c = b;
-		b = e;
-		e = d;
-		d = a;
-		a = e;
-		k += 32;
-		beforeS0(LT);
-	}
-	while (true);
-
-	afterS7(KX);
-
-	Block::Put(xorBlock, outBlock)(d)(e)(b)(a);
-}
-
-void Serpent::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-{
-	word32 a, b, c, d, e;
-
-	Block::Get(inBlock)(a)(b)(c)(d);
-
-	const word32 *k = m_key + 96;
-	unsigned int i=4;
-
-	beforeI7(KX);
-	goto start;
-
-	do
-	{
-		c = b;
-		b = d;
-		d = e;
-		k -= 32;
-		beforeI7(ILT);
-start:
-		            beforeI7(I7); afterI7(KX);
-		afterI7(ILT); afterI7(I6); afterI6(KX);
-		afterI6(ILT); afterI6(I5); afterI5(KX);
-		afterI5(ILT); afterI5(I4); afterI4(KX);
-		afterI4(ILT); afterI4(I3); afterI3(KX);
-		afterI3(ILT); afterI3(I2); afterI2(KX);
-		afterI2(ILT); afterI2(I1); afterI1(KX);
-		afterI1(ILT); afterI1(I0); afterI0(KX);
-	}
-	while (--i != 0);
-
-	Block::Put(xorBlock, outBlock)(a)(d)(b)(e);
-}
-
-NAMESPACE_END
diff --git a/src-cryptopp/serpent.h b/src-cryptopp/serpent.h
deleted file mode 100644
index 501ef0a..0000000
--- a/src-cryptopp/serpent.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// serpent.h - written and placed in the public domain by Wei Dai
-
-//! \file serpent.h
-//! \brief Classes for the Serpent block cipher
-
-#ifndef CRYPTOPP_SERPENT_H
-#define CRYPTOPP_SERPENT_H
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class Serpent_Info
-//! \brief Serpent block cipher information
-struct Serpent_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 32, 8>, public FixedRounds<32>
-{
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "Serpent";}
-};
-
-//! \class Serpent
-//! \brief Serpent block cipher
-/// \sa <a href="http://www.weidai.com/scan-mirror/cs.html#Serpent">Serpent</a>
-class Serpent : public Serpent_Info, public BlockCipherDocumentation
-{
-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Serpent_Info>
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-
-	protected:
-		FixedSizeSecBlock<word32, 33*4> m_key;
-	};
-
-	class CRYPTOPP_NO_VTABLE Enc : public Base
-	{
-	public:
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-	};
-
-	class CRYPTOPP_NO_VTABLE Dec : public Base
-	{
-	public:
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-	};
-
-public:
-	typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;
-	typedef BlockCipherFinal<DECRYPTION, Dec> Decryption;
-};
-
-typedef Serpent::Encryption SerpentEncryption;
-typedef Serpent::Decryption SerpentDecryption;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/serpentp.h b/src-cryptopp/serpentp.h
deleted file mode 100644
index a38b39a..0000000
--- a/src-cryptopp/serpentp.h
+++ /dev/null
@@ -1,434 +0,0 @@
-// private header for Serpent and Sosemanuk
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// linear transformation
-#define LT(i,a,b,c,d,e)	{\
-	a = rotlFixed(a, 13);	\
-	c = rotlFixed(c, 3); 	\
-	d = rotlFixed(d ^ c ^ (a << 3), 7); 	\
-	b = rotlFixed(b ^ a ^ c, 1); 	\
-	a = rotlFixed(a ^ b ^ d, 5); 		\
-	c = rotlFixed(c ^ d ^ (b << 7), 22);}
-
-// inverse linear transformation
-#define ILT(i,a,b,c,d,e)	{\
-	c = rotrFixed(c, 22);	\
-	a = rotrFixed(a, 5); 	\
-	c ^= d ^ (b << 7);	\
-	a ^= b ^ d; 		\
-	b = rotrFixed(b, 1); 	\
-	d = rotrFixed(d, 7) ^ c ^ (a << 3);	\
-	b ^= a ^ c; 		\
-	c = rotrFixed(c, 3); 	\
-	a = rotrFixed(a, 13);}
-
-// order of output from S-box functions
-#define beforeS0(f) f(0,a,b,c,d,e)
-#define afterS0(f) f(1,b,e,c,a,d)
-#define afterS1(f) f(2,c,b,a,e,d)
-#define afterS2(f) f(3,a,e,b,d,c)
-#define afterS3(f) f(4,e,b,d,c,a)
-#define afterS4(f) f(5,b,a,e,c,d)
-#define afterS5(f) f(6,a,c,b,e,d)
-#define afterS6(f) f(7,a,c,d,b,e)
-#define afterS7(f) f(8,d,e,b,a,c)
-
-// order of output from inverse S-box functions
-#define beforeI7(f) f(8,a,b,c,d,e)
-#define afterI7(f) f(7,d,a,b,e,c)
-#define afterI6(f) f(6,a,b,c,e,d)
-#define afterI5(f) f(5,b,d,e,c,a)
-#define afterI4(f) f(4,b,c,e,a,d)
-#define afterI3(f) f(3,a,b,e,c,d)
-#define afterI2(f) f(2,b,d,e,c,a)
-#define afterI1(f) f(1,a,b,c,e,d)
-#define afterI0(f) f(0,a,d,b,e,c)
-
-// The instruction sequences for the S-box functions
-// come from Dag Arne Osvik's paper "Speeding up Serpent".
-
-#define S0(i, r0, r1, r2, r3, r4) \
-       {           \
-    r3 ^= r0;   \
-    r4 = r1;   \
-    r1 &= r3;   \
-    r4 ^= r2;   \
-    r1 ^= r0;   \
-    r0 |= r3;   \
-    r0 ^= r4;   \
-    r4 ^= r3;   \
-    r3 ^= r2;   \
-    r2 |= r1;   \
-    r2 ^= r4;   \
-    r4 = ~r4;      \
-    r4 |= r1;   \
-    r1 ^= r3;   \
-    r1 ^= r4;   \
-    r3 |= r0;   \
-    r1 ^= r3;   \
-    r4 ^= r3;   \
-            }
-
-#define I0(i, r0, r1, r2, r3, r4) \
-       {           \
-    r2 = ~r2;      \
-    r4 = r1;   \
-    r1 |= r0;   \
-    r4 = ~r4;      \
-    r1 ^= r2;   \
-    r2 |= r4;   \
-    r1 ^= r3;   \
-    r0 ^= r4;   \
-    r2 ^= r0;   \
-    r0 &= r3;   \
-    r4 ^= r0;   \
-    r0 |= r1;   \
-    r0 ^= r2;   \
-    r3 ^= r4;   \
-    r2 ^= r1;   \
-    r3 ^= r0;   \
-    r3 ^= r1;   \
-    r2 &= r3;   \
-    r4 ^= r2;   \
-            }
-
-#define S1(i, r0, r1, r2, r3, r4) \
-       {           \
-    r0 = ~r0;      \
-    r2 = ~r2;      \
-    r4 = r0;   \
-    r0 &= r1;   \
-    r2 ^= r0;   \
-    r0 |= r3;   \
-    r3 ^= r2;   \
-    r1 ^= r0;   \
-    r0 ^= r4;   \
-    r4 |= r1;   \
-    r1 ^= r3;   \
-    r2 |= r0;   \
-    r2 &= r4;   \
-    r0 ^= r1;   \
-    r1 &= r2;   \
-    r1 ^= r0;   \
-    r0 &= r2;   \
-    r0 ^= r4;   \
-            }
-
-#define I1(i, r0, r1, r2, r3, r4) \
-       {           \
-    r4 = r1;   \
-    r1 ^= r3;   \
-    r3 &= r1;   \
-    r4 ^= r2;   \
-    r3 ^= r0;   \
-    r0 |= r1;   \
-    r2 ^= r3;   \
-    r0 ^= r4;   \
-    r0 |= r2;   \
-    r1 ^= r3;   \
-    r0 ^= r1;   \
-    r1 |= r3;   \
-    r1 ^= r0;   \
-    r4 = ~r4;      \
-    r4 ^= r1;   \
-    r1 |= r0;   \
-    r1 ^= r0;   \
-    r1 |= r4;   \
-    r3 ^= r1;   \
-            }
-
-#define S2(i, r0, r1, r2, r3, r4) \
-       {           \
-    r4 = r0;   \
-    r0 &= r2;   \
-    r0 ^= r3;   \
-    r2 ^= r1;   \
-    r2 ^= r0;   \
-    r3 |= r4;   \
-    r3 ^= r1;   \
-    r4 ^= r2;   \
-    r1 = r3;   \
-    r3 |= r4;   \
-    r3 ^= r0;   \
-    r0 &= r1;   \
-    r4 ^= r0;   \
-    r1 ^= r3;   \
-    r1 ^= r4;   \
-    r4 = ~r4;      \
-            }
-
-#define I2(i, r0, r1, r2, r3, r4) \
-       {           \
-    r2 ^= r3;   \
-    r3 ^= r0;   \
-    r4 = r3;   \
-    r3 &= r2;   \
-    r3 ^= r1;   \
-    r1 |= r2;   \
-    r1 ^= r4;   \
-    r4 &= r3;   \
-    r2 ^= r3;   \
-    r4 &= r0;   \
-    r4 ^= r2;   \
-    r2 &= r1;   \
-    r2 |= r0;   \
-    r3 = ~r3;      \
-    r2 ^= r3;   \
-    r0 ^= r3;   \
-    r0 &= r1;   \
-    r3 ^= r4;   \
-    r3 ^= r0;   \
-            }
-
-#define S3(i, r0, r1, r2, r3, r4) \
-       {           \
-    r4 = r0;   \
-    r0 |= r3;   \
-    r3 ^= r1;   \
-    r1 &= r4;   \
-    r4 ^= r2;   \
-    r2 ^= r3;   \
-    r3 &= r0;   \
-    r4 |= r1;   \
-    r3 ^= r4;   \
-    r0 ^= r1;   \
-    r4 &= r0;   \
-    r1 ^= r3;   \
-    r4 ^= r2;   \
-    r1 |= r0;   \
-    r1 ^= r2;   \
-    r0 ^= r3;   \
-    r2 = r1;   \
-    r1 |= r3;   \
-    r1 ^= r0;   \
-            }
-
-#define I3(i, r0, r1, r2, r3, r4) \
-       {           \
-    r4 = r2;   \
-    r2 ^= r1;   \
-    r1 &= r2;   \
-    r1 ^= r0;   \
-    r0 &= r4;   \
-    r4 ^= r3;   \
-    r3 |= r1;   \
-    r3 ^= r2;   \
-    r0 ^= r4;   \
-    r2 ^= r0;   \
-    r0 |= r3;   \
-    r0 ^= r1;   \
-    r4 ^= r2;   \
-    r2 &= r3;   \
-    r1 |= r3;   \
-    r1 ^= r2;   \
-    r4 ^= r0;   \
-    r2 ^= r4;   \
-            }
-
-#define S4(i, r0, r1, r2, r3, r4) \
-       {           \
-    r1 ^= r3;   \
-    r3 = ~r3;      \
-    r2 ^= r3;   \
-    r3 ^= r0;   \
-    r4 = r1;   \
-    r1 &= r3;   \
-    r1 ^= r2;   \
-    r4 ^= r3;   \
-    r0 ^= r4;   \
-    r2 &= r4;   \
-    r2 ^= r0;   \
-    r0 &= r1;   \
-    r3 ^= r0;   \
-    r4 |= r1;   \
-    r4 ^= r0;   \
-    r0 |= r3;   \
-    r0 ^= r2;   \
-    r2 &= r3;   \
-    r0 = ~r0;      \
-    r4 ^= r2;   \
-            }
-
-#define I4(i, r0, r1, r2, r3, r4) \
-       {           \
-    r4 = r2;   \
-    r2 &= r3;   \
-    r2 ^= r1;   \
-    r1 |= r3;   \
-    r1 &= r0;   \
-    r4 ^= r2;   \
-    r4 ^= r1;   \
-    r1 &= r2;   \
-    r0 = ~r0;      \
-    r3 ^= r4;   \
-    r1 ^= r3;   \
-    r3 &= r0;   \
-    r3 ^= r2;   \
-    r0 ^= r1;   \
-    r2 &= r0;   \
-    r3 ^= r0;   \
-    r2 ^= r4;   \
-    r2 |= r3;   \
-    r3 ^= r0;   \
-    r2 ^= r1;   \
-            }
-
-#define S5(i, r0, r1, r2, r3, r4) \
-       {           \
-    r0 ^= r1;   \
-    r1 ^= r3;   \
-    r3 = ~r3;      \
-    r4 = r1;   \
-    r1 &= r0;   \
-    r2 ^= r3;   \
-    r1 ^= r2;   \
-    r2 |= r4;   \
-    r4 ^= r3;   \
-    r3 &= r1;   \
-    r3 ^= r0;   \
-    r4 ^= r1;   \
-    r4 ^= r2;   \
-    r2 ^= r0;   \
-    r0 &= r3;   \
-    r2 = ~r2;      \
-    r0 ^= r4;   \
-    r4 |= r3;   \
-    r2 ^= r4;   \
-            }
-
-#define I5(i, r0, r1, r2, r3, r4) \
-       {           \
-    r1 = ~r1;      \
-    r4 = r3;   \
-    r2 ^= r1;   \
-    r3 |= r0;   \
-    r3 ^= r2;   \
-    r2 |= r1;   \
-    r2 &= r0;   \
-    r4 ^= r3;   \
-    r2 ^= r4;   \
-    r4 |= r0;   \
-    r4 ^= r1;   \
-    r1 &= r2;   \
-    r1 ^= r3;   \
-    r4 ^= r2;   \
-    r3 &= r4;   \
-    r4 ^= r1;   \
-    r3 ^= r0;   \
-    r3 ^= r4;   \
-    r4 = ~r4;      \
-            }
-
-#define S6(i, r0, r1, r2, r3, r4) \
-       {           \
-    r2 = ~r2;      \
-    r4 = r3;   \
-    r3 &= r0;   \
-    r0 ^= r4;   \
-    r3 ^= r2;   \
-    r2 |= r4;   \
-    r1 ^= r3;   \
-    r2 ^= r0;   \
-    r0 |= r1;   \
-    r2 ^= r1;   \
-    r4 ^= r0;   \
-    r0 |= r3;   \
-    r0 ^= r2;   \
-    r4 ^= r3;   \
-    r4 ^= r0;   \
-    r3 = ~r3;      \
-    r2 &= r4;   \
-    r2 ^= r3;   \
-            }
-
-#define I6(i, r0, r1, r2, r3, r4) \
-       {           \
-    r0 ^= r2;   \
-    r4 = r2;   \
-    r2 &= r0;   \
-    r4 ^= r3;   \
-    r2 = ~r2;      \
-    r3 ^= r1;   \
-    r2 ^= r3;   \
-    r4 |= r0;   \
-    r0 ^= r2;   \
-    r3 ^= r4;   \
-    r4 ^= r1;   \
-    r1 &= r3;   \
-    r1 ^= r0;   \
-    r0 ^= r3;   \
-    r0 |= r2;   \
-    r3 ^= r1;   \
-    r4 ^= r0;   \
-            }
-
-#define S7(i, r0, r1, r2, r3, r4) \
-       {           \
-    r4 = r2;   \
-    r2 &= r1;   \
-    r2 ^= r3;   \
-    r3 &= r1;   \
-    r4 ^= r2;   \
-    r2 ^= r1;   \
-    r1 ^= r0;   \
-    r0 |= r4;   \
-    r0 ^= r2;   \
-    r3 ^= r1;   \
-    r2 ^= r3;   \
-    r3 &= r0;   \
-    r3 ^= r4;   \
-    r4 ^= r2;   \
-    r2 &= r0;   \
-    r4 = ~r4;      \
-    r2 ^= r4;   \
-    r4 &= r0;   \
-    r1 ^= r3;   \
-    r4 ^= r1;   \
-            }
-
-#define I7(i, r0, r1, r2, r3, r4) \
-       {           \
-    r4 = r2;   \
-    r2 ^= r0;   \
-    r0 &= r3;   \
-    r2 = ~r2;      \
-    r4 |= r3;   \
-    r3 ^= r1;   \
-    r1 |= r0;   \
-    r0 ^= r2;   \
-    r2 &= r4;   \
-    r1 ^= r2;   \
-    r2 ^= r0;   \
-    r0 |= r2;   \
-    r3 &= r4;   \
-    r0 ^= r3;   \
-    r4 ^= r1;   \
-    r3 ^= r4;   \
-    r4 |= r0;   \
-    r3 ^= r2;   \
-    r4 ^= r2;   \
-            }
-
-// key xor
-#define KX(r, a, b, c, d, e)	{\
-	a ^= k[4 * r + 0]; \
-	b ^= k[4 * r + 1]; \
-	c ^= k[4 * r + 2]; \
-	d ^= k[4 * r + 3];}
-
-#define LK(r, a, b, c, d, e)	{\
-	a = k[(8-r)*4 + 0];		\
-	b = k[(8-r)*4 + 1];		\
-	c = k[(8-r)*4 + 2];		\
-	d = k[(8-r)*4 + 3];}
-
-#define SK(r, a, b, c, d, e)	{\
-	k[(8-r)*4 + 4] = a;		\
-	k[(8-r)*4 + 5] = b;		\
-	k[(8-r)*4 + 6] = c;		\
-	k[(8-r)*4 + 7] = d;}
-
-void Serpent_KeySchedule(word32 *k, unsigned int rounds, const byte *userKey, size_t keylen);
-
-NAMESPACE_END
diff --git a/src-cryptopp/sha.cpp b/src-cryptopp/sha.cpp
deleted file mode 100644
index 441a5c6..0000000
--- a/src-cryptopp/sha.cpp
+++ /dev/null
@@ -1,941 +0,0 @@
-// sha.cpp - modified by Wei Dai from Steve Reid's public domain sha1.c
-
-// Steve Reid implemented SHA-1. Wei Dai implemented SHA-2.
-// Both are in the public domain.
-
-// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM sha.cpp" to generate MASM code
-
-#include "pch.h"
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4100 4731)
-#endif
-
-#ifndef CRYPTOPP_IMPORTS
-#ifndef CRYPTOPP_GENERATE_X64_MASM
-
-#include "secblock.h"
-#include "sha.h"
-#include "misc.h"
-#include "cpu.h"
-
-#if defined(CRYPTOPP_DISABLE_SHA_ASM)
-# undef CRYPTOPP_X86_ASM_AVAILABLE
-# undef CRYPTOPP_X32_ASM_AVAILABLE
-# undef CRYPTOPP_X64_ASM_AVAILABLE
-# undef CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// start of Steve Reid's code
-
-#define blk0(i) (W[i] = data[i])
-#define blk1(i) (W[i&15] = rotlFixed(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1))
-
-void SHA1::InitState(HashWordType *state)
-{
-	state[0] = 0x67452301L;
-	state[1] = 0xEFCDAB89L;
-	state[2] = 0x98BADCFEL;
-	state[3] = 0x10325476L;
-	state[4] = 0xC3D2E1F0L;
-}
-
-#define f1(x,y,z) (z^(x&(y^z)))
-#define f2(x,y,z) (x^y^z)
-#define f3(x,y,z) ((x&y)|(z&(x|y)))
-#define f4(x,y,z) (x^y^z)
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=f1(w,x,y)+blk0(i)+0x5A827999+rotlFixed(v,5);w=rotlFixed(w,30);
-#define R1(v,w,x,y,z,i) z+=f1(w,x,y)+blk1(i)+0x5A827999+rotlFixed(v,5);w=rotlFixed(w,30);
-#define R2(v,w,x,y,z,i) z+=f2(w,x,y)+blk1(i)+0x6ED9EBA1+rotlFixed(v,5);w=rotlFixed(w,30);
-#define R3(v,w,x,y,z,i) z+=f3(w,x,y)+blk1(i)+0x8F1BBCDC+rotlFixed(v,5);w=rotlFixed(w,30);
-#define R4(v,w,x,y,z,i) z+=f4(w,x,y)+blk1(i)+0xCA62C1D6+rotlFixed(v,5);w=rotlFixed(w,30);
-
-void SHA1::Transform(word32 *state, const word32 *data)
-{
-	word32 W[16];
-    /* Copy context->state[] to working vars */
-    word32 a = state[0];
-    word32 b = state[1];
-    word32 c = state[2];
-    word32 d = state[3];
-    word32 e = state[4];
-    /* 4 rounds of 20 operations each. Loop unrolled. */
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-    /* Add the working vars back into context.state[] */
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    state[4] += e;
-}
-
-// end of Steve Reid's code
-
-// *************************************************************
-
-void SHA224::InitState(HashWordType *state)
-{
-	static const word32 s[8] = {0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4};
-	memcpy(state, s, sizeof(s));
-}
-
-void SHA256::InitState(HashWordType *state)
-{
-	static const word32 s[8] = {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
-	memcpy(state, s, sizeof(s));
-}
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-CRYPTOPP_ALIGN_DATA(16) extern const word32 SHA256_K[64] CRYPTOPP_SECTION_ALIGN16 = {
-#else
-extern const word32 SHA256_K[64] = {
-#endif
-	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
-	0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-	0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-	0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-	0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
-	0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
-	0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-	0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-	0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-	0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
-	0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
-	0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-	0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-};
-
-#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM
-
-#if (defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_GENERATE_X64_MASM))
-
-static void CRYPTOPP_FASTCALL X86_SHA256_HashBlocks(word32 *state, const word32 *data, size_t len
-#if defined(_MSC_VER) && (_MSC_VER == 1200)
-	, ...	// VC60 workaround: prevent VC 6 from inlining this function
-#endif
-	)
-{
-#if defined(_MSC_VER) && (_MSC_VER == 1200)
-	AS2(mov ecx, [state])
-	AS2(mov edx, [data])
-#endif
-
-	#define LOCALS_SIZE	8*4 + 16*4 + 4*WORD_SZ
-	#define H(i)		[BASE+ASM_MOD(1024+7-(i),8)*4]
-	#define G(i)		H(i+1)
-	#define F(i)		H(i+2)
-	#define E(i)		H(i+3)
-	#define D(i)		H(i+4)
-	#define C(i)		H(i+5)
-	#define B(i)		H(i+6)
-	#define A(i)		H(i+7)
-	#define Wt(i)		BASE+8*4+ASM_MOD(1024+15-(i),16)*4
-	#define Wt_2(i)		Wt((i)-2)
-	#define Wt_15(i)	Wt((i)-15)
-	#define Wt_7(i)		Wt((i)-7)
-	#define K_END		[BASE+8*4+16*4+0*WORD_SZ]
-	#define STATE_SAVE	[BASE+8*4+16*4+1*WORD_SZ]
-	#define DATA_SAVE	[BASE+8*4+16*4+2*WORD_SZ]
-	#define DATA_END	[BASE+8*4+16*4+3*WORD_SZ]
-	#define Kt(i)		WORD_REG(si)+(i)*4
-#if CRYPTOPP_BOOL_X32
-	#define BASE		esp+8
-#elif CRYPTOPP_BOOL_X86
-	#define BASE		esp+4
-#elif defined(__GNUC__)
-	#define BASE		r8
-#else
-	#define BASE		rsp
-#endif
-
-#define RA0(i, edx, edi)		\
-	AS2(	add edx, [Kt(i)]	)\
-	AS2(	add edx, [Wt(i)]	)\
-	AS2(	add edx, H(i)		)\
-
-#define RA1(i, edx, edi)
-
-#define RB0(i, edx, edi)
-
-#define RB1(i, edx, edi)	\
-	AS2(	mov AS_REG_7d, [Wt_2(i)]	)\
-	AS2(	mov edi, [Wt_15(i)])\
-	AS2(	mov ebx, AS_REG_7d	)\
-	AS2(	shr AS_REG_7d, 10		)\
-	AS2(	ror ebx, 17		)\
-	AS2(	xor AS_REG_7d, ebx	)\
-	AS2(	ror ebx, 2		)\
-	AS2(	xor ebx, AS_REG_7d	)/* s1(W_t-2) */\
-	AS2(	add ebx, [Wt_7(i)])\
-	AS2(	mov AS_REG_7d, edi	)\
-	AS2(	shr AS_REG_7d, 3		)\
-	AS2(	ror edi, 7		)\
-	AS2(	add ebx, [Wt(i)])/* s1(W_t-2) + W_t-7 + W_t-16 */\
-	AS2(	xor AS_REG_7d, edi	)\
-	AS2(	add edx, [Kt(i)])\
-	AS2(	ror edi, 11		)\
-	AS2(	add edx, H(i)	)\
-	AS2(	xor AS_REG_7d, edi	)/* s0(W_t-15) */\
-	AS2(	add AS_REG_7d, ebx	)/* W_t = s1(W_t-2) + W_t-7 + s0(W_t-15) W_t-16*/\
-	AS2(	mov [Wt(i)], AS_REG_7d)\
-	AS2(	add edx, AS_REG_7d	)\
-
-#define ROUND(i, r, eax, ecx, edi, edx)\
-	/* in: edi = E	*/\
-	/* unused: eax, ecx, temp: ebx, AS_REG_7d, out: edx = T1 */\
-	AS2(	mov edx, F(i)	)\
-	AS2(	xor edx, G(i)	)\
-	AS2(	and edx, edi	)\
-	AS2(	xor edx, G(i)	)/* Ch(E,F,G) = (G^(E&(F^G))) */\
-	AS2(	mov AS_REG_7d, edi	)\
-	AS2(	ror edi, 6		)\
-	AS2(	ror AS_REG_7d, 25		)\
-	RA##r(i, edx, edi		)/* H + Wt + Kt + Ch(E,F,G) */\
-	AS2(	xor AS_REG_7d, edi	)\
-	AS2(	ror edi, 5		)\
-	AS2(	xor AS_REG_7d, edi	)/* S1(E) */\
-	AS2(	add edx, AS_REG_7d	)/* T1 = S1(E) + Ch(E,F,G) + H + Wt + Kt */\
-	RB##r(i, edx, edi		)/* H + Wt + Kt + Ch(E,F,G) */\
-	/* in: ecx = A, eax = B^C, edx = T1 */\
-	/* unused: edx, temp: ebx, AS_REG_7d, out: eax = A, ecx = B^C, edx = E */\
-	AS2(	mov ebx, ecx	)\
-	AS2(	xor ecx, B(i)	)/* A^B */\
-	AS2(	and eax, ecx	)\
-	AS2(	xor eax, B(i)	)/* Maj(A,B,C) = B^((A^B)&(B^C) */\
-	AS2(	mov AS_REG_7d, ebx	)\
-	AS2(	ror ebx, 2		)\
-	AS2(	add eax, edx	)/* T1 + Maj(A,B,C) */\
-	AS2(	add edx, D(i)	)\
-	AS2(	mov D(i), edx	)\
-	AS2(	ror AS_REG_7d, 22		)\
-	AS2(	xor AS_REG_7d, ebx	)\
-	AS2(	ror ebx, 11		)\
-	AS2(	xor AS_REG_7d, ebx	)\
-	AS2(	add eax, AS_REG_7d	)/* T1 + S0(A) + Maj(A,B,C) */\
-	AS2(	mov H(i), eax	)\
-
-// Unroll the use of CRYPTOPP_BOOL_X64 in assembler math. The GAS assembler on X32 (version 2.25)
-//   complains "Error: invalid operands (*ABS* and *UND* sections) for `*` and `-`"
-#if CRYPTOPP_BOOL_X64
-#define SWAP_COPY(i)		\
-	AS2(	mov		WORD_REG(bx), [WORD_REG(dx)+i*WORD_SZ])\
-	AS1(	bswap	WORD_REG(bx))\
-	AS2(	mov		[Wt(i*2+1)], WORD_REG(bx))
-#else // X86 and X32
-#define SWAP_COPY(i)		\
-	AS2(	mov		WORD_REG(bx), [WORD_REG(dx)+i*WORD_SZ])\
-	AS1(	bswap	WORD_REG(bx))\
-	AS2(	mov		[Wt(i)], WORD_REG(bx))
-#endif
-
-#if defined(__GNUC__)
-	#if CRYPTOPP_BOOL_X64
-		FixedSizeAlignedSecBlock<byte, LOCALS_SIZE> workspace;
-	#endif
-	__asm__ __volatile__
-	(
-	#if CRYPTOPP_BOOL_X64
-		"lea %4, %%r8;"
-	#endif
-	INTEL_NOPREFIX
-#elif defined(CRYPTOPP_GENERATE_X64_MASM)
-		ALIGN   8
-	X86_SHA256_HashBlocks	PROC FRAME
-		rex_push_reg rsi
-		push_reg rdi
-		push_reg rbx
-		push_reg rbp
-		alloc_stack(LOCALS_SIZE+8)
-		.endprolog
-		mov rdi, r8
-		lea rsi, [?SHA256_K@CryptoPP@@3QBIB + 48*4]
-#endif
-
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	#ifndef __GNUC__
-		AS2(	mov		edi, [len])
-		AS2(	lea		WORD_REG(si), [SHA256_K+48*4])
-	#endif
-	#if !defined(_MSC_VER) || (_MSC_VER < 1400)
-		AS_PUSH_IF86(bx)
-	#endif
-
-	AS_PUSH_IF86(bp)
-	AS2(	mov		ebx, esp)
-	AS2(	and		esp, -16)
-	AS2(	sub		WORD_REG(sp), LOCALS_SIZE)
-	AS_PUSH_IF86(bx)
-#endif
-	AS2(	mov		STATE_SAVE, WORD_REG(cx))
-	AS2(	mov		DATA_SAVE, WORD_REG(dx))
-	AS2(	lea		WORD_REG(ax), [WORD_REG(di) + WORD_REG(dx)])
-	AS2(	mov		DATA_END, WORD_REG(ax))
-	AS2(	mov		K_END, WORD_REG(si))
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	AS2(	test	edi, 1)
-	ASJ(	jnz,	2, f)
-	AS1(	dec		DWORD PTR K_END)
-#endif
-	AS2(	movdqa	xmm0, XMMWORD_PTR [WORD_REG(cx)+0*16])
-	AS2(	movdqa	xmm1, XMMWORD_PTR [WORD_REG(cx)+1*16])
-#endif
-
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-	ASJ(	jmp,	0, f)
-#endif
-	ASL(2)	// non-SSE2
-	AS2(	mov		esi, ecx)
-	AS2(	lea		edi, A(0))
-	AS2(	mov		ecx, 8)
-ATT_NOPREFIX
-	AS1(	rep movsd)
-INTEL_NOPREFIX
-	AS2(	mov		esi, K_END)
-	ASJ(	jmp,	3, f)
-#endif
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-	ASL(0)
-	AS2(	movdqa	E(0), xmm1)
-	AS2(	movdqa	A(0), xmm0)
-#endif
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	ASL(3)
-#endif
-	AS2(	sub		WORD_REG(si), 48*4)
-	SWAP_COPY(0)	SWAP_COPY(1)	SWAP_COPY(2)	SWAP_COPY(3)
-	SWAP_COPY(4)	SWAP_COPY(5)	SWAP_COPY(6)	SWAP_COPY(7)
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	SWAP_COPY(8)	SWAP_COPY(9)	SWAP_COPY(10)	SWAP_COPY(11)
-	SWAP_COPY(12)	SWAP_COPY(13)	SWAP_COPY(14)	SWAP_COPY(15)
-#endif
-	AS2(	mov		edi, E(0))	// E
-	AS2(	mov		eax, B(0))	// B
-	AS2(	xor		eax, C(0))	// B^C
-	AS2(	mov		ecx, A(0))	// A
-
-	ROUND(0, 0, eax, ecx, edi, edx)
-	ROUND(1, 0, ecx, eax, edx, edi)
-	ROUND(2, 0, eax, ecx, edi, edx)
-	ROUND(3, 0, ecx, eax, edx, edi)
-	ROUND(4, 0, eax, ecx, edi, edx)
-	ROUND(5, 0, ecx, eax, edx, edi)
-	ROUND(6, 0, eax, ecx, edi, edx)
-	ROUND(7, 0, ecx, eax, edx, edi)
-	ROUND(8, 0, eax, ecx, edi, edx)
-	ROUND(9, 0, ecx, eax, edx, edi)
-	ROUND(10, 0, eax, ecx, edi, edx)
-	ROUND(11, 0, ecx, eax, edx, edi)
-	ROUND(12, 0, eax, ecx, edi, edx)
-	ROUND(13, 0, ecx, eax, edx, edi)
-	ROUND(14, 0, eax, ecx, edi, edx)
-	ROUND(15, 0, ecx, eax, edx, edi)
-
-	ASL(1)
-	AS2(add WORD_REG(si), 4*16)
-	ROUND(0, 1, eax, ecx, edi, edx)
-	ROUND(1, 1, ecx, eax, edx, edi)
-	ROUND(2, 1, eax, ecx, edi, edx)
-	ROUND(3, 1, ecx, eax, edx, edi)
-	ROUND(4, 1, eax, ecx, edi, edx)
-	ROUND(5, 1, ecx, eax, edx, edi)
-	ROUND(6, 1, eax, ecx, edi, edx)
-	ROUND(7, 1, ecx, eax, edx, edi)
-	ROUND(8, 1, eax, ecx, edi, edx)
-	ROUND(9, 1, ecx, eax, edx, edi)
-	ROUND(10, 1, eax, ecx, edi, edx)
-	ROUND(11, 1, ecx, eax, edx, edi)
-	ROUND(12, 1, eax, ecx, edi, edx)
-	ROUND(13, 1, ecx, eax, edx, edi)
-	ROUND(14, 1, eax, ecx, edi, edx)
-	ROUND(15, 1, ecx, eax, edx, edi)
-	AS2(	cmp		WORD_REG(si), K_END)
-	ATT_NOPREFIX
-	ASJ(	jb,		1, b)
-	INTEL_NOPREFIX
-
-	AS2(	mov		WORD_REG(dx), DATA_SAVE)
-	AS2(	add		WORD_REG(dx), 64)
-	AS2(	mov		AS_REG_7, STATE_SAVE)
-	AS2(	mov		DATA_SAVE, WORD_REG(dx))
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-	AS2(	test	DWORD PTR K_END, 1)
-	ASJ(	jz,		4, f)
-#endif
-	AS2(	movdqa	xmm1, XMMWORD_PTR [AS_REG_7+1*16])
-	AS2(	movdqa	xmm0, XMMWORD_PTR [AS_REG_7+0*16])
-	AS2(	paddd	xmm1, E(0))
-	AS2(	paddd	xmm0, A(0))
-	AS2(	movdqa	[AS_REG_7+1*16], xmm1)
-	AS2(	movdqa	[AS_REG_7+0*16], xmm0)
-	AS2(	cmp		WORD_REG(dx), DATA_END)
-	ATT_NOPREFIX
-	ASJ(	jb,		0, b)
-	INTEL_NOPREFIX
-#endif
-
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-	ASJ(	jmp,	5, f)
-	ASL(4)	// non-SSE2
-#endif
-	AS2(	add		[AS_REG_7+0*4], ecx)	// A
-	AS2(	add		[AS_REG_7+4*4], edi)	// E
-	AS2(	mov		eax, B(0))
-	AS2(	mov		ebx, C(0))
-	AS2(	mov		ecx, D(0))
-	AS2(	add		[AS_REG_7+1*4], eax)
-	AS2(	add		[AS_REG_7+2*4], ebx)
-	AS2(	add		[AS_REG_7+3*4], ecx)
-	AS2(	mov		eax, F(0))
-	AS2(	mov		ebx, G(0))
-	AS2(	mov		ecx, H(0))
-	AS2(	add		[AS_REG_7+5*4], eax)
-	AS2(	add		[AS_REG_7+6*4], ebx)
-	AS2(	add		[AS_REG_7+7*4], ecx)
-	AS2(	mov		ecx, AS_REG_7d)
-	AS2(	cmp		WORD_REG(dx), DATA_END)
-	ASJ(	jb,		2, b)
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-	ASL(5)
-#endif
-#endif
-
-	AS_POP_IF86(sp)
-	AS_POP_IF86(bp)
-	#if !defined(_MSC_VER) || (_MSC_VER < 1400)
-		AS_POP_IF86(bx)
-	#endif
-
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-	add		rsp, LOCALS_SIZE+8
-	pop		rbp
-	pop		rbx
-	pop		rdi
-	pop		rsi
-	ret
-	X86_SHA256_HashBlocks ENDP
-#endif
-
-#ifdef __GNUC__
-	ATT_PREFIX
-	:
-	: "c" (state), "d" (data), "S" (SHA256_K+48), "D" (len)
-	#if CRYPTOPP_BOOL_X64
-		, "m" (workspace[0])
-	#endif
-	: "memory", "cc", "%eax"
-	#if CRYPTOPP_BOOL_X64
-		, "%rbx", "%r8", "%r10"
-	#endif
-	);
-#endif
-}
-
-#endif	// (defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_GENERATE_X64_MASM))
-
-#ifndef CRYPTOPP_GENERATE_X64_MASM
-
-#ifdef CRYPTOPP_X64_MASM_AVAILABLE
-extern "C" {
-void CRYPTOPP_FASTCALL X86_SHA256_HashBlocks(word32 *state, const word32 *data, size_t len);
-}
-#endif
-
-#if (defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_SHA_ASM)
-
-size_t SHA256::HashMultipleBlocks(const word32 *input, size_t length)
-{
-	X86_SHA256_HashBlocks(m_state, input, (length&(size_t(0)-BLOCKSIZE)) - !HasSSE2());
-	return length % BLOCKSIZE;
-}
-
-size_t SHA224::HashMultipleBlocks(const word32 *input, size_t length)
-{
-	X86_SHA256_HashBlocks(m_state, input, (length&(size_t(0)-BLOCKSIZE)) - !HasSSE2());
-	return length % BLOCKSIZE;
-}
-
-#endif
-
-#define blk2(i) (W[i&15]+=s1(W[(i-2)&15])+W[(i-7)&15]+s0(W[(i-15)&15]))
-
-#define Ch(x,y,z) (z^(x&(y^z)))
-#define Maj(x,y,z) (y^((x^y)&(y^z)))
-
-#define a(i) T[(0-i)&7]
-#define b(i) T[(1-i)&7]
-#define c(i) T[(2-i)&7]
-#define d(i) T[(3-i)&7]
-#define e(i) T[(4-i)&7]
-#define f(i) T[(5-i)&7]
-#define g(i) T[(6-i)&7]
-#define h(i) T[(7-i)&7]
-
-#define R(i) h(i)+=S1(e(i))+Ch(e(i),f(i),g(i))+SHA256_K[i+j]+(j?blk2(i):blk0(i));\
-	d(i)+=h(i);h(i)+=S0(a(i))+Maj(a(i),b(i),c(i))
-
-// for SHA256
-#define S0(x) (rotrFixed(x,2)^rotrFixed(x,13)^rotrFixed(x,22))
-#define S1(x) (rotrFixed(x,6)^rotrFixed(x,11)^rotrFixed(x,25))
-#define s0(x) (rotrFixed(x,7)^rotrFixed(x,18)^(x>>3))
-#define s1(x) (rotrFixed(x,17)^rotrFixed(x,19)^(x>>10))
-
-// Smaller but slower
-#if defined(__OPTIMIZE_SIZE__)
-void SHA256::Transform(word32 *state, const word32 *data)
-{
-	word32 T[20];
-	word32 W[32];
-	unsigned int i = 0, j = 0;
-	word32 *t = T+8;
-
-	memcpy(t, state, 8*4);
-	word32 e = t[4], a = t[0];
-
-	do
-	{
-		word32 w = data[j];
-		W[j] = w;
-		w += SHA256_K[j];
-		w += t[7];
-		w += S1(e);
-		w += Ch(e, t[5], t[6]);
-		e = t[3] + w;
-		t[3] = t[3+8] = e;
-		w += S0(t[0]);
-		a = w + Maj(a, t[1], t[2]);
-		t[-1] = t[7] = a;
-		--t;
-		++j;
-		if (j%8 == 0)
-			t += 8;
-	} while (j<16);
-
-	do
-	{
-		i = j&0xf;
-		word32 w = s1(W[i+16-2]) + s0(W[i+16-15]) + W[i] + W[i+16-7];
-		W[i+16] = W[i] = w;
-		w += SHA256_K[j];
-		w += t[7];
-		w += S1(e);
-		w += Ch(e, t[5], t[6]);
-		e = t[3] + w;
-		t[3] = t[3+8] = e;
-		w += S0(t[0]);
-		a = w + Maj(a, t[1], t[2]);
-		t[-1] = t[7] = a;
-
-		w = s1(W[(i+1)+16-2]) + s0(W[(i+1)+16-15]) + W[(i+1)] + W[(i+1)+16-7];
-		W[(i+1)+16] = W[(i+1)] = w;
-		w += SHA256_K[j+1];
-		w += (t-1)[7];
-		w += S1(e);
-		w += Ch(e, (t-1)[5], (t-1)[6]);
-		e = (t-1)[3] + w;
-		(t-1)[3] = (t-1)[3+8] = e;
-		w += S0((t-1)[0]);
-		a = w + Maj(a, (t-1)[1], (t-1)[2]);
-		(t-1)[-1] = (t-1)[7] = a;
-
-		t-=2;
-		j+=2;
-		if (j%8 == 0)
-			t += 8;
-	} while (j<64);
-
-    state[0] += a;
-    state[1] += t[1];
-    state[2] += t[2];
-    state[3] += t[3];
-    state[4] += e;
-    state[5] += t[5];
-    state[6] += t[6];
-    state[7] += t[7];
-}
-#else
-void SHA256::Transform(word32 *state, const word32 *data)
-{
-	word32 W[16];
-#if (defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_SHA_ASM)
-	// this byte reverse is a waste of time, but this function is only called by MDC
-	ByteReverse(W, data, BLOCKSIZE);
-	X86_SHA256_HashBlocks(state, W, BLOCKSIZE - !HasSSE2());
-#else
-	word32 T[8];
-    /* Copy context->state[] to working vars */
-	memcpy(T, state, sizeof(T));
-    /* 64 operations, partially loop unrolled */
-	for (unsigned int j=0; j<64; j+=16)
-	{
-		R( 0); R( 1); R( 2); R( 3);
-		R( 4); R( 5); R( 6); R( 7);
-		R( 8); R( 9); R(10); R(11);
-		R(12); R(13); R(14); R(15);
-	}
-    /* Add the working vars back into context.state[] */
-    state[0] += a(0);
-    state[1] += b(0);
-    state[2] += c(0);
-    state[3] += d(0);
-    state[4] += e(0);
-    state[5] += f(0);
-    state[6] += g(0);
-    state[7] += h(0);
-#endif
-}
-#endif
-
-#undef S0
-#undef S1
-#undef s0
-#undef s1
-#undef R
-
-// *************************************************************
-
-void SHA384::InitState(HashWordType *state)
-{
-	static const word64 s[8] = {
-		W64LIT(0xcbbb9d5dc1059ed8), W64LIT(0x629a292a367cd507),
-		W64LIT(0x9159015a3070dd17), W64LIT(0x152fecd8f70e5939),
-		W64LIT(0x67332667ffc00b31), W64LIT(0x8eb44a8768581511),
-		W64LIT(0xdb0c2e0d64f98fa7), W64LIT(0x47b5481dbefa4fa4)};
-	memcpy(state, s, sizeof(s));
-}
-
-void SHA512::InitState(HashWordType *state)
-{
-	static const word64 s[8] = {
-		W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b),
-		W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1),
-		W64LIT(0x510e527fade682d1), W64LIT(0x9b05688c2b3e6c1f),
-		W64LIT(0x1f83d9abfb41bd6b), W64LIT(0x5be0cd19137e2179)};
-	memcpy(state, s, sizeof(s));
-}
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32)
-CRYPTOPP_ALIGN_DATA(16) static const word64 SHA512_K[80] CRYPTOPP_SECTION_ALIGN16 = {
-#else
-CRYPTOPP_ALIGN_DATA(16) static const word64 SHA512_K[80] CRYPTOPP_SECTION_ALIGN16 = {
-#endif
-	W64LIT(0x428a2f98d728ae22), W64LIT(0x7137449123ef65cd),
-	W64LIT(0xb5c0fbcfec4d3b2f), W64LIT(0xe9b5dba58189dbbc),
-	W64LIT(0x3956c25bf348b538), W64LIT(0x59f111f1b605d019),
-	W64LIT(0x923f82a4af194f9b), W64LIT(0xab1c5ed5da6d8118),
-	W64LIT(0xd807aa98a3030242), W64LIT(0x12835b0145706fbe),
-	W64LIT(0x243185be4ee4b28c), W64LIT(0x550c7dc3d5ffb4e2),
-	W64LIT(0x72be5d74f27b896f), W64LIT(0x80deb1fe3b1696b1),
-	W64LIT(0x9bdc06a725c71235), W64LIT(0xc19bf174cf692694),
-	W64LIT(0xe49b69c19ef14ad2), W64LIT(0xefbe4786384f25e3),
-	W64LIT(0x0fc19dc68b8cd5b5), W64LIT(0x240ca1cc77ac9c65),
-	W64LIT(0x2de92c6f592b0275), W64LIT(0x4a7484aa6ea6e483),
-	W64LIT(0x5cb0a9dcbd41fbd4), W64LIT(0x76f988da831153b5),
-	W64LIT(0x983e5152ee66dfab), W64LIT(0xa831c66d2db43210),
-	W64LIT(0xb00327c898fb213f), W64LIT(0xbf597fc7beef0ee4),
-	W64LIT(0xc6e00bf33da88fc2), W64LIT(0xd5a79147930aa725),
-	W64LIT(0x06ca6351e003826f), W64LIT(0x142929670a0e6e70),
-	W64LIT(0x27b70a8546d22ffc), W64LIT(0x2e1b21385c26c926),
-	W64LIT(0x4d2c6dfc5ac42aed), W64LIT(0x53380d139d95b3df),
-	W64LIT(0x650a73548baf63de), W64LIT(0x766a0abb3c77b2a8),
-	W64LIT(0x81c2c92e47edaee6), W64LIT(0x92722c851482353b),
-	W64LIT(0xa2bfe8a14cf10364), W64LIT(0xa81a664bbc423001),
-	W64LIT(0xc24b8b70d0f89791), W64LIT(0xc76c51a30654be30),
-	W64LIT(0xd192e819d6ef5218), W64LIT(0xd69906245565a910),
-	W64LIT(0xf40e35855771202a), W64LIT(0x106aa07032bbd1b8),
-	W64LIT(0x19a4c116b8d2d0c8), W64LIT(0x1e376c085141ab53),
-	W64LIT(0x2748774cdf8eeb99), W64LIT(0x34b0bcb5e19b48a8),
-	W64LIT(0x391c0cb3c5c95a63), W64LIT(0x4ed8aa4ae3418acb),
-	W64LIT(0x5b9cca4f7763e373), W64LIT(0x682e6ff3d6b2b8a3),
-	W64LIT(0x748f82ee5defb2fc), W64LIT(0x78a5636f43172f60),
-	W64LIT(0x84c87814a1f0ab72), W64LIT(0x8cc702081a6439ec),
-	W64LIT(0x90befffa23631e28), W64LIT(0xa4506cebde82bde9),
-	W64LIT(0xbef9a3f7b2c67915), W64LIT(0xc67178f2e372532b),
-	W64LIT(0xca273eceea26619c), W64LIT(0xd186b8c721c0c207),
-	W64LIT(0xeada7dd6cde0eb1e), W64LIT(0xf57d4f7fee6ed178),
-	W64LIT(0x06f067aa72176fba), W64LIT(0x0a637dc5a2c898a6),
-	W64LIT(0x113f9804bef90dae), W64LIT(0x1b710b35131c471b),
-	W64LIT(0x28db77f523047d84), W64LIT(0x32caab7b40c72493),
-	W64LIT(0x3c9ebe0a15c9bebc), W64LIT(0x431d67c49c100d4c),
-	W64LIT(0x4cc5d4becb3e42b6), W64LIT(0x597f299cfc657e2a),
-	W64LIT(0x5fcb6fab3ad6faec), W64LIT(0x6c44198c4a475817)
-};
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32)
-// put assembly version in separate function, otherwise MSVC 2005 SP1 doesn't generate correct code for the non-assembly version
-CRYPTOPP_NAKED static void CRYPTOPP_FASTCALL SHA512_SSE2_Transform(word64 *state, const word64 *data)
-{
-#ifdef __GNUC__
-	__asm__ __volatile__
-	(
-	INTEL_NOPREFIX
-	AS_PUSH_IF86(	bx)
-	AS2(	mov		ebx, eax)
-#else
-	AS1(	push	ebx)
-	AS1(	push	esi)
-	AS1(	push	edi)
-	AS2(	lea		ebx, SHA512_K)
-#endif
-
-	AS2(	mov		eax, esp)
-	AS2(	and		esp, 0xfffffff0)
-	AS2(	sub		esp, 27*16)				// 17*16 for expanded data, 20*8 for state
-	AS_PUSH_IF86(	ax)
-	AS2(	xor		eax, eax)
-
-#if CRYPTOPP_BOOL_X32
-	AS2(	lea		edi, [esp+8+8*8])		// start at middle of state buffer. will decrement pointer each round to avoid copying
-	AS2(	lea		esi, [esp+8+20*8+8])	// 16-byte alignment, then add 8
-#else
-	AS2(	lea		edi, [esp+4+8*8])		// start at middle of state buffer. will decrement pointer each round to avoid copying
-	AS2(	lea		esi, [esp+4+20*8+8])	// 16-byte alignment, then add 8
-#endif
-
-	AS2(	movdqa	xmm0, [ecx+0*16])
-	AS2(	movdq2q	mm4, xmm0)
-	AS2(	movdqa	[edi+0*16], xmm0)
-	AS2(	movdqa	xmm0, [ecx+1*16])
-	AS2(	movdqa	[edi+1*16], xmm0)
-	AS2(	movdqa	xmm0, [ecx+2*16])
-	AS2(	movdq2q	mm5, xmm0)
-	AS2(	movdqa	[edi+2*16], xmm0)
-	AS2(	movdqa	xmm0, [ecx+3*16])
-	AS2(	movdqa	[edi+3*16], xmm0)
-	ASJ(	jmp,	0, f)
-
-#define SSE2_S0_S1(r, a, b, c)	\
-	AS2(	movq	mm6, r)\
-	AS2(	psrlq	r, a)\
-	AS2(	movq	mm7, r)\
-	AS2(	psllq	mm6, 64-c)\
-	AS2(	pxor	mm7, mm6)\
-	AS2(	psrlq	r, b-a)\
-	AS2(	pxor	mm7, r)\
-	AS2(	psllq	mm6, c-b)\
-	AS2(	pxor	mm7, mm6)\
-	AS2(	psrlq	r, c-b)\
-	AS2(	pxor	r, mm7)\
-	AS2(	psllq	mm6, b-a)\
-	AS2(	pxor	r, mm6)
-
-#define SSE2_s0(r, a, b, c)	\
-	AS2(	movdqa	xmm6, r)\
-	AS2(	psrlq	r, a)\
-	AS2(	movdqa	xmm7, r)\
-	AS2(	psllq	xmm6, 64-c)\
-	AS2(	pxor	xmm7, xmm6)\
-	AS2(	psrlq	r, b-a)\
-	AS2(	pxor	xmm7, r)\
-	AS2(	psrlq	r, c-b)\
-	AS2(	pxor	r, xmm7)\
-	AS2(	psllq	xmm6, c-a)\
-	AS2(	pxor	r, xmm6)
-
-#define SSE2_s1(r, a, b, c)	\
-	AS2(	movdqa	xmm6, r)\
-	AS2(	psrlq	r, a)\
-	AS2(	movdqa	xmm7, r)\
-	AS2(	psllq	xmm6, 64-c)\
-	AS2(	pxor	xmm7, xmm6)\
-	AS2(	psrlq	r, b-a)\
-	AS2(	pxor	xmm7, r)\
-	AS2(	psllq	xmm6, c-b)\
-	AS2(	pxor	xmm7, xmm6)\
-	AS2(	psrlq	r, c-b)\
-	AS2(	pxor	r, xmm7)
-
-	ASL(SHA512_Round)
-	// k + w is in mm0, a is in mm4, e is in mm5
-	AS2(	paddq	mm0, [edi+7*8])		// h
-	AS2(	movq	mm2, [edi+5*8])		// f
-	AS2(	movq	mm3, [edi+6*8])		// g
-	AS2(	pxor	mm2, mm3)
-	AS2(	pand	mm2, mm5)
-	SSE2_S0_S1(mm5,14,18,41)
-	AS2(	pxor	mm2, mm3)
-	AS2(	paddq	mm0, mm2)			// h += Ch(e,f,g)
-	AS2(	paddq	mm5, mm0)			// h += S1(e)
-	AS2(	movq	mm2, [edi+1*8])		// b
-	AS2(	movq	mm1, mm2)
-	AS2(	por		mm2, mm4)
-	AS2(	pand	mm2, [edi+2*8])		// c
-	AS2(	pand	mm1, mm4)
-	AS2(	por		mm1, mm2)
-	AS2(	paddq	mm1, mm5)			// temp = h + Maj(a,b,c)
-	AS2(	paddq	mm5, [edi+3*8])		// e = d + h
-	AS2(	movq	[edi+3*8], mm5)
-	AS2(	movq	[edi+11*8], mm5)
-	SSE2_S0_S1(mm4,28,34,39)			// S0(a)
-	AS2(	paddq	mm4, mm1)			// a = temp + S0(a)
-	AS2(	movq	[edi-8], mm4)
-	AS2(	movq	[edi+7*8], mm4)
-	AS1(	ret)
-
-	// first 16 rounds
-	ASL(0)
-	AS2(	movq	mm0, [edx+eax*8])
-	AS2(	movq	[esi+eax*8], mm0)
-	AS2(	movq	[esi+eax*8+16*8], mm0)
-	AS2(	paddq	mm0, [ebx+eax*8])
-	ASC(	call,	SHA512_Round)
-	AS1(	inc		eax)
-	AS2(	sub		edi, 8)
-	AS2(	test	eax, 7)
-	ASJ(	jnz,	0, b)
-	AS2(	add		edi, 8*8)
-	AS2(	cmp		eax, 16)
-	ASJ(	jne,	0, b)
-
-	// rest of the rounds
-	AS2(	movdqu	xmm0, [esi+(16-2)*8])
-	ASL(1)
-	// data expansion, W[i-2] already in xmm0
-	AS2(	movdqu	xmm3, [esi])
-	AS2(	paddq	xmm3, [esi+(16-7)*8])
-	AS2(	movdqa	xmm2, [esi+(16-15)*8])
-	SSE2_s1(xmm0, 6, 19, 61)
-	AS2(	paddq	xmm0, xmm3)
-	SSE2_s0(xmm2, 1, 7, 8)
-	AS2(	paddq	xmm0, xmm2)
-	AS2(	movdq2q	mm0, xmm0)
-	AS2(	movhlps	xmm1, xmm0)
-	AS2(	paddq	mm0, [ebx+eax*8])
-	AS2(	movlps	[esi], xmm0)
-	AS2(	movlps	[esi+8], xmm1)
-	AS2(	movlps	[esi+8*16], xmm0)
-	AS2(	movlps	[esi+8*17], xmm1)
-	// 2 rounds
-	ASC(	call,	SHA512_Round)
-	AS2(	sub		edi, 8)
-	AS2(	movdq2q	mm0, xmm1)
-	AS2(	paddq	mm0, [ebx+eax*8+8])
-	ASC(	call,	SHA512_Round)
-	// update indices and loop
-	AS2(	add		esi, 16)
-	AS2(	add		eax, 2)
-	AS2(	sub		edi, 8)
-	AS2(	test	eax, 7)
-	ASJ(	jnz,	1, b)
-	// do housekeeping every 8 rounds
-	AS2(	mov		esi, 0xf)
-	AS2(	and		esi, eax)
-#if CRYPTOPP_BOOL_X32
-	AS2(	lea		esi, [esp+8+20*8+8+esi*8])
-#else
-	AS2(	lea		esi, [esp+4+20*8+8+esi*8])
-#endif
-	AS2(	add		edi, 8*8)
-	AS2(	cmp		eax, 80)
-	ASJ(	jne,	1, b)
-
-#define SSE2_CombineState(i)	\
-	AS2(	movdqa	xmm0, [edi+i*16])\
-	AS2(	paddq	xmm0, [ecx+i*16])\
-	AS2(	movdqa	[ecx+i*16], xmm0)
-
-	SSE2_CombineState(0)
-	SSE2_CombineState(1)
-	SSE2_CombineState(2)
-	SSE2_CombineState(3)
-
-	AS_POP_IF86(	sp)
-	AS1(	emms)
-
-#if defined(__GNUC__)
-	AS_POP_IF86(	bx)
-	ATT_PREFIX
-		:
-		: "a" (SHA512_K), "c" (state), "d" (data)
-		: "%esi", "%edi", "memory", "cc"
-	);
-#else
-	AS1(	pop		edi)
-	AS1(	pop		esi)
-	AS1(	pop		ebx)
-	AS1(	ret)
-#endif
-}
-#endif	// #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-
-void SHA512::Transform(word64 *state, const word64 *data)
-{
-	CRYPTOPP_ASSERT(IsAlignedOn(state, GetAlignmentOf<word64>()));
-	CRYPTOPP_ASSERT(IsAlignedOn(data, GetAlignmentOf<word64>()));
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32)
-	if (HasSSE2())
-	{
-		SHA512_SSE2_Transform(state, data);
-		return;
-	}
-#endif
-
-#define S0(x) (rotrFixed(x,28)^rotrFixed(x,34)^rotrFixed(x,39))
-#define S1(x) (rotrFixed(x,14)^rotrFixed(x,18)^rotrFixed(x,41))
-#define s0(x) (rotrFixed(x,1)^rotrFixed(x,8)^(x>>7))
-#define s1(x) (rotrFixed(x,19)^rotrFixed(x,61)^(x>>6))
-
-#define R(i) h(i)+=S1(e(i))+Ch(e(i),f(i),g(i))+SHA512_K[i+j]+(j?blk2(i):blk0(i));\
-	d(i)+=h(i);h(i)+=S0(a(i))+Maj(a(i),b(i),c(i))
-
-	word64 W[16];
-	word64 T[8];
-    /* Copy context->state[] to working vars */
-	memcpy(T, state, sizeof(T));
-    /* 80 operations, partially loop unrolled */
-	for (unsigned int j=0; j<80; j+=16)
-	{
-		R( 0); R( 1); R( 2); R( 3);
-		R( 4); R( 5); R( 6); R( 7);
-		R( 8); R( 9); R(10); R(11);
-		R(12); R(13); R(14); R(15);
-	}
-    /* Add the working vars back into context.state[] */
-    state[0] += a(0);
-    state[1] += b(0);
-    state[2] += c(0);
-    state[3] += d(0);
-    state[4] += e(0);
-    state[5] += f(0);
-    state[6] += g(0);
-    state[7] += h(0);
-}
-
-NAMESPACE_END
-
-#endif	// #ifndef CRYPTOPP_GENERATE_X64_MASM
-#endif	// #ifndef CRYPTOPP_IMPORTS
diff --git a/src-cryptopp/sha.h b/src-cryptopp/sha.h
deleted file mode 100644
index 86151cc..0000000
--- a/src-cryptopp/sha.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// sha.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile sha.h
-//! \brief Classes for SHA-1 and SHA-2 family of message digests
-
-#ifndef CRYPTOPP_SHA_H
-#define CRYPTOPP_SHA_H
-
-#include "config.h"
-#include "iterhash.h"
-
-// Clang 3.3 integrated assembler crash on Linux
-//  http://github.com/weidai11/cryptopp/issues/264
-#if defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400)
-# define CRYPTOPP_DISABLE_SHA_ASM
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-/// <a href="http://www.weidai.com/scan-mirror/md.html#SHA-1">SHA-1</a>
-class CRYPTOPP_DLL SHA1 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 20, SHA1>
-{
-public:
-	static void CRYPTOPP_API InitState(HashWordType *state);
-	static void CRYPTOPP_API Transform(word32 *digest, const word32 *data);
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-1";}
-};
-
-typedef SHA1 SHA;	// for backwards compatibility
-
-//! implements the SHA-256 standard
-class CRYPTOPP_DLL SHA256 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 32, SHA256, 32, true>
-{
-public:
-#if (defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_SHA_ASM)
-	size_t HashMultipleBlocks(const word32 *input, size_t length);
-#endif
-	static void CRYPTOPP_API InitState(HashWordType *state);
-	static void CRYPTOPP_API Transform(word32 *digest, const word32 *data);
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-256";}
-};
-
-//! implements the SHA-224 standard
-class CRYPTOPP_DLL SHA224 : public IteratedHashWithStaticTransform<word32, BigEndian, 64, 32, SHA224, 28, true>
-{
-public:
-#if (defined(CRYPTOPP_X86_ASM_AVAILABLE) || defined(CRYPTOPP_X32_ASM_AVAILABLE) || defined(CRYPTOPP_X64_MASM_AVAILABLE)) && !defined(CRYPTOPP_DISABLE_SHA_ASM)
-	size_t HashMultipleBlocks(const word32 *input, size_t length);
-#endif
-	static void CRYPTOPP_API InitState(HashWordType *state);
-	static void CRYPTOPP_API Transform(word32 *digest, const word32 *data) {SHA256::Transform(digest, data);}
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-224";}
-};
-
-//! implements the SHA-512 standard
-class CRYPTOPP_DLL SHA512 : public IteratedHashWithStaticTransform<word64, BigEndian, 128, 64, SHA512, 64, (CRYPTOPP_BOOL_X86|CRYPTOPP_BOOL_X32)>
-{
-public:
-	static void CRYPTOPP_API InitState(HashWordType *state);
-	static void CRYPTOPP_API Transform(word64 *digest, const word64 *data);
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-512";}
-};
-
-//! implements the SHA-384 standard
-class CRYPTOPP_DLL SHA384 : public IteratedHashWithStaticTransform<word64, BigEndian, 128, 64, SHA384, 48, (CRYPTOPP_BOOL_X86|CRYPTOPP_BOOL_X32)>
-{
-public:
-	static void CRYPTOPP_API InitState(HashWordType *state);
-	static void CRYPTOPP_API Transform(word64 *digest, const word64 *data) {SHA512::Transform(digest, data);}
-	CRYPTOPP_CONSTEXPR static const char * CRYPTOPP_API StaticAlgorithmName() {return "SHA-384";}
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/simple.h b/src-cryptopp/simple.h
deleted file mode 100644
index afe06c7..0000000
--- a/src-cryptopp/simple.h
+++ /dev/null
@@ -1,306 +0,0 @@
-// simple.h - written and placed in the public domain by Wei Dai
-
-//! \file simple.h
-//! \brief Classes providing basic library services.
-
-#ifndef CRYPTOPP_SIMPLE_H
-#define CRYPTOPP_SIMPLE_H
-
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4127 4189)
-#endif
-
-#include "cryptlib.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class ClonableImpl
-//! \brief Base class for identifying alogorithm
-//! \tparam BASE base class from which to derive
-//! \tparam DERIVED class which to clone
-template <class DERIVED, class BASE>
-class CRYPTOPP_NO_VTABLE ClonableImpl : public BASE
-{
-public:
-	Clonable * Clone() const {return new DERIVED(*static_cast<const DERIVED *>(this));}
-};
-
-//! \class AlgorithmImpl
-//! \brief Base class for identifying alogorithm
-//! \tparam BASE an Algorithm derived class
-//! \tparam ALGORITHM_INFO an Algorithm derived class
-//! \details AlgorithmImpl provides StaticAlgorithmName from the template parameter BASE
-template <class BASE, class ALGORITHM_INFO=BASE>
-class CRYPTOPP_NO_VTABLE AlgorithmImpl : public BASE
-{
-public:
-	static std::string CRYPTOPP_API StaticAlgorithmName() {return ALGORITHM_INFO::StaticAlgorithmName();}
-	std::string AlgorithmName() const {return ALGORITHM_INFO::StaticAlgorithmName();}
-};
-
-//! \class InvalidKeyLength
-//! \brief Exception thrown when an invalid key length is encountered
-class CRYPTOPP_DLL InvalidKeyLength : public InvalidArgument
-{
-public:
-	explicit InvalidKeyLength(const std::string &algorithm, size_t length) : InvalidArgument(algorithm + ": " + IntToString(length) + " is not a valid key length") {}
-};
-
-//! \class InvalidRounds
-//! \brief Exception thrown when an invalid number of rounds is encountered
-class CRYPTOPP_DLL InvalidRounds : public InvalidArgument
-{
-public:
-	explicit InvalidRounds(const std::string &algorithm, unsigned int rounds) : InvalidArgument(algorithm + ": " + IntToString(rounds) + " is not a valid number of rounds") {}
-};
-
-//! \class InvalidPersonalizationLength
-//! \brief Exception thrown when an invalid personalization string length is encountered
-class CRYPTOPP_DLL InvalidPersonalizationLength : public InvalidArgument
-{
-public:
-	explicit InvalidPersonalizationLength(const std::string &algorithm, size_t length) : InvalidArgument(algorithm + ": " + IntToString(length) + " is not a valid salt length") {}
-};
-
-//! \class InvalidSaltLength
-//! \brief Exception thrown when an invalid salt length is encountered
-class CRYPTOPP_DLL InvalidSaltLength : public InvalidArgument
-{
-public:
-	explicit InvalidSaltLength(const std::string &algorithm, size_t length) : InvalidArgument(algorithm + ": " + IntToString(length) + " is not a valid salt length") {}
-};
-
-// *****************************
-
-//! \class Bufferless
-//! \brief Base class for bufferless filters
-//! \tparam T the class or type
-template <class T>
-class CRYPTOPP_NO_VTABLE Bufferless : public T
-{
-public:
-	bool IsolatedFlush(bool hardFlush, bool blocking)
-		{CRYPTOPP_UNUSED(hardFlush); CRYPTOPP_UNUSED(blocking); return false;}
-};
-
-//! \class Unflushable
-//! \brief Base class for unflushable filters
-//! \tparam T the class or type
-template <class T>
-class CRYPTOPP_NO_VTABLE Unflushable : public T
-{
-public:
-	bool Flush(bool completeFlush, int propagation=-1, bool blocking=true)
-		{return ChannelFlush(DEFAULT_CHANNEL, completeFlush, propagation, blocking);}
-	bool IsolatedFlush(bool hardFlush, bool blocking)
-		{CRYPTOPP_UNUSED(hardFlush); CRYPTOPP_UNUSED(blocking); CRYPTOPP_ASSERT(false); return false;}
-	bool ChannelFlush(const std::string &channel, bool hardFlush, int propagation=-1, bool blocking=true)
-	{
-		if (hardFlush && !InputBufferIsEmpty())
-			throw CannotFlush("Unflushable<T>: this object has buffered input that cannot be flushed");
-		else
-		{
-			BufferedTransformation *attached = this->AttachedTransformation();
-			return attached && propagation ? attached->ChannelFlush(channel, hardFlush, propagation-1, blocking) : false;
-		}
-	}
-
-protected:
-	virtual bool InputBufferIsEmpty() const {return false;}
-};
-
-//! \class InputRejecting
-//! \brief Base class for input rejecting filters
-//! \tparam T the class or type
-//! \details T should be a BufferedTransformation derived class
-template <class T>
-class CRYPTOPP_NO_VTABLE InputRejecting : public T
-{
-public:
-	struct InputRejected : public NotImplemented
-		{InputRejected() : NotImplemented("BufferedTransformation: this object doesn't allow input") {}};
-
-	//!	\name INPUT
-	//@{
-
-	//! \brief Input a byte array for processing
-	//! \param inString the byte array to process
-	//! \param length the size of the string, in bytes
-	//! \param messageEnd means how many filters to signal MessageEnd() to, including this one
-	//! \param blocking specifies whether the object should block when processing input
-	//! \throws InputRejected
-	//! \returns the number of bytes that remain in the block (i.e., bytes not processed)
-	//! \details Internally, the default implmentation throws InputRejected.
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-		{CRYPTOPP_UNUSED(inString); CRYPTOPP_UNUSED(length); CRYPTOPP_UNUSED(messageEnd); CRYPTOPP_UNUSED(blocking); throw InputRejected();}
-	//@}
-
-	//!	\name SIGNALS
-	//@{
-	bool IsolatedFlush(bool hardFlush, bool blocking)
-		{CRYPTOPP_UNUSED(hardFlush); CRYPTOPP_UNUSED(blocking); return false;}
-	bool IsolatedMessageSeriesEnd(bool blocking)
-		{CRYPTOPP_UNUSED(blocking); throw InputRejected();}
-	size_t ChannelPut2(const std::string &channel, const byte *inString, size_t length, int messageEnd, bool blocking)
-		{CRYPTOPP_UNUSED(channel); CRYPTOPP_UNUSED(inString); CRYPTOPP_UNUSED(length); CRYPTOPP_UNUSED(messageEnd); CRYPTOPP_UNUSED(blocking); throw InputRejected();}
-	bool ChannelMessageSeriesEnd(const std::string& channel, int messageEnd, bool blocking)
-		{CRYPTOPP_UNUSED(channel); CRYPTOPP_UNUSED(messageEnd); CRYPTOPP_UNUSED(blocking); throw InputRejected();}
-	//@}
-};
-
-//! \class CustomFlushPropagation
-//! \brief Provides interface for custom flush signals
-//! \tparam T the class or type
-//! \details T should be a BufferedTransformation derived class
-template <class T>
-class CRYPTOPP_NO_VTABLE CustomFlushPropagation : public T
-{
-public:
-	//!	\name SIGNALS
-	//@{
-	virtual bool Flush(bool hardFlush, int propagation=-1, bool blocking=true) =0;
-	//@}
-
-private:
-	bool IsolatedFlush(bool hardFlush, bool blocking)
-		{CRYPTOPP_UNUSED(hardFlush); CRYPTOPP_UNUSED(blocking); CRYPTOPP_ASSERT(false); return false;}
-};
-
-//! \class CustomSignalPropagation
-//! \brief Provides interface for initialization of derived filters
-//! \tparam T the class or type
-//! \details T should be a BufferedTransformation derived class
-template <class T>
-class CRYPTOPP_NO_VTABLE CustomSignalPropagation : public CustomFlushPropagation<T>
-{
-public:
-	virtual void Initialize(const NameValuePairs &parameters=g_nullNameValuePairs, int propagation=-1) =0;
-
-private:
-	void IsolatedInitialize(const NameValuePairs &parameters)
-		{CRYPTOPP_UNUSED(parameters); CRYPTOPP_ASSERT(false);}
-};
-
-//! \class Multichannel
-//! \brief Provides multiple channels support for custom flush signal processing
-//! \tparam T the class or type
-//! \details T should be a BufferedTransformation derived class
-template <class T>
-class CRYPTOPP_NO_VTABLE Multichannel : public CustomFlushPropagation<T>
-{
-public:
-	bool Flush(bool hardFlush, int propagation=-1, bool blocking=true)
-		{return this->ChannelFlush(DEFAULT_CHANNEL, hardFlush, propagation, blocking);}
-	bool MessageSeriesEnd(int propagation=-1, bool blocking=true)
-		{return this->ChannelMessageSeriesEnd(DEFAULT_CHANNEL, propagation, blocking);}
-	byte * CreatePutSpace(size_t &size)
-		{return this->ChannelCreatePutSpace(DEFAULT_CHANNEL, size);}
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-		{return this->ChannelPut2(DEFAULT_CHANNEL, inString, length, messageEnd, blocking);}
-	size_t PutModifiable2(byte *inString, size_t length, int messageEnd, bool blocking)
-		{return this->ChannelPutModifiable2(DEFAULT_CHANNEL, inString, length, messageEnd, blocking);}
-
-//	void ChannelMessageSeriesEnd(const std::string &channel, int propagation=-1)
-//		{PropagateMessageSeriesEnd(propagation, channel);}
-	byte * ChannelCreatePutSpace(const std::string &channel, size_t &size)
-		{CRYPTOPP_UNUSED(channel); size = 0; return NULL;}
-	bool ChannelPutModifiable(const std::string &channel, byte *inString, size_t length)
-		{this->ChannelPut(channel, inString, length); return false;}
-
-	virtual size_t ChannelPut2(const std::string &channel, const byte *begin, size_t length, int messageEnd, bool blocking) =0;
-	size_t ChannelPutModifiable2(const std::string &channel, byte *begin, size_t length, int messageEnd, bool blocking)
-		{return ChannelPut2(channel, begin, length, messageEnd, blocking);}
-
-	virtual bool ChannelFlush(const std::string &channel, bool hardFlush, int propagation=-1, bool blocking=true) =0;
-};
-
-//! \class AutoSignaling
-//! \brief Provides auto signaling support
-//! \tparam T the class or type
-//! \details T should be a BufferedTransformation derived class
-template <class T>
-class CRYPTOPP_NO_VTABLE AutoSignaling : public T
-{
-public:
-	AutoSignaling(int propagation=-1) : m_autoSignalPropagation(propagation) {}
-
-	void SetAutoSignalPropagation(int propagation)
-		{m_autoSignalPropagation = propagation;}
-	int GetAutoSignalPropagation() const
-		{return m_autoSignalPropagation;}
-
-private:
-	int m_autoSignalPropagation;
-};
-
-//! \class Store
-//! \brief Acts as a Source for pre-existing, static data
-//! \tparam T the class or type
-//! \details A BufferedTransformation that only contains pre-existing data as "output"
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Store : public AutoSignaling<InputRejecting<BufferedTransformation> >
-{
-public:
-	//! \brief Construct a Store
-	Store() : m_messageEnd(false) {}
-
-	void IsolatedInitialize(const NameValuePairs &parameters)
-	{
-		m_messageEnd = false;
-		StoreInitialize(parameters);
-	}
-
-	unsigned int NumberOfMessages() const {return m_messageEnd ? 0 : 1;}
-	bool GetNextMessage();
-	unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=DEFAULT_CHANNEL) const;
-
-protected:
-	virtual void StoreInitialize(const NameValuePairs &parameters) =0;
-
-	bool m_messageEnd;
-};
-
-//! \class Sink
-//! \brief Implementation of BufferedTransformation's attachment interface
-//! \details Sink is a cornerstone of the Pipeline trinitiy. Data flows from
-//!   Sources, through Filters, and then terminates in Sinks. The difference
-//!   between a Source and Filter is a Source \a pumps data, while a Filter does
-//!   not. The difference between a Filter and a Sink is a Filter allows an
-//!   attached transformation, while a Sink does not.
-//! \details A Sink doesnot produce any retrievable output.
-//! \details See the discussion of BufferedTransformation in cryptlib.h for
-//!   more details.
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Sink : public BufferedTransformation
-{
-public:
-	size_t TransferTo2(BufferedTransformation &target, lword &transferBytes, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true)
-		{CRYPTOPP_UNUSED(target); CRYPTOPP_UNUSED(transferBytes); CRYPTOPP_UNUSED(channel); CRYPTOPP_UNUSED(blocking); transferBytes = 0; return 0;}
-	size_t CopyRangeTo2(BufferedTransformation &target, lword &begin, lword end=LWORD_MAX, const std::string &channel=DEFAULT_CHANNEL, bool blocking=true) const
-		{CRYPTOPP_UNUSED(target); CRYPTOPP_UNUSED(begin); CRYPTOPP_UNUSED(end); CRYPTOPP_UNUSED(channel); CRYPTOPP_UNUSED(blocking); return 0;}
-};
-
-//! \class BitBucket
-//! \brief Acts as an input discarding Filter or Sink
-//! \tparam T the class or type
-//! \details The BitBucket discards all input and returns 0 to the caller
-//!   to indicate all data was processed.
-class CRYPTOPP_DLL BitBucket : public Bufferless<Sink>
-{
-public:
-	std::string AlgorithmName() const {return "BitBucket";}
-	void IsolatedInitialize(const NameValuePairs &params)
-		{CRYPTOPP_UNUSED(params);}
-	size_t Put2(const byte *inString, size_t length, int messageEnd, bool blocking)
-		{CRYPTOPP_UNUSED(inString); CRYPTOPP_UNUSED(length); CRYPTOPP_UNUSED(messageEnd); CRYPTOPP_UNUSED(blocking); return 0;}
-};
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/skipjack.h b/src-cryptopp/skipjack.h
deleted file mode 100644
index 3378931..0000000
--- a/src-cryptopp/skipjack.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// skipjack.h - written and placed in the public domain by Wei Dai
-
-//! \file skipjack.h
-//! \brief Classes for the SKIPJACK block cipher
-
-#ifndef CRYPTOPP_SKIPJACK_H
-#define CRYPTOPP_SKIPJACK_H
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class SKIPJACK_Info
-//! \brief SKIPJACK block cipher information
-struct SKIPJACK_Info : public FixedBlockSize<8>, public FixedKeyLength<10>
-{
-	CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return "SKIPJACK";}
-};
-
-//! \class SKIPJACK
-//! \brief SKIPJACK block cipher
-//! \sa <a href="http://www.weidai.com/scan-mirror/cs.html#SKIPJACK">SKIPJACK</a>
-class SKIPJACK : public SKIPJACK_Info, public BlockCipherDocumentation
-{
-	//! \class Base
-	//! \brief SKIPJACK block cipher default operation
-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SKIPJACK_Info>
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-		unsigned int OptimalDataAlignment() const {return GetAlignmentOf<word16>();}
-
-	protected:
-		static const byte fTable[256];
-
-		FixedSizeSecBlock<byte, 10*256> tab;
-	};
-
-	//! \class Enc
-	//! \brief SKIPJACK block cipher encryption operation
-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Enc : public Base
-	{
-	public:
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-	private:
-		static const byte Se[256];
-		static const word32 Te[4][256];
-	};
-
-	//! \class Dec
-	//! \brief SKIPJACK block cipher decryption operation
-	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Dec : public Base
-	{
-	public:
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-	private:
-		static const byte Sd[256];
-		static const word32 Td[4][256];
-	};
-
-public:
-	typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;
-	typedef BlockCipherFinal<DECRYPTION, Dec> Decryption;
-};
-
-typedef SKIPJACK::Encryption SKIPJACKEncryption;
-typedef SKIPJACK::Decryption SKIPJACKDecryption;
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/smartptr.h b/src-cryptopp/smartptr.h
deleted file mode 100644
index 38e1aee..0000000
--- a/src-cryptopp/smartptr.h
+++ /dev/null
@@ -1,321 +0,0 @@
-// smartptr.h - written and placed in the public domain by Wei Dai
-
-//! \file
-//! \headerfile smartptr.h
-//! \brief Classes for automatic resource management
-
-#ifndef CRYPTOPP_SMARTPTR_H
-#define CRYPTOPP_SMARTPTR_H
-
-#include "config.h"
-#include "stdcpp.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class simple_ptr
-//! \brief Manages resources for a single object
-//! \tparam T class or type
-//! \details \p simple_ptr is used frequently in the library to manage resources and
-//!   ensure cleanup under the RAII pattern (Resource Acquisition Is Initialization).
-template <class T> class simple_ptr
-{
-public:
-	simple_ptr(T *p = NULL) : m_p(p) {}
-	~simple_ptr()
-	{
-		delete m_p;
-		*((volatile T**)&m_p) = NULL;
-	}
-
-	T *m_p;
-};
-
-//! \class member_ptr
-//! \brief Pointer that overloads operator ->
-//! \tparam T class or type
-//! \details member_ptr is used frequently in the library to avoid the issues related to
-//!   std::auto_ptr in C++11 (deprecated) and std::unique_ptr in C++03 (non-existent).
-//! \bug <a href="http://github.com/weidai11/cryptopp/issues/48">Issue 48: "Use of auto_ptr causes dirty compile under C++11"</a>
-template <class T> class member_ptr
-{
-public:
-	explicit member_ptr(T *p = NULL) : m_p(p) {}
-
-	~member_ptr();
-
-	const T& operator*() const { return *m_p; }
-	T& operator*() { return *m_p; }
-
-	const T* operator->() const { return m_p; }
-	T* operator->() { return m_p; }
-
-	const T* get() const { return m_p; }
-	T* get() { return m_p; }
-
-	T* release()
-	{
-		T *old_p = m_p;
-		*((volatile T**)&m_p) = NULL;
-		return old_p;
-	}
-
-	void reset(T *p = 0);
-
-protected:
-	member_ptr(const member_ptr<T>& rhs);		// copy not allowed
-	void operator=(const member_ptr<T>& rhs);	// assignment not allowed
-
-	T *m_p;
-};
-
-template <class T> member_ptr<T>::~member_ptr() {delete m_p;}
-template <class T> void member_ptr<T>::reset(T *p) {delete m_p; m_p = p;}
-
-// ********************************************************
-
-//! \class value_ptr
-//! \brief Value pointer
-//! \tparam T class or type
-template<class T> class value_ptr : public member_ptr<T>
-{
-public:
-	value_ptr(const T &obj) : member_ptr<T>(new T(obj)) {}
-	value_ptr(T *p = NULL) : member_ptr<T>(p) {}
-	value_ptr(const value_ptr<T>& rhs)
-		: member_ptr<T>(rhs.m_p ? new T(*rhs.m_p) : NULL) {}
-
-	value_ptr<T>& operator=(const value_ptr<T>& rhs);
-	bool operator==(const value_ptr<T>& rhs)
-	{
-		return (!this->m_p && !rhs.m_p) || (this->m_p && rhs.m_p && *this->m_p == *rhs.m_p);
-	}
-};
-
-template <class T> value_ptr<T>& value_ptr<T>::operator=(const value_ptr<T>& rhs)
-{
-	T *old_p = this->m_p;
-	this->m_p = rhs.m_p ? new T(*rhs.m_p) : NULL;
-	delete old_p;
-	return *this;
-}
-
-// ********************************************************
-
-//! \class clonable_ptr
-//! \brief A pointer which can be copied and cloned
-//! \tparam T class or type
-//! \details \p T should adhere to the \p Clonable interface
-template<class T> class clonable_ptr : public member_ptr<T>
-{
-public:
-	clonable_ptr(const T &obj) : member_ptr<T>(obj.Clone()) {}
-	clonable_ptr(T *p = NULL) : member_ptr<T>(p) {}
-	clonable_ptr(const clonable_ptr<T>& rhs)
-		: member_ptr<T>(rhs.m_p ? rhs.m_p->Clone() : NULL) {}
-
-	clonable_ptr<T>& operator=(const clonable_ptr<T>& rhs);
-};
-
-template <class T> clonable_ptr<T>& clonable_ptr<T>::operator=(const clonable_ptr<T>& rhs)
-{
-	T *old_p = this->m_p;
-	this->m_p = rhs.m_p ? rhs.m_p->Clone() : NULL;
-	delete old_p;
-	return *this;
-}
-
-// ********************************************************
-
-//! \class counted_ptr
-//! \brief Reference counted pointer
-//! \tparam T class or type
-//! \details users should declare \p m_referenceCount as <tt>std::atomic<unsigned></tt>
-//!   (or similar) under C++ 11
-template<class T> class counted_ptr
-{
-public:
-	explicit counted_ptr(T *p = 0);
-	counted_ptr(const T &r) : m_p(0) {attach(r);}
-	counted_ptr(const counted_ptr<T>& rhs);
-
-	~counted_ptr();
-
-	const T& operator*() const { return *m_p; }
-	T& operator*() { return *m_p; }
-
-	const T* operator->() const { return m_p; }
-	T* operator->() { return get(); }
-
-	const T* get() const { return m_p; }
-	T* get();
-
-	void attach(const T &p);
-
-	counted_ptr<T> & operator=(const counted_ptr<T>& rhs);
-
-private:
-	T *m_p;
-};
-
-template <class T> counted_ptr<T>::counted_ptr(T *p)
-	: m_p(p)
-{
-	if (m_p)
-		m_p->m_referenceCount = 1;
-}
-
-template <class T> counted_ptr<T>::counted_ptr(const counted_ptr<T>& rhs)
-	: m_p(rhs.m_p)
-{
-	if (m_p)
-		m_p->m_referenceCount++;
-}
-
-template <class T> counted_ptr<T>::~counted_ptr()
-{
-	if (m_p && --m_p->m_referenceCount == 0)
-		delete m_p;
-}
-
-template <class T> void counted_ptr<T>::attach(const T &r)
-{
-	if (m_p && --m_p->m_referenceCount == 0)
-		delete m_p;
-	if (r.m_referenceCount == 0)
-	{
-		m_p = r.clone();
-		m_p->m_referenceCount = 1;
-	}
-	else
-	{
-		m_p = const_cast<T *>(&r);
-		m_p->m_referenceCount++;
-	}
-}
-
-template <class T> T* counted_ptr<T>::get()
-{
-	if (m_p && m_p->m_referenceCount > 1)
-	{
-		T *temp = m_p->clone();
-		m_p->m_referenceCount--;
-		m_p = temp;
-		m_p->m_referenceCount = 1;
-	}
-	return m_p;
-}
-
-template <class T> counted_ptr<T> & counted_ptr<T>::operator=(const counted_ptr<T>& rhs)
-{
-	if (m_p != rhs.m_p)
-	{
-		if (m_p && --m_p->m_referenceCount == 0)
-			delete m_p;
-		m_p = rhs.m_p;
-		if (m_p)
-			m_p->m_referenceCount++;
-	}
-	return *this;
-}
-
-// ********************************************************
-
-//! \class vector_ptr
-//! \brief Manages resources for an array of objects
-//! \tparam T class or type
-//! \details \p vector_ptr is used frequently in the library to avoid large stack allocations,
-//!   and manage resources and ensure cleanup under the RAII pattern (Resource Acquisition
-//!   Is Initialization).
-template <class T> class vector_ptr
-{
-public:
-	//! Construct an arry of \p T
-	//! \param size the size of the array, in elements
-	//! \details If \p T is a Plain Old Dataype (POD), then the array is uninitialized.
-	vector_ptr(size_t size=0)
-		: m_size(size), m_ptr(new T[m_size]) {}
-	~vector_ptr()
-		{delete [] m_ptr;}
-
-	T& operator[](size_t index)
-		{CRYPTOPP_ASSERT(m_size && index<this->m_size); return this->m_ptr[index];}
-	const T& operator[](size_t index) const
-		{CRYPTOPP_ASSERT(m_size && index<this->m_size); return this->m_ptr[index];}
-
-	size_t size() const {return this->m_size;}
-	void resize(size_t newSize)
-	{
-		T *newPtr = new T[newSize];
-		for (size_t i=0; i<this->m_size && i<newSize; i++)
-			newPtr[i] = m_ptr[i];
-		delete [] this->m_ptr;
-		this->m_size = newSize;
-		this->m_ptr = newPtr;
-	}
-
-#ifdef __BORLANDC__
-	operator T *() const
-		{return (T*)m_ptr;}
-#else
-	operator const void *() const
-		{return m_ptr;}
-	operator void *()
-		{return m_ptr;}
-
-	operator const T *() const
-		{return m_ptr;}
-	operator T *()
-		{return m_ptr;}
-#endif
-
-private:
-	vector_ptr(const vector_ptr<T> &c);	// copy not allowed
-	void operator=(const vector_ptr<T> &x);		// assignment not allowed
-
-	size_t m_size;
-	T *m_ptr;
-};
-
-// ********************************************************
-
-//! \class vector_member_ptrs
-//! \brief Manages resources for an array of objects
-//! \tparam T class or type
-template <class T> class vector_member_ptrs
-{
-public:
-	//! Construct an arry of \p T
-	//! \param size the size of the array, in elements
-	//! \details If \p T is a Plain Old Dataype (POD), then the array is uninitialized.
-	vector_member_ptrs(size_t size=0)
-		: m_size(size), m_ptr(new member_ptr<T>[size]) {}
-	~vector_member_ptrs()
-		{delete [] this->m_ptr;}
-
-	member_ptr<T>& operator[](size_t index)
-		{CRYPTOPP_ASSERT(index<this->m_size); return this->m_ptr[index];}
-	const member_ptr<T>& operator[](size_t index) const
-		{CRYPTOPP_ASSERT(index<this->m_size); return this->m_ptr[index];}
-
-	size_t size() const {return this->m_size;}
-	void resize(size_t newSize)
-	{
-		member_ptr<T> *newPtr = new member_ptr<T>[newSize];
-		for (size_t i=0; i<this->m_size && i<newSize; i++)
-			newPtr[i].reset(this->m_ptr[i].release());
-		delete [] this->m_ptr;
-		this->m_size = newSize;
-		this->m_ptr = newPtr;
-	}
-
-private:
-	vector_member_ptrs(const vector_member_ptrs<T> &c);	// copy not allowed
-	void operator=(const vector_member_ptrs<T> &x);		// assignment not allowed
-
-	size_t m_size;
-	member_ptr<T> *m_ptr;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/sosemanuk.cpp b/src-cryptopp/sosemanuk.cpp
deleted file mode 100644
index 366fe35..0000000
--- a/src-cryptopp/sosemanuk.cpp
+++ /dev/null
@@ -1,717 +0,0 @@
-// sosemanuk.cpp - written and placed in the public domain by Wei Dai
-
-// use "cl /EP /P /DCRYPTOPP_GENERATE_X64_MASM sosemanuk.cpp" to generate MASM code
-
-#include "pch.h"
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4702 4731)
-#endif
-
-#ifndef CRYPTOPP_GENERATE_X64_MASM
-
-#include "sosemanuk.h"
-#include "serpentp.h"
-#include "secblock.h"
-#include "misc.h"
-#include "cpu.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-void SosemanukPolicy::CipherSetKey(const NameValuePairs &params, const byte *userKey, size_t keylen)
-{
-	CRYPTOPP_UNUSED(params);
-	Serpent_KeySchedule(m_key, 24, userKey, keylen);
-}
-
-void SosemanukPolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length)
-{
-	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(iv), CRYPTOPP_UNUSED(length);
-	CRYPTOPP_ASSERT(length==16);
-
-	word32 a, b, c, d, e;
-
-	typedef BlockGetAndPut<word32, LittleEndian> Block;
-	Block::Get(iv)(a)(b)(c)(d);
-
-	const word32 *k = m_key;
-	unsigned int i=1;
-
-	do
-	{
-		beforeS0(KX); beforeS0(S0); afterS0(LT);
-		afterS0(KX); afterS0(S1); afterS1(LT);
-		if (i == 3)	// after 18th round
-		{
-			m_state[4] = b;
-			m_state[5] = e;
-			m_state[10] = c;
-			m_state[11] = a;
-		}
-		afterS1(KX); afterS1(S2); afterS2(LT);
-		afterS2(KX); afterS2(S3); afterS3(LT);
-		if (i == 2)	// after 12th round
-		{
-			m_state[6] = c;
-			m_state[7] = d;
-			m_state[8] = b;
-			m_state[9] = e;
-		}
-		afterS3(KX); afterS3(S4); afterS4(LT);
-		afterS4(KX); afterS4(S5); afterS5(LT);
-		afterS5(KX); afterS5(S6); afterS6(LT);
-		afterS6(KX); afterS6(S7); afterS7(LT);
-
-		if (i == 3)
-			break;
-
-		++i;
-		c = b;
-		b = e;
-		e = d;
-		d = a;
-		a = e;
-		k += 32;
-	}
-	while (true);
-
-	afterS7(KX);
-
-	m_state[0] = a;
-	m_state[1] = b;
-	m_state[2] = e;
-	m_state[3] = d;
-
-#define XMUX(c, x, y)   (x ^ (y & (0 - (c & 1))))
-	m_state[11] += XMUX(m_state[10], m_state[1], m_state[8]);
-	m_state[10] = rotlFixed(m_state[10] * 0x54655307, 7);
-}
-
-extern "C" {
-word32 s_sosemanukMulTables[512] = {
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
-	0x00000000, 0xE19FCF12, 0x6B973724, 0x8A08F836,
-	0xD6876E48, 0x3718A15A, 0xBD10596C, 0x5C8F967E,
-	0x05A7DC90, 0xE4381382, 0x6E30EBB4, 0x8FAF24A6,
-	0xD320B2D8, 0x32BF7DCA, 0xB8B785FC, 0x59284AEE,
-	0x0AE71189, 0xEB78DE9B, 0x617026AD, 0x80EFE9BF,
-	0xDC607FC1, 0x3DFFB0D3, 0xB7F748E5, 0x566887F7,
-	0x0F40CD19, 0xEEDF020B, 0x64D7FA3D, 0x8548352F,
-	0xD9C7A351, 0x38586C43, 0xB2509475, 0x53CF5B67,
-	0x146722BB, 0xF5F8EDA9, 0x7FF0159F, 0x9E6FDA8D,
-	0xC2E04CF3, 0x237F83E1, 0xA9777BD7, 0x48E8B4C5,
-	0x11C0FE2B, 0xF05F3139, 0x7A57C90F, 0x9BC8061D,
-	0xC7479063, 0x26D85F71, 0xACD0A747, 0x4D4F6855,
-	0x1E803332, 0xFF1FFC20, 0x75170416, 0x9488CB04,
-	0xC8075D7A, 0x29989268, 0xA3906A5E, 0x420FA54C,
-	0x1B27EFA2, 0xFAB820B0, 0x70B0D886, 0x912F1794,
-	0xCDA081EA, 0x2C3F4EF8, 0xA637B6CE, 0x47A879DC,
-	0x28CE44DF, 0xC9518BCD, 0x435973FB, 0xA2C6BCE9,
-	0xFE492A97, 0x1FD6E585, 0x95DE1DB3, 0x7441D2A1,
-	0x2D69984F, 0xCCF6575D, 0x46FEAF6B, 0xA7616079,
-	0xFBEEF607, 0x1A713915, 0x9079C123, 0x71E60E31,
-	0x22295556, 0xC3B69A44, 0x49BE6272, 0xA821AD60,
-	0xF4AE3B1E, 0x1531F40C, 0x9F390C3A, 0x7EA6C328,
-	0x278E89C6, 0xC61146D4, 0x4C19BEE2, 0xAD8671F0,
-	0xF109E78E, 0x1096289C, 0x9A9ED0AA, 0x7B011FB8,
-	0x3CA96664, 0xDD36A976, 0x573E5140, 0xB6A19E52,
-	0xEA2E082C, 0x0BB1C73E, 0x81B93F08, 0x6026F01A,
-	0x390EBAF4, 0xD89175E6, 0x52998DD0, 0xB30642C2,
-	0xEF89D4BC, 0x0E161BAE, 0x841EE398, 0x65812C8A,
-	0x364E77ED, 0xD7D1B8FF, 0x5DD940C9, 0xBC468FDB,
-	0xE0C919A5, 0x0156D6B7, 0x8B5E2E81, 0x6AC1E193,
-	0x33E9AB7D, 0xD276646F, 0x587E9C59, 0xB9E1534B,
-	0xE56EC535, 0x04F10A27, 0x8EF9F211, 0x6F663D03,
-	0x50358817, 0xB1AA4705, 0x3BA2BF33, 0xDA3D7021,
-	0x86B2E65F, 0x672D294D, 0xED25D17B, 0x0CBA1E69,
-	0x55925487, 0xB40D9B95, 0x3E0563A3, 0xDF9AACB1,
-	0x83153ACF, 0x628AF5DD, 0xE8820DEB, 0x091DC2F9,
-	0x5AD2999E, 0xBB4D568C, 0x3145AEBA, 0xD0DA61A8,
-	0x8C55F7D6, 0x6DCA38C4, 0xE7C2C0F2, 0x065D0FE0,
-	0x5F75450E, 0xBEEA8A1C, 0x34E2722A, 0xD57DBD38,
-	0x89F22B46, 0x686DE454, 0xE2651C62, 0x03FAD370,
-	0x4452AAAC, 0xA5CD65BE, 0x2FC59D88, 0xCE5A529A,
-	0x92D5C4E4, 0x734A0BF6, 0xF942F3C0, 0x18DD3CD2,
-	0x41F5763C, 0xA06AB92E, 0x2A624118, 0xCBFD8E0A,
-	0x97721874, 0x76EDD766, 0xFCE52F50, 0x1D7AE042,
-	0x4EB5BB25, 0xAF2A7437, 0x25228C01, 0xC4BD4313,
-	0x9832D56D, 0x79AD1A7F, 0xF3A5E249, 0x123A2D5B,
-	0x4B1267B5, 0xAA8DA8A7, 0x20855091, 0xC11A9F83,
-	0x9D9509FD, 0x7C0AC6EF, 0xF6023ED9, 0x179DF1CB,
-	0x78FBCCC8, 0x996403DA, 0x136CFBEC, 0xF2F334FE,
-	0xAE7CA280, 0x4FE36D92, 0xC5EB95A4, 0x24745AB6,
-	0x7D5C1058, 0x9CC3DF4A, 0x16CB277C, 0xF754E86E,
-	0xABDB7E10, 0x4A44B102, 0xC04C4934, 0x21D38626,
-	0x721CDD41, 0x93831253, 0x198BEA65, 0xF8142577,
-	0xA49BB309, 0x45047C1B, 0xCF0C842D, 0x2E934B3F,
-	0x77BB01D1, 0x9624CEC3, 0x1C2C36F5, 0xFDB3F9E7,
-	0xA13C6F99, 0x40A3A08B, 0xCAAB58BD, 0x2B3497AF,
-	0x6C9CEE73, 0x8D032161, 0x070BD957, 0xE6941645,
-	0xBA1B803B, 0x5B844F29, 0xD18CB71F, 0x3013780D,
-	0x693B32E3, 0x88A4FDF1, 0x02AC05C7, 0xE333CAD5,
-	0xBFBC5CAB, 0x5E2393B9, 0xD42B6B8F, 0x35B4A49D,
-	0x667BFFFA, 0x87E430E8, 0x0DECC8DE, 0xEC7307CC,
-	0xB0FC91B2, 0x51635EA0, 0xDB6BA696, 0x3AF46984,
-	0x63DC236A, 0x8243EC78, 0x084B144E, 0xE9D4DB5C,
-	0xB55B4D22, 0x54C48230, 0xDECC7A06, 0x3F53B514,
-#else
-	0x00000000, 0xE19FCF13, 0x6B973726, 0x8A08F835,
-	0xD6876E4C, 0x3718A15F, 0xBD10596A, 0x5C8F9679,
-	0x05A7DC98, 0xE438138B, 0x6E30EBBE, 0x8FAF24AD,
-	0xD320B2D4, 0x32BF7DC7, 0xB8B785F2, 0x59284AE1,
-	0x0AE71199, 0xEB78DE8A, 0x617026BF, 0x80EFE9AC,
-	0xDC607FD5, 0x3DFFB0C6, 0xB7F748F3, 0x566887E0,
-	0x0F40CD01, 0xEEDF0212, 0x64D7FA27, 0x85483534,
-	0xD9C7A34D, 0x38586C5E, 0xB250946B, 0x53CF5B78,
-	0x1467229B, 0xF5F8ED88, 0x7FF015BD, 0x9E6FDAAE,
-	0xC2E04CD7, 0x237F83C4, 0xA9777BF1, 0x48E8B4E2,
-	0x11C0FE03, 0xF05F3110, 0x7A57C925, 0x9BC80636,
-	0xC747904F, 0x26D85F5C, 0xACD0A769, 0x4D4F687A,
-	0x1E803302, 0xFF1FFC11, 0x75170424, 0x9488CB37,
-	0xC8075D4E, 0x2998925D, 0xA3906A68, 0x420FA57B,
-	0x1B27EF9A, 0xFAB82089, 0x70B0D8BC, 0x912F17AF,
-	0xCDA081D6, 0x2C3F4EC5, 0xA637B6F0, 0x47A879E3,
-	0x28CE449F, 0xC9518B8C, 0x435973B9, 0xA2C6BCAA,
-	0xFE492AD3, 0x1FD6E5C0, 0x95DE1DF5, 0x7441D2E6,
-	0x2D699807, 0xCCF65714, 0x46FEAF21, 0xA7616032,
-	0xFBEEF64B, 0x1A713958, 0x9079C16D, 0x71E60E7E,
-	0x22295506, 0xC3B69A15, 0x49BE6220, 0xA821AD33,
-	0xF4AE3B4A, 0x1531F459, 0x9F390C6C, 0x7EA6C37F,
-	0x278E899E, 0xC611468D, 0x4C19BEB8, 0xAD8671AB,
-	0xF109E7D2, 0x109628C1, 0x9A9ED0F4, 0x7B011FE7,
-	0x3CA96604, 0xDD36A917, 0x573E5122, 0xB6A19E31,
-	0xEA2E0848, 0x0BB1C75B, 0x81B93F6E, 0x6026F07D,
-	0x390EBA9C, 0xD891758F, 0x52998DBA, 0xB30642A9,
-	0xEF89D4D0, 0x0E161BC3, 0x841EE3F6, 0x65812CE5,
-	0x364E779D, 0xD7D1B88E, 0x5DD940BB, 0xBC468FA8,
-	0xE0C919D1, 0x0156D6C2, 0x8B5E2EF7, 0x6AC1E1E4,
-	0x33E9AB05, 0xD2766416, 0x587E9C23, 0xB9E15330,
-	0xE56EC549, 0x04F10A5A, 0x8EF9F26F, 0x6F663D7C,
-	0x50358897, 0xB1AA4784, 0x3BA2BFB1, 0xDA3D70A2,
-	0x86B2E6DB, 0x672D29C8, 0xED25D1FD, 0x0CBA1EEE,
-	0x5592540F, 0xB40D9B1C, 0x3E056329, 0xDF9AAC3A,
-	0x83153A43, 0x628AF550, 0xE8820D65, 0x091DC276,
-	0x5AD2990E, 0xBB4D561D, 0x3145AE28, 0xD0DA613B,
-	0x8C55F742, 0x6DCA3851, 0xE7C2C064, 0x065D0F77,
-	0x5F754596, 0xBEEA8A85, 0x34E272B0, 0xD57DBDA3,
-	0x89F22BDA, 0x686DE4C9, 0xE2651CFC, 0x03FAD3EF,
-	0x4452AA0C, 0xA5CD651F, 0x2FC59D2A, 0xCE5A5239,
-	0x92D5C440, 0x734A0B53, 0xF942F366, 0x18DD3C75,
-	0x41F57694, 0xA06AB987, 0x2A6241B2, 0xCBFD8EA1,
-	0x977218D8, 0x76EDD7CB, 0xFCE52FFE, 0x1D7AE0ED,
-	0x4EB5BB95, 0xAF2A7486, 0x25228CB3, 0xC4BD43A0,
-	0x9832D5D9, 0x79AD1ACA, 0xF3A5E2FF, 0x123A2DEC,
-	0x4B12670D, 0xAA8DA81E, 0x2085502B, 0xC11A9F38,
-	0x9D950941, 0x7C0AC652, 0xF6023E67, 0x179DF174,
-	0x78FBCC08, 0x9964031B, 0x136CFB2E, 0xF2F3343D,
-	0xAE7CA244, 0x4FE36D57, 0xC5EB9562, 0x24745A71,
-	0x7D5C1090, 0x9CC3DF83, 0x16CB27B6, 0xF754E8A5,
-	0xABDB7EDC, 0x4A44B1CF, 0xC04C49FA, 0x21D386E9,
-	0x721CDD91, 0x93831282, 0x198BEAB7, 0xF81425A4,
-	0xA49BB3DD, 0x45047CCE, 0xCF0C84FB, 0x2E934BE8,
-	0x77BB0109, 0x9624CE1A, 0x1C2C362F, 0xFDB3F93C,
-	0xA13C6F45, 0x40A3A056, 0xCAAB5863, 0x2B349770,
-	0x6C9CEE93, 0x8D032180, 0x070BD9B5, 0xE69416A6,
-	0xBA1B80DF, 0x5B844FCC, 0xD18CB7F9, 0x301378EA,
-	0x693B320B, 0x88A4FD18, 0x02AC052D, 0xE333CA3E,
-	0xBFBC5C47, 0x5E239354, 0xD42B6B61, 0x35B4A472,
-	0x667BFF0A, 0x87E43019, 0x0DECC82C, 0xEC73073F,
-	0xB0FC9146, 0x51635E55, 0xDB6BA660, 0x3AF46973,
-	0x63DC2392, 0x8243EC81, 0x084B14B4, 0xE9D4DBA7,
-	0xB55B4DDE, 0x54C482CD, 0xDECC7AF8, 0x3F53B5EB,
-#endif
-	0x00000000, 0x180F40CD, 0x301E8033, 0x2811C0FE,
-	0x603CA966, 0x7833E9AB, 0x50222955, 0x482D6998,
-	0xC078FBCC, 0xD877BB01, 0xF0667BFF, 0xE8693B32,
-	0xA04452AA, 0xB84B1267, 0x905AD299, 0x88559254,
-	0x29F05F31, 0x31FF1FFC, 0x19EEDF02, 0x01E19FCF,
-	0x49CCF657, 0x51C3B69A, 0x79D27664, 0x61DD36A9,
-	0xE988A4FD, 0xF187E430, 0xD99624CE, 0xC1996403,
-	0x89B40D9B, 0x91BB4D56, 0xB9AA8DA8, 0xA1A5CD65,
-	0x5249BE62, 0x4A46FEAF, 0x62573E51, 0x7A587E9C,
-	0x32751704, 0x2A7A57C9, 0x026B9737, 0x1A64D7FA,
-	0x923145AE, 0x8A3E0563, 0xA22FC59D, 0xBA208550,
-	0xF20DECC8, 0xEA02AC05, 0xC2136CFB, 0xDA1C2C36,
-	0x7BB9E153, 0x63B6A19E, 0x4BA76160, 0x53A821AD,
-	0x1B854835, 0x038A08F8, 0x2B9BC806, 0x339488CB,
-	0xBBC11A9F, 0xA3CE5A52, 0x8BDF9AAC, 0x93D0DA61,
-	0xDBFDB3F9, 0xC3F2F334, 0xEBE333CA, 0xF3EC7307,
-	0xA492D5C4, 0xBC9D9509, 0x948C55F7, 0x8C83153A,
-	0xC4AE7CA2, 0xDCA13C6F, 0xF4B0FC91, 0xECBFBC5C,
-	0x64EA2E08, 0x7CE56EC5, 0x54F4AE3B, 0x4CFBEEF6,
-	0x04D6876E, 0x1CD9C7A3, 0x34C8075D, 0x2CC74790,
-	0x8D628AF5, 0x956DCA38, 0xBD7C0AC6, 0xA5734A0B,
-	0xED5E2393, 0xF551635E, 0xDD40A3A0, 0xC54FE36D,
-	0x4D1A7139, 0x551531F4, 0x7D04F10A, 0x650BB1C7,
-	0x2D26D85F, 0x35299892, 0x1D38586C, 0x053718A1,
-	0xF6DB6BA6, 0xEED42B6B, 0xC6C5EB95, 0xDECAAB58,
-	0x96E7C2C0, 0x8EE8820D, 0xA6F942F3, 0xBEF6023E,
-	0x36A3906A, 0x2EACD0A7, 0x06BD1059, 0x1EB25094,
-	0x569F390C, 0x4E9079C1, 0x6681B93F, 0x7E8EF9F2,
-	0xDF2B3497, 0xC724745A, 0xEF35B4A4, 0xF73AF469,
-	0xBF179DF1, 0xA718DD3C, 0x8F091DC2, 0x97065D0F,
-	0x1F53CF5B, 0x075C8F96, 0x2F4D4F68, 0x37420FA5,
-	0x7F6F663D, 0x676026F0, 0x4F71E60E, 0x577EA6C3,
-	0xE18D0321, 0xF98243EC, 0xD1938312, 0xC99CC3DF,
-	0x81B1AA47, 0x99BEEA8A, 0xB1AF2A74, 0xA9A06AB9,
-	0x21F5F8ED, 0x39FAB820, 0x11EB78DE, 0x09E43813,
-	0x41C9518B, 0x59C61146, 0x71D7D1B8, 0x69D89175,
-	0xC87D5C10, 0xD0721CDD, 0xF863DC23, 0xE06C9CEE,
-	0xA841F576, 0xB04EB5BB, 0x985F7545, 0x80503588,
-	0x0805A7DC, 0x100AE711, 0x381B27EF, 0x20146722,
-	0x68390EBA, 0x70364E77, 0x58278E89, 0x4028CE44,
-	0xB3C4BD43, 0xABCBFD8E, 0x83DA3D70, 0x9BD57DBD,
-	0xD3F81425, 0xCBF754E8, 0xE3E69416, 0xFBE9D4DB,
-	0x73BC468F, 0x6BB30642, 0x43A2C6BC, 0x5BAD8671,
-	0x1380EFE9, 0x0B8FAF24, 0x239E6FDA, 0x3B912F17,
-	0x9A34E272, 0x823BA2BF, 0xAA2A6241, 0xB225228C,
-	0xFA084B14, 0xE2070BD9, 0xCA16CB27, 0xD2198BEA,
-	0x5A4C19BE, 0x42435973, 0x6A52998D, 0x725DD940,
-	0x3A70B0D8, 0x227FF015, 0x0A6E30EB, 0x12617026,
-	0x451FD6E5, 0x5D109628, 0x750156D6, 0x6D0E161B,
-	0x25237F83, 0x3D2C3F4E, 0x153DFFB0, 0x0D32BF7D,
-	0x85672D29, 0x9D686DE4, 0xB579AD1A, 0xAD76EDD7,
-	0xE55B844F, 0xFD54C482, 0xD545047C, 0xCD4A44B1,
-	0x6CEF89D4, 0x74E0C919, 0x5CF109E7, 0x44FE492A,
-	0x0CD320B2, 0x14DC607F, 0x3CCDA081, 0x24C2E04C,
-	0xAC977218, 0xB49832D5, 0x9C89F22B, 0x8486B2E6,
-	0xCCABDB7E, 0xD4A49BB3, 0xFCB55B4D, 0xE4BA1B80,
-	0x17566887, 0x0F59284A, 0x2748E8B4, 0x3F47A879,
-	0x776AC1E1, 0x6F65812C, 0x477441D2, 0x5F7B011F,
-	0xD72E934B, 0xCF21D386, 0xE7301378, 0xFF3F53B5,
-	0xB7123A2D, 0xAF1D7AE0, 0x870CBA1E, 0x9F03FAD3,
-	0x3EA637B6, 0x26A9777B, 0x0EB8B785, 0x16B7F748,
-	0x5E9A9ED0, 0x4695DE1D, 0x6E841EE3, 0x768B5E2E,
-	0xFEDECC7A, 0xE6D18CB7, 0xCEC04C49, 0xD6CF0C84,
-	0x9EE2651C, 0x86ED25D1, 0xAEFCE52F, 0xB6F3A5E2
-};
-}
-
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
-unsigned int SosemanukPolicy::GetAlignment() const
-{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
-#ifdef __INTEL_COMPILER
-	if (HasSSE2() && !IsP4())	// Intel compiler produces faster code for this algorithm on the P4
-#else
-	if (HasSSE2())
-#endif
-		return 16;
-	else
-#endif
-		return GetAlignmentOf<word32>();
-}
-
-unsigned int SosemanukPolicy::GetOptimalBlockSize() const
-{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
-#ifdef __INTEL_COMPILER
-	if (HasSSE2() && !IsP4())	// Intel compiler produces faster code for this algorithm on the P4
-#else
-	if (HasSSE2())
-#endif
-		return 4*BYTES_PER_ITERATION;
-	else
-#endif
-		return BYTES_PER_ITERATION;
-}
-#endif
-
-#ifdef CRYPTOPP_X64_MASM_AVAILABLE
-extern "C" {
-void Sosemanuk_OperateKeystream(size_t iterationCount, const byte *input, byte *output, word32 *state);
-}
-#endif
-
-void SosemanukPolicy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount)
-{
-#endif	// #ifdef CRYPTOPP_GENERATE_X64_MASM
-
-#ifdef CRYPTOPP_X64_MASM_AVAILABLE
-	Sosemanuk_OperateKeystream(iterationCount, input, output, m_state.data());
-	return;
-#endif
-
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-		ALIGN   8
-	Sosemanuk_OperateKeystream	PROC FRAME
-		rex_push_reg rsi
-		push_reg rdi
-		alloc_stack(80*4*2+12*4+8*WORD_SZ + 2*16+8)
-		save_xmm128 xmm6, 02f0h
-		save_xmm128 xmm7, 0300h
-		.endprolog
-		mov		rdi, r8
-		mov		rax, r9
-#else
-#ifdef __INTEL_COMPILER
-	if (HasSSE2() && !IsP4())	// Intel compiler produces faster code for this algorithm on the P4
-#else
-	if (HasSSE2())
-#endif
-	{
-#ifdef __GNUC__
-	#if CRYPTOPP_BOOL_X64
-		FixedSizeAlignedSecBlock<byte, 80*4*2+12*4+8*WORD_SZ> workspace;
-	#endif
-		__asm__ __volatile__
-		(
-		INTEL_NOPREFIX
-		AS_PUSH_IF86(	bx)
-#else
-		word32 *state = m_state;
-		AS2(	mov		WORD_REG(ax), state)
-		AS2(	mov		WORD_REG(di), output)
-		AS2(	mov		WORD_REG(dx), input)
-		AS2(	mov		WORD_REG(cx), iterationCount)
-#endif
-#endif	// #ifdef CRYPTOPP_GENERATE_X64_MASM
-
-#if defined(__GNUC__) && CRYPTOPP_BOOL_X64
-	#define SSE2_workspace %5
-#else
-	#define SSE2_workspace WORD_REG(sp)
-#endif
-
-#define SSE2_output			WORD_PTR [SSE2_workspace+1*WORD_SZ]
-#define SSE2_input			WORD_PTR [SSE2_workspace+2*WORD_SZ]
-#define SSE2_wordsLeft		WORD_PTR [SSE2_workspace+3*WORD_SZ]
-#define SSE2_diEnd			WORD_PTR [SSE2_workspace+4*WORD_SZ]
-#define SSE2_pMulTables		WORD_PTR [SSE2_workspace+5*WORD_SZ]
-#define SSE2_state			WORD_PTR [SSE2_workspace+6*WORD_SZ]
-#define SSE2_wordsLeft2		WORD_PTR [SSE2_workspace+7*WORD_SZ]
-#define SSE2_stateCopy		SSE2_workspace + 8*WORD_SZ
-#define	SSE2_uvStart		SSE2_stateCopy + 12*4
-
-#if (CRYPTOPP_BOOL_X86) && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
-		AS_PUSH_IF86(	bp)
-		AS2(	mov		AS_REG_6, esp)
-		AS2(	and		esp, -16)
-		AS2(	sub		esp, 80*4*2+12*4+8*WORD_SZ)	// 80 v's, 80 u's, 12 state, 8 locals
-		AS2(	mov		[esp], AS_REG_6)
-#endif
-		AS2(	mov		SSE2_output, WORD_REG(di))
-		AS2(	mov		SSE2_input, WORD_REG(dx))
-		AS2(	mov		SSE2_state, WORD_REG(ax))
-#ifndef _MSC_VER
-		AS2(	mov		SSE2_pMulTables, WORD_REG(si))
-#endif
-		AS2(	lea		WORD_REG(cx), [4*WORD_REG(cx)+WORD_REG(cx)])
-		AS2(	lea		WORD_REG(si), [4*WORD_REG(cx)])
-		AS2(	mov		SSE2_wordsLeft, WORD_REG(si))
-		AS2(	movdqa	xmm0, [WORD_REG(ax)+0*16])		// copy state to stack to save a register
-		AS2(	movdqa	[SSE2_stateCopy+0*16], xmm0)
-		AS2(	movdqa	xmm0, [WORD_REG(ax)+1*16])
-		AS2(	movdqa	[SSE2_stateCopy+1*16], xmm0)
-		AS2(	movq	xmm0, QWORD PTR [WORD_REG(ax)+2*16])
-		AS2(	movq	QWORD PTR [SSE2_stateCopy+2*16], xmm0)
-		AS2(	psrlq	xmm0, 32)
-		AS2(	movd	AS_REG_6d, xmm0)				// s(9)
-		AS2(	mov		ecx, [WORD_REG(ax)+10*4])
-		AS2(	mov		edx, [WORD_REG(ax)+11*4])
-		AS2(	pcmpeqb	xmm7, xmm7)				// all ones
-
-#define s(i)	SSE2_stateCopy + ASM_MOD(i,10)*4
-#define u(j)	WORD_REG(di) + (ASM_MOD(j,4)*20 + (j/4)) * 4
-#define v(j)	WORD_REG(di) + (ASM_MOD(j,4)*20 + (j/4)) * 4 + 80*4
-
-#define R10 ecx
-#define R11 edx
-#define R20 edx
-#define R21 ecx
-// workaround bug in GAS 2.15
-#define R20r WORD_REG(dx)
-#define R21r WORD_REG(cx)
-
-#define SSE2_STEP(i, j)	\
-	AS2(	mov		eax, [s(i+0)])\
-	AS2(	mov		[v(i)], eax)\
-	AS2(	rol		eax, 8)\
-	AS2(	lea		AS_REG_7, [AS_REG_6 + R2##j##r])\
-	AS2(	xor		AS_REG_7d, R1##j)\
-	AS2(	mov		[u(i)], AS_REG_7d)\
-	AS2(	mov		AS_REG_7d, 1)\
-	AS2(	and		AS_REG_7d, R2##j)\
-	AS1(	neg		AS_REG_7d)\
-	AS2(	and		AS_REG_7d, AS_REG_6d)\
-	AS2(	xor		AS_REG_6d, eax)\
-	AS2(	movzx	eax, al)\
-	AS2(	xor		AS_REG_6d, [WORD_REG(si)+WORD_REG(ax)*4])\
-	AS2(	mov		eax, [s(i+3)])\
-	AS2(	xor		AS_REG_7d, [s(i+2)])\
-	AS2(	add		R1##j, AS_REG_7d)\
-	AS2(	movzx	AS_REG_7d, al)\
-	AS2(	shr		eax, 8)\
-	AS2(	xor		AS_REG_6d, [WORD_REG(si)+1024+AS_REG_7*4])\
-	AS2(	xor		AS_REG_6d, eax)\
-	AS2(	imul	R2##j, AS_HEX(54655307))\
-	AS2(	rol		R2##j, 7)\
-	AS2(	mov		[s(i+0)], AS_REG_6d)\
-
-		ASL(2)	// outer loop, each iteration of this processes 80 words
-		AS2(	lea		WORD_REG(di), [SSE2_uvStart])	// start of v and u
-		AS2(	mov		WORD_REG(ax), 80)
-		AS2(	cmp		WORD_REG(si), 80)
-		AS2(	cmovg	WORD_REG(si), WORD_REG(ax))
-		AS2(	mov		SSE2_wordsLeft2, WORD_REG(si))
-		AS2(	lea		WORD_REG(si), [WORD_REG(di)+WORD_REG(si)])		// use to end first inner loop
-		AS2(	mov		SSE2_diEnd, WORD_REG(si))
-#ifdef _MSC_VER
-		AS2(	lea		WORD_REG(si), s_sosemanukMulTables)
-#else
-		AS2(	mov		WORD_REG(si), SSE2_pMulTables)
-#endif
-
-		ASL(0)	// first inner loop, 20 words each, 4 iterations
-		SSE2_STEP(0, 0)
-		SSE2_STEP(1, 1)
-		SSE2_STEP(2, 0)
-		SSE2_STEP(3, 1)
-		SSE2_STEP(4, 0)
-		SSE2_STEP(5, 1)
-		SSE2_STEP(6, 0)
-		SSE2_STEP(7, 1)
-		SSE2_STEP(8, 0)
-		SSE2_STEP(9, 1)
-		SSE2_STEP(10, 0)
-		SSE2_STEP(11, 1)
-		SSE2_STEP(12, 0)
-		SSE2_STEP(13, 1)
-		SSE2_STEP(14, 0)
-		SSE2_STEP(15, 1)
-		SSE2_STEP(16, 0)
-		SSE2_STEP(17, 1)
-		SSE2_STEP(18, 0)
-		SSE2_STEP(19, 1)
-		// loop
-		AS2(	add		WORD_REG(di), 5*4)
-		AS2(	cmp		WORD_REG(di), SSE2_diEnd)
-		ASJ(	jne,	0, b)
-
-		AS2(	mov		WORD_REG(ax), SSE2_input)
-		AS2(	mov		AS_REG_7, SSE2_output)
-		AS2(	lea		WORD_REG(di), [SSE2_uvStart])		// start of v and u
-		AS2(	mov		WORD_REG(si), SSE2_wordsLeft2)
-
-		ASL(1)	// second inner loop, 16 words each, 5 iterations
-		AS2(	movdqa	xmm0, [WORD_REG(di)+0*20*4])
-		AS2(	movdqa	xmm2, [WORD_REG(di)+2*20*4])
-		AS2(	movdqa	xmm3, [WORD_REG(di)+3*20*4])
-		AS2(	movdqa	xmm1, [WORD_REG(di)+1*20*4])
-		// S2
-		AS2(	movdqa	xmm4, xmm0)
-		AS2(	pand	xmm0, xmm2)
-		AS2(    pxor	xmm0, xmm3)
-		AS2(    pxor	xmm2, xmm1)
- 		AS2(	pxor	xmm2, xmm0)
- 		AS2(	por		xmm3, xmm4)
- 		AS2(	pxor	xmm3, xmm1)
- 		AS2(	pxor	xmm4, xmm2)
- 		AS2(	movdqa	xmm1, xmm3)
- 		AS2(	por		xmm3, xmm4)
- 		AS2(	pxor	xmm3, xmm0)
- 		AS2(	pand	xmm0, xmm1)
- 		AS2(	pxor	xmm4, xmm0)
- 		AS2(	pxor	xmm1, xmm3)
- 		AS2(	pxor	xmm1, xmm4)
-		AS2(	pxor	xmm4, xmm7)
-		// xor with v
-		AS2(	pxor	xmm2, [WORD_REG(di)+80*4])
-		AS2(	pxor	xmm3, [WORD_REG(di)+80*5])
-		AS2(	pxor	xmm1, [WORD_REG(di)+80*6])
-		AS2(	pxor	xmm4, [WORD_REG(di)+80*7])
-		// exit loop early if less than 16 words left to output
-		// this is necessary because block size is 20 words, and we output 16 words in each iteration of this loop
-		AS2(	cmp		WORD_REG(si), 16)
-		ASJ(	jl,		4, f)
-		// unpack
-		AS2(	movdqa		xmm6, xmm2)
-		AS2(	punpckldq	xmm2, xmm3)
-		AS2(	movdqa		xmm5, xmm1)
-		AS2(	punpckldq	xmm1, xmm4)
-		AS2(	movdqa		xmm0, xmm2)
-		AS2(	punpcklqdq	xmm2, xmm1)
-		AS2(	punpckhqdq	xmm0, xmm1)
-		AS2(	punpckhdq	xmm6, xmm3)
-		AS2(	punpckhdq	xmm5, xmm4)
-		AS2(	movdqa		xmm3, xmm6)
-		AS2(	punpcklqdq	xmm6, xmm5)
-		AS2(	punpckhqdq	xmm3, xmm5)
-
-		// output keystream
-		AS_XMM_OUTPUT4(SSE2_Sosemanuk_Output, WORD_REG(ax), AS_REG_7, 2,0,6,3, 1, 0,1,2,3, 4)
-
-		// loop
-		AS2(	add		WORD_REG(di), 4*4)
-		AS2(	sub		WORD_REG(si), 16)
-		ASJ(	jnz,	1, b)
-
-		// outer loop
-		AS2(	mov		WORD_REG(si), SSE2_wordsLeft)
-		AS2(	sub		WORD_REG(si), 80)
-		ASJ(	jz,		6, f)
-		AS2(	mov		SSE2_wordsLeft, WORD_REG(si))
-		AS2(	mov		SSE2_input, WORD_REG(ax))
-		AS2(	mov		SSE2_output, AS_REG_7)
-		ASJ(	jmp,	2, b)
-
-		ASL(4)	// final output of less than 16 words
-		AS2(	test	WORD_REG(ax), WORD_REG(ax))
-		ASJ(	jz,		5, f)
-		AS2(	movd	xmm0, dword ptr [WORD_REG(ax)+0*4])
-		AS2(	pxor	xmm2, xmm0)
-		AS2(	movd	xmm0, dword ptr [WORD_REG(ax)+1*4])
-		AS2(	pxor	xmm3, xmm0)
-		AS2(	movd	xmm0, dword ptr [WORD_REG(ax)+2*4])
-		AS2(	pxor	xmm1, xmm0)
-		AS2(	movd	xmm0, dword ptr [WORD_REG(ax)+3*4])
-		AS2(	pxor	xmm4, xmm0)
-		AS2(	add		WORD_REG(ax), 16)
-		ASL(5)
-		AS2(	movd	dword ptr [AS_REG_7+0*4], xmm2)
-		AS2(	movd	dword ptr [AS_REG_7+1*4], xmm3)
-		AS2(	movd	dword ptr [AS_REG_7+2*4], xmm1)
-		AS2(	movd	dword ptr [AS_REG_7+3*4], xmm4)
-		AS2(	sub		WORD_REG(si), 4)
-		ASJ(	jz,		6, f)
-		AS2(	add		AS_REG_7, 16)
-		AS2(	psrldq	xmm2, 4)
-		AS2(	psrldq	xmm3, 4)
-		AS2(	psrldq	xmm1, 4)
-		AS2(	psrldq	xmm4, 4)
-		ASJ(	jmp,	4, b)
-
-		ASL(6)	// save state
-		AS2(	mov		AS_REG_6, SSE2_state)
-		AS2(	movdqa	xmm0, [SSE2_stateCopy+0*16])
-		AS2(	movdqa	[AS_REG_6+0*16], xmm0)
-		AS2(	movdqa	xmm0, [SSE2_stateCopy+1*16])
-		AS2(	movdqa	[AS_REG_6+1*16], xmm0)
-		AS2(	movq	xmm0, QWORD PTR [SSE2_stateCopy+2*16])
-		AS2(	movq	QWORD PTR [AS_REG_6+2*16], xmm0)
-		AS2(	mov		[AS_REG_6+10*4], ecx)
-		AS2(	mov		[AS_REG_6+11*4], edx)
-
-		AS_POP_IF86(	sp)
-		AS_POP_IF86(	bp)
-
-#ifdef __GNUC__
-		AS_POP_IF86(	bx)
-		ATT_PREFIX
-			:
-			: "a" (m_state.m_ptr), "c" (iterationCount), "S" (s_sosemanukMulTables), "D" (output), "d" (input)
-	#if CRYPTOPP_BOOL_X64
-			, "r" (workspace.m_ptr)
-			: "memory", "cc", "%r9", "%r10", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7"
-	#else
-			: "memory", "cc"
-	#endif
-		);
-#endif
-#ifdef CRYPTOPP_GENERATE_X64_MASM
-	movdqa	xmm6, [rsp + 02f0h]
-	movdqa	xmm7, [rsp + 0300h]
-	add		rsp, 80*4*2+12*4+8*WORD_SZ + 2*16+8
-	pop		rdi
-	pop		rsi
-	ret
-	Sosemanuk_OperateKeystream ENDP
-#else
-	}
-	else
-#endif
-#endif
-#ifndef CRYPTOPP_GENERATE_X64_MASM
-	{
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
-#define MUL_A(x)    (x = rotlFixed(x, 8), x ^ s_sosemanukMulTables[byte(x)])
-#else
-#define MUL_A(x)    (((x) << 8) ^ s_sosemanukMulTables[(x) >> 24])
-#endif
-
-#define DIV_A(x)    (((x) >> 8) ^ s_sosemanukMulTables[256 + byte(x)])
-
-#define r1(i) ((i%2) ? reg2 : reg1)
-#define r2(i) ((i%2) ? reg1 : reg2)
-
-#define STEP(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, v, u)	\
-		u = (s##x9 + r2(x0)) ^ r1(x0);\
-		v = s##x0;\
-		s##x0 = MUL_A(s##x0) ^ DIV_A(s##x3) ^ s##x9;\
-		r1(x0) += XMUX(r2(x0), s##x2, s##x9);\
-		r2(x0) = rotlFixed(r2(x0) * 0x54655307, 7);\
-
-#define SOSEMANUK_OUTPUT(x)	\
-	CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 0, u2 ^ v0);\
-	CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 1, u3 ^ v1);\
-	CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 2, u1 ^ v2);\
-	CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, LITTLE_ENDIAN_ORDER, 3, u4 ^ v3);
-
-#define OUTPUT4	\
-	S2(0, u0, u1, u2, u3, u4);\
-	CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(SOSEMANUK_OUTPUT, 4*4);
-
-	word32 s0 = m_state[0];
-	word32 s1 = m_state[1];
-	word32 s2 = m_state[2];
-	word32 s3 = m_state[3];
-	word32 s4 = m_state[4];
-	word32 s5 = m_state[5];
-	word32 s6 = m_state[6];
-	word32 s7 = m_state[7];
-	word32 s8 = m_state[8];
-	word32 s9 = m_state[9];
-	word32 reg1 = m_state[10];
-	word32 reg2 = m_state[11];
-	word32 u0, u1, u2, u3, u4, v0, v1, v2, v3;
-
-	do
-	{
-		STEP(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, v0, u0)
-		STEP(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, v1, u1)
-		STEP(2, 3, 4, 5, 6, 7, 8, 9, 0, 1, v2, u2)
-		STEP(3, 4, 5, 6, 7, 8, 9, 0, 1, 2, v3, u3)
-		OUTPUT4
-		STEP(4, 5, 6, 7, 8, 9, 0, 1, 2, 3, v0, u0)
-		STEP(5, 6, 7, 8, 9, 0, 1, 2, 3, 4, v1, u1)
-		STEP(6, 7, 8, 9, 0, 1, 2, 3, 4, 5, v2, u2)
-		STEP(7, 8, 9, 0, 1, 2, 3, 4, 5, 6, v3, u3)
-		OUTPUT4
-		STEP(8, 9, 0, 1, 2, 3, 4, 5, 6, 7, v0, u0)
-		STEP(9, 0, 1, 2, 3, 4, 5, 6, 7, 8, v1, u1)
-		STEP(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, v2, u2)
-		STEP(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, v3, u3)
-		OUTPUT4
-		STEP(2, 3, 4, 5, 6, 7, 8, 9, 0, 1, v0, u0)
-		STEP(3, 4, 5, 6, 7, 8, 9, 0, 1, 2, v1, u1)
-		STEP(4, 5, 6, 7, 8, 9, 0, 1, 2, 3, v2, u2)
-		STEP(5, 6, 7, 8, 9, 0, 1, 2, 3, 4, v3, u3)
-		OUTPUT4
-		STEP(6, 7, 8, 9, 0, 1, 2, 3, 4, 5, v0, u0)
-		STEP(7, 8, 9, 0, 1, 2, 3, 4, 5, 6, v1, u1)
-		STEP(8, 9, 0, 1, 2, 3, 4, 5, 6, 7, v2, u2)
-		STEP(9, 0, 1, 2, 3, 4, 5, 6, 7, 8, v3, u3)
-		OUTPUT4
-	}
-	while (--iterationCount);
-
-	m_state[0] = s0;
-	m_state[1] = s1;
-	m_state[2] = s2;
-	m_state[3] = s3;
-	m_state[4] = s4;
-	m_state[5] = s5;
-	m_state[6] = s6;
-	m_state[7] = s7;
-	m_state[8] = s8;
-	m_state[9] = s9;
-	m_state[10] = reg1;
-	m_state[11] = reg2;
-	}
-}
-
-NAMESPACE_END
-
-#endif // #ifndef CRYPTOPP_GENERATE_X64_MASM
diff --git a/src-cryptopp/sosemanuk.h b/src-cryptopp/sosemanuk.h
deleted file mode 100644
index a64d92c..0000000
--- a/src-cryptopp/sosemanuk.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// sosemanuk.h - written and placed in the public domain by Wei Dai
-
-//! \file sosemanuk.h
-//! \brief Classes for Sosemanuk stream cipher
-
-#ifndef CRYPTOPP_SOSEMANUK_H
-#define CRYPTOPP_SOSEMANUK_H
-
-#include "strciphr.h"
-#include "secblock.h"
-
-// Clang due to "Inline assembly operands don't work with .intel_syntax"
-//   https://llvm.org/bugs/show_bug.cgi?id=24232
-#if CRYPTOPP_BOOL_X32 || defined(CRYPTOPP_DISABLE_INTEL_ASM)
-# define CRYPTOPP_DISABLE_SOSEMANUK_ASM
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! algorithm info
-struct SosemanukInfo : public VariableKeyLength<16, 1, 32, 1, SimpleKeyingInterface::UNIQUE_IV, 16>
-{
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "Sosemanuk";}
-};
-
-//! _
-class SosemanukPolicy : public AdditiveCipherConcretePolicy<word32, 20>, public SosemanukInfo
-{
-protected:
-	void CipherSetKey(const NameValuePairs &params, const byte *key, size_t length);
-	void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount);
-	void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length);
-	bool CipherIsRandomAccess() const {return false;}
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
-	unsigned int GetAlignment() const;
-	unsigned int GetOptimalBlockSize() const;
-#endif
-
-	FixedSizeSecBlock<word32, 25*4> m_key;
-	FixedSizeAlignedSecBlock<word32, 12> m_state;
-};
-
-//! <a href="http://www.cryptolounge.org/wiki/Sosemanuk">Sosemanuk</a>
-struct Sosemanuk : public SosemanukInfo, public SymmetricCipherDocumentation
-{
-	typedef SymmetricCipherFinal<ConcretePolicyHolder<SosemanukPolicy, AdditiveCipherTemplate<> >, SosemanukInfo> Encryption;
-	typedef Encryption Decryption;
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/stdcpp.h b/src-cryptopp/stdcpp.h
deleted file mode 100644
index b4fae58..0000000
--- a/src-cryptopp/stdcpp.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef CRYPTOPP_STDCPP_H
-#define CRYPTOPP_STDCPP_H
-
-#if _MSC_VER >= 1500
-#define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY
-#include <intrin.h>
-#endif
-
-#include <string>
-#include <memory>
-#include <exception>
-#include <typeinfo>
-#include <algorithm>
-#include <functional>
-#include <utility>
-#include <vector>
-#include <limits>
-#include <deque>
-#include <list>
-#include <map>
-#include <new>
-
-// http://connect.microsoft.com/VisualStudio/feedback/details/1600701/type-info-does-not-compile-with-has-exceptions-0
-#if defined(_MSC_VER) && (_MSC_VER < 1900) && defined(_HAS_EXCEPTIONS) && (_HAS_EXCEPTIONS == 0)
-namespace std {
-  using ::type_info;
-}
-#endif
-
-// make_unchecked_array_iterator
-#if _MSC_VER >= 1600
-#include <iterator>
-#endif
-
-#if defined(CRYPTOPP_CXX11_ATOMICS)
-#include <atomic>
-#endif
-
-#if defined(CRYPTOPP_CXX11_SYNCHRONIZATION)
-#include <mutex>
-#endif
-
-#if defined(CRYPTOPP_CXX11_RVALUES)
-# include <utility>
-#endif
-
-#include <cstdlib>
-#include <cstddef>
-#include <cstring>
-#include <climits>
-
-// uintptr_t and ptrdiff_t
-#if (__cplusplus < 201103L) && (!defined(_MSC_VER) || (_MSC_VER >= 1700))
-# include <stdint.h>
-#elif defined(_MSC_VER) && (_MSC_VER < 1700)
-# include <stddef.h>
-#endif
-
-// workaround needed on Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21
-#ifdef CRYPTOPP_INCLUDE_VECTOR_CC
-# include <vector.cc>
-#endif
-
-// for alloca
-#if defined(CRYPTOPP_BSD_AVAILABLE)
-# include <stdlib.h>
-#elif defined(CRYPTOPP_UNIX_AVAILABLE) || defined(__sun) || defined(QNX)
-# include <alloca.h>
-#elif defined(CRYPTOPP_WIN32_AVAILABLE) || defined(__MINGW32__) || defined(__BORLANDC__)
-# include <malloc.h>
-#endif
-
-#ifdef _MSC_VER
-# pragma warning(disable: 4231)	// re-disable this
-# ifdef _CRTAPI1
-#  define CRYPTOPP_MSVCRT6
-# endif
-#endif
-
-#endif
diff --git a/src-cryptopp/strciphr.cpp b/src-cryptopp/strciphr.cpp
deleted file mode 100644
index a0197c9..0000000
--- a/src-cryptopp/strciphr.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-// strciphr.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "strciphr.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-template <class S>
-void AdditiveCipherTemplate<S>::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
-{
-	PolicyInterface &policy = this->AccessPolicy();
-	policy.CipherSetKey(params, key, length);
-	m_leftOver = 0;
-	unsigned int bufferByteSize = policy.CanOperateKeystream() ? GetBufferByteSize(policy) : RoundUpToMultipleOf(1024U, GetBufferByteSize(policy));
-	m_buffer.New(bufferByteSize);
-
-	if (this->IsResynchronizable())
-	{
-		size_t ivLength;
-		const byte *iv = this->GetIVAndThrowIfInvalid(params, ivLength);
-		policy.CipherResynchronize(m_buffer, iv, ivLength);
-	}
-}
-
-template <class S>
-void AdditiveCipherTemplate<S>::GenerateBlock(byte *outString, size_t length)
-{
-	if (m_leftOver > 0)
-	{
-		size_t len = STDMIN(m_leftOver, length);
-		memcpy(outString, KeystreamBufferEnd()-m_leftOver, len);
-		length -= len;
-		m_leftOver -= len;
-		outString += len;
-
-		if (!length)
-			return;
-	}
-	CRYPTOPP_ASSERT(m_leftOver == 0);
-
-	PolicyInterface &policy = this->AccessPolicy();
-	unsigned int bytesPerIteration = policy.GetBytesPerIteration();
-
-	if (length >= bytesPerIteration)
-	{
-		size_t iterations = length / bytesPerIteration;
-		policy.WriteKeystream(outString, iterations);
-		outString += iterations * bytesPerIteration;
-		length -= iterations * bytesPerIteration;
-	}
-
-	if (length > 0)
-	{
-		size_t bufferByteSize = RoundUpToMultipleOf(length, bytesPerIteration);
-		size_t bufferIterations = bufferByteSize / bytesPerIteration;
-
-		policy.WriteKeystream(KeystreamBufferEnd()-bufferByteSize, bufferIterations);
-		memcpy(outString, KeystreamBufferEnd()-bufferByteSize, length);
-		m_leftOver = bufferByteSize - length;
-	}
-}
-
-template <class S>
-void AdditiveCipherTemplate<S>::ProcessData(byte *outString, const byte *inString, size_t length)
-{
-	if (m_leftOver > 0)
-	{
-		size_t len = STDMIN(m_leftOver, length);
-		xorbuf(outString, inString, KeystreamBufferEnd()-m_leftOver, len);
-		length -= len;
-		m_leftOver -= len;
-		inString += len;
-		outString += len;
-
-		if (!length)
-			return;
-	}
-	CRYPTOPP_ASSERT(m_leftOver == 0);
-
-	PolicyInterface &policy = this->AccessPolicy();
-	unsigned int bytesPerIteration = policy.GetBytesPerIteration();
-
-	if (policy.CanOperateKeystream() && length >= bytesPerIteration)
-	{
-		size_t iterations = length / bytesPerIteration;
-		unsigned int alignment = policy.GetAlignment();
-		KeystreamOperation operation = KeystreamOperation((IsAlignedOn(inString, alignment) * 2) | (int)IsAlignedOn(outString, alignment));
-
-		policy.OperateKeystream(operation, outString, inString, iterations);
-
-		inString += iterations * bytesPerIteration;
-		outString += iterations * bytesPerIteration;
-		length -= iterations * bytesPerIteration;
-
-		if (!length)
-			return;
-	}
-
-	size_t bufferByteSize = m_buffer.size();
-	size_t bufferIterations = bufferByteSize / bytesPerIteration;
-
-	while (length >= bufferByteSize)
-	{
-		policy.WriteKeystream(m_buffer, bufferIterations);
-		xorbuf(outString, inString, KeystreamBufferBegin(), bufferByteSize);
-		length -= bufferByteSize;
-		inString += bufferByteSize;
-		outString += bufferByteSize;
-	}
-
-	if (length > 0)
-	{
-		bufferByteSize = RoundUpToMultipleOf(length, bytesPerIteration);
-		bufferIterations = bufferByteSize / bytesPerIteration;
-
-		policy.WriteKeystream(KeystreamBufferEnd()-bufferByteSize, bufferIterations);
-		xorbuf(outString, inString, KeystreamBufferEnd()-bufferByteSize, length);
-		m_leftOver = bufferByteSize - length;
-	}
-}
-
-template <class S>
-void AdditiveCipherTemplate<S>::Resynchronize(const byte *iv, int length)
-{
-	PolicyInterface &policy = this->AccessPolicy();
-	m_leftOver = 0;
-	m_buffer.New(GetBufferByteSize(policy));
-	policy.CipherResynchronize(m_buffer, iv, this->ThrowIfInvalidIVLength(length));
-}
-
-template <class BASE>
-void AdditiveCipherTemplate<BASE>::Seek(lword position)
-{
-	PolicyInterface &policy = this->AccessPolicy();
-	unsigned int bytesPerIteration = policy.GetBytesPerIteration();
-
-	policy.SeekToIteration(position / bytesPerIteration);
-	position %= bytesPerIteration;
-
-	if (position > 0)
-	{
-		policy.WriteKeystream(KeystreamBufferEnd()-bytesPerIteration, 1);
-		m_leftOver = bytesPerIteration - (unsigned int)position;
-	}
-	else
-		m_leftOver = 0;
-}
-
-template <class BASE>
-void CFB_CipherTemplate<BASE>::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
-{
-	PolicyInterface &policy = this->AccessPolicy();
-	policy.CipherSetKey(params, key, length);
-
-	if (this->IsResynchronizable())
-	{
-		size_t ivLength;
-		const byte *iv = this->GetIVAndThrowIfInvalid(params, ivLength);
-		policy.CipherResynchronize(iv, ivLength);
-	}
-
-	m_leftOver = policy.GetBytesPerIteration();
-}
-
-template <class BASE>
-void CFB_CipherTemplate<BASE>::Resynchronize(const byte *iv, int length)
-{
-	PolicyInterface &policy = this->AccessPolicy();
-	policy.CipherResynchronize(iv, this->ThrowIfInvalidIVLength(length));
-	m_leftOver = policy.GetBytesPerIteration();
-}
-
-template <class BASE>
-void CFB_CipherTemplate<BASE>::ProcessData(byte *outString, const byte *inString, size_t length)
-{
-	CRYPTOPP_ASSERT(length % this->MandatoryBlockSize() == 0);
-
-	PolicyInterface &policy = this->AccessPolicy();
-	unsigned int bytesPerIteration = policy.GetBytesPerIteration();
-	unsigned int alignment = policy.GetAlignment();
-	byte *reg = policy.GetRegisterBegin();
-
-	if (m_leftOver)
-	{
-		size_t len = STDMIN(m_leftOver, length);
-		CombineMessageAndShiftRegister(outString, reg + bytesPerIteration - m_leftOver, inString, len);
-		m_leftOver -= len;
-		length -= len;
-		inString += len;
-		outString += len;
-	}
-
-	if (!length)
-		return;
-
-	CRYPTOPP_ASSERT(m_leftOver == 0);
-
-	if (policy.CanIterate() && length >= bytesPerIteration && IsAlignedOn(outString, alignment))
-	{
-		if (IsAlignedOn(inString, alignment))
-			policy.Iterate(outString, inString, GetCipherDir(*this), length / bytesPerIteration);
-		else
-		{
-			memcpy(outString, inString, length);
-			policy.Iterate(outString, outString, GetCipherDir(*this), length / bytesPerIteration);
-		}
-		inString += length - length % bytesPerIteration;
-		outString += length - length % bytesPerIteration;
-		length %= bytesPerIteration;
-	}
-
-	while (length >= bytesPerIteration)
-	{
-		policy.TransformRegister();
-		CombineMessageAndShiftRegister(outString, reg, inString, bytesPerIteration);
-		length -= bytesPerIteration;
-		inString += bytesPerIteration;
-		outString += bytesPerIteration;
-	}
-
-	if (length > 0)
-	{
-		policy.TransformRegister();
-		CombineMessageAndShiftRegister(outString, reg, inString, length);
-		m_leftOver = bytesPerIteration - length;
-	}
-}
-
-template <class BASE>
-void CFB_EncryptionTemplate<BASE>::CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length)
-{
-	xorbuf(reg, message, length);
-	memcpy(output, reg, length);
-}
-
-template <class BASE>
-void CFB_DecryptionTemplate<BASE>::CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length)
-{
-	for (unsigned int i=0; i<length; i++)
-	{
-		byte b = message[i];
-		output[i] = reg[i] ^ b;
-		reg[i] = b;
-	}
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/strciphr.h b/src-cryptopp/strciphr.h
deleted file mode 100644
index 9d1e093..0000000
--- a/src-cryptopp/strciphr.h
+++ /dev/null
@@ -1,633 +0,0 @@
-// strciphr.h - written and placed in the public domain by Wei Dai
-
-//! \file strciphr.h
-//! \brief Classes for implementing stream ciphers
-//! \details This file contains helper classes for implementing stream ciphers.
-//!   All this infrastructure may look very complex compared to what's in Crypto++ 4.x,
-//!   but stream ciphers implementations now support a lot of new functionality,
-//!   including better performance (minimizing copying), resetting of keys and IVs, and methods to
-//!   query which features are supported by a cipher.
-//! \details Here's an explanation of these classes. The word "policy" is used here to mean a class with a
-//!   set of methods that must be implemented by individual stream cipher implementations.
-//!   This is usually much simpler than the full stream cipher API, which is implemented by
-//!   either AdditiveCipherTemplate or CFB_CipherTemplate using the policy. So for example, an
-//!   implementation of SEAL only needs to implement the AdditiveCipherAbstractPolicy interface
-//!   (since it's an additive cipher, i.e., it xors a keystream into the plaintext).
-//!   See this line in seal.h:
-//! <pre>
-//!     typedef SymmetricCipherFinal\<ConcretePolicyHolder\<SEAL_Policy\<B\>, AdditiveCipherTemplate\<\> \> \> Encryption;
-//! </pre>
-//! \details AdditiveCipherTemplate and CFB_CipherTemplate are designed so that they don't need
-//!   to take a policy class as a template parameter (although this is allowed), so that
-//!   their code is not duplicated for each new cipher. Instead they each
-//!   get a reference to an abstract policy interface by calling AccessPolicy() on itself, so
-//!   AccessPolicy() must be overriden to return the actual policy reference. This is done
-//!   by the ConceretePolicyHolder class. Finally, SymmetricCipherFinal implements the constructors and
-//!   other functions that must be implemented by the most derived class.
-
-#ifndef CRYPTOPP_STRCIPHR_H
-#define CRYPTOPP_STRCIPHR_H
-
-#include "config.h"
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4127 4189)
-#endif
-
-#include "cryptlib.h"
-#include "seckey.h"
-#include "secblock.h"
-#include "argnames.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! \class AbstractPolicyHolder
-//! \brief Access a stream cipher policy object
-//! \tparam POLICY_INTERFACE class implementing AbstractPolicyHolder
-//! \tparam BASE class or type to use as a base class
-template <class POLICY_INTERFACE, class BASE = Empty>
-class CRYPTOPP_NO_VTABLE AbstractPolicyHolder : public BASE
-{
-public:
-	typedef POLICY_INTERFACE PolicyInterface;
-	virtual ~AbstractPolicyHolder() {}
-
-protected:
-	virtual const POLICY_INTERFACE & GetPolicy() const =0;
-	virtual POLICY_INTERFACE & AccessPolicy() =0;
-};
-
-//! \class ConcretePolicyHolder
-//! \brief Stream cipher policy object
-//! \tparam POLICY class implementing AbstractPolicyHolder
-//! \tparam BASE class or type to use as a base class
-template <class POLICY, class BASE, class POLICY_INTERFACE = CPP_TYPENAME BASE::PolicyInterface>
-class ConcretePolicyHolder : public BASE, protected POLICY
-{
-public:
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
-	virtual ~ConcretePolicyHolder() {}
-#endif
-protected:
-	const POLICY_INTERFACE & GetPolicy() const {return *this;}
-	POLICY_INTERFACE & AccessPolicy() {return *this;}
-};
-
-//! \brief Keystream operation flags
-//! \sa AdditiveCipherAbstractPolicy::GetBytesPerIteration(), AdditiveCipherAbstractPolicy::GetOptimalBlockSize()
-//!   and AdditiveCipherAbstractPolicy::GetAlignment()
-enum KeystreamOperationFlags {
-	//! \brief Output buffer is aligned
-	OUTPUT_ALIGNED=1,
-	//! \brief Input buffer is aligned
-	INPUT_ALIGNED=2,
-	//! \brief Input buffer is NULL
-	INPUT_NULL = 4
-};
-
-//! \brief Keystream operation flags
-//! \sa AdditiveCipherAbstractPolicy::GetBytesPerIteration(), AdditiveCipherAbstractPolicy::GetOptimalBlockSize()
-//!   and AdditiveCipherAbstractPolicy::GetAlignment()
-enum KeystreamOperation {
-	//! \brief Wirte the keystream to the output buffer, input is NULL
-	WRITE_KEYSTREAM				= INPUT_NULL,
-	//! \brief Wirte the keystream to the aligned output buffer, input is NULL
-	WRITE_KEYSTREAM_ALIGNED		= INPUT_NULL | OUTPUT_ALIGNED,
-	//! \brief XOR the input buffer and keystream, write to the output buffer
-	XOR_KEYSTREAM				= 0,
-	//! \brief XOR the aligned input buffer and keystream, write to the output buffer
-	XOR_KEYSTREAM_INPUT_ALIGNED = INPUT_ALIGNED,
-	//! \brief XOR the input buffer and keystream, write to the aligned output buffer
-	XOR_KEYSTREAM_OUTPUT_ALIGNED= OUTPUT_ALIGNED,
-	//! \brief XOR the aligned input buffer and keystream, write to the aligned output buffer
-	XOR_KEYSTREAM_BOTH_ALIGNED	= OUTPUT_ALIGNED | INPUT_ALIGNED};
-
-//! \class AdditiveCipherAbstractPolicy
-//! \brief Policy object for additive stream ciphers
-struct CRYPTOPP_DLL CRYPTOPP_NO_VTABLE AdditiveCipherAbstractPolicy
-{
-	virtual ~AdditiveCipherAbstractPolicy() {}
-
-	//! \brief Provides data alignment requirements
-	//! \returns data alignment requirements, in bytes
-	//! \details Internally, the default implementation returns 1. If the stream cipher is implemented
-	//!   using an SSE2 ASM or intrinsics, then the value returned is usually 16.
-	virtual unsigned int GetAlignment() const {return 1;}
-
-	//! \brief Provides number of bytes operated upon during an iteration
-	//! \returns bytes operated upon during an iteration, in bytes
-	//! \sa GetOptimalBlockSize()
-	virtual unsigned int GetBytesPerIteration() const =0;
-
-	//! \brief Provides number of ideal bytes to process
-	//! \returns the ideal number of bytes to process
-	//! \details Internally, the default implementation returns GetBytesPerIteration()
-	//! \sa GetBytesPerIteration()
-	virtual unsigned int GetOptimalBlockSize() const {return GetBytesPerIteration();}
-
-	//! \brief Provides buffer size based on iterations
-	//! \returns the buffer size based on iterations, in bytes
-	virtual unsigned int GetIterationsToBuffer() const =0;
-
-	//! \brief Generate the keystream
-	//! \param keystream the key stream
-	//! \param iterationCount the number of iterations to generate the key stream
-	//! \sa CanOperateKeystream(), OperateKeystream(), WriteKeystream()
-	virtual void WriteKeystream(byte *keystream, size_t iterationCount)
-		{OperateKeystream(KeystreamOperation(INPUT_NULL | (KeystreamOperationFlags)IsAlignedOn(keystream, GetAlignment())), keystream, NULL, iterationCount);}
-
-	//! \brief Flag indicating
-	//! \returns true if the stream can be generated independent of the transformation input, false otherwise
-	//! \sa CanOperateKeystream(), OperateKeystream(), WriteKeystream()
-	virtual bool CanOperateKeystream() const {return false;}
-
-	//! \brief Operates the keystream
-	//! \param operation the operation with additional flags
-	//! \param output the output buffer
-	//! \param input the input buffer
-	//! \param iterationCount the number of iterations to perform on the input
-	//! \details OperateKeystream() will attempt to operate upon GetOptimalBlockSize() buffer,
-	//!   which will be derived from GetBytesPerIteration().
-	//! \sa CanOperateKeystream(), OperateKeystream(), WriteKeystream(), KeystreamOperation()
-	virtual void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount)
-		{CRYPTOPP_UNUSED(operation); CRYPTOPP_UNUSED(output); CRYPTOPP_UNUSED(input); CRYPTOPP_UNUSED(iterationCount); CRYPTOPP_ASSERT(false);}
-
-	//! \brief Key the cipher
-	//! \param params set of NameValuePairs use to initialize this object
-	//! \param key a byte array used to key the cipher
-	//! \param length the size of the key array
-	virtual void CipherSetKey(const NameValuePairs &params, const byte *key, size_t length) =0;
-
-	//! \brief Resynchronize the cipher
-	//! \param keystreamBuffer the keystream buffer
-	//! \param iv a byte array used to resynchronize the cipher
-	//! \param length the size of the IV array
-	virtual void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length)
-		{CRYPTOPP_UNUSED(keystreamBuffer); CRYPTOPP_UNUSED(iv); CRYPTOPP_UNUSED(length); throw NotImplemented("SimpleKeyingInterface: this object doesn't support resynchronization");}
-
-	//! \brief Flag indicating random access
-	//! \returns true if the cipher is seekable, false otherwise
-	//! \sa SeekToIteration()
-	virtual bool CipherIsRandomAccess() const =0;
-
-	//! \brief Seeks to a random position in the stream
-	//! \returns iterationCount
-	//! \sa CipherIsRandomAccess()
-	virtual void SeekToIteration(lword iterationCount)
-		{CRYPTOPP_UNUSED(iterationCount); CRYPTOPP_ASSERT(!CipherIsRandomAccess()); throw NotImplemented("StreamTransformation: this object doesn't support random access");}
-};
-
-//! \class AdditiveCipherConcretePolicy
-//! \brief Base class for additive stream ciphers
-//! \tparam WT word type
-//! \tparam W count of words
-//! \tparam X bytes per iteration count
-//! \tparam BASE AdditiveCipherAbstractPolicy derived base class
-template <typename WT, unsigned int W, unsigned int X = 1, class BASE = AdditiveCipherAbstractPolicy>
-struct CRYPTOPP_NO_VTABLE AdditiveCipherConcretePolicy : public BASE
-{
-	typedef WT WordType;
-	CRYPTOPP_CONSTANT(BYTES_PER_ITERATION = sizeof(WordType) * W)
-
-#if !(CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X64)
-	//! \brief Provides data alignment requirements
-	//! \returns data alignment requirements, in bytes
-	//! \details Internally, the default implementation returns 1. If the stream cipher is implemented
-	//!   using an SSE2 ASM or intrinsics, then the value returned is usually 16.
-	unsigned int GetAlignment() const {return GetAlignmentOf<WordType>();}
-#endif
-
-	//! \brief Provides number of bytes operated upon during an iteration
-	//! \returns bytes operated upon during an iteration, in bytes
-	//! \sa GetOptimalBlockSize()
-	unsigned int GetBytesPerIteration() const {return BYTES_PER_ITERATION;}
-
-	//! \brief Provides buffer size based on iterations
-	//! \returns the buffer size based on iterations, in bytes
-	unsigned int GetIterationsToBuffer() const {return X;}
-
-	//! \brief Flag indicating
-	//! \returns true if the stream can be generated independent of the transformation input, false otherwise
-	//! \sa CanOperateKeystream(), OperateKeystream(), WriteKeystream()
-	bool CanOperateKeystream() const {return true;}
-
-	//! \brief Operates the keystream
-	//! \param operation the operation with additional flags
-	//! \param output the output buffer
-	//! \param input the input buffer
-	//! \param iterationCount the number of iterations to perform on the input
-	//! \details OperateKeystream() will attempt to operate upon GetOptimalBlockSize() buffer,
-	//!   which will be derived from GetBytesPerIteration().
-	//! \sa CanOperateKeystream(), OperateKeystream(), WriteKeystream(), KeystreamOperation()
-	virtual void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) =0;
-};
-
-//! \brief Helper macro to implement OperateKeystream
-#define CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, b, i, a)	\
-	PutWord(bool(x & OUTPUT_ALIGNED), b, output+i*sizeof(WordType), (x & INPUT_NULL) ? (a) : (a) ^ GetWord<WordType>(bool(x & INPUT_ALIGNED), b, input+i*sizeof(WordType)));
-
-//! \brief Helper macro to implement OperateKeystream
-#define CRYPTOPP_KEYSTREAM_OUTPUT_XMM(x, i, a)	{\
-	__m128i t = (x & INPUT_NULL) ? a : _mm_xor_si128(a, (x & INPUT_ALIGNED) ? _mm_load_si128((__m128i *)input+i) : _mm_loadu_si128((__m128i *)input+i));\
-	if (x & OUTPUT_ALIGNED) _mm_store_si128((__m128i *)output+i, t);\
-	else _mm_storeu_si128((__m128i *)output+i, t);}
-
-//! \brief Helper macro to implement OperateKeystream
-#define CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(x, y)	\
-	switch (operation)							\
-	{											\
-		case WRITE_KEYSTREAM:					\
-			x(WRITE_KEYSTREAM)					\
-			break;								\
-		case XOR_KEYSTREAM:						\
-			x(XOR_KEYSTREAM)					\
-			input += y;							\
-			break;								\
-		case XOR_KEYSTREAM_INPUT_ALIGNED:		\
-			x(XOR_KEYSTREAM_INPUT_ALIGNED)		\
-			input += y;							\
-			break;								\
-		case XOR_KEYSTREAM_OUTPUT_ALIGNED:		\
-			x(XOR_KEYSTREAM_OUTPUT_ALIGNED)		\
-			input += y;							\
-			break;								\
-		case WRITE_KEYSTREAM_ALIGNED:			\
-			x(WRITE_KEYSTREAM_ALIGNED)			\
-			break;								\
-		case XOR_KEYSTREAM_BOTH_ALIGNED:		\
-			x(XOR_KEYSTREAM_BOTH_ALIGNED)		\
-			input += y;							\
-			break;								\
-	}											\
-	output += y;
-
-//! \class AdditiveCipherTemplate
-//! \brief Base class for additive stream ciphers with SymmetricCipher interface
-//! \tparam BASE AbstractPolicyHolder base class
-template <class BASE = AbstractPolicyHolder<AdditiveCipherAbstractPolicy, SymmetricCipher> >
-class CRYPTOPP_NO_VTABLE AdditiveCipherTemplate : public BASE, public RandomNumberGenerator
-{
-public:
-	//! \brief Generate random array of bytes
-	//! \param output the byte buffer
-	//! \param size the length of the buffer, in bytes
-	//! \details All generated values are uniformly distributed over the range specified within the
-	//!   the contraints of a particular generator.
-	void GenerateBlock(byte *output, size_t size);
-
-	//! \brief Apply keystream to data
-	//! \param outString a buffer to write the transformed data
-	//! \param inString a buffer to read the data
-	//! \param length the size fo the buffers, in bytes
-	//! \details This is the primary method to operate a stream cipher. For example:
-	//! <pre>
-	//!     size_t size = 30;
-	//!     byte plain[size] = "Do or do not; there is no try";
-	//!     byte cipher[size];
-	//!     ...
-	//!     ChaCha20 chacha(key, keySize);
-	//!     chacha.ProcessData(cipher, plain, size);
-	//! </pre>
-    void ProcessData(byte *outString, const byte *inString, size_t length);
-
-	//! \brief Resynchronize the cipher
-	//! \param iv a byte array used to resynchronize the cipher
-	//! \param length the size of the IV array
-	void Resynchronize(const byte *iv, int length=-1);
-
-	//! \brief Provides number of ideal bytes to process
-	//! \returns the ideal number of bytes to process
-	//! \details Internally, the default implementation returns GetBytesPerIteration()
-	//! \sa GetBytesPerIteration() and GetOptimalNextBlockSize()
-	unsigned int OptimalBlockSize() const {return this->GetPolicy().GetOptimalBlockSize();}
-
-	//! \brief Provides number of ideal bytes to process
-	//! \returns the ideal number of bytes to process
-	//! \details Internally, the default implementation returns remaining unprocessed bytes
-	//! \sa GetBytesPerIteration() and OptimalBlockSize()
-	unsigned int GetOptimalNextBlockSize() const {return (unsigned int)this->m_leftOver;}
-
-	//! \brief Provides number of ideal data alignment
-	//! \returns the ideal data alignment, in bytes
-	//! \sa GetAlignment() and OptimalBlockSize()
-	unsigned int OptimalDataAlignment() const {return this->GetPolicy().GetAlignment();}
-
-	//! \brief Determines if the cipher is self inverting
-	//! \returns true if the stream cipher is self inverting, false otherwise
-	bool IsSelfInverting() const {return true;}
-
-	//! \brief Determines if the cipher is a forward transformation
-	//! \returns true if the stream cipher is a forward transformation, false otherwise
-	bool IsForwardTransformation() const {return true;}
-
-	//! \brief Flag indicating random access
-	//! \returns true if the cipher is seekable, false otherwise
-	//! \sa Seek()
-	bool IsRandomAccess() const {return this->GetPolicy().CipherIsRandomAccess();}
-
-	//! \brief Seeks to a random position in the stream
-	//! \param position the absolute position in the stream
-	//! \sa IsRandomAccess()
-	void Seek(lword position);
-
-	typedef typename BASE::PolicyInterface PolicyInterface;
-
-protected:
-	void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
-
-	unsigned int GetBufferByteSize(const PolicyInterface &policy) const {return policy.GetBytesPerIteration() * policy.GetIterationsToBuffer();}
-
-	inline byte * KeystreamBufferBegin() {return this->m_buffer.data();}
-	inline byte * KeystreamBufferEnd() {return (this->m_buffer.data() + this->m_buffer.size());}
-
-	SecByteBlock m_buffer;
-	size_t m_leftOver;
-};
-
-//! \class CFB_CipherAbstractPolicy
-//! \brief Policy object for feeback based stream ciphers
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CFB_CipherAbstractPolicy
-{
-public:
-	virtual ~CFB_CipherAbstractPolicy() {}
-
-	//! \brief Provides data alignment requirements
-	//! \returns data alignment requirements, in bytes
-	//! \details Internally, the default implementation returns 1. If the stream cipher is implemented
-	//!   using an SSE2 ASM or intrinsics, then the value returned is usually 16.
-	virtual unsigned int GetAlignment() const =0;
-
-	//! \brief Provides number of bytes operated upon during an iteration
-	//! \returns bytes operated upon during an iteration, in bytes
-	//! \sa GetOptimalBlockSize()
-	virtual unsigned int GetBytesPerIteration() const =0;
-
-	//! \brief Access the feedback register
-	//! \returns pointer to the first byte of the feedback register
-	virtual byte * GetRegisterBegin() =0;
-
-	//! \brief TODO
-	virtual void TransformRegister() =0;
-
-	//! \brief Flag indicating iteration support
-	//! \returns true if the cipher supports iteration, false otherwise
-	virtual bool CanIterate() const {return false;}
-
-	//! \brief Iterate the cipher
-	//! \param output the output buffer
-	//! \param input the input buffer
-	//! \param dir the direction of the cipher
-	//! \param iterationCount the number of iterations to perform on the input
-	//! \sa IsSelfInverting() and IsForwardTransformation()
-	virtual void Iterate(byte *output, const byte *input, CipherDir dir, size_t iterationCount)
-		{CRYPTOPP_UNUSED(output); CRYPTOPP_UNUSED(input); CRYPTOPP_UNUSED(dir); CRYPTOPP_UNUSED(iterationCount);
-		 CRYPTOPP_ASSERT(false); /*throw 0;*/ throw Exception(Exception::OTHER_ERROR, "SimpleKeyingInterface: unexpected error");}
-
-	//! \brief Key the cipher
-	//! \param params set of NameValuePairs use to initialize this object
-	//! \param key a byte array used to key the cipher
-	//! \param length the size of the key array
-	virtual void CipherSetKey(const NameValuePairs &params, const byte *key, size_t length) =0;
-
-	//! \brief Resynchronize the cipher
-	//! \param iv a byte array used to resynchronize the cipher
-	//! \param length the size of the IV array
-	virtual void CipherResynchronize(const byte *iv, size_t length)
-		{CRYPTOPP_UNUSED(iv); CRYPTOPP_UNUSED(length); throw NotImplemented("SimpleKeyingInterface: this object doesn't support resynchronization");}
-};
-
-//! \class CFB_CipherConcretePolicy
-//! \brief Base class for feedback based stream ciphers
-//! \tparam WT word type
-//! \tparam W count of words
-//! \tparam BASE CFB_CipherAbstractPolicy derived base class
-template <typename WT, unsigned int W, class BASE = CFB_CipherAbstractPolicy>
-struct CRYPTOPP_NO_VTABLE CFB_CipherConcretePolicy : public BASE
-{
-	typedef WT WordType;
-
-	//! \brief Provides data alignment requirements
-	//! \returns data alignment requirements, in bytes
-	//! \details Internally, the default implementation returns 1. If the stream cipher is implemented
-	//!   using an SSE2 ASM or intrinsics, then the value returned is usually 16.
-	unsigned int GetAlignment() const {return sizeof(WordType);}
-
-	//! \brief Provides number of bytes operated upon during an iteration
-	//! \returns bytes operated upon during an iteration, in bytes
-	//! \sa GetOptimalBlockSize()
-	unsigned int GetBytesPerIteration() const {return sizeof(WordType) * W;}
-
-	//! \brief Flag indicating iteration support
-	//! \returns true if the cipher supports iteration, false otherwise
-	bool CanIterate() const {return true;}
-
-	//! \brief Perform one iteration in the forward direction
-	void TransformRegister() {this->Iterate(NULL, NULL, ENCRYPTION, 1);}
-
-	//! \brief
-	//! \tparam B enumeration indicating endianess
-	//! \details RegisterOutput() provides alternate access to the feedback register. The
-	//!   enumeration B is BigEndian or LittleEndian. Repeatedly applying operator()
-	//!   results in advancing in the register.
-	template <class B>
-	struct RegisterOutput
-	{
-		RegisterOutput(byte *output, const byte *input, CipherDir dir)
-			: m_output(output), m_input(input), m_dir(dir) {}
-
-		//! \brief XOR feedback register with data
-		//! \param registerWord data represented as a word type
-		//! \returns reference to the next feedback register word
-		inline RegisterOutput& operator()(WordType &registerWord)
-		{
-			CRYPTOPP_ASSERT(IsAligned<WordType>(m_output));
-			CRYPTOPP_ASSERT(IsAligned<WordType>(m_input));
-
-			if (!NativeByteOrderIs(B::ToEnum()))
-				registerWord = ByteReverse(registerWord);
-
-			if (m_dir == ENCRYPTION)
-			{
-				if (m_input == NULL)
-				{
-					CRYPTOPP_ASSERT(m_output == NULL);
-				}
-				else
-				{
-					WordType ct = *(const WordType *)m_input ^ registerWord;
-					registerWord = ct;
-					*(WordType*)m_output = ct;
-					m_input += sizeof(WordType);
-					m_output += sizeof(WordType);
-				}
-			}
-			else
-			{
-				WordType ct = *(const WordType *)m_input;
-				*(WordType*)m_output = registerWord ^ ct;
-				registerWord = ct;
-				m_input += sizeof(WordType);
-				m_output += sizeof(WordType);
-			}
-
-			// registerWord is left unreversed so it can be xor-ed with further input
-
-			return *this;
-		}
-
-		byte *m_output;
-		const byte *m_input;
-		CipherDir m_dir;
-	};
-};
-
-//! \class CFB_CipherTemplate
-//! \brief Base class for feedback based stream ciphers with SymmetricCipher interface
-//! \tparam BASE AbstractPolicyHolder base class
-template <class BASE>
-class CRYPTOPP_NO_VTABLE CFB_CipherTemplate : public BASE
-{
-public:
-	//! \brief Apply keystream to data
-	//! \param outString a buffer to write the transformed data
-	//! \param inString a buffer to read the data
-	//! \param length the size fo the buffers, in bytes
-	//! \details This is the primary method to operate a stream cipher. For example:
-	//! <pre>
-	//!     size_t size = 30;
-	//!     byte plain[size] = "Do or do not; there is no try";
-	//!     byte cipher[size];
-	//!     ...
-	//!     ChaCha20 chacha(key, keySize);
-	//!     chacha.ProcessData(cipher, plain, size);
-	//! </pre>
-	void ProcessData(byte *outString, const byte *inString, size_t length);
-
-	//! \brief Resynchronize the cipher
-	//! \param iv a byte array used to resynchronize the cipher
-	//! \param length the size of the IV array
-	void Resynchronize(const byte *iv, int length=-1);
-
-	//! \brief Provides number of ideal bytes to process
-	//! \returns the ideal number of bytes to process
-	//! \details Internally, the default implementation returns GetBytesPerIteration()
-	//! \sa GetBytesPerIteration() and GetOptimalNextBlockSize()
-	unsigned int OptimalBlockSize() const {return this->GetPolicy().GetBytesPerIteration();}
-
-	//! \brief Provides number of ideal bytes to process
-	//! \returns the ideal number of bytes to process
-	//! \details Internally, the default implementation returns remaining unprocessed bytes
-	//! \sa GetBytesPerIteration() and OptimalBlockSize()
-	unsigned int GetOptimalNextBlockSize() const {return (unsigned int)m_leftOver;}
-
-	//! \brief Provides number of ideal data alignment
-	//! \returns the ideal data alignment, in bytes
-	//! \sa GetAlignment() and OptimalBlockSize()
-	unsigned int OptimalDataAlignment() const {return this->GetPolicy().GetAlignment();}
-
-	//! \brief Flag indicating random access
-	//! \returns true if the cipher is seekable, false otherwise
-	//! \sa Seek()
-	bool IsRandomAccess() const {return false;}
-
-	//! \brief Determines if the cipher is self inverting
-	//! \returns true if the stream cipher is self inverting, false otherwise
-	bool IsSelfInverting() const {return false;}
-
-	typedef typename BASE::PolicyInterface PolicyInterface;
-
-protected:
-	virtual void CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length) =0;
-
-	void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
-
-	size_t m_leftOver;
-};
-
-//! \class CFB_EncryptionTemplate
-//! \brief Base class for feedback based stream ciphers in the forward direction with SymmetricCipher interface
-//! \tparam BASE AbstractPolicyHolder base class
-template <class BASE = AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >
-class CRYPTOPP_NO_VTABLE CFB_EncryptionTemplate : public CFB_CipherTemplate<BASE>
-{
-	bool IsForwardTransformation() const {return true;}
-	void CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length);
-};
-
-//! \class CFB_DecryptionTemplate
-//! \brief Base class for feedback based stream ciphers in the reverse direction with SymmetricCipher interface
-//! \tparam BASE AbstractPolicyHolder base class
-template <class BASE = AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >
-class CRYPTOPP_NO_VTABLE CFB_DecryptionTemplate : public CFB_CipherTemplate<BASE>
-{
-	bool IsForwardTransformation() const {return false;}
-	void CombineMessageAndShiftRegister(byte *output, byte *reg, const byte *message, size_t length);
-};
-
-//! \class CFB_RequireFullDataBlocks
-//! \brief Base class for feedback based stream ciphers with a mandatory block size
-//! \tparam BASE CFB_EncryptionTemplate or CFB_DecryptionTemplate base class
-template <class BASE>
-class CFB_RequireFullDataBlocks : public BASE
-{
-public:
-	unsigned int MandatoryBlockSize() const {return this->OptimalBlockSize();}
-};
-
-//! \class SymmetricCipherFinal
-//! \brief SymmetricCipher implementation
-//! \tparam BASE AbstractPolicyHolder derived base class
-//! \tparam INFO AbstractPolicyHolder derived information class
-//! \sa Weak::ARC4, ChaCha8, ChaCha12, ChaCha20, Salsa20, SEAL, Sosemanuk, WAKE
-template <class BASE, class INFO = BASE>
-class SymmetricCipherFinal : public AlgorithmImpl<SimpleKeyingInterfaceImpl<BASE, INFO>, INFO>
-{
-public:
-	//! \brief Construct a stream cipher
- 	SymmetricCipherFinal() {}
-
-	//! \brief Construct a stream cipher
-	//! \param key a byte array used to key the cipher
-	//! \details This overload uses DEFAULT_KEYLENGTH
-	SymmetricCipherFinal(const byte *key)
-		{this->SetKey(key, this->DEFAULT_KEYLENGTH);}
-
-	//! \brief Construct a stream cipher
-	//! \param key a byte array used to key the cipher
-	//! \param length the size of the key array
-	SymmetricCipherFinal(const byte *key, size_t length)
-		{this->SetKey(key, length);}
-
-	//! \brief Construct a stream cipher
-	//! \param key a byte array used to key the cipher
-	//! \param length the size of the key array
-	//! \param iv a byte array used as an initialization vector
-	SymmetricCipherFinal(const byte *key, size_t length, const byte *iv)
-		{this->SetKeyWithIV(key, length, iv);}
-
-	//! \brief Clone a SymmetricCipher
-	//! \returns a new SymmetricCipher based on this object
-	Clonable * Clone() const {return static_cast<SymmetricCipher *>(new SymmetricCipherFinal<BASE, INFO>(*this));}
-};
-
-NAMESPACE_END
-
-#ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
-#include "strciphr.cpp"
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-CRYPTOPP_DLL_TEMPLATE_CLASS AbstractPolicyHolder<AdditiveCipherAbstractPolicy, SymmetricCipher>;
-CRYPTOPP_DLL_TEMPLATE_CLASS AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, SymmetricCipher> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS CFB_CipherTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS CFB_EncryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >;
-CRYPTOPP_DLL_TEMPLATE_CLASS CFB_DecryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >;
-
-NAMESPACE_END
-
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(pop)
-#endif
-
-#endif
diff --git a/src-cryptopp/tiger.cpp b/src-cryptopp/tiger.cpp
deleted file mode 100644
index d7261f9..0000000
--- a/src-cryptopp/tiger.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-// tiger.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-#include "config.h"
-
-#include "tiger.h"
-#include "misc.h"
-#include "cpu.h"
-
-#if defined(CRYPTOPP_DISABLE_TIGER_ASM)
-# undef CRYPTOPP_X86_ASM_AVAILABLE
-# undef CRYPTOPP_X32_ASM_AVAILABLE
-# undef CRYPTOPP_X64_ASM_AVAILABLE
-# undef CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-void Tiger::InitState(HashWordType *state)
-{
-	state[0] = W64LIT(0x0123456789ABCDEF);
-	state[1] = W64LIT(0xFEDCBA9876543210);
-	state[2] = W64LIT(0xF096A5B4C3B2E187);
-}
-
-void Tiger::TruncatedFinal(byte *hash, size_t size)
-{
-	ThrowIfInvalidTruncatedSize(size);
-
-	PadLastBlock(56, 0x01);
-	CorrectEndianess(m_data, m_data, 56);
-
-	m_data[7] = GetBitCountLo();
-
-	Transform(m_state, m_data);
-	CorrectEndianess(m_state, m_state, DigestSize());
-	memcpy(hash, m_state, size);
-
-	Restart();		// reinit for next use
-}
-
-void Tiger::Transform (word64 *digest, const word64 *X)
-{
-#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE && (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32)
-	if (HasSSE2())
-	{
-#ifdef __GNUC__
-		__asm__ __volatile__
-		(
-		INTEL_NOPREFIX
-		AS_PUSH_IF86(bx)
-#else
-	#if _MSC_VER < 1300
-		const word64 *t = table;
-		AS2(	mov		edx, t)
-	#else
-		AS2(	lea		edx, [table])
-	#endif
-		AS2(	mov		eax, digest)
-		AS2(	mov		esi, X)
-#endif
-		AS2(	movq	mm0, [eax])
-		AS2(	movq	mm1, [eax+1*8])
-		AS2(	movq	mm5, mm1)
-		AS2(	movq	mm2, [eax+2*8])
-		AS2(	movq	mm7, [edx+4*2048+0*8])
-		AS2(	movq	mm6, [edx+4*2048+1*8])
-		AS2(	mov		ecx, esp)
-		AS2(	and		esp, 0xfffffff0)
-		AS2(	sub		esp, 8*8)
-		AS_PUSH_IF86(cx)
-
-#define SSE2_round(a,b,c,x,mul) \
-		AS2(	pxor	c, [x])\
-		AS2(	movd	ecx, c)\
-		AS2(	movzx	edi, cl)\
-		AS2(	movq	mm3, [edx+0*2048+edi*8])\
-		AS2(	movzx	edi, ch)\
-		AS2(	movq	mm4, [edx+3*2048+edi*8])\
-		AS2(	shr		ecx, 16)\
-		AS2(	movzx	edi, cl)\
-		AS2(	pxor	mm3, [edx+1*2048+edi*8])\
-		AS2(	movzx	edi, ch)\
-		AS2(	pxor	mm4, [edx+2*2048+edi*8])\
-		AS3(	pextrw	ecx, c, 2)\
-		AS2(	movzx	edi, cl)\
-		AS2(	pxor	mm3, [edx+2*2048+edi*8])\
-		AS2(	movzx	edi, ch)\
-		AS2(	pxor	mm4, [edx+1*2048+edi*8])\
-		AS3(	pextrw	ecx, c, 3)\
-		AS2(	movzx	edi, cl)\
-		AS2(	pxor	mm3, [edx+3*2048+edi*8])\
-		AS2(	psubq	a, mm3)\
-		AS2(	movzx	edi, ch)\
-		AS2(	pxor	mm4, [edx+0*2048+edi*8])\
-		AS2(	paddq	b, mm4)\
-		SSE2_mul_##mul(b)
-
-#define SSE2_mul_5(b)	\
-		AS2(	movq	mm3, b)\
-		AS2(	psllq	b, 2)\
-		AS2(	paddq	b, mm3)
-
-#define SSE2_mul_7(b)	\
-		AS2(	movq	mm3, b)\
-		AS2(	psllq	b, 3)\
-		AS2(	psubq	b, mm3)
-
-#define SSE2_mul_9(b)	\
-		AS2(	movq	mm3, b)\
-		AS2(	psllq	b, 3)\
-		AS2(	paddq	b, mm3)
-
-#define label2_5 1
-#define label2_7 2
-#define label2_9 3
-
-#define SSE2_pass(A,B,C,mul,X)	\
-		AS2(	xor		ebx, ebx)\
-		ASL(mul)\
-		SSE2_round(A,B,C,X+0*8+ebx,mul)\
-		SSE2_round(B,C,A,X+1*8+ebx,mul)\
-		AS2(	cmp		ebx, 6*8)\
-		ASJ(	je,		label2_##mul, f)\
-		SSE2_round(C,A,B,X+2*8+ebx,mul)\
-		AS2(	add		ebx, 3*8)\
-		ASJ(	jmp,	mul, b)\
-		ASL(label2_##mul)
-
-#define SSE2_key_schedule(Y,X) \
-		AS2(	movq	mm3, [X+7*8])\
-		AS2(	pxor	mm3, mm6)\
-		AS2(	movq	mm4, [X+0*8])\
-		AS2(	psubq	mm4, mm3)\
-		AS2(	movq	[Y+0*8], mm4)\
-		AS2(	pxor	mm4, [X+1*8])\
-		AS2(	movq	mm3, mm4)\
-		AS2(	movq	[Y+1*8], mm4)\
-		AS2(	paddq	mm4, [X+2*8])\
-		AS2(	pxor	mm3, mm7)\
-		AS2(	psllq	mm3, 19)\
-		AS2(	movq	[Y+2*8], mm4)\
-		AS2(	pxor	mm3, mm4)\
-		AS2(	movq	mm4, [X+3*8])\
-		AS2(	psubq	mm4, mm3)\
-		AS2(	movq	[Y+3*8], mm4)\
-		AS2(	pxor	mm4, [X+4*8])\
-		AS2(	movq	mm3, mm4)\
-		AS2(	movq	[Y+4*8], mm4)\
-		AS2(	paddq	mm4, [X+5*8])\
-		AS2(	pxor	mm3, mm7)\
-		AS2(	psrlq	mm3, 23)\
-		AS2(	movq	[Y+5*8], mm4)\
-		AS2(	pxor	mm3, mm4)\
-		AS2(	movq	mm4, [X+6*8])\
-		AS2(	psubq	mm4, mm3)\
-		AS2(	movq	[Y+6*8], mm4)\
-		AS2(	pxor	mm4, [X+7*8])\
-		AS2(	movq	mm3, mm4)\
-		AS2(	movq	[Y+7*8], mm4)\
-		AS2(	paddq	mm4, [Y+0*8])\
-		AS2(	pxor	mm3, mm7)\
-		AS2(	psllq	mm3, 19)\
-		AS2(	movq	[Y+0*8], mm4)\
-		AS2(	pxor	mm3, mm4)\
-		AS2(	movq	mm4, [Y+1*8])\
-		AS2(	psubq	mm4, mm3)\
-		AS2(	movq	[Y+1*8], mm4)\
-		AS2(	pxor	mm4, [Y+2*8])\
-		AS2(	movq	mm3, mm4)\
-		AS2(	movq	[Y+2*8], mm4)\
-		AS2(	paddq	mm4, [Y+3*8])\
-		AS2(	pxor	mm3, mm7)\
-		AS2(	psrlq	mm3, 23)\
-		AS2(	movq	[Y+3*8], mm4)\
-		AS2(	pxor	mm3, mm4)\
-		AS2(	movq	mm4, [Y+4*8])\
-		AS2(	psubq	mm4, mm3)\
-		AS2(	movq	[Y+4*8], mm4)\
-		AS2(	pxor	mm4, [Y+5*8])\
-		AS2(	movq	[Y+5*8], mm4)\
-		AS2(	paddq	mm4, [Y+6*8])\
-		AS2(	movq	[Y+6*8], mm4)\
-		AS2(	pxor	mm4, [edx+4*2048+2*8])\
-		AS2(	movq	mm3, [Y+7*8])\
-		AS2(	psubq	mm3, mm4)\
-		AS2(	movq	[Y+7*8], mm3)
-
-#if CRYPTOPP_BOOL_X32
-		SSE2_pass(mm0, mm1, mm2, 5, esi)
-		SSE2_key_schedule(esp+8, esi)
-		SSE2_pass(mm2, mm0, mm1, 7, esp+8)
-		SSE2_key_schedule(esp+8, esp+8)
-		SSE2_pass(mm1, mm2, mm0, 9, esp+8)
-#else
-		SSE2_pass(mm0, mm1, mm2, 5, esi)
-		SSE2_key_schedule(esp+4, esi)
-		SSE2_pass(mm2, mm0, mm1, 7, esp+4)
-		SSE2_key_schedule(esp+4, esp+4)
-		SSE2_pass(mm1, mm2, mm0, 9, esp+4)
-#endif
-
-		AS2(	pxor	mm0, [eax+0*8])
-		AS2(	movq	[eax+0*8], mm0)
-		AS2(	psubq	mm1, mm5)
-		AS2(	movq	[eax+1*8], mm1)
-		AS2(	paddq	mm2, [eax+2*8])
-		AS2(	movq	[eax+2*8], mm2)
-
-		AS_POP_IF86(sp)
-		AS1(	emms)
-
-#ifdef __GNUC__
-		AS_POP_IF86(bx)
-		ATT_PREFIX
-			:
-			: "a" (digest), "S" (X), "d" (table)
-			: "%ecx", "%edi", "memory", "cc"
-		);
-#endif
-	}
-	else
-#endif
-	{
-		word64 a = digest[0];
-		word64 b = digest[1];
-		word64 c = digest[2];
-		word64 Y[8];
-
-#define t1 (table)
-#define t2 (table+256)
-#define t3 (table+256*2)
-#define t4 (table+256*3)
-
-#define round(a,b,c,x,mul) \
-	c ^= x; \
-	a -= t1[GETBYTE(c,0)] ^ t2[GETBYTE(c,2)] ^ t3[GETBYTE(c,4)] ^ t4[GETBYTE(c,6)]; \
-	b += t4[GETBYTE(c,1)] ^ t3[GETBYTE(c,3)] ^ t2[GETBYTE(c,5)] ^ t1[GETBYTE(c,7)]; \
-	b *= mul
-
-#define pass(a,b,c,mul,X) {\
-	int i=0;\
-	while (true)\
-	{\
-		round(a,b,c,X[i+0],mul); \
-		round(b,c,a,X[i+1],mul); \
-		if (i==6)\
-			break;\
-		round(c,a,b,X[i+2],mul); \
-		i+=3;\
-	}}
-
-#define key_schedule(Y,X) \
-	Y[0] = X[0] - (X[7]^W64LIT(0xA5A5A5A5A5A5A5A5)); \
-	Y[1] = X[1] ^ Y[0]; \
-	Y[2] = X[2] + Y[1]; \
-	Y[3] = X[3] - (Y[2] ^ ((~Y[1])<<19)); \
-	Y[4] = X[4] ^ Y[3]; \
-	Y[5] = X[5] + Y[4]; \
-	Y[6] = X[6] - (Y[5] ^ ((~Y[4])>>23)); \
-	Y[7] = X[7] ^ Y[6]; \
-	Y[0] += Y[7]; \
-	Y[1] -= Y[0] ^ ((~Y[7])<<19); \
-	Y[2] ^= Y[1]; \
-	Y[3] += Y[2]; \
-	Y[4] -= Y[3] ^ ((~Y[2])>>23); \
-	Y[5] ^= Y[4]; \
-	Y[6] += Y[5]; \
-	Y[7] -= Y[6] ^ W64LIT(0x0123456789ABCDEF)
-
-		pass(a,b,c,5,X);
-		key_schedule(Y,X);
-		pass(c,a,b,7,Y);
-		key_schedule(Y,Y);
-		pass(b,c,a,9,Y);
-
-		digest[0] = a ^ digest[0];
-		digest[1] = b - digest[1];
-		digest[2] = c + digest[2];
-	}
-}
-
-NAMESPACE_END
diff --git a/src-cryptopp/tiger.h b/src-cryptopp/tiger.h
deleted file mode 100644
index 71e5964..0000000
--- a/src-cryptopp/tiger.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CRYPTOPP_TIGER_H
-#define CRYPTOPP_TIGER_H
-
-#include "config.h"
-#include "iterhash.h"
-
-// Clang 3.3 integrated assembler crash on Linux
-//  http://github.com/weidai11/cryptopp/issues/264
-#if defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400)
-# define CRYPTOPP_DISABLE_TIGER_ASM
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-/// <a href="http://www.cryptolounge.org/wiki/Tiger">Tiger</a>
-class Tiger : public IteratedHashWithStaticTransform<word64, LittleEndian, 64, 24, Tiger>
-{
-public:
-	static void InitState(HashWordType *state);
-	static void Transform(word64 *digest, const word64 *data);
-	void TruncatedFinal(byte *hash, size_t size);
-	CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "Tiger";}
-
-protected:
-	static const word64 table[4*256+3];
-};
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/tigertab.cpp b/src-cryptopp/tigertab.cpp
deleted file mode 100644
index 5e219dc..0000000
--- a/src-cryptopp/tigertab.cpp
+++ /dev/null
@@ -1,525 +0,0 @@
-#include "pch.h"
-#include "tiger.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-const word64 Tiger::table[4*256+3] =
-{
-	W64LIT(0x02AAB17CF7E90C5E)   /*    0 */,    W64LIT(0xAC424B03E243A8EC)   /*    1 */,
-	W64LIT(0x72CD5BE30DD5FCD3)   /*    2 */,    W64LIT(0x6D019B93F6F97F3A)   /*    3 */,
-	W64LIT(0xCD9978FFD21F9193)   /*    4 */,    W64LIT(0x7573A1C9708029E2)   /*    5 */,
-	W64LIT(0xB164326B922A83C3)   /*    6 */,    W64LIT(0x46883EEE04915870)   /*    7 */,
-	W64LIT(0xEAACE3057103ECE6)   /*    8 */,    W64LIT(0xC54169B808A3535C)   /*    9 */,
-	W64LIT(0x4CE754918DDEC47C)   /*   10 */,    W64LIT(0x0AA2F4DFDC0DF40C)   /*   11 */,
-	W64LIT(0x10B76F18A74DBEFA)   /*   12 */,    W64LIT(0xC6CCB6235AD1AB6A)   /*   13 */,
-	W64LIT(0x13726121572FE2FF)   /*   14 */,    W64LIT(0x1A488C6F199D921E)   /*   15 */,
-	W64LIT(0x4BC9F9F4DA0007CA)   /*   16 */,    W64LIT(0x26F5E6F6E85241C7)   /*   17 */,
-	W64LIT(0x859079DBEA5947B6)   /*   18 */,    W64LIT(0x4F1885C5C99E8C92)   /*   19 */,
-	W64LIT(0xD78E761EA96F864B)   /*   20 */,    W64LIT(0x8E36428C52B5C17D)   /*   21 */,
-	W64LIT(0x69CF6827373063C1)   /*   22 */,    W64LIT(0xB607C93D9BB4C56E)   /*   23 */,
-	W64LIT(0x7D820E760E76B5EA)   /*   24 */,    W64LIT(0x645C9CC6F07FDC42)   /*   25 */,
-	W64LIT(0xBF38A078243342E0)   /*   26 */,    W64LIT(0x5F6B343C9D2E7D04)   /*   27 */,
-	W64LIT(0xF2C28AEB600B0EC6)   /*   28 */,    W64LIT(0x6C0ED85F7254BCAC)   /*   29 */,
-	W64LIT(0x71592281A4DB4FE5)   /*   30 */,    W64LIT(0x1967FA69CE0FED9F)   /*   31 */,
-	W64LIT(0xFD5293F8B96545DB)   /*   32 */,    W64LIT(0xC879E9D7F2A7600B)   /*   33 */,
-	W64LIT(0x860248920193194E)   /*   34 */,    W64LIT(0xA4F9533B2D9CC0B3)   /*   35 */,
-	W64LIT(0x9053836C15957613)   /*   36 */,    W64LIT(0xDB6DCF8AFC357BF1)   /*   37 */,
-	W64LIT(0x18BEEA7A7A370F57)   /*   38 */,    W64LIT(0x037117CA50B99066)   /*   39 */,
-	W64LIT(0x6AB30A9774424A35)   /*   40 */,    W64LIT(0xF4E92F02E325249B)   /*   41 */,
-	W64LIT(0x7739DB07061CCAE1)   /*   42 */,    W64LIT(0xD8F3B49CECA42A05)   /*   43 */,
-	W64LIT(0xBD56BE3F51382F73)   /*   44 */,    W64LIT(0x45FAED5843B0BB28)   /*   45 */,
-	W64LIT(0x1C813D5C11BF1F83)   /*   46 */,    W64LIT(0x8AF0E4B6D75FA169)   /*   47 */,
-	W64LIT(0x33EE18A487AD9999)   /*   48 */,    W64LIT(0x3C26E8EAB1C94410)   /*   49 */,
-	W64LIT(0xB510102BC0A822F9)   /*   50 */,    W64LIT(0x141EEF310CE6123B)   /*   51 */,
-	W64LIT(0xFC65B90059DDB154)   /*   52 */,    W64LIT(0xE0158640C5E0E607)   /*   53 */,
-	W64LIT(0x884E079826C3A3CF)   /*   54 */,    W64LIT(0x930D0D9523C535FD)   /*   55 */,
-	W64LIT(0x35638D754E9A2B00)   /*   56 */,    W64LIT(0x4085FCCF40469DD5)   /*   57 */,
-	W64LIT(0xC4B17AD28BE23A4C)   /*   58 */,    W64LIT(0xCAB2F0FC6A3E6A2E)   /*   59 */,
-	W64LIT(0x2860971A6B943FCD)   /*   60 */,    W64LIT(0x3DDE6EE212E30446)   /*   61 */,
-	W64LIT(0x6222F32AE01765AE)   /*   62 */,    W64LIT(0x5D550BB5478308FE)   /*   63 */,
-	W64LIT(0xA9EFA98DA0EDA22A)   /*   64 */,    W64LIT(0xC351A71686C40DA7)   /*   65 */,
-	W64LIT(0x1105586D9C867C84)   /*   66 */,    W64LIT(0xDCFFEE85FDA22853)   /*   67 */,
-	W64LIT(0xCCFBD0262C5EEF76)   /*   68 */,    W64LIT(0xBAF294CB8990D201)   /*   69 */,
-	W64LIT(0xE69464F52AFAD975)   /*   70 */,    W64LIT(0x94B013AFDF133E14)   /*   71 */,
-	W64LIT(0x06A7D1A32823C958)   /*   72 */,    W64LIT(0x6F95FE5130F61119)   /*   73 */,
-	W64LIT(0xD92AB34E462C06C0)   /*   74 */,    W64LIT(0xED7BDE33887C71D2)   /*   75 */,
-	W64LIT(0x79746D6E6518393E)   /*   76 */,    W64LIT(0x5BA419385D713329)   /*   77 */,
-	W64LIT(0x7C1BA6B948A97564)   /*   78 */,    W64LIT(0x31987C197BFDAC67)   /*   79 */,
-	W64LIT(0xDE6C23C44B053D02)   /*   80 */,    W64LIT(0x581C49FED002D64D)   /*   81 */,
-	W64LIT(0xDD474D6338261571)   /*   82 */,    W64LIT(0xAA4546C3E473D062)   /*   83 */,
-	W64LIT(0x928FCE349455F860)   /*   84 */,    W64LIT(0x48161BBACAAB94D9)   /*   85 */,
-	W64LIT(0x63912430770E6F68)   /*   86 */,    W64LIT(0x6EC8A5E602C6641C)   /*   87 */,
-	W64LIT(0x87282515337DDD2B)   /*   88 */,    W64LIT(0x2CDA6B42034B701B)   /*   89 */,
-	W64LIT(0xB03D37C181CB096D)   /*   90 */,    W64LIT(0xE108438266C71C6F)   /*   91 */,
-	W64LIT(0x2B3180C7EB51B255)   /*   92 */,    W64LIT(0xDF92B82F96C08BBC)   /*   93 */,
-	W64LIT(0x5C68C8C0A632F3BA)   /*   94 */,    W64LIT(0x5504CC861C3D0556)   /*   95 */,
-	W64LIT(0xABBFA4E55FB26B8F)   /*   96 */,    W64LIT(0x41848B0AB3BACEB4)   /*   97 */,
-	W64LIT(0xB334A273AA445D32)   /*   98 */,    W64LIT(0xBCA696F0A85AD881)   /*   99 */,
-	W64LIT(0x24F6EC65B528D56C)   /*  100 */,    W64LIT(0x0CE1512E90F4524A)   /*  101 */,
-	W64LIT(0x4E9DD79D5506D35A)   /*  102 */,    W64LIT(0x258905FAC6CE9779)   /*  103 */,
-	W64LIT(0x2019295B3E109B33)   /*  104 */,    W64LIT(0xF8A9478B73A054CC)   /*  105 */,
-	W64LIT(0x2924F2F934417EB0)   /*  106 */,    W64LIT(0x3993357D536D1BC4)   /*  107 */,
-	W64LIT(0x38A81AC21DB6FF8B)   /*  108 */,    W64LIT(0x47C4FBF17D6016BF)   /*  109 */,
-	W64LIT(0x1E0FAADD7667E3F5)   /*  110 */,    W64LIT(0x7ABCFF62938BEB96)   /*  111 */,
-	W64LIT(0xA78DAD948FC179C9)   /*  112 */,    W64LIT(0x8F1F98B72911E50D)   /*  113 */,
-	W64LIT(0x61E48EAE27121A91)   /*  114 */,    W64LIT(0x4D62F7AD31859808)   /*  115 */,
-	W64LIT(0xECEBA345EF5CEAEB)   /*  116 */,    W64LIT(0xF5CEB25EBC9684CE)   /*  117 */,
-	W64LIT(0xF633E20CB7F76221)   /*  118 */,    W64LIT(0xA32CDF06AB8293E4)   /*  119 */,
-	W64LIT(0x985A202CA5EE2CA4)   /*  120 */,    W64LIT(0xCF0B8447CC8A8FB1)   /*  121 */,
-	W64LIT(0x9F765244979859A3)   /*  122 */,    W64LIT(0xA8D516B1A1240017)   /*  123 */,
-	W64LIT(0x0BD7BA3EBB5DC726)   /*  124 */,    W64LIT(0xE54BCA55B86ADB39)   /*  125 */,
-	W64LIT(0x1D7A3AFD6C478063)   /*  126 */,    W64LIT(0x519EC608E7669EDD)   /*  127 */,
-	W64LIT(0x0E5715A2D149AA23)   /*  128 */,    W64LIT(0x177D4571848FF194)   /*  129 */,
-	W64LIT(0xEEB55F3241014C22)   /*  130 */,    W64LIT(0x0F5E5CA13A6E2EC2)   /*  131 */,
-	W64LIT(0x8029927B75F5C361)   /*  132 */,    W64LIT(0xAD139FABC3D6E436)   /*  133 */,
-	W64LIT(0x0D5DF1A94CCF402F)   /*  134 */,    W64LIT(0x3E8BD948BEA5DFC8)   /*  135 */,
-	W64LIT(0xA5A0D357BD3FF77E)   /*  136 */,    W64LIT(0xA2D12E251F74F645)   /*  137 */,
-	W64LIT(0x66FD9E525E81A082)   /*  138 */,    W64LIT(0x2E0C90CE7F687A49)   /*  139 */,
-	W64LIT(0xC2E8BCBEBA973BC5)   /*  140 */,    W64LIT(0x000001BCE509745F)   /*  141 */,
-	W64LIT(0x423777BBE6DAB3D6)   /*  142 */,    W64LIT(0xD1661C7EAEF06EB5)   /*  143 */,
-	W64LIT(0xA1781F354DAACFD8)   /*  144 */,    W64LIT(0x2D11284A2B16AFFC)   /*  145 */,
-	W64LIT(0xF1FC4F67FA891D1F)   /*  146 */,    W64LIT(0x73ECC25DCB920ADA)   /*  147 */,
-	W64LIT(0xAE610C22C2A12651)   /*  148 */,    W64LIT(0x96E0A810D356B78A)   /*  149 */,
-	W64LIT(0x5A9A381F2FE7870F)   /*  150 */,    W64LIT(0xD5AD62EDE94E5530)   /*  151 */,
-	W64LIT(0xD225E5E8368D1427)   /*  152 */,    W64LIT(0x65977B70C7AF4631)   /*  153 */,
-	W64LIT(0x99F889B2DE39D74F)   /*  154 */,    W64LIT(0x233F30BF54E1D143)   /*  155 */,
-	W64LIT(0x9A9675D3D9A63C97)   /*  156 */,    W64LIT(0x5470554FF334F9A8)   /*  157 */,
-	W64LIT(0x166ACB744A4F5688)   /*  158 */,    W64LIT(0x70C74CAAB2E4AEAD)   /*  159 */,
-	W64LIT(0xF0D091646F294D12)   /*  160 */,    W64LIT(0x57B82A89684031D1)   /*  161 */,
-	W64LIT(0xEFD95A5A61BE0B6B)   /*  162 */,    W64LIT(0x2FBD12E969F2F29A)   /*  163 */,
-	W64LIT(0x9BD37013FEFF9FE8)   /*  164 */,    W64LIT(0x3F9B0404D6085A06)   /*  165 */,
-	W64LIT(0x4940C1F3166CFE15)   /*  166 */,    W64LIT(0x09542C4DCDF3DEFB)   /*  167 */,
-	W64LIT(0xB4C5218385CD5CE3)   /*  168 */,    W64LIT(0xC935B7DC4462A641)   /*  169 */,
-	W64LIT(0x3417F8A68ED3B63F)   /*  170 */,    W64LIT(0xB80959295B215B40)   /*  171 */,
-	W64LIT(0xF99CDAEF3B8C8572)   /*  172 */,    W64LIT(0x018C0614F8FCB95D)   /*  173 */,
-	W64LIT(0x1B14ACCD1A3ACDF3)   /*  174 */,    W64LIT(0x84D471F200BB732D)   /*  175 */,
-	W64LIT(0xC1A3110E95E8DA16)   /*  176 */,    W64LIT(0x430A7220BF1A82B8)   /*  177 */,
-	W64LIT(0xB77E090D39DF210E)   /*  178 */,    W64LIT(0x5EF4BD9F3CD05E9D)   /*  179 */,
-	W64LIT(0x9D4FF6DA7E57A444)   /*  180 */,    W64LIT(0xDA1D60E183D4A5F8)   /*  181 */,
-	W64LIT(0xB287C38417998E47)   /*  182 */,    W64LIT(0xFE3EDC121BB31886)   /*  183 */,
-	W64LIT(0xC7FE3CCC980CCBEF)   /*  184 */,    W64LIT(0xE46FB590189BFD03)   /*  185 */,
-	W64LIT(0x3732FD469A4C57DC)   /*  186 */,    W64LIT(0x7EF700A07CF1AD65)   /*  187 */,
-	W64LIT(0x59C64468A31D8859)   /*  188 */,    W64LIT(0x762FB0B4D45B61F6)   /*  189 */,
-	W64LIT(0x155BAED099047718)   /*  190 */,    W64LIT(0x68755E4C3D50BAA6)   /*  191 */,
-	W64LIT(0xE9214E7F22D8B4DF)   /*  192 */,    W64LIT(0x2ADDBF532EAC95F4)   /*  193 */,
-	W64LIT(0x32AE3909B4BD0109)   /*  194 */,    W64LIT(0x834DF537B08E3450)   /*  195 */,
-	W64LIT(0xFA209DA84220728D)   /*  196 */,    W64LIT(0x9E691D9B9EFE23F7)   /*  197 */,
-	W64LIT(0x0446D288C4AE8D7F)   /*  198 */,    W64LIT(0x7B4CC524E169785B)   /*  199 */,
-	W64LIT(0x21D87F0135CA1385)   /*  200 */,    W64LIT(0xCEBB400F137B8AA5)   /*  201 */,
-	W64LIT(0x272E2B66580796BE)   /*  202 */,    W64LIT(0x3612264125C2B0DE)   /*  203 */,
-	W64LIT(0x057702BDAD1EFBB2)   /*  204 */,    W64LIT(0xD4BABB8EACF84BE9)   /*  205 */,
-	W64LIT(0x91583139641BC67B)   /*  206 */,    W64LIT(0x8BDC2DE08036E024)   /*  207 */,
-	W64LIT(0x603C8156F49F68ED)   /*  208 */,    W64LIT(0xF7D236F7DBEF5111)   /*  209 */,
-	W64LIT(0x9727C4598AD21E80)   /*  210 */,    W64LIT(0xA08A0896670A5FD7)   /*  211 */,
-	W64LIT(0xCB4A8F4309EBA9CB)   /*  212 */,    W64LIT(0x81AF564B0F7036A1)   /*  213 */,
-	W64LIT(0xC0B99AA778199ABD)   /*  214 */,    W64LIT(0x959F1EC83FC8E952)   /*  215 */,
-	W64LIT(0x8C505077794A81B9)   /*  216 */,    W64LIT(0x3ACAAF8F056338F0)   /*  217 */,
-	W64LIT(0x07B43F50627A6778)   /*  218 */,    W64LIT(0x4A44AB49F5ECCC77)   /*  219 */,
-	W64LIT(0x3BC3D6E4B679EE98)   /*  220 */,    W64LIT(0x9CC0D4D1CF14108C)   /*  221 */,
-	W64LIT(0x4406C00B206BC8A0)   /*  222 */,    W64LIT(0x82A18854C8D72D89)   /*  223 */,
-	W64LIT(0x67E366B35C3C432C)   /*  224 */,    W64LIT(0xB923DD61102B37F2)   /*  225 */,
-	W64LIT(0x56AB2779D884271D)   /*  226 */,    W64LIT(0xBE83E1B0FF1525AF)   /*  227 */,
-	W64LIT(0xFB7C65D4217E49A9)   /*  228 */,    W64LIT(0x6BDBE0E76D48E7D4)   /*  229 */,
-	W64LIT(0x08DF828745D9179E)   /*  230 */,    W64LIT(0x22EA6A9ADD53BD34)   /*  231 */,
-	W64LIT(0xE36E141C5622200A)   /*  232 */,    W64LIT(0x7F805D1B8CB750EE)   /*  233 */,
-	W64LIT(0xAFE5C7A59F58E837)   /*  234 */,    W64LIT(0xE27F996A4FB1C23C)   /*  235 */,
-	W64LIT(0xD3867DFB0775F0D0)   /*  236 */,    W64LIT(0xD0E673DE6E88891A)   /*  237 */,
-	W64LIT(0x123AEB9EAFB86C25)   /*  238 */,    W64LIT(0x30F1D5D5C145B895)   /*  239 */,
-	W64LIT(0xBB434A2DEE7269E7)   /*  240 */,    W64LIT(0x78CB67ECF931FA38)   /*  241 */,
-	W64LIT(0xF33B0372323BBF9C)   /*  242 */,    W64LIT(0x52D66336FB279C74)   /*  243 */,
-	W64LIT(0x505F33AC0AFB4EAA)   /*  244 */,    W64LIT(0xE8A5CD99A2CCE187)   /*  245 */,
-	W64LIT(0x534974801E2D30BB)   /*  246 */,    W64LIT(0x8D2D5711D5876D90)   /*  247 */,
-	W64LIT(0x1F1A412891BC038E)   /*  248 */,    W64LIT(0xD6E2E71D82E56648)   /*  249 */,
-	W64LIT(0x74036C3A497732B7)   /*  250 */,    W64LIT(0x89B67ED96361F5AB)   /*  251 */,
-	W64LIT(0xFFED95D8F1EA02A2)   /*  252 */,    W64LIT(0xE72B3BD61464D43D)   /*  253 */,
-	W64LIT(0xA6300F170BDC4820)   /*  254 */,    W64LIT(0xEBC18760ED78A77A)   /*  255 */,
-	W64LIT(0xE6A6BE5A05A12138)   /*  256 */,    W64LIT(0xB5A122A5B4F87C98)   /*  257 */,
-	W64LIT(0x563C6089140B6990)   /*  258 */,    W64LIT(0x4C46CB2E391F5DD5)   /*  259 */,
-	W64LIT(0xD932ADDBC9B79434)   /*  260 */,    W64LIT(0x08EA70E42015AFF5)   /*  261 */,
-	W64LIT(0xD765A6673E478CF1)   /*  262 */,    W64LIT(0xC4FB757EAB278D99)   /*  263 */,
-	W64LIT(0xDF11C6862D6E0692)   /*  264 */,    W64LIT(0xDDEB84F10D7F3B16)   /*  265 */,
-	W64LIT(0x6F2EF604A665EA04)   /*  266 */,    W64LIT(0x4A8E0F0FF0E0DFB3)   /*  267 */,
-	W64LIT(0xA5EDEEF83DBCBA51)   /*  268 */,    W64LIT(0xFC4F0A2A0EA4371E)   /*  269 */,
-	W64LIT(0xE83E1DA85CB38429)   /*  270 */,    W64LIT(0xDC8FF882BA1B1CE2)   /*  271 */,
-	W64LIT(0xCD45505E8353E80D)   /*  272 */,    W64LIT(0x18D19A00D4DB0717)   /*  273 */,
-	W64LIT(0x34A0CFEDA5F38101)   /*  274 */,    W64LIT(0x0BE77E518887CAF2)   /*  275 */,
-	W64LIT(0x1E341438B3C45136)   /*  276 */,    W64LIT(0xE05797F49089CCF9)   /*  277 */,
-	W64LIT(0xFFD23F9DF2591D14)   /*  278 */,    W64LIT(0x543DDA228595C5CD)   /*  279 */,
-	W64LIT(0x661F81FD99052A33)   /*  280 */,    W64LIT(0x8736E641DB0F7B76)   /*  281 */,
-	W64LIT(0x15227725418E5307)   /*  282 */,    W64LIT(0xE25F7F46162EB2FA)   /*  283 */,
-	W64LIT(0x48A8B2126C13D9FE)   /*  284 */,    W64LIT(0xAFDC541792E76EEA)   /*  285 */,
-	W64LIT(0x03D912BFC6D1898F)   /*  286 */,    W64LIT(0x31B1AAFA1B83F51B)   /*  287 */,
-	W64LIT(0xF1AC2796E42AB7D9)   /*  288 */,    W64LIT(0x40A3A7D7FCD2EBAC)   /*  289 */,
-	W64LIT(0x1056136D0AFBBCC5)   /*  290 */,    W64LIT(0x7889E1DD9A6D0C85)   /*  291 */,
-	W64LIT(0xD33525782A7974AA)   /*  292 */,    W64LIT(0xA7E25D09078AC09B)   /*  293 */,
-	W64LIT(0xBD4138B3EAC6EDD0)   /*  294 */,    W64LIT(0x920ABFBE71EB9E70)   /*  295 */,
-	W64LIT(0xA2A5D0F54FC2625C)   /*  296 */,    W64LIT(0xC054E36B0B1290A3)   /*  297 */,
-	W64LIT(0xF6DD59FF62FE932B)   /*  298 */,    W64LIT(0x3537354511A8AC7D)   /*  299 */,
-	W64LIT(0xCA845E9172FADCD4)   /*  300 */,    W64LIT(0x84F82B60329D20DC)   /*  301 */,
-	W64LIT(0x79C62CE1CD672F18)   /*  302 */,    W64LIT(0x8B09A2ADD124642C)   /*  303 */,
-	W64LIT(0xD0C1E96A19D9E726)   /*  304 */,    W64LIT(0x5A786A9B4BA9500C)   /*  305 */,
-	W64LIT(0x0E020336634C43F3)   /*  306 */,    W64LIT(0xC17B474AEB66D822)   /*  307 */,
-	W64LIT(0x6A731AE3EC9BAAC2)   /*  308 */,    W64LIT(0x8226667AE0840258)   /*  309 */,
-	W64LIT(0x67D4567691CAECA5)   /*  310 */,    W64LIT(0x1D94155C4875ADB5)   /*  311 */,
-	W64LIT(0x6D00FD985B813FDF)   /*  312 */,    W64LIT(0x51286EFCB774CD06)   /*  313 */,
-	W64LIT(0x5E8834471FA744AF)   /*  314 */,    W64LIT(0xF72CA0AEE761AE2E)   /*  315 */,
-	W64LIT(0xBE40E4CDAEE8E09A)   /*  316 */,    W64LIT(0xE9970BBB5118F665)   /*  317 */,
-	W64LIT(0x726E4BEB33DF1964)   /*  318 */,    W64LIT(0x703B000729199762)   /*  319 */,
-	W64LIT(0x4631D816F5EF30A7)   /*  320 */,    W64LIT(0xB880B5B51504A6BE)   /*  321 */,
-	W64LIT(0x641793C37ED84B6C)   /*  322 */,    W64LIT(0x7B21ED77F6E97D96)   /*  323 */,
-	W64LIT(0x776306312EF96B73)   /*  324 */,    W64LIT(0xAE528948E86FF3F4)   /*  325 */,
-	W64LIT(0x53DBD7F286A3F8F8)   /*  326 */,    W64LIT(0x16CADCE74CFC1063)   /*  327 */,
-	W64LIT(0x005C19BDFA52C6DD)   /*  328 */,    W64LIT(0x68868F5D64D46AD3)   /*  329 */,
-	W64LIT(0x3A9D512CCF1E186A)   /*  330 */,    W64LIT(0x367E62C2385660AE)   /*  331 */,
-	W64LIT(0xE359E7EA77DCB1D7)   /*  332 */,    W64LIT(0x526C0773749ABE6E)   /*  333 */,
-	W64LIT(0x735AE5F9D09F734B)   /*  334 */,    W64LIT(0x493FC7CC8A558BA8)   /*  335 */,
-	W64LIT(0xB0B9C1533041AB45)   /*  336 */,    W64LIT(0x321958BA470A59BD)   /*  337 */,
-	W64LIT(0x852DB00B5F46C393)   /*  338 */,    W64LIT(0x91209B2BD336B0E5)   /*  339 */,
-	W64LIT(0x6E604F7D659EF19F)   /*  340 */,    W64LIT(0xB99A8AE2782CCB24)   /*  341 */,
-	W64LIT(0xCCF52AB6C814C4C7)   /*  342 */,    W64LIT(0x4727D9AFBE11727B)   /*  343 */,
-	W64LIT(0x7E950D0C0121B34D)   /*  344 */,    W64LIT(0x756F435670AD471F)   /*  345 */,
-	W64LIT(0xF5ADD442615A6849)   /*  346 */,    W64LIT(0x4E87E09980B9957A)   /*  347 */,
-	W64LIT(0x2ACFA1DF50AEE355)   /*  348 */,    W64LIT(0xD898263AFD2FD556)   /*  349 */,
-	W64LIT(0xC8F4924DD80C8FD6)   /*  350 */,    W64LIT(0xCF99CA3D754A173A)   /*  351 */,
-	W64LIT(0xFE477BACAF91BF3C)   /*  352 */,    W64LIT(0xED5371F6D690C12D)   /*  353 */,
-	W64LIT(0x831A5C285E687094)   /*  354 */,    W64LIT(0xC5D3C90A3708A0A4)   /*  355 */,
-	W64LIT(0x0F7F903717D06580)   /*  356 */,    W64LIT(0x19F9BB13B8FDF27F)   /*  357 */,
-	W64LIT(0xB1BD6F1B4D502843)   /*  358 */,    W64LIT(0x1C761BA38FFF4012)   /*  359 */,
-	W64LIT(0x0D1530C4E2E21F3B)   /*  360 */,    W64LIT(0x8943CE69A7372C8A)   /*  361 */,
-	W64LIT(0xE5184E11FEB5CE66)   /*  362 */,    W64LIT(0x618BDB80BD736621)   /*  363 */,
-	W64LIT(0x7D29BAD68B574D0B)   /*  364 */,    W64LIT(0x81BB613E25E6FE5B)   /*  365 */,
-	W64LIT(0x071C9C10BC07913F)   /*  366 */,    W64LIT(0xC7BEEB7909AC2D97)   /*  367 */,
-	W64LIT(0xC3E58D353BC5D757)   /*  368 */,    W64LIT(0xEB017892F38F61E8)   /*  369 */,
-	W64LIT(0xD4EFFB9C9B1CC21A)   /*  370 */,    W64LIT(0x99727D26F494F7AB)   /*  371 */,
-	W64LIT(0xA3E063A2956B3E03)   /*  372 */,    W64LIT(0x9D4A8B9A4AA09C30)   /*  373 */,
-	W64LIT(0x3F6AB7D500090FB4)   /*  374 */,    W64LIT(0x9CC0F2A057268AC0)   /*  375 */,
-	W64LIT(0x3DEE9D2DEDBF42D1)   /*  376 */,    W64LIT(0x330F49C87960A972)   /*  377 */,
-	W64LIT(0xC6B2720287421B41)   /*  378 */,    W64LIT(0x0AC59EC07C00369C)   /*  379 */,
-	W64LIT(0xEF4EAC49CB353425)   /*  380 */,    W64LIT(0xF450244EEF0129D8)   /*  381 */,
-	W64LIT(0x8ACC46E5CAF4DEB6)   /*  382 */,    W64LIT(0x2FFEAB63989263F7)   /*  383 */,
-	W64LIT(0x8F7CB9FE5D7A4578)   /*  384 */,    W64LIT(0x5BD8F7644E634635)   /*  385 */,
-	W64LIT(0x427A7315BF2DC900)   /*  386 */,    W64LIT(0x17D0C4AA2125261C)   /*  387 */,
-	W64LIT(0x3992486C93518E50)   /*  388 */,    W64LIT(0xB4CBFEE0A2D7D4C3)   /*  389 */,
-	W64LIT(0x7C75D6202C5DDD8D)   /*  390 */,    W64LIT(0xDBC295D8E35B6C61)   /*  391 */,
-	W64LIT(0x60B369D302032B19)   /*  392 */,    W64LIT(0xCE42685FDCE44132)   /*  393 */,
-	W64LIT(0x06F3DDB9DDF65610)   /*  394 */,    W64LIT(0x8EA4D21DB5E148F0)   /*  395 */,
-	W64LIT(0x20B0FCE62FCD496F)   /*  396 */,    W64LIT(0x2C1B912358B0EE31)   /*  397 */,
-	W64LIT(0xB28317B818F5A308)   /*  398 */,    W64LIT(0xA89C1E189CA6D2CF)   /*  399 */,
-	W64LIT(0x0C6B18576AAADBC8)   /*  400 */,    W64LIT(0xB65DEAA91299FAE3)   /*  401 */,
-	W64LIT(0xFB2B794B7F1027E7)   /*  402 */,    W64LIT(0x04E4317F443B5BEB)   /*  403 */,
-	W64LIT(0x4B852D325939D0A6)   /*  404 */,    W64LIT(0xD5AE6BEEFB207FFC)   /*  405 */,
-	W64LIT(0x309682B281C7D374)   /*  406 */,    W64LIT(0xBAE309A194C3B475)   /*  407 */,
-	W64LIT(0x8CC3F97B13B49F05)   /*  408 */,    W64LIT(0x98A9422FF8293967)   /*  409 */,
-	W64LIT(0x244B16B01076FF7C)   /*  410 */,    W64LIT(0xF8BF571C663D67EE)   /*  411 */,
-	W64LIT(0x1F0D6758EEE30DA1)   /*  412 */,    W64LIT(0xC9B611D97ADEB9B7)   /*  413 */,
-	W64LIT(0xB7AFD5887B6C57A2)   /*  414 */,    W64LIT(0x6290AE846B984FE1)   /*  415 */,
-	W64LIT(0x94DF4CDEACC1A5FD)   /*  416 */,    W64LIT(0x058A5BD1C5483AFF)   /*  417 */,
-	W64LIT(0x63166CC142BA3C37)   /*  418 */,    W64LIT(0x8DB8526EB2F76F40)   /*  419 */,
-	W64LIT(0xE10880036F0D6D4E)   /*  420 */,    W64LIT(0x9E0523C9971D311D)   /*  421 */,
-	W64LIT(0x45EC2824CC7CD691)   /*  422 */,    W64LIT(0x575B8359E62382C9)   /*  423 */,
-	W64LIT(0xFA9E400DC4889995)   /*  424 */,    W64LIT(0xD1823ECB45721568)   /*  425 */,
-	W64LIT(0xDAFD983B8206082F)   /*  426 */,    W64LIT(0xAA7D29082386A8CB)   /*  427 */,
-	W64LIT(0x269FCD4403B87588)   /*  428 */,    W64LIT(0x1B91F5F728BDD1E0)   /*  429 */,
-	W64LIT(0xE4669F39040201F6)   /*  430 */,    W64LIT(0x7A1D7C218CF04ADE)   /*  431 */,
-	W64LIT(0x65623C29D79CE5CE)   /*  432 */,    W64LIT(0x2368449096C00BB1)   /*  433 */,
-	W64LIT(0xAB9BF1879DA503BA)   /*  434 */,    W64LIT(0xBC23ECB1A458058E)   /*  435 */,
-	W64LIT(0x9A58DF01BB401ECC)   /*  436 */,    W64LIT(0xA070E868A85F143D)   /*  437 */,
-	W64LIT(0x4FF188307DF2239E)   /*  438 */,    W64LIT(0x14D565B41A641183)   /*  439 */,
-	W64LIT(0xEE13337452701602)   /*  440 */,    W64LIT(0x950E3DCF3F285E09)   /*  441 */,
-	W64LIT(0x59930254B9C80953)   /*  442 */,    W64LIT(0x3BF299408930DA6D)   /*  443 */,
-	W64LIT(0xA955943F53691387)   /*  444 */,    W64LIT(0xA15EDECAA9CB8784)   /*  445 */,
-	W64LIT(0x29142127352BE9A0)   /*  446 */,    W64LIT(0x76F0371FFF4E7AFB)   /*  447 */,
-	W64LIT(0x0239F450274F2228)   /*  448 */,    W64LIT(0xBB073AF01D5E868B)   /*  449 */,
-	W64LIT(0xBFC80571C10E96C1)   /*  450 */,    W64LIT(0xD267088568222E23)   /*  451 */,
-	W64LIT(0x9671A3D48E80B5B0)   /*  452 */,    W64LIT(0x55B5D38AE193BB81)   /*  453 */,
-	W64LIT(0x693AE2D0A18B04B8)   /*  454 */,    W64LIT(0x5C48B4ECADD5335F)   /*  455 */,
-	W64LIT(0xFD743B194916A1CA)   /*  456 */,    W64LIT(0x2577018134BE98C4)   /*  457 */,
-	W64LIT(0xE77987E83C54A4AD)   /*  458 */,    W64LIT(0x28E11014DA33E1B9)   /*  459 */,
-	W64LIT(0x270CC59E226AA213)   /*  460 */,    W64LIT(0x71495F756D1A5F60)   /*  461 */,
-	W64LIT(0x9BE853FB60AFEF77)   /*  462 */,    W64LIT(0xADC786A7F7443DBF)   /*  463 */,
-	W64LIT(0x0904456173B29A82)   /*  464 */,    W64LIT(0x58BC7A66C232BD5E)   /*  465 */,
-	W64LIT(0xF306558C673AC8B2)   /*  466 */,    W64LIT(0x41F639C6B6C9772A)   /*  467 */,
-	W64LIT(0x216DEFE99FDA35DA)   /*  468 */,    W64LIT(0x11640CC71C7BE615)   /*  469 */,
-	W64LIT(0x93C43694565C5527)   /*  470 */,    W64LIT(0xEA038E6246777839)   /*  471 */,
-	W64LIT(0xF9ABF3CE5A3E2469)   /*  472 */,    W64LIT(0x741E768D0FD312D2)   /*  473 */,
-	W64LIT(0x0144B883CED652C6)   /*  474 */,    W64LIT(0xC20B5A5BA33F8552)   /*  475 */,
-	W64LIT(0x1AE69633C3435A9D)   /*  476 */,    W64LIT(0x97A28CA4088CFDEC)   /*  477 */,
-	W64LIT(0x8824A43C1E96F420)   /*  478 */,    W64LIT(0x37612FA66EEEA746)   /*  479 */,
-	W64LIT(0x6B4CB165F9CF0E5A)   /*  480 */,    W64LIT(0x43AA1C06A0ABFB4A)   /*  481 */,
-	W64LIT(0x7F4DC26FF162796B)   /*  482 */,    W64LIT(0x6CBACC8E54ED9B0F)   /*  483 */,
-	W64LIT(0xA6B7FFEFD2BB253E)   /*  484 */,    W64LIT(0x2E25BC95B0A29D4F)   /*  485 */,
-	W64LIT(0x86D6A58BDEF1388C)   /*  486 */,    W64LIT(0xDED74AC576B6F054)   /*  487 */,
-	W64LIT(0x8030BDBC2B45805D)   /*  488 */,    W64LIT(0x3C81AF70E94D9289)   /*  489 */,
-	W64LIT(0x3EFF6DDA9E3100DB)   /*  490 */,    W64LIT(0xB38DC39FDFCC8847)   /*  491 */,
-	W64LIT(0x123885528D17B87E)   /*  492 */,    W64LIT(0xF2DA0ED240B1B642)   /*  493 */,
-	W64LIT(0x44CEFADCD54BF9A9)   /*  494 */,    W64LIT(0x1312200E433C7EE6)   /*  495 */,
-	W64LIT(0x9FFCC84F3A78C748)   /*  496 */,    W64LIT(0xF0CD1F72248576BB)   /*  497 */,
-	W64LIT(0xEC6974053638CFE4)   /*  498 */,    W64LIT(0x2BA7B67C0CEC4E4C)   /*  499 */,
-	W64LIT(0xAC2F4DF3E5CE32ED)   /*  500 */,    W64LIT(0xCB33D14326EA4C11)   /*  501 */,
-	W64LIT(0xA4E9044CC77E58BC)   /*  502 */,    W64LIT(0x5F513293D934FCEF)   /*  503 */,
-	W64LIT(0x5DC9645506E55444)   /*  504 */,    W64LIT(0x50DE418F317DE40A)   /*  505 */,
-	W64LIT(0x388CB31A69DDE259)   /*  506 */,    W64LIT(0x2DB4A83455820A86)   /*  507 */,
-	W64LIT(0x9010A91E84711AE9)   /*  508 */,    W64LIT(0x4DF7F0B7B1498371)   /*  509 */,
-	W64LIT(0xD62A2EABC0977179)   /*  510 */,    W64LIT(0x22FAC097AA8D5C0E)   /*  511 */,
-	W64LIT(0xF49FCC2FF1DAF39B)   /*  512 */,    W64LIT(0x487FD5C66FF29281)   /*  513 */,
-	W64LIT(0xE8A30667FCDCA83F)   /*  514 */,    W64LIT(0x2C9B4BE3D2FCCE63)   /*  515 */,
-	W64LIT(0xDA3FF74B93FBBBC2)   /*  516 */,    W64LIT(0x2FA165D2FE70BA66)   /*  517 */,
-	W64LIT(0xA103E279970E93D4)   /*  518 */,    W64LIT(0xBECDEC77B0E45E71)   /*  519 */,
-	W64LIT(0xCFB41E723985E497)   /*  520 */,    W64LIT(0xB70AAA025EF75017)   /*  521 */,
-	W64LIT(0xD42309F03840B8E0)   /*  522 */,    W64LIT(0x8EFC1AD035898579)   /*  523 */,
-	W64LIT(0x96C6920BE2B2ABC5)   /*  524 */,    W64LIT(0x66AF4163375A9172)   /*  525 */,
-	W64LIT(0x2174ABDCCA7127FB)   /*  526 */,    W64LIT(0xB33CCEA64A72FF41)   /*  527 */,
-	W64LIT(0xF04A4933083066A5)   /*  528 */,    W64LIT(0x8D970ACDD7289AF5)   /*  529 */,
-	W64LIT(0x8F96E8E031C8C25E)   /*  530 */,    W64LIT(0xF3FEC02276875D47)   /*  531 */,
-	W64LIT(0xEC7BF310056190DD)   /*  532 */,    W64LIT(0xF5ADB0AEBB0F1491)   /*  533 */,
-	W64LIT(0x9B50F8850FD58892)   /*  534 */,    W64LIT(0x4975488358B74DE8)   /*  535 */,
-	W64LIT(0xA3354FF691531C61)   /*  536 */,    W64LIT(0x0702BBE481D2C6EE)   /*  537 */,
-	W64LIT(0x89FB24057DEDED98)   /*  538 */,    W64LIT(0xAC3075138596E902)   /*  539 */,
-	W64LIT(0x1D2D3580172772ED)   /*  540 */,    W64LIT(0xEB738FC28E6BC30D)   /*  541 */,
-	W64LIT(0x5854EF8F63044326)   /*  542 */,    W64LIT(0x9E5C52325ADD3BBE)   /*  543 */,
-	W64LIT(0x90AA53CF325C4623)   /*  544 */,    W64LIT(0xC1D24D51349DD067)   /*  545 */,
-	W64LIT(0x2051CFEEA69EA624)   /*  546 */,    W64LIT(0x13220F0A862E7E4F)   /*  547 */,
-	W64LIT(0xCE39399404E04864)   /*  548 */,    W64LIT(0xD9C42CA47086FCB7)   /*  549 */,
-	W64LIT(0x685AD2238A03E7CC)   /*  550 */,    W64LIT(0x066484B2AB2FF1DB)   /*  551 */,
-	W64LIT(0xFE9D5D70EFBF79EC)   /*  552 */,    W64LIT(0x5B13B9DD9C481854)   /*  553 */,
-	W64LIT(0x15F0D475ED1509AD)   /*  554 */,    W64LIT(0x0BEBCD060EC79851)   /*  555 */,
-	W64LIT(0xD58C6791183AB7F8)   /*  556 */,    W64LIT(0xD1187C5052F3EEE4)   /*  557 */,
-	W64LIT(0xC95D1192E54E82FF)   /*  558 */,    W64LIT(0x86EEA14CB9AC6CA2)   /*  559 */,
-	W64LIT(0x3485BEB153677D5D)   /*  560 */,    W64LIT(0xDD191D781F8C492A)   /*  561 */,
-	W64LIT(0xF60866BAA784EBF9)   /*  562 */,    W64LIT(0x518F643BA2D08C74)   /*  563 */,
-	W64LIT(0x8852E956E1087C22)   /*  564 */,    W64LIT(0xA768CB8DC410AE8D)   /*  565 */,
-	W64LIT(0x38047726BFEC8E1A)   /*  566 */,    W64LIT(0xA67738B4CD3B45AA)   /*  567 */,
-	W64LIT(0xAD16691CEC0DDE19)   /*  568 */,    W64LIT(0xC6D4319380462E07)   /*  569 */,
-	W64LIT(0xC5A5876D0BA61938)   /*  570 */,    W64LIT(0x16B9FA1FA58FD840)   /*  571 */,
-	W64LIT(0x188AB1173CA74F18)   /*  572 */,    W64LIT(0xABDA2F98C99C021F)   /*  573 */,
-	W64LIT(0x3E0580AB134AE816)   /*  574 */,    W64LIT(0x5F3B05B773645ABB)   /*  575 */,
-	W64LIT(0x2501A2BE5575F2F6)   /*  576 */,    W64LIT(0x1B2F74004E7E8BA9)   /*  577 */,
-	W64LIT(0x1CD7580371E8D953)   /*  578 */,    W64LIT(0x7F6ED89562764E30)   /*  579 */,
-	W64LIT(0xB15926FF596F003D)   /*  580 */,    W64LIT(0x9F65293DA8C5D6B9)   /*  581 */,
-	W64LIT(0x6ECEF04DD690F84C)   /*  582 */,    W64LIT(0x4782275FFF33AF88)   /*  583 */,
-	W64LIT(0xE41433083F820801)   /*  584 */,    W64LIT(0xFD0DFE409A1AF9B5)   /*  585 */,
-	W64LIT(0x4325A3342CDB396B)   /*  586 */,    W64LIT(0x8AE77E62B301B252)   /*  587 */,
-	W64LIT(0xC36F9E9F6655615A)   /*  588 */,    W64LIT(0x85455A2D92D32C09)   /*  589 */,
-	W64LIT(0xF2C7DEA949477485)   /*  590 */,    W64LIT(0x63CFB4C133A39EBA)   /*  591 */,
-	W64LIT(0x83B040CC6EBC5462)   /*  592 */,    W64LIT(0x3B9454C8FDB326B0)   /*  593 */,
-	W64LIT(0x56F56A9E87FFD78C)   /*  594 */,    W64LIT(0x2DC2940D99F42BC6)   /*  595 */,
-	W64LIT(0x98F7DF096B096E2D)   /*  596 */,    W64LIT(0x19A6E01E3AD852BF)   /*  597 */,
-	W64LIT(0x42A99CCBDBD4B40B)   /*  598 */,    W64LIT(0xA59998AF45E9C559)   /*  599 */,
-	W64LIT(0x366295E807D93186)   /*  600 */,    W64LIT(0x6B48181BFAA1F773)   /*  601 */,
-	W64LIT(0x1FEC57E2157A0A1D)   /*  602 */,    W64LIT(0x4667446AF6201AD5)   /*  603 */,
-	W64LIT(0xE615EBCACFB0F075)   /*  604 */,    W64LIT(0xB8F31F4F68290778)   /*  605 */,
-	W64LIT(0x22713ED6CE22D11E)   /*  606 */,    W64LIT(0x3057C1A72EC3C93B)   /*  607 */,
-	W64LIT(0xCB46ACC37C3F1F2F)   /*  608 */,    W64LIT(0xDBB893FD02AAF50E)   /*  609 */,
-	W64LIT(0x331FD92E600B9FCF)   /*  610 */,    W64LIT(0xA498F96148EA3AD6)   /*  611 */,
-	W64LIT(0xA8D8426E8B6A83EA)   /*  612 */,    W64LIT(0xA089B274B7735CDC)   /*  613 */,
-	W64LIT(0x87F6B3731E524A11)   /*  614 */,    W64LIT(0x118808E5CBC96749)   /*  615 */,
-	W64LIT(0x9906E4C7B19BD394)   /*  616 */,    W64LIT(0xAFED7F7E9B24A20C)   /*  617 */,
-	W64LIT(0x6509EADEEB3644A7)   /*  618 */,    W64LIT(0x6C1EF1D3E8EF0EDE)   /*  619 */,
-	W64LIT(0xB9C97D43E9798FB4)   /*  620 */,    W64LIT(0xA2F2D784740C28A3)   /*  621 */,
-	W64LIT(0x7B8496476197566F)   /*  622 */,    W64LIT(0x7A5BE3E6B65F069D)   /*  623 */,
-	W64LIT(0xF96330ED78BE6F10)   /*  624 */,    W64LIT(0xEEE60DE77A076A15)   /*  625 */,
-	W64LIT(0x2B4BEE4AA08B9BD0)   /*  626 */,    W64LIT(0x6A56A63EC7B8894E)   /*  627 */,
-	W64LIT(0x02121359BA34FEF4)   /*  628 */,    W64LIT(0x4CBF99F8283703FC)   /*  629 */,
-	W64LIT(0x398071350CAF30C8)   /*  630 */,    W64LIT(0xD0A77A89F017687A)   /*  631 */,
-	W64LIT(0xF1C1A9EB9E423569)   /*  632 */,    W64LIT(0x8C7976282DEE8199)   /*  633 */,
-	W64LIT(0x5D1737A5DD1F7ABD)   /*  634 */,    W64LIT(0x4F53433C09A9FA80)   /*  635 */,
-	W64LIT(0xFA8B0C53DF7CA1D9)   /*  636 */,    W64LIT(0x3FD9DCBC886CCB77)   /*  637 */,
-	W64LIT(0xC040917CA91B4720)   /*  638 */,    W64LIT(0x7DD00142F9D1DCDF)   /*  639 */,
-	W64LIT(0x8476FC1D4F387B58)   /*  640 */,    W64LIT(0x23F8E7C5F3316503)   /*  641 */,
-	W64LIT(0x032A2244E7E37339)   /*  642 */,    W64LIT(0x5C87A5D750F5A74B)   /*  643 */,
-	W64LIT(0x082B4CC43698992E)   /*  644 */,    W64LIT(0xDF917BECB858F63C)   /*  645 */,
-	W64LIT(0x3270B8FC5BF86DDA)   /*  646 */,    W64LIT(0x10AE72BB29B5DD76)   /*  647 */,
-	W64LIT(0x576AC94E7700362B)   /*  648 */,    W64LIT(0x1AD112DAC61EFB8F)   /*  649 */,
-	W64LIT(0x691BC30EC5FAA427)   /*  650 */,    W64LIT(0xFF246311CC327143)   /*  651 */,
-	W64LIT(0x3142368E30E53206)   /*  652 */,    W64LIT(0x71380E31E02CA396)   /*  653 */,
-	W64LIT(0x958D5C960AAD76F1)   /*  654 */,    W64LIT(0xF8D6F430C16DA536)   /*  655 */,
-	W64LIT(0xC8FFD13F1BE7E1D2)   /*  656 */,    W64LIT(0x7578AE66004DDBE1)   /*  657 */,
-	W64LIT(0x05833F01067BE646)   /*  658 */,    W64LIT(0xBB34B5AD3BFE586D)   /*  659 */,
-	W64LIT(0x095F34C9A12B97F0)   /*  660 */,    W64LIT(0x247AB64525D60CA8)   /*  661 */,
-	W64LIT(0xDCDBC6F3017477D1)   /*  662 */,    W64LIT(0x4A2E14D4DECAD24D)   /*  663 */,
-	W64LIT(0xBDB5E6D9BE0A1EEB)   /*  664 */,    W64LIT(0x2A7E70F7794301AB)   /*  665 */,
-	W64LIT(0xDEF42D8A270540FD)   /*  666 */,    W64LIT(0x01078EC0A34C22C1)   /*  667 */,
-	W64LIT(0xE5DE511AF4C16387)   /*  668 */,    W64LIT(0x7EBB3A52BD9A330A)   /*  669 */,
-	W64LIT(0x77697857AA7D6435)   /*  670 */,    W64LIT(0x004E831603AE4C32)   /*  671 */,
-	W64LIT(0xE7A21020AD78E312)   /*  672 */,    W64LIT(0x9D41A70C6AB420F2)   /*  673 */,
-	W64LIT(0x28E06C18EA1141E6)   /*  674 */,    W64LIT(0xD2B28CBD984F6B28)   /*  675 */,
-	W64LIT(0x26B75F6C446E9D83)   /*  676 */,    W64LIT(0xBA47568C4D418D7F)   /*  677 */,
-	W64LIT(0xD80BADBFE6183D8E)   /*  678 */,    W64LIT(0x0E206D7F5F166044)   /*  679 */,
-	W64LIT(0xE258A43911CBCA3E)   /*  680 */,    W64LIT(0x723A1746B21DC0BC)   /*  681 */,
-	W64LIT(0xC7CAA854F5D7CDD3)   /*  682 */,    W64LIT(0x7CAC32883D261D9C)   /*  683 */,
-	W64LIT(0x7690C26423BA942C)   /*  684 */,    W64LIT(0x17E55524478042B8)   /*  685 */,
-	W64LIT(0xE0BE477656A2389F)   /*  686 */,    W64LIT(0x4D289B5E67AB2DA0)   /*  687 */,
-	W64LIT(0x44862B9C8FBBFD31)   /*  688 */,    W64LIT(0xB47CC8049D141365)   /*  689 */,
-	W64LIT(0x822C1B362B91C793)   /*  690 */,    W64LIT(0x4EB14655FB13DFD8)   /*  691 */,
-	W64LIT(0x1ECBBA0714E2A97B)   /*  692 */,    W64LIT(0x6143459D5CDE5F14)   /*  693 */,
-	W64LIT(0x53A8FBF1D5F0AC89)   /*  694 */,    W64LIT(0x97EA04D81C5E5B00)   /*  695 */,
-	W64LIT(0x622181A8D4FDB3F3)   /*  696 */,    W64LIT(0xE9BCD341572A1208)   /*  697 */,
-	W64LIT(0x1411258643CCE58A)   /*  698 */,    W64LIT(0x9144C5FEA4C6E0A4)   /*  699 */,
-	W64LIT(0x0D33D06565CF620F)   /*  700 */,    W64LIT(0x54A48D489F219CA1)   /*  701 */,
-	W64LIT(0xC43E5EAC6D63C821)   /*  702 */,    W64LIT(0xA9728B3A72770DAF)   /*  703 */,
-	W64LIT(0xD7934E7B20DF87EF)   /*  704 */,    W64LIT(0xE35503B61A3E86E5)   /*  705 */,
-	W64LIT(0xCAE321FBC819D504)   /*  706 */,    W64LIT(0x129A50B3AC60BFA6)   /*  707 */,
-	W64LIT(0xCD5E68EA7E9FB6C3)   /*  708 */,    W64LIT(0xB01C90199483B1C7)   /*  709 */,
-	W64LIT(0x3DE93CD5C295376C)   /*  710 */,    W64LIT(0xAED52EDF2AB9AD13)   /*  711 */,
-	W64LIT(0x2E60F512C0A07884)   /*  712 */,    W64LIT(0xBC3D86A3E36210C9)   /*  713 */,
-	W64LIT(0x35269D9B163951CE)   /*  714 */,    W64LIT(0x0C7D6E2AD0CDB5FA)   /*  715 */,
-	W64LIT(0x59E86297D87F5733)   /*  716 */,    W64LIT(0x298EF221898DB0E7)   /*  717 */,
-	W64LIT(0x55000029D1A5AA7E)   /*  718 */,    W64LIT(0x8BC08AE1B5061B45)   /*  719 */,
-	W64LIT(0xC2C31C2B6C92703A)   /*  720 */,    W64LIT(0x94CC596BAF25EF42)   /*  721 */,
-	W64LIT(0x0A1D73DB22540456)   /*  722 */,    W64LIT(0x04B6A0F9D9C4179A)   /*  723 */,
-	W64LIT(0xEFFDAFA2AE3D3C60)   /*  724 */,    W64LIT(0xF7C8075BB49496C4)   /*  725 */,
-	W64LIT(0x9CC5C7141D1CD4E3)   /*  726 */,    W64LIT(0x78BD1638218E5534)   /*  727 */,
-	W64LIT(0xB2F11568F850246A)   /*  728 */,    W64LIT(0xEDFABCFA9502BC29)   /*  729 */,
-	W64LIT(0x796CE5F2DA23051B)   /*  730 */,    W64LIT(0xAAE128B0DC93537C)   /*  731 */,
-	W64LIT(0x3A493DA0EE4B29AE)   /*  732 */,    W64LIT(0xB5DF6B2C416895D7)   /*  733 */,
-	W64LIT(0xFCABBD25122D7F37)   /*  734 */,    W64LIT(0x70810B58105DC4B1)   /*  735 */,
-	W64LIT(0xE10FDD37F7882A90)   /*  736 */,    W64LIT(0x524DCAB5518A3F5C)   /*  737 */,
-	W64LIT(0x3C9E85878451255B)   /*  738 */,    W64LIT(0x4029828119BD34E2)   /*  739 */,
-	W64LIT(0x74A05B6F5D3CECCB)   /*  740 */,    W64LIT(0xB610021542E13ECA)   /*  741 */,
-	W64LIT(0x0FF979D12F59E2AC)   /*  742 */,    W64LIT(0x6037DA27E4F9CC50)   /*  743 */,
-	W64LIT(0x5E92975A0DF1847D)   /*  744 */,    W64LIT(0xD66DE190D3E623FE)   /*  745 */,
-	W64LIT(0x5032D6B87B568048)   /*  746 */,    W64LIT(0x9A36B7CE8235216E)   /*  747 */,
-	W64LIT(0x80272A7A24F64B4A)   /*  748 */,    W64LIT(0x93EFED8B8C6916F7)   /*  749 */,
-	W64LIT(0x37DDBFF44CCE1555)   /*  750 */,    W64LIT(0x4B95DB5D4B99BD25)   /*  751 */,
-	W64LIT(0x92D3FDA169812FC0)   /*  752 */,    W64LIT(0xFB1A4A9A90660BB6)   /*  753 */,
-	W64LIT(0x730C196946A4B9B2)   /*  754 */,    W64LIT(0x81E289AA7F49DA68)   /*  755 */,
-	W64LIT(0x64669A0F83B1A05F)   /*  756 */,    W64LIT(0x27B3FF7D9644F48B)   /*  757 */,
-	W64LIT(0xCC6B615C8DB675B3)   /*  758 */,    W64LIT(0x674F20B9BCEBBE95)   /*  759 */,
-	W64LIT(0x6F31238275655982)   /*  760 */,    W64LIT(0x5AE488713E45CF05)   /*  761 */,
-	W64LIT(0xBF619F9954C21157)   /*  762 */,    W64LIT(0xEABAC46040A8EAE9)   /*  763 */,
-	W64LIT(0x454C6FE9F2C0C1CD)   /*  764 */,    W64LIT(0x419CF6496412691C)   /*  765 */,
-	W64LIT(0xD3DC3BEF265B0F70)   /*  766 */,    W64LIT(0x6D0E60F5C3578A9E)   /*  767 */,
-	W64LIT(0x5B0E608526323C55)   /*  768 */,    W64LIT(0x1A46C1A9FA1B59F5)   /*  769 */,
-	W64LIT(0xA9E245A17C4C8FFA)   /*  770 */,    W64LIT(0x65CA5159DB2955D7)   /*  771 */,
-	W64LIT(0x05DB0A76CE35AFC2)   /*  772 */,    W64LIT(0x81EAC77EA9113D45)   /*  773 */,
-	W64LIT(0x528EF88AB6AC0A0D)   /*  774 */,    W64LIT(0xA09EA253597BE3FF)   /*  775 */,
-	W64LIT(0x430DDFB3AC48CD56)   /*  776 */,    W64LIT(0xC4B3A67AF45CE46F)   /*  777 */,
-	W64LIT(0x4ECECFD8FBE2D05E)   /*  778 */,    W64LIT(0x3EF56F10B39935F0)   /*  779 */,
-	W64LIT(0x0B22D6829CD619C6)   /*  780 */,    W64LIT(0x17FD460A74DF2069)   /*  781 */,
-	W64LIT(0x6CF8CC8E8510ED40)   /*  782 */,    W64LIT(0xD6C824BF3A6ECAA7)   /*  783 */,
-	W64LIT(0x61243D581A817049)   /*  784 */,    W64LIT(0x048BACB6BBC163A2)   /*  785 */,
-	W64LIT(0xD9A38AC27D44CC32)   /*  786 */,    W64LIT(0x7FDDFF5BAAF410AB)   /*  787 */,
-	W64LIT(0xAD6D495AA804824B)   /*  788 */,    W64LIT(0xE1A6A74F2D8C9F94)   /*  789 */,
-	W64LIT(0xD4F7851235DEE8E3)   /*  790 */,    W64LIT(0xFD4B7F886540D893)   /*  791 */,
-	W64LIT(0x247C20042AA4BFDA)   /*  792 */,    W64LIT(0x096EA1C517D1327C)   /*  793 */,
-	W64LIT(0xD56966B4361A6685)   /*  794 */,    W64LIT(0x277DA5C31221057D)   /*  795 */,
-	W64LIT(0x94D59893A43ACFF7)   /*  796 */,    W64LIT(0x64F0C51CCDC02281)   /*  797 */,
-	W64LIT(0x3D33BCC4FF6189DB)   /*  798 */,    W64LIT(0xE005CB184CE66AF1)   /*  799 */,
-	W64LIT(0xFF5CCD1D1DB99BEA)   /*  800 */,    W64LIT(0xB0B854A7FE42980F)   /*  801 */,
-	W64LIT(0x7BD46A6A718D4B9F)   /*  802 */,    W64LIT(0xD10FA8CC22A5FD8C)   /*  803 */,
-	W64LIT(0xD31484952BE4BD31)   /*  804 */,    W64LIT(0xC7FA975FCB243847)   /*  805 */,
-	W64LIT(0x4886ED1E5846C407)   /*  806 */,    W64LIT(0x28CDDB791EB70B04)   /*  807 */,
-	W64LIT(0xC2B00BE2F573417F)   /*  808 */,    W64LIT(0x5C9590452180F877)   /*  809 */,
-	W64LIT(0x7A6BDDFFF370EB00)   /*  810 */,    W64LIT(0xCE509E38D6D9D6A4)   /*  811 */,
-	W64LIT(0xEBEB0F00647FA702)   /*  812 */,    W64LIT(0x1DCC06CF76606F06)   /*  813 */,
-	W64LIT(0xE4D9F28BA286FF0A)   /*  814 */,    W64LIT(0xD85A305DC918C262)   /*  815 */,
-	W64LIT(0x475B1D8732225F54)   /*  816 */,    W64LIT(0x2D4FB51668CCB5FE)   /*  817 */,
-	W64LIT(0xA679B9D9D72BBA20)   /*  818 */,    W64LIT(0x53841C0D912D43A5)   /*  819 */,
-	W64LIT(0x3B7EAA48BF12A4E8)   /*  820 */,    W64LIT(0x781E0E47F22F1DDF)   /*  821 */,
-	W64LIT(0xEFF20CE60AB50973)   /*  822 */,    W64LIT(0x20D261D19DFFB742)   /*  823 */,
-	W64LIT(0x16A12B03062A2E39)   /*  824 */,    W64LIT(0x1960EB2239650495)   /*  825 */,
-	W64LIT(0x251C16FED50EB8B8)   /*  826 */,    W64LIT(0x9AC0C330F826016E)   /*  827 */,
-	W64LIT(0xED152665953E7671)   /*  828 */,    W64LIT(0x02D63194A6369570)   /*  829 */,
-	W64LIT(0x5074F08394B1C987)   /*  830 */,    W64LIT(0x70BA598C90B25CE1)   /*  831 */,
-	W64LIT(0x794A15810B9742F6)   /*  832 */,    W64LIT(0x0D5925E9FCAF8C6C)   /*  833 */,
-	W64LIT(0x3067716CD868744E)   /*  834 */,    W64LIT(0x910AB077E8D7731B)   /*  835 */,
-	W64LIT(0x6A61BBDB5AC42F61)   /*  836 */,    W64LIT(0x93513EFBF0851567)   /*  837 */,
-	W64LIT(0xF494724B9E83E9D5)   /*  838 */,    W64LIT(0xE887E1985C09648D)   /*  839 */,
-	W64LIT(0x34B1D3C675370CFD)   /*  840 */,    W64LIT(0xDC35E433BC0D255D)   /*  841 */,
-	W64LIT(0xD0AAB84234131BE0)   /*  842 */,    W64LIT(0x08042A50B48B7EAF)   /*  843 */,
-	W64LIT(0x9997C4EE44A3AB35)   /*  844 */,    W64LIT(0x829A7B49201799D0)   /*  845 */,
-	W64LIT(0x263B8307B7C54441)   /*  846 */,    W64LIT(0x752F95F4FD6A6CA6)   /*  847 */,
-	W64LIT(0x927217402C08C6E5)   /*  848 */,    W64LIT(0x2A8AB754A795D9EE)   /*  849 */,
-	W64LIT(0xA442F7552F72943D)   /*  850 */,    W64LIT(0x2C31334E19781208)   /*  851 */,
-	W64LIT(0x4FA98D7CEAEE6291)   /*  852 */,    W64LIT(0x55C3862F665DB309)   /*  853 */,
-	W64LIT(0xBD0610175D53B1F3)   /*  854 */,    W64LIT(0x46FE6CB840413F27)   /*  855 */,
-	W64LIT(0x3FE03792DF0CFA59)   /*  856 */,    W64LIT(0xCFE700372EB85E8F)   /*  857 */,
-	W64LIT(0xA7BE29E7ADBCE118)   /*  858 */,    W64LIT(0xE544EE5CDE8431DD)   /*  859 */,
-	W64LIT(0x8A781B1B41F1873E)   /*  860 */,    W64LIT(0xA5C94C78A0D2F0E7)   /*  861 */,
-	W64LIT(0x39412E2877B60728)   /*  862 */,    W64LIT(0xA1265EF3AFC9A62C)   /*  863 */,
-	W64LIT(0xBCC2770C6A2506C5)   /*  864 */,    W64LIT(0x3AB66DD5DCE1CE12)   /*  865 */,
-	W64LIT(0xE65499D04A675B37)   /*  866 */,    W64LIT(0x7D8F523481BFD216)   /*  867 */,
-	W64LIT(0x0F6F64FCEC15F389)   /*  868 */,    W64LIT(0x74EFBE618B5B13C8)   /*  869 */,
-	W64LIT(0xACDC82B714273E1D)   /*  870 */,    W64LIT(0xDD40BFE003199D17)   /*  871 */,
-	W64LIT(0x37E99257E7E061F8)   /*  872 */,    W64LIT(0xFA52626904775AAA)   /*  873 */,
-	W64LIT(0x8BBBF63A463D56F9)   /*  874 */,    W64LIT(0xF0013F1543A26E64)   /*  875 */,
-	W64LIT(0xA8307E9F879EC898)   /*  876 */,    W64LIT(0xCC4C27A4150177CC)   /*  877 */,
-	W64LIT(0x1B432F2CCA1D3348)   /*  878 */,    W64LIT(0xDE1D1F8F9F6FA013)   /*  879 */,
-	W64LIT(0x606602A047A7DDD6)   /*  880 */,    W64LIT(0xD237AB64CC1CB2C7)   /*  881 */,
-	W64LIT(0x9B938E7225FCD1D3)   /*  882 */,    W64LIT(0xEC4E03708E0FF476)   /*  883 */,
-	W64LIT(0xFEB2FBDA3D03C12D)   /*  884 */,    W64LIT(0xAE0BCED2EE43889A)   /*  885 */,
-	W64LIT(0x22CB8923EBFB4F43)   /*  886 */,    W64LIT(0x69360D013CF7396D)   /*  887 */,
-	W64LIT(0x855E3602D2D4E022)   /*  888 */,    W64LIT(0x073805BAD01F784C)   /*  889 */,
-	W64LIT(0x33E17A133852F546)   /*  890 */,    W64LIT(0xDF4874058AC7B638)   /*  891 */,
-	W64LIT(0xBA92B29C678AA14A)   /*  892 */,    W64LIT(0x0CE89FC76CFAADCD)   /*  893 */,
-	W64LIT(0x5F9D4E0908339E34)   /*  894 */,    W64LIT(0xF1AFE9291F5923B9)   /*  895 */,
-	W64LIT(0x6E3480F60F4A265F)   /*  896 */,    W64LIT(0xEEBF3A2AB29B841C)   /*  897 */,
-	W64LIT(0xE21938A88F91B4AD)   /*  898 */,    W64LIT(0x57DFEFF845C6D3C3)   /*  899 */,
-	W64LIT(0x2F006B0BF62CAAF2)   /*  900 */,    W64LIT(0x62F479EF6F75EE78)   /*  901 */,
-	W64LIT(0x11A55AD41C8916A9)   /*  902 */,    W64LIT(0xF229D29084FED453)   /*  903 */,
-	W64LIT(0x42F1C27B16B000E6)   /*  904 */,    W64LIT(0x2B1F76749823C074)   /*  905 */,
-	W64LIT(0x4B76ECA3C2745360)   /*  906 */,    W64LIT(0x8C98F463B91691BD)   /*  907 */,
-	W64LIT(0x14BCC93CF1ADE66A)   /*  908 */,    W64LIT(0x8885213E6D458397)   /*  909 */,
-	W64LIT(0x8E177DF0274D4711)   /*  910 */,    W64LIT(0xB49B73B5503F2951)   /*  911 */,
-	W64LIT(0x10168168C3F96B6B)   /*  912 */,    W64LIT(0x0E3D963B63CAB0AE)   /*  913 */,
-	W64LIT(0x8DFC4B5655A1DB14)   /*  914 */,    W64LIT(0xF789F1356E14DE5C)   /*  915 */,
-	W64LIT(0x683E68AF4E51DAC1)   /*  916 */,    W64LIT(0xC9A84F9D8D4B0FD9)   /*  917 */,
-	W64LIT(0x3691E03F52A0F9D1)   /*  918 */,    W64LIT(0x5ED86E46E1878E80)   /*  919 */,
-	W64LIT(0x3C711A0E99D07150)   /*  920 */,    W64LIT(0x5A0865B20C4E9310)   /*  921 */,
-	W64LIT(0x56FBFC1FE4F0682E)   /*  922 */,    W64LIT(0xEA8D5DE3105EDF9B)   /*  923 */,
-	W64LIT(0x71ABFDB12379187A)   /*  924 */,    W64LIT(0x2EB99DE1BEE77B9C)   /*  925 */,
-	W64LIT(0x21ECC0EA33CF4523)   /*  926 */,    W64LIT(0x59A4D7521805C7A1)   /*  927 */,
-	W64LIT(0x3896F5EB56AE7C72)   /*  928 */,    W64LIT(0xAA638F3DB18F75DC)   /*  929 */,
-	W64LIT(0x9F39358DABE9808E)   /*  930 */,    W64LIT(0xB7DEFA91C00B72AC)   /*  931 */,
-	W64LIT(0x6B5541FD62492D92)   /*  932 */,    W64LIT(0x6DC6DEE8F92E4D5B)   /*  933 */,
-	W64LIT(0x353F57ABC4BEEA7E)   /*  934 */,    W64LIT(0x735769D6DA5690CE)   /*  935 */,
-	W64LIT(0x0A234AA642391484)   /*  936 */,    W64LIT(0xF6F9508028F80D9D)   /*  937 */,
-	W64LIT(0xB8E319A27AB3F215)   /*  938 */,    W64LIT(0x31AD9C1151341A4D)   /*  939 */,
-	W64LIT(0x773C22A57BEF5805)   /*  940 */,    W64LIT(0x45C7561A07968633)   /*  941 */,
-	W64LIT(0xF913DA9E249DBE36)   /*  942 */,    W64LIT(0xDA652D9B78A64C68)   /*  943 */,
-	W64LIT(0x4C27A97F3BC334EF)   /*  944 */,    W64LIT(0x76621220E66B17F4)   /*  945 */,
-	W64LIT(0x967743899ACD7D0B)   /*  946 */,    W64LIT(0xF3EE5BCAE0ED6782)   /*  947 */,
-	W64LIT(0x409F753600C879FC)   /*  948 */,    W64LIT(0x06D09A39B5926DB6)   /*  949 */,
-	W64LIT(0x6F83AEB0317AC588)   /*  950 */,    W64LIT(0x01E6CA4A86381F21)   /*  951 */,
-	W64LIT(0x66FF3462D19F3025)   /*  952 */,    W64LIT(0x72207C24DDFD3BFB)   /*  953 */,
-	W64LIT(0x4AF6B6D3E2ECE2EB)   /*  954 */,    W64LIT(0x9C994DBEC7EA08DE)   /*  955 */,
-	W64LIT(0x49ACE597B09A8BC4)   /*  956 */,    W64LIT(0xB38C4766CF0797BA)   /*  957 */,
-	W64LIT(0x131B9373C57C2A75)   /*  958 */,    W64LIT(0xB1822CCE61931E58)   /*  959 */,
-	W64LIT(0x9D7555B909BA1C0C)   /*  960 */,    W64LIT(0x127FAFDD937D11D2)   /*  961 */,
-	W64LIT(0x29DA3BADC66D92E4)   /*  962 */,    W64LIT(0xA2C1D57154C2ECBC)   /*  963 */,
-	W64LIT(0x58C5134D82F6FE24)   /*  964 */,    W64LIT(0x1C3AE3515B62274F)   /*  965 */,
-	W64LIT(0xE907C82E01CB8126)   /*  966 */,    W64LIT(0xF8ED091913E37FCB)   /*  967 */,
-	W64LIT(0x3249D8F9C80046C9)   /*  968 */,    W64LIT(0x80CF9BEDE388FB63)   /*  969 */,
-	W64LIT(0x1881539A116CF19E)   /*  970 */,    W64LIT(0x5103F3F76BD52457)   /*  971 */,
-	W64LIT(0x15B7E6F5AE47F7A8)   /*  972 */,    W64LIT(0xDBD7C6DED47E9CCF)   /*  973 */,
-	W64LIT(0x44E55C410228BB1A)   /*  974 */,    W64LIT(0xB647D4255EDB4E99)   /*  975 */,
-	W64LIT(0x5D11882BB8AAFC30)   /*  976 */,    W64LIT(0xF5098BBB29D3212A)   /*  977 */,
-	W64LIT(0x8FB5EA14E90296B3)   /*  978 */,    W64LIT(0x677B942157DD025A)   /*  979 */,
-	W64LIT(0xFB58E7C0A390ACB5)   /*  980 */,    W64LIT(0x89D3674C83BD4A01)   /*  981 */,
-	W64LIT(0x9E2DA4DF4BF3B93B)   /*  982 */,    W64LIT(0xFCC41E328CAB4829)   /*  983 */,
-	W64LIT(0x03F38C96BA582C52)   /*  984 */,    W64LIT(0xCAD1BDBD7FD85DB2)   /*  985 */,
-	W64LIT(0xBBB442C16082AE83)   /*  986 */,    W64LIT(0xB95FE86BA5DA9AB0)   /*  987 */,
-	W64LIT(0xB22E04673771A93F)   /*  988 */,    W64LIT(0x845358C9493152D8)   /*  989 */,
-	W64LIT(0xBE2A488697B4541E)   /*  990 */,    W64LIT(0x95A2DC2DD38E6966)   /*  991 */,
-	W64LIT(0xC02C11AC923C852B)   /*  992 */,    W64LIT(0x2388B1990DF2A87B)   /*  993 */,
-	W64LIT(0x7C8008FA1B4F37BE)   /*  994 */,    W64LIT(0x1F70D0C84D54E503)   /*  995 */,
-	W64LIT(0x5490ADEC7ECE57D4)   /*  996 */,    W64LIT(0x002B3C27D9063A3A)   /*  997 */,
-	W64LIT(0x7EAEA3848030A2BF)   /*  998 */,    W64LIT(0xC602326DED2003C0)   /*  999 */,
-	W64LIT(0x83A7287D69A94086)   /* 1000 */,    W64LIT(0xC57A5FCB30F57A8A)   /* 1001 */,
-	W64LIT(0xB56844E479EBE779)   /* 1002 */,    W64LIT(0xA373B40F05DCBCE9)   /* 1003 */,
-	W64LIT(0xD71A786E88570EE2)   /* 1004 */,    W64LIT(0x879CBACDBDE8F6A0)   /* 1005 */,
-	W64LIT(0x976AD1BCC164A32F)   /* 1006 */,    W64LIT(0xAB21E25E9666D78B)   /* 1007 */,
-	W64LIT(0x901063AAE5E5C33C)   /* 1008 */,    W64LIT(0x9818B34448698D90)   /* 1009 */,
-	W64LIT(0xE36487AE3E1E8ABB)   /* 1010 */,    W64LIT(0xAFBDF931893BDCB4)   /* 1011 */,
-	W64LIT(0x6345A0DC5FBBD519)   /* 1012 */,    W64LIT(0x8628FE269B9465CA)   /* 1013 */,
-	W64LIT(0x1E5D01603F9C51EC)   /* 1014 */,    W64LIT(0x4DE44006A15049B7)   /* 1015 */,
-	W64LIT(0xBF6C70E5F776CBB1)   /* 1016 */,    W64LIT(0x411218F2EF552BED)   /* 1017 */,
-	W64LIT(0xCB0C0708705A36A3)   /* 1018 */,    W64LIT(0xE74D14754F986044)   /* 1019 */,
-	W64LIT(0xCD56D9430EA8280E)   /* 1020 */,    W64LIT(0xC12591D7535F5065)   /* 1021 */,
-	W64LIT(0xC83223F1720AEF96)   /* 1022 */,    W64LIT(0xC3A0396F7363A51F)   /* 1023 */,
-	W64LIT(0xffffffffffffffff),
-	W64LIT(0xA5A5A5A5A5A5A5A5),
-	W64LIT(0x0123456789ABCDEF),
-};
-
-NAMESPACE_END
diff --git a/src-cryptopp/trap.h b/src-cryptopp/trap.h
deleted file mode 100644
index f594e44..0000000
--- a/src-cryptopp/trap.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// trap.h - written and placed in public domain by Jeffrey Walton.
-//          Copyright assigned to Crypto++ project
-
-//! \file trap.h
-//! \brief Debugging and diagnostic assertions
-//! \details <tt>CRYPTOPP_ASSERT</tt> is the library's debugging and diagnostic assertion. <tt>CRYPTOPP_ASSERT</tt>
-//!   is enabled by <tt>CRYPTOPP_DEBUG</tt>, <tt>DEBUG</tt> or <tt>_DEBUG</tt>.
-//! \details <tt>CRYPTOPP_ASSERT</tt> raises a <tt>SIGTRAP</tt> (Unix) or calls <tt>__debugbreak()</tt> (Windows).
-//!   <tt>CRYPTOPP_ASSERT</tt> is only in effect when the user requests a debug configuration. Unlike Posix assert,
-//!   <tt>NDEBUG</tt> (or failure to define it) does not affect the library.
-//! The traditional Posix define <tt>NDEBUG</tt> has no effect on <tt>CRYPTOPP_DEBUG</tt> or DebugTrapHandler.
-//! \since Crypto++ 5.6.5
-//! \sa DebugTrapHandler, <A HREF="http://github.com/weidai11/cryptopp/issues/277">Issue 277</A>,
-//!   <A HREF="http://seclists.org/oss-sec/2016/q3/520">CVE-2016-7420</A>
-
-#ifndef CRYPTOPP_TRAP_H
-#define CRYPTOPP_TRAP_H
-
-#include "config.h"
-
-#if CRYPTOPP_DEBUG
-#  include <iostream>
-#  include <sstream>
-#  if defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE)
-#    include "ossig.h"
-#  elif defined(CRYPTOPP_WIN32_AVAILABLE)
-#    if (_MSC_VER >= 1400)
-#      include <intrin.h>
-#    endif
-#  endif
-#endif // CRYPTOPP_DEBUG
-
-// ************** run-time assertion ***************
-
-#if defined(CRYPTOPP_DOXYGEN_PROCESSING)
-//! \brief Debugging and diagnostic assertion
-//! \details <tt>CRYPTOPP_ASSERT</tt> is the library's debugging and diagnostic assertion. <tt>CRYPTOPP_ASSERT</tt>
-//!   is enabled by the preprocessor macros <tt>CRYPTOPP_DEBUG</tt>, <tt>DEBUG</tt> or <tt>_DEBUG</tt>.
-//! \details <tt>CRYPTOPP_ASSERT</tt> raises a <tt>SIGTRAP</tt> (Unix) or calls <tt>DebugBreak()</tt> (Windows).
-//!   <tt>CRYPTOPP_ASSERT</tt> is only in effect when the user explictly requests a debug configuration.
-//! \details If you want to ensure <tt>CRYPTOPP_ASSERT</tt> is inert, then <em>do not</em> define
-//!   <tt>CRYPTOPP_DEBUG</tt>, <tt>DEBUG</tt> or <tt>_DEBUG</tt>. Avoiding the defines means <tt>CRYPTOPP_ASSERT</tt>
-//!   is processed into <tt>((void)(exp))</tt>.
-//! \details The traditional Posix define <tt>NDEBUG</tt> has no effect on <tt>CRYPTOPP_DEBUG</tt>, <tt>CRYPTOPP_ASSERT</tt>
-//!   or DebugTrapHandler.
-//! \details An example of using \ref CRYPTOPP_ASSERT "CRYPTOPP_ASSERT" and DebugTrapHandler is shown below. The library's
-//!   test program, <tt>cryptest.exe</tt> (from test.cpp), exercises the structure:
-//!  <pre>
-//!    #if CRYPTOPP_DEBUG && (defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE))
-//!    static const DebugTrapHandler g_dummyHandler;
-//!    #endif
-//!
-//!    int main(int argc, char* argv[])
-//!    {
-//!       CRYPTOPP_ASSERT(argv != nullptr);
-//!       ...
-//!    }
-//!  </pre>
-//! \since Crypto++ 5.6.5
-//! \sa DebugTrapHandler, SignalHandler, <A HREF="http://github.com/weidai11/cryptopp/issues/277">Issue 277</A>,
-//!   <A HREF="http://seclists.org/oss-sec/2016/q3/520">CVE-2016-7420</A>
-#  define CRYPTOPP_ASSERT(exp) { ... }
-#endif
-
-#if CRYPTOPP_DEBUG && (defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE))
-#  define CRYPTOPP_ASSERT(exp) {                                  \
-    if (!(exp)) {                                                 \
-      std::ostringstream oss;                                     \
-      oss << "Assertion failed: " << (char*)(__FILE__) << "("     \
-          << (int)(__LINE__) << "): " << (char*)(__func__)        \
-          << std::endl;                                           \
-      std::cerr << oss.str();                                     \
-      raise(SIGTRAP);                                             \
-    }                                                             \
-  }
-#elif CRYPTOPP_DEBUG && defined(CRYPTOPP_WIN32_AVAILABLE)
-#  define CRYPTOPP_ASSERT(exp) {                                  \
-    if (!(exp)) {                                                 \
-      std::ostringstream oss;                                     \
-      oss << "Assertion failed: " << (char*)(__FILE__) << "("     \
-          << (int)(__LINE__) << "): " << (char*)(__FUNCTION__)    \
-          << std::endl;                                           \
-      std::cerr << oss.str();                                     \
-      __debugbreak();                                             \
-    }                                                             \
-  }
-#endif // DEBUG and Unix or Windows
-
-// Remove CRYPTOPP_ASSERT in non-debug builds.
-//  Can't use CRYPTOPP_UNUSED due to circular dependency
-#ifndef CRYPTOPP_ASSERT
-#  define CRYPTOPP_ASSERT(exp) ((void)(exp))
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// ************** SIGTRAP handler ***************
-
-#if (CRYPTOPP_DEBUG && (defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE))) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
-//! \brief Default SIGTRAP handler
-//! \details DebugTrapHandler() can be used by a program to install an empty SIGTRAP handler. If present,
-//!   the handler ensures there is a signal handler in place for <tt>SIGTRAP</tt> raised by
-//!   <tt>CRYPTOPP_ASSERT</tt>. If <tt>CRYPTOPP_ASSERT</tt> raises <tt>SIGTRAP</tt> <em>without</em>
-//!   a handler, then one of two things can occur. First, the OS might allow the program
-//!   to continue. Second, the OS might terminate the program. OS X allows the program to continue, while
-//!   some Linuxes terminate the program.
-//! \details If DebugTrapHandler detects another handler in place, then it will not install a handler. This
-//!   ensures a debugger can gain control of the <tt>SIGTRAP</tt> signal without contention. It also allows multiple
-//!   DebugTrapHandler to be created without contentious or unusual behavior. Though muliple DebugTrapHandler can be
-//!   created, a program should only create one, if needed.
-//! \details A DebugTrapHandler is subject to C++ static initialization [dis]order. If you need to install a handler
-//!   and it must be installed early, then reference the code associated with <tt>CRYPTOPP_INIT_PRIORITY</tt> in
-//!   cryptlib.cpp and cpu.cpp.
-//! \details If you want to ensure <tt>CRYPTOPP_ASSERT</tt> is inert, then <em>do not</em> define
-//!   <tt>CRYPTOPP_DEBUG</tt>, <tt>DEBUG</tt> or <tt>_DEBUG</tt>. Avoiding the defines means <tt>CRYPTOPP_ASSERT</tt>
-//!   is processed into <tt>((void)(exp))</tt>.
-//! \details The traditional Posix define <tt>NDEBUG</tt> has no effect on <tt>CRYPTOPP_DEBUG</tt>, <tt>CRYPTOPP_ASSERT</tt>
-//!   or DebugTrapHandler.
-//! \details An example of using \ref CRYPTOPP_ASSERT "CRYPTOPP_ASSERT" and DebugTrapHandler is shown below. The library's
-//!   test program, <tt>cryptest.exe</tt> (from test.cpp), exercises the structure:
-//!  <pre>
-//!    #if CRYPTOPP_DEBUG && (defined(CRYPTOPP_BSD_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE))
-//!    static const DebugTrapHandler g_dummyHandler;
-//!    #endif
-//!
-//!    int main(int argc, char* argv[])
-//!    {
-//!       CRYPTOPP_ASSERT(argv != nullptr);
-//!       ...
-//!    }
-//!  </pre>
-//! \since Crypto++ 5.6.5
-//! \sa \ref CRYPTOPP_ASSERT "CRYPTOPP_ASSERT", SignalHandler, <A HREF="http://github.com/weidai11/cryptopp/issues/277">Issue 277</A>,
-//!   <A HREF="http://seclists.org/oss-sec/2016/q3/520">CVE-2016-7420</A>
-
-#if defined(CRYPTOPP_DOXYGEN_PROCESSING)
-class DebugTrapHandler : public SignalHandler<SIGILL, false> { };
-#else
-typedef SignalHandler<SIGILL, false> DebugTrapHandler;
-#endif
-
-#endif  // Linux, Unix and Documentation
-
-NAMESPACE_END
-
-#endif // CRYPTOPP_TRAP_H
diff --git a/src-cryptopp/trdlocal.h b/src-cryptopp/trdlocal.h
deleted file mode 100644
index a3eb043..0000000
--- a/src-cryptopp/trdlocal.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef CRYPTOPP_TRDLOCAL_H
-#define CRYPTOPP_TRDLOCAL_H
-
-#include "config.h"
-
-#if !defined(NO_OS_DEPENDENCE) && defined(THREADS_AVAILABLE)
-
-#include "misc.h"
-
-#ifdef HAS_WINTHREADS
-typedef unsigned long ThreadLocalIndexType;
-#else
-#include <pthread.h>
-typedef pthread_key_t ThreadLocalIndexType;
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! thread local storage
-class CRYPTOPP_DLL ThreadLocalStorage : public NotCopyable
-{
-public:
-	//! exception thrown by ThreadLocalStorage class
-	class Err : public OS_Error
-	{
-	public:
-		Err(const std::string& operation, int error);
-	};
-
-	ThreadLocalStorage();
-	~ThreadLocalStorage() CRYPTOPP_THROW;
-
-	void SetValue(void *value);
-	void *GetValue() const;
-
-private:
-	ThreadLocalIndexType m_index;
-};
-
-NAMESPACE_END
-
-#endif	// THREADS_AVAILABLE
-
-#endif  // CRYPTOPP_TRDLOCAL_H
diff --git a/src-cryptopp/words.h b/src-cryptopp/words.h
deleted file mode 100644
index c2be979..0000000
--- a/src-cryptopp/words.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef CRYPTOPP_WORDS_H
-#define CRYPTOPP_WORDS_H
-
-#include "config.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-inline size_t CountWords(const word *X, size_t N)
-{
-	while (N && X[N-1]==0)
-		N--;
-	return N;
-}
-
-inline void SetWords(word *r, word a, size_t n)
-{
-	for (size_t i=0; i<n; i++)
-		r[i] = a;
-}
-
-inline void CopyWords(word *r, const word *a, size_t n)
-{
-	if (r != a)
-#if CRYPTOPP_MSC_VERSION
-		memcpy_s(r, n*WORD_SIZE, a, n*WORD_SIZE);
-#else
-		memcpy(r, a, n*WORD_SIZE);
-#endif
-}
-
-inline void XorWords(word *r, const word *a, const word *b, size_t n)
-{
-	for (size_t i=0; i<n; i++)
-		r[i] = a[i] ^ b[i];
-}
-
-inline void XorWords(word *r, const word *a, size_t n)
-{
-	for (size_t i=0; i<n; i++)
-		r[i] ^= a[i];
-}
-
-inline void AndWords(word *r, const word *a, const word *b, size_t n)
-{
-	for (size_t i=0; i<n; i++)
-		r[i] = a[i] & b[i];
-}
-
-inline void AndWords(word *r, const word *a, size_t n)
-{
-	for (size_t i=0; i<n; i++)
-		r[i] &= a[i];
-}
-
-inline word ShiftWordsLeftByBits(word *r, size_t n, unsigned int shiftBits)
-{
-	CRYPTOPP_ASSERT (shiftBits<WORD_BITS);
-	word u, carry=0;
-	if (shiftBits)
-		for (size_t i=0; i<n; i++)
-		{
-			u = r[i];
-			r[i] = (u << shiftBits) | carry;
-			carry = u >> (WORD_BITS-shiftBits);
-		}
-	return carry;
-}
-
-inline word ShiftWordsRightByBits(word *r, size_t n, unsigned int shiftBits)
-{
-	CRYPTOPP_ASSERT (shiftBits<WORD_BITS);
-	word u, carry=0;
-	if (shiftBits)
-		for (size_t i=n; i>0; i--)
-		{
-			u = r[i-1];
-			r[i-1] = (u >> shiftBits) | carry;
-			carry = u << (WORD_BITS-shiftBits);
-		}
-	return carry;
-}
-
-inline void ShiftWordsLeftByWords(word *r, size_t n, size_t shiftWords)
-{
-	shiftWords = STDMIN(shiftWords, n);
-	if (shiftWords)
-	{
-		for (size_t i=n-1; i>=shiftWords; i--)
-			r[i] = r[i-shiftWords];
-		SetWords(r, 0, shiftWords);
-	}
-}
-
-inline void ShiftWordsRightByWords(word *r, size_t n, size_t shiftWords)
-{
-	shiftWords = STDMIN(shiftWords, n);
-	if (shiftWords)
-	{
-		for (size_t i=0; i+shiftWords<n; i++)
-			r[i] = r[i+shiftWords];
-		SetWords(r+n-shiftWords, 0, shiftWords);
-	}
-}
-
-NAMESPACE_END
-
-#endif
diff --git a/src-cryptopp/x64dll.asm b/src-cryptopp/x64dll.asm
deleted file mode 100644
index 386f751..0000000
--- a/src-cryptopp/x64dll.asm
+++ /dev/null
@@ -1,1968 +0,0 @@
-include ksamd64.inc
-EXTERNDEF ?Te@rdtable@CryptoPP@@3PA_KA:FAR
-EXTERNDEF ?g_cacheLineSize@CryptoPP@@3IA:FAR
-EXTERNDEF ?SHA256_K@CryptoPP@@3QBIB:FAR
-.CODE
-
-    ALIGN   8
-Baseline_Add	PROC
-	lea		rdx, [rdx+8*rcx]
-	lea		r8, [r8+8*rcx]
-	lea		r9, [r9+8*rcx]
-	neg		rcx					; rcx is negative index
-	jz		$1@Baseline_Add
-	mov		rax,[r8+8*rcx]
-	add		rax,[r9+8*rcx]
-	mov		[rdx+8*rcx],rax
-$0@Baseline_Add:
-	mov		rax,[r8+8*rcx+8]
-	adc		rax,[r9+8*rcx+8]
-	mov		[rdx+8*rcx+8],rax
-	lea		rcx,[rcx+2]			; advance index, avoid inc which causes slowdown on Intel Core 2
-	jrcxz	$1@Baseline_Add		; loop until rcx overflows and becomes zero
-	mov		rax,[r8+8*rcx]
-	adc		rax,[r9+8*rcx]
-	mov		[rdx+8*rcx],rax
-	jmp		$0@Baseline_Add
-$1@Baseline_Add:
-	mov		rax, 0
-	adc		rax, rax			; store carry into rax (return result register)
-	ret
-Baseline_Add ENDP
-
-    ALIGN   8
-Baseline_Sub	PROC
-	lea		rdx, [rdx+8*rcx]
-	lea		r8, [r8+8*rcx]
-	lea		r9, [r9+8*rcx]
-	neg		rcx					; rcx is negative index
-	jz		$1@Baseline_Sub
-	mov		rax,[r8+8*rcx]
-	sub		rax,[r9+8*rcx]
-	mov		[rdx+8*rcx],rax
-$0@Baseline_Sub:
-	mov		rax,[r8+8*rcx+8]
-	sbb		rax,[r9+8*rcx+8]
-	mov		[rdx+8*rcx+8],rax
-	lea		rcx,[rcx+2]			; advance index, avoid inc which causes slowdown on Intel Core 2
-	jrcxz	$1@Baseline_Sub		; loop until rcx overflows and becomes zero
-	mov		rax,[r8+8*rcx]
-	sbb		rax,[r9+8*rcx]
-	mov		[rdx+8*rcx],rax
-	jmp		$0@Baseline_Sub
-$1@Baseline_Sub:
-	mov		rax, 0
-	adc		rax, rax			; store carry into rax (return result register)
-
-	ret
-Baseline_Sub ENDP
-
-ALIGN   8
-Rijndael_Enc_AdvancedProcessBlocks	PROC FRAME
-rex_push_reg rsi
-push_reg rdi
-push_reg rbx
-push_reg r12
-.endprolog
-mov r8, rcx
-mov r11, ?Te@rdtable@CryptoPP@@3PA_KA
-mov edi, DWORD PTR [?g_cacheLineSize@CryptoPP@@3IA]
-mov rsi, [(r8+16*19)]
-mov rax, 16
-and rax, rsi
-movdqa xmm3, XMMWORD PTR [rdx+16+rax]
-movdqa [(r8+16*12)], xmm3
-lea rax, [rdx+rax+2*16]
-sub rax, rsi
-label0:
-movdqa xmm0, [rax+rsi]
-movdqa XMMWORD PTR [(r8+0)+rsi], xmm0
-add rsi, 16
-cmp rsi, 16*12
-jl label0
-movdqa xmm4, [rax+rsi]
-movdqa xmm1, [rdx]
-mov r12d, [rdx+4*4]
-mov ebx, [rdx+5*4]
-mov ecx, [rdx+6*4]
-mov edx, [rdx+7*4]
-xor rax, rax
-label9:
-mov esi, [r11+rax]
-add rax, rdi
-mov esi, [r11+rax]
-add rax, rdi
-mov esi, [r11+rax]
-add rax, rdi
-mov esi, [r11+rax]
-add rax, rdi
-cmp rax, 2048
-jl label9
-lfence
-test DWORD PTR [(r8+16*18+8)], 1
-jz label8
-mov rsi, [(r8+16*14)]
-movdqu xmm2, [rsi]
-pxor xmm2, xmm1
-psrldq xmm1, 14
-movd eax, xmm1
-mov al, BYTE PTR [rsi+15]
-mov r10d, eax
-movd eax, xmm2
-psrldq xmm2, 4
-movd edi, xmm2
-psrldq xmm2, 4
-movzx esi, al
-xor r12d, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ah
-xor edx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, al
-xor ecx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, ah
-xor ebx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov eax, edi
-movd edi, xmm2
-psrldq xmm2, 4
-movzx esi, al
-xor ebx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ah
-xor r12d, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, al
-xor edx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, ah
-xor ecx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov eax, edi
-movd edi, xmm2
-movzx esi, al
-xor ecx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ah
-xor ebx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, al
-xor r12d, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, ah
-xor edx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov eax, edi
-movzx esi, al
-xor edx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ah
-xor ecx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, al
-xor ebx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-psrldq xmm2, 3
-mov eax, [(r8+16*12)+0*4]
-mov edi, [(r8+16*12)+2*4]
-mov r9d, [(r8+16*12)+3*4]
-movzx esi, cl
-xor r9d, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-movzx esi, bl
-xor edi, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-movzx esi, bh
-xor r9d, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr ebx, 16
-movzx esi, bl
-xor eax, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, bh
-mov ebx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-xor ebx, [(r8+16*12)+1*4]
-movzx esi, ch
-xor eax, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr ecx, 16
-movzx esi, dl
-xor eax, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-movzx esi, dh
-xor ebx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr edx, 16
-movzx esi, ch
-xor edi, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, cl
-xor ebx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, dl
-xor edi, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, dh
-xor r9d, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movd ecx, xmm2
-mov edx, r12d
-mov [(r8+0)+3*4], r9d
-mov [(r8+0)+0*4], eax
-mov [(r8+0)+1*4], ebx
-mov [(r8+0)+2*4], edi
-jmp label5
-label3:
-mov r12d, [(r8+16*12)+0*4]
-mov ebx, [(r8+16*12)+1*4]
-mov ecx, [(r8+16*12)+2*4]
-mov edx, [(r8+16*12)+3*4]
-label8:
-mov rax, [(r8+16*14)]
-movdqu xmm2, [rax]
-mov rsi, [(r8+16*14)+8]
-movdqu xmm5, [rsi]
-pxor xmm2, xmm1
-pxor xmm2, xmm5
-movd eax, xmm2
-psrldq xmm2, 4
-movd edi, xmm2
-psrldq xmm2, 4
-movzx esi, al
-xor r12d, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ah
-xor edx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, al
-xor ecx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, ah
-xor ebx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov eax, edi
-movd edi, xmm2
-psrldq xmm2, 4
-movzx esi, al
-xor ebx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ah
-xor r12d, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, al
-xor edx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, ah
-xor ecx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov eax, edi
-movd edi, xmm2
-movzx esi, al
-xor ecx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ah
-xor ebx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, al
-xor r12d, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, ah
-xor edx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov eax, edi
-movzx esi, al
-xor edx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ah
-xor ecx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, al
-xor ebx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, ah
-xor r12d, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov eax, r12d
-add r8, [(r8+16*19)]
-add r8, 4*16
-jmp label2
-label1:
-mov ecx, r10d
-mov edx, r12d
-mov eax, [(r8+0)+0*4]
-mov ebx, [(r8+0)+1*4]
-xor cl, ch
-and rcx, 255
-label5:
-add r10d, 1
-xor edx, DWORD PTR [r11+rcx*8+3]
-movzx esi, dl
-xor ebx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-movzx esi, dh
-mov ecx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr edx, 16
-xor ecx, [(r8+0)+2*4]
-movzx esi, dh
-xor eax, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, dl
-mov edx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-xor edx, [(r8+0)+3*4]
-add r8, [(r8+16*19)]
-add r8, 3*16
-jmp label4
-label2:
-mov r9d, [(r8+0)-4*16+3*4]
-mov edi, [(r8+0)-4*16+2*4]
-movzx esi, cl
-xor r9d, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov cl, al
-movzx esi, ah
-xor edi, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, bl
-xor edi, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-movzx esi, bh
-xor r9d, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr ebx, 16
-movzx esi, al
-xor r9d, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, ah
-mov eax, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, bl
-xor eax, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, bh
-mov ebx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ch
-xor eax, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, cl
-xor ebx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-shr ecx, 16
-movzx esi, dl
-xor eax, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-movzx esi, dh
-xor ebx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr edx, 16
-movzx esi, ch
-xor edi, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, cl
-xor ebx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, dl
-xor edi, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, dh
-xor r9d, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-mov ecx, edi
-xor eax, [(r8+0)-4*16+0*4]
-xor ebx, [(r8+0)-4*16+1*4]
-mov edx, r9d
-label4:
-mov r9d, [(r8+0)-4*16+7*4]
-mov edi, [(r8+0)-4*16+6*4]
-movzx esi, cl
-xor r9d, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-mov cl, al
-movzx esi, ah
-xor edi, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr eax, 16
-movzx esi, bl
-xor edi, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-movzx esi, bh
-xor r9d, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr ebx, 16
-movzx esi, al
-xor r9d, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, ah
-mov eax, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, bl
-xor eax, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, bh
-mov ebx, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, ch
-xor eax, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-movzx esi, cl
-xor ebx, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-shr ecx, 16
-movzx esi, dl
-xor eax, DWORD PTR [r11+8*rsi+(((3+3) MOD (4))+1)]
-movzx esi, dh
-xor ebx, DWORD PTR [r11+8*rsi+(((2+3) MOD (4))+1)]
-shr edx, 16
-movzx esi, ch
-xor edi, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-movzx esi, cl
-xor ebx, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, dl
-xor edi, DWORD PTR [r11+8*rsi+(((1+3) MOD (4))+1)]
-movzx esi, dh
-xor r9d, DWORD PTR [r11+8*rsi+(((0+3) MOD (4))+1)]
-mov ecx, edi
-xor eax, [(r8+0)-4*16+4*4]
-xor ebx, [(r8+0)-4*16+5*4]
-mov edx, r9d
-add r8, 32
-test r8, 255
-jnz label2
-sub r8, 16*16
-movzx esi, ch
-movzx edi, BYTE PTR [r11+rsi*8+1]
-movzx esi, dl
-xor edi, DWORD PTR [r11+rsi*8+0]
-mov WORD PTR [(r8+16*13)+2], di
-movzx esi, dh
-movzx edi, BYTE PTR [r11+rsi*8+1]
-movzx esi, al
-xor edi, DWORD PTR [r11+rsi*8+0]
-mov WORD PTR [(r8+16*13)+6], di
-shr edx, 16
-movzx esi, ah
-movzx edi, BYTE PTR [r11+rsi*8+1]
-movzx esi, bl
-xor edi, DWORD PTR [r11+rsi*8+0]
-mov WORD PTR [(r8+16*13)+10], di
-shr eax, 16
-movzx esi, bh
-movzx edi, BYTE PTR [r11+rsi*8+1]
-movzx esi, cl
-xor edi, DWORD PTR [r11+rsi*8+0]
-mov WORD PTR [(r8+16*13)+14], di
-shr ebx, 16
-movzx esi, dh
-movzx edi, BYTE PTR [r11+rsi*8+1]
-movzx esi, al
-xor edi, DWORD PTR [r11+rsi*8+0]
-mov WORD PTR [(r8+16*13)+12], di
-shr ecx, 16
-movzx esi, ah
-movzx edi, BYTE PTR [r11+rsi*8+1]
-movzx esi, bl
-xor edi, DWORD PTR [r11+rsi*8+0]
-mov WORD PTR [(r8+16*13)+0], di
-movzx esi, bh
-movzx edi, BYTE PTR [r11+rsi*8+1]
-movzx esi, cl
-xor edi, DWORD PTR [r11+rsi*8+0]
-mov WORD PTR [(r8+16*13)+4], di
-movzx esi, ch
-movzx edi, BYTE PTR [r11+rsi*8+1]
-movzx esi, dl
-xor edi, DWORD PTR [r11+rsi*8+0]
-mov WORD PTR [(r8+16*13)+8], di
-mov rax, [(r8+16*14)+16]
-mov rbx, [(r8+16*14)+24]
-mov rcx, [(r8+16*18+8)]
-sub rcx, 16
-movdqu xmm2, [rax]
-pxor xmm2, xmm4
-movdqa xmm0, [(r8+16*16)+16]
-paddq xmm0, [(r8+16*14)+16]
-movdqa [(r8+16*14)+16], xmm0
-pxor xmm2, [(r8+16*13)]
-movdqu [rbx], xmm2
-jle label7
-mov [(r8+16*18+8)], rcx
-test rcx, 1
-jnz label1
-movdqa xmm0, [(r8+16*16)]
-paddq xmm0, [(r8+16*14)]
-movdqa [(r8+16*14)], xmm0
-jmp label3
-label7:
-xorps xmm0, xmm0
-lea rax, [(r8+0)+7*16]
-movaps [rax-7*16], xmm0
-movaps [rax-6*16], xmm0
-movaps [rax-5*16], xmm0
-movaps [rax-4*16], xmm0
-movaps [rax-3*16], xmm0
-movaps [rax-2*16], xmm0
-movaps [rax-1*16], xmm0
-movaps [rax+0*16], xmm0
-movaps [rax+1*16], xmm0
-movaps [rax+2*16], xmm0
-movaps [rax+3*16], xmm0
-movaps [rax+4*16], xmm0
-movaps [rax+5*16], xmm0
-movaps [rax+6*16], xmm0
-pop r12
-pop rbx
-pop rdi
-pop rsi
-ret
-Rijndael_Enc_AdvancedProcessBlocks ENDP
-
-ALIGN   8
-GCM_AuthenticateBlocks_2K	PROC FRAME
-rex_push_reg rsi
-push_reg rdi
-push_reg rbx
-.endprolog
-mov rsi, r8
-mov r11, r9
-movdqa xmm0, [rsi]
-label0:
-movdqu xmm4, [rcx]
-pxor xmm0, xmm4
-movd ebx, xmm0
-mov eax, 0f0f0f0f0h
-and eax, ebx
-shl ebx, 4
-and ebx, 0f0f0f0f0h
-movzx edi, ah
-movdqa xmm5, XMMWORD PTR [rsi + 32 + 1024 + rdi]
-movzx edi, al
-movdqa xmm4, XMMWORD PTR [rsi + 32 + 1024 + rdi]
-shr eax, 16
-movzx edi, ah
-movdqa xmm3, XMMWORD PTR [rsi + 32 + 1024 + rdi]
-movzx edi, al
-movdqa xmm2, XMMWORD PTR [rsi + 32 + 1024 + rdi]
-psrldq xmm0, 4
-movd eax, xmm0
-and eax, 0f0f0f0f0h
-movzx edi, bh
-pxor xmm5, XMMWORD PTR [rsi + 32 + (1-1)*256 + rdi]
-movzx edi, bl
-pxor xmm4, XMMWORD PTR [rsi + 32 + (1-1)*256 + rdi]
-shr ebx, 16
-movzx edi, bh
-pxor xmm3, XMMWORD PTR [rsi + 32 + (1-1)*256 + rdi]
-movzx edi, bl
-pxor xmm2, XMMWORD PTR [rsi + 32 + (1-1)*256 + rdi]
-movd ebx, xmm0
-shl ebx, 4
-and ebx, 0f0f0f0f0h
-movzx edi, ah
-pxor xmm5, XMMWORD PTR [rsi + 32 + 1024 + 1*256 + rdi]
-movzx edi, al
-pxor xmm4, XMMWORD PTR [rsi + 32 + 1024 + 1*256 + rdi]
-shr eax, 16
-movzx edi, ah
-pxor xmm3, XMMWORD PTR [rsi + 32 + 1024 + 1*256 + rdi]
-movzx edi, al
-pxor xmm2, XMMWORD PTR [rsi + 32 + 1024 + 1*256 + rdi]
-psrldq xmm0, 4
-movd eax, xmm0
-and eax, 0f0f0f0f0h
-movzx edi, bh
-pxor xmm5, XMMWORD PTR [rsi + 32 + (2-1)*256 + rdi]
-movzx edi, bl
-pxor xmm4, XMMWORD PTR [rsi + 32 + (2-1)*256 + rdi]
-shr ebx, 16
-movzx edi, bh
-pxor xmm3, XMMWORD PTR [rsi + 32 + (2-1)*256 + rdi]
-movzx edi, bl
-pxor xmm2, XMMWORD PTR [rsi + 32 + (2-1)*256 + rdi]
-movd ebx, xmm0
-shl ebx, 4
-and ebx, 0f0f0f0f0h
-movzx edi, ah
-pxor xmm5, XMMWORD PTR [rsi + 32 + 1024 + 2*256 + rdi]
-movzx edi, al
-pxor xmm4, XMMWORD PTR [rsi + 32 + 1024 + 2*256 + rdi]
-shr eax, 16
-movzx edi, ah
-pxor xmm3, XMMWORD PTR [rsi + 32 + 1024 + 2*256 + rdi]
-movzx edi, al
-pxor xmm2, XMMWORD PTR [rsi + 32 + 1024 + 2*256 + rdi]
-psrldq xmm0, 4
-movd eax, xmm0
-and eax, 0f0f0f0f0h
-movzx edi, bh
-pxor xmm5, XMMWORD PTR [rsi + 32 + (3-1)*256 + rdi]
-movzx edi, bl
-pxor xmm4, XMMWORD PTR [rsi + 32 + (3-1)*256 + rdi]
-shr ebx, 16
-movzx edi, bh
-pxor xmm3, XMMWORD PTR [rsi + 32 + (3-1)*256 + rdi]
-movzx edi, bl
-pxor xmm2, XMMWORD PTR [rsi + 32 + (3-1)*256 + rdi]
-movd ebx, xmm0
-shl ebx, 4
-and ebx, 0f0f0f0f0h
-movzx edi, ah
-pxor xmm5, XMMWORD PTR [rsi + 32 + 1024 + 3*256 + rdi]
-movzx edi, al
-pxor xmm4, XMMWORD PTR [rsi + 32 + 1024 + 3*256 + rdi]
-shr eax, 16
-movzx edi, ah
-pxor xmm3, XMMWORD PTR [rsi + 32 + 1024 + 3*256 + rdi]
-movzx edi, al
-pxor xmm2, XMMWORD PTR [rsi + 32 + 1024 + 3*256 + rdi]
-movzx edi, bh
-pxor xmm5, XMMWORD PTR [rsi + 32 + 3*256 + rdi]
-movzx edi, bl
-pxor xmm4, XMMWORD PTR [rsi + 32 + 3*256 + rdi]
-shr ebx, 16
-movzx edi, bh
-pxor xmm3, XMMWORD PTR [rsi + 32 + 3*256 + rdi]
-movzx edi, bl
-pxor xmm2, XMMWORD PTR [rsi + 32 + 3*256 + rdi]
-movdqa xmm0, xmm3
-pslldq xmm3, 1
-pxor xmm2, xmm3
-movdqa xmm1, xmm2
-pslldq xmm2, 1
-pxor xmm5, xmm2
-psrldq xmm0, 15
-movd rdi, xmm0
-movzx eax, WORD PTR [r11 + rdi*2]
-shl eax, 8
-movdqa xmm0, xmm5
-pslldq xmm5, 1
-pxor xmm4, xmm5
-psrldq xmm1, 15
-movd rdi, xmm1
-xor ax, WORD PTR [r11 + rdi*2]
-shl eax, 8
-psrldq xmm0, 15
-movd rdi, xmm0
-xor ax, WORD PTR [r11 + rdi*2]
-movd xmm0, eax
-pxor xmm0, xmm4
-add rcx, 16
-sub rdx, 1
-jnz label0
-movdqa [rsi], xmm0
-pop rbx
-pop rdi
-pop rsi
-ret
-GCM_AuthenticateBlocks_2K ENDP
-
-ALIGN   8
-GCM_AuthenticateBlocks_64K	PROC FRAME
-rex_push_reg rsi
-push_reg rdi
-.endprolog
-mov rsi, r8
-movdqa xmm0, [rsi]
-label1:
-movdqu xmm1, [rcx]
-pxor xmm1, xmm0
-pxor xmm0, xmm0
-movd eax, xmm1
-psrldq xmm1, 4
-movzx edi, al
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (0*4+0)*256*16 + rdi*8]
-movzx edi, ah
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (0*4+1)*256*16 + rdi*8]
-shr eax, 16
-movzx edi, al
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (0*4+2)*256*16 + rdi*8]
-movzx edi, ah
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (0*4+3)*256*16 + rdi*8]
-movd eax, xmm1
-psrldq xmm1, 4
-movzx edi, al
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (1*4+0)*256*16 + rdi*8]
-movzx edi, ah
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (1*4+1)*256*16 + rdi*8]
-shr eax, 16
-movzx edi, al
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (1*4+2)*256*16 + rdi*8]
-movzx edi, ah
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (1*4+3)*256*16 + rdi*8]
-movd eax, xmm1
-psrldq xmm1, 4
-movzx edi, al
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (2*4+0)*256*16 + rdi*8]
-movzx edi, ah
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (2*4+1)*256*16 + rdi*8]
-shr eax, 16
-movzx edi, al
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (2*4+2)*256*16 + rdi*8]
-movzx edi, ah
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (2*4+3)*256*16 + rdi*8]
-movd eax, xmm1
-psrldq xmm1, 4
-movzx edi, al
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (3*4+0)*256*16 + rdi*8]
-movzx edi, ah
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (3*4+1)*256*16 + rdi*8]
-shr eax, 16
-movzx edi, al
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (3*4+2)*256*16 + rdi*8]
-movzx edi, ah
-add rdi, rdi
-pxor xmm0, [rsi + 32 + (3*4+3)*256*16 + rdi*8]
-add rcx, 16
-sub rdx, 1
-jnz label1
-movdqa [rsi], xmm0
-pop rdi
-pop rsi
-ret
-GCM_AuthenticateBlocks_64K ENDP
-
-ALIGN   8
-X86_SHA256_HashBlocks	PROC FRAME
-rex_push_reg rsi
-push_reg rdi
-push_reg rbx
-push_reg rbp
-alloc_stack(8*4 + 16*4 + 4*8 + 8)
-.endprolog
-mov rdi, r8
-lea rsi, [?SHA256_K@CryptoPP@@3QBIB + 48*4]
-mov [rsp+8*4+16*4+1*8], rcx
-mov [rsp+8*4+16*4+2*8], rdx
-add rdi, rdx
-mov [rsp+8*4+16*4+3*8], rdi
-movdqa xmm0, XMMWORD PTR [rcx+0*16]
-movdqa xmm1, XMMWORD PTR [rcx+1*16]
-mov [rsp+8*4+16*4+0*8], rsi
-label0:
-sub rsi, 48*4
-movdqa [rsp+((1024+7-(0+3)) MOD (8))*4], xmm1
-movdqa [rsp+((1024+7-(0+7)) MOD (8))*4], xmm0
-mov rbx, [rdx+0*8]
-bswap rbx
-mov [rsp+8*4+((1024+15-(0*(1+1)+1)) MOD (16))*4], rbx
-mov rbx, [rdx+1*8]
-bswap rbx
-mov [rsp+8*4+((1024+15-(1*(1+1)+1)) MOD (16))*4], rbx
-mov rbx, [rdx+2*8]
-bswap rbx
-mov [rsp+8*4+((1024+15-(2*(1+1)+1)) MOD (16))*4], rbx
-mov rbx, [rdx+3*8]
-bswap rbx
-mov [rsp+8*4+((1024+15-(3*(1+1)+1)) MOD (16))*4], rbx
-mov rbx, [rdx+4*8]
-bswap rbx
-mov [rsp+8*4+((1024+15-(4*(1+1)+1)) MOD (16))*4], rbx
-mov rbx, [rdx+5*8]
-bswap rbx
-mov [rsp+8*4+((1024+15-(5*(1+1)+1)) MOD (16))*4], rbx
-mov rbx, [rdx+6*8]
-bswap rbx
-mov [rsp+8*4+((1024+15-(6*(1+1)+1)) MOD (16))*4], rbx
-mov rbx, [rdx+7*8]
-bswap rbx
-mov [rsp+8*4+((1024+15-(7*(1+1)+1)) MOD (16))*4], rbx
-mov edi, [rsp+((1024+7-(0+3)) MOD (8))*4]
-mov eax, [rsp+((1024+7-(0+6)) MOD (8))*4]
-xor eax, [rsp+((1024+7-(0+5)) MOD (8))*4]
-mov ecx, [rsp+((1024+7-(0+7)) MOD (8))*4]
-mov edx, [rsp+((1024+7-(0+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(0+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(0+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-add edx, [rsi+(0)*4]
-add edx, [rsp+8*4+((1024+15-(0)) MOD (16))*4]
-add edx, [rsp+((1024+7-(0)) MOD (8))*4]
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(0+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(0+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(0+4)) MOD (8))*4]
-mov [rsp+((1024+7-(0+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(0)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(1+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(1+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(1+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-add edi, [rsi+(1)*4]
-add edi, [rsp+8*4+((1024+15-(1)) MOD (16))*4]
-add edi, [rsp+((1024+7-(1)) MOD (8))*4]
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(1+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(1+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(1+4)) MOD (8))*4]
-mov [rsp+((1024+7-(1+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(1)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(2+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(2+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(2+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-add edx, [rsi+(2)*4]
-add edx, [rsp+8*4+((1024+15-(2)) MOD (16))*4]
-add edx, [rsp+((1024+7-(2)) MOD (8))*4]
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(2+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(2+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(2+4)) MOD (8))*4]
-mov [rsp+((1024+7-(2+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(2)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(3+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(3+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(3+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-add edi, [rsi+(3)*4]
-add edi, [rsp+8*4+((1024+15-(3)) MOD (16))*4]
-add edi, [rsp+((1024+7-(3)) MOD (8))*4]
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(3+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(3+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(3+4)) MOD (8))*4]
-mov [rsp+((1024+7-(3+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(3)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(4+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(4+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(4+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-add edx, [rsi+(4)*4]
-add edx, [rsp+8*4+((1024+15-(4)) MOD (16))*4]
-add edx, [rsp+((1024+7-(4)) MOD (8))*4]
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(4+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(4+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(4+4)) MOD (8))*4]
-mov [rsp+((1024+7-(4+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(4)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(5+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(5+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(5+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-add edi, [rsi+(5)*4]
-add edi, [rsp+8*4+((1024+15-(5)) MOD (16))*4]
-add edi, [rsp+((1024+7-(5)) MOD (8))*4]
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(5+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(5+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(5+4)) MOD (8))*4]
-mov [rsp+((1024+7-(5+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(5)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(6+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(6+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(6+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-add edx, [rsi+(6)*4]
-add edx, [rsp+8*4+((1024+15-(6)) MOD (16))*4]
-add edx, [rsp+((1024+7-(6)) MOD (8))*4]
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(6+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(6+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(6+4)) MOD (8))*4]
-mov [rsp+((1024+7-(6+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(6)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(7+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(7+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(7+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-add edi, [rsi+(7)*4]
-add edi, [rsp+8*4+((1024+15-(7)) MOD (16))*4]
-add edi, [rsp+((1024+7-(7)) MOD (8))*4]
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(7+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(7+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(7+4)) MOD (8))*4]
-mov [rsp+((1024+7-(7+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(7)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(8+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(8+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(8+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-add edx, [rsi+(8)*4]
-add edx, [rsp+8*4+((1024+15-(8)) MOD (16))*4]
-add edx, [rsp+((1024+7-(8)) MOD (8))*4]
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(8+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(8+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(8+4)) MOD (8))*4]
-mov [rsp+((1024+7-(8+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(8)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(9+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(9+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(9+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-add edi, [rsi+(9)*4]
-add edi, [rsp+8*4+((1024+15-(9)) MOD (16))*4]
-add edi, [rsp+((1024+7-(9)) MOD (8))*4]
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(9+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(9+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(9+4)) MOD (8))*4]
-mov [rsp+((1024+7-(9+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(9)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(10+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(10+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(10+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-add edx, [rsi+(10)*4]
-add edx, [rsp+8*4+((1024+15-(10)) MOD (16))*4]
-add edx, [rsp+((1024+7-(10)) MOD (8))*4]
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(10+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(10+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(10+4)) MOD (8))*4]
-mov [rsp+((1024+7-(10+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(10)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(11+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(11+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(11+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-add edi, [rsi+(11)*4]
-add edi, [rsp+8*4+((1024+15-(11)) MOD (16))*4]
-add edi, [rsp+((1024+7-(11)) MOD (8))*4]
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(11+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(11+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(11+4)) MOD (8))*4]
-mov [rsp+((1024+7-(11+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(11)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(12+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(12+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(12+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-add edx, [rsi+(12)*4]
-add edx, [rsp+8*4+((1024+15-(12)) MOD (16))*4]
-add edx, [rsp+((1024+7-(12)) MOD (8))*4]
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(12+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(12+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(12+4)) MOD (8))*4]
-mov [rsp+((1024+7-(12+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(12)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(13+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(13+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(13+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-add edi, [rsi+(13)*4]
-add edi, [rsp+8*4+((1024+15-(13)) MOD (16))*4]
-add edi, [rsp+((1024+7-(13)) MOD (8))*4]
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(13+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(13+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(13+4)) MOD (8))*4]
-mov [rsp+((1024+7-(13+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(13)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(14+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(14+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(14+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-add edx, [rsi+(14)*4]
-add edx, [rsp+8*4+((1024+15-(14)) MOD (16))*4]
-add edx, [rsp+((1024+7-(14)) MOD (8))*4]
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(14+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(14+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(14+4)) MOD (8))*4]
-mov [rsp+((1024+7-(14+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(14)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(15+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(15+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(15+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-add edi, [rsi+(15)*4]
-add edi, [rsp+8*4+((1024+15-(15)) MOD (16))*4]
-add edi, [rsp+((1024+7-(15)) MOD (8))*4]
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(15+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(15+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(15+4)) MOD (8))*4]
-mov [rsp+((1024+7-(15+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(15)) MOD (8))*4], ecx
-label1:
-add rsi, 4*16
-mov edx, [rsp+((1024+7-(0+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(0+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(0+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebp, [rsp+8*4+((1024+15-((0)-2)) MOD (16))*4]
-mov edi, [rsp+8*4+((1024+15-((0)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((0)-7)) MOD (16))*4]
-mov ebp, edi
-shr ebp, 3
-ror edi, 7
-add ebx, [rsp+8*4+((1024+15-(0)) MOD (16))*4]
-xor ebp, edi
-add edx, [rsi+(0)*4]
-ror edi, 11
-add edx, [rsp+((1024+7-(0)) MOD (8))*4]
-xor ebp, edi
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(0)) MOD (16))*4], ebp
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(0+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(0+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(0+4)) MOD (8))*4]
-mov [rsp+((1024+7-(0+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(0)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(1+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(1+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(1+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebp, [rsp+8*4+((1024+15-((1)-2)) MOD (16))*4]
-mov edx, [rsp+8*4+((1024+15-((1)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((1)-7)) MOD (16))*4]
-mov ebp, edx
-shr ebp, 3
-ror edx, 7
-add ebx, [rsp+8*4+((1024+15-(1)) MOD (16))*4]
-xor ebp, edx
-add edi, [rsi+(1)*4]
-ror edx, 11
-add edi, [rsp+((1024+7-(1)) MOD (8))*4]
-xor ebp, edx
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(1)) MOD (16))*4], ebp
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(1+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(1+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(1+4)) MOD (8))*4]
-mov [rsp+((1024+7-(1+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(1)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(2+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(2+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(2+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebp, [rsp+8*4+((1024+15-((2)-2)) MOD (16))*4]
-mov edi, [rsp+8*4+((1024+15-((2)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((2)-7)) MOD (16))*4]
-mov ebp, edi
-shr ebp, 3
-ror edi, 7
-add ebx, [rsp+8*4+((1024+15-(2)) MOD (16))*4]
-xor ebp, edi
-add edx, [rsi+(2)*4]
-ror edi, 11
-add edx, [rsp+((1024+7-(2)) MOD (8))*4]
-xor ebp, edi
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(2)) MOD (16))*4], ebp
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(2+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(2+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(2+4)) MOD (8))*4]
-mov [rsp+((1024+7-(2+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(2)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(3+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(3+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(3+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebp, [rsp+8*4+((1024+15-((3)-2)) MOD (16))*4]
-mov edx, [rsp+8*4+((1024+15-((3)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((3)-7)) MOD (16))*4]
-mov ebp, edx
-shr ebp, 3
-ror edx, 7
-add ebx, [rsp+8*4+((1024+15-(3)) MOD (16))*4]
-xor ebp, edx
-add edi, [rsi+(3)*4]
-ror edx, 11
-add edi, [rsp+((1024+7-(3)) MOD (8))*4]
-xor ebp, edx
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(3)) MOD (16))*4], ebp
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(3+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(3+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(3+4)) MOD (8))*4]
-mov [rsp+((1024+7-(3+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(3)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(4+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(4+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(4+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebp, [rsp+8*4+((1024+15-((4)-2)) MOD (16))*4]
-mov edi, [rsp+8*4+((1024+15-((4)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((4)-7)) MOD (16))*4]
-mov ebp, edi
-shr ebp, 3
-ror edi, 7
-add ebx, [rsp+8*4+((1024+15-(4)) MOD (16))*4]
-xor ebp, edi
-add edx, [rsi+(4)*4]
-ror edi, 11
-add edx, [rsp+((1024+7-(4)) MOD (8))*4]
-xor ebp, edi
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(4)) MOD (16))*4], ebp
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(4+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(4+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(4+4)) MOD (8))*4]
-mov [rsp+((1024+7-(4+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(4)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(5+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(5+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(5+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebp, [rsp+8*4+((1024+15-((5)-2)) MOD (16))*4]
-mov edx, [rsp+8*4+((1024+15-((5)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((5)-7)) MOD (16))*4]
-mov ebp, edx
-shr ebp, 3
-ror edx, 7
-add ebx, [rsp+8*4+((1024+15-(5)) MOD (16))*4]
-xor ebp, edx
-add edi, [rsi+(5)*4]
-ror edx, 11
-add edi, [rsp+((1024+7-(5)) MOD (8))*4]
-xor ebp, edx
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(5)) MOD (16))*4], ebp
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(5+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(5+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(5+4)) MOD (8))*4]
-mov [rsp+((1024+7-(5+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(5)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(6+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(6+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(6+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebp, [rsp+8*4+((1024+15-((6)-2)) MOD (16))*4]
-mov edi, [rsp+8*4+((1024+15-((6)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((6)-7)) MOD (16))*4]
-mov ebp, edi
-shr ebp, 3
-ror edi, 7
-add ebx, [rsp+8*4+((1024+15-(6)) MOD (16))*4]
-xor ebp, edi
-add edx, [rsi+(6)*4]
-ror edi, 11
-add edx, [rsp+((1024+7-(6)) MOD (8))*4]
-xor ebp, edi
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(6)) MOD (16))*4], ebp
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(6+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(6+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(6+4)) MOD (8))*4]
-mov [rsp+((1024+7-(6+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(6)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(7+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(7+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(7+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebp, [rsp+8*4+((1024+15-((7)-2)) MOD (16))*4]
-mov edx, [rsp+8*4+((1024+15-((7)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((7)-7)) MOD (16))*4]
-mov ebp, edx
-shr ebp, 3
-ror edx, 7
-add ebx, [rsp+8*4+((1024+15-(7)) MOD (16))*4]
-xor ebp, edx
-add edi, [rsi+(7)*4]
-ror edx, 11
-add edi, [rsp+((1024+7-(7)) MOD (8))*4]
-xor ebp, edx
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(7)) MOD (16))*4], ebp
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(7+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(7+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(7+4)) MOD (8))*4]
-mov [rsp+((1024+7-(7+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(7)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(8+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(8+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(8+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebp, [rsp+8*4+((1024+15-((8)-2)) MOD (16))*4]
-mov edi, [rsp+8*4+((1024+15-((8)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((8)-7)) MOD (16))*4]
-mov ebp, edi
-shr ebp, 3
-ror edi, 7
-add ebx, [rsp+8*4+((1024+15-(8)) MOD (16))*4]
-xor ebp, edi
-add edx, [rsi+(8)*4]
-ror edi, 11
-add edx, [rsp+((1024+7-(8)) MOD (8))*4]
-xor ebp, edi
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(8)) MOD (16))*4], ebp
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(8+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(8+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(8+4)) MOD (8))*4]
-mov [rsp+((1024+7-(8+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(8)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(9+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(9+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(9+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebp, [rsp+8*4+((1024+15-((9)-2)) MOD (16))*4]
-mov edx, [rsp+8*4+((1024+15-((9)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((9)-7)) MOD (16))*4]
-mov ebp, edx
-shr ebp, 3
-ror edx, 7
-add ebx, [rsp+8*4+((1024+15-(9)) MOD (16))*4]
-xor ebp, edx
-add edi, [rsi+(9)*4]
-ror edx, 11
-add edi, [rsp+((1024+7-(9)) MOD (8))*4]
-xor ebp, edx
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(9)) MOD (16))*4], ebp
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(9+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(9+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(9+4)) MOD (8))*4]
-mov [rsp+((1024+7-(9+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(9)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(10+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(10+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(10+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebp, [rsp+8*4+((1024+15-((10)-2)) MOD (16))*4]
-mov edi, [rsp+8*4+((1024+15-((10)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((10)-7)) MOD (16))*4]
-mov ebp, edi
-shr ebp, 3
-ror edi, 7
-add ebx, [rsp+8*4+((1024+15-(10)) MOD (16))*4]
-xor ebp, edi
-add edx, [rsi+(10)*4]
-ror edi, 11
-add edx, [rsp+((1024+7-(10)) MOD (8))*4]
-xor ebp, edi
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(10)) MOD (16))*4], ebp
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(10+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(10+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(10+4)) MOD (8))*4]
-mov [rsp+((1024+7-(10+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(10)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(11+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(11+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(11+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebp, [rsp+8*4+((1024+15-((11)-2)) MOD (16))*4]
-mov edx, [rsp+8*4+((1024+15-((11)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((11)-7)) MOD (16))*4]
-mov ebp, edx
-shr ebp, 3
-ror edx, 7
-add ebx, [rsp+8*4+((1024+15-(11)) MOD (16))*4]
-xor ebp, edx
-add edi, [rsi+(11)*4]
-ror edx, 11
-add edi, [rsp+((1024+7-(11)) MOD (8))*4]
-xor ebp, edx
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(11)) MOD (16))*4], ebp
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(11+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(11+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(11+4)) MOD (8))*4]
-mov [rsp+((1024+7-(11+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(11)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(12+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(12+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(12+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebp, [rsp+8*4+((1024+15-((12)-2)) MOD (16))*4]
-mov edi, [rsp+8*4+((1024+15-((12)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((12)-7)) MOD (16))*4]
-mov ebp, edi
-shr ebp, 3
-ror edi, 7
-add ebx, [rsp+8*4+((1024+15-(12)) MOD (16))*4]
-xor ebp, edi
-add edx, [rsi+(12)*4]
-ror edi, 11
-add edx, [rsp+((1024+7-(12)) MOD (8))*4]
-xor ebp, edi
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(12)) MOD (16))*4], ebp
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(12+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(12+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(12+4)) MOD (8))*4]
-mov [rsp+((1024+7-(12+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(12)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(13+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(13+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(13+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebp, [rsp+8*4+((1024+15-((13)-2)) MOD (16))*4]
-mov edx, [rsp+8*4+((1024+15-((13)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((13)-7)) MOD (16))*4]
-mov ebp, edx
-shr ebp, 3
-ror edx, 7
-add ebx, [rsp+8*4+((1024+15-(13)) MOD (16))*4]
-xor ebp, edx
-add edi, [rsi+(13)*4]
-ror edx, 11
-add edi, [rsp+((1024+7-(13)) MOD (8))*4]
-xor ebp, edx
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(13)) MOD (16))*4], ebp
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(13+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(13+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(13+4)) MOD (8))*4]
-mov [rsp+((1024+7-(13+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(13)) MOD (8))*4], ecx
-mov edx, [rsp+((1024+7-(14+2)) MOD (8))*4]
-xor edx, [rsp+((1024+7-(14+1)) MOD (8))*4]
-and edx, edi
-xor edx, [rsp+((1024+7-(14+1)) MOD (8))*4]
-mov ebp, edi
-ror edi, 6
-ror ebp, 25
-xor ebp, edi
-ror edi, 5
-xor ebp, edi
-add edx, ebp
-mov ebp, [rsp+8*4+((1024+15-((14)-2)) MOD (16))*4]
-mov edi, [rsp+8*4+((1024+15-((14)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((14)-7)) MOD (16))*4]
-mov ebp, edi
-shr ebp, 3
-ror edi, 7
-add ebx, [rsp+8*4+((1024+15-(14)) MOD (16))*4]
-xor ebp, edi
-add edx, [rsi+(14)*4]
-ror edi, 11
-add edx, [rsp+((1024+7-(14)) MOD (8))*4]
-xor ebp, edi
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(14)) MOD (16))*4], ebp
-add edx, ebp
-mov ebx, ecx
-xor ecx, [rsp+((1024+7-(14+6)) MOD (8))*4]
-and eax, ecx
-xor eax, [rsp+((1024+7-(14+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add eax, edx
-add edx, [rsp+((1024+7-(14+4)) MOD (8))*4]
-mov [rsp+((1024+7-(14+4)) MOD (8))*4], edx
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add eax, ebp
-mov [rsp+((1024+7-(14)) MOD (8))*4], eax
-mov edi, [rsp+((1024+7-(15+2)) MOD (8))*4]
-xor edi, [rsp+((1024+7-(15+1)) MOD (8))*4]
-and edi, edx
-xor edi, [rsp+((1024+7-(15+1)) MOD (8))*4]
-mov ebp, edx
-ror edx, 6
-ror ebp, 25
-xor ebp, edx
-ror edx, 5
-xor ebp, edx
-add edi, ebp
-mov ebp, [rsp+8*4+((1024+15-((15)-2)) MOD (16))*4]
-mov edx, [rsp+8*4+((1024+15-((15)-15)) MOD (16))*4]
-mov ebx, ebp
-shr ebp, 10
-ror ebx, 17
-xor ebp, ebx
-ror ebx, 2
-xor ebx, ebp
-add ebx, [rsp+8*4+((1024+15-((15)-7)) MOD (16))*4]
-mov ebp, edx
-shr ebp, 3
-ror edx, 7
-add ebx, [rsp+8*4+((1024+15-(15)) MOD (16))*4]
-xor ebp, edx
-add edi, [rsi+(15)*4]
-ror edx, 11
-add edi, [rsp+((1024+7-(15)) MOD (8))*4]
-xor ebp, edx
-add ebp, ebx
-mov [rsp+8*4+((1024+15-(15)) MOD (16))*4], ebp
-add edi, ebp
-mov ebx, eax
-xor eax, [rsp+((1024+7-(15+6)) MOD (8))*4]
-and ecx, eax
-xor ecx, [rsp+((1024+7-(15+6)) MOD (8))*4]
-mov ebp, ebx
-ror ebx, 2
-add ecx, edi
-add edi, [rsp+((1024+7-(15+4)) MOD (8))*4]
-mov [rsp+((1024+7-(15+4)) MOD (8))*4], edi
-ror ebp, 22
-xor ebp, ebx
-ror ebx, 11
-xor ebp, ebx
-add ecx, ebp
-mov [rsp+((1024+7-(15)) MOD (8))*4], ecx
-cmp rsi, [rsp+8*4+16*4+0*8]
-jne label1
-mov rcx, [rsp+8*4+16*4+1*8]
-movdqa xmm1, XMMWORD PTR [rcx+1*16]
-movdqa xmm0, XMMWORD PTR [rcx+0*16]
-paddd xmm1, [rsp+((1024+7-(0+3)) MOD (8))*4]
-paddd xmm0, [rsp+((1024+7-(0+7)) MOD (8))*4]
-movdqa [rcx+1*16], xmm1
-movdqa [rcx+0*16], xmm0
-mov rdx, [rsp+8*4+16*4+2*8]
-add rdx, 64
-mov [rsp+8*4+16*4+2*8], rdx
-cmp rdx, [rsp+8*4+16*4+3*8]
-jne label0
-add		rsp, 8*4 + 16*4 + 4*8 + 8
-pop		rbp
-pop		rbx
-pop		rdi
-pop		rsi
-ret
-X86_SHA256_HashBlocks ENDP
-
-_TEXT ENDS
-END
diff --git a/src-cryptopp/x64masm.asm b/src-cryptopp/x64masm.asm
deleted file mode 100644
index babead0..0000000
--- a/src-cryptopp/x64masm.asm
+++ /dev/null
@@ -1,1565 +0,0 @@
-include ksamd64.inc
-EXTERNDEF s_sosemanukMulTables:FAR
-.CODE
-
-ALIGN 8
-Salsa20_OperateKeystream PROC FRAME
-mov r10, [rsp + 5*8]
-alloc_stack(10*16 + 32*16 + 8)
-save_xmm128 xmm6, 0200h
-save_xmm128 xmm7, 0210h
-save_xmm128 xmm8, 0220h
-save_xmm128 xmm9, 0230h
-save_xmm128 xmm10, 0240h
-save_xmm128 xmm11, 0250h
-save_xmm128 xmm12, 0260h
-save_xmm128 xmm13, 0270h
-save_xmm128 xmm14, 0280h
-save_xmm128 xmm15, 0290h
-.endprolog
-cmp r8, 4
-jl label5
-movdqa xmm0, [r10 + 0*16]
-movdqa xmm1, [r10 + 1*16]
-movdqa xmm2, [r10 + 2*16]
-movdqa xmm3, [r10 + 3*16]
-pshufd xmm4, xmm0, 0*64+0*16+0*4+0
-movdqa [rsp + (0*4+0)*16 + 256], xmm4
-pshufd xmm4, xmm0, 1*64+1*16+1*4+1
-movdqa [rsp + (0*4+1)*16 + 256], xmm4
-pshufd xmm4, xmm0, 2*64+2*16+2*4+2
-movdqa [rsp + (0*4+2)*16 + 256], xmm4
-pshufd xmm4, xmm0, 3*64+3*16+3*4+3
-movdqa [rsp + (0*4+3)*16 + 256], xmm4
-pshufd xmm4, xmm1, 0*64+0*16+0*4+0
-movdqa [rsp + (1*4+0)*16 + 256], xmm4
-pshufd xmm4, xmm1, 2*64+2*16+2*4+2
-movdqa [rsp + (1*4+2)*16 + 256], xmm4
-pshufd xmm4, xmm1, 3*64+3*16+3*4+3
-movdqa [rsp + (1*4+3)*16 + 256], xmm4
-pshufd xmm4, xmm2, 1*64+1*16+1*4+1
-movdqa [rsp + (2*4+1)*16 + 256], xmm4
-pshufd xmm4, xmm2, 2*64+2*16+2*4+2
-movdqa [rsp + (2*4+2)*16 + 256], xmm4
-pshufd xmm4, xmm2, 3*64+3*16+3*4+3
-movdqa [rsp + (2*4+3)*16 + 256], xmm4
-pshufd xmm4, xmm3, 0*64+0*16+0*4+0
-movdqa [rsp + (3*4+0)*16 + 256], xmm4
-pshufd xmm4, xmm3, 1*64+1*16+1*4+1
-movdqa [rsp + (3*4+1)*16 + 256], xmm4
-pshufd xmm4, xmm3, 2*64+2*16+2*4+2
-movdqa [rsp + (3*4+2)*16 + 256], xmm4
-pshufd xmm4, xmm3, 3*64+3*16+3*4+3
-movdqa [rsp + (3*4+3)*16 + 256], xmm4
-label1:
-mov eax, dword ptr [r10 + 8*4]
-mov r11d, dword ptr [r10 + 5*4]
-mov dword ptr [rsp + 8*16 + 0*4 + 256], eax
-mov dword ptr [rsp + 5*16 + 0*4 + 256], r11d
-add eax, 1
-adc r11d, 0
-mov dword ptr [rsp + 8*16 + 1*4 + 256], eax
-mov dword ptr [rsp + 5*16 + 1*4 + 256], r11d
-add eax, 1
-adc r11d, 0
-mov dword ptr [rsp + 8*16 + 2*4 + 256], eax
-mov dword ptr [rsp + 5*16 + 2*4 + 256], r11d
-add eax, 1
-adc r11d, 0
-mov dword ptr [rsp + 8*16 + 3*4 + 256], eax
-mov dword ptr [rsp + 5*16 + 3*4 + 256], r11d
-add eax, 1
-adc r11d, 0
-mov dword ptr [r10 + 8*4], eax
-mov dword ptr [r10 + 5*4], r11d
-movdqa xmm0, [rsp + 12*16 + 1*256]
-movdqa xmm4, [rsp + 13*16 + 1*256]
-movdqa xmm8, [rsp + 14*16 + 1*256]
-movdqa xmm12, [rsp + 15*16 + 1*256]
-movdqa xmm2, [rsp + 0*16 + 1*256]
-movdqa xmm6, [rsp + 1*16 + 1*256]
-movdqa xmm10, [rsp + 2*16 + 1*256]
-movdqa xmm14, [rsp + 3*16 + 1*256]
-paddd xmm0, xmm2
-paddd xmm4, xmm6
-paddd xmm8, xmm10
-paddd xmm12, xmm14
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-pslld xmm0, 7
-pslld xmm4, 7
-pslld xmm8, 7
-pslld xmm12, 7
-psrld xmm1, 32-7
-psrld xmm5, 32-7
-psrld xmm9, 32-7
-psrld xmm13, 32-7
-pxor xmm0, [rsp + 4*16 + 1*256]
-pxor xmm4, [rsp + 5*16 + 1*256]
-pxor xmm8, [rsp + 6*16 + 1*256]
-pxor xmm12, [rsp + 7*16 + 1*256]
-pxor xmm0, xmm1
-pxor xmm4, xmm5
-pxor xmm8, xmm9
-pxor xmm12, xmm13
-movdqa [rsp + 4*16], xmm0
-movdqa [rsp + 5*16], xmm4
-movdqa [rsp + 6*16], xmm8
-movdqa [rsp + 7*16], xmm12
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-paddd xmm0, xmm2
-paddd xmm4, xmm6
-paddd xmm8, xmm10
-paddd xmm12, xmm14
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-pslld xmm0, 9
-pslld xmm4, 9
-pslld xmm8, 9
-pslld xmm12, 9
-psrld xmm3, 32-9
-psrld xmm7, 32-9
-psrld xmm11, 32-9
-psrld xmm15, 32-9
-pxor xmm0, [rsp + 8*16 + 1*256]
-pxor xmm4, [rsp + 9*16 + 1*256]
-pxor xmm8, [rsp + 10*16 + 1*256]
-pxor xmm12, [rsp + 11*16 + 1*256]
-pxor xmm0, xmm3
-pxor xmm4, xmm7
-pxor xmm8, xmm11
-pxor xmm12, xmm15
-movdqa [rsp + 8*16], xmm0
-movdqa [rsp + 9*16], xmm4
-movdqa [rsp + 10*16], xmm8
-movdqa [rsp + 11*16], xmm12
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-paddd xmm0, xmm1
-paddd xmm4, xmm5
-paddd xmm8, xmm9
-paddd xmm12, xmm13
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-pslld xmm0, 13
-pslld xmm4, 13
-pslld xmm8, 13
-pslld xmm12, 13
-psrld xmm1, 32-13
-psrld xmm5, 32-13
-psrld xmm9, 32-13
-psrld xmm13, 32-13
-pxor xmm0, [rsp + 12*16 + 1*256]
-pxor xmm4, [rsp + 13*16 + 1*256]
-pxor xmm8, [rsp + 14*16 + 1*256]
-pxor xmm12, [rsp + 15*16 + 1*256]
-pxor xmm0, xmm1
-pxor xmm4, xmm5
-pxor xmm8, xmm9
-pxor xmm12, xmm13
-movdqa [rsp + 12*16], xmm0
-movdqa [rsp + 13*16], xmm4
-movdqa [rsp + 14*16], xmm8
-movdqa [rsp + 15*16], xmm12
-paddd xmm0, xmm3
-paddd xmm4, xmm7
-paddd xmm8, xmm11
-paddd xmm12, xmm15
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-pslld xmm0, 18
-pslld xmm4, 18
-pslld xmm8, 18
-pslld xmm12, 18
-psrld xmm3, 32-18
-psrld xmm7, 32-18
-psrld xmm11, 32-18
-psrld xmm15, 32-18
-pxor xmm0, xmm2
-pxor xmm4, xmm6
-pxor xmm8, xmm10
-pxor xmm12, xmm14
-pxor xmm0, xmm3
-pxor xmm4, xmm7
-pxor xmm8, xmm11
-pxor xmm12, xmm15
-movdqa [rsp + 0*16], xmm0
-movdqa [rsp + 1*16], xmm4
-movdqa [rsp + 2*16], xmm8
-movdqa [rsp + 3*16], xmm12
-mov rax, r9
-jmp label2
-labelSSE2_Salsa_Output:
-movdqa xmm0, xmm4
-punpckldq xmm4, xmm5
-movdqa xmm1, xmm6
-punpckldq xmm6, xmm7
-movdqa xmm2, xmm4
-punpcklqdq xmm4, xmm6
-punpckhqdq xmm2, xmm6
-punpckhdq xmm0, xmm5
-punpckhdq xmm1, xmm7
-movdqa xmm6, xmm0
-punpcklqdq xmm0, xmm1
-punpckhqdq xmm6, xmm1
-test rdx, rdx
-jz labelSSE2_Salsa_Output_A3
-test rdx, 15
-jnz labelSSE2_Salsa_Output_A7
-pxor xmm4, [rdx+0*16]
-pxor xmm2, [rdx+4*16]
-pxor xmm0, [rdx+8*16]
-pxor xmm6, [rdx+12*16]
-add rdx, 1*16
-jmp labelSSE2_Salsa_Output_A3
-labelSSE2_Salsa_Output_A7:
-movdqu xmm1, [rdx+0*16]
-pxor xmm4, xmm1
-movdqu xmm1, [rdx+4*16]
-pxor xmm2, xmm1
-movdqu xmm1, [rdx+8*16]
-pxor xmm0, xmm1
-movdqu xmm1, [rdx+12*16]
-pxor xmm6, xmm1
-add rdx, 1*16
-labelSSE2_Salsa_Output_A3:
-test rcx, 15
-jnz labelSSE2_Salsa_Output_A8
-movdqa [rcx+0*16], xmm4
-movdqa [rcx+4*16], xmm2
-movdqa [rcx+8*16], xmm0
-movdqa [rcx+12*16], xmm6
-jmp labelSSE2_Salsa_Output_A9
-labelSSE2_Salsa_Output_A8:
-movdqu [rcx+0*16], xmm4
-movdqu [rcx+4*16], xmm2
-movdqu [rcx+8*16], xmm0
-movdqu [rcx+12*16], xmm6
-labelSSE2_Salsa_Output_A9:
-add rcx, 1*16
-ret
-label6:
-movdqa xmm0, [rsp + 12*16 + 0*256]
-movdqa xmm4, [rsp + 13*16 + 0*256]
-movdqa xmm8, [rsp + 14*16 + 0*256]
-movdqa xmm12, [rsp + 15*16 + 0*256]
-movdqa xmm2, [rsp + 0*16 + 0*256]
-movdqa xmm6, [rsp + 1*16 + 0*256]
-movdqa xmm10, [rsp + 2*16 + 0*256]
-movdqa xmm14, [rsp + 3*16 + 0*256]
-paddd xmm0, xmm2
-paddd xmm4, xmm6
-paddd xmm8, xmm10
-paddd xmm12, xmm14
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-pslld xmm0, 7
-pslld xmm4, 7
-pslld xmm8, 7
-pslld xmm12, 7
-psrld xmm1, 32-7
-psrld xmm5, 32-7
-psrld xmm9, 32-7
-psrld xmm13, 32-7
-pxor xmm0, [rsp + 4*16 + 0*256]
-pxor xmm4, [rsp + 5*16 + 0*256]
-pxor xmm8, [rsp + 6*16 + 0*256]
-pxor xmm12, [rsp + 7*16 + 0*256]
-pxor xmm0, xmm1
-pxor xmm4, xmm5
-pxor xmm8, xmm9
-pxor xmm12, xmm13
-movdqa [rsp + 4*16], xmm0
-movdqa [rsp + 5*16], xmm4
-movdqa [rsp + 6*16], xmm8
-movdqa [rsp + 7*16], xmm12
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-paddd xmm0, xmm2
-paddd xmm4, xmm6
-paddd xmm8, xmm10
-paddd xmm12, xmm14
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-pslld xmm0, 9
-pslld xmm4, 9
-pslld xmm8, 9
-pslld xmm12, 9
-psrld xmm3, 32-9
-psrld xmm7, 32-9
-psrld xmm11, 32-9
-psrld xmm15, 32-9
-pxor xmm0, [rsp + 8*16 + 0*256]
-pxor xmm4, [rsp + 9*16 + 0*256]
-pxor xmm8, [rsp + 10*16 + 0*256]
-pxor xmm12, [rsp + 11*16 + 0*256]
-pxor xmm0, xmm3
-pxor xmm4, xmm7
-pxor xmm8, xmm11
-pxor xmm12, xmm15
-movdqa [rsp + 8*16], xmm0
-movdqa [rsp + 9*16], xmm4
-movdqa [rsp + 10*16], xmm8
-movdqa [rsp + 11*16], xmm12
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-paddd xmm0, xmm1
-paddd xmm4, xmm5
-paddd xmm8, xmm9
-paddd xmm12, xmm13
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-pslld xmm0, 13
-pslld xmm4, 13
-pslld xmm8, 13
-pslld xmm12, 13
-psrld xmm1, 32-13
-psrld xmm5, 32-13
-psrld xmm9, 32-13
-psrld xmm13, 32-13
-pxor xmm0, [rsp + 12*16 + 0*256]
-pxor xmm4, [rsp + 13*16 + 0*256]
-pxor xmm8, [rsp + 14*16 + 0*256]
-pxor xmm12, [rsp + 15*16 + 0*256]
-pxor xmm0, xmm1
-pxor xmm4, xmm5
-pxor xmm8, xmm9
-pxor xmm12, xmm13
-movdqa [rsp + 12*16], xmm0
-movdqa [rsp + 13*16], xmm4
-movdqa [rsp + 14*16], xmm8
-movdqa [rsp + 15*16], xmm12
-paddd xmm0, xmm3
-paddd xmm4, xmm7
-paddd xmm8, xmm11
-paddd xmm12, xmm15
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-pslld xmm0, 18
-pslld xmm4, 18
-pslld xmm8, 18
-pslld xmm12, 18
-psrld xmm3, 32-18
-psrld xmm7, 32-18
-psrld xmm11, 32-18
-psrld xmm15, 32-18
-pxor xmm0, xmm2
-pxor xmm4, xmm6
-pxor xmm8, xmm10
-pxor xmm12, xmm14
-pxor xmm0, xmm3
-pxor xmm4, xmm7
-pxor xmm8, xmm11
-pxor xmm12, xmm15
-movdqa [rsp + 0*16], xmm0
-movdqa [rsp + 1*16], xmm4
-movdqa [rsp + 2*16], xmm8
-movdqa [rsp + 3*16], xmm12
-label2:
-movdqa xmm0, [rsp + 7*16 + 0*256]
-movdqa xmm4, [rsp + 4*16 + 0*256]
-movdqa xmm8, [rsp + 5*16 + 0*256]
-movdqa xmm12, [rsp + 6*16 + 0*256]
-movdqa xmm2, [rsp + 0*16 + 0*256]
-movdqa xmm6, [rsp + 1*16 + 0*256]
-movdqa xmm10, [rsp + 2*16 + 0*256]
-movdqa xmm14, [rsp + 3*16 + 0*256]
-paddd xmm0, xmm2
-paddd xmm4, xmm6
-paddd xmm8, xmm10
-paddd xmm12, xmm14
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-pslld xmm0, 7
-pslld xmm4, 7
-pslld xmm8, 7
-pslld xmm12, 7
-psrld xmm1, 32-7
-psrld xmm5, 32-7
-psrld xmm9, 32-7
-psrld xmm13, 32-7
-pxor xmm0, [rsp + 13*16 + 0*256]
-pxor xmm4, [rsp + 14*16 + 0*256]
-pxor xmm8, [rsp + 15*16 + 0*256]
-pxor xmm12, [rsp + 12*16 + 0*256]
-pxor xmm0, xmm1
-pxor xmm4, xmm5
-pxor xmm8, xmm9
-pxor xmm12, xmm13
-movdqa [rsp + 13*16], xmm0
-movdqa [rsp + 14*16], xmm4
-movdqa [rsp + 15*16], xmm8
-movdqa [rsp + 12*16], xmm12
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-paddd xmm0, xmm2
-paddd xmm4, xmm6
-paddd xmm8, xmm10
-paddd xmm12, xmm14
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-pslld xmm0, 9
-pslld xmm4, 9
-pslld xmm8, 9
-pslld xmm12, 9
-psrld xmm3, 32-9
-psrld xmm7, 32-9
-psrld xmm11, 32-9
-psrld xmm15, 32-9
-pxor xmm0, [rsp + 10*16 + 0*256]
-pxor xmm4, [rsp + 11*16 + 0*256]
-pxor xmm8, [rsp + 8*16 + 0*256]
-pxor xmm12, [rsp + 9*16 + 0*256]
-pxor xmm0, xmm3
-pxor xmm4, xmm7
-pxor xmm8, xmm11
-pxor xmm12, xmm15
-movdqa [rsp + 10*16], xmm0
-movdqa [rsp + 11*16], xmm4
-movdqa [rsp + 8*16], xmm8
-movdqa [rsp + 9*16], xmm12
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-paddd xmm0, xmm1
-paddd xmm4, xmm5
-paddd xmm8, xmm9
-paddd xmm12, xmm13
-movdqa xmm1, xmm0
-movdqa xmm5, xmm4
-movdqa xmm9, xmm8
-movdqa xmm13, xmm12
-pslld xmm0, 13
-pslld xmm4, 13
-pslld xmm8, 13
-pslld xmm12, 13
-psrld xmm1, 32-13
-psrld xmm5, 32-13
-psrld xmm9, 32-13
-psrld xmm13, 32-13
-pxor xmm0, [rsp + 7*16 + 0*256]
-pxor xmm4, [rsp + 4*16 + 0*256]
-pxor xmm8, [rsp + 5*16 + 0*256]
-pxor xmm12, [rsp + 6*16 + 0*256]
-pxor xmm0, xmm1
-pxor xmm4, xmm5
-pxor xmm8, xmm9
-pxor xmm12, xmm13
-movdqa [rsp + 7*16], xmm0
-movdqa [rsp + 4*16], xmm4
-movdqa [rsp + 5*16], xmm8
-movdqa [rsp + 6*16], xmm12
-paddd xmm0, xmm3
-paddd xmm4, xmm7
-paddd xmm8, xmm11
-paddd xmm12, xmm15
-movdqa xmm3, xmm0
-movdqa xmm7, xmm4
-movdqa xmm11, xmm8
-movdqa xmm15, xmm12
-pslld xmm0, 18
-pslld xmm4, 18
-pslld xmm8, 18
-pslld xmm12, 18
-psrld xmm3, 32-18
-psrld xmm7, 32-18
-psrld xmm11, 32-18
-psrld xmm15, 32-18
-pxor xmm0, xmm2
-pxor xmm4, xmm6
-pxor xmm8, xmm10
-pxor xmm12, xmm14
-pxor xmm0, xmm3
-pxor xmm4, xmm7
-pxor xmm8, xmm11
-pxor xmm12, xmm15
-movdqa [rsp + 0*16], xmm0
-movdqa [rsp + 1*16], xmm4
-movdqa [rsp + 2*16], xmm8
-movdqa [rsp + 3*16], xmm12
-sub eax, 2
-jnz label6
-movdqa xmm4, [rsp + 0*16 + 256]
-paddd xmm4, [rsp + 0*16]
-movdqa xmm5, [rsp + 13*16 + 256]
-paddd xmm5, [rsp + 13*16]
-movdqa xmm6, [rsp + 10*16 + 256]
-paddd xmm6, [rsp + 10*16]
-movdqa xmm7, [rsp + 7*16 + 256]
-paddd xmm7, [rsp + 7*16]
-call labelSSE2_Salsa_Output
-movdqa xmm4, [rsp + 4*16 + 256]
-paddd xmm4, [rsp + 4*16]
-movdqa xmm5, [rsp + 1*16 + 256]
-paddd xmm5, [rsp + 1*16]
-movdqa xmm6, [rsp + 14*16 + 256]
-paddd xmm6, [rsp + 14*16]
-movdqa xmm7, [rsp + 11*16 + 256]
-paddd xmm7, [rsp + 11*16]
-call labelSSE2_Salsa_Output
-movdqa xmm4, [rsp + 8*16 + 256]
-paddd xmm4, [rsp + 8*16]
-movdqa xmm5, [rsp + 5*16 + 256]
-paddd xmm5, [rsp + 5*16]
-movdqa xmm6, [rsp + 2*16 + 256]
-paddd xmm6, [rsp + 2*16]
-movdqa xmm7, [rsp + 15*16 + 256]
-paddd xmm7, [rsp + 15*16]
-call labelSSE2_Salsa_Output
-movdqa xmm4, [rsp + 12*16 + 256]
-paddd xmm4, [rsp + 12*16]
-movdqa xmm5, [rsp + 9*16 + 256]
-paddd xmm5, [rsp + 9*16]
-movdqa xmm6, [rsp + 6*16 + 256]
-paddd xmm6, [rsp + 6*16]
-movdqa xmm7, [rsp + 3*16 + 256]
-paddd xmm7, [rsp + 3*16]
-call labelSSE2_Salsa_Output
-test rdx, rdx
-jz label9
-add rdx, 12*16
-label9:
-add rcx, 12*16
-sub r8, 4
-cmp r8, 4
-jge label1
-label5:
-sub r8, 1
-jl label4
-movdqa xmm0, [r10 + 0*16]
-movdqa xmm1, [r10 + 1*16]
-movdqa xmm2, [r10 + 2*16]
-movdqa xmm3, [r10 + 3*16]
-mov rax, r9
-label0:
-movdqa xmm4, xmm3
-paddd xmm4, xmm0
-movdqa xmm5, xmm4
-pslld xmm4, 7
-psrld xmm5, 32-7
-pxor xmm1, xmm4
-pxor xmm1, xmm5
-movdqa xmm4, xmm0
-paddd xmm4, xmm1
-movdqa xmm5, xmm4
-pslld xmm4, 9
-psrld xmm5, 32-9
-pxor xmm2, xmm4
-pxor xmm2, xmm5
-movdqa xmm4, xmm1
-paddd xmm4, xmm2
-movdqa xmm5, xmm4
-pslld xmm4, 13
-psrld xmm5, 32-13
-pxor xmm3, xmm4
-pxor xmm3, xmm5
-movdqa xmm4, xmm2
-paddd xmm4, xmm3
-movdqa xmm5, xmm4
-pslld xmm4, 18
-psrld xmm5, 32-18
-pxor xmm0, xmm4
-pxor xmm0, xmm5
-pshufd xmm1, xmm1, 2*64+1*16+0*4+3
-pshufd xmm2, xmm2, 1*64+0*16+3*4+2
-pshufd xmm3, xmm3, 0*64+3*16+2*4+1
-movdqa xmm4, xmm1
-paddd xmm4, xmm0
-movdqa xmm5, xmm4
-pslld xmm4, 7
-psrld xmm5, 32-7
-pxor xmm3, xmm4
-pxor xmm3, xmm5
-movdqa xmm4, xmm0
-paddd xmm4, xmm3
-movdqa xmm5, xmm4
-pslld xmm4, 9
-psrld xmm5, 32-9
-pxor xmm2, xmm4
-pxor xmm2, xmm5
-movdqa xmm4, xmm3
-paddd xmm4, xmm2
-movdqa xmm5, xmm4
-pslld xmm4, 13
-psrld xmm5, 32-13
-pxor xmm1, xmm4
-pxor xmm1, xmm5
-movdqa xmm4, xmm2
-paddd xmm4, xmm1
-movdqa xmm5, xmm4
-pslld xmm4, 18
-psrld xmm5, 32-18
-pxor xmm0, xmm4
-pxor xmm0, xmm5
-pshufd xmm1, xmm1, 0*64+3*16+2*4+1
-pshufd xmm2, xmm2, 1*64+0*16+3*4+2
-pshufd xmm3, xmm3, 2*64+1*16+0*4+3
-sub eax, 2
-jnz label0
-paddd xmm0, [r10 + 0*16]
-paddd xmm1, [r10 + 1*16]
-paddd xmm2, [r10 + 2*16]
-paddd xmm3, [r10 + 3*16]
-add dword ptr [r10 + 8*4], 1
-adc dword ptr [r10 + 5*4], 0
-pcmpeqb xmm6, xmm6
-psrlq xmm6, 32
-pshufd xmm7, xmm6, 0*64+1*16+2*4+3
-movdqa xmm4, xmm0
-movdqa xmm5, xmm3
-pand xmm0, xmm7
-pand xmm4, xmm6
-pand xmm3, xmm6
-pand xmm5, xmm7
-por xmm4, xmm5
-movdqa xmm5, xmm1
-pand xmm1, xmm7
-pand xmm5, xmm6
-por xmm0, xmm5
-pand xmm6, xmm2
-pand xmm2, xmm7
-por xmm1, xmm6
-por xmm2, xmm3
-movdqa xmm5, xmm4
-movdqa xmm6, xmm0
-shufpd xmm4, xmm1, 2
-shufpd xmm0, xmm2, 2
-shufpd xmm1, xmm5, 2
-shufpd xmm2, xmm6, 2
-test rdx, rdx
-jz labelSSE2_Salsa_Output_B3
-test rdx, 15
-jnz labelSSE2_Salsa_Output_B7
-pxor xmm4, [rdx+0*16]
-pxor xmm0, [rdx+1*16]
-pxor xmm1, [rdx+2*16]
-pxor xmm2, [rdx+3*16]
-add rdx, 4*16
-jmp labelSSE2_Salsa_Output_B3
-labelSSE2_Salsa_Output_B7:
-movdqu xmm3, [rdx+0*16]
-pxor xmm4, xmm3
-movdqu xmm3, [rdx+1*16]
-pxor xmm0, xmm3
-movdqu xmm3, [rdx+2*16]
-pxor xmm1, xmm3
-movdqu xmm3, [rdx+3*16]
-pxor xmm2, xmm3
-add rdx, 4*16
-labelSSE2_Salsa_Output_B3:
-test rcx, 15
-jnz labelSSE2_Salsa_Output_B8
-movdqa [rcx+0*16], xmm4
-movdqa [rcx+1*16], xmm0
-movdqa [rcx+2*16], xmm1
-movdqa [rcx+3*16], xmm2
-jmp labelSSE2_Salsa_Output_B9
-labelSSE2_Salsa_Output_B8:
-movdqu [rcx+0*16], xmm4
-movdqu [rcx+1*16], xmm0
-movdqu [rcx+2*16], xmm1
-movdqu [rcx+3*16], xmm2
-labelSSE2_Salsa_Output_B9:
-add rcx, 4*16
-jmp label5
-label4:
-movdqa xmm6, [rsp + 0200h]
-movdqa xmm7, [rsp + 0210h]
-movdqa xmm8, [rsp + 0220h]
-movdqa xmm9, [rsp + 0230h]
-movdqa xmm10, [rsp + 0240h]
-movdqa xmm11, [rsp + 0250h]
-movdqa xmm12, [rsp + 0260h]
-movdqa xmm13, [rsp + 0270h]
-movdqa xmm14, [rsp + 0280h]
-movdqa xmm15, [rsp + 0290h]
-add rsp, 10*16 + 32*16 + 8
-ret
-Salsa20_OperateKeystream ENDP
-
-ALIGN 8
-Sosemanuk_OperateKeystream PROC FRAME
-rex_push_reg rsi
-push_reg rdi
-alloc_stack(80*4*2+12*4+8*8 + 2*16+8)
-save_xmm128 xmm6, 02f0h
-save_xmm128 xmm7, 0300h
-.endprolog
-mov rdi, r8
-mov rax, r9
-mov QWORD PTR [rsp+1*8], rdi
-mov QWORD PTR [rsp+2*8], rdx
-mov QWORD PTR [rsp+6*8], rax
-lea rcx, [4*rcx+rcx]
-lea rsi, [4*rcx]
-mov QWORD PTR [rsp+3*8], rsi
-movdqa xmm0, [rax+0*16]
-movdqa [rsp + 8*8+0*16], xmm0
-movdqa xmm0, [rax+1*16]
-movdqa [rsp + 8*8+1*16], xmm0
-movq xmm0, QWORD PTR [rax+2*16]
-movq QWORD PTR [rsp + 8*8+2*16], xmm0
-psrlq xmm0, 32
-movd r10d, xmm0
-mov ecx, [rax+10*4]
-mov edx, [rax+11*4]
-pcmpeqb xmm7, xmm7
-label2:
-lea rdi, [rsp + 8*8 + 12*4]
-mov rax, 80
-cmp rsi, 80
-cmovg rsi, rax
-mov QWORD PTR [rsp+7*8], rsi
-lea rsi, [rdi+rsi]
-mov QWORD PTR [rsp+4*8], rsi
-lea rsi, s_sosemanukMulTables
-label0:
-mov eax, [rsp + 8*8 + ((0+0)-((0+0)/(10))*(10))*4]
-mov [rdi + (((0)-((0)/(4))*(4))*20 + (0/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((0)-((0)/(4))*(4))*20 + (0/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((0+3)-((0+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((0+2)-((0+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((0+0)-((0+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((1+0)-((1+0)/(10))*(10))*4]
-mov [rdi + (((1)-((1)/(4))*(4))*20 + (1/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((1)-((1)/(4))*(4))*20 + (1/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((1+3)-((1+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((1+2)-((1+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((1+0)-((1+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((2+0)-((2+0)/(10))*(10))*4]
-mov [rdi + (((2)-((2)/(4))*(4))*20 + (2/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((2)-((2)/(4))*(4))*20 + (2/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((2+3)-((2+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((2+2)-((2+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((2+0)-((2+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((3+0)-((3+0)/(10))*(10))*4]
-mov [rdi + (((3)-((3)/(4))*(4))*20 + (3/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((3)-((3)/(4))*(4))*20 + (3/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((3+3)-((3+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((3+2)-((3+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((3+0)-((3+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((4+0)-((4+0)/(10))*(10))*4]
-mov [rdi + (((4)-((4)/(4))*(4))*20 + (4/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((4)-((4)/(4))*(4))*20 + (4/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((4+3)-((4+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((4+2)-((4+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((4+0)-((4+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((5+0)-((5+0)/(10))*(10))*4]
-mov [rdi + (((5)-((5)/(4))*(4))*20 + (5/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((5)-((5)/(4))*(4))*20 + (5/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((5+3)-((5+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((5+2)-((5+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((5+0)-((5+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((6+0)-((6+0)/(10))*(10))*4]
-mov [rdi + (((6)-((6)/(4))*(4))*20 + (6/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((6)-((6)/(4))*(4))*20 + (6/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((6+3)-((6+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((6+2)-((6+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((6+0)-((6+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((7+0)-((7+0)/(10))*(10))*4]
-mov [rdi + (((7)-((7)/(4))*(4))*20 + (7/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((7)-((7)/(4))*(4))*20 + (7/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((7+3)-((7+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((7+2)-((7+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((7+0)-((7+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((8+0)-((8+0)/(10))*(10))*4]
-mov [rdi + (((8)-((8)/(4))*(4))*20 + (8/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((8)-((8)/(4))*(4))*20 + (8/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((8+3)-((8+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((8+2)-((8+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((8+0)-((8+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((9+0)-((9+0)/(10))*(10))*4]
-mov [rdi + (((9)-((9)/(4))*(4))*20 + (9/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((9)-((9)/(4))*(4))*20 + (9/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((9+3)-((9+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((9+2)-((9+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((9+0)-((9+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((10+0)-((10+0)/(10))*(10))*4]
-mov [rdi + (((10)-((10)/(4))*(4))*20 + (10/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((10)-((10)/(4))*(4))*20 + (10/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((10+3)-((10+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((10+2)-((10+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((10+0)-((10+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((11+0)-((11+0)/(10))*(10))*4]
-mov [rdi + (((11)-((11)/(4))*(4))*20 + (11/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((11)-((11)/(4))*(4))*20 + (11/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((11+3)-((11+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((11+2)-((11+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((11+0)-((11+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((12+0)-((12+0)/(10))*(10))*4]
-mov [rdi + (((12)-((12)/(4))*(4))*20 + (12/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((12)-((12)/(4))*(4))*20 + (12/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((12+3)-((12+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((12+2)-((12+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((12+0)-((12+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((13+0)-((13+0)/(10))*(10))*4]
-mov [rdi + (((13)-((13)/(4))*(4))*20 + (13/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((13)-((13)/(4))*(4))*20 + (13/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((13+3)-((13+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((13+2)-((13+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((13+0)-((13+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((14+0)-((14+0)/(10))*(10))*4]
-mov [rdi + (((14)-((14)/(4))*(4))*20 + (14/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((14)-((14)/(4))*(4))*20 + (14/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((14+3)-((14+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((14+2)-((14+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((14+0)-((14+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((15+0)-((15+0)/(10))*(10))*4]
-mov [rdi + (((15)-((15)/(4))*(4))*20 + (15/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((15)-((15)/(4))*(4))*20 + (15/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((15+3)-((15+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((15+2)-((15+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((15+0)-((15+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((16+0)-((16+0)/(10))*(10))*4]
-mov [rdi + (((16)-((16)/(4))*(4))*20 + (16/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((16)-((16)/(4))*(4))*20 + (16/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((16+3)-((16+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((16+2)-((16+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((16+0)-((16+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((17+0)-((17+0)/(10))*(10))*4]
-mov [rdi + (((17)-((17)/(4))*(4))*20 + (17/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((17)-((17)/(4))*(4))*20 + (17/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((17+3)-((17+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((17+2)-((17+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((17+0)-((17+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((18+0)-((18+0)/(10))*(10))*4]
-mov [rdi + (((18)-((18)/(4))*(4))*20 + (18/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + edx]
-xor r11d, ecx
-mov [rdi + (((18)-((18)/(4))*(4))*20 + (18/4)) * 4], r11d
-mov r11d, 1
-and r11d, edx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((18+3)-((18+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((18+2)-((18+2)/(10))*(10))*4]
-add ecx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul edx, 54655307h
-rol edx, 7
-mov [rsp + 8*8 + ((18+0)-((18+0)/(10))*(10))*4], r10d
-mov eax, [rsp + 8*8 + ((19+0)-((19+0)/(10))*(10))*4]
-mov [rdi + (((19)-((19)/(4))*(4))*20 + (19/4)) * 4 + 80*4], eax
-rol eax, 8
-lea r11d, [r10d + ecx]
-xor r11d, edx
-mov [rdi + (((19)-((19)/(4))*(4))*20 + (19/4)) * 4], r11d
-mov r11d, 1
-and r11d, ecx
-neg r11d
-and r11d, r10d
-xor r10d, eax
-movzx eax, al
-xor r10d, [rsi+rax*4]
-mov eax, [rsp + 8*8 + ((19+3)-((19+3)/(10))*(10))*4]
-xor r11d, [rsp + 8*8 + ((19+2)-((19+2)/(10))*(10))*4]
-add edx, r11d
-movzx r11d, al
-shr eax, 8
-xor r10d, [rsi+1024+r11*4]
-xor r10d, eax
-imul ecx, 54655307h
-rol ecx, 7
-mov [rsp + 8*8 + ((19+0)-((19+0)/(10))*(10))*4], r10d
-add rdi, 5*4
-cmp rdi, QWORD PTR [rsp+4*8]
-jne label0
-mov rax, QWORD PTR [rsp+2*8]
-mov r11, QWORD PTR [rsp+1*8]
-lea rdi, [rsp + 8*8 + 12*4]
-mov rsi, QWORD PTR [rsp+7*8]
-label1:
-movdqa xmm0, [rdi+0*20*4]
-movdqa xmm2, [rdi+2*20*4]
-movdqa xmm3, [rdi+3*20*4]
-movdqa xmm1, [rdi+1*20*4]
-movdqa xmm4, xmm0
-pand xmm0, xmm2
-pxor xmm0, xmm3
-pxor xmm2, xmm1
-pxor xmm2, xmm0
-por xmm3, xmm4
-pxor xmm3, xmm1
-pxor xmm4, xmm2
-movdqa xmm1, xmm3
-por xmm3, xmm4
-pxor xmm3, xmm0
-pand xmm0, xmm1
-pxor xmm4, xmm0
-pxor xmm1, xmm3
-pxor xmm1, xmm4
-pxor xmm4, xmm7
-pxor xmm2, [rdi+80*4]
-pxor xmm3, [rdi+80*5]
-pxor xmm1, [rdi+80*6]
-pxor xmm4, [rdi+80*7]
-cmp rsi, 16
-jl label4
-movdqa xmm6, xmm2
-punpckldq xmm2, xmm3
-movdqa xmm5, xmm1
-punpckldq xmm1, xmm4
-movdqa xmm0, xmm2
-punpcklqdq xmm2, xmm1
-punpckhqdq xmm0, xmm1
-punpckhdq xmm6, xmm3
-punpckhdq xmm5, xmm4
-movdqa xmm3, xmm6
-punpcklqdq xmm6, xmm5
-punpckhqdq xmm3, xmm5
-test rax, rax
-jz labelSSE2_Sosemanuk_Output3
-test rax, 15
-jnz labelSSE2_Sosemanuk_Output7
-pxor xmm2, [rax+0*16]
-pxor xmm0, [rax+1*16]
-pxor xmm6, [rax+2*16]
-pxor xmm3, [rax+3*16]
-add rax, 4*16
-jmp labelSSE2_Sosemanuk_Output3
-labelSSE2_Sosemanuk_Output7:
-movdqu xmm1, [rax+0*16]
-pxor xmm2, xmm1
-movdqu xmm1, [rax+1*16]
-pxor xmm0, xmm1
-movdqu xmm1, [rax+2*16]
-pxor xmm6, xmm1
-movdqu xmm1, [rax+3*16]
-pxor xmm3, xmm1
-add rax, 4*16
-labelSSE2_Sosemanuk_Output3:
-test r11, 15
-jnz labelSSE2_Sosemanuk_Output8
-movdqa [r11+0*16], xmm2
-movdqa [r11+1*16], xmm0
-movdqa [r11+2*16], xmm6
-movdqa [r11+3*16], xmm3
-jmp labelSSE2_Sosemanuk_Output9
-labelSSE2_Sosemanuk_Output8:
-movdqu [r11+0*16], xmm2
-movdqu [r11+1*16], xmm0
-movdqu [r11+2*16], xmm6
-movdqu [r11+3*16], xmm3
-labelSSE2_Sosemanuk_Output9:
-add r11, 4*16
-add rdi, 4*4
-sub rsi, 16
-jnz label1
-mov rsi, QWORD PTR [rsp+3*8]
-sub rsi, 80
-jz label6
-mov QWORD PTR [rsp+3*8], rsi
-mov QWORD PTR [rsp+2*8], rax
-mov QWORD PTR [rsp+1*8], r11
-jmp label2
-label4:
-test rax, rax
-jz label5
-movd xmm0, dword ptr [rax+0*4]
-pxor xmm2, xmm0
-movd xmm0, dword ptr [rax+1*4]
-pxor xmm3, xmm0
-movd xmm0, dword ptr [rax+2*4]
-pxor xmm1, xmm0
-movd xmm0, dword ptr [rax+3*4]
-pxor xmm4, xmm0
-add rax, 16
-label5:
-movd dword ptr [r11+0*4], xmm2
-movd dword ptr [r11+1*4], xmm3
-movd dword ptr [r11+2*4], xmm1
-movd dword ptr [r11+3*4], xmm4
-sub rsi, 4
-jz label6
-add r11, 16
-psrldq xmm2, 4
-psrldq xmm3, 4
-psrldq xmm1, 4
-psrldq xmm4, 4
-jmp label4
-label6:
-mov r10, QWORD PTR [rsp+6*8]
-movdqa xmm0, [rsp + 8*8+0*16]
-movdqa [r10+0*16], xmm0
-movdqa xmm0, [rsp + 8*8+1*16]
-movdqa [r10+1*16], xmm0
-movq xmm0, QWORD PTR [rsp + 8*8+2*16]
-movq QWORD PTR [r10+2*16], xmm0
-mov [r10+10*4], ecx
-mov [r10+11*4], edx
-movdqa xmm6, [rsp + 02f0h]
-movdqa xmm7, [rsp + 0300h]
-add rsp, 80*4*2+12*4+8*8 + 2*16+8
-pop		rdi
-pop		rsi
-ret
-Sosemanuk_OperateKeystream ENDP
-
-Panama_SSE2_Pull PROC FRAME
-rex_push_reg rdi
-alloc_stack(2*16)
-save_xmm128 xmm6, 0h
-save_xmm128 xmm7, 10h
-.endprolog
-shl rcx, 5
-jz label5
-mov r10d, [rdx+4*17]
-add rcx, r10
-mov rdi, rcx
-movdqa xmm0, xmmword ptr [rdx+0*16]
-movdqa xmm1, xmmword ptr [rdx+1*16]
-movdqa xmm2, xmmword ptr [rdx+2*16]
-movdqa xmm3, xmmword ptr [rdx+3*16]
-mov eax, dword ptr [rdx+4*16]
-label4:
-movdqa xmm6, xmm2
-movss xmm6, xmm3
-pshufd xmm5, xmm6, 0*64+3*16+2*4+1
-movd xmm6, eax
-movdqa xmm7, xmm3
-movss xmm7, xmm6
-pshufd xmm6, xmm7, 0*64+3*16+2*4+1
-movd ecx, xmm2
-not ecx
-movd r11d, xmm3
-or ecx, r11d
-xor eax, ecx
-pcmpeqb xmm7, xmm7
-pxor xmm7, xmm1
-por xmm7, xmm2
-pxor xmm7, xmm3
-movd ecx, xmm7
-rol ecx, (((((5*1) MOD (17))*(((5*1) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(1)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pshuflw xmm7, xmm7, 1*64+0*16+3*4+2
-movd ecx, xmm7
-rol ecx, (((((5*5) MOD (17))*(((5*5) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(5)) MOD (17)))*13+16)) MOD (17))*4], ecx
-punpckhqdq xmm7, xmm7
-movd ecx, xmm7
-rol ecx, (((((5*9) MOD (17))*(((5*9) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(9)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pshuflw xmm7, xmm7, 1*64+0*16+3*4+2
-movd ecx, xmm7
-rol ecx, (((((5*13) MOD (17))*(((5*13) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(13)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pcmpeqb xmm7, xmm7
-pxor xmm7, xmm0
-por xmm7, xmm1
-pxor xmm7, xmm2
-movd ecx, xmm7
-rol ecx, (((((5*2) MOD (17))*(((5*2) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(2)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pshuflw xmm7, xmm7, 1*64+0*16+3*4+2
-movd ecx, xmm7
-rol ecx, (((((5*6) MOD (17))*(((5*6) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(6)) MOD (17)))*13+16)) MOD (17))*4], ecx
-punpckhqdq xmm7, xmm7
-movd ecx, xmm7
-rol ecx, (((((5*10) MOD (17))*(((5*10) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(10)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pshuflw xmm7, xmm7, 1*64+0*16+3*4+2
-movd ecx, xmm7
-rol ecx, (((((5*14) MOD (17))*(((5*14) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(14)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pcmpeqb xmm7, xmm7
-pxor xmm7, xmm6
-por xmm7, xmm0
-pxor xmm7, xmm1
-movd ecx, xmm7
-rol ecx, (((((5*3) MOD (17))*(((5*3) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(3)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pshuflw xmm7, xmm7, 1*64+0*16+3*4+2
-movd ecx, xmm7
-rol ecx, (((((5*7) MOD (17))*(((5*7) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(7)) MOD (17)))*13+16)) MOD (17))*4], ecx
-punpckhqdq xmm7, xmm7
-movd ecx, xmm7
-rol ecx, (((((5*11) MOD (17))*(((5*11) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(11)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pshuflw xmm7, xmm7, 1*64+0*16+3*4+2
-movd ecx, xmm7
-rol ecx, (((((5*15) MOD (17))*(((5*15) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(15)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pcmpeqb xmm7, xmm7
-pxor xmm7, xmm5
-por xmm7, xmm6
-pxor xmm7, xmm0
-movd ecx, xmm7
-rol ecx, (((((5*4) MOD (17))*(((5*4) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(4)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pshuflw xmm7, xmm7, 1*64+0*16+3*4+2
-movd ecx, xmm7
-rol ecx, (((((5*8) MOD (17))*(((5*8) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(8)) MOD (17)))*13+16)) MOD (17))*4], ecx
-punpckhqdq xmm7, xmm7
-movd ecx, xmm7
-rol ecx, (((((5*12) MOD (17))*(((5*12) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(12)) MOD (17)))*13+16)) MOD (17))*4], ecx
-pshuflw xmm7, xmm7, 1*64+0*16+3*4+2
-movd ecx, xmm7
-rol ecx, (((((5*16) MOD (17))*(((5*16) MOD (17))+1)/2)) MOD (32))
-mov [rdx+((((((5*(16)) MOD (17)))*13+16)) MOD (17))*4], ecx
-movdqa xmm4, xmm3
-punpcklqdq xmm3, xmm2
-punpckhdq xmm4, xmm2
-movdqa xmm2, xmm1
-punpcklqdq xmm1, xmm0
-punpckhdq xmm2, xmm0
-test r8, r8
-jz label0
-movdqa xmm6, xmm4
-punpcklqdq xmm4, xmm2
-punpckhqdq xmm6, xmm2
-test r9, 15
-jnz label2
-test r9, r9
-jz label1
-pxor xmm4, [r9]
-pxor xmm6, [r9+16]
-add r9, 32
-jmp label1
-label2:
-movdqu xmm0, [r9]
-movdqu xmm2, [r9+16]
-pxor xmm4, xmm0
-pxor xmm6, xmm2
-add r9, 32
-label1:
-test r8, 15
-jnz label3
-movdqa xmmword ptr [r8], xmm4
-movdqa xmmword ptr [r8+16], xmm6
-add r8, 32
-jmp label0
-label3:
-movdqu xmmword ptr [r8], xmm4
-movdqu xmmword ptr [r8+16], xmm6
-add r8, 32
-label0:
-lea rcx, [r10 + 32]
-and rcx, 31*32
-lea r11, [r10 + (32-24)*32]
-and r11, 31*32
-movdqa xmm0, xmmword ptr [rdx+20*4+rcx+0*8]
-pxor xmm3, xmm0
-pshufd xmm0, xmm0, 2*64+3*16+0*4+1
-movdqa xmmword ptr [rdx+20*4+rcx+0*8], xmm3
-pxor xmm0, xmmword ptr [rdx+20*4+r11+2*8]
-movdqa xmmword ptr [rdx+20*4+r11+2*8], xmm0
-movdqa xmm4, xmmword ptr [rdx+20*4+rcx+2*8]
-pxor xmm1, xmm4
-movdqa xmmword ptr [rdx+20*4+rcx+2*8], xmm1
-pxor xmm4, xmmword ptr [rdx+20*4+r11+0*8]
-movdqa xmmword ptr [rdx+20*4+r11+0*8], xmm4
-movdqa xmm3, xmmword ptr [rdx+3*16]
-movdqa xmm2, xmmword ptr [rdx+2*16]
-movdqa xmm1, xmmword ptr [rdx+1*16]
-movdqa xmm0, xmmword ptr [rdx+0*16]
-movd xmm6, eax
-movdqa xmm7, xmm3
-movss xmm7, xmm6
-movdqa xmm6, xmm2
-movss xmm6, xmm3
-movdqa xmm5, xmm1
-movss xmm5, xmm2
-movdqa xmm4, xmm0
-movss xmm4, xmm1
-pshufd xmm7, xmm7, 0*64+3*16+2*4+1
-pshufd xmm6, xmm6, 0*64+3*16+2*4+1
-pshufd xmm5, xmm5, 0*64+3*16+2*4+1
-pshufd xmm4, xmm4, 0*64+3*16+2*4+1
-xor eax, 1
-movd ecx, xmm0
-xor eax, ecx
-movd ecx, xmm3
-xor eax, ecx
-pxor xmm3, xmm2
-pxor xmm2, xmm1
-pxor xmm1, xmm0
-pxor xmm0, xmm7
-pxor xmm3, xmm7
-pxor xmm2, xmm6
-pxor xmm1, xmm5
-pxor xmm0, xmm4
-lea rcx, [r10 + (32-4)*32]
-and rcx, 31*32
-lea r11, [r10 + 16*32]
-and r11, 31*32
-movdqa xmm4, xmmword ptr [rdx+20*4+rcx+0*16]
-movdqa xmm5, xmmword ptr [rdx+20*4+r11+0*16]
-movdqa xmm6, xmm4
-punpcklqdq xmm4, xmm5
-punpckhqdq xmm6, xmm5
-pxor xmm3, xmm4
-pxor xmm2, xmm6
-movdqa xmm4, xmmword ptr [rdx+20*4+rcx+1*16]
-movdqa xmm5, xmmword ptr [rdx+20*4+r11+1*16]
-movdqa xmm6, xmm4
-punpcklqdq xmm4, xmm5
-punpckhqdq xmm6, xmm5
-pxor xmm1, xmm4
-pxor xmm0, xmm6
-add r10, 32
-cmp r10, rdi
-jne label4
-mov [rdx+4*16], eax
-movdqa xmmword ptr [rdx+3*16], xmm3
-movdqa xmmword ptr [rdx+2*16], xmm2
-movdqa xmmword ptr [rdx+1*16], xmm1
-movdqa xmmword ptr [rdx+0*16], xmm0
-label5:
-movdqa xmm6, [rsp + 0h]
-movdqa xmm7, [rsp + 10h]
-add rsp, 2*16
-pop	rdi
-ret
-Panama_SSE2_Pull ENDP
-
-_TEXT ENDS
-END

From 0677c49997f6d63f142161dbd809cc3631ac28ae Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:14:47 +0200
Subject: [PATCH 02/10] add src-cryptopp as git module

---
 .gitmodules  | 3 +++
 src-cryptopp | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 src-cryptopp

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6d3f5c0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src-cryptopp"]
+	path = src-cryptopp
+	url = https://github.com/weidai11/cryptopp
diff --git a/src-cryptopp b/src-cryptopp
new file mode 160000
index 0000000..a75a7d8
--- /dev/null
+++ b/src-cryptopp
@@ -0,0 +1 @@
+Subproject commit a75a7d87ff03df37f6319c45a484b292465cc173

From e156b4d3b35142f768e41e3f6c55e86518b8cd5d Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:15:10 +0200
Subject: [PATCH 03/10] rm src-ed25519

---
 src-ed25519/glue/ed25519module.c            | 199 -----
 src-ed25519/supercop-ref/Makefile           |  10 -
 src-ed25519/supercop-ref/api.h              |   4 -
 src-ed25519/supercop-ref/crypto_int32.h     |   6 -
 src-ed25519/supercop-ref/crypto_sign.h      |  13 -
 src-ed25519/supercop-ref/crypto_uint32.h    |   6 -
 src-ed25519/supercop-ref/crypto_verify_32.h |   7 -
 src-ed25519/supercop-ref/ed25519.c          | 136 ----
 src-ed25519/supercop-ref/fe25519.c          | 326 --------
 src-ed25519/supercop-ref/fe25519.h          |  63 --
 src-ed25519/supercop-ref/ge25519.c          | 311 -------
 src-ed25519/supercop-ref/ge25519.h          |  35 -
 src-ed25519/supercop-ref/ge25519_base.data  | 850 --------------------
 src-ed25519/supercop-ref/sc25519.c          | 298 -------
 src-ed25519/supercop-ref/sc25519.h          |  73 --
 src-ed25519/supercop-ref/sha512-blocks.c    | 239 ------
 src-ed25519/supercop-ref/sha512-hash.c      |  72 --
 src-ed25519/supercop-ref/sha512.h           |   4 -
 src-ed25519/supercop-ref/test.c             |  39 -
 src-ed25519/supercop-ref/verify.c           |  40 -
 20 files changed, 2731 deletions(-)
 delete mode 100644 src-ed25519/glue/ed25519module.c
 delete mode 100644 src-ed25519/supercop-ref/Makefile
 delete mode 100644 src-ed25519/supercop-ref/api.h
 delete mode 100644 src-ed25519/supercop-ref/crypto_int32.h
 delete mode 100644 src-ed25519/supercop-ref/crypto_sign.h
 delete mode 100644 src-ed25519/supercop-ref/crypto_uint32.h
 delete mode 100644 src-ed25519/supercop-ref/crypto_verify_32.h
 delete mode 100644 src-ed25519/supercop-ref/ed25519.c
 delete mode 100644 src-ed25519/supercop-ref/fe25519.c
 delete mode 100644 src-ed25519/supercop-ref/fe25519.h
 delete mode 100644 src-ed25519/supercop-ref/ge25519.c
 delete mode 100644 src-ed25519/supercop-ref/ge25519.h
 delete mode 100644 src-ed25519/supercop-ref/ge25519_base.data
 delete mode 100644 src-ed25519/supercop-ref/sc25519.c
 delete mode 100644 src-ed25519/supercop-ref/sc25519.h
 delete mode 100644 src-ed25519/supercop-ref/sha512-blocks.c
 delete mode 100644 src-ed25519/supercop-ref/sha512-hash.c
 delete mode 100644 src-ed25519/supercop-ref/sha512.h
 delete mode 100644 src-ed25519/supercop-ref/test.c
 delete mode 100644 src-ed25519/supercop-ref/verify.c

diff --git a/src-ed25519/glue/ed25519module.c b/src-ed25519/glue/ed25519module.c
deleted file mode 100644
index bec1fe8..0000000
--- a/src-ed25519/glue/ed25519module.c
+++ /dev/null
@@ -1,199 +0,0 @@
-
-/* Use this file as a template to start implementing a module that
-   also declares object types. All occurrences of 'FOOOBJ' should be changed
-   to something reasonable for your objects. After that, all other
-   occurrences of 'ed25519' should be changed to something reasonable for your
-   module. If your module is named foo your sourcefile should be named
-   foomodule.c.
-
-   You will probably want to delete all references to 'x_attr' and add
-   your own types of attributes instead.  Maybe you want to name your
-   local variables other than 'self'.  If your object type is needed in
-   other files, you'll have to create a file "foobarobject.h"; see
-   intobject.h for an example. */
-
-// this makes "s#" use Py_ssize_t instead of int
-#define PY_SSIZE_T_CLEAN 1
-#include "Python.h"
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-#define PY_SSIZE_T_MAX INT_MAX
-#define PY_SSIZE_T_MIN INT_MIN
-#endif
-
-static PyObject *BadSignatureError,
-    *SECRETKEYBYTESObject, *PUBLICKEYBYTESObject, *SIGNATUREBYTESObject;
-/* --------------------------------------------------------------------- */
-
-#include "crypto_sign.h"
-
-PyDoc_STRVAR(ed25519_publickey_doc,
-"publickey(signkey_seed)\n\
-\n\
-Accepts a 32-byte seed. Return a tuple of (verfkey, signkey), with the\n\
-64-byte private signing key and the corresponding 32-byte public\n\
-verfiying key.");
-
-#include <stdio.h>
-
-static PyObject *
-ed25519_publickey(PyObject *self, PyObject *args)
-{
-    unsigned char verfkey[PUBLICKEYBYTES];
-    unsigned char signkey[SECRETKEYBYTES];
-    unsigned char *seed;
-    Py_ssize_t seed_len;
-    if (!PyArg_ParseTuple(args, "s#", &seed, &seed_len))
-        return NULL;
-    crypto_sign_publickey(verfkey, signkey, seed);
-    return Py_BuildValue("(s#s#)",
-                         verfkey, PUBLICKEYBYTES,
-                         signkey, SECRETKEYBYTES);
-}
-
-PyDoc_STRVAR(ed25519_sign_doc,
-"sign(message, signing_key)\n\
-\n\
-Return the concatenation of three parts: the 32-byte R signature value,\n\
-the original message, and the 32-byte S signature value.");
-
-static PyObject *
-ed25519_sign(PyObject *self, PyObject *args)
-{
-    const unsigned char *msg; Py_ssize_t msg_len;
-    const unsigned char *signkey; Py_ssize_t signkey_len;
-    unsigned char *sig_and_msg; unsigned long long sig_and_msg_len1;
-    Py_ssize_t sig_and_msg_len2;
-    PyObject *ret;
-
-    // NOTE: using s# copies the message. It'd be nicer to use it in-place.
-    // Consider s* and using a Py_buffer. Don't forget PyBuffer_Release.
-    // Py_buffer is available in py2.6 and later.
-    //// on the other hand, the funky NaCl API means we're already doing 3
-    //// copies anyway, so a 4th isn't a big deal.
-    if (!PyArg_ParseTuple(args, "s#s#:signature",
-                          &msg, &msg_len,
-                          &signkey, &signkey_len))
-        return NULL;
-    if (signkey_len != SECRETKEYBYTES) { // 64
-        PyErr_SetString(PyExc_TypeError,
-                        "Private signing keys are 64 byte strings");
-        return NULL;
-    }
-    sig_and_msg = PyMem_Malloc(msg_len + SIGNATUREBYTES);
-    if (!sig_and_msg)
-        return PyErr_NoMemory();
-    crypto_sign(sig_and_msg, &sig_and_msg_len1, msg, msg_len, signkey);
-    sig_and_msg_len2 = sig_and_msg_len1;
-    ret = Py_BuildValue("s#", sig_and_msg, sig_and_msg_len2);
-    PyMem_Free(sig_and_msg);
-    return ret;
-}
-
-PyDoc_STRVAR(ed25519_open_doc,
-"open(message+signature, verifying_key)\n\
-\n\
-Check the signature for validity. Returns the message if valid, raises\n\
-ed25519.error if not.");
-
-static PyObject *
-ed25519_open(PyObject *self, PyObject *args)
-{
-    const unsigned char *sig_and_msg; Py_ssize_t sig_and_msg_len;
-    const unsigned char *verfkey; Py_ssize_t verfkey_len;
-    unsigned char *msg; unsigned long long msg_len1;
-    Py_ssize_t msg_len2;
-    PyObject *ret;
-    int result;
-    if (!PyArg_ParseTuple(args, "s#s#:checkvalid",
-                          &sig_and_msg, &sig_and_msg_len,
-                          &verfkey, &verfkey_len ))
-        return NULL;
-    if (sig_and_msg_len < SIGNATUREBYTES) { // 64
-        PyErr_SetString(PyExc_TypeError,
-                        "signature-and-message must be at least 64 bytes long");
-        return NULL;
-    }
-    if (verfkey_len != PUBLICKEYBYTES) { // 32
-        PyErr_SetString(PyExc_TypeError,
-                        "Public verifying keys are 32 byte strings");
-        return NULL;
-    }
-
-    // crypto_sign_open() uses the output buffer as a scratchpad, and thus
-    // requires an extra 64 bytes beyond the expected message. So allocate
-    // sig_and_msg_len, not sig_and_msg_len-SIGNATUREBYTES
-    msg = PyMem_Malloc(sig_and_msg_len);
-    if (!msg)
-        return PyErr_NoMemory();
-    result = crypto_sign_open(msg, &msg_len1, sig_and_msg, sig_and_msg_len,
-                              verfkey);
-    // be faithful to the NaCl interface and return the message, even though
-    // it's a waste.
-    if (result == 0) {
-        // good signature
-        msg_len2 = msg_len1;
-        ret = Py_BuildValue("s#", msg, msg_len2);
-        PyMem_Free(msg);
-        return ret;
-    }
-    // bad signature. We do throw an exception when the signature is bad, so
-    // it can't be silently ignored
-    PyMem_Free(msg);
-    PyErr_SetString(BadSignatureError, "Bad Signature");
-    return NULL;
-}
-
-
-/* List of functions defined in the module */
-
-static PyMethodDef ed25519_methods[] = {
-    {"publickey",  ed25519_publickey,  METH_VARARGS, ed25519_publickey_doc},
-    {"sign",  ed25519_sign,  METH_VARARGS, ed25519_sign_doc},
-    {"open", ed25519_open, METH_VARARGS, ed25519_open_doc},
-    {NULL, NULL} /* sentinel */
-};
-
-PyDoc_STRVAR(module_doc,
-"Low-level Ed25519 signature/verification functions.");
-
-/* Initialization function for the module (*must* be called init_ed25519) */
-
-PyMODINIT_FUNC
-init_ed25519(void)
-{
-    PyObject *m;
-
-    /* Create the module and add the functions */
-    m = Py_InitModule3("_ed25519", ed25519_methods, module_doc);
-    if (m == NULL)
-        return;
-
-    /* Add some symbolic constants to the module */
-    if (BadSignatureError == NULL) {
-        BadSignatureError = PyErr_NewException("ed25519.BadSignatureError",
-                                               NULL, NULL);
-        if (BadSignatureError == NULL)
-            return;
-    }
-    if (SECRETKEYBYTESObject == NULL) {
-        SECRETKEYBYTESObject = PyInt_FromLong(SECRETKEYBYTES);
-        if (SECRETKEYBYTESObject == NULL)
-            return;
-    }
-    if (PUBLICKEYBYTESObject == NULL) {
-        PUBLICKEYBYTESObject = PyInt_FromLong(PUBLICKEYBYTES);
-        if (PUBLICKEYBYTESObject == NULL)
-            return;
-    }
-    if (SIGNATUREBYTESObject == NULL) {
-        SIGNATUREBYTESObject = PyInt_FromLong(SIGNATUREBYTES);
-        if (SIGNATUREBYTESObject == NULL)
-            return;
-    }
-    Py_INCREF(BadSignatureError);
-    PyModule_AddObject(m, "BadSignatureError", BadSignatureError);
-    PyModule_AddObject(m, "SECRETKEYBYTES", SECRETKEYBYTESObject);
-    PyModule_AddObject(m, "PUBLICKEYBYTES", PUBLICKEYBYTESObject);
-    PyModule_AddObject(m, "SIGNATUREKEYBYTES", SIGNATUREBYTESObject);
-}
diff --git a/src-ed25519/supercop-ref/Makefile b/src-ed25519/supercop-ref/Makefile
deleted file mode 100644
index 69b0d3b..0000000
--- a/src-ed25519/supercop-ref/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-
-CC=gcc
-CFLAGS=-O2 -Wall
-
-OBJS= fe25519.o ge25519.o sc25519.o sha512-blocks.o sha512-hash.o ed25519.o randombytes.o verify.o
-test: test.o $(OBJS)
-	gcc -o $@ $^
-
-clean:
-	rm -f *.o test
diff --git a/src-ed25519/supercop-ref/api.h b/src-ed25519/supercop-ref/api.h
deleted file mode 100644
index 1d0c988..0000000
--- a/src-ed25519/supercop-ref/api.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define CRYPTO_SECRETKEYBYTES 64
-#define CRYPTO_PUBLICKEYBYTES 32
-#define CRYPTO_BYTES 64
-
diff --git a/src-ed25519/supercop-ref/crypto_int32.h b/src-ed25519/supercop-ref/crypto_int32.h
deleted file mode 100644
index cae135e..0000000
--- a/src-ed25519/supercop-ref/crypto_int32.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef crypto_int32_h
-#define crypto_int32_h
-
-typedef int crypto_int32;
-
-#endif
diff --git a/src-ed25519/supercop-ref/crypto_sign.h b/src-ed25519/supercop-ref/crypto_sign.h
deleted file mode 100644
index afed208..0000000
--- a/src-ed25519/supercop-ref/crypto_sign.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef crypto_sign_edwards25519sha512batch_H
-#define crypto_sign_edwards25519sha512batch_H
-
-#define SECRETKEYBYTES 64
-#define PUBLICKEYBYTES 32
-#define SIGNATUREBYTES 64
-
-extern int crypto_sign(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
-extern int crypto_sign_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
-extern int crypto_sign_keypair(unsigned char *,unsigned char *);
-extern int crypto_sign_publickey(unsigned char *pk, unsigned char *sk, unsigned char *seed);
-
-#endif
diff --git a/src-ed25519/supercop-ref/crypto_uint32.h b/src-ed25519/supercop-ref/crypto_uint32.h
deleted file mode 100644
index 21020d7..0000000
--- a/src-ed25519/supercop-ref/crypto_uint32.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef crypto_uint32_h
-#define crypto_uint32_h
-
-typedef unsigned int crypto_uint32;
-
-#endif
diff --git a/src-ed25519/supercop-ref/crypto_verify_32.h b/src-ed25519/supercop-ref/crypto_verify_32.h
deleted file mode 100644
index ad265c7..0000000
--- a/src-ed25519/supercop-ref/crypto_verify_32.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef crypto_verify_32_H
-#define crypto_verify_32_H
-
-#define crypto_verify_32_ref_BYTES 32
-extern int crypto_verify_32(const unsigned char *,const unsigned char *);
-
-#endif
diff --git a/src-ed25519/supercop-ref/ed25519.c b/src-ed25519/supercop-ref/ed25519.c
deleted file mode 100644
index 925b894..0000000
--- a/src-ed25519/supercop-ref/ed25519.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include "crypto_sign.h"
-
-#include "crypto_verify_32.h"
-#include "sha512.h"
-
-#include "ge25519.h"
-
-static void get_hram(unsigned char *hram, const unsigned char *sm, const unsigned char *pk, unsigned char *playground, unsigned long long smlen)
-{
-  unsigned long long i;
-
-  for (i =  0;i < 32;++i)    playground[i] = sm[i];
-  for (i = 32;i < 64;++i)    playground[i] = pk[i-32];
-  for (i = 64;i < smlen;++i) playground[i] = sm[i];
-
-  crypto_hash_sha512(hram,playground,smlen);
-}
-
-
-int crypto_sign_publickey(
-    unsigned char *pk,  // write 32 bytes into this
-    unsigned char *sk,  // write 64 bytes into this (seed+pubkey)
-    unsigned char *seed // 32 bytes
-    )
-{
-  sc25519 scsk;
-  ge25519 gepk;
-  int i;
-
-  crypto_hash_sha512(sk, seed, 32);
-  sk[0] &= 248;
-  sk[31] &= 127;
-  sk[31] |= 64;
-
-  sc25519_from32bytes(&scsk,sk);
-  
-  ge25519_scalarmult_base(&gepk, &scsk);
-  ge25519_pack(pk, &gepk);
-  for(i=0;i<32;i++)
-    sk[32 + i] = pk[i];
-  for(i=0;i<32;i++)
-    sk[i] = seed[i];
-  return 0;
-}
-
-int crypto_sign(
-    unsigned char *sm,unsigned long long *smlen,
-    const unsigned char *m,unsigned long long mlen,
-    const unsigned char *sk
-    )
-{
-  sc25519 sck, scs, scsk;
-  ge25519 ger;
-  unsigned char r[32];
-  unsigned char s[32];
-  unsigned char extsk[64];
-  unsigned long long i;
-  unsigned char hmg[crypto_hash_sha512_BYTES];
-  unsigned char hram[crypto_hash_sha512_BYTES];
-
-  crypto_hash_sha512(extsk, sk, 32);
-  extsk[0] &= 248;
-  extsk[31] &= 127;
-  extsk[31] |= 64;
-
-  *smlen = mlen+64;
-  for(i=0;i<mlen;i++)
-    sm[64 + i] = m[i];
-  for(i=0;i<32;i++)
-    sm[32 + i] = extsk[32+i];
-
-  crypto_hash_sha512(hmg, sm+32, mlen+32); /* Generate k as h(extsk[32],...,extsk[63],m) */
-
-  /* Computation of R */
-  sc25519_from64bytes(&sck, hmg);
-  ge25519_scalarmult_base(&ger, &sck);
-  ge25519_pack(r, &ger);
-  
-  /* Computation of s */
-  for(i=0;i<32;i++)
-    sm[i] = r[i];
-
-  get_hram(hram, sm, sk+32, sm, mlen+64);
-
-  sc25519_from64bytes(&scs, hram);
-  sc25519_from32bytes(&scsk, extsk);
-  sc25519_mul(&scs, &scs, &scsk);
-  
-  sc25519_add(&scs, &scs, &sck);
-
-  sc25519_to32bytes(s,&scs); /* cat s */
-  for(i=0;i<32;i++)
-    sm[32 + i] = s[i]; 
-
-  return 0;
-}
-
-int crypto_sign_open(
-    unsigned char *m,unsigned long long *mlen,
-    const unsigned char *sm,unsigned long long smlen,
-    const unsigned char *pk
-    )
-{
-  int i, ret;
-  unsigned char t2[32];
-  ge25519 get1, get2;
-  sc25519 schram, scs;
-  unsigned char hram[crypto_hash_sha512_BYTES];
-
-  if (ge25519_unpackneg_vartime(&get1, pk)) return -1;
-
-  get_hram(hram,sm,pk,m,smlen);
-
-  sc25519_from64bytes(&schram, hram);
-
-  sc25519_from32bytes(&scs, sm+32);
-
-  ge25519_double_scalarmult_vartime(&get2, &get1, &schram, &ge25519_base, &scs);
-  ge25519_pack(t2, &get2);
-
-  ret = crypto_verify_32(sm, t2);
-
-  if (!ret)
-  {
-    for(i=0;i<smlen-64;i++)
-      m[i] = sm[i + 64];
-    *mlen = smlen-64;
-  }
-  else
-  {
-    for(i=0;i<smlen-64;i++)
-      m[i] = 0;
-    *mlen = (unsigned long long) -1;
-  }
-  return ret;
-}
diff --git a/src-ed25519/supercop-ref/fe25519.c b/src-ed25519/supercop-ref/fe25519.c
deleted file mode 100644
index b96764c..0000000
--- a/src-ed25519/supercop-ref/fe25519.c
+++ /dev/null
@@ -1,326 +0,0 @@
-#define WINDOWSIZE 1 /* Should be 1,2, or 4 */
-#define WINDOWMASK ((1<<WINDOWSIZE)-1)
-
-#include "fe25519.h"
-
-static crypto_uint32 equal(crypto_uint32 a,crypto_uint32 b) /* 16-bit inputs */
-{
-  crypto_uint32 x = a ^ b; /* 0: yes; 1..65535: no */
-  x -= 1; /* 4294967295: yes; 0..65534: no */
-  x >>= 31; /* 1: yes; 0: no */
-  return x;
-}
-
-static crypto_uint32 ge(crypto_uint32 a,crypto_uint32 b) /* 16-bit inputs */
-{
-  unsigned int x = a;
-  x -= (unsigned int) b; /* 0..65535: yes; 4294901761..4294967295: no */
-  x >>= 31; /* 0: yes; 1: no */
-  x ^= 1; /* 1: yes; 0: no */
-  return x;
-}
-
-static crypto_uint32 times19(crypto_uint32 a)
-{
-  return (a << 4) + (a << 1) + a;
-}
-
-static crypto_uint32 times38(crypto_uint32 a)
-{
-  return (a << 5) + (a << 2) + (a << 1);
-}
-
-static void reduce_add_sub(fe25519 *r)
-{
-  crypto_uint32 t;
-  int i,rep;
-
-  for(rep=0;rep<4;rep++)
-  {
-    t = r->v[31] >> 7;
-    r->v[31] &= 127;
-    t = times19(t);
-    r->v[0] += t;
-    for(i=0;i<31;i++)
-    {
-      t = r->v[i] >> 8;
-      r->v[i+1] += t;
-      r->v[i] &= 255;
-    }
-  }
-}
-
-static void reduce_mul(fe25519 *r)
-{
-  crypto_uint32 t;
-  int i,rep;
-
-  for(rep=0;rep<2;rep++)
-  {
-    t = r->v[31] >> 7;
-    r->v[31] &= 127;
-    t = times19(t);
-    r->v[0] += t;
-    for(i=0;i<31;i++)
-    {
-      t = r->v[i] >> 8;
-      r->v[i+1] += t;
-      r->v[i] &= 255;
-    }
-  }
-}
-
-/* reduction modulo 2^255-19 */
-void fe25519_freeze(fe25519 *r) 
-{
-  int i;
-  crypto_uint32 m = equal(r->v[31],127);
-  for(i=30;i>0;i--)
-    m &= equal(r->v[i],255);
-  m &= ge(r->v[0],237);
-
-  m = -m;
-
-  r->v[31] -= m&127;
-  for(i=30;i>0;i--)
-    r->v[i] -= m&255;
-  r->v[0] -= m&237;
-}
-
-void fe25519_unpack(fe25519 *r, const unsigned char x[32])
-{
-  int i;
-  for(i=0;i<32;i++) r->v[i] = x[i];
-  r->v[31] &= 127;
-}
-
-/* Assumes input x being reduced below 2^255 */
-void fe25519_pack(unsigned char r[32], const fe25519 *x)
-{
-  int i;
-  fe25519 y = *x;
-  fe25519_freeze(&y);
-  for(i=0;i<32;i++) 
-    r[i] = y.v[i];
-}
-
-int fe25519_iszero(const fe25519 *x)
-{
-  int i, r;
-  fe25519 t = *x;
-  fe25519_freeze(&t);
-  r = equal(t.v[0],0);
-  for(i=1;i<32;i++) 
-    r &= equal(t.v[i],0);
-  return r;
-}
-
-int fe25519_iseq_vartime(const fe25519 *x, const fe25519 *y)
-{
-  int i;
-  fe25519 t1 = *x;
-  fe25519 t2 = *y;
-  fe25519_freeze(&t1);
-  fe25519_freeze(&t2);
-  for(i=0;i<32;i++)
-    if(t1.v[i] != t2.v[i]) return 0;
-  return 1;
-}
-
-void fe25519_cmov(fe25519 *r, const fe25519 *x, unsigned char b)
-{
-  int i;
-  crypto_uint32 mask = b;
-  mask = -mask;
-  for(i=0;i<32;i++) r->v[i] ^= mask & (x->v[i] ^ r->v[i]);
-}
-
-unsigned char fe25519_getparity(const fe25519 *x)
-{
-  fe25519 t = *x;
-  fe25519_freeze(&t);
-  return t.v[0] & 1;
-}
-
-void fe25519_setone(fe25519 *r)
-{
-  int i;
-  r->v[0] = 1;
-  for(i=1;i<32;i++) r->v[i]=0;
-}
-
-void fe25519_setzero(fe25519 *r)
-{
-  int i;
-  for(i=0;i<32;i++) r->v[i]=0;
-}
-
-void fe25519_neg(fe25519 *r, const fe25519 *x)
-{
-  fe25519 t;
-  int i;
-  for(i=0;i<32;i++) t.v[i]=x->v[i];
-  fe25519_setzero(r);
-  fe25519_sub(r, r, &t);
-}
-
-void fe25519_add(fe25519 *r, const fe25519 *x, const fe25519 *y)
-{
-  int i;
-  for(i=0;i<32;i++) r->v[i] = x->v[i] + y->v[i];
-  reduce_add_sub(r);
-}
-
-void fe25519_sub(fe25519 *r, const fe25519 *x, const fe25519 *y)
-{
-  int i;
-  crypto_uint32 t[32];
-  t[0] = x->v[0] + 0x1da;
-  t[31] = x->v[31] + 0xfe;
-  for(i=1;i<31;i++) t[i] = x->v[i] + 0x1fe;
-  for(i=0;i<32;i++) r->v[i] = t[i] - y->v[i];
-  reduce_add_sub(r);
-}
-
-void fe25519_mul(fe25519 *r, const fe25519 *x, const fe25519 *y)
-{
-  int i,j;
-  crypto_uint32 t[63];
-  for(i=0;i<63;i++)t[i] = 0;
-
-  for(i=0;i<32;i++)
-    for(j=0;j<32;j++)
-      t[i+j] += x->v[i] * y->v[j];
-
-  for(i=32;i<63;i++)
-    r->v[i-32] = t[i-32] + times38(t[i]); 
-  r->v[31] = t[31]; /* result now in r[0]...r[31] */
-
-  reduce_mul(r);
-}
-
-void fe25519_square(fe25519 *r, const fe25519 *x)
-{
-  fe25519_mul(r, x, x);
-}
-
-void fe25519_invert(fe25519 *r, const fe25519 *x)
-{
-	fe25519 z2;
-	fe25519 z9;
-	fe25519 z11;
-	fe25519 z2_5_0;
-	fe25519 z2_10_0;
-	fe25519 z2_20_0;
-	fe25519 z2_50_0;
-	fe25519 z2_100_0;
-	fe25519 t0;
-	fe25519 t1;
-	int i;
-	
-	/* 2 */ fe25519_square(&z2,x);
-	/* 4 */ fe25519_square(&t1,&z2);
-	/* 8 */ fe25519_square(&t0,&t1);
-	/* 9 */ fe25519_mul(&z9,&t0,x);
-	/* 11 */ fe25519_mul(&z11,&z9,&z2);
-	/* 22 */ fe25519_square(&t0,&z11);
-	/* 2^5 - 2^0 = 31 */ fe25519_mul(&z2_5_0,&t0,&z9);
-
-	/* 2^6 - 2^1 */ fe25519_square(&t0,&z2_5_0);
-	/* 2^7 - 2^2 */ fe25519_square(&t1,&t0);
-	/* 2^8 - 2^3 */ fe25519_square(&t0,&t1);
-	/* 2^9 - 2^4 */ fe25519_square(&t1,&t0);
-	/* 2^10 - 2^5 */ fe25519_square(&t0,&t1);
-	/* 2^10 - 2^0 */ fe25519_mul(&z2_10_0,&t0,&z2_5_0);
-
-	/* 2^11 - 2^1 */ fe25519_square(&t0,&z2_10_0);
-	/* 2^12 - 2^2 */ fe25519_square(&t1,&t0);
-	/* 2^20 - 2^10 */ for (i = 2;i < 10;i += 2) { fe25519_square(&t0,&t1); fe25519_square(&t1,&t0); }
-	/* 2^20 - 2^0 */ fe25519_mul(&z2_20_0,&t1,&z2_10_0);
-
-	/* 2^21 - 2^1 */ fe25519_square(&t0,&z2_20_0);
-	/* 2^22 - 2^2 */ fe25519_square(&t1,&t0);
-	/* 2^40 - 2^20 */ for (i = 2;i < 20;i += 2) { fe25519_square(&t0,&t1); fe25519_square(&t1,&t0); }
-	/* 2^40 - 2^0 */ fe25519_mul(&t0,&t1,&z2_20_0);
-
-	/* 2^41 - 2^1 */ fe25519_square(&t1,&t0);
-	/* 2^42 - 2^2 */ fe25519_square(&t0,&t1);
-	/* 2^50 - 2^10 */ for (i = 2;i < 10;i += 2) { fe25519_square(&t1,&t0); fe25519_square(&t0,&t1); }
-	/* 2^50 - 2^0 */ fe25519_mul(&z2_50_0,&t0,&z2_10_0);
-
-	/* 2^51 - 2^1 */ fe25519_square(&t0,&z2_50_0);
-	/* 2^52 - 2^2 */ fe25519_square(&t1,&t0);
-	/* 2^100 - 2^50 */ for (i = 2;i < 50;i += 2) { fe25519_square(&t0,&t1); fe25519_square(&t1,&t0); }
-	/* 2^100 - 2^0 */ fe25519_mul(&z2_100_0,&t1,&z2_50_0);
-
-	/* 2^101 - 2^1 */ fe25519_square(&t1,&z2_100_0);
-	/* 2^102 - 2^2 */ fe25519_square(&t0,&t1);
-	/* 2^200 - 2^100 */ for (i = 2;i < 100;i += 2) { fe25519_square(&t1,&t0); fe25519_square(&t0,&t1); }
-	/* 2^200 - 2^0 */ fe25519_mul(&t1,&t0,&z2_100_0);
-
-	/* 2^201 - 2^1 */ fe25519_square(&t0,&t1);
-	/* 2^202 - 2^2 */ fe25519_square(&t1,&t0);
-	/* 2^250 - 2^50 */ for (i = 2;i < 50;i += 2) { fe25519_square(&t0,&t1); fe25519_square(&t1,&t0); }
-	/* 2^250 - 2^0 */ fe25519_mul(&t0,&t1,&z2_50_0);
-
-	/* 2^251 - 2^1 */ fe25519_square(&t1,&t0);
-	/* 2^252 - 2^2 */ fe25519_square(&t0,&t1);
-	/* 2^253 - 2^3 */ fe25519_square(&t1,&t0);
-	/* 2^254 - 2^4 */ fe25519_square(&t0,&t1);
-	/* 2^255 - 2^5 */ fe25519_square(&t1,&t0);
-	/* 2^255 - 21 */ fe25519_mul(r,&t1,&z11);
-}
-
-void fe25519_pow2523(fe25519 *r, const fe25519 *x)
-{
-	fe25519 z2;
-	fe25519 z9;
-	fe25519 z11;
-	fe25519 z2_5_0;
-	fe25519 z2_10_0;
-	fe25519 z2_20_0;
-	fe25519 z2_50_0;
-	fe25519 z2_100_0;
-	fe25519 t;
-	int i;
-		
-	/* 2 */ fe25519_square(&z2,x);
-	/* 4 */ fe25519_square(&t,&z2);
-	/* 8 */ fe25519_square(&t,&t);
-	/* 9 */ fe25519_mul(&z9,&t,x);
-	/* 11 */ fe25519_mul(&z11,&z9,&z2);
-	/* 22 */ fe25519_square(&t,&z11);
-	/* 2^5 - 2^0 = 31 */ fe25519_mul(&z2_5_0,&t,&z9);
-
-	/* 2^6 - 2^1 */ fe25519_square(&t,&z2_5_0);
-	/* 2^10 - 2^5 */ for (i = 1;i < 5;i++) { fe25519_square(&t,&t); }
-	/* 2^10 - 2^0 */ fe25519_mul(&z2_10_0,&t,&z2_5_0);
-
-	/* 2^11 - 2^1 */ fe25519_square(&t,&z2_10_0);
-	/* 2^20 - 2^10 */ for (i = 1;i < 10;i++) { fe25519_square(&t,&t); }
-	/* 2^20 - 2^0 */ fe25519_mul(&z2_20_0,&t,&z2_10_0);
-
-	/* 2^21 - 2^1 */ fe25519_square(&t,&z2_20_0);
-	/* 2^40 - 2^20 */ for (i = 1;i < 20;i++) { fe25519_square(&t,&t); }
-	/* 2^40 - 2^0 */ fe25519_mul(&t,&t,&z2_20_0);
-
-	/* 2^41 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^50 - 2^10 */ for (i = 1;i < 10;i++) { fe25519_square(&t,&t); }
-	/* 2^50 - 2^0 */ fe25519_mul(&z2_50_0,&t,&z2_10_0);
-
-	/* 2^51 - 2^1 */ fe25519_square(&t,&z2_50_0);
-	/* 2^100 - 2^50 */ for (i = 1;i < 50;i++) { fe25519_square(&t,&t); }
-	/* 2^100 - 2^0 */ fe25519_mul(&z2_100_0,&t,&z2_50_0);
-
-	/* 2^101 - 2^1 */ fe25519_square(&t,&z2_100_0);
-	/* 2^200 - 2^100 */ for (i = 1;i < 100;i++) { fe25519_square(&t,&t); }
-	/* 2^200 - 2^0 */ fe25519_mul(&t,&t,&z2_100_0);
-
-	/* 2^201 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^250 - 2^50 */ for (i = 1;i < 50;i++) { fe25519_square(&t,&t); }
-	/* 2^250 - 2^0 */ fe25519_mul(&t,&t,&z2_50_0);
-
-	/* 2^251 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^252 - 2^2 */ fe25519_square(&t,&t);
-	/* 2^252 - 3 */ fe25519_mul(r,&t,x);
-}
diff --git a/src-ed25519/supercop-ref/fe25519.h b/src-ed25519/supercop-ref/fe25519.h
deleted file mode 100644
index ef338e8..0000000
--- a/src-ed25519/supercop-ref/fe25519.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef FE25519_H
-#define FE25519_H
-
-#include "crypto_int32.h"
-#include "crypto_uint32.h"
-
-#define fe25519              crypto_sign_ed25519_ref_fe25519
-#define fe25519_freeze       crypto_sign_ed25519_ref_fe25519_freeze
-#define fe25519_unpack       crypto_sign_ed25519_ref_fe25519_unpack
-#define fe25519_pack         crypto_sign_ed25519_ref_fe25519_pack
-#define fe25519_iszero       crypto_sign_ed25519_ref_fe25519_iszero
-#define fe25519_iseq_vartime crypto_sign_ed25519_ref_fe25519_iseq_vartime
-#define fe25519_cmov         crypto_sign_ed25519_ref_fe25519_cmov
-#define fe25519_setone       crypto_sign_ed25519_ref_fe25519_setone
-#define fe25519_setzero      crypto_sign_ed25519_ref_fe25519_setzero
-#define fe25519_neg          crypto_sign_ed25519_ref_fe25519_neg
-#define fe25519_getparity    crypto_sign_ed25519_ref_fe25519_getparity
-#define fe25519_add          crypto_sign_ed25519_ref_fe25519_add
-#define fe25519_sub          crypto_sign_ed25519_ref_fe25519_sub
-#define fe25519_mul          crypto_sign_ed25519_ref_fe25519_mul
-#define fe25519_square       crypto_sign_ed25519_ref_fe25519_square
-#define fe25519_invert       crypto_sign_ed25519_ref_fe25519_invert
-#define fe25519_pow2523      crypto_sign_ed25519_ref_fe25519_pow2523
-
-typedef struct 
-{
-  crypto_uint32 v[32]; 
-}
-fe25519;
-
-void fe25519_freeze(fe25519 *r);
-
-void fe25519_unpack(fe25519 *r, const unsigned char x[32]);
-
-void fe25519_pack(unsigned char r[32], const fe25519 *x);
-
-int fe25519_iszero(const fe25519 *x);
-
-int fe25519_iseq_vartime(const fe25519 *x, const fe25519 *y);
-
-void fe25519_cmov(fe25519 *r, const fe25519 *x, unsigned char b);
-
-void fe25519_setone(fe25519 *r);
-
-void fe25519_setzero(fe25519 *r);
-
-void fe25519_neg(fe25519 *r, const fe25519 *x);
-
-unsigned char fe25519_getparity(const fe25519 *x);
-
-void fe25519_add(fe25519 *r, const fe25519 *x, const fe25519 *y);
-
-void fe25519_sub(fe25519 *r, const fe25519 *x, const fe25519 *y);
-
-void fe25519_mul(fe25519 *r, const fe25519 *x, const fe25519 *y);
-
-void fe25519_square(fe25519 *r, const fe25519 *x);
-
-void fe25519_invert(fe25519 *r, const fe25519 *x);
-
-void fe25519_pow2523(fe25519 *r, const fe25519 *x);
-
-#endif
diff --git a/src-ed25519/supercop-ref/ge25519.c b/src-ed25519/supercop-ref/ge25519.c
deleted file mode 100644
index 0ea7f15..0000000
--- a/src-ed25519/supercop-ref/ge25519.c
+++ /dev/null
@@ -1,311 +0,0 @@
-#include "fe25519.h"
-#include "sc25519.h"
-#include "ge25519.h"
-
-/* 
- * Arithmetic on the twisted Edwards curve -x^2 + y^2 = 1 + dx^2y^2 
- * with d = -(121665/121666) = 37095705934669439343138083508754565189542113879843219016388785533085940283555
- * Base point: (15112221349535400772501151409588531511454012693041857206046113283949847762202,46316835694926478169428394003475163141307993866256225615783033603165251855960);
- */
-
-/* d */
-static const fe25519 ge25519_ecd = {{0xA3, 0x78, 0x59, 0x13, 0xCA, 0x4D, 0xEB, 0x75, 0xAB, 0xD8, 0x41, 0x41, 0x4D, 0x0A, 0x70, 0x00, 
-                      0x98, 0xE8, 0x79, 0x77, 0x79, 0x40, 0xC7, 0x8C, 0x73, 0xFE, 0x6F, 0x2B, 0xEE, 0x6C, 0x03, 0x52}};
-/* 2*d */
-static const fe25519 ge25519_ec2d = {{0x59, 0xF1, 0xB2, 0x26, 0x94, 0x9B, 0xD6, 0xEB, 0x56, 0xB1, 0x83, 0x82, 0x9A, 0x14, 0xE0, 0x00, 
-                       0x30, 0xD1, 0xF3, 0xEE, 0xF2, 0x80, 0x8E, 0x19, 0xE7, 0xFC, 0xDF, 0x56, 0xDC, 0xD9, 0x06, 0x24}};
-/* sqrt(-1) */
-static const fe25519 ge25519_sqrtm1 = {{0xB0, 0xA0, 0x0E, 0x4A, 0x27, 0x1B, 0xEE, 0xC4, 0x78, 0xE4, 0x2F, 0xAD, 0x06, 0x18, 0x43, 0x2F, 
-                         0xA7, 0xD7, 0xFB, 0x3D, 0x99, 0x00, 0x4D, 0x2B, 0x0B, 0xDF, 0xC1, 0x4F, 0x80, 0x24, 0x83, 0x2B}};
-
-#define ge25519_p3 ge25519
-
-typedef struct
-{
-  fe25519 x;
-  fe25519 z;
-  fe25519 y;
-  fe25519 t;
-} ge25519_p1p1;
-
-typedef struct
-{
-  fe25519 x;
-  fe25519 y;
-  fe25519 z;
-} ge25519_p2;
-
-typedef struct
-{
-  fe25519 x;
-  fe25519 y;
-} ge25519_aff;
-
-
-/* Packed coordinates of the base point */
-const ge25519 ge25519_base = {{{0x1A, 0xD5, 0x25, 0x8F, 0x60, 0x2D, 0x56, 0xC9, 0xB2, 0xA7, 0x25, 0x95, 0x60, 0xC7, 0x2C, 0x69, 
-                                0x5C, 0xDC, 0xD6, 0xFD, 0x31, 0xE2, 0xA4, 0xC0, 0xFE, 0x53, 0x6E, 0xCD, 0xD3, 0x36, 0x69, 0x21}},
-                              {{0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
-                                0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}},
-                              {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
-                              {{0xA3, 0xDD, 0xB7, 0xA5, 0xB3, 0x8A, 0xDE, 0x6D, 0xF5, 0x52, 0x51, 0x77, 0x80, 0x9F, 0xF0, 0x20, 
-                                0x7D, 0xE3, 0xAB, 0x64, 0x8E, 0x4E, 0xEA, 0x66, 0x65, 0x76, 0x8B, 0xD7, 0x0F, 0x5F, 0x87, 0x67}}};
-
-/* Multiples of the base point in affine representation */
-static const ge25519_aff ge25519_base_multiples_affine[425] = {
-#include "ge25519_base.data"
-};
-
-static void p1p1_to_p2(ge25519_p2 *r, const ge25519_p1p1 *p)
-{
-  fe25519_mul(&r->x, &p->x, &p->t);
-  fe25519_mul(&r->y, &p->y, &p->z);
-  fe25519_mul(&r->z, &p->z, &p->t);
-}
-
-static void p1p1_to_p3(ge25519_p3 *r, const ge25519_p1p1 *p)
-{
-  p1p1_to_p2((ge25519_p2 *)r, p);
-  fe25519_mul(&r->t, &p->x, &p->y);
-}
-
-static void ge25519_mixadd2(ge25519_p3 *r, const ge25519_aff *q)
-{
-  fe25519 a,b,t1,t2,c,d,e,f,g,h,qt;
-  fe25519_mul(&qt, &q->x, &q->y);
-  fe25519_sub(&a, &r->y, &r->x); /* A = (Y1-X1)*(Y2-X2) */
-  fe25519_add(&b, &r->y, &r->x); /* B = (Y1+X1)*(Y2+X2) */
-  fe25519_sub(&t1, &q->y, &q->x);
-  fe25519_add(&t2, &q->y, &q->x);
-  fe25519_mul(&a, &a, &t1);
-  fe25519_mul(&b, &b, &t2);
-  fe25519_sub(&e, &b, &a); /* E = B-A */
-  fe25519_add(&h, &b, &a); /* H = B+A */
-  fe25519_mul(&c, &r->t, &qt); /* C = T1*k*T2 */
-  fe25519_mul(&c, &c, &ge25519_ec2d);
-  fe25519_add(&d, &r->z, &r->z); /* D = Z1*2 */
-  fe25519_sub(&f, &d, &c); /* F = D-C */
-  fe25519_add(&g, &d, &c); /* G = D+C */
-  fe25519_mul(&r->x, &e, &f);
-  fe25519_mul(&r->y, &h, &g);
-  fe25519_mul(&r->z, &g, &f);
-  fe25519_mul(&r->t, &e, &h);
-}
-
-static void add_p1p1(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_p3 *q)
-{
-  fe25519 a, b, c, d, t;
-  
-  fe25519_sub(&a, &p->y, &p->x); /* A = (Y1-X1)*(Y2-X2) */
-  fe25519_sub(&t, &q->y, &q->x);
-  fe25519_mul(&a, &a, &t);
-  fe25519_add(&b, &p->x, &p->y); /* B = (Y1+X1)*(Y2+X2) */
-  fe25519_add(&t, &q->x, &q->y);
-  fe25519_mul(&b, &b, &t);
-  fe25519_mul(&c, &p->t, &q->t); /* C = T1*k*T2 */
-  fe25519_mul(&c, &c, &ge25519_ec2d);
-  fe25519_mul(&d, &p->z, &q->z); /* D = Z1*2*Z2 */
-  fe25519_add(&d, &d, &d);
-  fe25519_sub(&r->x, &b, &a); /* E = B-A */
-  fe25519_sub(&r->t, &d, &c); /* F = D-C */
-  fe25519_add(&r->z, &d, &c); /* G = D+C */
-  fe25519_add(&r->y, &b, &a); /* H = B+A */
-}
-
-/* See http://www.hyperelliptic.org/EFD/g1p/auto-twisted-extended-1.html#doubling-dbl-2008-hwcd */
-static void dbl_p1p1(ge25519_p1p1 *r, const ge25519_p2 *p)
-{
-  fe25519 a,b,c,d;
-  fe25519_square(&a, &p->x);
-  fe25519_square(&b, &p->y);
-  fe25519_square(&c, &p->z);
-  fe25519_add(&c, &c, &c);
-  fe25519_neg(&d, &a);
-
-  fe25519_add(&r->x, &p->x, &p->y);
-  fe25519_square(&r->x, &r->x);
-  fe25519_sub(&r->x, &r->x, &a);
-  fe25519_sub(&r->x, &r->x, &b);
-  fe25519_add(&r->z, &d, &b);
-  fe25519_sub(&r->t, &r->z, &c);
-  fe25519_sub(&r->y, &d, &b);
-}
-
-/* Constant-time version of: if(b) r = p */
-static void cmov_aff(ge25519_aff *r, const ge25519_aff *p, unsigned char b)
-{
-  fe25519_cmov(&r->x, &p->x, b);
-  fe25519_cmov(&r->y, &p->y, b);
-}
-
-static unsigned char equal(signed char b,signed char c)
-{
-  unsigned char ub = b;
-  unsigned char uc = c;
-  unsigned char x = ub ^ uc; /* 0: yes; 1..255: no */
-  crypto_uint32 y = x; /* 0: yes; 1..255: no */
-  y -= 1; /* 4294967295: yes; 0..254: no */
-  y >>= 31; /* 1: yes; 0: no */
-  return y;
-}
-
-static unsigned char negative(signed char b)
-{
-  unsigned long long x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */
-  x >>= 63; /* 1: yes; 0: no */
-  return x;
-}
-
-static void choose_t(ge25519_aff *t, unsigned long long pos, signed char b)
-{
-  /* constant time */
-  fe25519 v;
-  *t = ge25519_base_multiples_affine[5*pos+0];
-  cmov_aff(t, &ge25519_base_multiples_affine[5*pos+1],equal(b,1) | equal(b,-1));
-  cmov_aff(t, &ge25519_base_multiples_affine[5*pos+2],equal(b,2) | equal(b,-2));
-  cmov_aff(t, &ge25519_base_multiples_affine[5*pos+3],equal(b,3) | equal(b,-3));
-  cmov_aff(t, &ge25519_base_multiples_affine[5*pos+4],equal(b,-4));
-  fe25519_neg(&v, &t->x);
-  fe25519_cmov(&t->x, &v, negative(b));
-}
-
-static void setneutral(ge25519 *r)
-{
-  fe25519_setzero(&r->x);
-  fe25519_setone(&r->y);
-  fe25519_setone(&r->z);
-  fe25519_setzero(&r->t);
-}
-
-/* ********************************************************************
- *                    EXPORTED FUNCTIONS
- ******************************************************************** */
-
-/* return 0 on success, -1 otherwise */
-int ge25519_unpackneg_vartime(ge25519_p3 *r, const unsigned char p[32])
-{
-  unsigned char par;
-  fe25519 t, chk, num, den, den2, den4, den6;
-  fe25519_setone(&r->z);
-  par = p[31] >> 7;
-  fe25519_unpack(&r->y, p); 
-  fe25519_square(&num, &r->y); /* x = y^2 */
-  fe25519_mul(&den, &num, &ge25519_ecd); /* den = dy^2 */
-  fe25519_sub(&num, &num, &r->z); /* x = y^2-1 */
-  fe25519_add(&den, &r->z, &den); /* den = dy^2+1 */
-
-  /* Computation of sqrt(num/den) */
-  /* 1.: computation of num^((p-5)/8)*den^((7p-35)/8) = (num*den^7)^((p-5)/8) */
-  fe25519_square(&den2, &den);
-  fe25519_square(&den4, &den2);
-  fe25519_mul(&den6, &den4, &den2);
-  fe25519_mul(&t, &den6, &num);
-  fe25519_mul(&t, &t, &den);
-
-  fe25519_pow2523(&t, &t);
-  /* 2. computation of r->x = t * num * den^3 */
-  fe25519_mul(&t, &t, &num);
-  fe25519_mul(&t, &t, &den);
-  fe25519_mul(&t, &t, &den);
-  fe25519_mul(&r->x, &t, &den);
-
-  /* 3. Check whether sqrt computation gave correct result, multiply by sqrt(-1) if not: */
-  fe25519_square(&chk, &r->x);
-  fe25519_mul(&chk, &chk, &den);
-  if (!fe25519_iseq_vartime(&chk, &num))
-    fe25519_mul(&r->x, &r->x, &ge25519_sqrtm1);
-
-  /* 4. Now we have one of the two square roots, except if input was not a square */
-  fe25519_square(&chk, &r->x);
-  fe25519_mul(&chk, &chk, &den);
-  if (!fe25519_iseq_vartime(&chk, &num))
-    return -1;
-
-  /* 5. Choose the desired square root according to parity: */
-  if(fe25519_getparity(&r->x) != (1-par))
-    fe25519_neg(&r->x, &r->x);
-
-  fe25519_mul(&r->t, &r->x, &r->y);
-  return 0;
-}
-
-void ge25519_pack(unsigned char r[32], const ge25519_p3 *p)
-{
-  fe25519 tx, ty, zi;
-  fe25519_invert(&zi, &p->z); 
-  fe25519_mul(&tx, &p->x, &zi);
-  fe25519_mul(&ty, &p->y, &zi);
-  fe25519_pack(r, &ty);
-  r[31] ^= fe25519_getparity(&tx) << 7;
-}
-
-int ge25519_isneutral_vartime(const ge25519_p3 *p)
-{
-  int ret = 1;
-  if(!fe25519_iszero(&p->x)) ret = 0;
-  if(!fe25519_iseq_vartime(&p->y, &p->z)) ret = 0;
-  return ret;
-}
-
-/* computes [s1]p1 + [s2]p2 */
-void ge25519_double_scalarmult_vartime(ge25519_p3 *r, const ge25519_p3 *p1, const sc25519 *s1, const ge25519_p3 *p2, const sc25519 *s2)
-{
-  ge25519_p1p1 tp1p1;
-  ge25519_p3 pre[16];
-  unsigned char b[127];
-  int i;
-
-  /* precomputation                                                        s2 s1 */
-  setneutral(pre);                                                      /* 00 00 */
-  pre[1] = *p1;                                                         /* 00 01 */
-  dbl_p1p1(&tp1p1,(ge25519_p2 *)p1);      p1p1_to_p3( &pre[2], &tp1p1); /* 00 10 */
-  add_p1p1(&tp1p1,&pre[1], &pre[2]);      p1p1_to_p3( &pre[3], &tp1p1); /* 00 11 */
-  pre[4] = *p2;                                                         /* 01 00 */
-  add_p1p1(&tp1p1,&pre[1], &pre[4]);      p1p1_to_p3( &pre[5], &tp1p1); /* 01 01 */
-  add_p1p1(&tp1p1,&pre[2], &pre[4]);      p1p1_to_p3( &pre[6], &tp1p1); /* 01 10 */
-  add_p1p1(&tp1p1,&pre[3], &pre[4]);      p1p1_to_p3( &pre[7], &tp1p1); /* 01 11 */
-  dbl_p1p1(&tp1p1,(ge25519_p2 *)p2);      p1p1_to_p3( &pre[8], &tp1p1); /* 10 00 */
-  add_p1p1(&tp1p1,&pre[1], &pre[8]);      p1p1_to_p3( &pre[9], &tp1p1); /* 10 01 */
-  dbl_p1p1(&tp1p1,(ge25519_p2 *)&pre[5]); p1p1_to_p3(&pre[10], &tp1p1); /* 10 10 */
-  add_p1p1(&tp1p1,&pre[3], &pre[8]);      p1p1_to_p3(&pre[11], &tp1p1); /* 10 11 */
-  add_p1p1(&tp1p1,&pre[4], &pre[8]);      p1p1_to_p3(&pre[12], &tp1p1); /* 11 00 */
-  add_p1p1(&tp1p1,&pre[1],&pre[12]);      p1p1_to_p3(&pre[13], &tp1p1); /* 11 01 */
-  add_p1p1(&tp1p1,&pre[2],&pre[12]);      p1p1_to_p3(&pre[14], &tp1p1); /* 11 10 */
-  add_p1p1(&tp1p1,&pre[3],&pre[12]);      p1p1_to_p3(&pre[15], &tp1p1); /* 11 11 */
-
-  sc25519_2interleave2(b,s1,s2);
-
-  /* scalar multiplication */
-  *r = pre[b[126]];
-  for(i=125;i>=0;i--)
-  {
-    dbl_p1p1(&tp1p1, (ge25519_p2 *)r);
-    p1p1_to_p2((ge25519_p2 *) r, &tp1p1);
-    dbl_p1p1(&tp1p1, (ge25519_p2 *)r);
-    if(b[i]!=0)
-    {
-      p1p1_to_p3(r, &tp1p1);
-      add_p1p1(&tp1p1, r, &pre[b[i]]);
-    }
-    if(i != 0) p1p1_to_p2((ge25519_p2 *)r, &tp1p1);
-    else p1p1_to_p3(r, &tp1p1);
-  }
-}
-
-void ge25519_scalarmult_base(ge25519_p3 *r, const sc25519 *s)
-{
-  signed char b[85];
-  int i;
-  ge25519_aff t;
-  sc25519_window3(b,s);
-
-  choose_t((ge25519_aff *)r, 0, b[0]);
-  fe25519_setone(&r->z);
-  fe25519_mul(&r->t, &r->x, &r->y);
-  for(i=1;i<85;i++)
-  {
-    choose_t(&t, (unsigned long long) i, b[i]);
-    ge25519_mixadd2(r, &t);
-  }
-}
diff --git a/src-ed25519/supercop-ref/ge25519.h b/src-ed25519/supercop-ref/ge25519.h
deleted file mode 100644
index 18519d2..0000000
--- a/src-ed25519/supercop-ref/ge25519.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef GE25519_H
-#define GE25519_H
-
-#include "fe25519.h"
-#include "sc25519.h"
-
-#define ge25519                           crypto_sign_ed25519_ref_ge25519
-#define ge25519_base                      crypto_sign_ed25519_ref_ge25519_base
-#define ge25519_unpackneg_vartime         crypto_sign_ed25519_ref_unpackneg_vartime
-#define ge25519_pack                      crypto_sign_ed25519_ref_pack
-#define ge25519_isneutral_vartime         crypto_sign_ed25519_ref_isneutral_vartime
-#define ge25519_double_scalarmult_vartime crypto_sign_ed25519_ref_double_scalarmult_vartime
-#define ge25519_scalarmult_base           crypto_sign_ed25519_ref_scalarmult_base
-
-typedef struct
-{
-  fe25519 x;
-  fe25519 y;
-  fe25519 z;
-  fe25519 t;
-} ge25519;
-
-extern const ge25519 ge25519_base;
-
-int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]);
-
-void ge25519_pack(unsigned char r[32], const ge25519 *p);
-
-int ge25519_isneutral_vartime(const ge25519 *p);
-
-void ge25519_double_scalarmult_vartime(ge25519 *r, const ge25519 *p1, const sc25519 *s1, const ge25519 *p2, const sc25519 *s2);
-
-void ge25519_scalarmult_base(ge25519 *r, const sc25519 *s);
-
-#endif
diff --git a/src-ed25519/supercop-ref/ge25519_base.data b/src-ed25519/supercop-ref/ge25519_base.data
deleted file mode 100644
index d2ef2c1..0000000
--- a/src-ed25519/supercop-ref/ge25519_base.data
+++ /dev/null
@@ -1,850 +0,0 @@
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x1a, 0xd5, 0x25, 0x8f, 0x60, 0x2d, 0x56, 0xc9, 0xb2, 0xa7, 0x25, 0x95, 0x60, 0xc7, 0x2c, 0x69, 0x5c, 0xdc, 0xd6, 0xfd, 0x31, 0xe2, 0xa4, 0xc0, 0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21}} ,
- {{0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}}},
-{{{0x0e, 0xce, 0x43, 0x28, 0x4e, 0xa1, 0xc5, 0x83, 0x5f, 0xa4, 0xd7, 0x15, 0x45, 0x8e, 0x0d, 0x08, 0xac, 0xe7, 0x33, 0x18, 0x7d, 0x3b, 0x04, 0x3d, 0x6c, 0x04, 0x5a, 0x9f, 0x4c, 0x38, 0xab, 0x36}} ,
- {{0xc9, 0xa3, 0xf8, 0x6a, 0xae, 0x46, 0x5f, 0x0e, 0x56, 0x51, 0x38, 0x64, 0x51, 0x0f, 0x39, 0x97, 0x56, 0x1f, 0xa2, 0xc9, 0xe8, 0x5e, 0xa2, 0x1d, 0xc2, 0x29, 0x23, 0x09, 0xf3, 0xcd, 0x60, 0x22}}},
-{{{0x5c, 0xe2, 0xf8, 0xd3, 0x5f, 0x48, 0x62, 0xac, 0x86, 0x48, 0x62, 0x81, 0x19, 0x98, 0x43, 0x63, 0x3a, 0xc8, 0xda, 0x3e, 0x74, 0xae, 0xf4, 0x1f, 0x49, 0x8f, 0x92, 0x22, 0x4a, 0x9c, 0xae, 0x67}} ,
- {{0xd4, 0xb4, 0xf5, 0x78, 0x48, 0x68, 0xc3, 0x02, 0x04, 0x03, 0x24, 0x67, 0x17, 0xec, 0x16, 0x9f, 0xf7, 0x9e, 0x26, 0x60, 0x8e, 0xa1, 0x26, 0xa1, 0xab, 0x69, 0xee, 0x77, 0xd1, 0xb1, 0x67, 0x12}}},
-{{{0x70, 0xf8, 0xc9, 0xc4, 0x57, 0xa6, 0x3a, 0x49, 0x47, 0x15, 0xce, 0x93, 0xc1, 0x9e, 0x73, 0x1a, 0xf9, 0x20, 0x35, 0x7a, 0xb8, 0xd4, 0x25, 0x83, 0x46, 0xf1, 0xcf, 0x56, 0xdb, 0xa8, 0x3d, 0x20}} ,
- {{0x2f, 0x11, 0x32, 0xca, 0x61, 0xab, 0x38, 0xdf, 0xf0, 0x0f, 0x2f, 0xea, 0x32, 0x28, 0xf2, 0x4c, 0x6c, 0x71, 0xd5, 0x80, 0x85, 0xb8, 0x0e, 0x47, 0xe1, 0x95, 0x15, 0xcb, 0x27, 0xe8, 0xd0, 0x47}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xc8, 0x84, 0xa5, 0x08, 0xbc, 0xfd, 0x87, 0x3b, 0x99, 0x8b, 0x69, 0x80, 0x7b, 0xc6, 0x3a, 0xeb, 0x93, 0xcf, 0x4e, 0xf8, 0x5c, 0x2d, 0x86, 0x42, 0xb6, 0x71, 0xd7, 0x97, 0x5f, 0xe1, 0x42, 0x67}} ,
- {{0xb4, 0xb9, 0x37, 0xfc, 0xa9, 0x5b, 0x2f, 0x1e, 0x93, 0xe4, 0x1e, 0x62, 0xfc, 0x3c, 0x78, 0x81, 0x8f, 0xf3, 0x8a, 0x66, 0x09, 0x6f, 0xad, 0x6e, 0x79, 0x73, 0xe5, 0xc9, 0x00, 0x06, 0xd3, 0x21}}},
-{{{0xf8, 0xf9, 0x28, 0x6c, 0x6d, 0x59, 0xb2, 0x59, 0x74, 0x23, 0xbf, 0xe7, 0x33, 0x8d, 0x57, 0x09, 0x91, 0x9c, 0x24, 0x08, 0x15, 0x2b, 0xe2, 0xb8, 0xee, 0x3a, 0xe5, 0x27, 0x06, 0x86, 0xa4, 0x23}} ,
- {{0xeb, 0x27, 0x67, 0xc1, 0x37, 0xab, 0x7a, 0xd8, 0x27, 0x9c, 0x07, 0x8e, 0xff, 0x11, 0x6a, 0xb0, 0x78, 0x6e, 0xad, 0x3a, 0x2e, 0x0f, 0x98, 0x9f, 0x72, 0xc3, 0x7f, 0x82, 0xf2, 0x96, 0x96, 0x70}}},
-{{{0x81, 0x6b, 0x88, 0xe8, 0x1e, 0xc7, 0x77, 0x96, 0x0e, 0xa1, 0xa9, 0x52, 0xe0, 0xd8, 0x0e, 0x61, 0x9e, 0x79, 0x2d, 0x95, 0x9c, 0x8d, 0x96, 0xe0, 0x06, 0x40, 0x5d, 0x87, 0x28, 0x5f, 0x98, 0x70}} ,
- {{0xf1, 0x79, 0x7b, 0xed, 0x4f, 0x44, 0xb2, 0xe7, 0x08, 0x0d, 0xc2, 0x08, 0x12, 0xd2, 0x9f, 0xdf, 0xcd, 0x93, 0x20, 0x8a, 0xcf, 0x33, 0xca, 0x6d, 0x89, 0xb9, 0x77, 0xc8, 0x93, 0x1b, 0x4e, 0x60}}},
-{{{0x26, 0x4f, 0x7e, 0x97, 0xf6, 0x40, 0xdd, 0x4f, 0xfc, 0x52, 0x78, 0xf9, 0x90, 0x31, 0x03, 0xe6, 0x7d, 0x56, 0x39, 0x0b, 0x1d, 0x56, 0x82, 0x85, 0xf9, 0x1a, 0x42, 0x17, 0x69, 0x6c, 0xcf, 0x39}} ,
- {{0x69, 0xd2, 0x06, 0x3a, 0x4f, 0x39, 0x2d, 0xf9, 0x38, 0x40, 0x8c, 0x4c, 0xe7, 0x05, 0x12, 0xb4, 0x78, 0x8b, 0xf8, 0xc0, 0xec, 0x93, 0xde, 0x7a, 0x6b, 0xce, 0x2c, 0xe1, 0x0e, 0xa9, 0x34, 0x44}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x0b, 0xa4, 0x3c, 0xb0, 0x0f, 0x7a, 0x51, 0xf1, 0x78, 0xd6, 0xd9, 0x6a, 0xfd, 0x46, 0xe8, 0xb8, 0xa8, 0x79, 0x1d, 0x87, 0xf9, 0x90, 0xf2, 0x9c, 0x13, 0x29, 0xf8, 0x0b, 0x20, 0x64, 0xfa, 0x05}} ,
- {{0x26, 0x09, 0xda, 0x17, 0xaf, 0x95, 0xd6, 0xfb, 0x6a, 0x19, 0x0d, 0x6e, 0x5e, 0x12, 0xf1, 0x99, 0x4c, 0xaa, 0xa8, 0x6f, 0x79, 0x86, 0xf4, 0x72, 0x28, 0x00, 0x26, 0xf9, 0xea, 0x9e, 0x19, 0x3d}}},
-{{{0x87, 0xdd, 0xcf, 0xf0, 0x5b, 0x49, 0xa2, 0x5d, 0x40, 0x7a, 0x23, 0x26, 0xa4, 0x7a, 0x83, 0x8a, 0xb7, 0x8b, 0xd2, 0x1a, 0xbf, 0xea, 0x02, 0x24, 0x08, 0x5f, 0x7b, 0xa9, 0xb1, 0xbe, 0x9d, 0x37}} ,
- {{0xfc, 0x86, 0x4b, 0x08, 0xee, 0xe7, 0xa0, 0xfd, 0x21, 0x45, 0x09, 0x34, 0xc1, 0x61, 0x32, 0x23, 0xfc, 0x9b, 0x55, 0x48, 0x53, 0x99, 0xf7, 0x63, 0xd0, 0x99, 0xce, 0x01, 0xe0, 0x9f, 0xeb, 0x28}}},
-{{{0x47, 0xfc, 0xab, 0x5a, 0x17, 0xf0, 0x85, 0x56, 0x3a, 0x30, 0x86, 0x20, 0x28, 0x4b, 0x8e, 0x44, 0x74, 0x3a, 0x6e, 0x02, 0xf1, 0x32, 0x8f, 0x9f, 0x3f, 0x08, 0x35, 0xe9, 0xca, 0x16, 0x5f, 0x6e}} ,
- {{0x1c, 0x59, 0x1c, 0x65, 0x5d, 0x34, 0xa4, 0x09, 0xcd, 0x13, 0x9c, 0x70, 0x7d, 0xb1, 0x2a, 0xc5, 0x88, 0xaf, 0x0b, 0x60, 0xc7, 0x9f, 0x34, 0x8d, 0xd6, 0xb7, 0x7f, 0xea, 0x78, 0x65, 0x8d, 0x77}}},
-{{{0x56, 0xa5, 0xc2, 0x0c, 0xdd, 0xbc, 0xb8, 0x20, 0x6d, 0x57, 0x61, 0xb5, 0xfb, 0x78, 0xb5, 0xd4, 0x49, 0x54, 0x90, 0x26, 0xc1, 0xcb, 0xe9, 0xe6, 0xbf, 0xec, 0x1d, 0x4e, 0xed, 0x07, 0x7e, 0x5e}} ,
- {{0xc7, 0xf6, 0x6c, 0x56, 0x31, 0x20, 0x14, 0x0e, 0xa8, 0xd9, 0x27, 0xc1, 0x9a, 0x3d, 0x1b, 0x7d, 0x0e, 0x26, 0xd3, 0x81, 0xaa, 0xeb, 0xf5, 0x6b, 0x79, 0x02, 0xf1, 0x51, 0x5c, 0x75, 0x55, 0x0f}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x0a, 0x34, 0xcd, 0x82, 0x3c, 0x33, 0x09, 0x54, 0xd2, 0x61, 0x39, 0x30, 0x9b, 0xfd, 0xef, 0x21, 0x26, 0xd4, 0x70, 0xfa, 0xee, 0xf9, 0x31, 0x33, 0x73, 0x84, 0xd0, 0xb3, 0x81, 0xbf, 0xec, 0x2e}} ,
- {{0xe8, 0x93, 0x8b, 0x00, 0x64, 0xf7, 0x9c, 0xb8, 0x74, 0xe0, 0xe6, 0x49, 0x48, 0x4d, 0x4d, 0x48, 0xb6, 0x19, 0xa1, 0x40, 0xb7, 0xd9, 0x32, 0x41, 0x7c, 0x82, 0x37, 0xa1, 0x2d, 0xdc, 0xd2, 0x54}}},
-{{{0x68, 0x2b, 0x4a, 0x5b, 0xd5, 0xc7, 0x51, 0x91, 0x1d, 0xe1, 0x2a, 0x4b, 0xc4, 0x47, 0xf1, 0xbc, 0x7a, 0xb3, 0xcb, 0xc8, 0xb6, 0x7c, 0xac, 0x90, 0x05, 0xfd, 0xf3, 0xf9, 0x52, 0x3a, 0x11, 0x6b}} ,
- {{0x3d, 0xc1, 0x27, 0xf3, 0x59, 0x43, 0x95, 0x90, 0xc5, 0x96, 0x79, 0xf5, 0xf4, 0x95, 0x65, 0x29, 0x06, 0x9c, 0x51, 0x05, 0x18, 0xda, 0xb8, 0x2e, 0x79, 0x7e, 0x69, 0x59, 0x71, 0x01, 0xeb, 0x1a}}},
-{{{0x15, 0x06, 0x49, 0xb6, 0x8a, 0x3c, 0xea, 0x2f, 0x34, 0x20, 0x14, 0xc3, 0xaa, 0xd6, 0xaf, 0x2c, 0x3e, 0xbd, 0x65, 0x20, 0xe2, 0x4d, 0x4b, 0x3b, 0xeb, 0x9f, 0x4a, 0xc3, 0xad, 0xa4, 0x3b, 0x60}} ,
- {{0xbc, 0x58, 0xe6, 0xc0, 0x95, 0x2a, 0x2a, 0x81, 0x9a, 0x7a, 0xf3, 0xd2, 0x06, 0xbe, 0x48, 0xbc, 0x0c, 0xc5, 0x46, 0xe0, 0x6a, 0xd4, 0xac, 0x0f, 0xd9, 0xcc, 0x82, 0x34, 0x2c, 0xaf, 0xdb, 0x1f}}},
-{{{0xf7, 0x17, 0x13, 0xbd, 0xfb, 0xbc, 0xd2, 0xec, 0x45, 0xb3, 0x15, 0x31, 0xe9, 0xaf, 0x82, 0x84, 0x3d, 0x28, 0xc6, 0xfc, 0x11, 0xf5, 0x41, 0xb5, 0x8b, 0xd3, 0x12, 0x76, 0x52, 0xe7, 0x1a, 0x3c}} ,
- {{0x4e, 0x36, 0x11, 0x07, 0xa2, 0x15, 0x20, 0x51, 0xc4, 0x2a, 0xc3, 0x62, 0x8b, 0x5e, 0x7f, 0xa6, 0x0f, 0xf9, 0x45, 0x85, 0x6c, 0x11, 0x86, 0xb7, 0x7e, 0xe5, 0xd7, 0xf9, 0xc3, 0x91, 0x1c, 0x05}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xea, 0xd6, 0xde, 0x29, 0x3a, 0x00, 0xb9, 0x02, 0x59, 0xcb, 0x26, 0xc4, 0xba, 0x99, 0xb1, 0x97, 0x2f, 0x8e, 0x00, 0x92, 0x26, 0x4f, 0x52, 0xeb, 0x47, 0x1b, 0x89, 0x8b, 0x24, 0xc0, 0x13, 0x7d}} ,
- {{0xd5, 0x20, 0x5b, 0x80, 0xa6, 0x80, 0x20, 0x95, 0xc3, 0xe9, 0x9f, 0x8e, 0x87, 0x9e, 0x1e, 0x9e, 0x7a, 0xc7, 0xcc, 0x75, 0x6c, 0xa5, 0xf1, 0x91, 0x1a, 0xa8, 0x01, 0x2c, 0xab, 0x76, 0xa9, 0x59}}},
-{{{0xde, 0xc9, 0xb1, 0x31, 0x10, 0x16, 0xaa, 0x35, 0x14, 0x6a, 0xd4, 0xb5, 0x34, 0x82, 0x71, 0xd2, 0x4a, 0x5d, 0x9a, 0x1f, 0x53, 0x26, 0x3c, 0xe5, 0x8e, 0x8d, 0x33, 0x7f, 0xff, 0xa9, 0xd5, 0x17}} ,
- {{0x89, 0xaf, 0xf6, 0xa4, 0x64, 0xd5, 0x10, 0xe0, 0x1d, 0xad, 0xef, 0x44, 0xbd, 0xda, 0x83, 0xac, 0x7a, 0xa8, 0xf0, 0x1c, 0x07, 0xf9, 0xc3, 0x43, 0x6c, 0x3f, 0xb7, 0xd3, 0x87, 0x22, 0x02, 0x73}}},
-{{{0x64, 0x1d, 0x49, 0x13, 0x2f, 0x71, 0xec, 0x69, 0x87, 0xd0, 0x42, 0xee, 0x13, 0xec, 0xe3, 0xed, 0x56, 0x7b, 0xbf, 0xbd, 0x8c, 0x2f, 0x7d, 0x7b, 0x9d, 0x28, 0xec, 0x8e, 0x76, 0x2f, 0x6f, 0x08}} ,
- {{0x22, 0xf5, 0x5f, 0x4d, 0x15, 0xef, 0xfc, 0x4e, 0x57, 0x03, 0x36, 0x89, 0xf0, 0xeb, 0x5b, 0x91, 0xd6, 0xe2, 0xca, 0x01, 0xa5, 0xee, 0x52, 0xec, 0xa0, 0x3c, 0x8f, 0x33, 0x90, 0x5a, 0x94, 0x72}}},
-{{{0x8a, 0x4b, 0xe7, 0x38, 0xbc, 0xda, 0xc2, 0xb0, 0x85, 0xe1, 0x4a, 0xfe, 0x2d, 0x44, 0x84, 0xcb, 0x20, 0x6b, 0x2d, 0xbf, 0x11, 0x9c, 0xd7, 0xbe, 0xd3, 0x3e, 0x5f, 0xbf, 0x68, 0xbc, 0xa8, 0x07}} ,
- {{0x01, 0x89, 0x28, 0x22, 0x6a, 0x78, 0xaa, 0x29, 0x03, 0xc8, 0x74, 0x95, 0x03, 0x3e, 0xdc, 0xbd, 0x07, 0x13, 0xa8, 0xa2, 0x20, 0x2d, 0xb3, 0x18, 0x70, 0x42, 0xfd, 0x7a, 0xc4, 0xd7, 0x49, 0x72}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x02, 0xff, 0x32, 0x2b, 0x5c, 0x93, 0x54, 0x32, 0xe8, 0x57, 0x54, 0x1a, 0x8b, 0x33, 0x60, 0x65, 0xd3, 0x67, 0xa4, 0xc1, 0x26, 0xc4, 0xa4, 0x34, 0x1f, 0x9b, 0xa7, 0xa9, 0xf4, 0xd9, 0x4f, 0x5b}} ,
- {{0x46, 0x8d, 0xb0, 0x33, 0x54, 0x26, 0x5b, 0x68, 0xdf, 0xbb, 0xc5, 0xec, 0xc2, 0xf9, 0x3c, 0x5a, 0x37, 0xc1, 0x8e, 0x27, 0x47, 0xaa, 0x49, 0x5a, 0xf8, 0xfb, 0x68, 0x04, 0x23, 0xd1, 0xeb, 0x40}}},
-{{{0x65, 0xa5, 0x11, 0x84, 0x8a, 0x67, 0x9d, 0x9e, 0xd1, 0x44, 0x68, 0x7a, 0x34, 0xe1, 0x9f, 0xa3, 0x54, 0xcd, 0x07, 0xca, 0x79, 0x1f, 0x54, 0x2f, 0x13, 0x70, 0x4e, 0xee, 0xa2, 0xfa, 0xe7, 0x5d}} ,
- {{0x36, 0xec, 0x54, 0xf8, 0xce, 0xe4, 0x85, 0xdf, 0xf6, 0x6f, 0x1d, 0x90, 0x08, 0xbc, 0xe8, 0xc0, 0x92, 0x2d, 0x43, 0x6b, 0x92, 0xa9, 0x8e, 0xab, 0x0a, 0x2e, 0x1c, 0x1e, 0x64, 0x23, 0x9f, 0x2c}}},
-{{{0xa7, 0xd6, 0x2e, 0xd5, 0xcc, 0xd4, 0xcb, 0x5a, 0x3b, 0xa7, 0xf9, 0x46, 0x03, 0x1d, 0xad, 0x2b, 0x34, 0x31, 0x90, 0x00, 0x46, 0x08, 0x82, 0x14, 0xc4, 0xe0, 0x9c, 0xf0, 0xe3, 0x55, 0x43, 0x31}} ,
- {{0x60, 0xd6, 0xdd, 0x78, 0xe6, 0xd4, 0x22, 0x42, 0x1f, 0x00, 0xf9, 0xb1, 0x6a, 0x63, 0xe2, 0x92, 0x59, 0xd1, 0x1a, 0xb7, 0x00, 0x54, 0x29, 0xc9, 0xc1, 0xf6, 0x6f, 0x7a, 0xc5, 0x3c, 0x5f, 0x65}}},
-{{{0x27, 0x4f, 0xd0, 0x72, 0xb1, 0x11, 0x14, 0x27, 0x15, 0x94, 0x48, 0x81, 0x7e, 0x74, 0xd8, 0x32, 0xd5, 0xd1, 0x11, 0x28, 0x60, 0x63, 0x36, 0x32, 0x37, 0xb5, 0x13, 0x1c, 0xa0, 0x37, 0xe3, 0x74}} ,
- {{0xf1, 0x25, 0x4e, 0x11, 0x96, 0x67, 0xe6, 0x1c, 0xc2, 0xb2, 0x53, 0xe2, 0xda, 0x85, 0xee, 0xb2, 0x9f, 0x59, 0xf3, 0xba, 0xbd, 0xfa, 0xcf, 0x6e, 0xf9, 0xda, 0xa4, 0xb3, 0x02, 0x8f, 0x64, 0x08}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x34, 0x94, 0xf2, 0x64, 0x54, 0x47, 0x37, 0x07, 0x40, 0x8a, 0x20, 0xba, 0x4a, 0x55, 0xd7, 0x3f, 0x47, 0xba, 0x25, 0x23, 0x14, 0xb0, 0x2c, 0xe8, 0x55, 0xa8, 0xa6, 0xef, 0x51, 0xbd, 0x6f, 0x6a}} ,
- {{0x71, 0xd6, 0x16, 0x76, 0xb2, 0x06, 0xea, 0x79, 0xf5, 0xc4, 0xc3, 0x52, 0x7e, 0x61, 0xd1, 0xe1, 0xad, 0x70, 0x78, 0x1d, 0x16, 0x11, 0xf8, 0x7c, 0x2b, 0xfc, 0x55, 0x9f, 0x52, 0xf8, 0xf5, 0x16}}},
-{{{0x34, 0x96, 0x9a, 0xf6, 0xc5, 0xe0, 0x14, 0x03, 0x24, 0x0e, 0x4c, 0xad, 0x9e, 0x9a, 0x70, 0x23, 0x96, 0xb2, 0xf1, 0x2e, 0x9d, 0xc3, 0x32, 0x9b, 0x54, 0xa5, 0x73, 0xde, 0x88, 0xb1, 0x3e, 0x24}} ,
- {{0xf6, 0xe2, 0x4c, 0x1f, 0x5b, 0xb2, 0xaf, 0x82, 0xa5, 0xcf, 0x81, 0x10, 0x04, 0xef, 0xdb, 0xa2, 0xcc, 0x24, 0xb2, 0x7e, 0x0b, 0x7a, 0xeb, 0x01, 0xd8, 0x52, 0xf4, 0x51, 0x89, 0x29, 0x79, 0x37}}},
-{{{0x74, 0xde, 0x12, 0xf3, 0x68, 0xb7, 0x66, 0xc3, 0xee, 0x68, 0xdc, 0x81, 0xb5, 0x55, 0x99, 0xab, 0xd9, 0x28, 0x63, 0x6d, 0x8b, 0x40, 0x69, 0x75, 0x6c, 0xcd, 0x5c, 0x2a, 0x7e, 0x32, 0x7b, 0x29}} ,
- {{0x02, 0xcc, 0x22, 0x74, 0x4d, 0x19, 0x07, 0xc0, 0xda, 0xb5, 0x76, 0x51, 0x2a, 0xaa, 0xa6, 0x0a, 0x5f, 0x26, 0xd4, 0xbc, 0xaf, 0x48, 0x88, 0x7f, 0x02, 0xbc, 0xf2, 0xe1, 0xcf, 0xe9, 0xdd, 0x15}}},
-{{{0xed, 0xb5, 0x9a, 0x8c, 0x9a, 0xdd, 0x27, 0xf4, 0x7f, 0x47, 0xd9, 0x52, 0xa7, 0xcd, 0x65, 0xa5, 0x31, 0x22, 0xed, 0xa6, 0x63, 0x5b, 0x80, 0x4a, 0xad, 0x4d, 0xed, 0xbf, 0xee, 0x49, 0xb3, 0x06}} ,
- {{0xf8, 0x64, 0x8b, 0x60, 0x90, 0xe9, 0xde, 0x44, 0x77, 0xb9, 0x07, 0x36, 0x32, 0xc2, 0x50, 0xf5, 0x65, 0xdf, 0x48, 0x4c, 0x37, 0xaa, 0x68, 0xab, 0x9a, 0x1f, 0x3e, 0xff, 0x89, 0x92, 0xa0, 0x07}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x7d, 0x4f, 0x9c, 0x19, 0xc0, 0x4a, 0x31, 0xec, 0xf9, 0xaa, 0xeb, 0xb2, 0x16, 0x9c, 0xa3, 0x66, 0x5f, 0xd1, 0xd4, 0xed, 0xb8, 0x92, 0x1c, 0xab, 0xda, 0xea, 0xd9, 0x57, 0xdf, 0x4c, 0x2a, 0x48}} ,
- {{0x4b, 0xb0, 0x4e, 0x6e, 0x11, 0x3b, 0x51, 0xbd, 0x6a, 0xfd, 0xe4, 0x25, 0xa5, 0x5f, 0x11, 0x3f, 0x98, 0x92, 0x51, 0x14, 0xc6, 0x5f, 0x3c, 0x0b, 0xa8, 0xf7, 0xc2, 0x81, 0x43, 0xde, 0x91, 0x73}}},
-{{{0x3c, 0x8f, 0x9f, 0x33, 0x2a, 0x1f, 0x43, 0x33, 0x8f, 0x68, 0xff, 0x1f, 0x3d, 0x73, 0x6b, 0xbf, 0x68, 0xcc, 0x7d, 0x13, 0x6c, 0x24, 0x4b, 0xcc, 0x4d, 0x24, 0x0d, 0xfe, 0xde, 0x86, 0xad, 0x3b}} ,
- {{0x79, 0x51, 0x81, 0x01, 0xdc, 0x73, 0x53, 0xe0, 0x6e, 0x9b, 0xea, 0x68, 0x3f, 0x5c, 0x14, 0x84, 0x53, 0x8d, 0x4b, 0xc0, 0x9f, 0x9f, 0x89, 0x2b, 0x8c, 0xba, 0x86, 0xfa, 0xf2, 0xcd, 0xe3, 0x2d}}},
-{{{0x06, 0xf9, 0x29, 0x5a, 0xdb, 0x3d, 0x84, 0x52, 0xab, 0xcc, 0x6b, 0x60, 0x9d, 0xb7, 0x4a, 0x0e, 0x36, 0x63, 0x91, 0xad, 0xa0, 0x95, 0xb0, 0x97, 0x89, 0x4e, 0xcf, 0x7d, 0x3c, 0xe5, 0x7c, 0x28}} ,
- {{0x2e, 0x69, 0x98, 0xfd, 0xc6, 0xbd, 0xcc, 0xca, 0xdf, 0x9a, 0x44, 0x7e, 0x9d, 0xca, 0x89, 0x6d, 0xbf, 0x27, 0xc2, 0xf8, 0xcd, 0x46, 0x00, 0x2b, 0xb5, 0x58, 0x4e, 0xb7, 0x89, 0x09, 0xe9, 0x2d}}},
-{{{0x54, 0xbe, 0x75, 0xcb, 0x05, 0xb0, 0x54, 0xb7, 0xe7, 0x26, 0x86, 0x4a, 0xfc, 0x19, 0xcf, 0x27, 0x46, 0xd4, 0x22, 0x96, 0x5a, 0x11, 0xe8, 0xd5, 0x1b, 0xed, 0x71, 0xc5, 0x5d, 0xc8, 0xaf, 0x45}} ,
- {{0x40, 0x7b, 0x77, 0x57, 0x49, 0x9e, 0x80, 0x39, 0x23, 0xee, 0x81, 0x0b, 0x22, 0xcf, 0xdb, 0x7a, 0x2f, 0x14, 0xb8, 0x57, 0x8f, 0xa1, 0x39, 0x1e, 0x77, 0xfc, 0x0b, 0xa6, 0xbf, 0x8a, 0x0c, 0x6c}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x77, 0x3a, 0xd4, 0xd8, 0x27, 0xcf, 0xe8, 0xa1, 0x72, 0x9d, 0xca, 0xdd, 0x0d, 0x96, 0xda, 0x79, 0xed, 0x56, 0x42, 0x15, 0x60, 0xc7, 0x1c, 0x6b, 0x26, 0x30, 0xf6, 0x6a, 0x95, 0x67, 0xf3, 0x0a}} ,
- {{0xc5, 0x08, 0xa4, 0x2b, 0x2f, 0xbd, 0x31, 0x81, 0x2a, 0xa6, 0xb6, 0xe4, 0x00, 0x91, 0xda, 0x3d, 0xb2, 0xb0, 0x96, 0xce, 0x8a, 0xd2, 0x8d, 0x70, 0xb3, 0xd3, 0x34, 0x01, 0x90, 0x8d, 0x10, 0x21}}},
-{{{0x33, 0x0d, 0xe7, 0xba, 0x4f, 0x07, 0xdf, 0x8d, 0xea, 0x7d, 0xa0, 0xc5, 0xd6, 0xb1, 0xb0, 0xe5, 0x57, 0x1b, 0x5b, 0xf5, 0x45, 0x13, 0x14, 0x64, 0x5a, 0xeb, 0x5c, 0xfc, 0x54, 0x01, 0x76, 0x2b}} ,
- {{0x02, 0x0c, 0xc2, 0xaf, 0x96, 0x36, 0xfe, 0x4a, 0xe2, 0x54, 0x20, 0x6a, 0xeb, 0xb2, 0x9f, 0x62, 0xd7, 0xce, 0xa2, 0x3f, 0x20, 0x11, 0x34, 0x37, 0xe0, 0x42, 0xed, 0x6f, 0xf9, 0x1a, 0xc8, 0x7d}}},
-{{{0xd8, 0xb9, 0x11, 0xe8, 0x36, 0x3f, 0x42, 0xc1, 0xca, 0xdc, 0xd3, 0xf1, 0xc8, 0x23, 0x3d, 0x4f, 0x51, 0x7b, 0x9d, 0x8d, 0xd8, 0xe4, 0xa0, 0xaa, 0xf3, 0x04, 0xd6, 0x11, 0x93, 0xc8, 0x35, 0x45}} ,
- {{0x61, 0x36, 0xd6, 0x08, 0x90, 0xbf, 0xa7, 0x7a, 0x97, 0x6c, 0x0f, 0x84, 0xd5, 0x33, 0x2d, 0x37, 0xc9, 0x6a, 0x80, 0x90, 0x3d, 0x0a, 0xa2, 0xaa, 0xe1, 0xb8, 0x84, 0xba, 0x61, 0x36, 0xdd, 0x69}}},
-{{{0x6b, 0xdb, 0x5b, 0x9c, 0xc6, 0x92, 0xbc, 0x23, 0xaf, 0xc5, 0xb8, 0x75, 0xf8, 0x42, 0xfa, 0xd6, 0xb6, 0x84, 0x94, 0x63, 0x98, 0x93, 0x48, 0x78, 0x38, 0xcd, 0xbb, 0x18, 0x34, 0xc3, 0xdb, 0x67}} ,
- {{0x96, 0xf3, 0x3a, 0x09, 0x56, 0xb0, 0x6f, 0x7c, 0x51, 0x1e, 0x1b, 0x39, 0x48, 0xea, 0xc9, 0x0c, 0x25, 0xa2, 0x7a, 0xca, 0xe7, 0x92, 0xfc, 0x59, 0x30, 0xa3, 0x89, 0x85, 0xdf, 0x6f, 0x43, 0x38}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x79, 0x84, 0x44, 0x19, 0xbd, 0xe9, 0x54, 0xc4, 0xc0, 0x6e, 0x2a, 0xa8, 0xa8, 0x9b, 0x43, 0xd5, 0x71, 0x22, 0x5f, 0xdc, 0x01, 0xfa, 0xdf, 0xb3, 0xb8, 0x47, 0x4b, 0x0a, 0xa5, 0x44, 0xea, 0x29}} ,
- {{0x05, 0x90, 0x50, 0xaf, 0x63, 0x5f, 0x9d, 0x9e, 0xe1, 0x9d, 0x38, 0x97, 0x1f, 0x6c, 0xac, 0x30, 0x46, 0xb2, 0x6a, 0x19, 0xd1, 0x4b, 0xdb, 0xbb, 0x8c, 0xda, 0x2e, 0xab, 0xc8, 0x5a, 0x77, 0x6c}}},
-{{{0x2b, 0xbe, 0xaf, 0xa1, 0x6d, 0x2f, 0x0b, 0xb1, 0x8f, 0xe3, 0xe0, 0x38, 0xcd, 0x0b, 0x41, 0x1b, 0x4a, 0x15, 0x07, 0xf3, 0x6f, 0xdc, 0xb8, 0xe9, 0xde, 0xb2, 0xa3, 0x40, 0x01, 0xa6, 0x45, 0x1e}} ,
- {{0x76, 0x0a, 0xda, 0x8d, 0x2c, 0x07, 0x3f, 0x89, 0x7d, 0x04, 0xad, 0x43, 0x50, 0x6e, 0xd2, 0x47, 0xcb, 0x8a, 0xe6, 0x85, 0x1a, 0x24, 0xf3, 0xd2, 0x60, 0xfd, 0xdf, 0x73, 0xa4, 0x0d, 0x73, 0x0e}}},
-{{{0xfd, 0x67, 0x6b, 0x71, 0x9b, 0x81, 0x53, 0x39, 0x39, 0xf4, 0xb8, 0xd5, 0xc3, 0x30, 0x9b, 0x3b, 0x7c, 0xa3, 0xf0, 0xd0, 0x84, 0x21, 0xd6, 0xbf, 0xb7, 0x4c, 0x87, 0x13, 0x45, 0x2d, 0xa7, 0x55}} ,
- {{0x5d, 0x04, 0xb3, 0x40, 0x28, 0x95, 0x2d, 0x30, 0x83, 0xec, 0x5e, 0xe4, 0xff, 0x75, 0xfe, 0x79, 0x26, 0x9d, 0x1d, 0x36, 0xcd, 0x0a, 0x15, 0xd2, 0x24, 0x14, 0x77, 0x71, 0xd7, 0x8a, 0x1b, 0x04}}},
-{{{0x5d, 0x93, 0xc9, 0xbe, 0xaa, 0x90, 0xcd, 0x9b, 0xfb, 0x73, 0x7e, 0xb0, 0x64, 0x98, 0x57, 0x44, 0x42, 0x41, 0xb1, 0xaf, 0xea, 0xc1, 0xc3, 0x22, 0xff, 0x60, 0x46, 0xcb, 0x61, 0x81, 0x70, 0x61}} ,
- {{0x0d, 0x82, 0xb9, 0xfe, 0x21, 0xcd, 0xc4, 0xf5, 0x98, 0x0c, 0x4e, 0x72, 0xee, 0x87, 0x49, 0xf8, 0xa1, 0x95, 0xdf, 0x8f, 0x2d, 0xbd, 0x21, 0x06, 0x7c, 0x15, 0xe8, 0x12, 0x6d, 0x93, 0xd6, 0x38}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x91, 0xf7, 0x51, 0xd9, 0xef, 0x7d, 0x42, 0x01, 0x13, 0xe9, 0xb8, 0x7f, 0xa6, 0x49, 0x17, 0x64, 0x21, 0x80, 0x83, 0x2c, 0x63, 0x4c, 0x60, 0x09, 0x59, 0x91, 0x92, 0x77, 0x39, 0x51, 0xf4, 0x48}} ,
- {{0x60, 0xd5, 0x22, 0x83, 0x08, 0x2f, 0xff, 0x99, 0x3e, 0x69, 0x6d, 0x88, 0xda, 0xe7, 0x5b, 0x52, 0x26, 0x31, 0x2a, 0xe5, 0x89, 0xde, 0x68, 0x90, 0xb6, 0x22, 0x5a, 0xbd, 0xd3, 0x85, 0x53, 0x31}}},
-{{{0xd8, 0xce, 0xdc, 0xf9, 0x3c, 0x4b, 0xa2, 0x1d, 0x2c, 0x2f, 0x36, 0xbe, 0x7a, 0xfc, 0xcd, 0xbc, 0xdc, 0xf9, 0x30, 0xbd, 0xff, 0x05, 0xc7, 0xe4, 0x8e, 0x17, 0x62, 0xf8, 0x4d, 0xa0, 0x56, 0x79}} ,
- {{0x82, 0xe7, 0xf6, 0xba, 0x53, 0x84, 0x0a, 0xa3, 0x34, 0xff, 0x3c, 0xa3, 0x6a, 0xa1, 0x37, 0xea, 0xdd, 0xb6, 0x95, 0xb3, 0x78, 0x19, 0x76, 0x1e, 0x55, 0x2f, 0x77, 0x2e, 0x7f, 0xc1, 0xea, 0x5e}}},
-{{{0x83, 0xe1, 0x6e, 0xa9, 0x07, 0x33, 0x3e, 0x83, 0xff, 0xcb, 0x1c, 0x9f, 0xb1, 0xa3, 0xb4, 0xc9, 0xe1, 0x07, 0x97, 0xff, 0xf8, 0x23, 0x8f, 0xce, 0x40, 0xfd, 0x2e, 0x5e, 0xdb, 0x16, 0x43, 0x2d}} ,
- {{0xba, 0x38, 0x02, 0xf7, 0x81, 0x43, 0x83, 0xa3, 0x20, 0x4f, 0x01, 0x3b, 0x8a, 0x04, 0x38, 0x31, 0xc6, 0x0f, 0xc8, 0xdf, 0xd7, 0xfa, 0x2f, 0x88, 0x3f, 0xfc, 0x0c, 0x76, 0xc4, 0xa6, 0x45, 0x72}}},
-{{{0xbb, 0x0c, 0xbc, 0x6a, 0xa4, 0x97, 0x17, 0x93, 0x2d, 0x6f, 0xde, 0x72, 0x10, 0x1c, 0x08, 0x2c, 0x0f, 0x80, 0x32, 0x68, 0x27, 0xd4, 0xab, 0xdd, 0xc5, 0x58, 0x61, 0x13, 0x6d, 0x11, 0x1e, 0x4d}} ,
- {{0x1a, 0xb9, 0xc9, 0x10, 0xfb, 0x1e, 0x4e, 0xf4, 0x84, 0x4b, 0x8a, 0x5e, 0x7b, 0x4b, 0xe8, 0x43, 0x8c, 0x8f, 0x00, 0xb5, 0x54, 0x13, 0xc5, 0x5c, 0xb6, 0x35, 0x4e, 0x9d, 0xe4, 0x5b, 0x41, 0x6d}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x15, 0x7d, 0x12, 0x48, 0x82, 0x14, 0x42, 0xcd, 0x32, 0xd4, 0x4b, 0xc1, 0x72, 0x61, 0x2a, 0x8c, 0xec, 0xe2, 0xf8, 0x24, 0x45, 0x94, 0xe3, 0xbe, 0xdd, 0x67, 0xa8, 0x77, 0x5a, 0xae, 0x5b, 0x4b}} ,
- {{0xcb, 0x77, 0x9a, 0x20, 0xde, 0xb8, 0x23, 0xd9, 0xa0, 0x0f, 0x8c, 0x7b, 0xa5, 0xcb, 0xae, 0xb6, 0xec, 0x42, 0x67, 0x0e, 0x58, 0xa4, 0x75, 0x98, 0x21, 0x71, 0x84, 0xb3, 0xe0, 0x76, 0x94, 0x73}}},
-{{{0xdf, 0xfc, 0x69, 0x28, 0x23, 0x3f, 0x5b, 0xf8, 0x3b, 0x24, 0x37, 0xf3, 0x1d, 0xd5, 0x22, 0x6b, 0xd0, 0x98, 0xa8, 0x6c, 0xcf, 0xff, 0x06, 0xe1, 0x13, 0xdf, 0xb9, 0xc1, 0x0c, 0xa9, 0xbf, 0x33}} ,
- {{0xd9, 0x81, 0xda, 0xb2, 0x4f, 0x82, 0x9d, 0x43, 0x81, 0x09, 0xf1, 0xd2, 0x01, 0xef, 0xac, 0xf4, 0x2d, 0x7d, 0x01, 0x09, 0xf1, 0xff, 0xa5, 0x9f, 0xe5, 0xca, 0x27, 0x63, 0xdb, 0x20, 0xb1, 0x53}}},
-{{{0x67, 0x02, 0xe8, 0xad, 0xa9, 0x34, 0xd4, 0xf0, 0x15, 0x81, 0xaa, 0xc7, 0x4d, 0x87, 0x94, 0xea, 0x75, 0xe7, 0x4c, 0x94, 0x04, 0x0e, 0x69, 0x87, 0xe7, 0x51, 0x91, 0x10, 0x03, 0xc7, 0xbe, 0x56}} ,
- {{0x32, 0xfb, 0x86, 0xec, 0x33, 0x6b, 0x2e, 0x51, 0x2b, 0xc8, 0xfa, 0x6c, 0x70, 0x47, 0x7e, 0xce, 0x05, 0x0c, 0x71, 0xf3, 0xb4, 0x56, 0xa6, 0xdc, 0xcc, 0x78, 0x07, 0x75, 0xd0, 0xdd, 0xb2, 0x6a}}},
-{{{0xc6, 0xef, 0xb9, 0xc0, 0x2b, 0x22, 0x08, 0x1e, 0x71, 0x70, 0xb3, 0x35, 0x9c, 0x7a, 0x01, 0x92, 0x44, 0x9a, 0xf6, 0xb0, 0x58, 0x95, 0xc1, 0x9b, 0x02, 0xed, 0x2d, 0x7c, 0x34, 0x29, 0x49, 0x44}} ,
- {{0x45, 0x62, 0x1d, 0x2e, 0xff, 0x2a, 0x1c, 0x21, 0xa4, 0x25, 0x7b, 0x0d, 0x8c, 0x15, 0x39, 0xfc, 0x8f, 0x7c, 0xa5, 0x7d, 0x1e, 0x25, 0xa3, 0x45, 0xd6, 0xab, 0xbd, 0xcb, 0xc5, 0x5e, 0x78, 0x77}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xd0, 0xd3, 0x42, 0xed, 0x1d, 0x00, 0x3c, 0x15, 0x2c, 0x9c, 0x77, 0x81, 0xd2, 0x73, 0xd1, 0x06, 0xd5, 0xc4, 0x7f, 0x94, 0xbb, 0x92, 0x2d, 0x2c, 0x4b, 0x45, 0x4b, 0xe9, 0x2a, 0x89, 0x6b, 0x2b}} ,
- {{0xd2, 0x0c, 0x88, 0xc5, 0x48, 0x4d, 0xea, 0x0d, 0x4a, 0xc9, 0x52, 0x6a, 0x61, 0x79, 0xe9, 0x76, 0xf3, 0x85, 0x52, 0x5c, 0x1b, 0x2c, 0xe1, 0xd6, 0xc4, 0x0f, 0x18, 0x0e, 0x4e, 0xf6, 0x1c, 0x7f}}},
-{{{0xb4, 0x04, 0x2e, 0x42, 0xcb, 0x1f, 0x2b, 0x11, 0x51, 0x7b, 0x08, 0xac, 0xaa, 0x3e, 0x9e, 0x52, 0x60, 0xb7, 0xc2, 0x61, 0x57, 0x8c, 0x84, 0xd5, 0x18, 0xa6, 0x19, 0xfc, 0xb7, 0x75, 0x91, 0x1b}} ,
- {{0xe8, 0x68, 0xca, 0x44, 0xc8, 0x38, 0x38, 0xcc, 0x53, 0x0a, 0x32, 0x35, 0xcc, 0x52, 0xcb, 0x0e, 0xf7, 0xc5, 0xe7, 0xec, 0x3d, 0x85, 0xcc, 0x58, 0xe2, 0x17, 0x47, 0xff, 0x9f, 0xa5, 0x30, 0x17}}},
-{{{0xe3, 0xae, 0xc8, 0xc1, 0x71, 0x75, 0x31, 0x00, 0x37, 0x41, 0x5c, 0x0e, 0x39, 0xda, 0x73, 0xa0, 0xc7, 0x97, 0x36, 0x6c, 0x5b, 0xf2, 0xee, 0x64, 0x0a, 0x3d, 0x89, 0x1e, 0x1d, 0x49, 0x8c, 0x37}} ,
- {{0x4c, 0xe6, 0xb0, 0xc1, 0xa5, 0x2a, 0x82, 0x09, 0x08, 0xad, 0x79, 0x9c, 0x56, 0xf6, 0xf9, 0xc1, 0xd7, 0x7c, 0x39, 0x7f, 0x93, 0xca, 0x11, 0x55, 0xbf, 0x07, 0x1b, 0x82, 0x29, 0x69, 0x95, 0x5c}}},
-{{{0x87, 0xee, 0xa6, 0x56, 0x9e, 0xc2, 0x9a, 0x56, 0x24, 0x42, 0x85, 0x4d, 0x98, 0x31, 0x1e, 0x60, 0x4d, 0x87, 0x85, 0x04, 0xae, 0x46, 0x12, 0xf9, 0x8e, 0x7f, 0xe4, 0x7f, 0xf6, 0x1c, 0x37, 0x01}} ,
- {{0x73, 0x4c, 0xb6, 0xc5, 0xc4, 0xe9, 0x6c, 0x85, 0x48, 0x4a, 0x5a, 0xac, 0xd9, 0x1f, 0x43, 0xf8, 0x62, 0x5b, 0xee, 0x98, 0x2a, 0x33, 0x8e, 0x79, 0xce, 0x61, 0x06, 0x35, 0xd8, 0xd7, 0xca, 0x71}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x72, 0xd3, 0xae, 0xa6, 0xca, 0x8f, 0xcd, 0xcc, 0x78, 0x8e, 0x19, 0x4d, 0xa7, 0xd2, 0x27, 0xe9, 0xa4, 0x3c, 0x16, 0x5b, 0x84, 0x80, 0xf9, 0xd0, 0xcc, 0x6a, 0x1e, 0xca, 0x1e, 0x67, 0xbd, 0x63}} ,
- {{0x7b, 0x6e, 0x2a, 0xd2, 0x87, 0x48, 0xff, 0xa1, 0xca, 0xe9, 0x15, 0x85, 0xdc, 0xdb, 0x2c, 0x39, 0x12, 0x91, 0xa9, 0x20, 0xaa, 0x4f, 0x29, 0xf4, 0x15, 0x7a, 0xd2, 0xf5, 0x32, 0xcc, 0x60, 0x04}}},
-{{{0xe5, 0x10, 0x47, 0x3b, 0xfa, 0x90, 0xfc, 0x30, 0xb5, 0xea, 0x6f, 0x56, 0x8f, 0xfb, 0x0e, 0xa7, 0x3b, 0xc8, 0xb2, 0xff, 0x02, 0x7a, 0x33, 0x94, 0x93, 0x2a, 0x03, 0xe0, 0x96, 0x3a, 0x6c, 0x0f}} ,
- {{0x5a, 0x63, 0x67, 0xe1, 0x9b, 0x47, 0x78, 0x9f, 0x38, 0x79, 0xac, 0x97, 0x66, 0x1d, 0x5e, 0x51, 0xee, 0x24, 0x42, 0xe8, 0x58, 0x4b, 0x8a, 0x03, 0x75, 0x86, 0x37, 0x86, 0xe2, 0x97, 0x4e, 0x3d}}},
-{{{0x3f, 0x75, 0x8e, 0xb4, 0xff, 0xd8, 0xdd, 0xd6, 0x37, 0x57, 0x9d, 0x6d, 0x3b, 0xbd, 0xd5, 0x60, 0x88, 0x65, 0x9a, 0xb9, 0x4a, 0x68, 0x84, 0xa2, 0x67, 0xdd, 0x17, 0x25, 0x97, 0x04, 0x8b, 0x5e}} ,
- {{0xbb, 0x40, 0x5e, 0xbc, 0x16, 0x92, 0x05, 0xc4, 0xc0, 0x4e, 0x72, 0x90, 0x0e, 0xab, 0xcf, 0x8a, 0xed, 0xef, 0xb9, 0x2d, 0x3b, 0xf8, 0x43, 0x5b, 0xba, 0x2d, 0xeb, 0x2f, 0x52, 0xd2, 0xd1, 0x5a}}},
-{{{0x40, 0xb4, 0xab, 0xe6, 0xad, 0x9f, 0x46, 0x69, 0x4a, 0xb3, 0x8e, 0xaa, 0xea, 0x9c, 0x8a, 0x20, 0x16, 0x5d, 0x8c, 0x13, 0xbd, 0xf6, 0x1d, 0xc5, 0x24, 0xbd, 0x90, 0x2a, 0x1c, 0xc7, 0x13, 0x3b}} ,
- {{0x54, 0xdc, 0x16, 0x0d, 0x18, 0xbe, 0x35, 0x64, 0x61, 0x52, 0x02, 0x80, 0xaf, 0x05, 0xf7, 0xa6, 0x42, 0xd3, 0x8f, 0x2e, 0x79, 0x26, 0xa8, 0xbb, 0xb2, 0x17, 0x48, 0xb2, 0x7a, 0x0a, 0x89, 0x14}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x20, 0xa8, 0x88, 0xe3, 0x91, 0xc0, 0x6e, 0xbb, 0x8a, 0x27, 0x82, 0x51, 0x83, 0xb2, 0x28, 0xa9, 0x83, 0xeb, 0xa6, 0xa9, 0x4d, 0x17, 0x59, 0x22, 0x54, 0x00, 0x50, 0x45, 0xcb, 0x48, 0x4b, 0x18}} ,
- {{0x33, 0x7c, 0xe7, 0x26, 0xba, 0x4d, 0x32, 0xfe, 0x53, 0xf4, 0xfa, 0x83, 0xe3, 0xa5, 0x79, 0x66, 0x73, 0xef, 0x80, 0x23, 0x68, 0xc2, 0x60, 0xdd, 0xa9, 0x33, 0xdc, 0x03, 0x7a, 0xe0, 0xe0, 0x3e}}},
-{{{0x34, 0x5c, 0x13, 0xfb, 0xc0, 0xe3, 0x78, 0x2b, 0x54, 0x58, 0x22, 0x9b, 0x76, 0x81, 0x7f, 0x93, 0x9c, 0x25, 0x3c, 0xd2, 0xe9, 0x96, 0x21, 0x26, 0x08, 0xf5, 0xed, 0x95, 0x11, 0xae, 0x04, 0x5a}} ,
- {{0xb9, 0xe8, 0xc5, 0x12, 0x97, 0x1f, 0x83, 0xfe, 0x3e, 0x94, 0x99, 0xd4, 0x2d, 0xf9, 0x52, 0x59, 0x5c, 0x82, 0xa6, 0xf0, 0x75, 0x7e, 0xe8, 0xec, 0xcc, 0xac, 0x18, 0x21, 0x09, 0x67, 0x66, 0x67}}},
-{{{0xb3, 0x40, 0x29, 0xd1, 0xcb, 0x1b, 0x08, 0x9e, 0x9c, 0xb7, 0x53, 0xb9, 0x3b, 0x71, 0x08, 0x95, 0x12, 0x1a, 0x58, 0xaf, 0x7e, 0x82, 0x52, 0x43, 0x4f, 0x11, 0x39, 0xf4, 0x93, 0x1a, 0x26, 0x05}} ,
- {{0x6e, 0x44, 0xa3, 0xf9, 0x64, 0xaf, 0xe7, 0x6d, 0x7d, 0xdf, 0x1e, 0xac, 0x04, 0xea, 0x3b, 0x5f, 0x9b, 0xe8, 0x24, 0x9d, 0x0e, 0xe5, 0x2e, 0x3e, 0xdf, 0xa9, 0xf7, 0xd4, 0x50, 0x71, 0xf0, 0x78}}},
-{{{0x3e, 0xa8, 0x38, 0xc2, 0x57, 0x56, 0x42, 0x9a, 0xb1, 0xe2, 0xf8, 0x45, 0xaa, 0x11, 0x48, 0x5f, 0x17, 0xc4, 0x54, 0x27, 0xdc, 0x5d, 0xaa, 0xdd, 0x41, 0xbc, 0xdf, 0x81, 0xb9, 0x53, 0xee, 0x52}} ,
- {{0xc3, 0xf1, 0xa7, 0x6d, 0xb3, 0x5f, 0x92, 0x6f, 0xcc, 0x91, 0xb8, 0x95, 0x05, 0xdf, 0x3c, 0x64, 0x57, 0x39, 0x61, 0x51, 0xad, 0x8c, 0x38, 0x7b, 0xc8, 0xde, 0x00, 0x34, 0xbe, 0xa1, 0xb0, 0x7e}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x25, 0x24, 0x1d, 0x8a, 0x67, 0x20, 0xee, 0x42, 0xeb, 0x38, 0xed, 0x0b, 0x8b, 0xcd, 0x46, 0x9d, 0x5e, 0x6b, 0x1e, 0x24, 0x9d, 0x12, 0x05, 0x1a, 0xcc, 0x05, 0x4e, 0x92, 0x38, 0xe1, 0x1f, 0x50}} ,
- {{0x4e, 0xee, 0x1c, 0x91, 0xe6, 0x11, 0xbd, 0x8e, 0x55, 0x1a, 0x18, 0x75, 0x66, 0xaf, 0x4d, 0x7b, 0x0f, 0xae, 0x6d, 0x85, 0xca, 0x82, 0x58, 0x21, 0x9c, 0x18, 0xe0, 0xed, 0xec, 0x22, 0x80, 0x2f}}},
-{{{0x68, 0x3b, 0x0a, 0x39, 0x1d, 0x6a, 0x15, 0x57, 0xfc, 0xf0, 0x63, 0x54, 0xdb, 0x39, 0xdb, 0xe8, 0x5c, 0x64, 0xff, 0xa0, 0x09, 0x4f, 0x3b, 0xb7, 0x32, 0x60, 0x99, 0x94, 0xfd, 0x94, 0x82, 0x2d}} ,
- {{0x24, 0xf6, 0x5a, 0x44, 0xf1, 0x55, 0x2c, 0xdb, 0xea, 0x7c, 0x84, 0x7c, 0x01, 0xac, 0xe3, 0xfd, 0xc9, 0x27, 0xc1, 0x5a, 0xb9, 0xde, 0x4f, 0x5a, 0x90, 0xdd, 0xc6, 0x67, 0xaa, 0x6f, 0x8a, 0x3a}}},
-{{{0x78, 0x52, 0x87, 0xc9, 0x97, 0x63, 0xb1, 0xdd, 0x54, 0x5f, 0xc1, 0xf8, 0xf1, 0x06, 0xa6, 0xa8, 0xa3, 0x88, 0x82, 0xd4, 0xcb, 0xa6, 0x19, 0xdd, 0xd1, 0x11, 0x87, 0x08, 0x17, 0x4c, 0x37, 0x2a}} ,
- {{0xa1, 0x0c, 0xf3, 0x08, 0x43, 0xd9, 0x24, 0x1e, 0x83, 0xa7, 0xdf, 0x91, 0xca, 0xbd, 0x69, 0x47, 0x8d, 0x1b, 0xe2, 0xb9, 0x4e, 0xb5, 0xe1, 0x76, 0xb3, 0x1c, 0x93, 0x03, 0xce, 0x5f, 0xb3, 0x5a}}},
-{{{0x1d, 0xda, 0xe4, 0x61, 0x03, 0x50, 0xa9, 0x8b, 0x68, 0x18, 0xef, 0xb2, 0x1c, 0x84, 0x3b, 0xa2, 0x44, 0x95, 0xa3, 0x04, 0x3b, 0xd6, 0x99, 0x00, 0xaf, 0x76, 0x42, 0x67, 0x02, 0x7d, 0x85, 0x56}} ,
- {{0xce, 0x72, 0x0e, 0x29, 0x84, 0xb2, 0x7d, 0xd2, 0x45, 0xbe, 0x57, 0x06, 0xed, 0x7f, 0xcf, 0xed, 0xcd, 0xef, 0x19, 0xd6, 0xbc, 0x15, 0x79, 0x64, 0xd2, 0x18, 0xe3, 0x20, 0x67, 0x3a, 0x54, 0x0b}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x52, 0xfd, 0x04, 0xc5, 0xfb, 0x99, 0xe7, 0xe8, 0xfb, 0x8c, 0xe1, 0x42, 0x03, 0xef, 0x9d, 0xd9, 0x9e, 0x4d, 0xf7, 0x80, 0xcf, 0x2e, 0xcc, 0x9b, 0x45, 0xc9, 0x7b, 0x7a, 0xbc, 0x37, 0xa8, 0x52}} ,
- {{0x96, 0x11, 0x41, 0x8a, 0x47, 0x91, 0xfe, 0xb6, 0xda, 0x7a, 0x54, 0x63, 0xd1, 0x14, 0x35, 0x05, 0x86, 0x8c, 0xa9, 0x36, 0x3f, 0xf2, 0x85, 0x54, 0x4e, 0x92, 0xd8, 0x85, 0x01, 0x46, 0xd6, 0x50}}},
-{{{0x53, 0xcd, 0xf3, 0x86, 0x40, 0xe6, 0x39, 0x42, 0x95, 0xd6, 0xcb, 0x45, 0x1a, 0x20, 0xc8, 0x45, 0x4b, 0x32, 0x69, 0x04, 0xb1, 0xaf, 0x20, 0x46, 0xc7, 0x6b, 0x23, 0x5b, 0x69, 0xee, 0x30, 0x3f}} ,
- {{0x70, 0x83, 0x47, 0xc0, 0xdb, 0x55, 0x08, 0xa8, 0x7b, 0x18, 0x6d, 0xf5, 0x04, 0x5a, 0x20, 0x0c, 0x4a, 0x8c, 0x60, 0xae, 0xae, 0x0f, 0x64, 0x55, 0x55, 0x2e, 0xd5, 0x1d, 0x53, 0x31, 0x42, 0x41}}},
-{{{0xca, 0xfc, 0x88, 0x6b, 0x96, 0x78, 0x0a, 0x8b, 0x83, 0xdc, 0xbc, 0xaf, 0x40, 0xb6, 0x8d, 0x7f, 0xef, 0xb4, 0xd1, 0x3f, 0xcc, 0xa2, 0x74, 0xc9, 0xc2, 0x92, 0x55, 0x00, 0xab, 0xdb, 0xbf, 0x4f}} ,
- {{0x93, 0x1c, 0x06, 0x2d, 0x66, 0x65, 0x02, 0xa4, 0x97, 0x18, 0xfd, 0x00, 0xe7, 0xab, 0x03, 0xec, 0xce, 0xc1, 0xbf, 0x37, 0xf8, 0x13, 0x53, 0xa5, 0xe5, 0x0c, 0x3a, 0xa8, 0x55, 0xb9, 0xff, 0x68}}},
-{{{0xe4, 0xe6, 0x6d, 0x30, 0x7d, 0x30, 0x35, 0xc2, 0x78, 0x87, 0xf9, 0xfc, 0x6b, 0x5a, 0xc3, 0xb7, 0x65, 0xd8, 0x2e, 0xc7, 0xa5, 0x0c, 0xc6, 0xdc, 0x12, 0xaa, 0xd6, 0x4f, 0xc5, 0x38, 0xbc, 0x0e}} ,
- {{0xe2, 0x3c, 0x76, 0x86, 0x38, 0xf2, 0x7b, 0x2c, 0x16, 0x78, 0x8d, 0xf5, 0xa4, 0x15, 0xda, 0xdb, 0x26, 0x85, 0xa0, 0x56, 0xdd, 0x1d, 0xe3, 0xb3, 0xfd, 0x40, 0xef, 0xf2, 0xd9, 0xa1, 0xb3, 0x04}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xdb, 0x49, 0x0e, 0xe6, 0x58, 0x10, 0x7a, 0x52, 0xda, 0xb5, 0x7d, 0x37, 0x6a, 0x3e, 0xa1, 0x78, 0xce, 0xc7, 0x1c, 0x24, 0x23, 0xdb, 0x7d, 0xfb, 0x8c, 0x8d, 0xdc, 0x30, 0x67, 0x69, 0x75, 0x3b}} ,
- {{0xa9, 0xea, 0x6d, 0x16, 0x16, 0x60, 0xf4, 0x60, 0x87, 0x19, 0x44, 0x8c, 0x4a, 0x8b, 0x3e, 0xfb, 0x16, 0x00, 0x00, 0x54, 0xa6, 0x9e, 0x9f, 0xef, 0xcf, 0xd9, 0xd2, 0x4c, 0x74, 0x31, 0xd0, 0x34}}},
-{{{0xa4, 0xeb, 0x04, 0xa4, 0x8c, 0x8f, 0x71, 0x27, 0x95, 0x85, 0x5d, 0x55, 0x4b, 0xb1, 0x26, 0x26, 0xc8, 0xae, 0x6a, 0x7d, 0xa2, 0x21, 0xca, 0xce, 0x38, 0xab, 0x0f, 0xd0, 0xd5, 0x2b, 0x6b, 0x00}} ,
- {{0xe5, 0x67, 0x0c, 0xf1, 0x3a, 0x9a, 0xea, 0x09, 0x39, 0xef, 0xd1, 0x30, 0xbc, 0x33, 0xba, 0xb1, 0x6a, 0xc5, 0x27, 0x08, 0x7f, 0x54, 0x80, 0x3d, 0xab, 0xf6, 0x15, 0x7a, 0xc2, 0x40, 0x73, 0x72}}},
-{{{0x84, 0x56, 0x82, 0xb6, 0x12, 0x70, 0x7f, 0xf7, 0xf0, 0xbd, 0x5b, 0xa9, 0xd5, 0xc5, 0x5f, 0x59, 0xbf, 0x7f, 0xb3, 0x55, 0x22, 0x02, 0xc9, 0x44, 0x55, 0x87, 0x8f, 0x96, 0x98, 0x64, 0x6d, 0x15}} ,
- {{0xb0, 0x8b, 0xaa, 0x1e, 0xec, 0xc7, 0xa5, 0x8f, 0x1f, 0x92, 0x04, 0xc6, 0x05, 0xf6, 0xdf, 0xa1, 0xcc, 0x1f, 0x81, 0xf5, 0x0e, 0x9c, 0x57, 0xdc, 0xe3, 0xbb, 0x06, 0x87, 0x1e, 0xfe, 0x23, 0x6c}}},
-{{{0xd8, 0x2b, 0x5b, 0x16, 0xea, 0x20, 0xf1, 0xd3, 0x68, 0x8f, 0xae, 0x5b, 0xd0, 0xa9, 0x1a, 0x19, 0xa8, 0x36, 0xfb, 0x2b, 0x57, 0x88, 0x7d, 0x90, 0xd5, 0xa6, 0xf3, 0xdc, 0x38, 0x89, 0x4e, 0x1f}} ,
- {{0xcc, 0x19, 0xda, 0x9b, 0x3b, 0x43, 0x48, 0x21, 0x2e, 0x23, 0x4d, 0x3d, 0xae, 0xf8, 0x8c, 0xfc, 0xdd, 0xa6, 0x74, 0x37, 0x65, 0xca, 0xee, 0x1a, 0x19, 0x8e, 0x9f, 0x64, 0x6f, 0x0c, 0x8b, 0x5a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x25, 0xb9, 0xc2, 0xf0, 0x72, 0xb8, 0x15, 0x16, 0xcc, 0x8d, 0x3c, 0x6f, 0x25, 0xed, 0xf4, 0x46, 0x2e, 0x0c, 0x60, 0x0f, 0xe2, 0x84, 0x34, 0x55, 0x89, 0x59, 0x34, 0x1b, 0xf5, 0x8d, 0xfe, 0x08}} ,
- {{0xf8, 0xab, 0x93, 0xbc, 0x44, 0xba, 0x1b, 0x75, 0x4b, 0x49, 0x6f, 0xd0, 0x54, 0x2e, 0x63, 0xba, 0xb5, 0xea, 0xed, 0x32, 0x14, 0xc9, 0x94, 0xd8, 0xc5, 0xce, 0xf4, 0x10, 0x68, 0xe0, 0x38, 0x27}}},
-{{{0x74, 0x1c, 0x14, 0x9b, 0xd4, 0x64, 0x61, 0x71, 0x5a, 0xb6, 0x21, 0x33, 0x4f, 0xf7, 0x8e, 0xba, 0xa5, 0x48, 0x9a, 0xc7, 0xfa, 0x9a, 0xf0, 0xb4, 0x62, 0xad, 0xf2, 0x5e, 0xcc, 0x03, 0x24, 0x1a}} ,
- {{0xf5, 0x76, 0xfd, 0xe4, 0xaf, 0xb9, 0x03, 0x59, 0xce, 0x63, 0xd2, 0x3b, 0x1f, 0xcd, 0x21, 0x0c, 0xad, 0x44, 0xa5, 0x97, 0xac, 0x80, 0x11, 0x02, 0x9b, 0x0c, 0xe5, 0x8b, 0xcd, 0xfb, 0x79, 0x77}}},
-{{{0x15, 0xbe, 0x9a, 0x0d, 0xba, 0x38, 0x72, 0x20, 0x8a, 0xf5, 0xbe, 0x59, 0x93, 0x79, 0xb7, 0xf6, 0x6a, 0x0c, 0x38, 0x27, 0x1a, 0x60, 0xf4, 0x86, 0x3b, 0xab, 0x5a, 0x00, 0xa0, 0xce, 0x21, 0x7d}} ,
- {{0x6c, 0xba, 0x14, 0xc5, 0xea, 0x12, 0x9e, 0x2e, 0x82, 0x63, 0xce, 0x9b, 0x4a, 0xe7, 0x1d, 0xec, 0xf1, 0x2e, 0x51, 0x1c, 0xf4, 0xd0, 0x69, 0x15, 0x42, 0x9d, 0xa3, 0x3f, 0x0e, 0xbf, 0xe9, 0x5c}}},
-{{{0xe4, 0x0d, 0xf4, 0xbd, 0xee, 0x31, 0x10, 0xed, 0xcb, 0x12, 0x86, 0xad, 0xd4, 0x2f, 0x90, 0x37, 0x32, 0xc3, 0x0b, 0x73, 0xec, 0x97, 0x85, 0xa4, 0x01, 0x1c, 0x76, 0x35, 0xfe, 0x75, 0xdd, 0x71}} ,
- {{0x11, 0xa4, 0x88, 0x9f, 0x3e, 0x53, 0x69, 0x3b, 0x1b, 0xe0, 0xf7, 0xba, 0x9b, 0xad, 0x4e, 0x81, 0x5f, 0xb5, 0x5c, 0xae, 0xbe, 0x67, 0x86, 0x37, 0x34, 0x8e, 0x07, 0x32, 0x45, 0x4a, 0x67, 0x39}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x90, 0x70, 0x58, 0x20, 0x03, 0x1e, 0x67, 0xb2, 0xc8, 0x9b, 0x58, 0xc5, 0xb1, 0xeb, 0x2d, 0x4a, 0xde, 0x82, 0x8c, 0xf2, 0xd2, 0x14, 0xb8, 0x70, 0x61, 0x4e, 0x73, 0xd6, 0x0b, 0x6b, 0x0d, 0x30}} ,
- {{0x81, 0xfc, 0x55, 0x5c, 0xbf, 0xa7, 0xc4, 0xbd, 0xe2, 0xf0, 0x4b, 0x8f, 0xe9, 0x7d, 0x99, 0xfa, 0xd3, 0xab, 0xbc, 0xc7, 0x83, 0x2b, 0x04, 0x7f, 0x0c, 0x19, 0x43, 0x03, 0x3d, 0x07, 0xca, 0x40}}},
-{{{0xf9, 0xc8, 0xbe, 0x8c, 0x16, 0x81, 0x39, 0x96, 0xf6, 0x17, 0x58, 0xc8, 0x30, 0x58, 0xfb, 0xc2, 0x03, 0x45, 0xd2, 0x52, 0x76, 0xe0, 0x6a, 0x26, 0x28, 0x5c, 0x88, 0x59, 0x6a, 0x5a, 0x54, 0x42}} ,
- {{0x07, 0xb5, 0x2e, 0x2c, 0x67, 0x15, 0x9b, 0xfb, 0x83, 0x69, 0x1e, 0x0f, 0xda, 0xd6, 0x29, 0xb1, 0x60, 0xe0, 0xb2, 0xba, 0x69, 0xa2, 0x9e, 0xbd, 0xbd, 0xe0, 0x1c, 0xbd, 0xcd, 0x06, 0x64, 0x70}}},
-{{{0x41, 0xfa, 0x8c, 0xe1, 0x89, 0x8f, 0x27, 0xc8, 0x25, 0x8f, 0x6f, 0x5f, 0x55, 0xf8, 0xde, 0x95, 0x6d, 0x2f, 0x75, 0x16, 0x2b, 0x4e, 0x44, 0xfd, 0x86, 0x6e, 0xe9, 0x70, 0x39, 0x76, 0x97, 0x7e}} ,
- {{0x17, 0x62, 0x6b, 0x14, 0xa1, 0x7c, 0xd0, 0x79, 0x6e, 0xd8, 0x8a, 0xa5, 0x6d, 0x8c, 0x93, 0xd2, 0x3f, 0xec, 0x44, 0x8d, 0x6e, 0x91, 0x01, 0x8c, 0x8f, 0xee, 0x01, 0x8f, 0xc0, 0xb4, 0x85, 0x0e}}},
-{{{0x02, 0x3a, 0x70, 0x41, 0xe4, 0x11, 0x57, 0x23, 0xac, 0xe6, 0xfc, 0x54, 0x7e, 0xcd, 0xd7, 0x22, 0xcb, 0x76, 0x9f, 0x20, 0xce, 0xa0, 0x73, 0x76, 0x51, 0x3b, 0xa4, 0xf8, 0xe3, 0x62, 0x12, 0x6c}} ,
- {{0x7f, 0x00, 0x9c, 0x26, 0x0d, 0x6f, 0x48, 0x7f, 0x3a, 0x01, 0xed, 0xc5, 0x96, 0xb0, 0x1f, 0x4f, 0xa8, 0x02, 0x62, 0x27, 0x8a, 0x50, 0x8d, 0x9a, 0x8b, 0x52, 0x0f, 0x1e, 0xcf, 0x41, 0x38, 0x19}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xf5, 0x6c, 0xd4, 0x2f, 0x0f, 0x69, 0x0f, 0x87, 0x3f, 0x61, 0x65, 0x1e, 0x35, 0x34, 0x85, 0xba, 0x02, 0x30, 0xac, 0x25, 0x3d, 0xe2, 0x62, 0xf1, 0xcc, 0xe9, 0x1b, 0xc2, 0xef, 0x6a, 0x42, 0x57}} ,
- {{0x34, 0x1f, 0x2e, 0xac, 0xd1, 0xc7, 0x04, 0x52, 0x32, 0x66, 0xb2, 0x33, 0x73, 0x21, 0x34, 0x54, 0xf7, 0x71, 0xed, 0x06, 0xb0, 0xff, 0xa6, 0x59, 0x6f, 0x8a, 0x4e, 0xfb, 0x02, 0xb0, 0x45, 0x6b}}},
-{{{0xf5, 0x48, 0x0b, 0x03, 0xc5, 0x22, 0x7d, 0x80, 0x08, 0x53, 0xfe, 0x32, 0xb1, 0xa1, 0x8a, 0x74, 0x6f, 0xbd, 0x3f, 0x85, 0xf4, 0xcf, 0xf5, 0x60, 0xaf, 0x41, 0x7e, 0x3e, 0x46, 0xa3, 0x5a, 0x20}} ,
- {{0xaa, 0x35, 0x87, 0x44, 0x63, 0x66, 0x97, 0xf8, 0x6e, 0x55, 0x0c, 0x04, 0x3e, 0x35, 0x50, 0xbf, 0x93, 0x69, 0xd2, 0x8b, 0x05, 0x55, 0x99, 0xbe, 0xe2, 0x53, 0x61, 0xec, 0xe8, 0x08, 0x0b, 0x32}}},
-{{{0xb3, 0x10, 0x45, 0x02, 0x69, 0x59, 0x2e, 0x97, 0xd9, 0x64, 0xf8, 0xdb, 0x25, 0x80, 0xdc, 0xc4, 0xd5, 0x62, 0x3c, 0xed, 0x65, 0x91, 0xad, 0xd1, 0x57, 0x81, 0x94, 0xaa, 0xa1, 0x29, 0xfc, 0x68}} ,
- {{0xdd, 0xb5, 0x7d, 0xab, 0x5a, 0x21, 0x41, 0x53, 0xbb, 0x17, 0x79, 0x0d, 0xd1, 0xa8, 0x0c, 0x0c, 0x20, 0x88, 0x09, 0xe9, 0x84, 0xe8, 0x25, 0x11, 0x67, 0x7a, 0x8b, 0x1a, 0xe4, 0x5d, 0xe1, 0x5d}}},
-{{{0x37, 0xea, 0xfe, 0x65, 0x3b, 0x25, 0xe8, 0xe1, 0xc2, 0xc5, 0x02, 0xa4, 0xbe, 0x98, 0x0a, 0x2b, 0x61, 0xc1, 0x9b, 0xe2, 0xd5, 0x92, 0xe6, 0x9e, 0x7d, 0x1f, 0xca, 0x43, 0x88, 0x8b, 0x2c, 0x59}} ,
- {{0xe0, 0xb5, 0x00, 0x1d, 0x2a, 0x6f, 0xaf, 0x79, 0x86, 0x2f, 0xa6, 0x5a, 0x93, 0xd1, 0xfe, 0xae, 0x3a, 0xee, 0xdb, 0x7c, 0x61, 0xbe, 0x7c, 0x01, 0xf9, 0xfe, 0x52, 0xdc, 0xd8, 0x52, 0xa3, 0x42}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x22, 0xaf, 0x13, 0x37, 0xbd, 0x37, 0x71, 0xac, 0x04, 0x46, 0x63, 0xac, 0xa4, 0x77, 0xed, 0x25, 0x38, 0xe0, 0x15, 0xa8, 0x64, 0x00, 0x0d, 0xce, 0x51, 0x01, 0xa9, 0xbc, 0x0f, 0x03, 0x1c, 0x04}} ,
- {{0x89, 0xf9, 0x80, 0x07, 0xcf, 0x3f, 0xb3, 0xe9, 0xe7, 0x45, 0x44, 0x3d, 0x2a, 0x7c, 0xe9, 0xe4, 0x16, 0x5c, 0x5e, 0x65, 0x1c, 0xc7, 0x7d, 0xc6, 0x7a, 0xfb, 0x43, 0xee, 0x25, 0x76, 0x46, 0x72}}},
-{{{0x02, 0xa2, 0xed, 0xf4, 0x8f, 0x6b, 0x0b, 0x3e, 0xeb, 0x35, 0x1a, 0xd5, 0x7e, 0xdb, 0x78, 0x00, 0x96, 0x8a, 0xa0, 0xb4, 0xcf, 0x60, 0x4b, 0xd4, 0xd5, 0xf9, 0x2d, 0xbf, 0x88, 0xbd, 0x22, 0x62}} ,
- {{0x13, 0x53, 0xe4, 0x82, 0x57, 0xfa, 0x1e, 0x8f, 0x06, 0x2b, 0x90, 0xba, 0x08, 0xb6, 0x10, 0x54, 0x4f, 0x7c, 0x1b, 0x26, 0xed, 0xda, 0x6b, 0xdd, 0x25, 0xd0, 0x4e, 0xea, 0x42, 0xbb, 0x25, 0x03}}},
-{{{0x51, 0x16, 0x50, 0x7c, 0xd5, 0x5d, 0xf6, 0x99, 0xe8, 0x77, 0x72, 0x4e, 0xfa, 0x62, 0xcb, 0x76, 0x75, 0x0c, 0xe2, 0x71, 0x98, 0x92, 0xd5, 0xfa, 0x45, 0xdf, 0x5c, 0x6f, 0x1e, 0x9e, 0x28, 0x69}} ,
- {{0x0d, 0xac, 0x66, 0x6d, 0xc3, 0x8b, 0xba, 0x16, 0xb5, 0xe2, 0xa0, 0x0d, 0x0c, 0xbd, 0xa4, 0x8e, 0x18, 0x6c, 0xf2, 0xdc, 0xf9, 0xdc, 0x4a, 0x86, 0x25, 0x95, 0x14, 0xcb, 0xd8, 0x1a, 0x04, 0x0f}}},
-{{{0x97, 0xa5, 0xdb, 0x8b, 0x2d, 0xaa, 0x42, 0x11, 0x09, 0xf2, 0x93, 0xbb, 0xd9, 0x06, 0x84, 0x4e, 0x11, 0xa8, 0xa0, 0x25, 0x2b, 0xa6, 0x5f, 0xae, 0xc4, 0xb4, 0x4c, 0xc8, 0xab, 0xc7, 0x3b, 0x02}} ,
- {{0xee, 0xc9, 0x29, 0x0f, 0xdf, 0x11, 0x85, 0xed, 0xce, 0x0d, 0x62, 0x2c, 0x8f, 0x4b, 0xf9, 0x04, 0xe9, 0x06, 0x72, 0x1d, 0x37, 0x20, 0x50, 0xc9, 0x14, 0xeb, 0xec, 0x39, 0xa7, 0x97, 0x2b, 0x4d}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x69, 0xd1, 0x39, 0xbd, 0xfb, 0x33, 0xbe, 0xc4, 0xf0, 0x5c, 0xef, 0xf0, 0x56, 0x68, 0xfc, 0x97, 0x47, 0xc8, 0x72, 0xb6, 0x53, 0xa4, 0x0a, 0x98, 0xa5, 0xb4, 0x37, 0x71, 0xcf, 0x66, 0x50, 0x6d}} ,
- {{0x17, 0xa4, 0x19, 0x52, 0x11, 0x47, 0xb3, 0x5c, 0x5b, 0xa9, 0x2e, 0x22, 0xb4, 0x00, 0x52, 0xf9, 0x57, 0x18, 0xb8, 0xbe, 0x5a, 0xe3, 0xab, 0x83, 0xc8, 0x87, 0x0a, 0x2a, 0xd8, 0x8c, 0xbb, 0x54}}},
-{{{0xa9, 0x62, 0x93, 0x85, 0xbe, 0xe8, 0x73, 0x4a, 0x0e, 0xb0, 0xb5, 0x2d, 0x94, 0x50, 0xaa, 0xd3, 0xb2, 0xea, 0x9d, 0x62, 0x76, 0x3b, 0x07, 0x34, 0x4e, 0x2d, 0x70, 0xc8, 0x9a, 0x15, 0x66, 0x6b}} ,
- {{0xc5, 0x96, 0xca, 0xc8, 0x22, 0x1a, 0xee, 0x5f, 0xe7, 0x31, 0x60, 0x22, 0x83, 0x08, 0x63, 0xce, 0xb9, 0x32, 0x44, 0x58, 0x5d, 0x3a, 0x9b, 0xe4, 0x04, 0xd5, 0xef, 0x38, 0xef, 0x4b, 0xdd, 0x19}}},
-{{{0x4d, 0xc2, 0x17, 0x75, 0xa1, 0x68, 0xcd, 0xc3, 0xc6, 0x03, 0x44, 0xe3, 0x78, 0x09, 0x91, 0x47, 0x3f, 0x0f, 0xe4, 0x92, 0x58, 0xfa, 0x7d, 0x1f, 0x20, 0x94, 0x58, 0x5e, 0xbc, 0x19, 0x02, 0x6f}} ,
- {{0x20, 0xd6, 0xd8, 0x91, 0x54, 0xa7, 0xf3, 0x20, 0x4b, 0x34, 0x06, 0xfa, 0x30, 0xc8, 0x6f, 0x14, 0x10, 0x65, 0x74, 0x13, 0x4e, 0xf0, 0x69, 0x26, 0xce, 0xcf, 0x90, 0xf4, 0xd0, 0xc5, 0xc8, 0x64}}},
-{{{0x26, 0xa2, 0x50, 0x02, 0x24, 0x72, 0xf1, 0xf0, 0x4e, 0x2d, 0x93, 0xd5, 0x08, 0xe7, 0xae, 0x38, 0xf7, 0x18, 0xa5, 0x32, 0x34, 0xc2, 0xf0, 0xa6, 0xec, 0xb9, 0x61, 0x7b, 0x64, 0x99, 0xac, 0x71}} ,
- {{0x25, 0xcf, 0x74, 0x55, 0x1b, 0xaa, 0xa9, 0x38, 0x41, 0x40, 0xd5, 0x95, 0x95, 0xab, 0x1c, 0x5e, 0xbc, 0x41, 0x7e, 0x14, 0x30, 0xbe, 0x13, 0x89, 0xf4, 0xe5, 0xeb, 0x28, 0xc0, 0xc2, 0x96, 0x3a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x2b, 0x77, 0x45, 0xec, 0x67, 0x76, 0x32, 0x4c, 0xb9, 0xdf, 0x25, 0x32, 0x6b, 0xcb, 0xe7, 0x14, 0x61, 0x43, 0xee, 0xba, 0x9b, 0x71, 0xef, 0xd2, 0x48, 0x65, 0xbb, 0x1b, 0x8a, 0x13, 0x1b, 0x22}} ,
- {{0x84, 0xad, 0x0c, 0x18, 0x38, 0x5a, 0xba, 0xd0, 0x98, 0x59, 0xbf, 0x37, 0xb0, 0x4f, 0x97, 0x60, 0x20, 0xb3, 0x9b, 0x97, 0xf6, 0x08, 0x6c, 0xa4, 0xff, 0xfb, 0xb7, 0xfa, 0x95, 0xb2, 0x51, 0x79}}},
-{{{0x28, 0x5c, 0x3f, 0xdb, 0x6b, 0x18, 0x3b, 0x5c, 0xd1, 0x04, 0x28, 0xde, 0x85, 0x52, 0x31, 0xb5, 0xbb, 0xf6, 0xa9, 0xed, 0xbe, 0x28, 0x4f, 0xb3, 0x7e, 0x05, 0x6a, 0xdb, 0x95, 0x0d, 0x1b, 0x1c}} ,
- {{0xd5, 0xc5, 0xc3, 0x9a, 0x0a, 0xd0, 0x31, 0x3e, 0x07, 0x36, 0x8e, 0xc0, 0x8a, 0x62, 0xb1, 0xca, 0xd6, 0x0e, 0x1e, 0x9d, 0xef, 0xab, 0x98, 0x4d, 0xbb, 0x6c, 0x05, 0xe0, 0xe4, 0x5d, 0xbd, 0x57}}},
-{{{0xcc, 0x21, 0x27, 0xce, 0xfd, 0xa9, 0x94, 0x8e, 0xe1, 0xab, 0x49, 0xe0, 0x46, 0x26, 0xa1, 0xa8, 0x8c, 0xa1, 0x99, 0x1d, 0xb4, 0x27, 0x6d, 0x2d, 0xc8, 0x39, 0x30, 0x5e, 0x37, 0x52, 0xc4, 0x6e}} ,
- {{0xa9, 0x85, 0xf4, 0xe7, 0xb0, 0x15, 0x33, 0x84, 0x1b, 0x14, 0x1a, 0x02, 0xd9, 0x3b, 0xad, 0x0f, 0x43, 0x6c, 0xea, 0x3e, 0x0f, 0x7e, 0xda, 0xdd, 0x6b, 0x4c, 0x7f, 0x6e, 0xd4, 0x6b, 0xbf, 0x0f}}},
-{{{0x47, 0x9f, 0x7c, 0x56, 0x7c, 0x43, 0x91, 0x1c, 0xbb, 0x4e, 0x72, 0x3e, 0x64, 0xab, 0xa0, 0xa0, 0xdf, 0xb4, 0xd8, 0x87, 0x3a, 0xbd, 0xa8, 0x48, 0xc9, 0xb8, 0xef, 0x2e, 0xad, 0x6f, 0x84, 0x4f}} ,
- {{0x2d, 0x2d, 0xf0, 0x1b, 0x7e, 0x2a, 0x6c, 0xf8, 0xa9, 0x6a, 0xe1, 0xf0, 0x99, 0xa1, 0x67, 0x9a, 0xd4, 0x13, 0xca, 0xca, 0xba, 0x27, 0x92, 0xaa, 0xa1, 0x5d, 0x50, 0xde, 0xcc, 0x40, 0x26, 0x0a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x9f, 0x3e, 0xf2, 0xb2, 0x90, 0xce, 0xdb, 0x64, 0x3e, 0x03, 0xdd, 0x37, 0x36, 0x54, 0x70, 0x76, 0x24, 0xb5, 0x69, 0x03, 0xfc, 0xa0, 0x2b, 0x74, 0xb2, 0x05, 0x0e, 0xcc, 0xd8, 0x1f, 0x6a, 0x1f}} ,
- {{0x19, 0x5e, 0x60, 0x69, 0x58, 0x86, 0xa0, 0x31, 0xbd, 0x32, 0xe9, 0x2c, 0x5c, 0xd2, 0x85, 0xba, 0x40, 0x64, 0xa8, 0x74, 0xf8, 0x0e, 0x1c, 0xb3, 0xa9, 0x69, 0xe8, 0x1e, 0x40, 0x64, 0x99, 0x77}}},
-{{{0x6c, 0x32, 0x4f, 0xfd, 0xbb, 0x5c, 0xbb, 0x8d, 0x64, 0x66, 0x4a, 0x71, 0x1f, 0x79, 0xa3, 0xad, 0x8d, 0xf9, 0xd4, 0xec, 0xcf, 0x67, 0x70, 0xfa, 0x05, 0x4a, 0x0f, 0x6e, 0xaf, 0x87, 0x0a, 0x6f}} ,
- {{0xc6, 0x36, 0x6e, 0x6c, 0x8c, 0x24, 0x09, 0x60, 0xbe, 0x26, 0xd2, 0x4c, 0x5e, 0x17, 0xca, 0x5f, 0x1d, 0xcc, 0x87, 0xe8, 0x42, 0x6a, 0xcb, 0xcb, 0x7d, 0x92, 0x05, 0x35, 0x81, 0x13, 0x60, 0x6b}}},
-{{{0xf4, 0x15, 0xcd, 0x0f, 0x0a, 0xaf, 0x4e, 0x6b, 0x51, 0xfd, 0x14, 0xc4, 0x2e, 0x13, 0x86, 0x74, 0x44, 0xcb, 0x66, 0x6b, 0xb6, 0x9d, 0x74, 0x56, 0x32, 0xac, 0x8d, 0x8e, 0x8c, 0x8c, 0x8c, 0x39}} ,
- {{0xca, 0x59, 0x74, 0x1a, 0x11, 0xef, 0x6d, 0xf7, 0x39, 0x5c, 0x3b, 0x1f, 0xfa, 0xe3, 0x40, 0x41, 0x23, 0x9e, 0xf6, 0xd1, 0x21, 0xa2, 0xbf, 0xad, 0x65, 0x42, 0x6b, 0x59, 0x8a, 0xe8, 0xc5, 0x7f}}},
-{{{0x64, 0x05, 0x7a, 0x84, 0x4a, 0x13, 0xc3, 0xf6, 0xb0, 0x6e, 0x9a, 0x6b, 0x53, 0x6b, 0x32, 0xda, 0xd9, 0x74, 0x75, 0xc4, 0xba, 0x64, 0x3d, 0x3b, 0x08, 0xdd, 0x10, 0x46, 0xef, 0xc7, 0x90, 0x1f}} ,
- {{0x7b, 0x2f, 0x3a, 0xce, 0xc8, 0xa1, 0x79, 0x3c, 0x30, 0x12, 0x44, 0x28, 0xf6, 0xbc, 0xff, 0xfd, 0xf4, 0xc0, 0x97, 0xb0, 0xcc, 0xc3, 0x13, 0x7a, 0xb9, 0x9a, 0x16, 0xe4, 0xcb, 0x4c, 0x34, 0x63}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x07, 0x4e, 0xd3, 0x2d, 0x09, 0x33, 0x0e, 0xd2, 0x0d, 0xbe, 0x3e, 0xe7, 0xe4, 0xaa, 0xb7, 0x00, 0x8b, 0xe8, 0xad, 0xaa, 0x7a, 0x8d, 0x34, 0x28, 0xa9, 0x81, 0x94, 0xc5, 0xe7, 0x42, 0xac, 0x47}} ,
- {{0x24, 0x89, 0x7a, 0x8f, 0xb5, 0x9b, 0xf0, 0xc2, 0x03, 0x64, 0xd0, 0x1e, 0xf5, 0xa4, 0xb2, 0xf3, 0x74, 0xe9, 0x1a, 0x16, 0xfd, 0xcb, 0x15, 0xea, 0xeb, 0x10, 0x6c, 0x35, 0xd1, 0xc1, 0xa6, 0x28}}},
-{{{0xcc, 0xd5, 0x39, 0xfc, 0xa5, 0xa4, 0xad, 0x32, 0x15, 0xce, 0x19, 0xe8, 0x34, 0x2b, 0x1c, 0x60, 0x91, 0xfc, 0x05, 0xa9, 0xb3, 0xdc, 0x80, 0x29, 0xc4, 0x20, 0x79, 0x06, 0x39, 0xc0, 0xe2, 0x22}} ,
- {{0xbb, 0xa8, 0xe1, 0x89, 0x70, 0x57, 0x18, 0x54, 0x3c, 0xf6, 0x0d, 0x82, 0x12, 0x05, 0x87, 0x96, 0x06, 0x39, 0xe3, 0xf8, 0xb3, 0x95, 0xe5, 0xd7, 0x26, 0xbf, 0x09, 0x5a, 0x94, 0xf9, 0x1c, 0x63}}},
-{{{0x2b, 0x8c, 0x2d, 0x9a, 0x8b, 0x84, 0xf2, 0x56, 0xfb, 0xad, 0x2e, 0x7f, 0xb7, 0xfc, 0x30, 0xe1, 0x35, 0x89, 0xba, 0x4d, 0xa8, 0x6d, 0xce, 0x8c, 0x8b, 0x30, 0xe0, 0xda, 0x29, 0x18, 0x11, 0x17}} ,
- {{0x19, 0xa6, 0x5a, 0x65, 0x93, 0xc3, 0xb5, 0x31, 0x22, 0x4f, 0xf3, 0xf6, 0x0f, 0xeb, 0x28, 0xc3, 0x7c, 0xeb, 0xce, 0x86, 0xec, 0x67, 0x76, 0x6e, 0x35, 0x45, 0x7b, 0xd8, 0x6b, 0x92, 0x01, 0x65}}},
-{{{0x3d, 0xd5, 0x9a, 0x64, 0x73, 0x36, 0xb1, 0xd6, 0x86, 0x98, 0x42, 0x3f, 0x8a, 0xf1, 0xc7, 0xf5, 0x42, 0xa8, 0x9c, 0x52, 0xa8, 0xdc, 0xf9, 0x24, 0x3f, 0x4a, 0xa1, 0xa4, 0x5b, 0xe8, 0x62, 0x1a}} ,
- {{0xc5, 0xbd, 0xc8, 0x14, 0xd5, 0x0d, 0xeb, 0xe1, 0xa5, 0xe6, 0x83, 0x11, 0x09, 0x00, 0x1d, 0x55, 0x83, 0x51, 0x7e, 0x75, 0x00, 0x81, 0xb9, 0xcb, 0xd8, 0xc5, 0xe5, 0xa1, 0xd9, 0x17, 0x6d, 0x1f}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xea, 0xf9, 0xe4, 0xe9, 0xe1, 0x52, 0x3f, 0x51, 0x19, 0x0d, 0xdd, 0xd9, 0x9d, 0x93, 0x31, 0x87, 0x23, 0x09, 0xd5, 0x83, 0xeb, 0x92, 0x09, 0x76, 0x6e, 0xe3, 0xf8, 0xc0, 0xa2, 0x66, 0xb5, 0x36}} ,
- {{0x3a, 0xbb, 0x39, 0xed, 0x32, 0x02, 0xe7, 0x43, 0x7a, 0x38, 0x14, 0x84, 0xe3, 0x44, 0xd2, 0x5e, 0x94, 0xdd, 0x78, 0x89, 0x55, 0x4c, 0x73, 0x9e, 0xe1, 0xe4, 0x3e, 0x43, 0xd0, 0x4a, 0xde, 0x1b}}},
-{{{0xb2, 0xe7, 0x8f, 0xe3, 0xa3, 0xc5, 0xcb, 0x72, 0xee, 0x79, 0x41, 0xf8, 0xdf, 0xee, 0x65, 0xc5, 0x45, 0x77, 0x27, 0x3c, 0xbd, 0x58, 0xd3, 0x75, 0xe2, 0x04, 0x4b, 0xbb, 0x65, 0xf3, 0xc8, 0x0f}} ,
- {{0x24, 0x7b, 0x93, 0x34, 0xb5, 0xe2, 0x74, 0x48, 0xcd, 0xa0, 0x0b, 0x92, 0x97, 0x66, 0x39, 0xf4, 0xb0, 0xe2, 0x5d, 0x39, 0x6a, 0x5b, 0x45, 0x17, 0x78, 0x1e, 0xdb, 0x91, 0x81, 0x1c, 0xf9, 0x16}}},
-{{{0x16, 0xdf, 0xd1, 0x5a, 0xd5, 0xe9, 0x4e, 0x58, 0x95, 0x93, 0x5f, 0x51, 0x09, 0xc3, 0x2a, 0xc9, 0xd4, 0x55, 0x48, 0x79, 0xa4, 0xa3, 0xb2, 0xc3, 0x62, 0xaa, 0x8c, 0xe8, 0xad, 0x47, 0x39, 0x1b}} ,
- {{0x46, 0xda, 0x9e, 0x51, 0x3a, 0xe6, 0xd1, 0xa6, 0xbb, 0x4d, 0x7b, 0x08, 0xbe, 0x8c, 0xd5, 0xf3, 0x3f, 0xfd, 0xf7, 0x44, 0x80, 0x2d, 0x53, 0x4b, 0xd0, 0x87, 0x68, 0xc1, 0xb5, 0xd8, 0xf7, 0x07}}},
-{{{0xf4, 0x10, 0x46, 0xbe, 0xb7, 0xd2, 0xd1, 0xce, 0x5e, 0x76, 0xa2, 0xd7, 0x03, 0xdc, 0xe4, 0x81, 0x5a, 0xf6, 0x3c, 0xde, 0xae, 0x7a, 0x9d, 0x21, 0x34, 0xa5, 0xf6, 0xa9, 0x73, 0xe2, 0x8d, 0x60}} ,
- {{0xfa, 0x44, 0x71, 0xf6, 0x41, 0xd8, 0xc6, 0x58, 0x13, 0x37, 0xeb, 0x84, 0x0f, 0x96, 0xc7, 0xdc, 0xc8, 0xa9, 0x7a, 0x83, 0xb2, 0x2f, 0x31, 0xb1, 0x1a, 0xd8, 0x98, 0x3f, 0x11, 0xd0, 0x31, 0x3b}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x81, 0xd5, 0x34, 0x16, 0x01, 0xa3, 0x93, 0xea, 0x52, 0x94, 0xec, 0x93, 0xb7, 0x81, 0x11, 0x2d, 0x58, 0xf9, 0xb5, 0x0a, 0xaa, 0x4f, 0xf6, 0x2e, 0x3f, 0x36, 0xbf, 0x33, 0x5a, 0xe7, 0xd1, 0x08}} ,
- {{0x1a, 0xcf, 0x42, 0xae, 0xcc, 0xb5, 0x77, 0x39, 0xc4, 0x5b, 0x5b, 0xd0, 0x26, 0x59, 0x27, 0xd0, 0x55, 0x71, 0x12, 0x9d, 0x88, 0x3d, 0x9c, 0xea, 0x41, 0x6a, 0xf0, 0x50, 0x93, 0x93, 0xdd, 0x47}}},
-{{{0x6f, 0xc9, 0x51, 0x6d, 0x1c, 0xaa, 0xf5, 0xa5, 0x90, 0x3f, 0x14, 0xe2, 0x6e, 0x8e, 0x64, 0xfd, 0xac, 0xe0, 0x4e, 0x22, 0xe5, 0xc1, 0xbc, 0x29, 0x0a, 0x6a, 0x9e, 0xa1, 0x60, 0xcb, 0x2f, 0x0b}} ,
- {{0xdc, 0x39, 0x32, 0xf3, 0xa1, 0x44, 0xe9, 0xc5, 0xc3, 0x78, 0xfb, 0x95, 0x47, 0x34, 0x35, 0x34, 0xe8, 0x25, 0xde, 0x93, 0xc6, 0xb4, 0x76, 0x6d, 0x86, 0x13, 0xc6, 0xe9, 0x68, 0xb5, 0x01, 0x63}}},
-{{{0x1f, 0x9a, 0x52, 0x64, 0x97, 0xd9, 0x1c, 0x08, 0x51, 0x6f, 0x26, 0x9d, 0xaa, 0x93, 0x33, 0x43, 0xfa, 0x77, 0xe9, 0x62, 0x9b, 0x5d, 0x18, 0x75, 0xeb, 0x78, 0xf7, 0x87, 0x8f, 0x41, 0xb4, 0x4d}} ,
- {{0x13, 0xa8, 0x82, 0x3e, 0xe9, 0x13, 0xad, 0xeb, 0x01, 0xca, 0xcf, 0xda, 0xcd, 0xf7, 0x6c, 0xc7, 0x7a, 0xdc, 0x1e, 0x6e, 0xc8, 0x4e, 0x55, 0x62, 0x80, 0xea, 0x78, 0x0c, 0x86, 0xb9, 0x40, 0x51}}},
-{{{0x27, 0xae, 0xd3, 0x0d, 0x4c, 0x8f, 0x34, 0xea, 0x7d, 0x3c, 0xe5, 0x8a, 0xcf, 0x5b, 0x92, 0xd8, 0x30, 0x16, 0xb4, 0xa3, 0x75, 0xff, 0xeb, 0x27, 0xc8, 0x5c, 0x6c, 0xc2, 0xee, 0x6c, 0x21, 0x0b}} ,
- {{0xc3, 0xba, 0x12, 0x53, 0x2a, 0xaa, 0x77, 0xad, 0x19, 0x78, 0x55, 0x8a, 0x2e, 0x60, 0x87, 0xc2, 0x6e, 0x91, 0x38, 0x91, 0x3f, 0x7a, 0xc5, 0x24, 0x8f, 0x51, 0xc5, 0xde, 0xb0, 0x53, 0x30, 0x56}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x02, 0xfe, 0x54, 0x12, 0x18, 0xca, 0x7d, 0xa5, 0x68, 0x43, 0xa3, 0x6d, 0x14, 0x2a, 0x6a, 0xa5, 0x8e, 0x32, 0xe7, 0x63, 0x4f, 0xe3, 0xc6, 0x44, 0x3e, 0xab, 0x63, 0xca, 0x17, 0x86, 0x74, 0x3f}} ,
- {{0x1e, 0x64, 0xc1, 0x7d, 0x52, 0xdc, 0x13, 0x5a, 0xa1, 0x9c, 0x4e, 0xee, 0x99, 0x28, 0xbb, 0x4c, 0xee, 0xac, 0xa9, 0x1b, 0x89, 0xa2, 0x38, 0x39, 0x7b, 0xc4, 0x0f, 0x42, 0xe6, 0x89, 0xed, 0x0f}}},
-{{{0xf3, 0x3c, 0x8c, 0x80, 0x83, 0x10, 0x8a, 0x37, 0x50, 0x9c, 0xb4, 0xdf, 0x3f, 0x8c, 0xf7, 0x23, 0x07, 0xd6, 0xff, 0xa0, 0x82, 0x6c, 0x75, 0x3b, 0xe4, 0xb5, 0xbb, 0xe4, 0xe6, 0x50, 0xf0, 0x08}} ,
- {{0x62, 0xee, 0x75, 0x48, 0x92, 0x33, 0xf2, 0xf4, 0xad, 0x15, 0x7a, 0xa1, 0x01, 0x46, 0xa9, 0x32, 0x06, 0x88, 0xb6, 0x36, 0x47, 0x35, 0xb9, 0xb4, 0x42, 0x85, 0x76, 0xf0, 0x48, 0x00, 0x90, 0x38}}},
-{{{0x51, 0x15, 0x9d, 0xc3, 0x95, 0xd1, 0x39, 0xbb, 0x64, 0x9d, 0x15, 0x81, 0xc1, 0x68, 0xd0, 0xb6, 0xa4, 0x2c, 0x7d, 0x5e, 0x02, 0x39, 0x00, 0xe0, 0x3b, 0xa4, 0xcc, 0xca, 0x1d, 0x81, 0x24, 0x10}} ,
- {{0xe7, 0x29, 0xf9, 0x37, 0xd9, 0x46, 0x5a, 0xcd, 0x70, 0xfe, 0x4d, 0x5b, 0xbf, 0xa5, 0xcf, 0x91, 0xf4, 0xef, 0xee, 0x8a, 0x29, 0xd0, 0xe7, 0xc4, 0x25, 0x92, 0x8a, 0xff, 0x36, 0xfc, 0xe4, 0x49}}},
-{{{0xbd, 0x00, 0xb9, 0x04, 0x7d, 0x35, 0xfc, 0xeb, 0xd0, 0x0b, 0x05, 0x32, 0x52, 0x7a, 0x89, 0x24, 0x75, 0x50, 0xe1, 0x63, 0x02, 0x82, 0x8e, 0xe7, 0x85, 0x0c, 0xf2, 0x56, 0x44, 0x37, 0x83, 0x25}} ,
- {{0x8f, 0xa1, 0xce, 0xcb, 0x60, 0xda, 0x12, 0x02, 0x1e, 0x29, 0x39, 0x2a, 0x03, 0xb7, 0xeb, 0x77, 0x40, 0xea, 0xc9, 0x2b, 0x2c, 0xd5, 0x7d, 0x7e, 0x2c, 0xc7, 0x5a, 0xfd, 0xff, 0xc4, 0xd1, 0x62}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x1d, 0x88, 0x98, 0x5b, 0x4e, 0xfc, 0x41, 0x24, 0x05, 0xe6, 0x50, 0x2b, 0xae, 0x96, 0x51, 0xd9, 0x6b, 0x72, 0xb2, 0x33, 0x42, 0x98, 0x68, 0xbb, 0x10, 0x5a, 0x7a, 0x8c, 0x9d, 0x07, 0xb4, 0x05}} ,
- {{0x2f, 0x61, 0x9f, 0xd7, 0xa8, 0x3f, 0x83, 0x8c, 0x10, 0x69, 0x90, 0xe6, 0xcf, 0xd2, 0x63, 0xa3, 0xe4, 0x54, 0x7e, 0xe5, 0x69, 0x13, 0x1c, 0x90, 0x57, 0xaa, 0xe9, 0x53, 0x22, 0x43, 0x29, 0x23}}},
-{{{0xe5, 0x1c, 0xf8, 0x0a, 0xfd, 0x2d, 0x7e, 0xf5, 0xf5, 0x70, 0x7d, 0x41, 0x6b, 0x11, 0xfe, 0xbe, 0x99, 0xd1, 0x55, 0x29, 0x31, 0xbf, 0xc0, 0x97, 0x6c, 0xd5, 0x35, 0xcc, 0x5e, 0x8b, 0xd9, 0x69}} ,
- {{0x8e, 0x4e, 0x9f, 0x25, 0xf8, 0x81, 0x54, 0x2d, 0x0e, 0xd5, 0x54, 0x81, 0x9b, 0xa6, 0x92, 0xce, 0x4b, 0xe9, 0x8f, 0x24, 0x3b, 0xca, 0xe0, 0x44, 0xab, 0x36, 0xfe, 0xfb, 0x87, 0xd4, 0x26, 0x3e}}},
-{{{0x0f, 0x93, 0x9c, 0x11, 0xe7, 0xdb, 0xf1, 0xf0, 0x85, 0x43, 0x28, 0x15, 0x37, 0xdd, 0xde, 0x27, 0xdf, 0xad, 0x3e, 0x49, 0x4f, 0xe0, 0x5b, 0xf6, 0x80, 0x59, 0x15, 0x3c, 0x85, 0xb7, 0x3e, 0x12}} ,
- {{0xf5, 0xff, 0xcc, 0xf0, 0xb4, 0x12, 0x03, 0x5f, 0xc9, 0x84, 0xcb, 0x1d, 0x17, 0xe0, 0xbc, 0xcc, 0x03, 0x62, 0xa9, 0x8b, 0x94, 0xa6, 0xaa, 0x18, 0xcb, 0x27, 0x8d, 0x49, 0xa6, 0x17, 0x15, 0x07}}},
-{{{0xd9, 0xb6, 0xd4, 0x9d, 0xd4, 0x6a, 0xaf, 0x70, 0x07, 0x2c, 0x10, 0x9e, 0xbd, 0x11, 0xad, 0xe4, 0x26, 0x33, 0x70, 0x92, 0x78, 0x1c, 0x74, 0x9f, 0x75, 0x60, 0x56, 0xf4, 0x39, 0xa8, 0xa8, 0x62}} ,
- {{0x3b, 0xbf, 0x55, 0x35, 0x61, 0x8b, 0x44, 0x97, 0xe8, 0x3a, 0x55, 0xc1, 0xc8, 0x3b, 0xfd, 0x95, 0x29, 0x11, 0x60, 0x96, 0x1e, 0xcb, 0x11, 0x9d, 0xc2, 0x03, 0x8a, 0x1b, 0xc6, 0xd6, 0x45, 0x3d}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x7e, 0x0e, 0x50, 0xb2, 0xcc, 0x0d, 0x6b, 0xa6, 0x71, 0x5b, 0x42, 0xed, 0xbd, 0xaf, 0xac, 0xf0, 0xfc, 0x12, 0xa2, 0x3f, 0x4e, 0xda, 0xe8, 0x11, 0xf3, 0x23, 0xe1, 0x04, 0x62, 0x03, 0x1c, 0x4e}} ,
- {{0xc8, 0xb1, 0x1b, 0x6f, 0x73, 0x61, 0x3d, 0x27, 0x0d, 0x7d, 0x7a, 0x25, 0x5f, 0x73, 0x0e, 0x2f, 0x93, 0xf6, 0x24, 0xd8, 0x4f, 0x90, 0xac, 0xa2, 0x62, 0x0a, 0xf0, 0x61, 0xd9, 0x08, 0x59, 0x6a}}},
-{{{0x6f, 0x2d, 0x55, 0xf8, 0x2f, 0x8e, 0xf0, 0x18, 0x3b, 0xea, 0xdd, 0x26, 0x72, 0xd1, 0xf5, 0xfe, 0xe5, 0xb8, 0xe6, 0xd3, 0x10, 0x48, 0x46, 0x49, 0x3a, 0x9f, 0x5e, 0x45, 0x6b, 0x90, 0xe8, 0x7f}} ,
- {{0xd3, 0x76, 0x69, 0x33, 0x7b, 0xb9, 0x40, 0x70, 0xee, 0xa6, 0x29, 0x6b, 0xdd, 0xd0, 0x5d, 0x8d, 0xc1, 0x3e, 0x4a, 0xea, 0x37, 0xb1, 0x03, 0x02, 0x03, 0x35, 0xf1, 0x28, 0x9d, 0xff, 0x00, 0x13}}},
-{{{0x7a, 0xdb, 0x12, 0xd2, 0x8a, 0x82, 0x03, 0x1b, 0x1e, 0xaf, 0xf9, 0x4b, 0x9c, 0xbe, 0xae, 0x7c, 0xe4, 0x94, 0x2a, 0x23, 0xb3, 0x62, 0x86, 0xe7, 0xfd, 0x23, 0xaa, 0x99, 0xbd, 0x2b, 0x11, 0x6c}} ,
- {{0x8d, 0xa6, 0xd5, 0xac, 0x9d, 0xcc, 0x68, 0x75, 0x7f, 0xc3, 0x4d, 0x4b, 0xdd, 0x6c, 0xbb, 0x11, 0x5a, 0x60, 0xe5, 0xbd, 0x7d, 0x27, 0x8b, 0xda, 0xb4, 0x95, 0xf6, 0x03, 0x27, 0xa4, 0x92, 0x3f}}},
-{{{0x22, 0xd6, 0xb5, 0x17, 0x84, 0xbf, 0x12, 0xcc, 0x23, 0x14, 0x4a, 0xdf, 0x14, 0x31, 0xbc, 0xa1, 0xac, 0x6e, 0xab, 0xfa, 0x57, 0x11, 0x53, 0xb3, 0x27, 0xe6, 0xf9, 0x47, 0x33, 0x44, 0x34, 0x1e}} ,
- {{0x79, 0xfc, 0xa6, 0xb4, 0x0b, 0x35, 0x20, 0xc9, 0x4d, 0x22, 0x84, 0xc4, 0xa9, 0x20, 0xec, 0x89, 0x94, 0xba, 0x66, 0x56, 0x48, 0xb9, 0x87, 0x7f, 0xca, 0x1e, 0x06, 0xed, 0xa5, 0x55, 0x59, 0x29}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x56, 0xe1, 0xf5, 0xf1, 0xd5, 0xab, 0xa8, 0x2b, 0xae, 0x89, 0xf3, 0xcf, 0x56, 0x9f, 0xf2, 0x4b, 0x31, 0xbc, 0x18, 0xa9, 0x06, 0x5b, 0xbe, 0xb4, 0x61, 0xf8, 0xb2, 0x06, 0x9c, 0x81, 0xab, 0x4c}} ,
- {{0x1f, 0x68, 0x76, 0x01, 0x16, 0x38, 0x2b, 0x0f, 0x77, 0x97, 0x92, 0x67, 0x4e, 0x86, 0x6a, 0x8b, 0xe5, 0xe8, 0x0c, 0xf7, 0x36, 0x39, 0xb5, 0x33, 0xe6, 0xcf, 0x5e, 0xbd, 0x18, 0xfb, 0x10, 0x1f}}},
-{{{0x83, 0xf0, 0x0d, 0x63, 0xef, 0x53, 0x6b, 0xb5, 0x6b, 0xf9, 0x83, 0xcf, 0xde, 0x04, 0x22, 0x9b, 0x2c, 0x0a, 0xe0, 0xa5, 0xd8, 0xc7, 0x9c, 0xa5, 0xa3, 0xf6, 0x6f, 0xcf, 0x90, 0x6b, 0x68, 0x7c}} ,
- {{0x33, 0x15, 0xd7, 0x7f, 0x1a, 0xd5, 0x21, 0x58, 0xc4, 0x18, 0xa5, 0xf0, 0xcc, 0x73, 0xa8, 0xfd, 0xfa, 0x18, 0xd1, 0x03, 0x91, 0x8d, 0x52, 0xd2, 0xa3, 0xa4, 0xd3, 0xb1, 0xea, 0x1d, 0x0f, 0x00}}},
-{{{0xcc, 0x48, 0x83, 0x90, 0xe5, 0xfd, 0x3f, 0x84, 0xaa, 0xf9, 0x8b, 0x82, 0x59, 0x24, 0x34, 0x68, 0x4f, 0x1c, 0x23, 0xd9, 0xcc, 0x71, 0xe1, 0x7f, 0x8c, 0xaf, 0xf1, 0xee, 0x00, 0xb6, 0xa0, 0x77}} ,
- {{0xf5, 0x1a, 0x61, 0xf7, 0x37, 0x9d, 0x00, 0xf4, 0xf2, 0x69, 0x6f, 0x4b, 0x01, 0x85, 0x19, 0x45, 0x4d, 0x7f, 0x02, 0x7c, 0x6a, 0x05, 0x47, 0x6c, 0x1f, 0x81, 0x20, 0xd4, 0xe8, 0x50, 0x27, 0x72}}},
-{{{0x2c, 0x3a, 0xe5, 0xad, 0xf4, 0xdd, 0x2d, 0xf7, 0x5c, 0x44, 0xb5, 0x5b, 0x21, 0xa3, 0x89, 0x5f, 0x96, 0x45, 0xca, 0x4d, 0xa4, 0x21, 0x99, 0x70, 0xda, 0xc4, 0xc4, 0xa0, 0xe5, 0xf4, 0xec, 0x0a}} ,
- {{0x07, 0x68, 0x21, 0x65, 0xe9, 0x08, 0xa0, 0x0b, 0x6a, 0x4a, 0xba, 0xb5, 0x80, 0xaf, 0xd0, 0x1b, 0xc5, 0xf5, 0x4b, 0x73, 0x50, 0x60, 0x2d, 0x71, 0x69, 0x61, 0x0e, 0xc0, 0x20, 0x40, 0x30, 0x19}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xd0, 0x75, 0x57, 0x3b, 0xeb, 0x5c, 0x14, 0x56, 0x50, 0xc9, 0x4f, 0xb8, 0xb8, 0x1e, 0xa3, 0xf4, 0xab, 0xf5, 0xa9, 0x20, 0x15, 0x94, 0x82, 0xda, 0x96, 0x1c, 0x9b, 0x59, 0x8c, 0xff, 0xf4, 0x51}} ,
- {{0xc1, 0x3a, 0x86, 0xd7, 0xb0, 0x06, 0x84, 0x7f, 0x1b, 0xbd, 0xd4, 0x07, 0x78, 0x80, 0x2e, 0xb1, 0xb4, 0xee, 0x52, 0x38, 0xee, 0x9a, 0xf9, 0xf6, 0xf3, 0x41, 0x6e, 0xd4, 0x88, 0x95, 0xac, 0x35}}},
-{{{0x41, 0x97, 0xbf, 0x71, 0x6a, 0x9b, 0x72, 0xec, 0xf3, 0xf8, 0x6b, 0xe6, 0x0e, 0x6c, 0x69, 0xa5, 0x2f, 0x68, 0x52, 0xd8, 0x61, 0x81, 0xc0, 0x63, 0x3f, 0xa6, 0x3c, 0x13, 0x90, 0xe6, 0x8d, 0x56}} ,
- {{0xe8, 0x39, 0x30, 0x77, 0x23, 0xb1, 0xfd, 0x1b, 0x3d, 0x3e, 0x74, 0x4d, 0x7f, 0xae, 0x5b, 0x3a, 0xb4, 0x65, 0x0e, 0x3a, 0x43, 0xdc, 0xdc, 0x41, 0x47, 0xe6, 0xe8, 0x92, 0x09, 0x22, 0x48, 0x4c}}},
-{{{0x85, 0x57, 0x9f, 0xb5, 0xc8, 0x06, 0xb2, 0x9f, 0x47, 0x3f, 0xf0, 0xfa, 0xe6, 0xa9, 0xb1, 0x9b, 0x6f, 0x96, 0x7d, 0xf9, 0xa4, 0x65, 0x09, 0x75, 0x32, 0xa6, 0x6c, 0x7f, 0x47, 0x4b, 0x2f, 0x4f}} ,
- {{0x34, 0xe9, 0x59, 0x93, 0x9d, 0x26, 0x80, 0x54, 0xf2, 0xcc, 0x3c, 0xc2, 0x25, 0x85, 0xe3, 0x6a, 0xc1, 0x62, 0x04, 0xa7, 0x08, 0x32, 0x6d, 0xa1, 0x39, 0x84, 0x8a, 0x3b, 0x87, 0x5f, 0x11, 0x13}}},
-{{{0xda, 0x03, 0x34, 0x66, 0xc4, 0x0c, 0x73, 0x6e, 0xbc, 0x24, 0xb5, 0xf9, 0x70, 0x81, 0x52, 0xe9, 0xf4, 0x7c, 0x23, 0xdd, 0x9f, 0xb8, 0x46, 0xef, 0x1d, 0x22, 0x55, 0x7d, 0x71, 0xc4, 0x42, 0x33}} ,
- {{0xc5, 0x37, 0x69, 0x5b, 0xa8, 0xc6, 0x9d, 0xa4, 0xfc, 0x61, 0x6e, 0x68, 0x46, 0xea, 0xd7, 0x1c, 0x67, 0xd2, 0x7d, 0xfa, 0xf1, 0xcc, 0x54, 0x8d, 0x36, 0x35, 0xc9, 0x00, 0xdf, 0x6c, 0x67, 0x50}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x9a, 0x4d, 0x42, 0x29, 0x5d, 0xa4, 0x6b, 0x6f, 0xa8, 0x8a, 0x4d, 0x91, 0x7b, 0xd2, 0xdf, 0x36, 0xef, 0x01, 0x22, 0xc5, 0xcc, 0x8d, 0xeb, 0x58, 0x3d, 0xb3, 0x50, 0xfc, 0x8b, 0x97, 0x96, 0x33}} ,
- {{0x93, 0x33, 0x07, 0xc8, 0x4a, 0xca, 0xd0, 0xb1, 0xab, 0xbd, 0xdd, 0xa7, 0x7c, 0xac, 0x3e, 0x45, 0xcb, 0xcc, 0x07, 0x91, 0xbf, 0x35, 0x9d, 0xcb, 0x7d, 0x12, 0x3c, 0x11, 0x59, 0x13, 0xcf, 0x5c}}},
-{{{0x45, 0xb8, 0x41, 0xd7, 0xab, 0x07, 0x15, 0x00, 0x8e, 0xce, 0xdf, 0xb2, 0x43, 0x5c, 0x01, 0xdc, 0xf4, 0x01, 0x51, 0x95, 0x10, 0x5a, 0xf6, 0x24, 0x24, 0xa0, 0x19, 0x3a, 0x09, 0x2a, 0xaa, 0x3f}} ,
- {{0xdc, 0x8e, 0xeb, 0xc6, 0xbf, 0xdd, 0x11, 0x7b, 0xe7, 0x47, 0xe6, 0xce, 0xe7, 0xb6, 0xc5, 0xe8, 0x8a, 0xdc, 0x4b, 0x57, 0x15, 0x3b, 0x66, 0xca, 0x89, 0xa3, 0xfd, 0xac, 0x0d, 0xe1, 0x1d, 0x7a}}},
-{{{0x89, 0xef, 0xbf, 0x03, 0x75, 0xd0, 0x29, 0x50, 0xcb, 0x7d, 0xd6, 0xbe, 0xad, 0x5f, 0x7b, 0x00, 0x32, 0xaa, 0x98, 0xed, 0x3f, 0x8f, 0x92, 0xcb, 0x81, 0x56, 0x01, 0x63, 0x64, 0xa3, 0x38, 0x39}} ,
- {{0x8b, 0xa4, 0xd6, 0x50, 0xb4, 0xaa, 0x5d, 0x64, 0x64, 0x76, 0x2e, 0xa1, 0xa6, 0xb3, 0xb8, 0x7c, 0x7a, 0x56, 0xf5, 0x5c, 0x4e, 0x84, 0x5c, 0xfb, 0xdd, 0xca, 0x48, 0x8b, 0x48, 0xb9, 0xba, 0x34}}},
-{{{0xc5, 0xe3, 0xe8, 0xae, 0x17, 0x27, 0xe3, 0x64, 0x60, 0x71, 0x47, 0x29, 0x02, 0x0f, 0x92, 0x5d, 0x10, 0x93, 0xc8, 0x0e, 0xa1, 0xed, 0xba, 0xa9, 0x96, 0x1c, 0xc5, 0x76, 0x30, 0xcd, 0xf9, 0x30}} ,
- {{0x95, 0xb0, 0xbd, 0x8c, 0xbc, 0xa7, 0x4f, 0x7e, 0xfd, 0x4e, 0x3a, 0xbf, 0x5f, 0x04, 0x79, 0x80, 0x2b, 0x5a, 0x9f, 0x4f, 0x68, 0x21, 0x19, 0x71, 0xc6, 0x20, 0x01, 0x42, 0xaa, 0xdf, 0xae, 0x2c}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x90, 0x6e, 0x7e, 0x4b, 0x71, 0x93, 0xc0, 0x72, 0xed, 0xeb, 0x71, 0x24, 0x97, 0x26, 0x9c, 0xfe, 0xcb, 0x3e, 0x59, 0x19, 0xa8, 0x0f, 0x75, 0x7d, 0xbe, 0x18, 0xe6, 0x96, 0x1e, 0x95, 0x70, 0x60}} ,
- {{0x89, 0x66, 0x3e, 0x1d, 0x4c, 0x5f, 0xfe, 0xc0, 0x04, 0x43, 0xd6, 0x44, 0x19, 0xb5, 0xad, 0xc7, 0x22, 0xdc, 0x71, 0x28, 0x64, 0xde, 0x41, 0x38, 0x27, 0x8f, 0x2c, 0x6b, 0x08, 0xb8, 0xb8, 0x7b}}},
-{{{0x3d, 0x70, 0x27, 0x9d, 0xd9, 0xaf, 0xb1, 0x27, 0xaf, 0xe3, 0x5d, 0x1e, 0x3a, 0x30, 0x54, 0x61, 0x60, 0xe8, 0xc3, 0x26, 0x3a, 0xbc, 0x7e, 0xf5, 0x81, 0xdd, 0x64, 0x01, 0x04, 0xeb, 0xc0, 0x1e}} ,
- {{0xda, 0x2c, 0xa4, 0xd1, 0xa1, 0xc3, 0x5c, 0x6e, 0x32, 0x07, 0x1f, 0xb8, 0x0e, 0x19, 0x9e, 0x99, 0x29, 0x33, 0x9a, 0xae, 0x7a, 0xed, 0x68, 0x42, 0x69, 0x7c, 0x07, 0xb3, 0x38, 0x2c, 0xf6, 0x3d}}},
-{{{0x64, 0xaa, 0xb5, 0x88, 0x79, 0x65, 0x38, 0x8c, 0x94, 0xd6, 0x62, 0x37, 0x7d, 0x64, 0xcd, 0x3a, 0xeb, 0xff, 0xe8, 0x81, 0x09, 0xc7, 0x6a, 0x50, 0x09, 0x0d, 0x28, 0x03, 0x0d, 0x9a, 0x93, 0x0a}} ,
- {{0x42, 0xa3, 0xf1, 0xc5, 0xb4, 0x0f, 0xd8, 0xc8, 0x8d, 0x15, 0x31, 0xbd, 0xf8, 0x07, 0x8b, 0xcd, 0x08, 0x8a, 0xfb, 0x18, 0x07, 0xfe, 0x8e, 0x52, 0x86, 0xef, 0xbe, 0xec, 0x49, 0x52, 0x99, 0x08}}},
-{{{0x0f, 0xa9, 0xd5, 0x01, 0xaa, 0x48, 0x4f, 0x28, 0x66, 0x32, 0x1a, 0xba, 0x7c, 0xea, 0x11, 0x80, 0x17, 0x18, 0x9b, 0x56, 0x88, 0x25, 0x06, 0x69, 0x12, 0x2c, 0xea, 0x56, 0x69, 0x41, 0x24, 0x19}} ,
- {{0xde, 0x21, 0xf0, 0xda, 0x8a, 0xfb, 0xb1, 0xb8, 0xcd, 0xc8, 0x6a, 0x82, 0x19, 0x73, 0xdb, 0xc7, 0xcf, 0x88, 0xeb, 0x96, 0xee, 0x6f, 0xfb, 0x06, 0xd2, 0xcd, 0x7d, 0x7b, 0x12, 0x28, 0x8e, 0x0c}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x93, 0x44, 0x97, 0xce, 0x28, 0xff, 0x3a, 0x40, 0xc4, 0xf5, 0xf6, 0x9b, 0xf4, 0x6b, 0x07, 0x84, 0xfb, 0x98, 0xd8, 0xec, 0x8c, 0x03, 0x57, 0xec, 0x49, 0xed, 0x63, 0xb6, 0xaa, 0xff, 0x98, 0x28}} ,
- {{0x3d, 0x16, 0x35, 0xf3, 0x46, 0xbc, 0xb3, 0xf4, 0xc6, 0xb6, 0x4f, 0xfa, 0xf4, 0xa0, 0x13, 0xe6, 0x57, 0x45, 0x93, 0xb9, 0xbc, 0xd6, 0x59, 0xe7, 0x77, 0x94, 0x6c, 0xab, 0x96, 0x3b, 0x4f, 0x09}}},
-{{{0x5a, 0xf7, 0x6b, 0x01, 0x12, 0x4f, 0x51, 0xc1, 0x70, 0x84, 0x94, 0x47, 0xb2, 0x01, 0x6c, 0x71, 0xd7, 0xcc, 0x17, 0x66, 0x0f, 0x59, 0x5d, 0x5d, 0x10, 0x01, 0x57, 0x11, 0xf5, 0xdd, 0xe2, 0x34}} ,
- {{0x26, 0xd9, 0x1f, 0x5c, 0x58, 0xac, 0x8b, 0x03, 0xd2, 0xc3, 0x85, 0x0f, 0x3a, 0xc3, 0x7f, 0x6d, 0x8e, 0x86, 0xcd, 0x52, 0x74, 0x8f, 0x55, 0x77, 0x17, 0xb7, 0x8e, 0xb7, 0x88, 0xea, 0xda, 0x1b}}},
-{{{0xb6, 0xea, 0x0e, 0x40, 0x93, 0x20, 0x79, 0x35, 0x6a, 0x61, 0x84, 0x5a, 0x07, 0x6d, 0xf9, 0x77, 0x6f, 0xed, 0x69, 0x1c, 0x0d, 0x25, 0x76, 0xcc, 0xf0, 0xdb, 0xbb, 0xc5, 0xad, 0xe2, 0x26, 0x57}} ,
- {{0xcf, 0xe8, 0x0e, 0x6b, 0x96, 0x7d, 0xed, 0x27, 0xd1, 0x3c, 0xa9, 0xd9, 0x50, 0xa9, 0x98, 0x84, 0x5e, 0x86, 0xef, 0xd6, 0xf0, 0xf8, 0x0e, 0x89, 0x05, 0x2f, 0xd9, 0x5f, 0x15, 0x5f, 0x73, 0x79}}},
-{{{0xc8, 0x5c, 0x16, 0xfe, 0xed, 0x9f, 0x26, 0x56, 0xf6, 0x4b, 0x9f, 0xa7, 0x0a, 0x85, 0xfe, 0xa5, 0x8c, 0x87, 0xdd, 0x98, 0xce, 0x4e, 0xc3, 0x58, 0x55, 0xb2, 0x7b, 0x3d, 0xd8, 0x6b, 0xb5, 0x4c}} ,
- {{0x65, 0x38, 0xa0, 0x15, 0xfa, 0xa7, 0xb4, 0x8f, 0xeb, 0xc4, 0x86, 0x9b, 0x30, 0xa5, 0x5e, 0x4d, 0xea, 0x8a, 0x9a, 0x9f, 0x1a, 0xd8, 0x5b, 0x53, 0x14, 0x19, 0x25, 0x63, 0xb4, 0x6f, 0x1f, 0x5d}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xac, 0x8f, 0xbc, 0x1e, 0x7d, 0x8b, 0x5a, 0x0b, 0x8d, 0xaf, 0x76, 0x2e, 0x71, 0xe3, 0x3b, 0x6f, 0x53, 0x2f, 0x3e, 0x90, 0x95, 0xd4, 0x35, 0x14, 0x4f, 0x8c, 0x3c, 0xce, 0x57, 0x1c, 0x76, 0x49}} ,
- {{0xa8, 0x50, 0xe1, 0x61, 0x6b, 0x57, 0x35, 0xeb, 0x44, 0x0b, 0x0c, 0x6e, 0xf9, 0x25, 0x80, 0x74, 0xf2, 0x8f, 0x6f, 0x7a, 0x3e, 0x7f, 0x2d, 0xf3, 0x4e, 0x09, 0x65, 0x10, 0x5e, 0x03, 0x25, 0x32}}},
-{{{0xa9, 0x60, 0xdc, 0x0f, 0x64, 0xe5, 0x1d, 0xe2, 0x8d, 0x4f, 0x79, 0x2f, 0x0e, 0x24, 0x02, 0x00, 0x05, 0x77, 0x43, 0x25, 0x3d, 0x6a, 0xc7, 0xb7, 0xbf, 0x04, 0x08, 0x65, 0xf4, 0x39, 0x4b, 0x65}} ,
- {{0x96, 0x19, 0x12, 0x6b, 0x6a, 0xb7, 0xe3, 0xdc, 0x45, 0x9b, 0xdb, 0xb4, 0xa8, 0xae, 0xdc, 0xa8, 0x14, 0x44, 0x65, 0x62, 0xce, 0x34, 0x9a, 0x84, 0x18, 0x12, 0x01, 0xf1, 0xe2, 0x7b, 0xce, 0x50}}},
-{{{0x41, 0x21, 0x30, 0x53, 0x1b, 0x47, 0x01, 0xb7, 0x18, 0xd8, 0x82, 0x57, 0xbd, 0xa3, 0x60, 0xf0, 0x32, 0xf6, 0x5b, 0xf0, 0x30, 0x88, 0x91, 0x59, 0xfd, 0x90, 0xa2, 0xb9, 0x55, 0x93, 0x21, 0x34}} ,
- {{0x97, 0x67, 0x9e, 0xeb, 0x6a, 0xf9, 0x6e, 0xd6, 0x73, 0xe8, 0x6b, 0x29, 0xec, 0x63, 0x82, 0x00, 0xa8, 0x99, 0x1c, 0x1d, 0x30, 0xc8, 0x90, 0x52, 0x90, 0xb6, 0x6a, 0x80, 0x4e, 0xff, 0x4b, 0x51}}},
-{{{0x0f, 0x7d, 0x63, 0x8c, 0x6e, 0x5c, 0xde, 0x30, 0xdf, 0x65, 0xfa, 0x2e, 0xb0, 0xa3, 0x25, 0x05, 0x54, 0xbd, 0x25, 0xba, 0x06, 0xae, 0xdf, 0x8b, 0xd9, 0x1b, 0xea, 0x38, 0xb3, 0x05, 0x16, 0x09}} ,
- {{0xc7, 0x8c, 0xbf, 0x64, 0x28, 0xad, 0xf8, 0xa5, 0x5a, 0x6f, 0xc9, 0xba, 0xd5, 0x7f, 0xd5, 0xd6, 0xbd, 0x66, 0x2f, 0x3d, 0xaa, 0x54, 0xf6, 0xba, 0x32, 0x22, 0x9a, 0x1e, 0x52, 0x05, 0xf4, 0x1d}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xaa, 0x1f, 0xbb, 0xeb, 0xfe, 0xe4, 0x87, 0xfc, 0xb1, 0x2c, 0xb7, 0x88, 0xf4, 0xc6, 0xb9, 0xf5, 0x24, 0x46, 0xf2, 0xa5, 0x9f, 0x8f, 0x8a, 0x93, 0x70, 0x69, 0xd4, 0x56, 0xec, 0xfd, 0x06, 0x46}} ,
- {{0x4e, 0x66, 0xcf, 0x4e, 0x34, 0xce, 0x0c, 0xd9, 0xa6, 0x50, 0xd6, 0x5e, 0x95, 0xaf, 0xe9, 0x58, 0xfa, 0xee, 0x9b, 0xb8, 0xa5, 0x0f, 0x35, 0xe0, 0x43, 0x82, 0x6d, 0x65, 0xe6, 0xd9, 0x00, 0x0f}}},
-{{{0x7b, 0x75, 0x3a, 0xfc, 0x64, 0xd3, 0x29, 0x7e, 0xdd, 0x49, 0x9a, 0x59, 0x53, 0xbf, 0xb4, 0xa7, 0x52, 0xb3, 0x05, 0xab, 0xc3, 0xaf, 0x16, 0x1a, 0x85, 0x42, 0x32, 0xa2, 0x86, 0xfa, 0x39, 0x43}} ,
- {{0x0e, 0x4b, 0xa3, 0x63, 0x8a, 0xfe, 0xa5, 0x58, 0xf1, 0x13, 0xbd, 0x9d, 0xaa, 0x7f, 0x76, 0x40, 0x70, 0x81, 0x10, 0x75, 0x99, 0xbb, 0xbe, 0x0b, 0x16, 0xe9, 0xba, 0x62, 0x34, 0xcc, 0x07, 0x6d}}},
-{{{0xc3, 0xf1, 0xc6, 0x93, 0x65, 0xee, 0x0b, 0xbc, 0xea, 0x14, 0xf0, 0xc1, 0xf8, 0x84, 0x89, 0xc2, 0xc9, 0xd7, 0xea, 0x34, 0xca, 0xa7, 0xc4, 0x99, 0xd5, 0x50, 0x69, 0xcb, 0xd6, 0x21, 0x63, 0x7c}} ,
- {{0x99, 0xeb, 0x7c, 0x31, 0x73, 0x64, 0x67, 0x7f, 0x0c, 0x66, 0xaa, 0x8c, 0x69, 0x91, 0xe2, 0x26, 0xd3, 0x23, 0xe2, 0x76, 0x5d, 0x32, 0x52, 0xdf, 0x5d, 0xc5, 0x8f, 0xb7, 0x7c, 0x84, 0xb3, 0x70}}},
-{{{0xeb, 0x01, 0xc7, 0x36, 0x97, 0x4e, 0xb6, 0xab, 0x5f, 0x0d, 0x2c, 0xba, 0x67, 0x64, 0x55, 0xde, 0xbc, 0xff, 0xa6, 0xec, 0x04, 0xd3, 0x8d, 0x39, 0x56, 0x5e, 0xee, 0xf8, 0xe4, 0x2e, 0x33, 0x62}} ,
- {{0x65, 0xef, 0xb8, 0x9f, 0xc8, 0x4b, 0xa7, 0xfd, 0x21, 0x49, 0x9b, 0x92, 0x35, 0x82, 0xd6, 0x0a, 0x9b, 0xf2, 0x79, 0xf1, 0x47, 0x2f, 0x6a, 0x7e, 0x9f, 0xcf, 0x18, 0x02, 0x3c, 0xfb, 0x1b, 0x3e}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x2f, 0x8b, 0xc8, 0x40, 0x51, 0xd1, 0xac, 0x1a, 0x0b, 0xe4, 0xa9, 0xa2, 0x42, 0x21, 0x19, 0x2f, 0x7b, 0x97, 0xbf, 0xf7, 0x57, 0x6d, 0x3f, 0x3d, 0x4f, 0x0f, 0xe2, 0xb2, 0x81, 0x00, 0x9e, 0x7b}} ,
- {{0x8c, 0x85, 0x2b, 0xc4, 0xfc, 0xf1, 0xab, 0xe8, 0x79, 0x22, 0xc4, 0x84, 0x17, 0x3a, 0xfa, 0x86, 0xa6, 0x7d, 0xf9, 0xf3, 0x6f, 0x03, 0x57, 0x20, 0x4d, 0x79, 0xf9, 0x6e, 0x71, 0x54, 0x38, 0x09}}},
-{{{0x40, 0x29, 0x74, 0xa8, 0x2f, 0x5e, 0xf9, 0x79, 0xa4, 0xf3, 0x3e, 0xb9, 0xfd, 0x33, 0x31, 0xac, 0x9a, 0x69, 0x88, 0x1e, 0x77, 0x21, 0x2d, 0xf3, 0x91, 0x52, 0x26, 0x15, 0xb2, 0xa6, 0xcf, 0x7e}} ,
- {{0xc6, 0x20, 0x47, 0x6c, 0xa4, 0x7d, 0xcb, 0x63, 0xea, 0x5b, 0x03, 0xdf, 0x3e, 0x88, 0x81, 0x6d, 0xce, 0x07, 0x42, 0x18, 0x60, 0x7e, 0x7b, 0x55, 0xfe, 0x6a, 0xf3, 0xda, 0x5c, 0x8b, 0x95, 0x10}}},
-{{{0x62, 0xe4, 0x0d, 0x03, 0xb4, 0xd7, 0xcd, 0xfa, 0xbd, 0x46, 0xdf, 0x93, 0x71, 0x10, 0x2c, 0xa8, 0x3b, 0xb6, 0x09, 0x05, 0x70, 0x84, 0x43, 0x29, 0xa8, 0x59, 0xf5, 0x8e, 0x10, 0xe4, 0xd7, 0x20}} ,
- {{0x57, 0x82, 0x1c, 0xab, 0xbf, 0x62, 0x70, 0xe8, 0xc4, 0xcf, 0xf0, 0x28, 0x6e, 0x16, 0x3c, 0x08, 0x78, 0x89, 0x85, 0x46, 0x0f, 0xf6, 0x7f, 0xcf, 0xcb, 0x7e, 0xb8, 0x25, 0xe9, 0x5a, 0xfa, 0x03}}},
-{{{0xfb, 0x95, 0x92, 0x63, 0x50, 0xfc, 0x62, 0xf0, 0xa4, 0x5e, 0x8c, 0x18, 0xc2, 0x17, 0x24, 0xb7, 0x78, 0xc2, 0xa9, 0xe7, 0x6a, 0x32, 0xd6, 0x29, 0x85, 0xaf, 0xcb, 0x8d, 0x91, 0x13, 0xda, 0x6b}} ,
- {{0x36, 0x0a, 0xc2, 0xb6, 0x4b, 0xa5, 0x5d, 0x07, 0x17, 0x41, 0x31, 0x5f, 0x62, 0x46, 0xf8, 0x92, 0xf9, 0x66, 0x48, 0x73, 0xa6, 0x97, 0x0d, 0x7d, 0x88, 0xee, 0x62, 0xb1, 0x03, 0xa8, 0x3f, 0x2c}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x4a, 0xb1, 0x70, 0x8a, 0xa9, 0xe8, 0x63, 0x79, 0x00, 0xe2, 0x25, 0x16, 0xca, 0x4b, 0x0f, 0xa4, 0x66, 0xad, 0x19, 0x9f, 0x88, 0x67, 0x0c, 0x8b, 0xc2, 0x4a, 0x5b, 0x2b, 0x6d, 0x95, 0xaf, 0x19}} ,
- {{0x8b, 0x9d, 0xb6, 0xcc, 0x60, 0xb4, 0x72, 0x4f, 0x17, 0x69, 0x5a, 0x4a, 0x68, 0x34, 0xab, 0xa1, 0x45, 0x32, 0x3c, 0x83, 0x87, 0x72, 0x30, 0x54, 0x77, 0x68, 0xae, 0xfb, 0xb5, 0x8b, 0x22, 0x5e}}},
-{{{0xf1, 0xb9, 0x87, 0x35, 0xc5, 0xbb, 0xb9, 0xcf, 0xf5, 0xd6, 0xcd, 0xd5, 0x0c, 0x7c, 0x0e, 0xe6, 0x90, 0x34, 0xfb, 0x51, 0x42, 0x1e, 0x6d, 0xac, 0x9a, 0x46, 0xc4, 0x97, 0x29, 0x32, 0xbf, 0x45}} ,
- {{0x66, 0x9e, 0xc6, 0x24, 0xc0, 0xed, 0xa5, 0x5d, 0x88, 0xd4, 0xf0, 0x73, 0x97, 0x7b, 0xea, 0x7f, 0x42, 0xff, 0x21, 0xa0, 0x9b, 0x2f, 0x9a, 0xfd, 0x53, 0x57, 0x07, 0x84, 0x48, 0x88, 0x9d, 0x52}}},
-{{{0xc6, 0x96, 0x48, 0x34, 0x2a, 0x06, 0xaf, 0x94, 0x3d, 0xf4, 0x1a, 0xcf, 0xf2, 0xc0, 0x21, 0xc2, 0x42, 0x5e, 0xc8, 0x2f, 0x35, 0xa2, 0x3e, 0x29, 0xfa, 0x0c, 0x84, 0xe5, 0x89, 0x72, 0x7c, 0x06}} ,
- {{0x32, 0x65, 0x03, 0xe5, 0x89, 0xa6, 0x6e, 0xb3, 0x5b, 0x8e, 0xca, 0xeb, 0xfe, 0x22, 0x56, 0x8b, 0x5d, 0x14, 0x4b, 0x4d, 0xf9, 0xbe, 0xb5, 0xf5, 0xe6, 0x5c, 0x7b, 0x8b, 0xf4, 0x13, 0x11, 0x34}}},
-{{{0x07, 0xc6, 0x22, 0x15, 0xe2, 0x9c, 0x60, 0xa2, 0x19, 0xd9, 0x27, 0xae, 0x37, 0x4e, 0xa6, 0xc9, 0x80, 0xa6, 0x91, 0x8f, 0x12, 0x49, 0xe5, 0x00, 0x18, 0x47, 0xd1, 0xd7, 0x28, 0x22, 0x63, 0x39}} ,
- {{0xe8, 0xe2, 0x00, 0x7e, 0xf2, 0x9e, 0x1e, 0x99, 0x39, 0x95, 0x04, 0xbd, 0x1e, 0x67, 0x7b, 0xb2, 0x26, 0xac, 0xe6, 0xaa, 0xe2, 0x46, 0xd5, 0xe4, 0xe8, 0x86, 0xbd, 0xab, 0x7c, 0x55, 0x59, 0x6f}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x24, 0x64, 0x6e, 0x9b, 0x35, 0x71, 0x78, 0xce, 0x33, 0x03, 0x21, 0x33, 0x36, 0xf1, 0x73, 0x9b, 0xb9, 0x15, 0x8b, 0x2c, 0x69, 0xcf, 0x4d, 0xed, 0x4f, 0x4d, 0x57, 0x14, 0x13, 0x82, 0xa4, 0x4d}} ,
- {{0x65, 0x6e, 0x0a, 0xa4, 0x59, 0x07, 0x17, 0xf2, 0x6b, 0x4a, 0x1f, 0x6e, 0xf6, 0xb5, 0xbc, 0x62, 0xe4, 0xb6, 0xda, 0xa2, 0x93, 0xbc, 0x29, 0x05, 0xd2, 0xd2, 0x73, 0x46, 0x03, 0x16, 0x40, 0x31}}},
-{{{0x4c, 0x73, 0x6d, 0x15, 0xbd, 0xa1, 0x4d, 0x5c, 0x13, 0x0b, 0x24, 0x06, 0x98, 0x78, 0x1c, 0x5b, 0xeb, 0x1f, 0x18, 0x54, 0x43, 0xd9, 0x55, 0x66, 0xda, 0x29, 0x21, 0xe8, 0xb8, 0x3c, 0x42, 0x22}} ,
- {{0xb4, 0xcd, 0x08, 0x6f, 0x15, 0x23, 0x1a, 0x0b, 0x22, 0xed, 0xd1, 0xf1, 0xa7, 0xc7, 0x73, 0x45, 0xf3, 0x9e, 0xce, 0x76, 0xb7, 0xf6, 0x39, 0xb6, 0x8e, 0x79, 0xbe, 0xe9, 0x9b, 0xcf, 0x7d, 0x62}}},
-{{{0x92, 0x5b, 0xfc, 0x72, 0xfd, 0xba, 0xf1, 0xfd, 0xa6, 0x7c, 0x95, 0xe3, 0x61, 0x3f, 0xe9, 0x03, 0xd4, 0x2b, 0xd4, 0x20, 0xd9, 0xdb, 0x4d, 0x32, 0x3e, 0xf5, 0x11, 0x64, 0xe3, 0xb4, 0xbe, 0x32}} ,
- {{0x86, 0x17, 0x90, 0xe7, 0xc9, 0x1f, 0x10, 0xa5, 0x6a, 0x2d, 0x39, 0xd0, 0x3b, 0xc4, 0xa6, 0xe9, 0x59, 0x13, 0xda, 0x1a, 0xe6, 0xa0, 0xb9, 0x3c, 0x50, 0xb8, 0x40, 0x7c, 0x15, 0x36, 0x5a, 0x42}}},
-{{{0xb4, 0x0b, 0x32, 0xab, 0xdc, 0x04, 0x51, 0x55, 0x21, 0x1e, 0x0b, 0x75, 0x99, 0x89, 0x73, 0x35, 0x3a, 0x91, 0x2b, 0xfe, 0xe7, 0x49, 0xea, 0x76, 0xc1, 0xf9, 0x46, 0xb9, 0x53, 0x02, 0x23, 0x04}} ,
- {{0xfc, 0x5a, 0x1e, 0x1d, 0x74, 0x58, 0x95, 0xa6, 0x8f, 0x7b, 0x97, 0x3e, 0x17, 0x3b, 0x79, 0x2d, 0xa6, 0x57, 0xef, 0x45, 0x02, 0x0b, 0x4d, 0x6e, 0x9e, 0x93, 0x8d, 0x2f, 0xd9, 0x9d, 0xdb, 0x04}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xc0, 0xd7, 0x56, 0x97, 0x58, 0x91, 0xde, 0x09, 0x4f, 0x9f, 0xbe, 0x63, 0xb0, 0x83, 0x86, 0x43, 0x5d, 0xbc, 0xe0, 0xf3, 0xc0, 0x75, 0xbf, 0x8b, 0x8e, 0xaa, 0xf7, 0x8b, 0x64, 0x6e, 0xb0, 0x63}} ,
- {{0x16, 0xae, 0x8b, 0xe0, 0x9b, 0x24, 0x68, 0x5c, 0x44, 0xc2, 0xd0, 0x08, 0xb7, 0x7b, 0x62, 0xfd, 0x7f, 0xd8, 0xd4, 0xb7, 0x50, 0xfd, 0x2c, 0x1b, 0xbf, 0x41, 0x95, 0xd9, 0x8e, 0xd8, 0x17, 0x1b}}},
-{{{0x86, 0x55, 0x37, 0x8e, 0xc3, 0x38, 0x48, 0x14, 0xb5, 0x97, 0xd2, 0xa7, 0x54, 0x45, 0xf1, 0x35, 0x44, 0x38, 0x9e, 0xf1, 0x1b, 0xb6, 0x34, 0x00, 0x3c, 0x96, 0xee, 0x29, 0x00, 0xea, 0x2c, 0x0b}} ,
- {{0xea, 0xda, 0x99, 0x9e, 0x19, 0x83, 0x66, 0x6d, 0xe9, 0x76, 0x87, 0x50, 0xd1, 0xfd, 0x3c, 0x60, 0x87, 0xc6, 0x41, 0xd9, 0x8e, 0xdb, 0x5e, 0xde, 0xaa, 0x9a, 0xd3, 0x28, 0xda, 0x95, 0xea, 0x47}}},
-{{{0xd0, 0x80, 0xba, 0x19, 0xae, 0x1d, 0xa9, 0x79, 0xf6, 0x3f, 0xac, 0x5d, 0x6f, 0x96, 0x1f, 0x2a, 0xce, 0x29, 0xb2, 0xff, 0x37, 0xf1, 0x94, 0x8f, 0x0c, 0xb5, 0x28, 0xba, 0x9a, 0x21, 0xf6, 0x66}} ,
- {{0x02, 0xfb, 0x54, 0xb8, 0x05, 0xf3, 0x81, 0x52, 0x69, 0x34, 0x46, 0x9d, 0x86, 0x76, 0x8f, 0xd7, 0xf8, 0x6a, 0x66, 0xff, 0xe6, 0xa7, 0x90, 0xf7, 0x5e, 0xcd, 0x6a, 0x9b, 0x55, 0xfc, 0x9d, 0x48}}},
-{{{0xbd, 0xaa, 0x13, 0xe6, 0xcd, 0x45, 0x4a, 0xa4, 0x59, 0x0a, 0x64, 0xb1, 0x98, 0xd6, 0x34, 0x13, 0x04, 0xe6, 0x97, 0x94, 0x06, 0xcb, 0xd4, 0x4e, 0xbb, 0x96, 0xcd, 0xd1, 0x57, 0xd1, 0xe3, 0x06}} ,
- {{0x7a, 0x6c, 0x45, 0x27, 0xc4, 0x93, 0x7f, 0x7d, 0x7c, 0x62, 0x50, 0x38, 0x3a, 0x6b, 0xb5, 0x88, 0xc6, 0xd9, 0xf1, 0x78, 0x19, 0xb9, 0x39, 0x93, 0x3d, 0xc9, 0xe0, 0x9c, 0x3c, 0xce, 0xf5, 0x72}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x24, 0xea, 0x23, 0x7d, 0x56, 0x2c, 0xe2, 0x59, 0x0e, 0x85, 0x60, 0x04, 0x88, 0x5a, 0x74, 0x1e, 0x4b, 0xef, 0x13, 0xda, 0x4c, 0xff, 0x83, 0x45, 0x85, 0x3f, 0x08, 0x95, 0x2c, 0x20, 0x13, 0x1f}} ,
- {{0x48, 0x5f, 0x27, 0x90, 0x5c, 0x02, 0x42, 0xad, 0x78, 0x47, 0x5c, 0xb5, 0x7e, 0x08, 0x85, 0x00, 0xfa, 0x7f, 0xfd, 0xfd, 0xe7, 0x09, 0x11, 0xf2, 0x7e, 0x1b, 0x38, 0x6c, 0x35, 0x6d, 0x33, 0x66}}},
-{{{0x93, 0x03, 0x36, 0x81, 0xac, 0xe4, 0x20, 0x09, 0x35, 0x4c, 0x45, 0xb2, 0x1e, 0x4c, 0x14, 0x21, 0xe6, 0xe9, 0x8a, 0x7b, 0x8d, 0xfe, 0x1e, 0xc6, 0x3e, 0xc1, 0x35, 0xfa, 0xe7, 0x70, 0x4e, 0x1d}} ,
- {{0x61, 0x2e, 0xc2, 0xdd, 0x95, 0x57, 0xd1, 0xab, 0x80, 0xe8, 0x63, 0x17, 0xb5, 0x48, 0xe4, 0x8a, 0x11, 0x9e, 0x72, 0xbe, 0x85, 0x8d, 0x51, 0x0a, 0xf2, 0x9f, 0xe0, 0x1c, 0xa9, 0x07, 0x28, 0x7b}}},
-{{{0xbb, 0x71, 0x14, 0x5e, 0x26, 0x8c, 0x3d, 0xc8, 0xe9, 0x7c, 0xd3, 0xd6, 0xd1, 0x2f, 0x07, 0x6d, 0xe6, 0xdf, 0xfb, 0x79, 0xd6, 0x99, 0x59, 0x96, 0x48, 0x40, 0x0f, 0x3a, 0x7b, 0xb2, 0xa0, 0x72}} ,
- {{0x4e, 0x3b, 0x69, 0xc8, 0x43, 0x75, 0x51, 0x6c, 0x79, 0x56, 0xe4, 0xcb, 0xf7, 0xa6, 0x51, 0xc2, 0x2c, 0x42, 0x0b, 0xd4, 0x82, 0x20, 0x1c, 0x01, 0x08, 0x66, 0xd7, 0xbf, 0x04, 0x56, 0xfc, 0x02}}},
-{{{0x24, 0xe8, 0xb7, 0x60, 0xae, 0x47, 0x80, 0xfc, 0xe5, 0x23, 0xe7, 0xc2, 0xc9, 0x85, 0xe6, 0x98, 0xa0, 0x29, 0x4e, 0xe1, 0x84, 0x39, 0x2d, 0x95, 0x2c, 0xf3, 0x45, 0x3c, 0xff, 0xaf, 0x27, 0x4c}} ,
- {{0x6b, 0xa6, 0xf5, 0x4b, 0x11, 0xbd, 0xba, 0x5b, 0x9e, 0xc4, 0xa4, 0x51, 0x1e, 0xbe, 0xd0, 0x90, 0x3a, 0x9c, 0xc2, 0x26, 0xb6, 0x1e, 0xf1, 0x95, 0x7d, 0xc8, 0x6d, 0x52, 0xe6, 0x99, 0x2c, 0x5f}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x85, 0xe0, 0x24, 0x32, 0xb4, 0xd1, 0xef, 0xfc, 0x69, 0xa2, 0xbf, 0x8f, 0x72, 0x2c, 0x95, 0xf6, 0xe4, 0x6e, 0x7d, 0x90, 0xf7, 0x57, 0x81, 0xa0, 0xf7, 0xda, 0xef, 0x33, 0x07, 0xe3, 0x6b, 0x78}} ,
- {{0x36, 0x27, 0x3e, 0xc6, 0x12, 0x07, 0xab, 0x4e, 0xbe, 0x69, 0x9d, 0xb3, 0xbe, 0x08, 0x7c, 0x2a, 0x47, 0x08, 0xfd, 0xd4, 0xcd, 0x0e, 0x27, 0x34, 0x5b, 0x98, 0x34, 0x2f, 0x77, 0x5f, 0x3a, 0x65}}},
-{{{0x13, 0xaa, 0x2e, 0x4c, 0xf0, 0x22, 0xb8, 0x6c, 0xb3, 0x19, 0x4d, 0xeb, 0x6b, 0xd0, 0xa4, 0xc6, 0x9c, 0xdd, 0xc8, 0x5b, 0x81, 0x57, 0x89, 0xdf, 0x33, 0xa9, 0x68, 0x49, 0x80, 0xe4, 0xfe, 0x21}} ,
- {{0x00, 0x17, 0x90, 0x30, 0xe9, 0xd3, 0x60, 0x30, 0x31, 0xc2, 0x72, 0x89, 0x7a, 0x36, 0xa5, 0xbd, 0x39, 0x83, 0x85, 0x50, 0xa1, 0x5d, 0x6c, 0x41, 0x1d, 0xb5, 0x2c, 0x07, 0x40, 0x77, 0x0b, 0x50}}},
-{{{0x64, 0x34, 0xec, 0xc0, 0x9e, 0x44, 0x41, 0xaf, 0xa0, 0x36, 0x05, 0x6d, 0xea, 0x30, 0x25, 0x46, 0x35, 0x24, 0x9d, 0x86, 0xbd, 0x95, 0xf1, 0x6a, 0x46, 0xd7, 0x94, 0x54, 0xf9, 0x3b, 0xbd, 0x5d}} ,
- {{0x77, 0x5b, 0xe2, 0x37, 0xc7, 0xe1, 0x7c, 0x13, 0x8c, 0x9f, 0x7b, 0x7b, 0x2a, 0xce, 0x42, 0xa3, 0xb9, 0x2a, 0x99, 0xa8, 0xc0, 0xd8, 0x3c, 0x86, 0xb0, 0xfb, 0xe9, 0x76, 0x77, 0xf7, 0xf5, 0x56}}},
-{{{0xdf, 0xb3, 0x46, 0x11, 0x6e, 0x13, 0xb7, 0x28, 0x4e, 0x56, 0xdd, 0xf1, 0xac, 0xad, 0x58, 0xc3, 0xf8, 0x88, 0x94, 0x5e, 0x06, 0x98, 0xa1, 0xe4, 0x6a, 0xfb, 0x0a, 0x49, 0x5d, 0x8a, 0xfe, 0x77}} ,
- {{0x46, 0x02, 0xf5, 0xa5, 0xaf, 0xc5, 0x75, 0x6d, 0xba, 0x45, 0x35, 0x0a, 0xfe, 0xc9, 0xac, 0x22, 0x91, 0x8d, 0x21, 0x95, 0x33, 0x03, 0xc0, 0x8a, 0x16, 0xf3, 0x39, 0xe0, 0x01, 0x0f, 0x53, 0x3c}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x34, 0x75, 0x37, 0x1f, 0x34, 0x4e, 0xa9, 0x1d, 0x68, 0x67, 0xf8, 0x49, 0x98, 0x96, 0xfc, 0x4c, 0x65, 0x97, 0xf7, 0x02, 0x4a, 0x52, 0x6c, 0x01, 0xbd, 0x48, 0xbb, 0x1b, 0xed, 0xa4, 0xe2, 0x53}} ,
- {{0x59, 0xd5, 0x9b, 0x5a, 0xa2, 0x90, 0xd3, 0xb8, 0x37, 0x4c, 0x55, 0x82, 0x28, 0x08, 0x0f, 0x7f, 0xaa, 0x81, 0x65, 0xe0, 0x0c, 0x52, 0xc9, 0xa3, 0x32, 0x27, 0x64, 0xda, 0xfd, 0x34, 0x23, 0x5a}}},
-{{{0xb5, 0xb0, 0x0c, 0x4d, 0xb3, 0x7b, 0x23, 0xc8, 0x1f, 0x8a, 0x39, 0x66, 0xe6, 0xba, 0x4c, 0x10, 0x37, 0xca, 0x9c, 0x7c, 0x05, 0x9e, 0xff, 0xc0, 0xf8, 0x8e, 0xb1, 0x8f, 0x6f, 0x67, 0x18, 0x26}} ,
- {{0x4b, 0x41, 0x13, 0x54, 0x23, 0x1a, 0xa4, 0x4e, 0xa9, 0x8b, 0x1e, 0x4b, 0xfc, 0x15, 0x24, 0xbb, 0x7e, 0xcb, 0xb6, 0x1e, 0x1b, 0xf5, 0xf2, 0xc8, 0x56, 0xec, 0x32, 0xa2, 0x60, 0x5b, 0xa0, 0x2a}}},
-{{{0xa4, 0x29, 0x47, 0x86, 0x2e, 0x92, 0x4f, 0x11, 0x4f, 0xf3, 0xb2, 0x5c, 0xd5, 0x3e, 0xa6, 0xb9, 0xc8, 0xe2, 0x33, 0x11, 0x1f, 0x01, 0x8f, 0xb0, 0x9b, 0xc7, 0xa5, 0xff, 0x83, 0x0f, 0x1e, 0x28}} ,
- {{0x1d, 0x29, 0x7a, 0xa1, 0xec, 0x8e, 0xb5, 0xad, 0xea, 0x02, 0x68, 0x60, 0x74, 0x29, 0x1c, 0xa5, 0xcf, 0xc8, 0x3b, 0x7d, 0x8b, 0x2b, 0x7c, 0xad, 0xa4, 0x40, 0x17, 0x51, 0x59, 0x7c, 0x2e, 0x5d}}},
-{{{0x0a, 0x6c, 0x4f, 0xbc, 0x3e, 0x32, 0xe7, 0x4a, 0x1a, 0x13, 0xc1, 0x49, 0x38, 0xbf, 0xf7, 0xc2, 0xd3, 0x8f, 0x6b, 0xad, 0x52, 0xf7, 0xcf, 0xbc, 0x27, 0xcb, 0x40, 0x67, 0x76, 0xcd, 0x6d, 0x56}} ,
- {{0xe5, 0xb0, 0x27, 0xad, 0xbe, 0x9b, 0xf2, 0xb5, 0x63, 0xde, 0x3a, 0x23, 0x95, 0xb7, 0x0a, 0x7e, 0xf3, 0x9e, 0x45, 0x6f, 0x19, 0x39, 0x75, 0x8f, 0x39, 0x3d, 0x0f, 0xc0, 0x9f, 0xf1, 0xe9, 0x51}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x88, 0xaa, 0x14, 0x24, 0x86, 0x94, 0x11, 0x12, 0x3e, 0x1a, 0xb5, 0xcc, 0xbb, 0xe0, 0x9c, 0xd5, 0x9c, 0x6d, 0xba, 0x58, 0x72, 0x8d, 0xfb, 0x22, 0x7b, 0x9f, 0x7c, 0x94, 0x30, 0xb3, 0x51, 0x21}} ,
- {{0xf6, 0x74, 0x3d, 0xf2, 0xaf, 0xd0, 0x1e, 0x03, 0x7c, 0x23, 0x6b, 0xc9, 0xfc, 0x25, 0x70, 0x90, 0xdc, 0x9a, 0xa4, 0xfb, 0x49, 0xfc, 0x3d, 0x0a, 0x35, 0x38, 0x6f, 0xe4, 0x7e, 0x50, 0x01, 0x2a}}},
-{{{0xd6, 0xe3, 0x96, 0x61, 0x3a, 0xfd, 0xef, 0x9b, 0x1f, 0x90, 0xa4, 0x24, 0x14, 0x5b, 0xc8, 0xde, 0x50, 0xb1, 0x1d, 0xaf, 0xe8, 0x55, 0x8a, 0x87, 0x0d, 0xfe, 0xaa, 0x3b, 0x82, 0x2c, 0x8d, 0x7b}} ,
- {{0x85, 0x0c, 0xaf, 0xf8, 0x83, 0x44, 0x49, 0xd9, 0x45, 0xcf, 0xf7, 0x48, 0xd9, 0x53, 0xb4, 0xf1, 0x65, 0xa0, 0xe1, 0xc3, 0xb3, 0x15, 0xed, 0x89, 0x9b, 0x4f, 0x62, 0xb3, 0x57, 0xa5, 0x45, 0x1c}}},
-{{{0x8f, 0x12, 0xea, 0xaf, 0xd1, 0x1f, 0x79, 0x10, 0x0b, 0xf6, 0xa3, 0x7b, 0xea, 0xac, 0x8b, 0x57, 0x32, 0x62, 0xe7, 0x06, 0x12, 0x51, 0xa0, 0x3b, 0x43, 0x5e, 0xa4, 0x20, 0x78, 0x31, 0xce, 0x0d}} ,
- {{0x84, 0x7c, 0xc2, 0xa6, 0x91, 0x23, 0xce, 0xbd, 0xdc, 0xf9, 0xce, 0xd5, 0x75, 0x30, 0x22, 0xe6, 0xf9, 0x43, 0x62, 0x0d, 0xf7, 0x75, 0x9d, 0x7f, 0x8c, 0xff, 0x7d, 0xe4, 0x72, 0xac, 0x9f, 0x1c}}},
-{{{0x88, 0xc1, 0x99, 0xd0, 0x3c, 0x1c, 0x5d, 0xb4, 0xef, 0x13, 0x0f, 0x90, 0xb9, 0x36, 0x2f, 0x95, 0x95, 0xc6, 0xdc, 0xde, 0x0a, 0x51, 0xe2, 0x8d, 0xf3, 0xbc, 0x51, 0xec, 0xdf, 0xb1, 0xa2, 0x5f}} ,
- {{0x2e, 0x68, 0xa1, 0x23, 0x7d, 0x9b, 0x40, 0x69, 0x85, 0x7b, 0x42, 0xbf, 0x90, 0x4b, 0xd6, 0x40, 0x2f, 0xd7, 0x52, 0x52, 0xb2, 0x21, 0xde, 0x64, 0xbd, 0x88, 0xc3, 0x6d, 0xa5, 0xfa, 0x81, 0x3f}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xfb, 0xfd, 0x47, 0x7b, 0x8a, 0x66, 0x9e, 0x79, 0x2e, 0x64, 0x82, 0xef, 0xf7, 0x21, 0xec, 0xf6, 0xd8, 0x86, 0x09, 0x31, 0x7c, 0xdd, 0x03, 0x6a, 0x58, 0xa0, 0x77, 0xb7, 0x9b, 0x8c, 0x87, 0x1f}} ,
- {{0x55, 0x47, 0xe4, 0xa8, 0x3d, 0x55, 0x21, 0x34, 0xab, 0x1d, 0xae, 0xe0, 0xf4, 0xea, 0xdb, 0xc5, 0xb9, 0x58, 0xbf, 0xc4, 0x2a, 0x89, 0x31, 0x1a, 0xf4, 0x2d, 0xe1, 0xca, 0x37, 0x99, 0x47, 0x59}}},
-{{{0xc7, 0xca, 0x63, 0xc1, 0x49, 0xa9, 0x35, 0x45, 0x55, 0x7e, 0xda, 0x64, 0x32, 0x07, 0x50, 0xf7, 0x32, 0xac, 0xde, 0x75, 0x58, 0x9b, 0x11, 0xb2, 0x3a, 0x1f, 0xf5, 0xf7, 0x79, 0x04, 0xe6, 0x08}} ,
- {{0x46, 0xfa, 0x22, 0x4b, 0xfa, 0xe1, 0xfe, 0x96, 0xfc, 0x67, 0xba, 0x67, 0x97, 0xc4, 0xe7, 0x1b, 0x86, 0x90, 0x5f, 0xee, 0xf4, 0x5b, 0x11, 0xb2, 0xcd, 0xad, 0xee, 0xc2, 0x48, 0x6c, 0x2b, 0x1b}}},
-{{{0xe3, 0x39, 0x62, 0xb4, 0x4f, 0x31, 0x04, 0xc9, 0xda, 0xd5, 0x73, 0x51, 0x57, 0xc5, 0xb8, 0xf3, 0xa3, 0x43, 0x70, 0xe4, 0x61, 0x81, 0x84, 0xe2, 0xbb, 0xbf, 0x4f, 0x9e, 0xa4, 0x5e, 0x74, 0x06}} ,
- {{0x29, 0xac, 0xff, 0x27, 0xe0, 0x59, 0xbe, 0x39, 0x9c, 0x0d, 0x83, 0xd7, 0x10, 0x0b, 0x15, 0xb7, 0xe1, 0xc2, 0x2c, 0x30, 0x73, 0x80, 0x3a, 0x7d, 0x5d, 0xab, 0x58, 0x6b, 0xc1, 0xf0, 0xf4, 0x22}}},
-{{{0xfe, 0x7f, 0xfb, 0x35, 0x7d, 0xc6, 0x01, 0x23, 0x28, 0xc4, 0x02, 0xac, 0x1f, 0x42, 0xb4, 0x9d, 0xfc, 0x00, 0x94, 0xa5, 0xee, 0xca, 0xda, 0x97, 0x09, 0x41, 0x77, 0x87, 0x5d, 0x7b, 0x87, 0x78}} ,
- {{0xf5, 0xfb, 0x90, 0x2d, 0x81, 0x19, 0x9e, 0x2f, 0x6d, 0x85, 0x88, 0x8c, 0x40, 0x5c, 0x77, 0x41, 0x4d, 0x01, 0x19, 0x76, 0x60, 0xe8, 0x4c, 0x48, 0xe4, 0x33, 0x83, 0x32, 0x6c, 0xb4, 0x41, 0x03}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xff, 0x10, 0xc2, 0x09, 0x4f, 0x6e, 0xf4, 0xd2, 0xdf, 0x7e, 0xca, 0x7b, 0x1c, 0x1d, 0xba, 0xa3, 0xb6, 0xda, 0x67, 0x33, 0xd4, 0x87, 0x36, 0x4b, 0x11, 0x20, 0x05, 0xa6, 0x29, 0xc1, 0x87, 0x17}} ,
- {{0xf6, 0x96, 0xca, 0x2f, 0xda, 0x38, 0xa7, 0x1b, 0xfc, 0xca, 0x7d, 0xfe, 0x08, 0x89, 0xe2, 0x47, 0x2b, 0x6a, 0x5d, 0x4b, 0xfa, 0xa1, 0xb4, 0xde, 0xb6, 0xc2, 0x31, 0x51, 0xf5, 0xe0, 0xa4, 0x0b}}},
-{{{0x5c, 0xe5, 0xc6, 0x04, 0x8e, 0x2b, 0x57, 0xbe, 0x38, 0x85, 0x23, 0xcb, 0xb7, 0xbe, 0x4f, 0xa9, 0xd3, 0x6e, 0x12, 0xaa, 0xd5, 0xb2, 0x2e, 0x93, 0x29, 0x9a, 0x4a, 0x88, 0x18, 0x43, 0xf5, 0x01}} ,
- {{0x50, 0xfc, 0xdb, 0xa2, 0x59, 0x21, 0x8d, 0xbd, 0x7e, 0x33, 0xae, 0x2f, 0x87, 0x1a, 0xd0, 0x97, 0xc7, 0x0d, 0x4d, 0x63, 0x01, 0xef, 0x05, 0x84, 0xec, 0x40, 0xdd, 0xa8, 0x0a, 0x4f, 0x70, 0x0b}}},
-{{{0x41, 0x69, 0x01, 0x67, 0x5c, 0xd3, 0x8a, 0xc5, 0xcf, 0x3f, 0xd1, 0x57, 0xd1, 0x67, 0x3e, 0x01, 0x39, 0xb5, 0xcb, 0x81, 0x56, 0x96, 0x26, 0xb6, 0xc2, 0xe7, 0x5c, 0xfb, 0x63, 0x97, 0x58, 0x06}} ,
- {{0x0c, 0x0e, 0xf3, 0xba, 0xf0, 0xe5, 0xba, 0xb2, 0x57, 0x77, 0xc6, 0x20, 0x9b, 0x89, 0x24, 0xbe, 0xf2, 0x9c, 0x8a, 0xba, 0x69, 0xc1, 0xf1, 0xb0, 0x4f, 0x2a, 0x05, 0x9a, 0xee, 0x10, 0x7e, 0x36}}},
-{{{0x3f, 0x26, 0xe9, 0x40, 0xe9, 0x03, 0xad, 0x06, 0x69, 0x91, 0xe0, 0xd1, 0x89, 0x60, 0x84, 0x79, 0xde, 0x27, 0x6d, 0xe6, 0x76, 0xbd, 0xea, 0xe6, 0xae, 0x48, 0xc3, 0x67, 0xc0, 0x57, 0xcd, 0x2f}} ,
- {{0x7f, 0xc1, 0xdc, 0xb9, 0xc7, 0xbc, 0x86, 0x3d, 0x55, 0x4b, 0x28, 0x7a, 0xfb, 0x4d, 0xc7, 0xf8, 0xbc, 0x67, 0x2a, 0x60, 0x4d, 0x8f, 0x07, 0x0b, 0x1a, 0x17, 0xbf, 0xfa, 0xac, 0xa7, 0x3d, 0x1a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x91, 0x3f, 0xed, 0x5e, 0x18, 0x78, 0x3f, 0x23, 0x2c, 0x0d, 0x8c, 0x44, 0x00, 0xe8, 0xfb, 0xe9, 0x8e, 0xd6, 0xd1, 0x36, 0x58, 0x57, 0x9e, 0xae, 0x4b, 0x5c, 0x0b, 0x07, 0xbc, 0x6b, 0x55, 0x2b}} ,
- {{0x6f, 0x4d, 0x17, 0xd7, 0xe1, 0x84, 0xd9, 0x78, 0xb1, 0x90, 0xfd, 0x2e, 0xb3, 0xb5, 0x19, 0x3f, 0x1b, 0xfa, 0xc0, 0x68, 0xb3, 0xdd, 0x00, 0x2e, 0x89, 0xbd, 0x7e, 0x80, 0x32, 0x13, 0xa0, 0x7b}}},
-{{{0x1a, 0x6f, 0x40, 0xaf, 0x44, 0x44, 0xb0, 0x43, 0x8f, 0x0d, 0xd0, 0x1e, 0xc4, 0x0b, 0x19, 0x5d, 0x8e, 0xfe, 0xc1, 0xf3, 0xc5, 0x5c, 0x91, 0xf8, 0x04, 0x4e, 0xbe, 0x90, 0xb4, 0x47, 0x5c, 0x3f}} ,
- {{0xb0, 0x3b, 0x2c, 0xf3, 0xfe, 0x32, 0x71, 0x07, 0x3f, 0xaa, 0xba, 0x45, 0x60, 0xa8, 0x8d, 0xea, 0x54, 0xcb, 0x39, 0x10, 0xb4, 0xf2, 0x8b, 0xd2, 0x14, 0x82, 0x42, 0x07, 0x8e, 0xe9, 0x7c, 0x53}}},
-{{{0xb0, 0xae, 0xc1, 0x8d, 0xc9, 0x8f, 0xb9, 0x7a, 0x77, 0xef, 0xba, 0x79, 0xa0, 0x3c, 0xa8, 0xf5, 0x6a, 0xe2, 0x3f, 0x5d, 0x00, 0xe3, 0x4b, 0x45, 0x24, 0x7b, 0x43, 0x78, 0x55, 0x1d, 0x2b, 0x1e}} ,
- {{0x01, 0xb8, 0xd6, 0x16, 0x67, 0xa0, 0x15, 0xb9, 0xe1, 0x58, 0xa4, 0xa7, 0x31, 0x37, 0x77, 0x2f, 0x8b, 0x12, 0x9f, 0xf4, 0x3f, 0xc7, 0x36, 0x66, 0xd2, 0xa8, 0x56, 0xf7, 0x7f, 0x74, 0xc6, 0x41}}},
-{{{0x5d, 0xf8, 0xb4, 0xa8, 0x30, 0xdd, 0xcc, 0x38, 0xa5, 0xd3, 0xca, 0xd8, 0xd1, 0xf8, 0xb2, 0x31, 0x91, 0xd4, 0x72, 0x05, 0x57, 0x4a, 0x3b, 0x82, 0x4a, 0xc6, 0x68, 0x20, 0xe2, 0x18, 0x41, 0x61}} ,
- {{0x19, 0xd4, 0x8d, 0x47, 0x29, 0x12, 0x65, 0xb0, 0x11, 0x78, 0x47, 0xb5, 0xcb, 0xa3, 0xa5, 0xfa, 0x05, 0x85, 0x54, 0xa9, 0x33, 0x97, 0x8d, 0x2b, 0xc2, 0xfe, 0x99, 0x35, 0x28, 0xe5, 0xeb, 0x63}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xb1, 0x3f, 0x3f, 0xef, 0xd8, 0xf4, 0xfc, 0xb3, 0xa0, 0x60, 0x50, 0x06, 0x2b, 0x29, 0x52, 0x70, 0x15, 0x0b, 0x24, 0x24, 0xf8, 0x5f, 0x79, 0x18, 0xcc, 0xff, 0x89, 0x99, 0x84, 0xa1, 0xae, 0x13}} ,
- {{0x44, 0x1f, 0xb8, 0xc2, 0x01, 0xc1, 0x30, 0x19, 0x55, 0x05, 0x60, 0x10, 0xa4, 0x6c, 0x2d, 0x67, 0x70, 0xe5, 0x25, 0x1b, 0xf2, 0xbf, 0xdd, 0xfb, 0x70, 0x2b, 0xa1, 0x8c, 0x9c, 0x94, 0x84, 0x08}}},
-{{{0xe7, 0xc4, 0x43, 0x4d, 0xc9, 0x2b, 0x69, 0x5d, 0x1d, 0x3c, 0xaf, 0xbb, 0x43, 0x38, 0x4e, 0x98, 0x3d, 0xed, 0x0d, 0x21, 0x03, 0xfd, 0xf0, 0x99, 0x47, 0x04, 0xb0, 0x98, 0x69, 0x55, 0x72, 0x0f}} ,
- {{0x5e, 0xdf, 0x15, 0x53, 0x3b, 0x86, 0x80, 0xb0, 0xf1, 0x70, 0x68, 0x8f, 0x66, 0x7c, 0x0e, 0x49, 0x1a, 0xd8, 0x6b, 0xfe, 0x4e, 0xef, 0xca, 0x47, 0xd4, 0x03, 0xc1, 0x37, 0x50, 0x9c, 0xc1, 0x16}}},
-{{{0xcd, 0x24, 0xc6, 0x3e, 0x0c, 0x82, 0x9b, 0x91, 0x2b, 0x61, 0x4a, 0xb2, 0x0f, 0x88, 0x55, 0x5f, 0x5a, 0x57, 0xff, 0xe5, 0x74, 0x0b, 0x13, 0x43, 0x00, 0xd8, 0x6b, 0xcf, 0xd2, 0x15, 0x03, 0x2c}} ,
- {{0xdc, 0xff, 0x15, 0x61, 0x2f, 0x4a, 0x2f, 0x62, 0xf2, 0x04, 0x2f, 0xb5, 0x0c, 0xb7, 0x1e, 0x3f, 0x74, 0x1a, 0x0f, 0xd7, 0xea, 0xcd, 0xd9, 0x7d, 0xf6, 0x12, 0x0e, 0x2f, 0xdb, 0x5a, 0x3b, 0x16}}},
-{{{0x1b, 0x37, 0x47, 0xe3, 0xf5, 0x9e, 0xea, 0x2c, 0x2a, 0xe7, 0x82, 0x36, 0xf4, 0x1f, 0x81, 0x47, 0x92, 0x4b, 0x69, 0x0e, 0x11, 0x8c, 0x5d, 0x53, 0x5b, 0x81, 0x27, 0x08, 0xbc, 0xa0, 0xae, 0x25}} ,
- {{0x69, 0x32, 0xa1, 0x05, 0x11, 0x42, 0x00, 0xd2, 0x59, 0xac, 0x4d, 0x62, 0x8b, 0x13, 0xe2, 0x50, 0x5d, 0xa0, 0x9d, 0x9b, 0xfd, 0xbb, 0x12, 0x41, 0x75, 0x41, 0x9e, 0xcc, 0xdc, 0xc7, 0xdc, 0x5d}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xd9, 0xe3, 0x38, 0x06, 0x46, 0x70, 0x82, 0x5e, 0x28, 0x49, 0x79, 0xff, 0x25, 0xd2, 0x4e, 0x29, 0x8d, 0x06, 0xb0, 0x23, 0xae, 0x9b, 0x66, 0xe4, 0x7d, 0xc0, 0x70, 0x91, 0xa3, 0xfc, 0xec, 0x4e}} ,
- {{0x62, 0x12, 0x37, 0x6a, 0x30, 0xf6, 0x1e, 0xfb, 0x14, 0x5c, 0x0d, 0x0e, 0xb7, 0x81, 0x6a, 0xe7, 0x08, 0x05, 0xac, 0xaa, 0x38, 0x46, 0xe2, 0x73, 0xea, 0x4b, 0x07, 0x81, 0x43, 0x7c, 0x9e, 0x5e}}},
-{{{0xfc, 0xf9, 0x21, 0x4f, 0x2e, 0x76, 0x9b, 0x1f, 0x28, 0x60, 0x77, 0x43, 0x32, 0x9d, 0xbe, 0x17, 0x30, 0x2a, 0xc6, 0x18, 0x92, 0x66, 0x62, 0x30, 0x98, 0x40, 0x11, 0xa6, 0x7f, 0x18, 0x84, 0x28}} ,
- {{0x3f, 0xab, 0xd3, 0xf4, 0x8a, 0x76, 0xa1, 0x3c, 0xca, 0x2d, 0x49, 0xc3, 0xea, 0x08, 0x0b, 0x85, 0x17, 0x2a, 0xc3, 0x6c, 0x08, 0xfd, 0x57, 0x9f, 0x3d, 0x5f, 0xdf, 0x67, 0x68, 0x42, 0x00, 0x32}}},
-{{{0x51, 0x60, 0x1b, 0x06, 0x4f, 0x8a, 0x21, 0xba, 0x38, 0xa8, 0xba, 0xd6, 0x40, 0xf6, 0xe9, 0x9b, 0x76, 0x4d, 0x56, 0x21, 0x5b, 0x0a, 0x9b, 0x2e, 0x4f, 0x3d, 0x81, 0x32, 0x08, 0x9f, 0x97, 0x5b}} ,
- {{0xe5, 0x44, 0xec, 0x06, 0x9d, 0x90, 0x79, 0x9f, 0xd3, 0xe0, 0x79, 0xaf, 0x8f, 0x10, 0xfd, 0xdd, 0x04, 0xae, 0x27, 0x97, 0x46, 0x33, 0x79, 0xea, 0xb8, 0x4e, 0xca, 0x5a, 0x59, 0x57, 0xe1, 0x0e}}},
-{{{0x1a, 0xda, 0xf3, 0xa5, 0x41, 0x43, 0x28, 0xfc, 0x7e, 0xe7, 0x71, 0xea, 0xc6, 0x3b, 0x59, 0xcc, 0x2e, 0xd3, 0x40, 0xec, 0xb3, 0x13, 0x6f, 0x44, 0xcd, 0x13, 0xb2, 0x37, 0xf2, 0x6e, 0xd9, 0x1c}} ,
- {{0xe3, 0xdb, 0x60, 0xcd, 0x5c, 0x4a, 0x18, 0x0f, 0xef, 0x73, 0x36, 0x71, 0x8c, 0xf6, 0x11, 0xb4, 0xd8, 0xce, 0x17, 0x5e, 0x4f, 0x26, 0x77, 0x97, 0x5f, 0xcb, 0xef, 0x91, 0xeb, 0x6a, 0x62, 0x7a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x18, 0x4a, 0xa2, 0x97, 0x08, 0x81, 0x2d, 0x83, 0xc4, 0xcc, 0xf0, 0x83, 0x7e, 0xec, 0x0d, 0x95, 0x4c, 0x5b, 0xfb, 0xfa, 0x98, 0x80, 0x4a, 0x66, 0x56, 0x0c, 0x51, 0xb3, 0xf2, 0x04, 0x5d, 0x27}} ,
- {{0x3b, 0xb9, 0xb8, 0x06, 0x5a, 0x2e, 0xfe, 0xc3, 0x82, 0x37, 0x9c, 0xa3, 0x11, 0x1f, 0x9c, 0xa6, 0xda, 0x63, 0x48, 0x9b, 0xad, 0xde, 0x2d, 0xa6, 0xbc, 0x6e, 0x32, 0xda, 0x27, 0x65, 0xdd, 0x57}}},
-{{{0x84, 0x4f, 0x37, 0x31, 0x7d, 0x2e, 0xbc, 0xad, 0x87, 0x07, 0x2a, 0x6b, 0x37, 0xfc, 0x5f, 0xeb, 0x4e, 0x75, 0x35, 0xa6, 0xde, 0xab, 0x0a, 0x19, 0x3a, 0xb7, 0xb1, 0xef, 0x92, 0x6a, 0x3b, 0x3c}} ,
- {{0x3b, 0xb2, 0x94, 0x6d, 0x39, 0x60, 0xac, 0xee, 0xe7, 0x81, 0x1a, 0x3b, 0x76, 0x87, 0x5c, 0x05, 0x94, 0x2a, 0x45, 0xb9, 0x80, 0xe9, 0x22, 0xb1, 0x07, 0xcb, 0x40, 0x9e, 0x70, 0x49, 0x6d, 0x12}}},
-{{{0xfd, 0x18, 0x78, 0x84, 0xa8, 0x4c, 0x7d, 0x6e, 0x59, 0xa6, 0xe5, 0x74, 0xf1, 0x19, 0xa6, 0x84, 0x2e, 0x51, 0xc1, 0x29, 0x13, 0xf2, 0x14, 0x6b, 0x5d, 0x53, 0x51, 0xf7, 0xef, 0xbf, 0x01, 0x22}} ,
- {{0xa4, 0x4b, 0x62, 0x4c, 0xe6, 0xfd, 0x72, 0x07, 0xf2, 0x81, 0xfc, 0xf2, 0xbd, 0x12, 0x7c, 0x68, 0x76, 0x2a, 0xba, 0xf5, 0x65, 0xb1, 0x1f, 0x17, 0x0a, 0x38, 0xb0, 0xbf, 0xc0, 0xf8, 0xf4, 0x2a}}},
-{{{0x55, 0x60, 0x55, 0x5b, 0xe4, 0x1d, 0x71, 0x4c, 0x9d, 0x5b, 0x9f, 0x70, 0xa6, 0x85, 0x9a, 0x2c, 0xa0, 0xe2, 0x32, 0x48, 0xce, 0x9e, 0x2a, 0xa5, 0x07, 0x3b, 0xc7, 0x6c, 0x86, 0x77, 0xde, 0x3c}} ,
- {{0xf7, 0x18, 0x7a, 0x96, 0x7e, 0x43, 0x57, 0xa9, 0x55, 0xfc, 0x4e, 0xb6, 0x72, 0x00, 0xf2, 0xe4, 0xd7, 0x52, 0xd3, 0xd3, 0xb6, 0x85, 0xf6, 0x71, 0xc7, 0x44, 0x3f, 0x7f, 0xd7, 0xb3, 0xf2, 0x79}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x46, 0xca, 0xa7, 0x55, 0x7b, 0x79, 0xf3, 0xca, 0x5a, 0x65, 0xf6, 0xed, 0x50, 0x14, 0x7b, 0xe4, 0xc4, 0x2a, 0x65, 0x9e, 0xe2, 0xf9, 0xca, 0xa7, 0x22, 0x26, 0x53, 0xcb, 0x21, 0x5b, 0xa7, 0x31}} ,
- {{0x90, 0xd7, 0xc5, 0x26, 0x08, 0xbd, 0xb0, 0x53, 0x63, 0x58, 0xc3, 0x31, 0x5e, 0x75, 0x46, 0x15, 0x91, 0xa6, 0xf8, 0x2f, 0x1a, 0x08, 0x65, 0x88, 0x2f, 0x98, 0x04, 0xf1, 0x7c, 0x6e, 0x00, 0x77}}},
-{{{0x81, 0x21, 0x61, 0x09, 0xf6, 0x4e, 0xf1, 0x92, 0xee, 0x63, 0x61, 0x73, 0x87, 0xc7, 0x54, 0x0e, 0x42, 0x4b, 0xc9, 0x47, 0xd1, 0xb8, 0x7e, 0x91, 0x75, 0x37, 0x99, 0x28, 0xb8, 0xdd, 0x7f, 0x50}} ,
- {{0x89, 0x8f, 0xc0, 0xbe, 0x5d, 0xd6, 0x9f, 0xa0, 0xf0, 0x9d, 0x81, 0xce, 0x3a, 0x7b, 0x98, 0x58, 0xbb, 0xd7, 0x78, 0xc8, 0x3f, 0x13, 0xf1, 0x74, 0x19, 0xdf, 0xf8, 0x98, 0x89, 0x5d, 0xfa, 0x5f}}},
-{{{0x9e, 0x35, 0x85, 0x94, 0x47, 0x1f, 0x90, 0x15, 0x26, 0xd0, 0x84, 0xed, 0x8a, 0x80, 0xf7, 0x63, 0x42, 0x86, 0x27, 0xd7, 0xf4, 0x75, 0x58, 0xdc, 0x9c, 0xc0, 0x22, 0x7e, 0x20, 0x35, 0xfd, 0x1f}} ,
- {{0x68, 0x0e, 0x6f, 0x97, 0xba, 0x70, 0xbb, 0xa3, 0x0e, 0xe5, 0x0b, 0x12, 0xf4, 0xa2, 0xdc, 0x47, 0xf8, 0xe6, 0xd0, 0x23, 0x6c, 0x33, 0xa8, 0x99, 0x46, 0x6e, 0x0f, 0x44, 0xba, 0x76, 0x48, 0x0f}}},
-{{{0xa3, 0x2a, 0x61, 0x37, 0xe2, 0x59, 0x12, 0x0e, 0x27, 0xba, 0x64, 0x43, 0xae, 0xc0, 0x42, 0x69, 0x79, 0xa4, 0x1e, 0x29, 0x8b, 0x15, 0xeb, 0xf8, 0xaf, 0xd4, 0xa2, 0x68, 0x33, 0xb5, 0x7a, 0x24}} ,
- {{0x2c, 0x19, 0x33, 0xdd, 0x1b, 0xab, 0xec, 0x01, 0xb0, 0x23, 0xf8, 0x42, 0x2b, 0x06, 0x88, 0xea, 0x3d, 0x2d, 0x00, 0x2a, 0x78, 0x45, 0x4d, 0x38, 0xed, 0x2e, 0x2e, 0x44, 0x49, 0xed, 0xcb, 0x33}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xa0, 0x68, 0xe8, 0x41, 0x8f, 0x91, 0xf8, 0x11, 0x13, 0x90, 0x2e, 0xa7, 0xab, 0x30, 0xef, 0xad, 0xa0, 0x61, 0x00, 0x88, 0xef, 0xdb, 0xce, 0x5b, 0x5c, 0xbb, 0x62, 0xc8, 0x56, 0xf9, 0x00, 0x73}} ,
- {{0x3f, 0x60, 0xc1, 0x82, 0x2d, 0xa3, 0x28, 0x58, 0x24, 0x9e, 0x9f, 0xe3, 0x70, 0xcc, 0x09, 0x4e, 0x1a, 0x3f, 0x11, 0x11, 0x15, 0x07, 0x3c, 0xa4, 0x41, 0xe0, 0x65, 0xa3, 0x0a, 0x41, 0x6d, 0x11}}},
-{{{0x31, 0x40, 0x01, 0x52, 0x56, 0x94, 0x5b, 0x28, 0x8a, 0xaa, 0x52, 0xee, 0xd8, 0x0a, 0x05, 0x8d, 0xcd, 0xb5, 0xaa, 0x2e, 0x38, 0xaa, 0xb7, 0x87, 0xf7, 0x2b, 0xfb, 0x04, 0xcb, 0x84, 0x3d, 0x54}} ,
- {{0x20, 0xef, 0x59, 0xde, 0xa4, 0x2b, 0x93, 0x6e, 0x2e, 0xec, 0x42, 0x9a, 0xd4, 0x2d, 0xf4, 0x46, 0x58, 0x27, 0x2b, 0x18, 0x8f, 0x83, 0x3d, 0x69, 0x9e, 0xd4, 0x3e, 0xb6, 0xc5, 0xfd, 0x58, 0x03}}},
-{{{0x33, 0x89, 0xc9, 0x63, 0x62, 0x1c, 0x17, 0xb4, 0x60, 0xc4, 0x26, 0x68, 0x09, 0xc3, 0x2e, 0x37, 0x0f, 0x7b, 0xb4, 0x9c, 0xb6, 0xf9, 0xfb, 0xd4, 0x51, 0x78, 0xc8, 0x63, 0xea, 0x77, 0x47, 0x07}} ,
- {{0x32, 0xb4, 0x18, 0x47, 0x79, 0xcb, 0xd4, 0x5a, 0x07, 0x14, 0x0f, 0xa0, 0xd5, 0xac, 0xd0, 0x41, 0x40, 0xab, 0x61, 0x23, 0xe5, 0x2a, 0x2a, 0x6f, 0xf7, 0xa8, 0xd4, 0x76, 0xef, 0xe7, 0x45, 0x6c}}},
-{{{0xa1, 0x5e, 0x60, 0x4f, 0xfb, 0xe1, 0x70, 0x6a, 0x1f, 0x55, 0x4f, 0x09, 0xb4, 0x95, 0x33, 0x36, 0xc6, 0x81, 0x01, 0x18, 0x06, 0x25, 0x27, 0xa4, 0xb4, 0x24, 0xa4, 0x86, 0x03, 0x4c, 0xac, 0x02}} ,
- {{0x77, 0x38, 0xde, 0xd7, 0x60, 0x48, 0x07, 0xf0, 0x74, 0xa8, 0xff, 0x54, 0xe5, 0x30, 0x43, 0xff, 0x77, 0xfb, 0x21, 0x07, 0xff, 0xb2, 0x07, 0x6b, 0xe4, 0xe5, 0x30, 0xfc, 0x19, 0x6c, 0xa3, 0x01}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x13, 0xc5, 0x2c, 0xac, 0xd3, 0x83, 0x82, 0x7c, 0x29, 0xf7, 0x05, 0xa5, 0x00, 0xb6, 0x1f, 0x86, 0x55, 0xf4, 0xd6, 0x2f, 0x0c, 0x99, 0xd0, 0x65, 0x9b, 0x6b, 0x46, 0x0d, 0x43, 0xf8, 0x16, 0x28}} ,
- {{0x1e, 0x7f, 0xb4, 0x74, 0x7e, 0xb1, 0x89, 0x4f, 0x18, 0x5a, 0xab, 0x64, 0x06, 0xdf, 0x45, 0x87, 0xe0, 0x6a, 0xc6, 0xf0, 0x0e, 0xc9, 0x24, 0x35, 0x38, 0xea, 0x30, 0x54, 0xb4, 0xc4, 0x52, 0x54}}},
-{{{0xe9, 0x9f, 0xdc, 0x3f, 0xc1, 0x89, 0x44, 0x74, 0x27, 0xe4, 0xc1, 0x90, 0xff, 0x4a, 0xa7, 0x3c, 0xee, 0xcd, 0xf4, 0x1d, 0x25, 0x94, 0x7f, 0x63, 0x16, 0x48, 0xbc, 0x64, 0xfe, 0x95, 0xc4, 0x0c}} ,
- {{0x8b, 0x19, 0x75, 0x6e, 0x03, 0x06, 0x5e, 0x6a, 0x6f, 0x1a, 0x8c, 0xe3, 0xd3, 0x28, 0xf2, 0xe0, 0xb9, 0x7a, 0x43, 0x69, 0xe6, 0xd3, 0xc0, 0xfe, 0x7e, 0x97, 0xab, 0x6c, 0x7b, 0x8e, 0x13, 0x42}}},
-{{{0xd4, 0xca, 0x70, 0x3d, 0xab, 0xfb, 0x5f, 0x5e, 0x00, 0x0c, 0xcc, 0x77, 0x22, 0xf8, 0x78, 0x55, 0xae, 0x62, 0x35, 0xfb, 0x9a, 0xc6, 0x03, 0xe4, 0x0c, 0xee, 0xab, 0xc7, 0xc0, 0x89, 0x87, 0x54}} ,
- {{0x32, 0xad, 0xae, 0x85, 0x58, 0x43, 0xb8, 0xb1, 0xe6, 0x3e, 0x00, 0x9c, 0x78, 0x88, 0x56, 0xdb, 0x9c, 0xfc, 0x79, 0xf6, 0xf9, 0x41, 0x5f, 0xb7, 0xbc, 0x11, 0xf9, 0x20, 0x36, 0x1c, 0x53, 0x2b}}},
-{{{0x5a, 0x20, 0x5b, 0xa1, 0xa5, 0x44, 0x91, 0x24, 0x02, 0x63, 0x12, 0x64, 0xb8, 0x55, 0xf6, 0xde, 0x2c, 0xdb, 0x47, 0xb8, 0xc6, 0x0a, 0xc3, 0x00, 0x78, 0x93, 0xd8, 0xf5, 0xf5, 0x18, 0x28, 0x0a}} ,
- {{0xd6, 0x1b, 0x9a, 0x6c, 0xe5, 0x46, 0xea, 0x70, 0x96, 0x8d, 0x4e, 0x2a, 0x52, 0x21, 0x26, 0x4b, 0xb1, 0xbb, 0x0f, 0x7c, 0xa9, 0x9b, 0x04, 0xbb, 0x51, 0x08, 0xf1, 0x9a, 0xa4, 0x76, 0x7c, 0x18}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xfa, 0x94, 0xf7, 0x40, 0xd0, 0xd7, 0xeb, 0xa9, 0x82, 0x36, 0xd5, 0x15, 0xb9, 0x33, 0x7a, 0xbf, 0x8a, 0xf2, 0x63, 0xaa, 0x37, 0xf5, 0x59, 0xac, 0xbd, 0xbb, 0x32, 0x36, 0xbe, 0x73, 0x99, 0x38}} ,
- {{0x2c, 0xb3, 0xda, 0x7a, 0xd8, 0x3d, 0x99, 0xca, 0xd2, 0xf4, 0xda, 0x99, 0x8e, 0x4f, 0x98, 0xb7, 0xf4, 0xae, 0x3e, 0x9f, 0x8e, 0x35, 0x60, 0xa4, 0x33, 0x75, 0xa4, 0x04, 0x93, 0xb1, 0x6b, 0x4d}}},
-{{{0x97, 0x9d, 0xa8, 0xcd, 0x97, 0x7b, 0x9d, 0xb9, 0xe7, 0xa5, 0xef, 0xfd, 0xa8, 0x42, 0x6b, 0xc3, 0x62, 0x64, 0x7d, 0xa5, 0x1b, 0xc9, 0x9e, 0xd2, 0x45, 0xb9, 0xee, 0x03, 0xb0, 0xbf, 0xc0, 0x68}} ,
- {{0xed, 0xb7, 0x84, 0x2c, 0xf6, 0xd3, 0xa1, 0x6b, 0x24, 0x6d, 0x87, 0x56, 0x97, 0x59, 0x79, 0x62, 0x9f, 0xac, 0xed, 0xf3, 0xc9, 0x89, 0x21, 0x2e, 0x04, 0xb3, 0xcc, 0x2f, 0xbe, 0xd6, 0x0a, 0x4b}}},
-{{{0x39, 0x61, 0x05, 0xed, 0x25, 0x89, 0x8b, 0x5d, 0x1b, 0xcb, 0x0c, 0x55, 0xf4, 0x6a, 0x00, 0x8a, 0x46, 0xe8, 0x1e, 0xc6, 0x83, 0xc8, 0x5a, 0x76, 0xdb, 0xcc, 0x19, 0x7a, 0xcc, 0x67, 0x46, 0x0b}} ,
- {{0x53, 0xcf, 0xc2, 0xa1, 0xad, 0x6a, 0xf3, 0xcd, 0x8f, 0xc9, 0xde, 0x1c, 0xf8, 0x6c, 0x8f, 0xf8, 0x76, 0x42, 0xe7, 0xfe, 0xb2, 0x72, 0x21, 0x0a, 0x66, 0x74, 0x8f, 0xb7, 0xeb, 0xe4, 0x6f, 0x01}}},
-{{{0x22, 0x8c, 0x6b, 0xbe, 0xfc, 0x4d, 0x70, 0x62, 0x6e, 0x52, 0x77, 0x99, 0x88, 0x7e, 0x7b, 0x57, 0x7a, 0x0d, 0xfe, 0xdc, 0x72, 0x92, 0xf1, 0x68, 0x1d, 0x97, 0xd7, 0x7c, 0x8d, 0x53, 0x10, 0x37}} ,
- {{0x53, 0x88, 0x77, 0x02, 0xca, 0x27, 0xa8, 0xe5, 0x45, 0xe2, 0xa8, 0x48, 0x2a, 0xab, 0x18, 0xca, 0xea, 0x2d, 0x2a, 0x54, 0x17, 0x37, 0x32, 0x09, 0xdc, 0xe0, 0x4a, 0xb7, 0x7d, 0x82, 0x10, 0x7d}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x8a, 0x64, 0x1e, 0x14, 0x0a, 0x57, 0xd4, 0xda, 0x5c, 0x96, 0x9b, 0x01, 0x4c, 0x67, 0xbf, 0x8b, 0x30, 0xfe, 0x08, 0xdb, 0x0d, 0xd5, 0xa8, 0xd7, 0x09, 0x11, 0x85, 0xa2, 0xd3, 0x45, 0xfb, 0x7e}} ,
- {{0xda, 0x8c, 0xc2, 0xd0, 0xac, 0x18, 0xe8, 0x52, 0x36, 0xd4, 0x21, 0xa3, 0xdd, 0x57, 0x22, 0x79, 0xb7, 0xf8, 0x71, 0x9d, 0xc6, 0x91, 0x70, 0x86, 0x56, 0xbf, 0xa1, 0x11, 0x8b, 0x19, 0xe1, 0x0f}}},
-{{{0x18, 0x32, 0x98, 0x2c, 0x8f, 0x91, 0xae, 0x12, 0xf0, 0x8c, 0xea, 0xf3, 0x3c, 0xb9, 0x5d, 0xe4, 0x69, 0xed, 0xb2, 0x47, 0x18, 0xbd, 0xce, 0x16, 0x52, 0x5c, 0x23, 0xe2, 0xa5, 0x25, 0x52, 0x5d}} ,
- {{0xb9, 0xb1, 0xe7, 0x5d, 0x4e, 0xbc, 0xee, 0xbb, 0x40, 0x81, 0x77, 0x82, 0x19, 0xab, 0xb5, 0xc6, 0xee, 0xab, 0x5b, 0x6b, 0x63, 0x92, 0x8a, 0x34, 0x8d, 0xcd, 0xee, 0x4f, 0x49, 0xe5, 0xc9, 0x7e}}},
-{{{0x21, 0xac, 0x8b, 0x22, 0xcd, 0xc3, 0x9a, 0xe9, 0x5e, 0x78, 0xbd, 0xde, 0xba, 0xad, 0xab, 0xbf, 0x75, 0x41, 0x09, 0xc5, 0x58, 0xa4, 0x7d, 0x92, 0xb0, 0x7f, 0xf2, 0xa1, 0xd1, 0xc0, 0xb3, 0x6d}} ,
- {{0x62, 0x4f, 0xd0, 0x75, 0x77, 0xba, 0x76, 0x77, 0xd7, 0xb8, 0xd8, 0x92, 0x6f, 0x98, 0x34, 0x3d, 0xd6, 0x4e, 0x1c, 0x0f, 0xf0, 0x8f, 0x2e, 0xf1, 0xb3, 0xbd, 0xb1, 0xb9, 0xec, 0x99, 0xb4, 0x07}}},
-{{{0x60, 0x57, 0x2e, 0x9a, 0x72, 0x1d, 0x6b, 0x6e, 0x58, 0x33, 0x24, 0x8c, 0x48, 0x39, 0x46, 0x8e, 0x89, 0x6a, 0x88, 0x51, 0x23, 0x62, 0xb5, 0x32, 0x09, 0x36, 0xe3, 0x57, 0xf5, 0x98, 0xde, 0x6f}} ,
- {{0x8b, 0x2c, 0x00, 0x48, 0x4a, 0xf9, 0x5b, 0x87, 0x69, 0x52, 0xe5, 0x5b, 0xd1, 0xb1, 0xe5, 0x25, 0x25, 0xe0, 0x9c, 0xc2, 0x13, 0x44, 0xe8, 0xb9, 0x0a, 0x70, 0xad, 0xbd, 0x0f, 0x51, 0x94, 0x69}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xa2, 0xdc, 0xab, 0xa9, 0x25, 0x2d, 0xac, 0x5f, 0x03, 0x33, 0x08, 0xe7, 0x7e, 0xfe, 0x95, 0x36, 0x3c, 0x5b, 0x3a, 0xd3, 0x05, 0x82, 0x1c, 0x95, 0x2d, 0xd8, 0x77, 0x7e, 0x02, 0xd9, 0x5b, 0x70}} ,
- {{0xc2, 0xfe, 0x1b, 0x0c, 0x67, 0xcd, 0xd6, 0xe0, 0x51, 0x8e, 0x2c, 0xe0, 0x79, 0x88, 0xf0, 0xcf, 0x41, 0x4a, 0xad, 0x23, 0xd4, 0x46, 0xca, 0x94, 0xa1, 0xc3, 0xeb, 0x28, 0x06, 0xfa, 0x17, 0x14}}},
-{{{0x7b, 0xaa, 0x70, 0x0a, 0x4b, 0xfb, 0xf5, 0xbf, 0x80, 0xc5, 0xcf, 0x08, 0x7a, 0xdd, 0xa1, 0xf4, 0x9d, 0x54, 0x50, 0x53, 0x23, 0x77, 0x23, 0xf5, 0x34, 0xa5, 0x22, 0xd1, 0x0d, 0x96, 0x2e, 0x47}} ,
- {{0xcc, 0xb7, 0x32, 0x89, 0x57, 0xd0, 0x98, 0x75, 0xe4, 0x37, 0x99, 0xa9, 0xe8, 0xba, 0xed, 0xba, 0xeb, 0xc7, 0x4f, 0x15, 0x76, 0x07, 0x0c, 0x4c, 0xef, 0x9f, 0x52, 0xfc, 0x04, 0x5d, 0x58, 0x10}}},
-{{{0xce, 0x82, 0xf0, 0x8f, 0x79, 0x02, 0xa8, 0xd1, 0xda, 0x14, 0x09, 0x48, 0xee, 0x8a, 0x40, 0x98, 0x76, 0x60, 0x54, 0x5a, 0xde, 0x03, 0x24, 0xf5, 0xe6, 0x2f, 0xe1, 0x03, 0xbf, 0x68, 0x82, 0x7f}} ,
- {{0x64, 0xe9, 0x28, 0xc7, 0xa4, 0xcf, 0x2a, 0xf9, 0x90, 0x64, 0x72, 0x2c, 0x8b, 0xeb, 0xec, 0xa0, 0xf2, 0x7d, 0x35, 0xb5, 0x90, 0x4d, 0x7f, 0x5b, 0x4a, 0x49, 0xe4, 0xb8, 0x3b, 0xc8, 0xa1, 0x2f}}},
-{{{0x8b, 0xc5, 0xcc, 0x3d, 0x69, 0xa6, 0xa1, 0x18, 0x44, 0xbc, 0x4d, 0x77, 0x37, 0xc7, 0x86, 0xec, 0x0c, 0xc9, 0xd6, 0x44, 0xa9, 0x23, 0x27, 0xb9, 0x03, 0x34, 0xa7, 0x0a, 0xd5, 0xc7, 0x34, 0x37}} ,
- {{0xf9, 0x7e, 0x3e, 0x66, 0xee, 0xf9, 0x99, 0x28, 0xff, 0xad, 0x11, 0xd8, 0xe2, 0x66, 0xc5, 0xcd, 0x0f, 0x0d, 0x0b, 0x6a, 0xfc, 0x7c, 0x24, 0xa8, 0x4f, 0xa8, 0x5e, 0x80, 0x45, 0x8b, 0x6c, 0x41}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xef, 0x1e, 0xec, 0xf7, 0x8d, 0x77, 0xf2, 0xea, 0xdb, 0x60, 0x03, 0x21, 0xc0, 0xff, 0x5e, 0x67, 0xc3, 0x71, 0x0b, 0x21, 0xb4, 0x41, 0xa0, 0x68, 0x38, 0xc6, 0x01, 0xa3, 0xd3, 0x51, 0x3c, 0x3c}} ,
- {{0x92, 0xf8, 0xd6, 0x4b, 0xef, 0x42, 0x13, 0xb2, 0x4a, 0xc4, 0x2e, 0x72, 0x3f, 0xc9, 0x11, 0xbd, 0x74, 0x02, 0x0e, 0xf5, 0x13, 0x9d, 0x83, 0x1a, 0x1b, 0xd5, 0x54, 0xde, 0xc4, 0x1e, 0x16, 0x6c}}},
-{{{0x27, 0x52, 0xe4, 0x63, 0xaa, 0x94, 0xe6, 0xc3, 0x28, 0x9c, 0xc6, 0x56, 0xac, 0xfa, 0xb6, 0xbd, 0xe2, 0xcc, 0x76, 0xc6, 0x27, 0x27, 0xa2, 0x8e, 0x78, 0x2b, 0x84, 0x72, 0x10, 0xbd, 0x4e, 0x2a}} ,
- {{0xea, 0xa7, 0x23, 0xef, 0x04, 0x61, 0x80, 0x50, 0xc9, 0x6e, 0xa5, 0x96, 0xd1, 0xd1, 0xc8, 0xc3, 0x18, 0xd7, 0x2d, 0xfd, 0x26, 0xbd, 0xcb, 0x7b, 0x92, 0x51, 0x0e, 0x4a, 0x65, 0x57, 0xb8, 0x49}}},
-{{{0xab, 0x55, 0x36, 0xc3, 0xec, 0x63, 0x55, 0x11, 0x55, 0xf6, 0xa5, 0xc7, 0x01, 0x5f, 0xfe, 0x79, 0xd8, 0x0a, 0xf7, 0x03, 0xd8, 0x98, 0x99, 0xf5, 0xd0, 0x00, 0x54, 0x6b, 0x66, 0x28, 0xf5, 0x25}} ,
- {{0x7a, 0x8d, 0xa1, 0x5d, 0x70, 0x5d, 0x51, 0x27, 0xee, 0x30, 0x65, 0x56, 0x95, 0x46, 0xde, 0xbd, 0x03, 0x75, 0xb4, 0x57, 0x59, 0x89, 0xeb, 0x02, 0x9e, 0xcc, 0x89, 0x19, 0xa7, 0xcb, 0x17, 0x67}}},
-{{{0x6a, 0xeb, 0xfc, 0x9a, 0x9a, 0x10, 0xce, 0xdb, 0x3a, 0x1c, 0x3c, 0x6a, 0x9d, 0xea, 0x46, 0xbc, 0x45, 0x49, 0xac, 0xe3, 0x41, 0x12, 0x7c, 0xf0, 0xf7, 0x4f, 0xf9, 0xf7, 0xff, 0x2c, 0x89, 0x04}} ,
- {{0x30, 0x31, 0x54, 0x1a, 0x46, 0xca, 0xe6, 0xc6, 0xcb, 0xe2, 0xc3, 0xc1, 0x8b, 0x75, 0x81, 0xbe, 0xee, 0xf8, 0xa3, 0x11, 0x1c, 0x25, 0xa3, 0xa7, 0x35, 0x51, 0x55, 0xe2, 0x25, 0xaa, 0xe2, 0x3a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xb4, 0x48, 0x10, 0x9f, 0x8a, 0x09, 0x76, 0xfa, 0xf0, 0x7a, 0xb0, 0x70, 0xf7, 0x83, 0x80, 0x52, 0x84, 0x2b, 0x26, 0xa2, 0xc4, 0x5d, 0x4f, 0xba, 0xb1, 0xc8, 0x40, 0x0d, 0x78, 0x97, 0xc4, 0x60}} ,
- {{0xd4, 0xb1, 0x6c, 0x08, 0xc7, 0x40, 0x38, 0x73, 0x5f, 0x0b, 0xf3, 0x76, 0x5d, 0xb2, 0xa5, 0x2f, 0x57, 0x57, 0x07, 0xed, 0x08, 0xa2, 0x6c, 0x4f, 0x08, 0x02, 0xb5, 0x0e, 0xee, 0x44, 0xfa, 0x22}}},
-{{{0x0f, 0x00, 0x3f, 0xa6, 0x04, 0x19, 0x56, 0x65, 0x31, 0x7f, 0x8b, 0xeb, 0x0d, 0xe1, 0x47, 0x89, 0x97, 0x16, 0x53, 0xfa, 0x81, 0xa7, 0xaa, 0xb2, 0xbf, 0x67, 0xeb, 0x72, 0x60, 0x81, 0x0d, 0x48}} ,
- {{0x7e, 0x13, 0x33, 0xcd, 0xa8, 0x84, 0x56, 0x1e, 0x67, 0xaf, 0x6b, 0x43, 0xac, 0x17, 0xaf, 0x16, 0xc0, 0x52, 0x99, 0x49, 0x5b, 0x87, 0x73, 0x7e, 0xb5, 0x43, 0xda, 0x6b, 0x1d, 0x0f, 0x2d, 0x55}}},
-{{{0xe9, 0x58, 0x1f, 0xff, 0x84, 0x3f, 0x93, 0x1c, 0xcb, 0xe1, 0x30, 0x69, 0xa5, 0x75, 0x19, 0x7e, 0x14, 0x5f, 0xf8, 0xfc, 0x09, 0xdd, 0xa8, 0x78, 0x9d, 0xca, 0x59, 0x8b, 0xd1, 0x30, 0x01, 0x13}} ,
- {{0xff, 0x76, 0x03, 0xc5, 0x4b, 0x89, 0x99, 0x70, 0x00, 0x59, 0x70, 0x9c, 0xd5, 0xd9, 0x11, 0x89, 0x5a, 0x46, 0xfe, 0xef, 0xdc, 0xd9, 0x55, 0x2b, 0x45, 0xa7, 0xb0, 0x2d, 0xfb, 0x24, 0xc2, 0x29}}},
-{{{0x38, 0x06, 0xf8, 0x0b, 0xac, 0x82, 0xc4, 0x97, 0x2b, 0x90, 0xe0, 0xf7, 0xa8, 0xab, 0x6c, 0x08, 0x80, 0x66, 0x90, 0x46, 0xf7, 0x26, 0x2d, 0xf8, 0xf1, 0xc4, 0x6b, 0x4a, 0x82, 0x98, 0x8e, 0x37}} ,
- {{0x8e, 0xb4, 0xee, 0xb8, 0xd4, 0x3f, 0xb2, 0x1b, 0xe0, 0x0a, 0x3d, 0x75, 0x34, 0x28, 0xa2, 0x8e, 0xc4, 0x92, 0x7b, 0xfe, 0x60, 0x6e, 0x6d, 0xb8, 0x31, 0x1d, 0x62, 0x0d, 0x78, 0x14, 0x42, 0x11}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x5e, 0xa8, 0xd8, 0x04, 0x9b, 0x73, 0xc9, 0xc9, 0xdc, 0x0d, 0x73, 0xbf, 0x0a, 0x0a, 0x73, 0xff, 0x18, 0x1f, 0x9c, 0x51, 0xaa, 0xc6, 0xf1, 0x83, 0x25, 0xfd, 0xab, 0xa3, 0x11, 0xd3, 0x01, 0x24}} ,
- {{0x4d, 0xe3, 0x7e, 0x38, 0x62, 0x5e, 0x64, 0xbb, 0x2b, 0x53, 0xb5, 0x03, 0x68, 0xc4, 0xf2, 0x2b, 0x5a, 0x03, 0x32, 0x99, 0x4a, 0x41, 0x9a, 0xe1, 0x1a, 0xae, 0x8c, 0x48, 0xf3, 0x24, 0x32, 0x65}}},
-{{{0xe8, 0xdd, 0xad, 0x3a, 0x8c, 0xea, 0xf4, 0xb3, 0xb2, 0xe5, 0x73, 0xf2, 0xed, 0x8b, 0xbf, 0xed, 0xb1, 0x0c, 0x0c, 0xfb, 0x2b, 0xf1, 0x01, 0x48, 0xe8, 0x26, 0x03, 0x8e, 0x27, 0x4d, 0x96, 0x72}} ,
- {{0xc8, 0x09, 0x3b, 0x60, 0xc9, 0x26, 0x4d, 0x7c, 0xf2, 0x9c, 0xd4, 0xa1, 0x3b, 0x26, 0xc2, 0x04, 0x33, 0x44, 0x76, 0x3c, 0x02, 0xbb, 0x11, 0x42, 0x0c, 0x22, 0xb7, 0xc6, 0xe1, 0xac, 0xb4, 0x0e}}},
-{{{0x6f, 0x85, 0xe7, 0xef, 0xde, 0x67, 0x30, 0xfc, 0xbf, 0x5a, 0xe0, 0x7b, 0x7a, 0x2a, 0x54, 0x6b, 0x5d, 0x62, 0x85, 0xa1, 0xf8, 0x16, 0x88, 0xec, 0x61, 0xb9, 0x96, 0xb5, 0xef, 0x2d, 0x43, 0x4d}} ,
- {{0x7c, 0x31, 0x33, 0xcc, 0xe4, 0xcf, 0x6c, 0xff, 0x80, 0x47, 0x77, 0xd1, 0xd8, 0xe9, 0x69, 0x97, 0x98, 0x7f, 0x20, 0x57, 0x1d, 0x1d, 0x4f, 0x08, 0x27, 0xc8, 0x35, 0x57, 0x40, 0xc6, 0x21, 0x0c}}},
-{{{0xd2, 0x8e, 0x9b, 0xfa, 0x42, 0x8e, 0xdf, 0x8f, 0xc7, 0x86, 0xf9, 0xa4, 0xca, 0x70, 0x00, 0x9d, 0x21, 0xbf, 0xec, 0x57, 0x62, 0x30, 0x58, 0x8c, 0x0d, 0x35, 0xdb, 0x5d, 0x8b, 0x6a, 0xa0, 0x5a}} ,
- {{0xc1, 0x58, 0x7c, 0x0d, 0x20, 0xdd, 0x11, 0x26, 0x5f, 0x89, 0x3b, 0x97, 0x58, 0xf8, 0x8b, 0xe3, 0xdf, 0x32, 0xe2, 0xfc, 0xd8, 0x67, 0xf2, 0xa5, 0x37, 0x1e, 0x6d, 0xec, 0x7c, 0x27, 0x20, 0x79}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xd0, 0xe9, 0xc0, 0xfa, 0x95, 0x45, 0x23, 0x96, 0xf1, 0x2c, 0x79, 0x25, 0x14, 0xce, 0x40, 0x14, 0x44, 0x2c, 0x36, 0x50, 0xd9, 0x63, 0x56, 0xb7, 0x56, 0x3b, 0x9e, 0xa7, 0xef, 0x89, 0xbb, 0x0e}} ,
- {{0xce, 0x7f, 0xdc, 0x0a, 0xcc, 0x82, 0x1c, 0x0a, 0x78, 0x71, 0xe8, 0x74, 0x8d, 0x01, 0x30, 0x0f, 0xa7, 0x11, 0x4c, 0xdf, 0x38, 0xd7, 0xa7, 0x0d, 0xf8, 0x48, 0x52, 0x00, 0x80, 0x7b, 0x5f, 0x0e}}},
-{{{0x25, 0x83, 0xe6, 0x94, 0x7b, 0x81, 0xb2, 0x91, 0xae, 0x0e, 0x05, 0xc9, 0xa3, 0x68, 0x2d, 0xd9, 0x88, 0x25, 0x19, 0x2a, 0x61, 0x61, 0x21, 0x97, 0x15, 0xa1, 0x35, 0xa5, 0x46, 0xc8, 0xa2, 0x0e}} ,
- {{0x1b, 0x03, 0x0d, 0x8b, 0x5a, 0x1b, 0x97, 0x4b, 0xf2, 0x16, 0x31, 0x3d, 0x1f, 0x33, 0xa0, 0x50, 0x3a, 0x18, 0xbe, 0x13, 0xa1, 0x76, 0xc1, 0xba, 0x1b, 0xf1, 0x05, 0x7b, 0x33, 0xa8, 0x82, 0x3b}}},
-{{{0xba, 0x36, 0x7b, 0x6d, 0xa9, 0xea, 0x14, 0x12, 0xc5, 0xfa, 0x91, 0x00, 0xba, 0x9b, 0x99, 0xcc, 0x56, 0x02, 0xe9, 0xa0, 0x26, 0x40, 0x66, 0x8c, 0xc4, 0xf8, 0x85, 0x33, 0x68, 0xe7, 0x03, 0x20}} ,
- {{0x50, 0x5b, 0xff, 0xa9, 0xb2, 0xf1, 0xf1, 0x78, 0xcf, 0x14, 0xa4, 0xa9, 0xfc, 0x09, 0x46, 0x94, 0x54, 0x65, 0x0d, 0x9c, 0x5f, 0x72, 0x21, 0xe2, 0x97, 0xa5, 0x2d, 0x81, 0xce, 0x4a, 0x5f, 0x79}}},
-{{{0x3d, 0x5f, 0x5c, 0xd2, 0xbc, 0x7d, 0x77, 0x0e, 0x2a, 0x6d, 0x22, 0x45, 0x84, 0x06, 0xc4, 0xdd, 0xc6, 0xa6, 0xc6, 0xd7, 0x49, 0xad, 0x6d, 0x87, 0x91, 0x0e, 0x3a, 0x67, 0x1d, 0x2c, 0x1d, 0x56}} ,
- {{0xfe, 0x7a, 0x74, 0xcf, 0xd4, 0xd2, 0xe5, 0x19, 0xde, 0xd0, 0xdb, 0x70, 0x23, 0x69, 0xe6, 0x6d, 0xec, 0xec, 0xcc, 0x09, 0x33, 0x6a, 0x77, 0xdc, 0x6b, 0x22, 0x76, 0x5d, 0x92, 0x09, 0xac, 0x2d}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x23, 0x15, 0x17, 0xeb, 0xd3, 0xdb, 0x12, 0x5e, 0x01, 0xf0, 0x91, 0xab, 0x2c, 0x41, 0xce, 0xac, 0xed, 0x1b, 0x4b, 0x2d, 0xbc, 0xdb, 0x17, 0x66, 0x89, 0x46, 0xad, 0x4b, 0x1e, 0x6f, 0x0b, 0x14}} ,
- {{0x11, 0xce, 0xbf, 0xb6, 0x77, 0x2d, 0x48, 0x22, 0x18, 0x4f, 0xa3, 0x5d, 0x4a, 0xb0, 0x70, 0x12, 0x3e, 0x54, 0xd7, 0xd8, 0x0e, 0x2b, 0x27, 0xdc, 0x53, 0xff, 0xca, 0x8c, 0x59, 0xb3, 0x4e, 0x44}}},
-{{{0x07, 0x76, 0x61, 0x0f, 0x66, 0xb2, 0x21, 0x39, 0x7e, 0xc0, 0xec, 0x45, 0x28, 0x82, 0xa1, 0x29, 0x32, 0x44, 0x35, 0x13, 0x5e, 0x61, 0x5e, 0x54, 0xcb, 0x7c, 0xef, 0xf6, 0x41, 0xcf, 0x9f, 0x0a}} ,
- {{0xdd, 0xf9, 0xda, 0x84, 0xc3, 0xe6, 0x8a, 0x9f, 0x24, 0xd2, 0x96, 0x5d, 0x39, 0x6f, 0x58, 0x8c, 0xc1, 0x56, 0x93, 0xab, 0xb5, 0x79, 0x3b, 0xd2, 0xa8, 0x73, 0x16, 0xed, 0xfa, 0xb4, 0x2f, 0x73}}},
-{{{0x8b, 0xb1, 0x95, 0xe5, 0x92, 0x50, 0x35, 0x11, 0x76, 0xac, 0xf4, 0x4d, 0x24, 0xc3, 0x32, 0xe6, 0xeb, 0xfe, 0x2c, 0x87, 0xc4, 0xf1, 0x56, 0xc4, 0x75, 0x24, 0x7a, 0x56, 0x85, 0x5a, 0x3a, 0x13}} ,
- {{0x0d, 0x16, 0xac, 0x3c, 0x4a, 0x58, 0x86, 0x3a, 0x46, 0x7f, 0x6c, 0xa3, 0x52, 0x6e, 0x37, 0xe4, 0x96, 0x9c, 0xe9, 0x5c, 0x66, 0x41, 0x67, 0xe4, 0xfb, 0x79, 0x0c, 0x05, 0xf6, 0x64, 0xd5, 0x7c}}},
-{{{0x28, 0xc1, 0xe1, 0x54, 0x73, 0xf2, 0xbf, 0x76, 0x74, 0x19, 0x19, 0x1b, 0xe4, 0xb9, 0xa8, 0x46, 0x65, 0x73, 0xf3, 0x77, 0x9b, 0x29, 0x74, 0x5b, 0xc6, 0x89, 0x6c, 0x2c, 0x7c, 0xf8, 0xb3, 0x0f}} ,
- {{0xf7, 0xd5, 0xe9, 0x74, 0x5d, 0xb8, 0x25, 0x16, 0xb5, 0x30, 0xbc, 0x84, 0xc5, 0xf0, 0xad, 0xca, 0x12, 0x28, 0xbc, 0x9d, 0xd4, 0xfa, 0x82, 0xe6, 0xe3, 0xbf, 0xa2, 0x15, 0x2c, 0xd4, 0x34, 0x10}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x61, 0xb1, 0x46, 0xba, 0x0e, 0x31, 0xa5, 0x67, 0x6c, 0x7f, 0xd6, 0xd9, 0x27, 0x85, 0x0f, 0x79, 0x14, 0xc8, 0x6c, 0x2f, 0x5f, 0x5b, 0x9c, 0x35, 0x3d, 0x38, 0x86, 0x77, 0x65, 0x55, 0x6a, 0x7b}} ,
- {{0xd3, 0xb0, 0x3a, 0x66, 0x60, 0x1b, 0x43, 0xf1, 0x26, 0x58, 0x99, 0x09, 0x8f, 0x2d, 0xa3, 0x14, 0x71, 0x85, 0xdb, 0xed, 0xf6, 0x26, 0xd5, 0x61, 0x9a, 0x73, 0xac, 0x0e, 0xea, 0xac, 0xb7, 0x0c}}},
-{{{0x5e, 0xf4, 0xe5, 0x17, 0x0e, 0x10, 0x9f, 0xe7, 0x43, 0x5f, 0x67, 0x5c, 0xac, 0x4b, 0xe5, 0x14, 0x41, 0xd2, 0xbf, 0x48, 0xf5, 0x14, 0xb0, 0x71, 0xc6, 0x61, 0xc1, 0xb2, 0x70, 0x58, 0xd2, 0x5a}} ,
- {{0x2d, 0xba, 0x16, 0x07, 0x92, 0x94, 0xdc, 0xbd, 0x50, 0x2b, 0xc9, 0x7f, 0x42, 0x00, 0xba, 0x61, 0xed, 0xf8, 0x43, 0xed, 0xf5, 0xf9, 0x40, 0x60, 0xb2, 0xb0, 0x82, 0xcb, 0xed, 0x75, 0xc7, 0x65}}},
-{{{0x80, 0xba, 0x0d, 0x09, 0x40, 0xa7, 0x39, 0xa6, 0x67, 0x34, 0x7e, 0x66, 0xbe, 0x56, 0xfb, 0x53, 0x78, 0xc4, 0x46, 0xe8, 0xed, 0x68, 0x6c, 0x7f, 0xce, 0xe8, 0x9f, 0xce, 0xa2, 0x64, 0x58, 0x53}} ,
- {{0xe8, 0xc1, 0xa9, 0xc2, 0x7b, 0x59, 0x21, 0x33, 0xe2, 0x43, 0x73, 0x2b, 0xac, 0x2d, 0xc1, 0x89, 0x3b, 0x15, 0xe2, 0xd5, 0xc0, 0x97, 0x8a, 0xfd, 0x6f, 0x36, 0x33, 0xb7, 0xb9, 0xc3, 0x88, 0x09}}},
-{{{0xd0, 0xb6, 0x56, 0x30, 0x5c, 0xae, 0xb3, 0x75, 0x44, 0xa4, 0x83, 0x51, 0x6e, 0x01, 0x65, 0xef, 0x45, 0x76, 0xe6, 0xf5, 0xa2, 0x0d, 0xd4, 0x16, 0x3b, 0x58, 0x2f, 0xf2, 0x2f, 0x36, 0x18, 0x3f}} ,
- {{0xfd, 0x2f, 0xe0, 0x9b, 0x1e, 0x8c, 0xc5, 0x18, 0xa9, 0xca, 0xd4, 0x2b, 0x35, 0xb6, 0x95, 0x0a, 0x9f, 0x7e, 0xfb, 0xc4, 0xef, 0x88, 0x7b, 0x23, 0x43, 0xec, 0x2f, 0x0d, 0x0f, 0x7a, 0xfc, 0x5c}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x8d, 0xd2, 0xda, 0xc7, 0x44, 0xd6, 0x7a, 0xdb, 0x26, 0x7d, 0x1d, 0xb8, 0xe1, 0xde, 0x9d, 0x7a, 0x7d, 0x17, 0x7e, 0x1c, 0x37, 0x04, 0x8d, 0x2d, 0x7c, 0x5e, 0x18, 0x38, 0x1e, 0xaf, 0xc7, 0x1b}} ,
- {{0x33, 0x48, 0x31, 0x00, 0x59, 0xf6, 0xf2, 0xca, 0x0f, 0x27, 0x1b, 0x63, 0x12, 0x7e, 0x02, 0x1d, 0x49, 0xc0, 0x5d, 0x79, 0x87, 0xef, 0x5e, 0x7a, 0x2f, 0x1f, 0x66, 0x55, 0xd8, 0x09, 0xd9, 0x61}}},
-{{{0x54, 0x83, 0x02, 0x18, 0x82, 0x93, 0x99, 0x07, 0xd0, 0xa7, 0xda, 0xd8, 0x75, 0x89, 0xfa, 0xf2, 0xd9, 0xa3, 0xb8, 0x6b, 0x5a, 0x35, 0x28, 0xd2, 0x6b, 0x59, 0xc2, 0xf8, 0x45, 0xe2, 0xbc, 0x06}} ,
- {{0x65, 0xc0, 0xa3, 0x88, 0x51, 0x95, 0xfc, 0x96, 0x94, 0x78, 0xe8, 0x0d, 0x8b, 0x41, 0xc9, 0xc2, 0x58, 0x48, 0x75, 0x10, 0x2f, 0xcd, 0x2a, 0xc9, 0xa0, 0x6d, 0x0f, 0xdd, 0x9c, 0x98, 0x26, 0x3d}}},
-{{{0x2f, 0x66, 0x29, 0x1b, 0x04, 0x89, 0xbd, 0x7e, 0xee, 0x6e, 0xdd, 0xb7, 0x0e, 0xef, 0xb0, 0x0c, 0xb4, 0xfc, 0x7f, 0xc2, 0xc9, 0x3a, 0x3c, 0x64, 0xef, 0x45, 0x44, 0xaf, 0x8a, 0x90, 0x65, 0x76}} ,
- {{0xa1, 0x4c, 0x70, 0x4b, 0x0e, 0xa0, 0x83, 0x70, 0x13, 0xa4, 0xaf, 0xb8, 0x38, 0x19, 0x22, 0x65, 0x09, 0xb4, 0x02, 0x4f, 0x06, 0xf8, 0x17, 0xce, 0x46, 0x45, 0xda, 0x50, 0x7c, 0x8a, 0xd1, 0x4e}}},
-{{{0xf7, 0xd4, 0x16, 0x6c, 0x4e, 0x95, 0x9d, 0x5d, 0x0f, 0x91, 0x2b, 0x52, 0xfe, 0x5c, 0x34, 0xe5, 0x30, 0xe6, 0xa4, 0x3b, 0xf3, 0xf3, 0x34, 0x08, 0xa9, 0x4a, 0xa0, 0xb5, 0x6e, 0xb3, 0x09, 0x0a}} ,
- {{0x26, 0xd9, 0x5e, 0xa3, 0x0f, 0xeb, 0xa2, 0xf3, 0x20, 0x3b, 0x37, 0xd4, 0xe4, 0x9e, 0xce, 0x06, 0x3d, 0x53, 0xed, 0xae, 0x2b, 0xeb, 0xb6, 0x24, 0x0a, 0x11, 0xa3, 0x0f, 0xd6, 0x7f, 0xa4, 0x3a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xdb, 0x9f, 0x2c, 0xfc, 0xd6, 0xb2, 0x1e, 0x2e, 0x52, 0x7a, 0x06, 0x87, 0x2d, 0x86, 0x72, 0x2b, 0x6d, 0x90, 0x77, 0x46, 0x43, 0xb5, 0x7a, 0xf8, 0x60, 0x7d, 0x91, 0x60, 0x5b, 0x9d, 0x9e, 0x07}} ,
- {{0x97, 0x87, 0xc7, 0x04, 0x1c, 0x38, 0x01, 0x39, 0x58, 0xc7, 0x85, 0xa3, 0xfc, 0x64, 0x00, 0x64, 0x25, 0xa2, 0xbf, 0x50, 0x94, 0xca, 0x26, 0x31, 0x45, 0x0a, 0x24, 0xd2, 0x51, 0x29, 0x51, 0x16}}},
-{{{0x4d, 0x4a, 0xd7, 0x98, 0x71, 0x57, 0xac, 0x7d, 0x8b, 0x37, 0xbd, 0x63, 0xff, 0x87, 0xb1, 0x49, 0x95, 0x20, 0x7c, 0xcf, 0x7c, 0x59, 0xc4, 0x91, 0x9c, 0xef, 0xd0, 0xdb, 0x60, 0x09, 0x9d, 0x46}} ,
- {{0xcb, 0x78, 0x94, 0x90, 0xe4, 0x45, 0xb3, 0xf6, 0xd9, 0xf6, 0x57, 0x74, 0xd5, 0xf8, 0x83, 0x4f, 0x39, 0xc9, 0xbd, 0x88, 0xc2, 0x57, 0x21, 0x1f, 0x24, 0x32, 0x68, 0xf8, 0xc7, 0x21, 0x5f, 0x0b}}},
-{{{0x2a, 0x36, 0x68, 0xfc, 0x5f, 0xb6, 0x4f, 0xa5, 0xe3, 0x9d, 0x24, 0x2f, 0xc0, 0x93, 0x61, 0xcf, 0xf8, 0x0a, 0xed, 0xe1, 0xdb, 0x27, 0xec, 0x0e, 0x14, 0x32, 0x5f, 0x8e, 0xa1, 0x62, 0x41, 0x16}} ,
- {{0x95, 0x21, 0x01, 0xce, 0x95, 0x5b, 0x0e, 0x57, 0xc7, 0xb9, 0x62, 0xb5, 0x28, 0xca, 0x11, 0xec, 0xb4, 0x46, 0x06, 0x73, 0x26, 0xff, 0xfb, 0x66, 0x7d, 0xee, 0x5f, 0xb2, 0x56, 0xfd, 0x2a, 0x08}}},
-{{{0x92, 0x67, 0x77, 0x56, 0xa1, 0xff, 0xc4, 0xc5, 0x95, 0xf0, 0xe3, 0x3a, 0x0a, 0xca, 0x94, 0x4d, 0x9e, 0x7e, 0x3d, 0xb9, 0x6e, 0xb6, 0xb0, 0xce, 0xa4, 0x30, 0x89, 0x99, 0xe9, 0xad, 0x11, 0x59}} ,
- {{0xf6, 0x48, 0x95, 0xa1, 0x6f, 0x5f, 0xb7, 0xa5, 0xbb, 0x30, 0x00, 0x1c, 0xd2, 0x8a, 0xd6, 0x25, 0x26, 0x1b, 0xb2, 0x0d, 0x37, 0x6a, 0x05, 0xf4, 0x9d, 0x3e, 0x17, 0x2a, 0x43, 0xd2, 0x3a, 0x06}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x32, 0x99, 0x93, 0xd1, 0x9a, 0x72, 0xf3, 0xa9, 0x16, 0xbd, 0xb4, 0x4c, 0xdd, 0xf9, 0xd4, 0xb2, 0x64, 0x9a, 0xd3, 0x05, 0xe4, 0xa3, 0x73, 0x1c, 0xcb, 0x7e, 0x57, 0x67, 0xff, 0x04, 0xb3, 0x10}} ,
- {{0xb9, 0x4b, 0xa4, 0xad, 0xd0, 0x6d, 0x61, 0x23, 0xb4, 0xaf, 0x34, 0xa9, 0xaa, 0x65, 0xec, 0xd9, 0x69, 0xe3, 0x85, 0xcd, 0xcc, 0xe7, 0xb0, 0x9b, 0x41, 0xc1, 0x1c, 0xf9, 0xa0, 0xfa, 0xb7, 0x13}}},
-{{{0x04, 0xfd, 0x88, 0x3c, 0x0c, 0xd0, 0x09, 0x52, 0x51, 0x4f, 0x06, 0x19, 0xcc, 0xc3, 0xbb, 0xde, 0x80, 0xc5, 0x33, 0xbc, 0xf9, 0xf3, 0x17, 0x36, 0xdd, 0xc6, 0xde, 0xe8, 0x9b, 0x5d, 0x79, 0x1b}} ,
- {{0x65, 0x0a, 0xbe, 0x51, 0x57, 0xad, 0x50, 0x79, 0x08, 0x71, 0x9b, 0x07, 0x95, 0x8f, 0xfb, 0xae, 0x4b, 0x38, 0xba, 0xcf, 0x53, 0x2a, 0x86, 0x1e, 0xc0, 0x50, 0x5c, 0x67, 0x1b, 0xf6, 0x87, 0x6c}}},
-{{{0x4f, 0x00, 0xb2, 0x66, 0x55, 0xed, 0x4a, 0xed, 0x8d, 0xe1, 0x66, 0x18, 0xb2, 0x14, 0x74, 0x8d, 0xfd, 0x1a, 0x36, 0x0f, 0x26, 0x5c, 0x8b, 0x89, 0xf3, 0xab, 0xf2, 0xf3, 0x24, 0x67, 0xfd, 0x70}} ,
- {{0xfd, 0x4e, 0x2a, 0xc1, 0x3a, 0xca, 0x8f, 0x00, 0xd8, 0xec, 0x74, 0x67, 0xef, 0x61, 0xe0, 0x28, 0xd0, 0x96, 0xf4, 0x48, 0xde, 0x81, 0xe3, 0xef, 0xdc, 0xaa, 0x7d, 0xf3, 0xb6, 0x55, 0xa6, 0x65}}},
-{{{0xeb, 0xcb, 0xc5, 0x70, 0x91, 0x31, 0x10, 0x93, 0x0d, 0xc8, 0xd0, 0xef, 0x62, 0xe8, 0x6f, 0x82, 0xe3, 0x69, 0x3d, 0x91, 0x7f, 0x31, 0xe1, 0x26, 0x35, 0x3c, 0x4a, 0x2f, 0xab, 0xc4, 0x9a, 0x5e}} ,
- {{0xab, 0x1b, 0xb5, 0xe5, 0x2b, 0xc3, 0x0e, 0x29, 0xb0, 0xd0, 0x73, 0xe6, 0x4f, 0x64, 0xf2, 0xbc, 0xe4, 0xe4, 0xe1, 0x9a, 0x52, 0x33, 0x2f, 0xbd, 0xcc, 0x03, 0xee, 0x8a, 0xfa, 0x00, 0x5f, 0x50}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xf6, 0xdb, 0x0d, 0x22, 0x3d, 0xb5, 0x14, 0x75, 0x31, 0xf0, 0x81, 0xe2, 0xb9, 0x37, 0xa2, 0xa9, 0x84, 0x11, 0x9a, 0x07, 0xb5, 0x53, 0x89, 0x78, 0xa9, 0x30, 0x27, 0xa1, 0xf1, 0x4e, 0x5c, 0x2e}} ,
- {{0x8b, 0x00, 0x54, 0xfb, 0x4d, 0xdc, 0xcb, 0x17, 0x35, 0x40, 0xff, 0xb7, 0x8c, 0xfe, 0x4a, 0xe4, 0x4e, 0x99, 0x4e, 0xa8, 0x74, 0x54, 0x5d, 0x5c, 0x96, 0xa3, 0x12, 0x55, 0x36, 0x31, 0x17, 0x5c}}},
-{{{0xce, 0x24, 0xef, 0x7b, 0x86, 0xf2, 0x0f, 0x77, 0xe8, 0x5c, 0x7d, 0x87, 0x38, 0x2d, 0xef, 0xaf, 0xf2, 0x8c, 0x72, 0x2e, 0xeb, 0xb6, 0x55, 0x4b, 0x6e, 0xf1, 0x4e, 0x8a, 0x0e, 0x9a, 0x6c, 0x4c}} ,
- {{0x25, 0xea, 0x86, 0xc2, 0xd1, 0x4f, 0xb7, 0x3e, 0xa8, 0x5c, 0x8d, 0x66, 0x81, 0x25, 0xed, 0xc5, 0x4c, 0x05, 0xb9, 0xd8, 0xd6, 0x70, 0xbe, 0x73, 0x82, 0xe8, 0xa1, 0xe5, 0x1e, 0x71, 0xd5, 0x26}}},
-{{{0x4e, 0x6d, 0xc3, 0xa7, 0x4f, 0x22, 0x45, 0x26, 0xa2, 0x7e, 0x16, 0xf7, 0xf7, 0x63, 0xdc, 0x86, 0x01, 0x2a, 0x71, 0x38, 0x5c, 0x33, 0xc3, 0xce, 0x30, 0xff, 0xf9, 0x2c, 0x91, 0x71, 0x8a, 0x72}} ,
- {{0x8c, 0x44, 0x09, 0x28, 0xd5, 0x23, 0xc9, 0x8f, 0xf3, 0x84, 0x45, 0xc6, 0x9a, 0x5e, 0xff, 0xd2, 0xc7, 0x57, 0x93, 0xa3, 0xc1, 0x69, 0xdd, 0x62, 0x0f, 0xda, 0x5c, 0x30, 0x59, 0x5d, 0xe9, 0x4c}}},
-{{{0x92, 0x7e, 0x50, 0x27, 0x72, 0xd7, 0x0c, 0xd6, 0x69, 0x96, 0x81, 0x35, 0x84, 0x94, 0x35, 0x8b, 0x6c, 0xaa, 0x62, 0x86, 0x6e, 0x1c, 0x15, 0xf3, 0x6c, 0xb3, 0xff, 0x65, 0x1b, 0xa2, 0x9b, 0x59}} ,
- {{0xe2, 0xa9, 0x65, 0x88, 0xc4, 0x50, 0xfa, 0xbb, 0x3b, 0x6e, 0x5f, 0x44, 0x01, 0xca, 0x97, 0xd4, 0xdd, 0xf6, 0xcd, 0x3f, 0x3f, 0xe5, 0x97, 0x67, 0x2b, 0x8c, 0x66, 0x0f, 0x35, 0x9b, 0xf5, 0x07}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xf1, 0x59, 0x27, 0xd8, 0xdb, 0x5a, 0x11, 0x5e, 0x82, 0xf3, 0x38, 0xff, 0x1c, 0xed, 0xfe, 0x3f, 0x64, 0x54, 0x3f, 0x7f, 0xd1, 0x81, 0xed, 0xef, 0x65, 0xc5, 0xcb, 0xfd, 0xe1, 0x80, 0xcd, 0x11}} ,
- {{0xe0, 0xdb, 0x22, 0x28, 0xe6, 0xff, 0x61, 0x9d, 0x41, 0x14, 0x2d, 0x3b, 0x26, 0x22, 0xdf, 0xf1, 0x34, 0x81, 0xe9, 0x45, 0xee, 0x0f, 0x98, 0x8b, 0xa6, 0x3f, 0xef, 0xf7, 0x43, 0x19, 0xf1, 0x43}}},
-{{{0xee, 0xf3, 0x00, 0xa1, 0x50, 0xde, 0xc0, 0xb6, 0x01, 0xe3, 0x8c, 0x3c, 0x4d, 0x31, 0xd2, 0xb0, 0x58, 0xcd, 0xed, 0x10, 0x4a, 0x7a, 0xef, 0x80, 0xa9, 0x19, 0x32, 0xf3, 0xd8, 0x33, 0x8c, 0x06}} ,
- {{0xcb, 0x7d, 0x4f, 0xff, 0x30, 0xd8, 0x12, 0x3b, 0x39, 0x1c, 0x06, 0xf9, 0x4c, 0x34, 0x35, 0x71, 0xb5, 0x16, 0x94, 0x67, 0xdf, 0xee, 0x11, 0xde, 0xa4, 0x1d, 0x88, 0x93, 0x35, 0xa9, 0x32, 0x10}}},
-{{{0xe9, 0xc3, 0xbc, 0x7b, 0x5c, 0xfc, 0xb2, 0xf9, 0xc9, 0x2f, 0xe5, 0xba, 0x3a, 0x0b, 0xab, 0x64, 0x38, 0x6f, 0x5b, 0x4b, 0x93, 0xda, 0x64, 0xec, 0x4d, 0x3d, 0xa0, 0xf5, 0xbb, 0xba, 0x47, 0x48}} ,
- {{0x60, 0xbc, 0x45, 0x1f, 0x23, 0xa2, 0x3b, 0x70, 0x76, 0xe6, 0x97, 0x99, 0x4f, 0x77, 0x54, 0x67, 0x30, 0x9a, 0xe7, 0x66, 0xd6, 0xcd, 0x2e, 0x51, 0x24, 0x2c, 0x42, 0x4a, 0x11, 0xfe, 0x6f, 0x7e}}},
-{{{0x87, 0xc0, 0xb1, 0xf0, 0xa3, 0x6f, 0x0c, 0x93, 0xa9, 0x0a, 0x72, 0xef, 0x5c, 0xbe, 0x65, 0x35, 0xa7, 0x6a, 0x4e, 0x2c, 0xbf, 0x21, 0x23, 0xe8, 0x2f, 0x97, 0xc7, 0x3e, 0xc8, 0x17, 0xac, 0x1e}} ,
- {{0x7b, 0xef, 0x21, 0xe5, 0x40, 0xcc, 0x1e, 0xdc, 0xd6, 0xbd, 0x97, 0x7a, 0x7c, 0x75, 0x86, 0x7a, 0x25, 0x5a, 0x6e, 0x7c, 0xe5, 0x51, 0x3c, 0x1b, 0x5b, 0x82, 0x9a, 0x07, 0x60, 0xa1, 0x19, 0x04}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x96, 0x88, 0xa6, 0xab, 0x8f, 0xe3, 0x3a, 0x49, 0xf8, 0xfe, 0x34, 0xe7, 0x6a, 0xb2, 0xfe, 0x40, 0x26, 0x74, 0x57, 0x4c, 0xf6, 0xd4, 0x99, 0xce, 0x5d, 0x7b, 0x2f, 0x67, 0xd6, 0x5a, 0xe4, 0x4e}} ,
- {{0x5c, 0x82, 0xb3, 0xbd, 0x55, 0x25, 0xf6, 0x6a, 0x93, 0xa4, 0x02, 0xc6, 0x7d, 0x5c, 0xb1, 0x2b, 0x5b, 0xff, 0xfb, 0x56, 0xf8, 0x01, 0x41, 0x90, 0xc6, 0xb6, 0xac, 0x4f, 0xfe, 0xa7, 0x41, 0x70}}},
-{{{0xdb, 0xfa, 0x9b, 0x2c, 0xd4, 0x23, 0x67, 0x2c, 0x8a, 0x63, 0x6c, 0x07, 0x26, 0x48, 0x4f, 0xc2, 0x03, 0xd2, 0x53, 0x20, 0x28, 0xed, 0x65, 0x71, 0x47, 0xa9, 0x16, 0x16, 0x12, 0xbc, 0x28, 0x33}} ,
- {{0x39, 0xc0, 0xfa, 0xfa, 0xcd, 0x33, 0x43, 0xc7, 0x97, 0x76, 0x9b, 0x93, 0x91, 0x72, 0xeb, 0xc5, 0x18, 0x67, 0x4c, 0x11, 0xf0, 0xf4, 0xe5, 0x73, 0xb2, 0x5c, 0x1b, 0xc2, 0x26, 0x3f, 0xbf, 0x2b}}},
-{{{0x86, 0xe6, 0x8c, 0x1d, 0xdf, 0xca, 0xfc, 0xd5, 0xf8, 0x3a, 0xc3, 0x44, 0x72, 0xe6, 0x78, 0x9d, 0x2b, 0x97, 0xf8, 0x28, 0x45, 0xb4, 0x20, 0xc9, 0x2a, 0x8c, 0x67, 0xaa, 0x11, 0xc5, 0x5b, 0x2f}} ,
- {{0x17, 0x0f, 0x86, 0x52, 0xd7, 0x9d, 0xc3, 0x44, 0x51, 0x76, 0x32, 0x65, 0xb4, 0x37, 0x81, 0x99, 0x46, 0x37, 0x62, 0xed, 0xcf, 0x64, 0x9d, 0x72, 0x40, 0x7a, 0x4c, 0x0b, 0x76, 0x2a, 0xfb, 0x56}}},
-{{{0x33, 0xa7, 0x90, 0x7c, 0xc3, 0x6f, 0x17, 0xa5, 0xa0, 0x67, 0x72, 0x17, 0xea, 0x7e, 0x63, 0x14, 0x83, 0xde, 0xc1, 0x71, 0x2d, 0x41, 0x32, 0x7a, 0xf3, 0xd1, 0x2b, 0xd8, 0x2a, 0xa6, 0x46, 0x36}} ,
- {{0xac, 0xcc, 0x6b, 0x7c, 0xf9, 0xb8, 0x8b, 0x08, 0x5c, 0xd0, 0x7d, 0x8f, 0x73, 0xea, 0x20, 0xda, 0x86, 0xca, 0x00, 0xc7, 0xad, 0x73, 0x4d, 0xe9, 0xe8, 0xa9, 0xda, 0x1f, 0x03, 0x06, 0xdd, 0x24}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x9c, 0xb2, 0x61, 0x0a, 0x98, 0x2a, 0xa5, 0xd7, 0xee, 0xa9, 0xac, 0x65, 0xcb, 0x0a, 0x1e, 0xe2, 0xbe, 0xdc, 0x85, 0x59, 0x0f, 0x9c, 0xa6, 0x57, 0x34, 0xa5, 0x87, 0xeb, 0x7b, 0x1e, 0x0c, 0x3c}} ,
- {{0x2f, 0xbd, 0x84, 0x63, 0x0d, 0xb5, 0xa0, 0xf0, 0x4b, 0x9e, 0x93, 0xc6, 0x34, 0x9a, 0x34, 0xff, 0x73, 0x19, 0x2f, 0x6e, 0x54, 0x45, 0x2c, 0x92, 0x31, 0x76, 0x34, 0xf1, 0xb2, 0x26, 0xe8, 0x74}}},
-{{{0x0a, 0x67, 0x90, 0x6d, 0x0c, 0x4c, 0xcc, 0xc0, 0xe6, 0xbd, 0xa7, 0x5e, 0x55, 0x8c, 0xcd, 0x58, 0x9b, 0x11, 0xa2, 0xbb, 0x4b, 0xb1, 0x43, 0x04, 0x3c, 0x55, 0xed, 0x23, 0xfe, 0xcd, 0xb1, 0x53}} ,
- {{0x05, 0xfb, 0x75, 0xf5, 0x01, 0xaf, 0x38, 0x72, 0x58, 0xfc, 0x04, 0x29, 0x34, 0x7a, 0x67, 0xa2, 0x08, 0x50, 0x6e, 0xd0, 0x2b, 0x73, 0xd5, 0xb8, 0xe4, 0x30, 0x96, 0xad, 0x45, 0xdf, 0xa6, 0x5c}}},
-{{{0x0d, 0x88, 0x1a, 0x90, 0x7e, 0xdc, 0xd8, 0xfe, 0xc1, 0x2f, 0x5d, 0x67, 0xee, 0x67, 0x2f, 0xed, 0x6f, 0x55, 0x43, 0x5f, 0x87, 0x14, 0x35, 0x42, 0xd3, 0x75, 0xae, 0xd5, 0xd3, 0x85, 0x1a, 0x76}} ,
- {{0x87, 0xc8, 0xa0, 0x6e, 0xe1, 0xb0, 0xad, 0x6a, 0x4a, 0x34, 0x71, 0xed, 0x7c, 0xd6, 0x44, 0x03, 0x65, 0x4a, 0x5c, 0x5c, 0x04, 0xf5, 0x24, 0x3f, 0xb0, 0x16, 0x5e, 0x8c, 0xb2, 0xd2, 0xc5, 0x20}}},
-{{{0x98, 0x83, 0xc2, 0x37, 0xa0, 0x41, 0xa8, 0x48, 0x5c, 0x5f, 0xbf, 0xc8, 0xfa, 0x24, 0xe0, 0x59, 0x2c, 0xbd, 0xf6, 0x81, 0x7e, 0x88, 0xe6, 0xca, 0x04, 0xd8, 0x5d, 0x60, 0xbb, 0x74, 0xa7, 0x0b}} ,
- {{0x21, 0x13, 0x91, 0xbf, 0x77, 0x7a, 0x33, 0xbc, 0xe9, 0x07, 0x39, 0x0a, 0xdd, 0x7d, 0x06, 0x10, 0x9a, 0xee, 0x47, 0x73, 0x1b, 0x15, 0x5a, 0xfb, 0xcd, 0x4d, 0xd0, 0xd2, 0x3a, 0x01, 0xba, 0x54}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x48, 0xd5, 0x39, 0x4a, 0x0b, 0x20, 0x6a, 0x43, 0xa0, 0x07, 0x82, 0x5e, 0x49, 0x7c, 0xc9, 0x47, 0xf1, 0x7c, 0x37, 0xb9, 0x23, 0xef, 0x6b, 0x46, 0x45, 0x8c, 0x45, 0x76, 0xdf, 0x14, 0x6b, 0x6e}} ,
- {{0x42, 0xc9, 0xca, 0x29, 0x4c, 0x76, 0x37, 0xda, 0x8a, 0x2d, 0x7c, 0x3a, 0x58, 0xf2, 0x03, 0xb4, 0xb5, 0xb9, 0x1a, 0x13, 0x2d, 0xde, 0x5f, 0x6b, 0x9d, 0xba, 0x52, 0xc9, 0x5d, 0xb3, 0xf3, 0x30}}},
-{{{0x4c, 0x6f, 0xfe, 0x6b, 0x0c, 0x62, 0xd7, 0x48, 0x71, 0xef, 0xb1, 0x85, 0x79, 0xc0, 0xed, 0x24, 0xb1, 0x08, 0x93, 0x76, 0x8e, 0xf7, 0x38, 0x8e, 0xeb, 0xfe, 0x80, 0x40, 0xaf, 0x90, 0x64, 0x49}} ,
- {{0x4a, 0x88, 0xda, 0xc1, 0x98, 0x44, 0x3c, 0x53, 0x4e, 0xdb, 0x4b, 0xb9, 0x12, 0x5f, 0xcd, 0x08, 0x04, 0xef, 0x75, 0xe7, 0xb1, 0x3a, 0xe5, 0x07, 0xfa, 0xca, 0x65, 0x7b, 0x72, 0x10, 0x64, 0x7f}}},
-{{{0x3d, 0x81, 0xf0, 0xeb, 0x16, 0xfd, 0x58, 0x33, 0x8d, 0x7c, 0x1a, 0xfb, 0x20, 0x2c, 0x8a, 0xee, 0x90, 0xbb, 0x33, 0x6d, 0x45, 0xe9, 0x8e, 0x99, 0x85, 0xe1, 0x08, 0x1f, 0xc5, 0xf1, 0xb5, 0x46}} ,
- {{0xe4, 0xe7, 0x43, 0x4b, 0xa0, 0x3f, 0x2b, 0x06, 0xba, 0x17, 0xae, 0x3d, 0xe6, 0xce, 0xbd, 0xb8, 0xed, 0x74, 0x11, 0x35, 0xec, 0x96, 0xfe, 0x31, 0xe3, 0x0e, 0x7a, 0x4e, 0xc9, 0x1d, 0xcb, 0x20}}},
-{{{0xe0, 0x67, 0xe9, 0x7b, 0xdb, 0x96, 0x5c, 0xb0, 0x32, 0xd0, 0x59, 0x31, 0x90, 0xdc, 0x92, 0x97, 0xac, 0x09, 0x38, 0x31, 0x0f, 0x7e, 0xd6, 0x5d, 0xd0, 0x06, 0xb6, 0x1f, 0xea, 0xf0, 0x5b, 0x07}} ,
- {{0x81, 0x9f, 0xc7, 0xde, 0x6b, 0x41, 0x22, 0x35, 0x14, 0x67, 0x77, 0x3e, 0x90, 0x81, 0xb0, 0xd9, 0x85, 0x4c, 0xca, 0x9b, 0x3f, 0x04, 0x59, 0xd6, 0xaa, 0x17, 0xc3, 0x88, 0x34, 0x37, 0xba, 0x43}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x4c, 0xb6, 0x69, 0xc8, 0x81, 0x95, 0x94, 0x33, 0x92, 0x34, 0xe9, 0x3c, 0x84, 0x0d, 0x3d, 0x5a, 0x37, 0x9c, 0x22, 0xa0, 0xaa, 0x65, 0xce, 0xb4, 0xc2, 0x2d, 0x66, 0x67, 0x02, 0xff, 0x74, 0x10}} ,
- {{0x22, 0xb0, 0xd5, 0xe6, 0xc7, 0xef, 0xb1, 0xa7, 0x13, 0xda, 0x60, 0xb4, 0x80, 0xc1, 0x42, 0x7d, 0x10, 0x70, 0x97, 0x04, 0x4d, 0xda, 0x23, 0x89, 0xc2, 0x0e, 0x68, 0xcb, 0xde, 0xe0, 0x9b, 0x29}}},
-{{{0x33, 0xfe, 0x42, 0x2a, 0x36, 0x2b, 0x2e, 0x36, 0x64, 0x5c, 0x8b, 0xcc, 0x81, 0x6a, 0x15, 0x08, 0xa1, 0x27, 0xe8, 0x57, 0xe5, 0x78, 0x8e, 0xf2, 0x58, 0x19, 0x12, 0x42, 0xae, 0xc4, 0x63, 0x3e}} ,
- {{0x78, 0x96, 0x9c, 0xa7, 0xca, 0x80, 0xae, 0x02, 0x85, 0xb1, 0x7c, 0x04, 0x5c, 0xc1, 0x5b, 0x26, 0xc1, 0xba, 0xed, 0xa5, 0x59, 0x70, 0x85, 0x8c, 0x8c, 0xe8, 0x87, 0xac, 0x6a, 0x28, 0x99, 0x35}}},
-{{{0x9f, 0x04, 0x08, 0x28, 0xbe, 0x87, 0xda, 0x80, 0x28, 0x38, 0xde, 0x9f, 0xcd, 0xe4, 0xe3, 0x62, 0xfb, 0x2e, 0x46, 0x8d, 0x01, 0xb3, 0x06, 0x51, 0xd4, 0x19, 0x3b, 0x11, 0xfa, 0xe2, 0xad, 0x1e}} ,
- {{0xa0, 0x20, 0x99, 0x69, 0x0a, 0xae, 0xa3, 0x70, 0x4e, 0x64, 0x80, 0xb7, 0x85, 0x9c, 0x87, 0x54, 0x43, 0x43, 0x55, 0x80, 0x6d, 0x8d, 0x7c, 0xa9, 0x64, 0xca, 0x6c, 0x2e, 0x21, 0xd8, 0xc8, 0x6c}}},
-{{{0x91, 0x4a, 0x07, 0xad, 0x08, 0x75, 0xc1, 0x4f, 0xa4, 0xb2, 0xc3, 0x6f, 0x46, 0x3e, 0xb1, 0xce, 0x52, 0xab, 0x67, 0x09, 0x54, 0x48, 0x6b, 0x6c, 0xd7, 0x1d, 0x71, 0x76, 0xcb, 0xff, 0xdd, 0x31}} ,
- {{0x36, 0x88, 0xfa, 0xfd, 0xf0, 0x36, 0x6f, 0x07, 0x74, 0x88, 0x50, 0xd0, 0x95, 0x38, 0x4a, 0x48, 0x2e, 0x07, 0x64, 0x97, 0x11, 0x76, 0x01, 0x1a, 0x27, 0x4d, 0x8e, 0x25, 0x9a, 0x9b, 0x1c, 0x22}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xbe, 0x57, 0xbd, 0x0e, 0x0f, 0xac, 0x5e, 0x76, 0xa3, 0x71, 0xad, 0x2b, 0x10, 0x45, 0x02, 0xec, 0x59, 0xd5, 0x5d, 0xa9, 0x44, 0xcc, 0x25, 0x4c, 0xb3, 0x3c, 0x5b, 0x69, 0x07, 0x55, 0x26, 0x6b}} ,
- {{0x30, 0x6b, 0xd4, 0xa7, 0x51, 0x29, 0xe3, 0xf9, 0x7a, 0x75, 0x2a, 0x82, 0x2f, 0xd6, 0x1d, 0x99, 0x2b, 0x80, 0xd5, 0x67, 0x1e, 0x15, 0x9d, 0xca, 0xfd, 0xeb, 0xac, 0x97, 0x35, 0x09, 0x7f, 0x3f}}},
-{{{0x35, 0x0d, 0x34, 0x0a, 0xb8, 0x67, 0x56, 0x29, 0x20, 0xf3, 0x19, 0x5f, 0xe2, 0x83, 0x42, 0x73, 0x53, 0xa8, 0xc5, 0x02, 0x19, 0x33, 0xb4, 0x64, 0xbd, 0xc3, 0x87, 0x8c, 0xd7, 0x76, 0xed, 0x25}} ,
- {{0x47, 0x39, 0x37, 0x76, 0x0d, 0x1d, 0x0c, 0xf5, 0x5a, 0x6d, 0x43, 0x88, 0x99, 0x15, 0xb4, 0x52, 0x0f, 0x2a, 0xb3, 0xb0, 0x3f, 0xa6, 0xb3, 0x26, 0xb3, 0xc7, 0x45, 0xf5, 0x92, 0x5f, 0x9b, 0x17}}},
-{{{0x9d, 0x23, 0xbd, 0x15, 0xfe, 0x52, 0x52, 0x15, 0x26, 0x79, 0x86, 0xba, 0x06, 0x56, 0x66, 0xbb, 0x8c, 0x2e, 0x10, 0x11, 0xd5, 0x4a, 0x18, 0x52, 0xda, 0x84, 0x44, 0xf0, 0x3e, 0xe9, 0x8c, 0x35}} ,
- {{0xad, 0xa0, 0x41, 0xec, 0xc8, 0x4d, 0xb9, 0xd2, 0x6e, 0x96, 0x4e, 0x5b, 0xc5, 0xc2, 0xa0, 0x1b, 0xcf, 0x0c, 0xbf, 0x17, 0x66, 0x57, 0xc1, 0x17, 0x90, 0x45, 0x71, 0xc2, 0xe1, 0x24, 0xeb, 0x27}}},
-{{{0x2c, 0xb9, 0x42, 0xa4, 0xaf, 0x3b, 0x42, 0x0e, 0xc2, 0x0f, 0xf2, 0xea, 0x83, 0xaf, 0x9a, 0x13, 0x17, 0xb0, 0xbd, 0x89, 0x17, 0xe3, 0x72, 0xcb, 0x0e, 0x76, 0x7e, 0x41, 0x63, 0x04, 0x88, 0x71}} ,
- {{0x75, 0x78, 0x38, 0x86, 0x57, 0xdd, 0x9f, 0xee, 0x54, 0x70, 0x65, 0xbf, 0xf1, 0x2c, 0xe0, 0x39, 0x0d, 0xe3, 0x89, 0xfd, 0x8e, 0x93, 0x4f, 0x43, 0xdc, 0xd5, 0x5b, 0xde, 0xf9, 0x98, 0xe5, 0x7b}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xe7, 0x3b, 0x65, 0x11, 0xdf, 0xb2, 0xf2, 0x63, 0x94, 0x12, 0x6f, 0x5c, 0x9e, 0x77, 0xc1, 0xb6, 0xd8, 0xab, 0x58, 0x7a, 0x1d, 0x95, 0x73, 0xdd, 0xe7, 0xe3, 0x6f, 0xf2, 0x03, 0x1d, 0xdb, 0x76}} ,
- {{0xae, 0x06, 0x4e, 0x2c, 0x52, 0x1b, 0xbc, 0x5a, 0x5a, 0xa5, 0xbe, 0x27, 0xbd, 0xeb, 0xe1, 0x14, 0x17, 0x68, 0x26, 0x07, 0x03, 0xd1, 0x18, 0x0b, 0xdf, 0xf1, 0x06, 0x5c, 0xa6, 0x1b, 0xb9, 0x24}}},
-{{{0xc5, 0x66, 0x80, 0x13, 0x0e, 0x48, 0x8c, 0x87, 0x31, 0x84, 0xb4, 0x60, 0xed, 0xc5, 0xec, 0xb6, 0xc5, 0x05, 0x33, 0x5f, 0x2f, 0x7d, 0x40, 0xb6, 0x32, 0x1d, 0x38, 0x74, 0x1b, 0xf1, 0x09, 0x3d}} ,
- {{0xd4, 0x69, 0x82, 0xbc, 0x8d, 0xf8, 0x34, 0x36, 0x75, 0x55, 0x18, 0x55, 0x58, 0x3c, 0x79, 0xaf, 0x26, 0x80, 0xab, 0x9b, 0x95, 0x00, 0xf1, 0xcb, 0xda, 0xc1, 0x9f, 0xf6, 0x2f, 0xa2, 0xf4, 0x45}}},
-{{{0x17, 0xbe, 0xeb, 0x85, 0xed, 0x9e, 0xcd, 0x56, 0xf5, 0x17, 0x45, 0x42, 0xb4, 0x1f, 0x44, 0x4c, 0x05, 0x74, 0x15, 0x47, 0x00, 0xc6, 0x6a, 0x3d, 0x24, 0x09, 0x0d, 0x58, 0xb1, 0x42, 0xd7, 0x04}} ,
- {{0x8d, 0xbd, 0xa3, 0xc4, 0x06, 0x9b, 0x1f, 0x90, 0x58, 0x60, 0x74, 0xb2, 0x00, 0x3b, 0x3c, 0xd2, 0xda, 0x82, 0xbb, 0x10, 0x90, 0x69, 0x92, 0xa9, 0xb4, 0x30, 0x81, 0xe3, 0x7c, 0xa8, 0x89, 0x45}}},
-{{{0x3f, 0xdc, 0x05, 0xcb, 0x41, 0x3c, 0xc8, 0x23, 0x04, 0x2c, 0x38, 0x99, 0xe3, 0x68, 0x55, 0xf9, 0xd3, 0x32, 0xc7, 0xbf, 0xfa, 0xd4, 0x1b, 0x5d, 0xde, 0xdc, 0x10, 0x42, 0xc0, 0x42, 0xd9, 0x75}} ,
- {{0x2d, 0xab, 0x35, 0x4e, 0x87, 0xc4, 0x65, 0x97, 0x67, 0x24, 0xa4, 0x47, 0xad, 0x3f, 0x8e, 0xf3, 0xcb, 0x31, 0x17, 0x77, 0xc5, 0xe2, 0xd7, 0x8f, 0x3c, 0xc1, 0xcd, 0x56, 0x48, 0xc1, 0x6c, 0x69}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x14, 0xae, 0x5f, 0x88, 0x7b, 0xa5, 0x90, 0xdf, 0x10, 0xb2, 0x8b, 0x5e, 0x24, 0x17, 0xc3, 0xa3, 0xd4, 0x0f, 0x92, 0x61, 0x1a, 0x19, 0x5a, 0xad, 0x76, 0xbd, 0xd8, 0x1c, 0xdd, 0xe0, 0x12, 0x6d}} ,
- {{0x8e, 0xbd, 0x70, 0x8f, 0x02, 0xa3, 0x24, 0x4d, 0x5a, 0x67, 0xc4, 0xda, 0xf7, 0x20, 0x0f, 0x81, 0x5b, 0x7a, 0x05, 0x24, 0x67, 0x83, 0x0b, 0x2a, 0x80, 0xe7, 0xfd, 0x74, 0x4b, 0x9e, 0x5c, 0x0d}}},
-{{{0x94, 0xd5, 0x5f, 0x1f, 0xa2, 0xfb, 0xeb, 0xe1, 0x07, 0x34, 0xf8, 0x20, 0xad, 0x81, 0x30, 0x06, 0x2d, 0xa1, 0x81, 0x95, 0x36, 0xcf, 0x11, 0x0b, 0xaf, 0xc1, 0x2b, 0x9a, 0x6c, 0x55, 0xc1, 0x16}} ,
- {{0x36, 0x4f, 0xf1, 0x5e, 0x74, 0x35, 0x13, 0x28, 0xd7, 0x11, 0xcf, 0xb8, 0xde, 0x93, 0xb3, 0x05, 0xb8, 0xb5, 0x73, 0xe9, 0xeb, 0xad, 0x19, 0x1e, 0x89, 0x0f, 0x8b, 0x15, 0xd5, 0x8c, 0xe3, 0x23}}},
-{{{0x33, 0x79, 0xe7, 0x18, 0xe6, 0x0f, 0x57, 0x93, 0x15, 0xa0, 0xa7, 0xaa, 0xc4, 0xbf, 0x4f, 0x30, 0x74, 0x95, 0x5e, 0x69, 0x4a, 0x5b, 0x45, 0xe4, 0x00, 0xeb, 0x23, 0x74, 0x4c, 0xdf, 0x6b, 0x45}} ,
- {{0x97, 0x29, 0x6c, 0xc4, 0x42, 0x0b, 0xdd, 0xc0, 0x29, 0x5c, 0x9b, 0x34, 0x97, 0xd0, 0xc7, 0x79, 0x80, 0x63, 0x74, 0xe4, 0x8e, 0x37, 0xb0, 0x2b, 0x7c, 0xe8, 0x68, 0x6c, 0xc3, 0x82, 0x97, 0x57}}},
-{{{0x22, 0xbe, 0x83, 0xb6, 0x4b, 0x80, 0x6b, 0x43, 0x24, 0x5e, 0xef, 0x99, 0x9b, 0xa8, 0xfc, 0x25, 0x8d, 0x3b, 0x03, 0x94, 0x2b, 0x3e, 0xe7, 0x95, 0x76, 0x9b, 0xcc, 0x15, 0xdb, 0x32, 0xe6, 0x66}} ,
- {{0x84, 0xf0, 0x4a, 0x13, 0xa6, 0xd6, 0xfa, 0x93, 0x46, 0x07, 0xf6, 0x7e, 0x5c, 0x6d, 0x5e, 0xf6, 0xa6, 0xe7, 0x48, 0xf0, 0x06, 0xea, 0xff, 0x90, 0xc1, 0xcc, 0x4c, 0x19, 0x9c, 0x3c, 0x4e, 0x53}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x2a, 0x50, 0xe3, 0x07, 0x15, 0x59, 0xf2, 0x8b, 0x81, 0xf2, 0xf3, 0xd3, 0x6c, 0x99, 0x8c, 0x70, 0x67, 0xec, 0xcc, 0xee, 0x9e, 0x59, 0x45, 0x59, 0x7d, 0x47, 0x75, 0x69, 0xf5, 0x24, 0x93, 0x5d}} ,
- {{0x6a, 0x4f, 0x1b, 0xbe, 0x6b, 0x30, 0xcf, 0x75, 0x46, 0xe3, 0x7b, 0x9d, 0xfc, 0xcd, 0xd8, 0x5c, 0x1f, 0xb4, 0xc8, 0xe2, 0x24, 0xec, 0x1a, 0x28, 0x05, 0x32, 0x57, 0xfd, 0x3c, 0x5a, 0x98, 0x10}}},
-{{{0xa3, 0xdb, 0xf7, 0x30, 0xd8, 0xc2, 0x9a, 0xe1, 0xd3, 0xce, 0x22, 0xe5, 0x80, 0x1e, 0xd9, 0xe4, 0x1f, 0xab, 0xc0, 0x71, 0x1a, 0x86, 0x0e, 0x27, 0x99, 0x5b, 0xfa, 0x76, 0x99, 0xb0, 0x08, 0x3c}} ,
- {{0x2a, 0x93, 0xd2, 0x85, 0x1b, 0x6a, 0x5d, 0xa6, 0xee, 0xd1, 0xd1, 0x33, 0xbd, 0x6a, 0x36, 0x73, 0x37, 0x3a, 0x44, 0xb4, 0xec, 0xa9, 0x7a, 0xde, 0x83, 0x40, 0xd7, 0xdf, 0x28, 0xba, 0xa2, 0x30}}},
-{{{0xd3, 0xb5, 0x6d, 0x05, 0x3f, 0x9f, 0xf3, 0x15, 0x8d, 0x7c, 0xca, 0xc9, 0xfc, 0x8a, 0x7c, 0x94, 0xb0, 0x63, 0x36, 0x9b, 0x78, 0xd1, 0x91, 0x1f, 0x93, 0xd8, 0x57, 0x43, 0xde, 0x76, 0xa3, 0x43}} ,
- {{0x9b, 0x35, 0xe2, 0xa9, 0x3d, 0x32, 0x1e, 0xbb, 0x16, 0x28, 0x70, 0xe9, 0x45, 0x2f, 0x8f, 0x70, 0x7f, 0x08, 0x7e, 0x53, 0xc4, 0x7a, 0xbf, 0xf7, 0xe1, 0xa4, 0x6a, 0xd8, 0xac, 0x64, 0x1b, 0x11}}},
-{{{0xb2, 0xeb, 0x47, 0x46, 0x18, 0x3e, 0x1f, 0x99, 0x0c, 0xcc, 0xf1, 0x2c, 0xe0, 0xe7, 0x8f, 0xe0, 0x01, 0x7e, 0x65, 0xb8, 0x0c, 0xd0, 0xfb, 0xc8, 0xb9, 0x90, 0x98, 0x33, 0x61, 0x3b, 0xd8, 0x27}} ,
- {{0xa0, 0xbe, 0x72, 0x3a, 0x50, 0x4b, 0x74, 0xab, 0x01, 0xc8, 0x93, 0xc5, 0xe4, 0xc7, 0x08, 0x6c, 0xb4, 0xca, 0xee, 0xeb, 0x8e, 0xd7, 0x4e, 0x26, 0xc6, 0x1d, 0xe2, 0x71, 0xaf, 0x89, 0xa0, 0x2a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x98, 0x0b, 0xe4, 0xde, 0xdb, 0xa8, 0xfa, 0x82, 0x74, 0x06, 0x52, 0x6d, 0x08, 0x52, 0x8a, 0xff, 0x62, 0xc5, 0x6a, 0x44, 0x0f, 0x51, 0x8c, 0x1f, 0x6e, 0xb6, 0xc6, 0x2c, 0x81, 0xd3, 0x76, 0x46}} ,
- {{0xf4, 0x29, 0x74, 0x2e, 0x80, 0xa7, 0x1a, 0x8f, 0xf6, 0xbd, 0xd6, 0x8e, 0xbf, 0xc1, 0x95, 0x2a, 0xeb, 0xa0, 0x7f, 0x45, 0xa0, 0x50, 0x14, 0x05, 0xb1, 0x57, 0x4c, 0x74, 0xb7, 0xe2, 0x89, 0x7d}}},
-{{{0x07, 0xee, 0xa7, 0xad, 0xb7, 0x09, 0x0b, 0x49, 0x4e, 0xbf, 0xca, 0xe5, 0x21, 0xe6, 0xe6, 0xaf, 0xd5, 0x67, 0xf3, 0xce, 0x7e, 0x7c, 0x93, 0x7b, 0x5a, 0x10, 0x12, 0x0e, 0x6c, 0x06, 0x11, 0x75}} ,
- {{0xd5, 0xfc, 0x86, 0xa3, 0x3b, 0xa3, 0x3e, 0x0a, 0xfb, 0x0b, 0xf7, 0x36, 0xb1, 0x5b, 0xda, 0x70, 0xb7, 0x00, 0xa7, 0xda, 0x88, 0x8f, 0x84, 0xa8, 0xbc, 0x1c, 0x39, 0xb8, 0x65, 0xf3, 0x4d, 0x60}}},
-{{{0x96, 0x9d, 0x31, 0xf4, 0xa2, 0xbe, 0x81, 0xb9, 0xa5, 0x59, 0x9e, 0xba, 0x07, 0xbe, 0x74, 0x58, 0xd8, 0xeb, 0xc5, 0x9f, 0x3d, 0xd1, 0xf4, 0xae, 0xce, 0x53, 0xdf, 0x4f, 0xc7, 0x2a, 0x89, 0x4d}} ,
- {{0x29, 0xd8, 0xf2, 0xaa, 0xe9, 0x0e, 0xf7, 0x2e, 0x5f, 0x9d, 0x8a, 0x5b, 0x09, 0xed, 0xc9, 0x24, 0x22, 0xf4, 0x0f, 0x25, 0x8f, 0x1c, 0x84, 0x6e, 0x34, 0x14, 0x6c, 0xea, 0xb3, 0x86, 0x5d, 0x04}}},
-{{{0x07, 0x98, 0x61, 0xe8, 0x6a, 0xd2, 0x81, 0x49, 0x25, 0xd5, 0x5b, 0x18, 0xc7, 0x35, 0x52, 0x51, 0xa4, 0x46, 0xad, 0x18, 0x0d, 0xc9, 0x5f, 0x18, 0x91, 0x3b, 0xb4, 0xc0, 0x60, 0x59, 0x8d, 0x66}} ,
- {{0x03, 0x1b, 0x79, 0x53, 0x6e, 0x24, 0xae, 0x57, 0xd9, 0x58, 0x09, 0x85, 0x48, 0xa2, 0xd3, 0xb5, 0xe2, 0x4d, 0x11, 0x82, 0xe6, 0x86, 0x3c, 0xe9, 0xb1, 0x00, 0x19, 0xc2, 0x57, 0xf7, 0x66, 0x7a}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x0f, 0xe3, 0x89, 0x03, 0xd7, 0x22, 0x95, 0x9f, 0xca, 0xb4, 0x8d, 0x9e, 0x6d, 0x97, 0xff, 0x8d, 0x21, 0x59, 0x07, 0xef, 0x03, 0x2d, 0x5e, 0xf8, 0x44, 0x46, 0xe7, 0x85, 0x80, 0xc5, 0x89, 0x50}} ,
- {{0x8b, 0xd8, 0x53, 0x86, 0x24, 0x86, 0x29, 0x52, 0x01, 0xfa, 0x20, 0xc3, 0x4e, 0x95, 0xcb, 0xad, 0x7b, 0x34, 0x94, 0x30, 0xb7, 0x7a, 0xfa, 0x96, 0x41, 0x60, 0x2b, 0xcb, 0x59, 0xb9, 0xca, 0x50}}},
-{{{0xc2, 0x5b, 0x9b, 0x78, 0x23, 0x1b, 0x3a, 0x88, 0x94, 0x5f, 0x0a, 0x9b, 0x98, 0x2b, 0x6e, 0x53, 0x11, 0xf6, 0xff, 0xc6, 0x7d, 0x42, 0xcc, 0x02, 0x80, 0x40, 0x0d, 0x1e, 0xfb, 0xaf, 0x61, 0x07}} ,
- {{0xb0, 0xe6, 0x2f, 0x81, 0x70, 0xa1, 0x2e, 0x39, 0x04, 0x7c, 0xc4, 0x2c, 0x87, 0x45, 0x4a, 0x5b, 0x69, 0x97, 0xac, 0x6d, 0x2c, 0x10, 0x42, 0x7c, 0x3b, 0x15, 0x70, 0x60, 0x0e, 0x11, 0x6d, 0x3a}}},
-{{{0x9b, 0x18, 0x80, 0x5e, 0xdb, 0x05, 0xbd, 0xc6, 0xb7, 0x3c, 0xc2, 0x40, 0x4d, 0x5d, 0xce, 0x97, 0x8a, 0x34, 0x15, 0xab, 0x28, 0x5d, 0x10, 0xf0, 0x37, 0x0c, 0xcc, 0x16, 0xfa, 0x1f, 0x33, 0x0d}} ,
- {{0x19, 0xf9, 0x35, 0xaa, 0x59, 0x1a, 0x0c, 0x5c, 0x06, 0xfc, 0x6a, 0x0b, 0x97, 0x53, 0x36, 0xfc, 0x2a, 0xa5, 0x5a, 0x9b, 0x30, 0xef, 0x23, 0xaf, 0x39, 0x5d, 0x9a, 0x6b, 0x75, 0x57, 0x48, 0x0b}}},
-{{{0x26, 0xdc, 0x76, 0x3b, 0xfc, 0xf9, 0x9c, 0x3f, 0x89, 0x0b, 0x62, 0x53, 0xaf, 0x83, 0x01, 0x2e, 0xbc, 0x6a, 0xc6, 0x03, 0x0d, 0x75, 0x2a, 0x0d, 0xe6, 0x94, 0x54, 0xcf, 0xb3, 0xe5, 0x96, 0x25}} ,
- {{0xfe, 0x82, 0xb1, 0x74, 0x31, 0x8a, 0xa7, 0x6f, 0x56, 0xbd, 0x8d, 0xf4, 0xe0, 0x94, 0x51, 0x59, 0xde, 0x2c, 0x5a, 0xf4, 0x84, 0x6b, 0x4a, 0x88, 0x93, 0xc0, 0x0c, 0x9a, 0xac, 0xa7, 0xa0, 0x68}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x25, 0x0d, 0xd6, 0xc7, 0x23, 0x47, 0x10, 0xad, 0xc7, 0x08, 0x5c, 0x87, 0x87, 0x93, 0x98, 0x18, 0xb8, 0xd3, 0x9c, 0xac, 0x5a, 0x3d, 0xc5, 0x75, 0xf8, 0x49, 0x32, 0x14, 0xcc, 0x51, 0x96, 0x24}} ,
- {{0x65, 0x9c, 0x5d, 0xf0, 0x37, 0x04, 0xf0, 0x34, 0x69, 0x2a, 0xf0, 0xa5, 0x64, 0xca, 0xde, 0x2b, 0x5b, 0x15, 0x10, 0xd2, 0xab, 0x06, 0xdd, 0xc4, 0xb0, 0xb6, 0x5b, 0xc1, 0x17, 0xdf, 0x8f, 0x02}}},
-{{{0xbd, 0x59, 0x3d, 0xbf, 0x5c, 0x31, 0x44, 0x2c, 0x32, 0x94, 0x04, 0x60, 0x84, 0x0f, 0xad, 0x00, 0xb6, 0x8f, 0xc9, 0x1d, 0xcc, 0x5c, 0xa2, 0x49, 0x0e, 0x50, 0x91, 0x08, 0x9a, 0x43, 0x55, 0x05}} ,
- {{0x5d, 0x93, 0x55, 0xdf, 0x9b, 0x12, 0x19, 0xec, 0x93, 0x85, 0x42, 0x9e, 0x66, 0x0f, 0x9d, 0xaf, 0x99, 0xaf, 0x26, 0x89, 0xbc, 0x61, 0xfd, 0xff, 0xce, 0x4b, 0xf4, 0x33, 0x95, 0xc9, 0x35, 0x58}}},
-{{{0x12, 0x55, 0xf9, 0xda, 0xcb, 0x44, 0xa7, 0xdc, 0x57, 0xe2, 0xf9, 0x9a, 0xe6, 0x07, 0x23, 0x60, 0x54, 0xa7, 0x39, 0xa5, 0x9b, 0x84, 0x56, 0x6e, 0xaa, 0x8b, 0x8f, 0xb0, 0x2c, 0x87, 0xaf, 0x67}} ,
- {{0x00, 0xa9, 0x4c, 0xb2, 0x12, 0xf8, 0x32, 0xa8, 0x7a, 0x00, 0x4b, 0x49, 0x32, 0xba, 0x1f, 0x5d, 0x44, 0x8e, 0x44, 0x7a, 0xdc, 0x11, 0xfb, 0x39, 0x08, 0x57, 0x87, 0xa5, 0x12, 0x42, 0x93, 0x0e}}},
-{{{0x17, 0xb4, 0xae, 0x72, 0x59, 0xd0, 0xaa, 0xa8, 0x16, 0x8b, 0x63, 0x11, 0xb3, 0x43, 0x04, 0xda, 0x0c, 0xa8, 0xb7, 0x68, 0xdd, 0x4e, 0x54, 0xe7, 0xaf, 0x5d, 0x5d, 0x05, 0x76, 0x36, 0xec, 0x0d}} ,
- {{0x6d, 0x7c, 0x82, 0x32, 0x38, 0x55, 0x57, 0x74, 0x5b, 0x7d, 0xc3, 0xc4, 0xfb, 0x06, 0x29, 0xf0, 0x13, 0x55, 0x54, 0xc6, 0xa7, 0xdc, 0x4c, 0x9f, 0x98, 0x49, 0x20, 0xa8, 0xc3, 0x8d, 0xfa, 0x48}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x87, 0x47, 0x9d, 0xe9, 0x25, 0xd5, 0xe3, 0x47, 0x78, 0xdf, 0x85, 0xa7, 0x85, 0x5e, 0x7a, 0x4c, 0x5f, 0x79, 0x1a, 0xf3, 0xa2, 0xb2, 0x28, 0xa0, 0x9c, 0xdd, 0x30, 0x40, 0xd4, 0x38, 0xbd, 0x28}} ,
- {{0xfc, 0xbb, 0xd5, 0x78, 0x6d, 0x1d, 0xd4, 0x99, 0xb4, 0xaa, 0x44, 0x44, 0x7a, 0x1b, 0xd8, 0xfe, 0xb4, 0x99, 0xb9, 0xcc, 0xe7, 0xc4, 0xd3, 0x3a, 0x73, 0x83, 0x41, 0x5c, 0x40, 0xd7, 0x2d, 0x55}}},
-{{{0x26, 0xe1, 0x7b, 0x5f, 0xe5, 0xdc, 0x3f, 0x7d, 0xa1, 0xa7, 0x26, 0x44, 0x22, 0x23, 0xc0, 0x8f, 0x7d, 0xf1, 0xb5, 0x11, 0x47, 0x7b, 0x19, 0xd4, 0x75, 0x6f, 0x1e, 0xa5, 0x27, 0xfe, 0xc8, 0x0e}} ,
- {{0xd3, 0x11, 0x3d, 0xab, 0xef, 0x2c, 0xed, 0xb1, 0x3d, 0x7c, 0x32, 0x81, 0x6b, 0xfe, 0xf8, 0x1c, 0x3c, 0x7b, 0xc0, 0x61, 0xdf, 0xb8, 0x75, 0x76, 0x7f, 0xaa, 0xd8, 0x93, 0xaf, 0x3d, 0xe8, 0x3d}}},
-{{{0xfd, 0x5b, 0x4e, 0x8d, 0xb6, 0x7e, 0x82, 0x9b, 0xef, 0xce, 0x04, 0x69, 0x51, 0x52, 0xff, 0xef, 0xa0, 0x52, 0xb5, 0x79, 0x17, 0x5e, 0x2f, 0xde, 0xd6, 0x3c, 0x2d, 0xa0, 0x43, 0xb4, 0x0b, 0x19}} ,
- {{0xc0, 0x61, 0x48, 0x48, 0x17, 0xf4, 0x9e, 0x18, 0x51, 0x2d, 0xea, 0x2f, 0xf2, 0xf2, 0xe0, 0xa3, 0x14, 0xb7, 0x8b, 0x3a, 0x30, 0xf5, 0x81, 0xc1, 0x5d, 0x71, 0x39, 0x62, 0x55, 0x1f, 0x60, 0x5a}}},
-{{{0xe5, 0x89, 0x8a, 0x76, 0x6c, 0xdb, 0x4d, 0x0a, 0x5b, 0x72, 0x9d, 0x59, 0x6e, 0x63, 0x63, 0x18, 0x7c, 0xe3, 0xfa, 0xe2, 0xdb, 0xa1, 0x8d, 0xf4, 0xa5, 0xd7, 0x16, 0xb2, 0xd0, 0xb3, 0x3f, 0x39}} ,
- {{0xce, 0x60, 0x09, 0x6c, 0xf5, 0x76, 0x17, 0x24, 0x80, 0x3a, 0x96, 0xc7, 0x94, 0x2e, 0xf7, 0x6b, 0xef, 0xb5, 0x05, 0x96, 0xef, 0xd3, 0x7b, 0x51, 0xda, 0x05, 0x44, 0x67, 0xbc, 0x07, 0x21, 0x4e}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xe9, 0x73, 0x6f, 0x21, 0xb9, 0xde, 0x22, 0x7d, 0xeb, 0x97, 0x31, 0x10, 0xa3, 0xea, 0xe1, 0xc6, 0x37, 0xeb, 0x8f, 0x43, 0x58, 0xde, 0x41, 0x64, 0x0e, 0x3e, 0x07, 0x99, 0x3d, 0xf1, 0xdf, 0x1e}} ,
- {{0xf8, 0xad, 0x43, 0xc2, 0x17, 0x06, 0xe2, 0xe4, 0xa9, 0x86, 0xcd, 0x18, 0xd7, 0x78, 0xc8, 0x74, 0x66, 0xd2, 0x09, 0x18, 0xa5, 0xf1, 0xca, 0xa6, 0x62, 0x92, 0xc1, 0xcb, 0x00, 0xeb, 0x42, 0x2e}}},
-{{{0x7b, 0x34, 0x24, 0x4c, 0xcf, 0x38, 0xe5, 0x6c, 0x0a, 0x01, 0x2c, 0x22, 0x0b, 0x24, 0x38, 0xad, 0x24, 0x7e, 0x19, 0xf0, 0x6c, 0xf9, 0x31, 0xf4, 0x35, 0x11, 0xf6, 0x46, 0x33, 0x3a, 0x23, 0x59}} ,
- {{0x20, 0x0b, 0xa1, 0x08, 0x19, 0xad, 0x39, 0x54, 0xea, 0x3e, 0x23, 0x09, 0xb6, 0xe2, 0xd2, 0xbc, 0x4d, 0xfc, 0x9c, 0xf0, 0x13, 0x16, 0x22, 0x3f, 0xb9, 0xd2, 0x11, 0x86, 0x90, 0x55, 0xce, 0x3c}}},
-{{{0xc4, 0x0b, 0x4b, 0x62, 0x99, 0x37, 0x84, 0x3f, 0x74, 0xa2, 0xf9, 0xce, 0xe2, 0x0b, 0x0f, 0x2a, 0x3d, 0xa3, 0xe3, 0xdb, 0x5a, 0x9d, 0x93, 0xcc, 0xa5, 0xef, 0x82, 0x91, 0x1d, 0xe6, 0x6c, 0x68}} ,
- {{0xa3, 0x64, 0x17, 0x9b, 0x8b, 0xc8, 0x3a, 0x61, 0xe6, 0x9d, 0xc6, 0xed, 0x7b, 0x03, 0x52, 0x26, 0x9d, 0x3a, 0xb3, 0x13, 0xcc, 0x8a, 0xfd, 0x2c, 0x1a, 0x1d, 0xed, 0x13, 0xd0, 0x55, 0x57, 0x0e}}},
-{{{0x1a, 0xea, 0xbf, 0xfd, 0x4a, 0x3c, 0x8e, 0xec, 0x29, 0x7e, 0x77, 0x77, 0x12, 0x99, 0xd7, 0x84, 0xf9, 0x55, 0x7f, 0xf1, 0x8b, 0xb4, 0xd2, 0x95, 0xa3, 0x8d, 0xf0, 0x8a, 0xa7, 0xeb, 0x82, 0x4b}} ,
- {{0x2c, 0x28, 0xf4, 0x3a, 0xf6, 0xde, 0x0a, 0xe0, 0x41, 0x44, 0x23, 0xf8, 0x3f, 0x03, 0x64, 0x9f, 0xc3, 0x55, 0x4c, 0xc6, 0xc1, 0x94, 0x1c, 0x24, 0x5d, 0x5f, 0x92, 0x45, 0x96, 0x57, 0x37, 0x14}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xc1, 0xcd, 0x90, 0x66, 0xb9, 0x76, 0xa0, 0x5b, 0xa5, 0x85, 0x75, 0x23, 0xf9, 0x89, 0xa5, 0x82, 0xb2, 0x6f, 0xb1, 0xeb, 0xc4, 0x69, 0x6f, 0x18, 0x5a, 0xed, 0x94, 0x3d, 0x9d, 0xd9, 0x2c, 0x1a}} ,
- {{0x35, 0xb0, 0xe6, 0x73, 0x06, 0xb7, 0x37, 0xe0, 0xf8, 0xb0, 0x22, 0xe8, 0xd2, 0xed, 0x0b, 0xef, 0xe6, 0xc6, 0x5a, 0x99, 0x9e, 0x1a, 0x9f, 0x04, 0x97, 0xe4, 0x4d, 0x0b, 0xbe, 0xba, 0x44, 0x40}}},
-{{{0xc1, 0x56, 0x96, 0x91, 0x5f, 0x1f, 0xbb, 0x54, 0x6f, 0x88, 0x89, 0x0a, 0xb2, 0xd6, 0x41, 0x42, 0x6a, 0x82, 0xee, 0x14, 0xaa, 0x76, 0x30, 0x65, 0x0f, 0x67, 0x39, 0xa6, 0x51, 0x7c, 0x49, 0x24}} ,
- {{0x35, 0xa3, 0x78, 0xd1, 0x11, 0x0f, 0x75, 0xd3, 0x70, 0x46, 0xdb, 0x20, 0x51, 0xcb, 0x92, 0x80, 0x54, 0x10, 0x74, 0x36, 0x86, 0xa9, 0xd7, 0xa3, 0x08, 0x78, 0xf1, 0x01, 0x29, 0xf8, 0x80, 0x3b}}},
-{{{0xdb, 0xa7, 0x9d, 0x9d, 0xbf, 0xa0, 0xcc, 0xed, 0x53, 0xa2, 0xa2, 0x19, 0x39, 0x48, 0x83, 0x19, 0x37, 0x58, 0xd1, 0x04, 0x28, 0x40, 0xf7, 0x8a, 0xc2, 0x08, 0xb7, 0xa5, 0x42, 0xcf, 0x53, 0x4c}} ,
- {{0xa7, 0xbb, 0xf6, 0x8e, 0xad, 0xdd, 0xf7, 0x90, 0xdd, 0x5f, 0x93, 0x89, 0xae, 0x04, 0x37, 0xe6, 0x9a, 0xb7, 0xe8, 0xc0, 0xdf, 0x16, 0x2a, 0xbf, 0xc4, 0x3a, 0x3c, 0x41, 0xd5, 0x89, 0x72, 0x5a}}},
-{{{0x1f, 0x96, 0xff, 0x34, 0x2c, 0x13, 0x21, 0xcb, 0x0a, 0x89, 0x85, 0xbe, 0xb3, 0x70, 0x9e, 0x1e, 0xde, 0x97, 0xaf, 0x96, 0x30, 0xf7, 0x48, 0x89, 0x40, 0x8d, 0x07, 0xf1, 0x25, 0xf0, 0x30, 0x58}} ,
- {{0x1e, 0xd4, 0x93, 0x57, 0xe2, 0x17, 0xe7, 0x9d, 0xab, 0x3c, 0x55, 0x03, 0x82, 0x2f, 0x2b, 0xdb, 0x56, 0x1e, 0x30, 0x2e, 0x24, 0x47, 0x6e, 0xe6, 0xff, 0x33, 0x24, 0x2c, 0x75, 0x51, 0xd4, 0x67}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0x2b, 0x06, 0xd9, 0xa1, 0x5d, 0xe1, 0xf4, 0xd1, 0x1e, 0x3c, 0x9a, 0xc6, 0x29, 0x2b, 0x13, 0x13, 0x78, 0xc0, 0xd8, 0x16, 0x17, 0x2d, 0x9e, 0xa9, 0xc9, 0x79, 0x57, 0xab, 0x24, 0x91, 0x92, 0x19}} ,
- {{0x69, 0xfb, 0xa1, 0x9c, 0xa6, 0x75, 0x49, 0x7d, 0x60, 0x73, 0x40, 0x42, 0xc4, 0x13, 0x0a, 0x95, 0x79, 0x1e, 0x04, 0x83, 0x94, 0x99, 0x9b, 0x1e, 0x0c, 0xe8, 0x1f, 0x54, 0xef, 0xcb, 0xc0, 0x52}}},
-{{{0x14, 0x89, 0x73, 0xa1, 0x37, 0x87, 0x6a, 0x7a, 0xcf, 0x1d, 0xd9, 0x2e, 0x1a, 0x67, 0xed, 0x74, 0xc0, 0xf0, 0x9c, 0x33, 0xdd, 0xdf, 0x08, 0xbf, 0x7b, 0xd1, 0x66, 0xda, 0xe6, 0xc9, 0x49, 0x08}} ,
- {{0xe9, 0xdd, 0x5e, 0x55, 0xb0, 0x0a, 0xde, 0x21, 0x4c, 0x5a, 0x2e, 0xd4, 0x80, 0x3a, 0x57, 0x92, 0x7a, 0xf1, 0xc4, 0x2c, 0x40, 0xaf, 0x2f, 0xc9, 0x92, 0x03, 0xe5, 0x5a, 0xbc, 0xdc, 0xf4, 0x09}}},
-{{{0xf3, 0xe1, 0x2b, 0x7c, 0x05, 0x86, 0x80, 0x93, 0x4a, 0xad, 0xb4, 0x8f, 0x7e, 0x99, 0x0c, 0xfd, 0xcd, 0xef, 0xd1, 0xff, 0x2c, 0x69, 0x34, 0x13, 0x41, 0x64, 0xcf, 0x3b, 0xd0, 0x90, 0x09, 0x1e}} ,
- {{0x9d, 0x45, 0xd6, 0x80, 0xe6, 0x45, 0xaa, 0xf4, 0x15, 0xaa, 0x5c, 0x34, 0x87, 0x99, 0xa2, 0x8c, 0x26, 0x84, 0x62, 0x7d, 0xb6, 0x29, 0xc0, 0x52, 0xea, 0xf5, 0x81, 0x18, 0x0f, 0x35, 0xa9, 0x0e}}},
-{{{0xe7, 0x20, 0x72, 0x7c, 0x6d, 0x94, 0x5f, 0x52, 0x44, 0x54, 0xe3, 0xf1, 0xb2, 0xb0, 0x36, 0x46, 0x0f, 0xae, 0x92, 0xe8, 0x70, 0x9d, 0x6e, 0x79, 0xb1, 0xad, 0x37, 0xa9, 0x5f, 0xc0, 0xde, 0x03}} ,
- {{0x15, 0x55, 0x37, 0xc6, 0x1c, 0x27, 0x1c, 0x6d, 0x14, 0x4f, 0xca, 0xa4, 0xc4, 0x88, 0x25, 0x46, 0x39, 0xfc, 0x5a, 0xe5, 0xfe, 0x29, 0x11, 0x69, 0xf5, 0x72, 0x84, 0x4d, 0x78, 0x9f, 0x94, 0x15}}},
-{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
- {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-{{{0xec, 0xd3, 0xff, 0x57, 0x0b, 0xb0, 0xb2, 0xdc, 0xf8, 0x4f, 0xe2, 0x12, 0xd5, 0x36, 0xbe, 0x6b, 0x09, 0x43, 0x6d, 0xa3, 0x4d, 0x90, 0x2d, 0xb8, 0x74, 0xe8, 0x71, 0x45, 0x19, 0x8b, 0x0c, 0x6a}} ,
- {{0xb8, 0x42, 0x1c, 0x03, 0xad, 0x2c, 0x03, 0x8e, 0xac, 0xd7, 0x98, 0x29, 0x13, 0xc6, 0x02, 0x29, 0xb5, 0xd4, 0xe7, 0xcf, 0xcc, 0x8b, 0x83, 0xec, 0x35, 0xc7, 0x9c, 0x74, 0xb7, 0xad, 0x85, 0x5f}}},
-{{{0x78, 0x84, 0xe1, 0x56, 0x45, 0x69, 0x68, 0x5a, 0x4f, 0xb8, 0xb1, 0x29, 0xff, 0x33, 0x03, 0x31, 0xb7, 0xcb, 0x96, 0x25, 0xe6, 0xe6, 0x41, 0x98, 0x1a, 0xbb, 0x03, 0x56, 0xf2, 0xb2, 0x91, 0x34}} ,
- {{0x2c, 0x6c, 0xf7, 0x66, 0xa4, 0x62, 0x6b, 0x39, 0xb3, 0xba, 0x65, 0xd3, 0x1c, 0xf8, 0x11, 0xaa, 0xbe, 0xdc, 0x80, 0x59, 0x87, 0xf5, 0x7b, 0xe5, 0xe3, 0xb3, 0x3e, 0x39, 0xda, 0xbe, 0x88, 0x09}}},
-{{{0x8b, 0xf1, 0xa0, 0xf5, 0xdc, 0x29, 0xb4, 0xe2, 0x07, 0xc6, 0x7a, 0x00, 0xd0, 0x89, 0x17, 0x51, 0xd4, 0xbb, 0xd4, 0x22, 0xea, 0x7e, 0x7d, 0x7c, 0x24, 0xea, 0xf2, 0xe8, 0x22, 0x12, 0x95, 0x06}} ,
- {{0xda, 0x7c, 0xa4, 0x0c, 0xf4, 0xba, 0x6e, 0xe1, 0x89, 0xb5, 0x59, 0xca, 0xf1, 0xc0, 0x29, 0x36, 0x09, 0x44, 0xe2, 0x7f, 0xd1, 0x63, 0x15, 0x99, 0xea, 0x25, 0xcf, 0x0c, 0x9d, 0xc0, 0x44, 0x6f}}},
-{{{0x1d, 0x86, 0x4e, 0xcf, 0xf7, 0x37, 0x10, 0x25, 0x8f, 0x12, 0xfb, 0x19, 0xfb, 0xe0, 0xed, 0x10, 0xc8, 0xe2, 0xf5, 0x75, 0xb1, 0x33, 0xc0, 0x96, 0x0d, 0xfb, 0x15, 0x6c, 0x0d, 0x07, 0x5f, 0x05}} ,
- {{0x69, 0x3e, 0x47, 0x97, 0x2c, 0xaf, 0x52, 0x7c, 0x78, 0x83, 0xad, 0x1b, 0x39, 0x82, 0x2f, 0x02, 0x6f, 0x47, 0xdb, 0x2a, 0xb0, 0xe1, 0x91, 0x99, 0x55, 0xb8, 0x99, 0x3a, 0xa0, 0x44, 0x11, 0x51}}}
diff --git a/src-ed25519/supercop-ref/sc25519.c b/src-ed25519/supercop-ref/sc25519.c
deleted file mode 100644
index 4c30430..0000000
--- a/src-ed25519/supercop-ref/sc25519.c
+++ /dev/null
@@ -1,298 +0,0 @@
-#include "sc25519.h"
-
-/*Arithmetic modulo the group order m = 2^252 +  27742317777372353535851937790883648493 = 7237005577332262213973186563042994240857116359379907606001950938285454250989 */
-
-static const crypto_uint32 m[32] = {0xED, 0xD3, 0xF5, 0x5C, 0x1A, 0x63, 0x12, 0x58, 0xD6, 0x9C, 0xF7, 0xA2, 0xDE, 0xF9, 0xDE, 0x14, 
-                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10};
-
-static const crypto_uint32 mu[33] = {0x1B, 0x13, 0x2C, 0x0A, 0xA3, 0xE5, 0x9C, 0xED, 0xA7, 0x29, 0x63, 0x08, 0x5D, 0x21, 0x06, 0x21, 
-                                     0xEB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F};
-
-static crypto_uint32 lt(crypto_uint32 a,crypto_uint32 b) /* 16-bit inputs */
-{
-  unsigned int x = a;
-  x -= (unsigned int) b; /* 0..65535: no; 4294901761..4294967295: yes */
-  x >>= 31; /* 0: no; 1: yes */
-  return x;
-}
-
-/* Reduce coefficients of r before calling reduce_add_sub */
-static void reduce_add_sub(sc25519 *r)
-{
-  crypto_uint32 pb = 0;
-  crypto_uint32 b;
-  crypto_uint32 mask;
-  int i;
-  unsigned char t[32];
-
-  for(i=0;i<32;i++) 
-  {
-    pb += m[i];
-    b = lt(r->v[i],pb);
-    t[i] = r->v[i]-pb+(b<<8);
-    pb = b;
-  }
-  mask = b - 1;
-  for(i=0;i<32;i++) 
-    r->v[i] ^= mask & (r->v[i] ^ t[i]);
-}
-
-/* Reduce coefficients of x before calling barrett_reduce */
-static void barrett_reduce(sc25519 *r, const crypto_uint32 x[64])
-{
-  /* See HAC, Alg. 14.42 */
-  int i,j;
-  crypto_uint32 q2[66];
-  crypto_uint32 *q3 = q2 + 33;
-  crypto_uint32 r1[33];
-  crypto_uint32 r2[33];
-  crypto_uint32 carry;
-  crypto_uint32 pb = 0;
-  crypto_uint32 b;
-
-  for (i = 0;i < 66;++i) q2[i] = 0;
-  for (i = 0;i < 33;++i) r2[i] = 0;
-
-  for(i=0;i<33;i++)
-    for(j=0;j<33;j++)
-      if(i+j >= 31) q2[i+j] += mu[i]*x[j+31];
-  carry = q2[31] >> 8;
-  q2[32] += carry;
-  carry = q2[32] >> 8;
-  q2[33] += carry;
-
-  for(i=0;i<33;i++)r1[i] = x[i];
-  for(i=0;i<32;i++)
-    for(j=0;j<33;j++)
-      if(i+j < 33) r2[i+j] += m[i]*q3[j];
-
-  for(i=0;i<32;i++)
-  {
-    carry = r2[i] >> 8;
-    r2[i+1] += carry;
-    r2[i] &= 0xff;
-  }
-
-  for(i=0;i<32;i++) 
-  {
-    pb += r2[i];
-    b = lt(r1[i],pb);
-    r->v[i] = r1[i]-pb+(b<<8);
-    pb = b;
-  }
-
-  /* XXX: Can it really happen that r<0?, See HAC, Alg 14.42, Step 3 
-   * If so: Handle  it here!
-   */
-
-  reduce_add_sub(r);
-  reduce_add_sub(r);
-}
-
-void sc25519_from32bytes(sc25519 *r, const unsigned char x[32])
-{
-  int i;
-  crypto_uint32 t[64];
-  for(i=0;i<32;i++) t[i] = x[i];
-  for(i=32;i<64;++i) t[i] = 0;
-  barrett_reduce(r, t);
-}
-
-void shortsc25519_from16bytes(shortsc25519 *r, const unsigned char x[16])
-{
-  int i;
-  for(i=0;i<16;i++) r->v[i] = x[i];
-}
-
-void sc25519_from64bytes(sc25519 *r, const unsigned char x[64])
-{
-  int i;
-  crypto_uint32 t[64];
-  for(i=0;i<64;i++) t[i] = x[i];
-  barrett_reduce(r, t);
-}
-
-void sc25519_from_shortsc(sc25519 *r, const shortsc25519 *x)
-{
-  int i;
-  for(i=0;i<16;i++)
-    r->v[i] = x->v[i];
-  for(i=0;i<16;i++)
-    r->v[16+i] = 0;
-}
-
-void sc25519_to32bytes(unsigned char r[32], const sc25519 *x)
-{
-  int i;
-  for(i=0;i<32;i++) r[i] = x->v[i];
-}
-
-int sc25519_iszero_vartime(const sc25519 *x)
-{
-  int i;
-  for(i=0;i<32;i++)
-    if(x->v[i] != 0) return 0;
-  return 1;
-}
-
-int sc25519_isshort_vartime(const sc25519 *x)
-{
-  int i;
-  for(i=31;i>15;i--)
-    if(x->v[i] != 0) return 0;
-  return 1;
-}
-
-int sc25519_lt_vartime(const sc25519 *x, const sc25519 *y)
-{
-  int i;
-  for(i=31;i>=0;i--)
-  {
-    if(x->v[i] < y->v[i]) return 1;
-    if(x->v[i] > y->v[i]) return 0;
-  }
-  return 0;
-}
-
-void sc25519_add(sc25519 *r, const sc25519 *x, const sc25519 *y)
-{
-  int i, carry;
-  for(i=0;i<32;i++) r->v[i] = x->v[i] + y->v[i];
-  for(i=0;i<31;i++)
-  {
-    carry = r->v[i] >> 8;
-    r->v[i+1] += carry;
-    r->v[i] &= 0xff;
-  }
-  reduce_add_sub(r);
-}
-
-void sc25519_sub_nored(sc25519 *r, const sc25519 *x, const sc25519 *y)
-{
-  crypto_uint32 b = 0;
-  crypto_uint32 t;
-  int i;
-  for(i=0;i<32;i++)
-  {
-    t = x->v[i] - y->v[i] - b;
-    r->v[i] = t & 255;
-    b = (t >> 8) & 1;
-  }
-}
-
-void sc25519_mul(sc25519 *r, const sc25519 *x, const sc25519 *y)
-{
-  int i,j,carry;
-  crypto_uint32 t[64];
-  for(i=0;i<64;i++)t[i] = 0;
-
-  for(i=0;i<32;i++)
-    for(j=0;j<32;j++)
-      t[i+j] += x->v[i] * y->v[j];
-
-  /* Reduce coefficients */
-  for(i=0;i<63;i++)
-  {
-    carry = t[i] >> 8;
-    t[i+1] += carry;
-    t[i] &= 0xff;
-  }
-
-  barrett_reduce(r, t);
-}
-
-void sc25519_mul_shortsc(sc25519 *r, const sc25519 *x, const shortsc25519 *y)
-{
-  sc25519 t;
-  sc25519_from_shortsc(&t, y);
-  sc25519_mul(r, x, &t);
-}
-
-void sc25519_window3(signed char r[85], const sc25519 *s)
-{
-  char carry;
-  int i;
-  for(i=0;i<10;i++)
-  {
-    r[8*i+0]  =  s->v[3*i+0]       & 7;
-    r[8*i+1]  = (s->v[3*i+0] >> 3) & 7;
-    r[8*i+2]  = (s->v[3*i+0] >> 6) & 7;
-    r[8*i+2] ^= (s->v[3*i+1] << 2) & 7;
-    r[8*i+3]  = (s->v[3*i+1] >> 1) & 7;
-    r[8*i+4]  = (s->v[3*i+1] >> 4) & 7;
-    r[8*i+5]  = (s->v[3*i+1] >> 7) & 7;
-    r[8*i+5] ^= (s->v[3*i+2] << 1) & 7;
-    r[8*i+6]  = (s->v[3*i+2] >> 2) & 7;
-    r[8*i+7]  = (s->v[3*i+2] >> 5) & 7;
-  }
-  r[8*i+0]  =  s->v[3*i+0]       & 7;
-  r[8*i+1]  = (s->v[3*i+0] >> 3) & 7;
-  r[8*i+2]  = (s->v[3*i+0] >> 6) & 7;
-  r[8*i+2] ^= (s->v[3*i+1] << 2) & 7;
-  r[8*i+3]  = (s->v[3*i+1] >> 1) & 7;
-  r[8*i+4]  = (s->v[3*i+1] >> 4) & 7;
-
-  /* Making it signed */
-  carry = 0;
-  for(i=0;i<84;i++)
-  {
-    r[i] += carry;
-    r[i+1] += r[i] >> 3;
-    r[i] &= 7;
-    carry = r[i] >> 2;
-    r[i] -= carry<<3;
-  }
-  r[84] += carry;
-}
-
-void sc25519_window5(signed char r[51], const sc25519 *s)
-{
-  char carry;
-  int i;
-  for(i=0;i<6;i++)
-  {
-    r[8*i+0]  =  s->v[5*i+0]       & 31;
-    r[8*i+1]  = (s->v[5*i+0] >> 5) & 31;
-    r[8*i+1] ^= (s->v[5*i+1] << 3) & 31;
-    r[8*i+2]  = (s->v[5*i+1] >> 2) & 31;
-    r[8*i+3]  = (s->v[5*i+1] >> 7) & 31;
-    r[8*i+3] ^= (s->v[5*i+2] << 1) & 31;
-    r[8*i+4]  = (s->v[5*i+2] >> 4) & 31;
-    r[8*i+4] ^= (s->v[5*i+3] << 4) & 31;
-    r[8*i+5]  = (s->v[5*i+3] >> 1) & 31;
-    r[8*i+6]  = (s->v[5*i+3] >> 6) & 31;
-    r[8*i+6] ^= (s->v[5*i+4] << 2) & 31;
-    r[8*i+7]  = (s->v[5*i+4] >> 3) & 31;
-  }
-  r[8*i+0]  =  s->v[5*i+0]       & 31;
-  r[8*i+1]  = (s->v[5*i+0] >> 5) & 31;
-  r[8*i+1] ^= (s->v[5*i+1] << 3) & 31;
-  r[8*i+2]  = (s->v[5*i+1] >> 2) & 31;
-
-  /* Making it signed */
-  carry = 0;
-  for(i=0;i<50;i++)
-  {
-    r[i] += carry;
-    r[i+1] += r[i] >> 5;
-    r[i] &= 31;
-    carry = r[i] >> 4;
-    r[i] -= carry<<5;
-  }
-  r[50] += carry;
-}
-
-void sc25519_2interleave2(unsigned char r[127], const sc25519 *s1, const sc25519 *s2)
-{
-  int i;
-  for(i=0;i<31;i++)
-  {
-    r[4*i]   = ( s1->v[i]       & 3) ^ (( s2->v[i]       & 3) << 2);
-    r[4*i+1] = ((s1->v[i] >> 2) & 3) ^ (((s2->v[i] >> 2) & 3) << 2);
-    r[4*i+2] = ((s1->v[i] >> 4) & 3) ^ (((s2->v[i] >> 4) & 3) << 2);
-    r[4*i+3] = ((s1->v[i] >> 6) & 3) ^ (((s2->v[i] >> 6) & 3) << 2);
-  }
-  r[124] = ( s1->v[31]       & 3) ^ (( s2->v[31]       & 3) << 2);
-  r[125] = ((s1->v[31] >> 2) & 3) ^ (((s2->v[31] >> 2) & 3) << 2);
-  r[126] = ((s1->v[31] >> 4) & 3) ^ (((s2->v[31] >> 4) & 3) << 2);
-}
diff --git a/src-ed25519/supercop-ref/sc25519.h b/src-ed25519/supercop-ref/sc25519.h
deleted file mode 100644
index 23c94a4..0000000
--- a/src-ed25519/supercop-ref/sc25519.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef SC25519_H
-#define SC25519_H
-
-#include "crypto_int32.h"
-#include "crypto_uint32.h"
-
-#define sc25519                  crypto_sign_ed25519_ref_sc25519
-#define shortsc25519             crypto_sign_ed25519_ref_shortsc25519
-#define sc25519_from32bytes      crypto_sign_ed25519_ref_sc25519_from32bytes
-#define shortsc25519_from16bytes crypto_sign_ed25519_ref_shortsc25519_from16bytes
-#define sc25519_from64bytes      crypto_sign_ed25519_ref_sc25519_from64bytes
-#define sc25519_from_shortsc     crypto_sign_ed25519_ref_sc25519_from_shortsc
-#define sc25519_to32bytes        crypto_sign_ed25519_ref_sc25519_to32bytes
-#define sc25519_iszero_vartime   crypto_sign_ed25519_ref_sc25519_iszero_vartime
-#define sc25519_isshort_vartime  crypto_sign_ed25519_ref_sc25519_isshort_vartime
-#define sc25519_lt_vartime       crypto_sign_ed25519_ref_sc25519_lt_vartime
-#define sc25519_add              crypto_sign_ed25519_ref_sc25519_add
-#define sc25519_sub_nored        crypto_sign_ed25519_ref_sc25519_sub_nored
-#define sc25519_mul              crypto_sign_ed25519_ref_sc25519_mul
-#define sc25519_mul_shortsc      crypto_sign_ed25519_ref_sc25519_mul_shortsc
-#define sc25519_window3          crypto_sign_ed25519_ref_sc25519_window3
-#define sc25519_window5          crypto_sign_ed25519_ref_sc25519_window5
-#define sc25519_2interleave2     crypto_sign_ed25519_ref_sc25519_2interleave2
-
-typedef struct 
-{
-  crypto_uint32 v[32]; 
-}
-sc25519;
-
-typedef struct 
-{
-  crypto_uint32 v[16]; 
-}
-shortsc25519;
-
-void sc25519_from32bytes(sc25519 *r, const unsigned char x[32]);
-
-void shortsc25519_from16bytes(shortsc25519 *r, const unsigned char x[16]);
-
-void sc25519_from64bytes(sc25519 *r, const unsigned char x[64]);
-
-void sc25519_from_shortsc(sc25519 *r, const shortsc25519 *x);
-
-void sc25519_to32bytes(unsigned char r[32], const sc25519 *x);
-
-int sc25519_iszero_vartime(const sc25519 *x);
-
-int sc25519_isshort_vartime(const sc25519 *x);
-
-int sc25519_lt_vartime(const sc25519 *x, const sc25519 *y);
-
-void sc25519_add(sc25519 *r, const sc25519 *x, const sc25519 *y);
-
-void sc25519_sub_nored(sc25519 *r, const sc25519 *x, const sc25519 *y);
-
-void sc25519_mul(sc25519 *r, const sc25519 *x, const sc25519 *y);
-
-void sc25519_mul_shortsc(sc25519 *r, const sc25519 *x, const shortsc25519 *y);
-
-/* Convert s into a representation of the form \sum_{i=0}^{84}r[i]2^3
- * with r[i] in {-4,...,3}
- */
-void sc25519_window3(signed char r[85], const sc25519 *s);
-
-/* Convert s into a representation of the form \sum_{i=0}^{50}r[i]2^5
- * with r[i] in {-16,...,15}
- */
-void sc25519_window5(signed char r[51], const sc25519 *s);
-
-void sc25519_2interleave2(unsigned char r[127], const sc25519 *s1, const sc25519 *s2);
-
-#endif
diff --git a/src-ed25519/supercop-ref/sha512-blocks.c b/src-ed25519/supercop-ref/sha512-blocks.c
deleted file mode 100644
index c8dbf0d..0000000
--- a/src-ed25519/supercop-ref/sha512-blocks.c
+++ /dev/null
@@ -1,239 +0,0 @@
-//#include "crypto_hashblocks.h"
-
-typedef unsigned long long uint64;
-
-static uint64 load_bigendian(const unsigned char *x)
-{
-  return
-      (uint64) (x[7]) \
-  | (((uint64) (x[6])) << 8) \
-  | (((uint64) (x[5])) << 16) \
-  | (((uint64) (x[4])) << 24) \
-  | (((uint64) (x[3])) << 32) \
-  | (((uint64) (x[2])) << 40) \
-  | (((uint64) (x[1])) << 48) \
-  | (((uint64) (x[0])) << 56)
-  ;
-}
-
-static void store_bigendian(unsigned char *x,uint64 u)
-{
-  x[7] = u; u >>= 8;
-  x[6] = u; u >>= 8;
-  x[5] = u; u >>= 8;
-  x[4] = u; u >>= 8;
-  x[3] = u; u >>= 8;
-  x[2] = u; u >>= 8;
-  x[1] = u; u >>= 8;
-  x[0] = u;
-}
-
-#define SHR(x,c) ((x) >> (c))
-#define ROTR(x,c) (((x) >> (c)) | ((x) << (64 - (c))))
-
-#define Ch(x,y,z) ((x & y) ^ (~x & z))
-#define Maj(x,y,z) ((x & y) ^ (x & z) ^ (y & z))
-#define Sigma0(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39))
-#define Sigma1(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41))
-#define sigma0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x,7))
-#define sigma1(x) (ROTR(x,19) ^ ROTR(x,61) ^ SHR(x,6))
-
-#define M(w0,w14,w9,w1) w0 = sigma1(w14) + w9 + sigma0(w1) + w0;
-
-#define EXPAND \
-  M(w0 ,w14,w9 ,w1 ) \
-  M(w1 ,w15,w10,w2 ) \
-  M(w2 ,w0 ,w11,w3 ) \
-  M(w3 ,w1 ,w12,w4 ) \
-  M(w4 ,w2 ,w13,w5 ) \
-  M(w5 ,w3 ,w14,w6 ) \
-  M(w6 ,w4 ,w15,w7 ) \
-  M(w7 ,w5 ,w0 ,w8 ) \
-  M(w8 ,w6 ,w1 ,w9 ) \
-  M(w9 ,w7 ,w2 ,w10) \
-  M(w10,w8 ,w3 ,w11) \
-  M(w11,w9 ,w4 ,w12) \
-  M(w12,w10,w5 ,w13) \
-  M(w13,w11,w6 ,w14) \
-  M(w14,w12,w7 ,w15) \
-  M(w15,w13,w8 ,w0 )
-
-#define F(w,k) \
-  T1 = h + Sigma1(e) + Ch(e,f,g) + k + w; \
-  T2 = Sigma0(a) + Maj(a,b,c); \
-  h = g; \
-  g = f; \
-  f = e; \
-  e = d + T1; \
-  d = c; \
-  c = b; \
-  b = a; \
-  a = T1 + T2;
-
-int crypto_hashblocks(unsigned char *statebytes,const unsigned char *in,unsigned long long inlen)
-{
-  uint64 state[8];
-  uint64 a;
-  uint64 b;
-  uint64 c;
-  uint64 d;
-  uint64 e;
-  uint64 f;
-  uint64 g;
-  uint64 h;
-  uint64 T1;
-  uint64 T2;
-
-  a = load_bigendian(statebytes +  0); state[0] = a;
-  b = load_bigendian(statebytes +  8); state[1] = b;
-  c = load_bigendian(statebytes + 16); state[2] = c;
-  d = load_bigendian(statebytes + 24); state[3] = d;
-  e = load_bigendian(statebytes + 32); state[4] = e;
-  f = load_bigendian(statebytes + 40); state[5] = f;
-  g = load_bigendian(statebytes + 48); state[6] = g;
-  h = load_bigendian(statebytes + 56); state[7] = h;
-
-  while (inlen >= 128) {
-    uint64 w0  = load_bigendian(in +   0);
-    uint64 w1  = load_bigendian(in +   8);
-    uint64 w2  = load_bigendian(in +  16);
-    uint64 w3  = load_bigendian(in +  24);
-    uint64 w4  = load_bigendian(in +  32);
-    uint64 w5  = load_bigendian(in +  40);
-    uint64 w6  = load_bigendian(in +  48);
-    uint64 w7  = load_bigendian(in +  56);
-    uint64 w8  = load_bigendian(in +  64);
-    uint64 w9  = load_bigendian(in +  72);
-    uint64 w10 = load_bigendian(in +  80);
-    uint64 w11 = load_bigendian(in +  88);
-    uint64 w12 = load_bigendian(in +  96);
-    uint64 w13 = load_bigendian(in + 104);
-    uint64 w14 = load_bigendian(in + 112);
-    uint64 w15 = load_bigendian(in + 120);
-
-    F(w0 ,0x428a2f98d728ae22ULL)
-    F(w1 ,0x7137449123ef65cdULL)
-    F(w2 ,0xb5c0fbcfec4d3b2fULL)
-    F(w3 ,0xe9b5dba58189dbbcULL)
-    F(w4 ,0x3956c25bf348b538ULL)
-    F(w5 ,0x59f111f1b605d019ULL)
-    F(w6 ,0x923f82a4af194f9bULL)
-    F(w7 ,0xab1c5ed5da6d8118ULL)
-    F(w8 ,0xd807aa98a3030242ULL)
-    F(w9 ,0x12835b0145706fbeULL)
-    F(w10,0x243185be4ee4b28cULL)
-    F(w11,0x550c7dc3d5ffb4e2ULL)
-    F(w12,0x72be5d74f27b896fULL)
-    F(w13,0x80deb1fe3b1696b1ULL)
-    F(w14,0x9bdc06a725c71235ULL)
-    F(w15,0xc19bf174cf692694ULL)
-
-    EXPAND
-
-    F(w0 ,0xe49b69c19ef14ad2ULL)
-    F(w1 ,0xefbe4786384f25e3ULL)
-    F(w2 ,0x0fc19dc68b8cd5b5ULL)
-    F(w3 ,0x240ca1cc77ac9c65ULL)
-    F(w4 ,0x2de92c6f592b0275ULL)
-    F(w5 ,0x4a7484aa6ea6e483ULL)
-    F(w6 ,0x5cb0a9dcbd41fbd4ULL)
-    F(w7 ,0x76f988da831153b5ULL)
-    F(w8 ,0x983e5152ee66dfabULL)
-    F(w9 ,0xa831c66d2db43210ULL)
-    F(w10,0xb00327c898fb213fULL)
-    F(w11,0xbf597fc7beef0ee4ULL)
-    F(w12,0xc6e00bf33da88fc2ULL)
-    F(w13,0xd5a79147930aa725ULL)
-    F(w14,0x06ca6351e003826fULL)
-    F(w15,0x142929670a0e6e70ULL)
-
-    EXPAND
-
-    F(w0 ,0x27b70a8546d22ffcULL)
-    F(w1 ,0x2e1b21385c26c926ULL)
-    F(w2 ,0x4d2c6dfc5ac42aedULL)
-    F(w3 ,0x53380d139d95b3dfULL)
-    F(w4 ,0x650a73548baf63deULL)
-    F(w5 ,0x766a0abb3c77b2a8ULL)
-    F(w6 ,0x81c2c92e47edaee6ULL)
-    F(w7 ,0x92722c851482353bULL)
-    F(w8 ,0xa2bfe8a14cf10364ULL)
-    F(w9 ,0xa81a664bbc423001ULL)
-    F(w10,0xc24b8b70d0f89791ULL)
-    F(w11,0xc76c51a30654be30ULL)
-    F(w12,0xd192e819d6ef5218ULL)
-    F(w13,0xd69906245565a910ULL)
-    F(w14,0xf40e35855771202aULL)
-    F(w15,0x106aa07032bbd1b8ULL)
-
-    EXPAND
-
-    F(w0 ,0x19a4c116b8d2d0c8ULL)
-    F(w1 ,0x1e376c085141ab53ULL)
-    F(w2 ,0x2748774cdf8eeb99ULL)
-    F(w3 ,0x34b0bcb5e19b48a8ULL)
-    F(w4 ,0x391c0cb3c5c95a63ULL)
-    F(w5 ,0x4ed8aa4ae3418acbULL)
-    F(w6 ,0x5b9cca4f7763e373ULL)
-    F(w7 ,0x682e6ff3d6b2b8a3ULL)
-    F(w8 ,0x748f82ee5defb2fcULL)
-    F(w9 ,0x78a5636f43172f60ULL)
-    F(w10,0x84c87814a1f0ab72ULL)
-    F(w11,0x8cc702081a6439ecULL)
-    F(w12,0x90befffa23631e28ULL)
-    F(w13,0xa4506cebde82bde9ULL)
-    F(w14,0xbef9a3f7b2c67915ULL)
-    F(w15,0xc67178f2e372532bULL)
-
-    EXPAND
-
-    F(w0 ,0xca273eceea26619cULL)
-    F(w1 ,0xd186b8c721c0c207ULL)
-    F(w2 ,0xeada7dd6cde0eb1eULL)
-    F(w3 ,0xf57d4f7fee6ed178ULL)
-    F(w4 ,0x06f067aa72176fbaULL)
-    F(w5 ,0x0a637dc5a2c898a6ULL)
-    F(w6 ,0x113f9804bef90daeULL)
-    F(w7 ,0x1b710b35131c471bULL)
-    F(w8 ,0x28db77f523047d84ULL)
-    F(w9 ,0x32caab7b40c72493ULL)
-    F(w10,0x3c9ebe0a15c9bebcULL)
-    F(w11,0x431d67c49c100d4cULL)
-    F(w12,0x4cc5d4becb3e42b6ULL)
-    F(w13,0x597f299cfc657e2aULL)
-    F(w14,0x5fcb6fab3ad6faecULL)
-    F(w15,0x6c44198c4a475817ULL)
-
-    a += state[0];
-    b += state[1];
-    c += state[2];
-    d += state[3];
-    e += state[4];
-    f += state[5];
-    g += state[6];
-    h += state[7];
-  
-    state[0] = a;
-    state[1] = b;
-    state[2] = c;
-    state[3] = d;
-    state[4] = e;
-    state[5] = f;
-    state[6] = g;
-    state[7] = h;
-
-    in += 128;
-    inlen -= 128;
-  }
-
-  store_bigendian(statebytes +  0,state[0]);
-  store_bigendian(statebytes +  8,state[1]);
-  store_bigendian(statebytes + 16,state[2]);
-  store_bigendian(statebytes + 24,state[3]);
-  store_bigendian(statebytes + 32,state[4]);
-  store_bigendian(statebytes + 40,state[5]);
-  store_bigendian(statebytes + 48,state[6]);
-  store_bigendian(statebytes + 56,state[7]);
-
-  return inlen;
-}
diff --git a/src-ed25519/supercop-ref/sha512-hash.c b/src-ed25519/supercop-ref/sha512-hash.c
deleted file mode 100644
index f2f2925..0000000
--- a/src-ed25519/supercop-ref/sha512-hash.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-20080913
-D. J. Bernstein
-Public domain.
-*/
-
-#include "sha512.h"
-
-extern int crypto_hashblocks(unsigned char *statebytes,const unsigned char *in,unsigned long long inlen);
-
-#define blocks crypto_hashblocks
-
-static const unsigned char iv[64] = {
-  0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08,
-  0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b,
-  0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b,
-  0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1,
-  0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1,
-  0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f,
-  0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b,
-  0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79
-} ;
-
-typedef unsigned long long uint64;
-
-int crypto_hash_sha512(unsigned char *out,const unsigned char *in,unsigned long long inlen)
-{
-  unsigned char h[64];
-  unsigned char padded[256];
-  int i;
-  unsigned long long bytes = inlen;
-
-  for (i = 0;i < 64;++i) h[i] = iv[i];
-
-  blocks(h,in,inlen);
-  in += inlen;
-  inlen &= 127;
-  in -= inlen;
-
-  for (i = 0;i < inlen;++i) padded[i] = in[i];
-  padded[inlen] = 0x80;
-
-  if (inlen < 112) {
-    for (i = inlen + 1;i < 119;++i) padded[i] = 0;
-    padded[119] = bytes >> 61;
-    padded[120] = bytes >> 53;
-    padded[121] = bytes >> 45;
-    padded[122] = bytes >> 37;
-    padded[123] = bytes >> 29;
-    padded[124] = bytes >> 21;
-    padded[125] = bytes >> 13;
-    padded[126] = bytes >> 5;
-    padded[127] = bytes << 3;
-    blocks(h,padded,128);
-  } else {
-    for (i = inlen + 1;i < 247;++i) padded[i] = 0;
-    padded[247] = bytes >> 61;
-    padded[248] = bytes >> 53;
-    padded[249] = bytes >> 45;
-    padded[250] = bytes >> 37;
-    padded[251] = bytes >> 29;
-    padded[252] = bytes >> 21;
-    padded[253] = bytes >> 13;
-    padded[254] = bytes >> 5;
-    padded[255] = bytes << 3;
-    blocks(h,padded,256);
-  }
-
-  for (i = 0;i < 64;++i) out[i] = h[i];
-
-  return 0;
-}
diff --git a/src-ed25519/supercop-ref/sha512.h b/src-ed25519/supercop-ref/sha512.h
deleted file mode 100644
index 37376b1..0000000
--- a/src-ed25519/supercop-ref/sha512.h
+++ /dev/null
@@ -1,4 +0,0 @@
-extern int crypto_hashblocks(unsigned char *statebytes,const unsigned char *in,unsigned long long inlen);
-extern int crypto_hash_sha512(unsigned char *out,const unsigned char *in,unsigned long long inlen);
-
-#define crypto_hash_sha512_BYTES 64
diff --git a/src-ed25519/supercop-ref/test.c b/src-ed25519/supercop-ref/test.c
deleted file mode 100644
index 35620f2..0000000
--- a/src-ed25519/supercop-ref/test.c
+++ /dev/null
@@ -1,39 +0,0 @@
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "crypto_sign.h"
-
-char *msg = "Hello World";
-
-int main(int argc, char *argv[]) {
-    unsigned char sk[SECRETKEYBYTES], vk[PUBLICKEYBYTES];
-    unsigned char *sigmsg, *newmsg;
-    unsigned long long sigmsglen, newmsglen;
-    int ret;
-    crypto_sign_keypair(vk, sk);
-    printf("got keypair\n");
-    sigmsg = malloc(strlen(msg)+1+BYTES);
-    if (!sigmsg)
-        return 1;
-    crypto_sign(sigmsg, &sigmsglen, (unsigned char *)msg, strlen(msg)+1, sk);
-    printf("got signature\n");
-    if (sigmsglen != strlen(msg)+1+BYTES)
-        return 2;
-    newmsg = malloc(sigmsglen);
-    if (!newmsg)
-        return 3;
-    ret = crypto_sign_open(newmsg, &newmsglen, sigmsg, sigmsglen, vk);
-    printf("verified signature\n");
-    if (ret == 0)
-        printf("good!\n");
-    else
-        printf("bad\n");
-    sigmsg[0] ^= 0x01;
-    ret = crypto_sign_open(newmsg, &newmsglen, sigmsg, sigmsglen, vk);
-    if (ret == 0) 
-        printf("bad: failed to detect simple corruption\n");
-    else
-        printf("good: detected simple corruption\n");
-    return 0;
-}
diff --git a/src-ed25519/supercop-ref/verify.c b/src-ed25519/supercop-ref/verify.c
deleted file mode 100644
index a04186b..0000000
--- a/src-ed25519/supercop-ref/verify.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "crypto_verify_32.h"
-
-int crypto_verify_32(const unsigned char *x,const unsigned char *y)
-{
-  unsigned int differentbits = 0;
-#define F(i) differentbits |= x[i] ^ y[i];
-  F(0)
-  F(1)
-  F(2)
-  F(3)
-  F(4)
-  F(5)
-  F(6)
-  F(7)
-  F(8)
-  F(9)
-  F(10)
-  F(11)
-  F(12)
-  F(13)
-  F(14)
-  F(15)
-  F(16)
-  F(17)
-  F(18)
-  F(19)
-  F(20)
-  F(21)
-  F(22)
-  F(23)
-  F(24)
-  F(25)
-  F(26)
-  F(27)
-  F(28)
-  F(29)
-  F(30)
-  F(31)
-  return (1 & ((differentbits - 1) >> 8)) - 1;
-}

From 5f4148904248ede297e09edee0d7d1f8f570bb0a Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:15:38 +0200
Subject: [PATCH 04/10] add src-ed25519 as git module

---
 .gitmodules | 3 +++
 src-ed25519 | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 src-ed25519

diff --git a/.gitmodules b/.gitmodules
index 6d3f5c0..e0aba4c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src-cryptopp"]
 	path = src-cryptopp
 	url = https://github.com/weidai11/cryptopp
+[submodule "src-ed25519"]
+	path = src-ed25519
+	url = https://github.com/orlp/ed25519
diff --git a/src-ed25519 b/src-ed25519
new file mode 160000
index 0000000..b1f19fa
--- /dev/null
+++ b/src-ed25519
@@ -0,0 +1 @@
+Subproject commit b1f19fab4aebe607805620d25a5e42566ce46a0e

From 7ff8f73bdf554db3ad2f0179cd9d94c4c72f8579 Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:16:59 +0200
Subject: [PATCH 05/10] python3: 2to3 -w -n --no-diffs .

---
 misc/build_helpers/show-tool-versions.py     | 60 ++++++++---------
 setup.py                                     |  6 +-
 src/pycryptopp/__init__.py                   |  2 +-
 src/pycryptopp/bench/bench_algs.py           |  2 +-
 src/pycryptopp/bench/bench_ciphers.py        | 12 ++--
 src/pycryptopp/bench/bench_hashes.py         | 12 ++--
 src/pycryptopp/bench/bench_sigs.py           | 50 +++++++-------
 src/pycryptopp/bench/common.py               |  6 +-
 src/pycryptopp/cipher/__init__.py            |  4 +-
 src/pycryptopp/hash/__init__.py              |  2 +-
 src/pycryptopp/publickey/__init__.py         |  2 +-
 src/pycryptopp/publickey/ed25519/__init__.py |  4 +-
 src/pycryptopp/test/test_aes.py              | 28 ++++----
 src/pycryptopp/test/test_ecdsa.py            | 52 +++++++--------
 src/pycryptopp/test/test_ed25519.py          | 68 ++++++++++----------
 src/pycryptopp/test/test_ed25519_kat.py      |  8 +--
 src/pycryptopp/test/test_rsa.py              | 26 ++++----
 src/pycryptopp/test/test_sha256.py           | 38 +++++------
 src/pycryptopp/test/test_xsalsa20.py         | 24 +++----
 versioneer.py                                | 50 +++++++-------
 20 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/misc/build_helpers/show-tool-versions.py b/misc/build_helpers/show-tool-versions.py
index 5011a7b..ff9209a 100644
--- a/misc/build_helpers/show-tool-versions.py
+++ b/misc/build_helpers/show-tool-versions.py
@@ -12,11 +12,11 @@ def print_platform():
     try:
         import platform
         out = platform.platform()
-        print
-        print "platform:", foldlines(out)
-        print "machine: ", platform.machine()
+        print()
+        print("platform:", foldlines(out))
+        print("machine: ", platform.machine())
         if hasattr(platform, 'linux_distribution'):
-            print "linux_distribution:", repr(platform.linux_distribution())
+            print("linux_distribution:", repr(platform.linux_distribution()))
     except EnvironmentError:
         sys.stderr.write("Got exception using 'platform'. Exception follows\n")
         traceback.print_exc(file=sys.stderr)
@@ -24,17 +24,17 @@ def print_platform():
         pass
 
 def print_python_ver():
-    print "python:", foldlines(sys.version)
-    print 'maxunicode: ' + str(sys.maxunicode)
+    print("python:", foldlines(sys.version))
+    print('maxunicode: ' + str(sys.maxunicode))
 
 def print_python_encoding_settings():
-    print 'filesystem.encoding: ' + str(sys.getfilesystemencoding())
-    print 'locale.getpreferredencoding: ' + str(locale.getpreferredencoding())
+    print('filesystem.encoding: ' + str(sys.getfilesystemencoding()))
+    print('locale.getpreferredencoding: ' + str(locale.getpreferredencoding()))
     try:
-        print 'locale.defaultlocale: ' + str(locale.getdefaultlocale())
-    except ValueError, e:
-        print 'got exception from locale.getdefaultlocale(): ', e
-    print 'locale.locale: ' + str(locale.getlocale())
+        print('locale.defaultlocale: ' + str(locale.getdefaultlocale()))
+    except ValueError as e:
+        print('got exception from locale.getdefaultlocale(): ', e)
+    print('locale.locale: ' + str(locale.getlocale()))
 
 def print_stdout(cmdlist, label=None, numlines=None):
     if label is None:
@@ -42,10 +42,10 @@ def print_stdout(cmdlist, label=None, numlines=None):
     try:
         res = subprocess.Popen(cmdlist, stdin=open(os.devnull),
                                stdout=subprocess.PIPE).communicate()[0]
-        print label + ': ' + foldlines(res, numlines)
-    except EnvironmentError, e:
+        print(label + ': ' + foldlines(res, numlines))
+    except EnvironmentError as e:
         if isinstance(e, OSError) and e.errno == errno.ENOENT:
-            print str(label) + ': ' + str(cmdlist[0]) + ': no such file or directory'
+            print(str(label) + ': ' + str(cmdlist[0]) + ': no such file or directory')
             return
         sys.stderr.write("\n%s: Got exception invoking '%s'. Exception follows.\n" % (label, cmdlist[0],))
         traceback.print_exc(file=sys.stderr)
@@ -58,10 +58,10 @@ def print_stderr(cmdlist, label=None):
     try:
         res = subprocess.Popen(cmdlist, stdin=open(os.devnull),
                                stderr=subprocess.PIPE).communicate()[1]
-        print label + ': ' + foldlines(res)
-    except EnvironmentError, e:
+        print(label + ': ' + foldlines(res))
+    except EnvironmentError as e:
         if isinstance(e, OSError) and e.errno == errno.ENOENT:
-            print str(label) + ': ' + str(cmdlist[0]) + ': no such file or directory'
+            print(str(label) + ': ' + str(cmdlist[0]) + ': no such file or directory')
             return
         sys.stderr.write("\n%s: Got exception invoking '%s'. Exception follows.\n" % (label, cmdlist[0],))
         traceback.print_exc(file=sys.stderr)
@@ -71,12 +71,12 @@ def print_stderr(cmdlist, label=None):
 
 def print_as_ver():
     if os.path.exists('a.out'):
-        print "WARNING: a file named a.out exists, and getting the version of the 'as' assembler writes to that filename, so I'm not attempting to get the version of 'as'."
+        print("WARNING: a file named a.out exists, and getting the version of the 'as' assembler writes to that filename, so I'm not attempting to get the version of 'as'.")
         return
     try:
         res = subprocess.Popen(['as', '-version'], stdin=open(os.devnull),
                                stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-        print 'as: ' + foldlines(res[0]+' '+res[1])
+        print('as: ' + foldlines(res[0]+' '+res[1]))
         if os.path.exists('a.out'):
             os.remove('a.out')
     except EnvironmentError:
@@ -89,31 +89,31 @@ def print_setuptools_ver():
     try:
         import pkg_resources
         out = str(pkg_resources.require("setuptools"))
-        print "setuptools:", foldlines(out)
+        print("setuptools:", foldlines(out))
     except (ImportError, EnvironmentError):
         sys.stderr.write("\nGot exception using 'pkg_resources' to get the version of setuptools. Exception follows\n")
         traceback.print_exc(file=sys.stderr)
         sys.stderr.flush()
         pass
     except pkg_resources.DistributionNotFound:
-        print 'setuptools: DistributionNotFound'
+        print('setuptools: DistributionNotFound')
         pass
 
 def print_py_pkg_ver(pkgname, modulename=None):
     if modulename is None:
         modulename = pkgname
-    print
+    print()
     try:
         import pkg_resources
         out = str(pkg_resources.require(pkgname))
-        print pkgname + ': ' + foldlines(out)
+        print(pkgname + ': ' + foldlines(out))
     except (ImportError, EnvironmentError):
         sys.stderr.write("\nGot exception using 'pkg_resources' to get the version of %s. Exception follows.\n" % (pkgname,))
         traceback.print_exc(file=sys.stderr)
         sys.stderr.flush()
         pass
     except pkg_resources.DistributionNotFound:
-        print pkgname + ': DistributionNotFound'
+        print(pkgname + ': DistributionNotFound')
         pass
     try:
         __import__(modulename)
@@ -121,19 +121,19 @@ def print_py_pkg_ver(pkgname, modulename=None):
         pass
     else:
         modobj = sys.modules.get(modulename)
-        print pkgname + ' module: ' + str(modobj)
+        print(pkgname + ' module: ' + str(modobj))
         try:
-            print pkgname + ' __version__: ' + str(modobj.__version__)
+            print(pkgname + ' __version__: ' + str(modobj.__version__))
         except AttributeError:
             pass
 
 print_platform()
-print
+print()
 print_python_ver()
-print
+print()
 print_stdout(['locale'])
 print_python_encoding_settings()
-print
+print()
 print_stdout(['buildbot', '--version'])
 print_stdout(['buildslave', '--version'])
 if 'windows' in platform.system().lower():
diff --git a/setup.py b/setup.py
index 2915b8d..1dd8245 100644
--- a/setup.py
+++ b/setup.py
@@ -91,9 +91,9 @@
             break
 
     if not libraries:
-        print "Did not locate libcryptopp in the usual places."
-        print "Adding /usr/local/{include,lib} and -lcryptopp in the hopes"
-        print "that they will work."
+        print("Did not locate libcryptopp in the usual places.")
+        print("Adding /usr/local/{include,lib} and -lcryptopp in the hopes")
+        print("that they will work.")
 
         # Note that when using cygwin build tools (including gcc) to build
         # Windows-native binaries, the os.path.exists() will not see the
diff --git a/src/pycryptopp/__init__.py b/src/pycryptopp/__init__.py
index 6248289..15c572b 100644
--- a/src/pycryptopp/__init__.py
+++ b/src/pycryptopp/__init__.py
@@ -25,7 +25,7 @@ def _import_my_names(thismodule, prefix):
             myname = name[len(prefix):]
             thismodule[myname] = getattr(_pycryptopp, name)
 
-import publickey, hash, cipher
+from . import publickey, hash, cipher
 
 quiet_pyflakes=[__version__, publickey, hash, cipher, _pycryptopp, __doc__, _import_my_names]
 del quiet_pyflakes
diff --git a/src/pycryptopp/bench/bench_algs.py b/src/pycryptopp/bench/bench_algs.py
index a896d2b..e2970a1 100644
--- a/src/pycryptopp/bench/bench_algs.py
+++ b/src/pycryptopp/bench/bench_algs.py
@@ -1,4 +1,4 @@
-import bench_sigs, bench_ciphers, bench_hashes
+from . import bench_sigs, bench_ciphers, bench_hashes
 
 def bench(MAXTIME=10.0):
     bench_sigs.bench(MAXTIME)
diff --git a/src/pycryptopp/bench/bench_ciphers.py b/src/pycryptopp/bench/bench_ciphers.py
index bb9a160..7e37a71 100644
--- a/src/pycryptopp/bench/bench_ciphers.py
+++ b/src/pycryptopp/bench/bench_ciphers.py
@@ -1,6 +1,6 @@
 from pycryptopp.cipher import aes, xsalsa20
 
-from common import insecurerandstr, rep_bench
+from .common import insecurerandstr, rep_bench
 
 UNITS_PER_SECOND = 10**9
 
@@ -27,16 +27,16 @@ def bench_ciphers(MAXTIME):
         (xsalsa20.XSalsa20, 32),
         ]:
         ob = BenchCrypt(klass, keysize)
-        print ob
+        print(ob)
         for (legend, size) in [
             ("large (%d B)",  10**7),
             ]:
-            print legend % size
+            print(legend % size)
             rep_bench(ob.crypt, size, UNITS_PER_SECOND=UNITS_PER_SECOND, MAXTIME=MAXTIME, MAXREPS=100, initfunc=ob.crypt_init)
-            print
+            print()
 
-    print "nanoseconds per byte crypted"
-    print
+    print("nanoseconds per byte crypted")
+    print()
 
 def bench(MAXTIME=10.0):
     bench_ciphers(MAXTIME)
diff --git a/src/pycryptopp/bench/bench_hashes.py b/src/pycryptopp/bench/bench_hashes.py
index c681ff8..fc81f7b 100644
--- a/src/pycryptopp/bench/bench_hashes.py
+++ b/src/pycryptopp/bench/bench_hashes.py
@@ -1,6 +1,6 @@
 from pycryptopp.hash import sha256
 
-from common import insecurerandstr, rep_bench
+from .common import insecurerandstr, rep_bench
 
 UNITS_PER_SECOND = 10**9
 
@@ -32,17 +32,17 @@ def proc(self, N):
     
 def bench_hashes(MAXTIME):
     for klass in generate_hash_benchers():
-        print klass
+        print(klass)
         ob = klass()
         for (legend, size) in [
             ("large (%d B)",  10**7),
             ]:
-            print legend % size
+            print(legend % size)
             rep_bench(ob.proc, size, UNITS_PER_SECOND=UNITS_PER_SECOND, MAXTIME=MAXTIME, MAXREPS=100, initfunc=ob.proc_init)
-            print
+            print()
 
-    print "nanoseconds per byte hashed"
-    print
+    print("nanoseconds per byte hashed")
+    print()
 
 
 def bench(MAXTIME=10.0):
diff --git a/src/pycryptopp/bench/bench_sigs.py b/src/pycryptopp/bench/bench_sigs.py
index e0fe37b..86ec15b 100644
--- a/src/pycryptopp/bench/bench_sigs.py
+++ b/src/pycryptopp/bench/bench_sigs.py
@@ -1,6 +1,6 @@
 from pycryptopp.publickey import ecdsa, ed25519, rsa
 
-from common import insecurerandstr, rep_bench
+from .common import insecurerandstr, rep_bench
 
 msg = 'crypto libraries should come with benchmarks'
 
@@ -10,7 +10,7 @@ def __init__(self):
         self.signer = None
 
     def gen(self, N):
-        for i in xrange(N):
+        for i in range(N):
              ecdsa.SigningKey(self.seed)
         
     def sign_init(self, N):
@@ -18,7 +18,7 @@ def sign_init(self, N):
         
     def sign(self, N):
         signer = self.signer
-        for i in xrange(N):
+        for i in range(N):
             signer.sign(msg)
         
     def ver_init(self, N):
@@ -29,7 +29,7 @@ def ver_init(self, N):
     def ver(self, N):
         sig = self.sig
         verifier = self.verifier
-        for i in xrange(N):
+        for i in range(N):
             verifier.verify(sig, msg)
         
 class Ed25519(object):
@@ -38,7 +38,7 @@ def __init__(self):
         self.signer = None
 
     def gen(self, N):
-        for i in xrange(N):
+        for i in range(N):
              ed25519.SigningKey(self.seed)
         
     def sign_init(self, N):
@@ -46,7 +46,7 @@ def sign_init(self, N):
         
     def sign(self, N):
         signer = self.signer
-        for i in xrange(N):
+        for i in range(N):
             signer.sign(msg)
         
     def ver_init(self, N):
@@ -57,7 +57,7 @@ def ver_init(self, N):
     def ver(self, N):
         sig = self.sig
         verifier = self.verifier
-        for i in xrange(N):
+        for i in range(N):
             verifier.verify(sig, msg)
         
 class RSA2048(object):
@@ -67,7 +67,7 @@ def __init__(self):
         self.signer = None
 
     def gen(self, N):
-        for i in xrange(N):
+        for i in range(N):
              rsa.generate(sizeinbits=self.SIZEINBITS)
         
     def sign_init(self, N):
@@ -75,7 +75,7 @@ def sign_init(self, N):
         
     def sign(self, N):
         signer = self.signer
-        for i in xrange(N):
+        for i in range(N):
             signer.sign(msg)
         
     def ver_init(self, N):
@@ -86,7 +86,7 @@ def ver_init(self, N):
     def ver(self, N):
         sig = self.sig
         verifier = self.verifier
-        for i in xrange(N):
+        for i in range(N):
             verifier.verify(msg, sig)
         
 class RSA3248(object):
@@ -96,7 +96,7 @@ def __init__(self):
         self.signer = None
 
     def gen(self, N):
-        for i in xrange(N):
+        for i in range(N):
              rsa.generate(sizeinbits=self.SIZEINBITS)
         
     def sign_init(self, N):
@@ -104,7 +104,7 @@ def sign_init(self, N):
         
     def sign(self, N):
         signer = self.signer
-        for i in xrange(N):
+        for i in range(N):
             signer.sign(msg)
         
     def ver_init(self, N):
@@ -115,34 +115,34 @@ def ver_init(self, N):
     def ver(self, N):
         sig = self.sig
         verifier = self.verifier
-        for i in xrange(N):
+        for i in range(N):
             verifier.verify(msg, sig)
         
 def bench_sigs(MAXTIME):
     for klass in [ECDSA256, Ed25519,]:
-        print klass
+        print(klass)
         ob = klass()
-        print "generate key"
+        print("generate key")
         rep_bench(ob.gen, 1000, UNITS_PER_SECOND=1000, MAXTIME=MAXTIME, MAXREPS=100)
-        print "sign"
+        print("sign")
         rep_bench(ob.sign, 1000, UNITS_PER_SECOND=1000, initfunc=ob.sign_init, MAXTIME=MAXTIME, MAXREPS=100)
-        print "verify"
+        print("verify")
         rep_bench(ob.ver, 1000, UNITS_PER_SECOND=1000, initfunc=ob.ver_init, MAXTIME=MAXTIME, MAXREPS=100)
-        print
+        print()
 
     for klass in [RSA2048, RSA3248]:
-        print klass
+        print(klass)
         ob = klass()
-        print "generate key"
+        print("generate key")
         rep_bench(ob.gen, 1, UNITS_PER_SECOND=1000, MAXTIME=MAXTIME, MAXREPS=100)
-        print "sign"
+        print("sign")
         rep_bench(ob.sign, 1000, UNITS_PER_SECOND=1000, initfunc=ob.sign_init, MAXTIME=MAXTIME, MAXREPS=100)
-        print "verify"
+        print("verify")
         rep_bench(ob.ver, 10000, UNITS_PER_SECOND=1000, initfunc=ob.ver_init, MAXTIME=MAXTIME, MAXREPS=100)
-        print
+        print()
 
-    print "milliseconds per operation"
-    print
+    print("milliseconds per operation")
+    print()
 
 def bench(MAXTIME=10.0):
     bench_sigs(MAXTIME)
diff --git a/src/pycryptopp/bench/common.py b/src/pycryptopp/bench/common.py
index 2d8f315..40723f9 100644
--- a/src/pycryptopp/bench/common.py
+++ b/src/pycryptopp/bench/common.py
@@ -30,7 +30,7 @@ def this_rep_bench(func, N, UNITS_PER_SECOND, MAXTIME, MAXREPS, initfunc=None):
 
             deltac = stopc - startc
             if deltac <= 0:
-                print "clock jump backward or wrapped -- ignoring this sample. startc: %s, stopc: %s, deltac: %s" % (startc, stopc, deltac,)
+                print("clock jump backward or wrapped -- ignoring this sample. startc: %s, stopc: %s, deltac: %s" % (startc, stopc, deltac,))
             else:
                 meanc += deltac
 
@@ -46,12 +46,12 @@ def this_rep_bench(func, N, UNITS_PER_SECOND, MAXTIME, MAXREPS, initfunc=None):
             'meanc': meanc,
             'num': num
             }
-        print "mean: %(meanc)#8.03e (of %(num)6d)" % res
+        print("mean: %(meanc)#8.03e (of %(num)6d)" % res)
     rep_bench = this_rep_bench
 
 import random as insecurerandom
 def insecurerandstr(n):
-    return ''.join(map(chr, map(insecurerandom.randrange, [0]*n, [256]*n)))
+    return ''.join(map(chr, list(map(insecurerandom.randrange, [0]*n, [256]*n))))
 
 def calib_clock():
     interval = 1.0
diff --git a/src/pycryptopp/cipher/__init__.py b/src/pycryptopp/cipher/__init__.py
index 0ebfadf..167f2be 100644
--- a/src/pycryptopp/cipher/__init__.py
+++ b/src/pycryptopp/cipher/__init__.py
@@ -1,4 +1,4 @@
-import aes
-import xsalsa20
+from . import aes
+from . import xsalsa20
 
 quiet_pyflakes=[aes, xsalsa20]
diff --git a/src/pycryptopp/hash/__init__.py b/src/pycryptopp/hash/__init__.py
index 5399f81..93079e9 100644
--- a/src/pycryptopp/hash/__init__.py
+++ b/src/pycryptopp/hash/__init__.py
@@ -1,3 +1,3 @@
-import sha256
+from . import sha256
 
 quiet_pyflakes=[sha256]
diff --git a/src/pycryptopp/publickey/__init__.py b/src/pycryptopp/publickey/__init__.py
index be9d7ad..7d406df 100644
--- a/src/pycryptopp/publickey/__init__.py
+++ b/src/pycryptopp/publickey/__init__.py
@@ -1,3 +1,3 @@
-import ecdsa, rsa, ed25519
+from . import ecdsa, rsa, ed25519
 
 quiet_pyflakes=[ecdsa, rsa, ed25519]
diff --git a/src/pycryptopp/publickey/ed25519/__init__.py b/src/pycryptopp/publickey/ed25519/__init__.py
index 4dd94ad..aaf5130 100644
--- a/src/pycryptopp/publickey/ed25519/__init__.py
+++ b/src/pycryptopp/publickey/ed25519/__init__.py
@@ -1,7 +1,7 @@
-from keys import (BadSignatureError, SigningKey, VerifyingKey, __doc__)
+from .keys import (BadSignatureError, SigningKey, VerifyingKey, __doc__)
 
 (BadSignatureError, SigningKey, VerifyingKey, __doc__) # hush pyflakes
 
-from _version import get_versions
+from ._version import get_versions
 __version__ = get_versions()['version']
 del get_versions
diff --git a/src/pycryptopp/test/test_aes.py b/src/pycryptopp/test/test_aes.py
index 591b171..fd75805 100644
--- a/src/pycryptopp/test/test_aes.py
+++ b/src/pycryptopp/test/test_aes.py
@@ -23,7 +23,7 @@ def ab(x): # debuggery
         return "%s:%s" % (len(x), "--empty--",)
 
 def randstr(n):
-    return ''.join(map(chr, map(random.randrange, [0]*n, [256]*n)))
+    return ''.join(map(chr, list(map(random.randrange, [0]*n, [256]*n))))
 
 class AES256(unittest.TestCase):
     enc0 = "dc95c078a2408989ad48a21492842087530f8afbc74536b9a963b4f1c4cb738b"
@@ -31,18 +31,18 @@ class AES256(unittest.TestCase):
     def test_encrypt_zeroes(self):
         cryptor = aes.AES(key="\x00"*32)
         ct = cryptor.process("\x00"*32)
-        self.failUnlessEqual(self.enc0, b2a_hex(ct))
+        self.assertEqual(self.enc0, b2a_hex(ct))
 
     def test_init_type_check(self):
-        self.failUnlessRaises(TypeError, aes.AES, None)
-        self.failUnlessRaises(aes.Error, aes.AES, "a"*1) # too short
-        self.failUnlessRaises(aes.Error, aes.AES, "a"*17) # not one of the valid key sizes for AES (16, 24, 32)
+        self.assertRaises(TypeError, aes.AES, None)
+        self.assertRaises(aes.Error, aes.AES, "a"*1) # too short
+        self.assertRaises(aes.Error, aes.AES, "a"*17) # not one of the valid key sizes for AES (16, 24, 32)
 
     def test_encrypt_zeroes_in_two_parts(self):
         cryptor = aes.AES(key="\x00"*32)
         ct1 = cryptor.process("\x00"*15)
         ct2 = cryptor.process("\x00"*17)
-        self.failUnlessEqual(self.enc0, b2a_hex(ct1+ct2))
+        self.assertEqual(self.enc0, b2a_hex(ct1+ct2))
 
 class AES128(unittest.TestCase):
     enc0 = "66e94bd4ef8a2c3b884cfa59ca342b2e"
@@ -50,17 +50,17 @@ class AES128(unittest.TestCase):
     def test_encrypt_zeroes(self):
         cryptor = aes.AES(key="\x00"*16)
         ct = cryptor.process("\x00"*16)
-        self.failUnlessEqual(self.enc0, b2a_hex(ct))
+        self.assertEqual(self.enc0, b2a_hex(ct))
 
     def test_init_type_check(self):
-        self.failUnlessRaises(TypeError, aes.AES, None)
-        self.failUnlessRaises(aes.Error, aes.AES, "a") # too short
+        self.assertRaises(TypeError, aes.AES, None)
+        self.assertRaises(aes.Error, aes.AES, "a") # too short
 
     def test_encrypt_zeroes_in_two_parts(self):
         cryptor = aes.AES(key="\x00"*16)
         ct1 = cryptor.process("\x00"*8)
         ct2 = cryptor.process("\x00"*8)
-        self.failUnlessEqual(self.enc0, b2a_hex(ct1+ct2))
+        self.assertEqual(self.enc0, b2a_hex(ct1+ct2))
 
 def fake_ecb_using_ctr(k, p):
     return aes.AES(key=k, iv=p).process('\x00'*16)
@@ -79,7 +79,7 @@ def _test_KAT_file(self, vects_str):
             ciphertext = a2b_hex(mo.group(4))
 
             computedciphertext = fake_ecb_using_ctr(key, plaintext)
-            self.failUnlessEqual(computedciphertext, ciphertext, "computedciphertext: %s, ciphertext: %s, key: %s, plaintext: %s" % (b2a_hex(computedciphertext), b2a_hex(ciphertext), b2a_hex(key), b2a_hex(plaintext)))
+            self.assertEqual(computedciphertext, ciphertext, "computedciphertext: %s, ciphertext: %s, key: %s, plaintext: %s" % (b2a_hex(computedciphertext), b2a_hex(ciphertext), b2a_hex(key), b2a_hex(plaintext)))
 
 class AES_from_Niels_Ferguson(unittest.TestCase):
     # http://blogs.msdn.com/si_team/archive/2006/05/19/aes-test-vectors.aspx
@@ -93,7 +93,7 @@ def _test_from_Niels_AES(self, keysize, result):
             P = S[-k-b:-k]
             S += E(K, E(K, P))
 
-        self.failUnlessEqual(S[-b:], a2b_hex(result))
+        self.assertEqual(S[-b:], a2b_hex(result))
 
     def test_from_Niels_AES128(self):
         return self._test_from_Niels_AES(16, 'bd883f01035e58f42f9d812f2dacbcd8')
@@ -104,8 +104,8 @@ def test_from_Niels_AES256(self):
 class PartialIV(unittest.TestCase):
     def test_partial(self):
         k = "k"*16
-        for iv_len in range(0, 16)+range(17,70): # all are wrong, 16 is right
-            self.failUnlessRaises(aes.Error,
+        for iv_len in list(range(0, 16))+list(range(17,70)): # all are wrong, 16 is right
+            self.assertRaises(aes.Error,
                                   aes.AES, k, iv="i"*iv_len)
 
 if __name__ == "__main__":
diff --git a/src/pycryptopp/test/test_ecdsa.py b/src/pycryptopp/test/test_ecdsa.py
index 85f809d..5492f50 100644
--- a/src/pycryptopp/test/test_ecdsa.py
+++ b/src/pycryptopp/test/test_ecdsa.py
@@ -32,7 +32,7 @@ def seed_which_refuses(a):
 from pycryptopp.publickey import ecdsa
 
 def randstr(n, rr=randrange):
-    return ''.join([chr(rr(0, 256)) for x in xrange(n)])
+    return ''.join([chr(rr(0, 256)) for x in range(n)])
 
 from base64 import b32encode
 def ab(x): # debuggery
@@ -72,57 +72,57 @@ def test_sign(self):
         seed = randstr(SEEDBYTES)
         signer = ecdsa.SigningKey(seed)
         sig = signer.sign("message")
-        self.failUnlessEqual(len(sig), SIGBYTES)
+        self.assertEqual(len(sig), SIGBYTES)
 
     def test_sign_and_verify(self):
         seed = randstr(SEEDBYTES)
         signer = ecdsa.SigningKey(seed)
         sig = signer.sign("message")
         v = signer.get_verifying_key()
-        self.failUnless(v.verify("message", sig))
+        self.assertTrue(v.verify("message", sig))
 
     def test_sign_and_verify_emptymsg(self):
         seed = randstr(SEEDBYTES)
         signer = ecdsa.SigningKey(seed)
         sig = signer.sign("")
         v = signer.get_verifying_key()
-        self.failUnless(v.verify("", sig))
+        self.assertTrue(v.verify("", sig))
 
     def test_construct_from_same_seed_is_reproducible(self):
         seed = randstr(SEEDBYTES)
         signer1 = ecdsa.SigningKey(seed)
         signer2 = ecdsa.SigningKey(seed)
-        self.failUnlessEqual(signer1.get_verifying_key().serialize(), signer2.get_verifying_key().serialize())
+        self.assertEqual(signer1.get_verifying_key().serialize(), signer2.get_verifying_key().serialize())
 
         # ... and using different seeds constructs a different private key.
         seed3 = randstr(SEEDBYTES)
         assert seed3 != seed, "Internal error in Python random module's PRNG (or in pycryptopp's hacks to it to facilitate testing) -- got two identical strings from randstr(%s)" % SEEDBYTES
         signer3 = ecdsa.SigningKey(seed3)
-        self.failIfEqual(signer1.get_verifying_key().serialize(), signer3.get_verifying_key().serialize())
+        self.assertNotEqual(signer1.get_verifying_key().serialize(), signer3.get_verifying_key().serialize())
 
         # Also try the all-zeroes string just because bugs sometimes are
         # data-dependent on zero or cause bogus zeroes.
         seed4 = '\x00'*SEEDBYTES
         assert seed4 != seed, "Internal error in Python random module's PRNG (or in pycryptopp's hacks to it to facilitate testing) -- got the all-zeroes string from randstr(%s)" % SEEDBYTES
         signer4 = ecdsa.SigningKey(seed4)
-        self.failIfEqual(signer4.get_verifying_key().serialize(), signer1.get_verifying_key().serialize())
+        self.assertNotEqual(signer4.get_verifying_key().serialize(), signer1.get_verifying_key().serialize())
 
         signer5 = ecdsa.SigningKey(seed4)
-        self.failUnlessEqual(signer5.get_verifying_key().serialize(), signer4.get_verifying_key().serialize())
+        self.assertEqual(signer5.get_verifying_key().serialize(), signer4.get_verifying_key().serialize())
 
     def test_construct_short_seed(self):
         try:
             ecdsa.SigningKey("\x00\x00\x00")
-        except ecdsa.Error, le:
-            self.failUnless("seed is required to be of length " in str(le), le)
+        except ecdsa.Error as le:
+            self.assertTrue("seed is required to be of length " in str(le), le)
         else:
            self.fail("Should have raised error from seed being too short.")
 
     def test_construct_bad_arg_type(self):
         try:
             ecdsa.SigningKey(1)
-        except TypeError, le:
-            self.failUnless("must be string" in str(le), le)
+        except TypeError as le:
+            self.assertTrue("must be string" in str(le), le)
         else:
            self.fail("Should have raised error from seed being of the wrong type.")
 
@@ -133,10 +133,10 @@ def test_from_signer_and_serialize_and_deserialize(self):
 
         verifier = signer.get_verifying_key()
         s1 = verifier.serialize()
-        self.failUnlessEqual(len(s1), PUBKEYBYTES)
+        self.assertEqual(len(s1), PUBKEYBYTES)
         ecdsa.VerifyingKey(s1)
         s2 = verifier.serialize()
-        self.failUnlessEqual(s1, s2)
+        self.assertEqual(s1, s2)
 
 def flip_one_bit(s):
     assert s
@@ -156,26 +156,26 @@ def _help_test_sign_and_check_good_keys(self, signer, verifier):
         msg = randmsg()
 
         sig = signer.sign(msg)
-        self.failUnlessEqual(len(sig), SIGBYTES)
-        self.failUnless(verifier.verify(msg, sig))
+        self.assertEqual(len(sig), SIGBYTES)
+        self.assertTrue(verifier.verify(msg, sig))
 
         # Now flip one bit of the signature and make sure that the signature doesn't check.
         badsig = flip_one_bit(sig)
-        self.failIf(verifier.verify(msg, badsig))
+        self.assertFalse(verifier.verify(msg, badsig))
 
         # Now generate a random signature and make sure that the signature doesn't check.
         badsig = randstr(len(sig))
         assert badsig != sig, "Internal error -- randstr() produced the same string twice: %s == %s" % (badsig, sig)
-        self.failIf(verifier.verify(msg, badsig))
+        self.assertFalse(verifier.verify(msg, badsig))
 
         # Now flip one bit of the message and make sure that the original signature doesn't check.
         badmsg = flip_one_bit(msg)
-        self.failIf(verifier.verify(badmsg, sig))
+        self.assertFalse(verifier.verify(badmsg, sig))
 
         # Now generate a random message and make sure that the original signature doesn't check.
         badmsg = randstr(len(msg))
         assert badmsg != msg, "Internal error -- randstr() produced the same string twice: %s == %s" % (badmsg, msg)
-        self.failIf(verifier.verify(badmsg, sig))
+        self.assertFalse(verifier.verify(badmsg, sig))
 
     def _help_test_sign_and_check_bad_keys(self, signer, verifier):
         """
@@ -184,8 +184,8 @@ def _help_test_sign_and_check_bad_keys(self, signer, verifier):
         msg = randmsg()
 
         sig = signer.sign(msg)
-        self.failUnlessEqual(len(sig), SIGBYTES)
-        self.failIf(verifier.verify(msg, sig))
+        self.assertEqual(len(sig), SIGBYTES)
+        self.assertFalse(verifier.verify(msg, sig))
 
     def test(self):
         seed = randstr(SEEDBYTES)
@@ -194,7 +194,7 @@ def test(self):
         self._help_test_sign_and_check_good_keys(signer, verifier)
 
         vstr = verifier.serialize()
-        self.failUnlessEqual(len(vstr), PUBKEYBYTES)
+        self.assertEqual(len(vstr), PUBKEYBYTES)
         verifier2 = ecdsa.VerifyingKey(vstr)
         self._help_test_sign_and_check_good_keys(signer, verifier2)
 
@@ -247,12 +247,12 @@ def test_compatibility(self):
         v1 = signer.get_verifying_key()
         vs = v1.serialize()
         vs32 = base64.b32encode(vs)
-        self.failUnlessEqual(vs32, "AIWKEM44YHQCR3VI7SF7IJI7SSW6YNLMGMWBIXQWXC5522H2KXXHO===")
+        self.assertEqual(vs32, "AIWKEM44YHQCR3VI7SF7IJI7SSW6YNLMGMWBIXQWXC5522H2KXXHO===")
         v2 = ecdsa.VerifyingKey(vs)
         # print signer.sign("message").encode('hex')
         sig = 'a914953c6e6cecaf97d3d7f142ed1da88014752c3e1cd43b38f3327a73be67075bda7ec4a2ead5bb8a3471271a44ffbbd456b4d3ca470584c05703fdbe7b5bc0'.decode('hex')
-        self.failUnless(v1.verify("message", sig))
-        self.failUnless(v2.verify("message", sig))
+        self.assertTrue(v1.verify("message", sig))
+        self.assertTrue(v2.verify("message", sig))
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/pycryptopp/test/test_ed25519.py b/src/pycryptopp/test/test_ed25519.py
index 6e530ab..4e8cd6e 100644
--- a/src/pycryptopp/test/test_ed25519.py
+++ b/src/pycryptopp/test/test_ed25519.py
@@ -26,59 +26,59 @@ def log(self, msg):
         else:
             elapsed = now - self.timer
             self.timer = now
-            print " (%f elapsed)" % elapsed
-        print msg
+            print(" (%f elapsed)" % elapsed)
+        print(msg)
 
     def test_version(self):
         # just make sure it can be retrieved
         ver = ed25519.__version__
-        self.failUnless(isinstance(ver, type("")))
+        self.assertTrue(isinstance(ver, type("")))
 
     def test_constants(self):
         # the secret key we get from raw.keypair() are 64 bytes long, and
         # are mostly the output of a sha512 call. The first 32 bytes are the
         # private exponent (random, with a few bits stomped).
-        self.failUnlessEqual(raw.SECRETKEYBYTES, 64)
+        self.assertEqual(raw.SECRETKEYBYTES, 64)
         # the public key is the encoded public point
-        self.failUnlessEqual(raw.PUBLICKEYBYTES, 32)
-        self.failUnlessEqual(raw.SIGNATUREKEYBYTES, 64)
+        self.assertEqual(raw.PUBLICKEYBYTES, 32)
+        self.assertEqual(raw.SIGNATUREKEYBYTES, 64)
 
     def test_raw(self):
         sk_s = "\x00" * 32 # usually urandom(32)
         vk_s, skvk_s = raw.publickey(sk_s)
-        self.failUnlessEqual(len(vk_s), 32)
+        self.assertEqual(len(vk_s), 32)
         exp_vks = unhexlify("3b6a27bcceb6a42d62a3a8d02a6f0d73"
                             "653215771de243a63ac048a18b59da29")
-        self.failUnlessEqual(vk_s, exp_vks)
-        self.failUnlessEqual(skvk_s[:32], sk_s)
-        self.failUnlessEqual(skvk_s[32:], vk_s)
+        self.assertEqual(vk_s, exp_vks)
+        self.assertEqual(skvk_s[:32], sk_s)
+        self.assertEqual(skvk_s[32:], vk_s)
         msg = "hello world"
         msg_and_sig = raw.sign(msg, skvk_s)
         sig = msg_and_sig[:-len(msg)]
-        self.failUnlessEqual(len(sig), 64)
+        self.assertEqual(len(sig), 64)
         exp_sig = unhexlify("b0b47780f096ae60bfff8d8e7b19c36b"
                             "321ae6e69cca972f2ff987ef30f20d29"
                             "774b53bae404485c4391ddf1b3f37aaa"
                             "8a9747f984eb0884e8aa533386e73305")
-        self.failUnlessEqual(sig, exp_sig)
+        self.assertEqual(sig, exp_sig)
         ret = raw.open(sig+msg, vk_s) # don't raise exception
-        self.failUnlessEqual(ret, msg)
-        self.failUnlessRaises(raw.BadSignatureError,
+        self.assertEqual(ret, msg)
+        self.assertRaises(raw.BadSignatureError,
                               raw.open,
                               sig+msg+".. NOT!", vk_s)
-        self.failUnlessRaises(raw.BadSignatureError,
+        self.assertRaises(raw.BadSignatureError,
                               raw.open,
                               sig+flip_bit(msg), vk_s)
-        self.failUnlessRaises(raw.BadSignatureError,
+        self.assertRaises(raw.BadSignatureError,
                               raw.open,
                               sig+msg, flip_bit(vk_s))
-        self.failUnlessRaises(raw.BadSignatureError,
+        self.assertRaises(raw.BadSignatureError,
                               raw.open,
                               sig+msg, flip_bit(vk_s, in_byte=2))
-        self.failUnlessRaises(raw.BadSignatureError,
+        self.assertRaises(raw.BadSignatureError,
                               raw.open,
                               flip_bit(sig)+msg, vk_s)
-        self.failUnlessRaises(raw.BadSignatureError,
+        self.assertRaises(raw.BadSignatureError,
                               raw.open,
                               flip_bit(sig, in_byte=33)+msg, vk_s)
 
@@ -87,36 +87,36 @@ def test_publickey(self):
         sk_bytes = unhexlify("4ba96b0b5303328c7405220598a587c4"
                              "acb06ed9a9601d149f85400195f1ec3d")
         sk = ed25519.SigningKey(sk_bytes)
-        self.failUnlessRaises(ValueError, ed25519.SigningKey, "wrong length")
+        self.assertRaises(ValueError, ed25519.SigningKey, "wrong length")
 
         vk_bytes = sk.get_verifying_key_bytes()
-        self.failUnlessEqual(hexlify(vk_bytes),
+        self.assertEqual(hexlify(vk_bytes),
                              "a66d161e090652b054740748f059f92a"
                              "5b731f1c27b05571f6d942e4f8b7b264")
 
         ed25519.VerifyingKey(vk_bytes)
-        self.failUnlessRaises(ValueError, ed25519.VerifyingKey, "wrong length")
+        self.assertRaises(ValueError, ed25519.VerifyingKey, "wrong length")
 
     def test_OOP(self):
         sk_bytes = unhexlify("4ba96b0b5303328c7405220598a587c4"
                              "acb06ed9a9601d149f85400195f1ec3d")
         sk = ed25519.SigningKey(sk_bytes)
 
-        self.failUnlessEqual(hexlify(sk.get_verifying_key_bytes()),
+        self.assertEqual(hexlify(sk.get_verifying_key_bytes()),
                              "a66d161e090652b054740748f059f92a"
                              "5b731f1c27b05571f6d942e4f8b7b264")
         vk = ed25519.VerifyingKey(sk.get_verifying_key_bytes())
 
         msg = "hello world"
         sig = sk.sign(msg)
-        self.failUnlessEqual(len(sig), 64)
-        self.failUnlessEqual(hexlify(sig),
+        self.assertEqual(len(sig), 64)
+        self.assertEqual(hexlify(sig),
                              "6eaffe94f2972b35158b6aaa9b69c1da"
                              "97f0896aca29c41b1dd7b32e6c9e2ff6"
                              "76fc8d8b034709cdcc37d8aeb86bebfb"
                              "173ace3c319e211ea1d7e8d8884c1808")
-        self.failUnlessEqual(vk.verify(sig, msg), None) # also, don't throw
-        self.failUnlessRaises(ed25519.BadSignatureError,
+        self.assertEqual(vk.verify(sig, msg), None) # also, don't throw
+        self.assertRaises(ed25519.BadSignatureError,
                               vk.verify, sig, msg+".. NOT!")
 
     def test_object_identity(self):
@@ -127,21 +127,21 @@ def test_object_identity(self):
         sk1a = ed25519.SigningKey(sk1_bytes)
         sk1b = ed25519.SigningKey(sk1_bytes)
         sk2 = ed25519.SigningKey(sk2_bytes)
-        self.failUnlessEqual(sk1a, sk1b)
-        self.failIfEqual(sk1a, sk2)
+        self.assertEqual(sk1a, sk1b)
+        self.assertNotEqual(sk1a, sk2)
 
         vk1_bytes = sk1a.get_verifying_key_bytes()
-        self.failUnlessEqual(vk1_bytes, sk1b.get_verifying_key_bytes())
+        self.assertEqual(vk1_bytes, sk1b.get_verifying_key_bytes())
         vk2_bytes = sk2.get_verifying_key_bytes()
         vk1a = ed25519.VerifyingKey(vk1_bytes)
         vk1b = ed25519.VerifyingKey(vk1_bytes)
         vk2 = ed25519.VerifyingKey(vk2_bytes)
-        self.failUnlessEqual(vk1a, vk1b)
-        self.failIfEqual(vk1a, vk2)
+        self.assertEqual(vk1a, vk1b)
+        self.assertNotEqual(vk1a, vk2)
 
         # exercise compare-against-other-type
-        self.failIfEqual(sk2, "not a SigningKey")
-        self.failIfEqual(vk2, "not a VerifyingKey")
+        self.assertNotEqual(sk2, "not a SigningKey")
+        self.assertNotEqual(vk2, "not a VerifyingKey")
 
 
 if __name__ == '__main__':
diff --git a/src/pycryptopp/test/test_ed25519_kat.py b/src/pycryptopp/test/test_ed25519_kat.py
index 83e38be..d1a1d50 100644
--- a/src/pycryptopp/test/test_ed25519_kat.py
+++ b/src/pycryptopp/test/test_ed25519_kat.py
@@ -32,15 +32,15 @@ def test_short(self):
 
             sk = ed25519.SigningKey(seed)
             vkbs = sk.get_verifying_key_bytes()
-            self.failUnlessEqual(vkbs, vk_s)
+            self.assertEqual(vkbs, vk_s)
             vk = ed25519.VerifyingKey(vkbs)
             vk2 = ed25519.VerifyingKey(vk_s)
-            self.failUnlessEqual(vk2, vk) # objects should compare equal
+            self.assertEqual(vk2, vk) # objects should compare equal
             newsig = sk.sign(msg)
             sig_R,sig_S = sig[:32],sig[32:]
             newsig_R,newsig_S = newsig[:32],newsig[32:]
-            self.failUnlessEqual(hexlify(newsig), hexlify(sig)) # deterministic sigs
-            self.failUnlessEqual(vk.verify(sig, msg), None) # no exception
+            self.assertEqual(hexlify(newsig), hexlify(sig)) # deterministic sigs
+            self.assertEqual(vk.verify(sig, msg), None) # no exception
 
 
 if __name__ == '__main__':
diff --git a/src/pycryptopp/test/test_rsa.py b/src/pycryptopp/test/test_rsa.py
index 7311a4f..5c94575 100644
--- a/src/pycryptopp/test/test_rsa.py
+++ b/src/pycryptopp/test/test_rsa.py
@@ -19,7 +19,7 @@ def ab(x): # debuggery
         return "%s:%s" % (len(x), "--empty--",)
 
 def randstr(n):
-    return ''.join(map(chr, map(random.randrange, [0]*n, [256]*n)))
+    return ''.join(map(chr, list(map(random.randrange, [0]*n, [256]*n))))
 
 KEYSIZE=522 # 522 bits is far too few for actual security -- it is used only for faster unit tests
 
@@ -27,14 +27,14 @@ class Signer(unittest.TestCase):
     def test_generate_bad_size(self):
         try:
             rsa.generate(KEYSIZE-1)
-        except rsa.Error, le:
-            self.failUnless("size in bits is required to be >=" in str(le), le)
+        except rsa.Error as le:
+            self.assertTrue("size in bits is required to be >=" in str(le), le)
         else:
             self.fail("Should have raised error from size being too small.")
         try:
             rsa.generate(sizeinbits=KEYSIZE-1)
-        except rsa.Error, le:
-            self.failUnless("size in bits is required to be >=" in str(le), le)
+        except rsa.Error as le:
+            self.assertTrue("size in bits is required to be >=" in str(le), le)
         else:
             self.fail("Should have raised error from size being too small.")
 
@@ -47,29 +47,29 @@ def test_generate(self):
     def test_sign(self):
         signer = rsa.generate(KEYSIZE)
         result = signer.sign("abc")
-        self.failUnlessEqual(len(result), ((KEYSIZE+7)/8))
+        self.assertEqual(len(result), ((KEYSIZE+7)/8))
         # TODO: test against RSAInc. test vectors.
 
     def test_create_from_string_invalid(self):
         try:
             rsa.create_signing_key_from_string("invalid string")
-        except rsa.Error, le:
-            self.failUnless("decode error" in str(le), le)
+        except rsa.Error as le:
+            self.assertTrue("decode error" in str(le), le)
         else:
             self.fail("Should have raised error from invalid string")
 
         try:
             rsa.create_verifying_key_from_string("invalid string")
-        except rsa.Error, le:
-            self.failUnless("decode error" in str(le), le)
+        except rsa.Error as le:
+            self.assertTrue("decode error" in str(le), le)
         else:
             self.fail("Should have raised error from invalid string")
 
 class SignAndVerify(unittest.TestCase):
     def _help_test_sign_and_check(self, signer, verifier, msg):
         sig = signer.sign(msg)
-        self.failUnlessEqual(len(sig), ((KEYSIZE+7)/8))
-        self.failUnless(verifier.verify(msg, sig))
+        self.assertEqual(len(sig), ((KEYSIZE+7)/8))
+        self.assertTrue(verifier.verify(msg, sig))
 
     def test_sign_and_check_a(self):
         signer = rsa.generate(KEYSIZE)
@@ -90,7 +90,7 @@ def test_sign_and_check_random(self):
     def _help_test_sign_and_failcheck(self, signer, verifier, msg):
         sig = signer.sign("a")
         sig = sig[:-1] + chr(ord(sig[-1])^0x01)
-        self.failUnless(not verifier.verify(msg, sig))
+        self.assertTrue(not verifier.verify(msg, sig))
 
     def test_sign_and_failcheck_a(self):
         signer = rsa.generate(KEYSIZE)
diff --git a/src/pycryptopp/test/test_sha256.py b/src/pycryptopp/test/test_sha256.py
index 5705b91..39e8578 100644
--- a/src/pycryptopp/test/test_sha256.py
+++ b/src/pycryptopp/test/test_sha256.py
@@ -26,7 +26,7 @@ def ab(x): # debuggery
         return "%s:%s" % (len(x), "--empty--",)
 
 def randstr(n):
-    return ''.join(map(chr, map(random.randrange, [0]*n, [256]*n)))
+    return ''.join(map(chr, list(map(random.randrange, [0]*n, [256]*n))))
 
 h0 = a2b_hex("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
 h_bd = a2b_hex("68325720aabd7c82f30f554b313d0570c95accbb7dc4b5aae11204c08ffe732b")
@@ -35,52 +35,52 @@ def randstr(n):
 class SHA256(unittest.TestCase):
     def test_digest(self):
         empty_digest = sha256.SHA256().digest()
-        self.failUnless(isinstance(empty_digest, str))
-        self.failUnlessEqual(len(empty_digest), 32)
-        self.failUnlessEqual(empty_digest, h0)
+        self.assertTrue(isinstance(empty_digest, str))
+        self.assertEqual(len(empty_digest), 32)
+        self.assertEqual(empty_digest, h0)
 
     def test_hexdigest(self):
         empty_hexdigest = sha256.SHA256().hexdigest()
-        self.failUnlessEqual(a2b_hex(empty_hexdigest), h0)
+        self.assertEqual(a2b_hex(empty_hexdigest), h0)
     test_hexdigest.todo = "Not yet implemented: SHA256.hexdigest()."
 
     def test_onebyte_1(self):
         d = sha256.SHA256("\xbd").digest()
-        self.failUnlessEqual(d, h_bd)
+        self.assertEqual(d, h_bd)
 
     def test_onebyte_2(self):
         s = sha256.SHA256()
         s.update("\xbd")
         d = s.digest()
-        self.failUnlessEqual(d, h_bd)
+        self.assertEqual(d, h_bd)
 
     def test_update(self):
         s = sha256.SHA256("\x5f")
         s.update("\xd4")
         d = s.digest()
-        self.failUnlessEqual(d, h_5fd4)
+        self.assertEqual(d, h_5fd4)
 
     def test_constructor_type_check(self):
-        self.failUnlessRaises(TypeError, sha256.SHA256, None)
+        self.assertRaises(TypeError, sha256.SHA256, None)
 
     def test_update_type_check(self):
         h = sha256.SHA256()
-        self.failUnlessRaises(TypeError, h.update, None)
+        self.assertRaises(TypeError, h.update, None)
 
     def test_digest_twice(self):
         h = sha256.SHA256()
         d1 = h.digest()
-        self.failUnless(isinstance(d1, str))
+        self.assertTrue(isinstance(d1, str))
         d2 = h.digest()
-        self.failUnlessEqual(d1, d2)
+        self.assertEqual(d1, d2)
 
     def test_digest_then_update_fail(self):
         h = sha256.SHA256()
         h.digest()
         try:
             h.update("oops")
-        except sha256.Error, le:
-            self.failUnless("digest() has been called" in str(le), le)
+        except sha256.Error as le:
+            self.assertTrue("digest() has been called" in str(le), le)
 
     def test_chunksize(self):
         # hashes can be computed on arbitrarily-sized chunks
@@ -95,8 +95,8 @@ def test_chunksize(self):
                 got = h.hexdigest()
                 if got != expected:
                     problems = True
-                    print len(s[:a]), len(s[a:]), len(s), got, expected
-        self.failIf(problems)
+                    print(len(s[:a]), len(s[a:]), len(s), got, expected)
+        self.assertFalse(problems)
 
     def test_recursive_different_chunksizes(self):
         """
@@ -115,7 +115,7 @@ def test_recursive_different_chunksizes(self):
         for i in range(0, 65):
             hx.update(chr(0xFE))
             hx.update(s[:64])
-        self.failUnlessEqual(hx.hexdigest().lower(), '5191c7841dd4e16aa454d40af924585dffc67157ffdbfd0236acddd07901629d')
+        self.assertEqual(hx.hexdigest().lower(), '5191c7841dd4e16aa454d40af924585dffc67157ffdbfd0236acddd07901629d')
 
 
 VECTS_RE=re.compile("\nLen = ([0-9]+)\nMsg = ([0-9a-f]+)\nMD = ([0-9a-f]+)")
@@ -153,7 +153,7 @@ def _test_vect(self, vects_str):
             md = a2b_hex(mo.group(3))
 
             computed_md = sha256.SHA256(msg).digest()
-            self.failUnlessEqual(computed_md, md)
+            self.assertEqual(computed_md, md)
 
     def test_monte(self):
         inlines = resource_string_lines('pycryptopp', 'testvectors/SHA256Monte.txt')
@@ -175,5 +175,5 @@ def test_monte(self):
                     m = mds[-3]+mds[-2]+mds[-1]
                     mds.append(sha256.SHA256(m).digest())
                 seed = mds[-1]
-                self.failUnlessEqual(line[5:], b2a_hex(seed))
+                self.assertEqual(line[5:], b2a_hex(seed))
                 j += 1
diff --git a/src/pycryptopp/test/test_xsalsa20.py b/src/pycryptopp/test/test_xsalsa20.py
index 0f949e7..03fd9c0 100644
--- a/src/pycryptopp/test/test_xsalsa20.py
+++ b/src/pycryptopp/test/test_xsalsa20.py
@@ -15,7 +15,7 @@ def test_zero_XSalsa20(self):
         key="1b27556473e985d462cd51197a9a46c76009549eac6474f206c4ee0844f68389"
         iv="69696ee955b62b73cd62bda875fc73d68219e0036b7a0b37"
         computedcipher=xsalsa20.XSalsa20(a2b_hex(key),a2b_hex(iv)).process('\x00'*139)
-        self.failUnlessEqual(a2b_hex(self.enc0), computedcipher, "enc0: %s, computedciper: %s" % (self.enc0, b2a_hex(computedcipher)))
+        self.assertEqual(a2b_hex(self.enc0), computedcipher, "enc0: %s, computedciper: %s" % (self.enc0, b2a_hex(computedcipher)))
 
         cryptor=xsalsa20.XSalsa20(a2b_hex(key),a2b_hex(iv))
 
@@ -23,7 +23,7 @@ def test_zero_XSalsa20(self):
         computedcipher2=cryptor.process('\x00'*69)
         computedcipher3=cryptor.process('\x00')
         computedcipher12=b2a_hex(computedcipher1)+b2a_hex(computedcipher2)+b2a_hex(computedcipher3)
-        self.failUnlessEqual(self.enc0, computedcipher12)
+        self.assertEqual(self.enc0, computedcipher12)
 
 
     def test_XSalsa(self):
@@ -47,7 +47,7 @@ def _test_XSalsa(self, vects_str):
             #print "ciphertext", b2a_hex(computedcipher), '\n'
             #print "computedtext", ciphertext, '\n'
             #print count, ": \n"
-            self.failUnlessEqual(computedcipher,a2b_hex(ciphertext),"computedcipher: %s, ciphertext: %s" % (b2a_hex(computedcipher), ciphertext))
+            self.assertEqual(computedcipher,a2b_hex(ciphertext),"computedcipher: %s, ciphertext: %s" % (b2a_hex(computedcipher), ciphertext))
 
             #the random decomposing
             plaintext1 = ""
@@ -63,7 +63,7 @@ def _test_XSalsa(self, vects_str):
                 plaintext2 += plaintext[point+2:]
                 rccipher += b2a_hex(cryptor.process(a2b_hex(plaintext1)))
                 rccipher += b2a_hex(cryptor.process(a2b_hex(plaintext2)))
-                self.failUnlessEqual(rccipher, ciphertext, "random computed cipher: %s, ciphertext: %s" % (rccipher, ciphertext))
+                self.assertEqual(rccipher, ciphertext, "random computed cipher: %s, ciphertext: %s" % (rccipher, ciphertext))
 
             #every byte encrypted
             cryptor = xsalsa20.XSalsa20(key,iv)
@@ -72,29 +72,29 @@ def _test_XSalsa(self, vects_str):
             while l<=(length-2):
                     eccipher += b2a_hex(cryptor.process(a2b_hex(plaintext[l:l+2])))
                     l += 2
-            self.failUnlessEqual(eccipher, ciphertext, "every byte computed cipher: %s, ciphertext: %s" % (eccipher, ciphertext))
+            self.assertEqual(eccipher, ciphertext, "every byte computed cipher: %s, ciphertext: %s" % (eccipher, ciphertext))
 
 
     def test_types_and_lengths(self):
         # the key= argument must be a bytestring exactly 32 bytes long
-        self.failUnlessRaises(TypeError, xsalsa20.XSalsa20, None)
+        self.assertRaises(TypeError, xsalsa20.XSalsa20, None)
         for i in range(70):
             key = "a"*i
             if i != 32:
-                self.failUnlessRaises(xsalsa20.Error, xsalsa20.XSalsa20, key)
+                self.assertRaises(xsalsa20.Error, xsalsa20.XSalsa20, key)
             else:
-                self.failUnless(xsalsa20.XSalsa20(key))
+                self.assertTrue(xsalsa20.XSalsa20(key))
 
         # likewise, iv= (if provided) must be exactly 24 bytes long. Passing
         # None is not treated the same as not passing the argument at all.
         key = "a"*32
-        self.failUnlessRaises(TypeError, xsalsa20.XSalsa20, key, None)
+        self.assertRaises(TypeError, xsalsa20.XSalsa20, key, None)
         for i in range(70):
             iv = "i"*i
             if i != 24:
-                self.failUnlessRaises(xsalsa20.Error, xsalsa20.XSalsa20, key, iv)
+                self.assertRaises(xsalsa20.Error, xsalsa20.XSalsa20, key, iv)
             else:
-                self.failUnless(xsalsa20.XSalsa20(key, iv))
+                self.assertTrue(xsalsa20.XSalsa20(key, iv))
 
     def test_recursive(self):
         # Try to use the same technique as:
@@ -123,7 +123,7 @@ def enc(key, nonce, plaintext):
             s = s[-K-N-B:]
         output = b2a_hex(s[-B:])
         # I've compared this output against pynacl -warner
-        self.failUnlessEqual(output,
+        self.assertEqual(output,
                              "77f8e2792dd4f2d44edf469c3a7ad5f7"
                              "5cb373fe0c3d9c8ee570dc91e00f1caa"
                              "25f725c202f3781869a40b8a2c856b55"
diff --git a/versioneer.py b/versioneer.py
index c05d831..6941384 100644
--- a/versioneer.py
+++ b/versioneer.py
@@ -296,15 +296,15 @@ def run_command(args, cwd=None, verbose=False):
     try:
         # remember shell=False, so use git.cmd on windows, not just git
         p = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd)
-    except EnvironmentError, e:
+    except EnvironmentError as e:
         if verbose:
-            print "unable to run %s" % args[0]
-            print e
+            print("unable to run %s" % args[0])
+            print(e)
         return None
     stdout = p.communicate()[0].strip()
     if p.returncode != 0:
         if verbose:
-            print "unable to run %s (error)" % args[0]
+            print("unable to run %s (error)" % args[0])
         return None
     return stdout
 
@@ -337,13 +337,13 @@ def versions_from_expanded_variables(variables, tag_prefix, verbose=False):
     refnames = variables["refnames"].strip()
     if refnames.startswith("$Format"):
         if verbose:
-            print "variables are unexpanded, not using"
+            print("variables are unexpanded, not using")
         return {} # unexpanded, so not in an unpacked git-archive tarball
     refs = set([r.strip() for r in refnames.strip("()").split(",")])
     for ref in list(refs):
         if not re.search(r'\d', ref):
             if verbose:
-                print "discarding '%s', no digits" % ref
+                print("discarding '%s', no digits" % ref)
             refs.discard(ref)
             # Assume all version tags have a digit. git's %d expansion
             # behaves like git log --decorate=short and strips out the
@@ -352,18 +352,18 @@ def versions_from_expanded_variables(variables, tag_prefix, verbose=False):
             # without digits, we filter out many common branch names like
             # "release" and "stabilization", as well as "HEAD" and "master".
     if verbose:
-        print "remaining refs:", ",".join(sorted(refs))
+        print("remaining refs:", ",".join(sorted(refs)))
     for ref in sorted(refs):
         # sorting will prefer e.g. "2.0" over "2.0rc1"
         if ref.startswith(tag_prefix):
             r = ref[len(tag_prefix):]
             if verbose:
-                print "picking %s" % r
+                print("picking %s" % r)
             return { "version": r,
                      "full": variables["full"].strip() }
     # no suitable tags, so we use the full revision id
     if verbose:
-        print "no suitable tags, using full revision id"
+        print("no suitable tags, using full revision id")
     return { "version": variables["full"].strip(),
              "full": variables["full"].strip() }
 
@@ -395,7 +395,7 @@ def versions_from_vcs(tag_prefix, versionfile_source, verbose=False):
         root = os.path.dirname(here)
     if not os.path.exists(os.path.join(root, ".git")):
         if verbose:
-            print "no .git in", root
+            print("no .git in", root)
         return {}
 
     GIT = "git"
@@ -407,7 +407,7 @@ def versions_from_vcs(tag_prefix, versionfile_source, verbose=False):
         return {}
     if not stdout.startswith(tag_prefix):
         if verbose:
-            print "tag '%s' doesn't start with prefix '%s'" % (stdout, tag_prefix)
+            print("tag '%s' doesn't start with prefix '%s'" % (stdout, tag_prefix))
         return {}
     tag = stdout[len(tag_prefix):]
     stdout = run_command([GIT, "rev-parse", "HEAD"], cwd=root)
@@ -446,8 +446,8 @@ def versions_from_parentdir(parentdir_prefix, versionfile_source, verbose=False)
     dirname = os.path.basename(root)
     if not dirname.startswith(parentdir_prefix):
         if verbose:
-            print "guessing rootdir is '%s', but '%s' doesn't start with prefix '%s'" % \
-                  (root, dirname, parentdir_prefix)
+            print("guessing rootdir is '%s', but '%s' doesn't start with prefix '%s'" % \
+                  (root, dirname, parentdir_prefix))
         return None
     return {"version": dirname[len(parentdir_prefix):], "full": ""}
 
@@ -511,7 +511,7 @@ def write_to_version_file(filename, versions):
     f = open(filename, "w")
     f.write(SHORT_VERSION_PY % versions)
     f.close()
-    print "set %s to '%s'" % (filename, versions["version"])
+    print("set %s to '%s'" % (filename, versions["version"]))
 
 
 def get_best_versions(versionfile, tag_prefix, parentdir_prefix,
@@ -528,25 +528,25 @@ def get_best_versions(versionfile, tag_prefix, parentdir_prefix,
     if variables:
         ver = versions_from_expanded_variables(variables, tag_prefix)
         if ver:
-            if verbose: print "got version from expanded variable", ver
+            if verbose: print("got version from expanded variable", ver)
             return ver
 
     ver = versions_from_file(versionfile)
     if ver:
-        if verbose: print "got version from file %s" % versionfile, ver
+        if verbose: print("got version from file %s" % versionfile, ver)
         return ver
 
     ver = versions_from_vcs(tag_prefix, versionfile_source, verbose)
     if ver:
-        if verbose: print "got version from git", ver
+        if verbose: print("got version from git", ver)
         return ver
 
     ver = versions_from_parentdir(parentdir_prefix, versionfile_source, verbose)
     if ver:
-        if verbose: print "got version from parentdir", ver
+        if verbose: print("got version from parentdir", ver)
         return ver
 
-    if verbose: print "got version from default", ver
+    if verbose: print("got version from default", ver)
     return default
 
 def get_versions(default=DEFAULT, verbose=False):
@@ -568,7 +568,7 @@ def finalize_options(self):
         pass
     def run(self):
         ver = get_version(verbose=True)
-        print "Version is currently:", ver
+        print("Version is currently:", ver)
 
 
 class cmd_build(_build):
@@ -578,7 +578,7 @@ def run(self):
         # now locate _version.py in the new build/ directory and replace it
         # with an updated value
         target_versionfile = os.path.join(self.build_lib, versionfile_build)
-        print "UPDATING", target_versionfile
+        print("UPDATING", target_versionfile)
         os.unlink(target_versionfile)
         f = open(target_versionfile, "w")
         f.write(SHORT_VERSION_PY % versions)
@@ -597,7 +597,7 @@ def make_release_tree(self, base_dir, files):
         # now locate _version.py in the new base_dir directory (remembering
         # that it may be a hardlink) and replace it with an updated value
         target_versionfile = os.path.join(base_dir, versionfile_source)
-        print "UPDATING", target_versionfile
+        print("UPDATING", target_versionfile)
         os.unlink(target_versionfile)
         f = open(target_versionfile, "w")
         f.write(SHORT_VERSION_PY % self._versioneer_generated_versions)
@@ -619,7 +619,7 @@ def finalize_options(self):
         pass
     def run(self):
         ipy = os.path.join(os.path.dirname(versionfile_source), "__init__.py")
-        print " creating %s" % versionfile_source
+        print(" creating %s" % versionfile_source)
         f = open(versionfile_source, "w")
         f.write(LONG_VERSION_PY % {"DOLLAR": "$",
                                    "TAG_PREFIX": tag_prefix,
@@ -632,12 +632,12 @@ def run(self):
         except EnvironmentError:
             old = ""
         if INIT_PY_SNIPPET not in old:
-            print " appending to %s" % ipy
+            print(" appending to %s" % ipy)
             f = open(ipy, "a")
             f.write(INIT_PY_SNIPPET)
             f.close()
         else:
-            print " %s unmodified" % ipy
+            print(" %s unmodified" % ipy)
         do_vcs_install(versionfile_source, ipy)
 
 def get_cmdclass():

From 06a8639861b0feb6f850452bd2ad3209a2832210 Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:17:28 +0200
Subject: [PATCH 06/10] fix: AttributeError: 'str' object has no attribute
 'decode'

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 1dd8245..ac8c968 100644
--- a/setup.py
+++ b/setup.py
@@ -189,7 +189,7 @@
 
 data_fnames=['COPYING.GPL', 'COPYING.TGPPL.rst', 'COPYING.MIT.txt', 'COPYING.SPL.txt', 'README.rst']
 
-readmetext = open('README.rst').read()
+readmetext = open('README.rst', 'rb').read()
 if readmetext[:3] == '\xef\xbb\xbf':
     # utf-8 "BOM" 
     readmetext = readmetext[3:]

From 6f75c81230e8a66cf9001b7ca9fe971d0b4786b1 Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:17:45 +0200
Subject: [PATCH 07/10] fix: TypeError: a bytes-like object is required, not
 'str'

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ac8c968..3e3a821 100644
--- a/setup.py
+++ b/setup.py
@@ -330,7 +330,7 @@ def write_version_py(self, pkgname, version, outfname, body, EXE_NAME):
         f.close()
 
     def write_extraversion_h(self, pkgname, version, outfname, body):
-        f = open(outfname, "wb")
+        f = open(outfname, "wt")
         f.write(body % {"pkgname": pkgname, "pkgversion": version})
         f.close()
 

From da9cb8278ece15e9cf79c8c537800ee27fafc1af Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:18:16 +0200
Subject: [PATCH 08/10] fix: FileNotFoundError: [Errno 2] No such file or
 directory: 'src-ed25519/supercop-ref'

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 3e3a821..60f0bac 100644
--- a/setup.py
+++ b/setup.py
@@ -159,10 +159,10 @@
 # python-ed25519
 sources = [os.path.join("src-ed25519","glue","ed25519module.c")]
 sources.extend([os.path.join("src-ed25519","supercop-ref",s)
-                for s in os.listdir(os.path.join("src-ed25519","supercop-ref"))
+                for s in os.listdir(os.path.join("src-ed25519","src"))
                 if s.endswith(".c") and s!="test.c"])
 m = Extension("pycryptopp.publickey.ed25519._ed25519",
-              include_dirs=[os.path.join("src-ed25519","supercop-ref")],
+              include_dirs=[os.path.join("src-ed25519","src")],
               sources=sources)
 ext_modules.append(m)
 

From e24e0f7e700e2c0d07e6eb27608c671bbe85d1e8 Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 14:19:17 +0200
Subject: [PATCH 09/10] TODO use pkg-config to find incldir and libdir of
 cryptopp

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 60f0bac..9623a3d 100644
--- a/setup.py
+++ b/setup.py
@@ -81,6 +81,7 @@
 
     # Link with a Crypto++ library that is already installed on the system.
 
+    # TODO use pkg-config to find incldir and libdir of cryptopp
     for inclpath in ["/usr/local/include/cryptopp", "/usr/include/cryptopp"]:
         if os.path.exists(inclpath):
             libraries.append("cryptopp")

From 204e5b3e1518c0aaa736e86ac08c5465d3b15fa3 Mon Sep 17 00:00:00 2001
From: Milan Hauth <milahu@gmail.com>
Date: Sat, 29 Jul 2023 16:13:25 +0200
Subject: [PATCH 10/10] =?UTF-8?q?fix:=20src/pycryptopp/=5Fpycryptoppmodule?=
 =?UTF-8?q?.cpp:42:14:=20error:=20=E2=80=98Py=5FInitModule3=E2=80=99=20was?=
 =?UTF-8?q?=20not=20declared=20in=20this=20scope?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pycryptopp/_pycryptoppmodule.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/pycryptopp/_pycryptoppmodule.cpp b/src/pycryptopp/_pycryptoppmodule.cpp
index 1c99817..dc44108 100644
--- a/src/pycryptopp/_pycryptoppmodule.cpp
+++ b/src/pycryptopp/_pycryptoppmodule.cpp
@@ -32,16 +32,28 @@ static PyMethodDef _pycryptopp_functions[] = {
     {NULL, NULL, 0, NULL}  /* sentinel */
 };
 
+static struct PyModuleDef _pycryptopp = {
+    PyModuleDef_HEAD_INIT,
+    // TODO "" or "_"
+    //"pycryptopp",
+    "_pycryptopp",
+    _pycryptopp__doc__,
+    -1,
+    _pycryptopp_functions
+};
+
 #ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
 #define PyMODINIT_FUNC void
 #endif
 PyMODINIT_FUNC
-init_pycryptopp(void) {
+// TODO "_" or "__"
+//PyInit_pycryptopp(void) {
+PyInit__pycryptopp(void) {
     PyObject *module;
 
-    module = Py_InitModule3("_pycryptopp", _pycryptopp_functions, _pycryptopp__doc__);
+    module = PyModule_Create(&_pycryptopp);
     if (!module)
-      return;
+      return NULL;
 
     PyObject* version;
 
@@ -61,7 +73,7 @@ init_pycryptopp(void) {
 
     int succ = PyModule_AddObject(module, "cryptopp_version", version);
     if (succ != 0)
-        return;
+        return NULL;
 
 
     init_ecdsa(module);
@@ -69,4 +81,6 @@ init_pycryptopp(void) {
     init_sha256(module);
     init_aes(module);
     init_xsalsa20(module);
+
+    return module;
 }