diff --git a/libdap-crypto.pri b/libdap-crypto.pri
index 6761178a2da9cc92b3a3d312ead49a816759fb1c..e9e9056805a30a40aee6774c694b2ae1a61393dd 100755
--- a/libdap-crypto.pri
+++ b/libdap-crypto.pri
@@ -1,6 +1,7 @@
include (src/defeo_scheme/defeo.pri)
include (src/iaes/iaes.pri)
include (src/oaes/oaes.pri)
+include (src/blowfish/blowfish.pri)
include (src/msrln/msrln.pri)
include (src/rand/rand.pri)
include (src/sha3/sha3.pri)
@@ -8,6 +9,7 @@ include (src/sig_bliss/sig_bliss.pri)
include (src/sig_picnic/sig_picnic.pri)
include (src/sig_tesla/sig_tesla.pri)
include (src/sig_dilithium/sig_dilithium.pri)
+include (src/ringct20/ringct20.pri)
DEFINES += KeccakP1600timesN_excluded
@@ -15,6 +17,8 @@ HEADERS += $$PWD/include/dap_enc.h \
$$PWD/include/dap_enc_base64.h \
$$PWD/include/dap_enc_iaes.h \
$$PWD/include/dap_enc_oaes.h \
+ $$PWD/include/dap_enc_bf.h \
+ $$PWD/include/dap_enc_GOST.h \
$$PWD/include/dap_enc_msrln.h \
$$PWD/include/dap_enc_key.h \
$$PWD/include/dap_enc_defeo.h \
@@ -23,6 +27,7 @@ HEADERS += $$PWD/include/dap_enc.h \
$$PWD/include/dap_enc_tesla.h \
$$PWD/include/dap_enc_base58.h \
$$PWD/include/dap_enc_dilithium.h \
+ $$PWD/include/dap_enc_ringct20.h \
$$PWD/include/dap_crypto_common.h \
$$PWD/include/dap_cert.h \
$$PWD/include/dap_cert_file.h \
@@ -39,6 +44,8 @@ SOURCES += $$PWD/src/dap_enc.c \
$$PWD/src/dap_enc_base64.c \
$$PWD/src/dap_enc_iaes.c \
$$PWD/src/dap_enc_oaes.c \
+ $$PWD/src/dap_enc_bf.c \
+ $$PWD/src/dap_enc_GOST.c \
$$PWD/src/dap_enc_msrln.c \
$$PWD/src/dap_enc_key.c \
$$PWD/src/dap_enc_defeo.c \
@@ -47,6 +54,7 @@ SOURCES += $$PWD/src/dap_enc.c \
$$PWD/src/dap_enc_tesla.c \
$$PWD/src/dap_enc_base58.c \
$$PWD/src/dap_enc_dilithium.c \
+ $$PWD/src/dap_enc_ringct20.c \
$$PWD/src/dap_enc_ca.c \
$$PWD/src/dap_cert.c \
$$PWD/src/dap_cert_file.c \
diff --git a/src/GOST/GOST.pri b/src/GOST/GOST.pri
new file mode 100644
index 0000000000000000000000000000000000000000..176c5281c593784d1dbd5853b8aef35a2d1ba64c
--- /dev/null
+++ b/src/GOST/GOST.pri
@@ -0,0 +1,16 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += $$PWD/28147_14.h \
+ $$PWD/28147_89.h \
+ $$PWD/callback_print.h \
+ $$PWD/dll_import.h \
+ $$PWD/print_data.h \
+ $$PWD/table.h \
+ $$PWD/test_data.inc \
+ $$PWD/block_cipher.h
+
+SOURCES += $$PWD/28147_14.c \
+ $$PWD/28147_89.c \
+ $$PWD/block_cipher.c \
+ $$PWD/print_data.c \
+ $$PWD/testgost.c
diff --git a/src/GOST/test_data.inc b/src/GOST/test_data.inc
new file mode 100644
index 0000000000000000000000000000000000000000..5df12771af70a2ee5b4545f21f34daf080ad040d
--- /dev/null
+++ b/src/GOST/test_data.inc
@@ -0,0 +1,313 @@
+/*----------------------------------------------------------------------
+ * тестовые значения для алгоритма кузнечик из стандарта
+ */
+
+/* тестовые значения преобразования S */
+unsigned char kSData[5][kBlockLen14] =
+{
+ {0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x00},
+ {0xb6, 0x6c, 0xd8, 0x88, 0x7d, 0x38, 0xe8, 0xd7, 0x77, 0x65, 0xae, 0xea, 0x0c, 0x9a, 0x7e, 0xfc},
+ {0x55, 0x9d, 0x8d, 0xd7, 0xbd, 0x06, 0xcb, 0xfe, 0x7e, 0x7b, 0x26, 0x25, 0x23, 0x28, 0x0d, 0x39},
+ {0x0c, 0x33, 0x22, 0xfe, 0xd5, 0x31, 0xe4, 0x63, 0x0d, 0x80, 0xef, 0x5c, 0x5a, 0x81, 0xc5, 0x0b},
+ {0x23, 0xae, 0x65, 0x63, 0x3f, 0x84, 0x2d, 0x29, 0xc5, 0xdf, 0x52, 0x9c, 0x13, 0xf5, 0xac, 0xda}
+};
+
+/* тестовые значения преобразования R */
+unsigned char kRData[5][kBlockLen14] =
+{
+ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00},
+ {0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
+ {0xa5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ {0x64, 0xa5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ {0x0d, 0x64, 0xa5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+};
+
+/* тестовые значения преобразования L */
+unsigned char kLData[5][kBlockLen14] =
+{
+ {0x64, 0xa5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ {0xd4, 0x56, 0x58, 0x4d, 0xd0, 0xe3, 0xe8, 0x4c, 0xc3, 0x16, 0x6e, 0x4b, 0x7f, 0xa2, 0x89, 0x0d},
+ {0x79, 0xd2, 0x62, 0x21, 0xb8, 0x7b, 0x58, 0x4c, 0xd4, 0x2f, 0xbc, 0x4f, 0xfe, 0xa5, 0xde, 0x9a},
+ {0x0e, 0x93, 0x69, 0x1a, 0x0c, 0xfc, 0x60, 0x40, 0x8b, 0x7b, 0x68, 0xf6, 0x6b, 0x51, 0x3c, 0x13},
+ {0xe6, 0xa8, 0x09, 0x4f, 0xee, 0x0a, 0xa2, 0x04, 0xfd, 0x97, 0xbc, 0xb0, 0xb4, 0x4b, 0x85, 0x80}
+};
+
+/* тестовые значения развернутых ключей */
+static const unsigned char kKData[10][kBlockLen14] =
+{
+ {0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77},
+ {0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
+ {0xdb, 0x31, 0x48, 0x53, 0x15, 0x69, 0x43, 0x43, 0x22, 0x8d, 0x6a, 0xef, 0x8c, 0xc7, 0x8c, 0x44},
+ {0x3d, 0x45, 0x53, 0xd8, 0xe9, 0xcf, 0xec, 0x68, 0x15, 0xeb, 0xad, 0xc4, 0x0a, 0x9f, 0xfd, 0x04},
+ {0x57, 0x64, 0x64, 0x68, 0xc4, 0x4a, 0x5e, 0x28, 0xd3, 0xe5, 0x92, 0x46, 0xf4, 0x29, 0xf1, 0xac},
+ {0xbd, 0x07, 0x94, 0x35, 0x16, 0x5c, 0x64, 0x32, 0xb5, 0x32, 0xe8, 0x28, 0x34, 0xda, 0x58, 0x1b},
+ {0x51, 0xe6, 0x40, 0x75, 0x7e, 0x87, 0x45, 0xde, 0x70, 0x57, 0x27, 0x26, 0x5a, 0x00, 0x98, 0xb1},
+ {0x5a, 0x79, 0x25, 0x01, 0x7b, 0x9f, 0xdd, 0x3e, 0xd7, 0x2a, 0x91, 0xa2, 0x22, 0x86, 0xf9, 0x84},
+ {0xbb, 0x44, 0xe2, 0x53, 0x78, 0xc7, 0x31, 0x23, 0xa5, 0xf3, 0x2f, 0x73, 0xcd, 0xb6, 0xe5, 0x17},
+ {0x72, 0xe9, 0xdd, 0x74, 0x16, 0xbc, 0xf4, 0x5b, 0x75, 0x5d, 0xba, 0xa8, 0x8e, 0x4a, 0x40, 0x43},
+};
+
+/* тестовые значения мастер-ключа */
+unsigned char kMasterKeyData[32] =
+{
+ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66,0x77,
+ 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef
+};
+
+/* значение открытого текста */
+unsigned char kPlainTextData[] =
+{
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x00, 0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88
+};
+
+
+/* значение шифротекста */
+unsigned char kChipherTextData[] =
+{
+ 0x7f, 0x67, 0x9d, 0x90, 0xbe, 0xbc, 0x24, 0x30, 0x5a, 0x46, 0x8d, 0x42, 0xb9, 0xd4, 0xed, 0xcd
+};
+
+/* тестовые значения обратного преобразования L */
+unsigned char kReverseLData[2][kBlockLen14] =
+{
+ {0x0d, 0x8e, 0x40, 0xe4, 0xa8, 0x00, 0xd0, 0x6b, 0x2f, 0x1b, 0x37, 0xea, 0x37, 0x9e, 0xad, 0x8e},
+ {0x8a, 0x6b, 0x93, 0x0a, 0x52, 0x21, 0x1b, 0x45, 0xc5, 0xba, 0xa4, 0x3f, 0xf8, 0xb9, 0x13, 0x19},
+};
+
+/* тестовые значения обратного преобразования LSX */
+unsigned char kReverseLSXData[10][kBlockLen14] =
+{
+ {0x8a, 0x6b, 0x93, 0x0a, 0x52, 0x21, 0x1b, 0x45, 0xc5, 0xba, 0xa4, 0x3f, 0xf8, 0xb9, 0x13, 0x19},
+ {0x76, 0xca, 0x14, 0x9e, 0xef, 0x27, 0xdl, 0xbl, 0x0d, 0x17, 0xe3, 0xd5, 0xd6, 0x8e, 0x5a, 0x72},
+ {0x5d, 0x9b, 0x06, 0xd4, 0x1b, 0x9d, 0x1d, 0x2d, 0x04, 0xdf, 0x77, 0x55, 0x36, 0x3e, 0x94, 0xa9},
+ {0x79, 0x48, 0x71, 0x92, 0xaa, 0x45, 0x70, 0x9c, 0x11, 0x55, 0x59, 0xd6, 0xe9, 0x28, 0x0f, 0x6e},
+ {0xae, 0x50, 0x69, 0x24, 0xc8, 0xce, 0x33, 0x1b, 0xb9, 0x18, 0xfc, 0x5b, 0xdf, 0xbl, 0x95, 0xfa},
+ {0xbb, 0xff, 0xbf, 0xc8, 0x93, 0x9e, 0xaa, 0xff, 0xaf, 0xb8, 0xe2, 0x27, 0x69, 0xe3, 0x23, 0xaa},
+ {0x3c, 0xc2, 0xf0, 0x7c, 0xc0, 0x7a, 0x8b, 0xec, 0x0f, 0x3e, 0xa0, 0xed, 0x2a, 0xe3, 0x3e, 0x4a},
+ {0xf3, 0x6f, 0x01, 0x29, 0x1d, 0x0b, 0x96, 0xd5, 0x91, 0xe2, 0x28, 0xb7, 0x2d, 0x01, 0x1c, 0x36},
+ {0x1c, 0x4b, 0x0c, 0x1e, 0x95, 0x01, 0x82, 0xbl, 0xce, 0x69, 0x6a, 0xf5, 0xc0, 0xbf, 0xc5, 0xdf},
+ {0x99, 0xbb, 0x99, 0xff, 0x99, 0xbb, 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
+};
+
+unsigned char kGost14SV[8] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef
+};
+
+unsigned char kGost14PlainText[64] =
+{
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x00, 0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88,
+ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xee, 0xff, 0x0a,
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xee, 0xff, 0x0a, 0x00,
+ 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xee, 0xff, 0x0a, 0x00, 0x11
+};
+
+unsigned char kGost14EcbEncText[64] =
+{
+ 0x7f, 0x67, 0x9d, 0x90, 0xbe, 0xbc, 0x24, 0x30, 0x5a, 0x46, 0x8d, 0x42, 0xb9, 0xd4, 0xed, 0xcd,
+ 0xb4, 0x29, 0x91, 0x2c, 0x6e, 0x00, 0x32, 0xf9, 0x28, 0x54, 0x52, 0xd7, 0x67, 0x18, 0xd0, 0x8b,
+ 0xf0, 0xca, 0x33, 0x54, 0x9d, 0x24, 0x7c, 0xee, 0xf3, 0xf5, 0xa5, 0x31, 0x3b, 0xd4, 0xb1, 0x57,
+ 0xd0, 0xb0, 0x9c, 0xcd, 0xe8, 0x30, 0xb9, 0xeb, 0x3a, 0x02, 0xc4, 0xc5, 0xaa, 0x8a, 0xda, 0x98
+};
+
+
+unsigned char kGost14CtrSV[16] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xce, 0xf0, 0xa1, 0xb2, 0xc3, 0xd4, 0xe5, 0xf0, 0x01, 0x12
+};
+
+unsigned char kGost14CtrC[64] =
+{
+ 0xf1, 0x95, 0xd8, 0xbe, 0xc1, 0x0e, 0xd1, 0xdb, 0xd5, 0x7b, 0x5f, 0xa2, 0x40, 0xbd, 0xa1, 0xb8,
+ 0x85, 0xee, 0xe7, 0x33, 0xf6, 0xa1, 0x3e, 0x5d, 0xf3, 0x3c, 0xe4, 0xb3, 0x3c, 0x45, 0xde, 0xe4,
+ 0xa5, 0xea, 0xe8, 0x8b, 0xe6, 0x35, 0x6e, 0xd3, 0xd5, 0xe8, 0x77, 0xf1, 0x35, 0x64, 0xa3, 0xa5,
+ 0xcb, 0x91, 0xfa, 0xb1, 0xf2, 0x0c, 0xba, 0xb6, 0xd1, 0xc6, 0xd1, 0x58, 0x20, 0xbd, 0xba, 0x73
+};
+
+unsigned char kGost14OfbSV[32] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xce, 0xf0, 0xa1, 0xb2, 0xc3, 0xd4, 0xe5, 0xf0, 0x01, 0x12,
+ 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x90, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19
+};
+
+unsigned char kGost14OfbC[64] =
+{
+ 0x81, 0x80, 0x0a, 0x59, 0xb1, 0x84, 0x2b, 0x24, 0xff, 0x1f, 0x79, 0x5e, 0x89, 0x7a, 0xbd, 0x95,
+ 0xed, 0x5b, 0x47, 0xa7, 0x04, 0x8c, 0xfa, 0xb4, 0x8f, 0xb5, 0x21, 0x36, 0x9d, 0x93, 0x26, 0xbf,
+ 0x66, 0xa2, 0x57, 0xac, 0x3c, 0xa0, 0xb8, 0xb1, 0xc8, 0x0f, 0xe7, 0xfc, 0x10, 0x28, 0x8a, 0x13,
+ 0x20, 0x3e, 0xbb, 0xc0, 0x66, 0x13, 0x86, 0x60, 0xa0, 0x29, 0x22, 0x43, 0xf6, 0x90, 0x31, 0x50
+};
+
+unsigned char kGost14CbcSV[32] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xce, 0xf0, 0xa1, 0xb2, 0xc3, 0xd4, 0xe5, 0xf0, 0x01, 0x12,
+ 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x90, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19
+};
+
+unsigned char kGost14CbcC[64] =
+{
+ 0x68, 0x99, 0x72, 0xd4, 0xa0, 0x85, 0xfa, 0x4d, 0x90, 0xe5, 0x2e, 0x3d, 0x6d, 0x7d, 0xcc, 0x27,
+ 0x28, 0x26, 0xe6, 0x61, 0xb4, 0x78, 0xec, 0xa6, 0xaf, 0x1e, 0x8e, 0x44, 0x8d, 0x5e, 0xa5, 0xac,
+ 0xfe, 0x7b, 0xab, 0xf1, 0xe9, 0x19, 0x99, 0xe8, 0x56, 0x40, 0xe8, 0xb0, 0xf4, 0x9d, 0x90, 0xd0,
+ 0x16, 0x76, 0x88, 0x06, 0x5a, 0x89, 0x5c, 0x63, 0x1a, 0x2d, 0x9a, 0x15, 0x60, 0xb6, 0x39, 0x70
+};
+
+unsigned char kGost14CfbSV[32] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xce, 0xf0, 0xa1, 0xb2, 0xc3, 0xd4, 0xe5, 0xf0, 0x01, 0x12,
+ 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89, 0x90, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19
+};
+
+unsigned char kGost14CfbC[64] =
+{
+ 0x81, 0x80, 0x0a, 0x59, 0xb1, 0x84, 0x2b, 0x24, 0xff, 0x1f, 0x79, 0x5e, 0x89, 0x7a, 0xbd, 0x95,
+ 0xed, 0x5b, 0x47, 0xa7, 0x04, 0x8c, 0xfa, 0xb4, 0x8f, 0xb5, 0x21, 0x36, 0x9d, 0x93, 0x26, 0xbf,
+ 0x79, 0xf2, 0xa8, 0xeb, 0x5c, 0xc6, 0x8d, 0x38, 0x84, 0x2d, 0x26, 0x4e, 0x97, 0xa2, 0x38, 0xb5,
+ 0x4f, 0xfe, 0xbe, 0xcd, 0x4e, 0x92, 0x2d, 0xe6, 0xc7, 0x5b, 0xd9, 0xdd, 0x44, 0xfb, 0xf4, 0xd1
+};
+
+unsigned char kGost14ImitS[8] =
+{
+ 0x33, 0x6f, 0x4d, 0x29, 0x60, 0x59, 0xfb, 0xe3
+};
+
+
+
+
+/* -------------------------------------------------------- */
+
+unsigned char kMasterKeyGost89[] =
+{
+ 0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88,
+ 0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11, 0x00,
+ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+
+/* тестовые значения из стандарты для алгоритма 89го года */
+unsigned char kGost89StandartPlainText[] =
+{
+ 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10
+};
+
+unsigned char kGost89StandartEncrText[] =
+{
+ 0x4e, 0xe9, 0x01, 0xe5, 0xc2, 0xd8, 0xca, 0x3d
+};
+
+/* тестовые значения для преобразования t, описанного в стандарте */
+unsigned int kTData[5] =
+{
+ 0xfdb97531, 0x2a196f34, 0xebd9f03a, 0xb039bb3d, 0x68695433
+};
+
+/* тестовые значения для преобразования g, описанного в стандарте */
+unsigned int kgData[4][3] =
+{
+ {0x87654321, 0xfedcba98, 0xfdcbc20c},
+ {0xfdcbc20c, 0x87654321, 0x7e791a4b},
+ {0x7e791a4b, 0xfdcbc20c, 0xc76549ec},
+ {0xc76549ec, 0x7e791a4b, 0x9791c849}
+};
+
+unsigned char kGost89PlaintText[32] =
+{
+ 0x92, 0xde, 0xf0, 0x6b, 0x3c, 0x13, 0x0a, 0x59,
+ 0xdb, 0x54, 0xc7, 0x04, 0xf8, 0x18, 0x9d, 0x20,
+ 0x4a, 0x98, 0xfb, 0x2e, 0x67, 0xa8, 0x02, 0x4c,
+ 0x89, 0x12, 0x40, 0x9b, 0x17, 0xb5, 0x7e, 0x41,
+};
+
+unsigned char kGost89EcbC[32] =
+{
+ 0x2b, 0x07, 0x3f, 0x04, 0x94, 0xf3, 0x72, 0xa0,
+ 0xde, 0x70, 0xe7, 0x15, 0xd3, 0x55, 0x6e, 0x48,
+ 0x11, 0xd8, 0xd9, 0xe9, 0xea, 0xcf, 0xbc, 0x1e,
+ 0x7c, 0x68, 0x26, 0x09, 0x96, 0xc6, 0x7e, 0xfb
+};
+
+unsigned char kGost89CtrSV[4] =
+{
+ 0x12, 0x34, 0x56, 0x78
+};
+
+unsigned char kGost89CtrC[32] =
+{
+ 0x4e, 0x98, 0x11, 0x0c, 0x97, 0xb7, 0xb9, 0x3c,
+ 0x3e, 0x25, 0x0d, 0x93, 0xd6, 0xe8, 0x5d, 0x69,
+ 0x13, 0x6d, 0x86, 0x88, 0x07, 0xb2, 0xdb, 0xef,
+ 0x56, 0x8e, 0xb6, 0x80, 0xab, 0x52, 0xa1, 0x2d
+};
+
+unsigned char kGost89OfbSV[16] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef,
+ 0x23, 0x45, 0x67, 0x89, 0x0a, 0xbc, 0xde, 0xf1
+};
+
+unsigned char kGost89OfbC[32] =
+{
+ 0xdb, 0x37, 0xe0, 0xe2, 0x66, 0x90, 0x3c, 0x83,
+ 0x0d, 0x46, 0x64, 0x4c, 0x1f, 0x9a, 0x08, 0x9c,
+ 0xa0, 0xf8, 0x30, 0x62, 0x43, 0x0e, 0x32, 0x7e,
+ 0xc8, 0x24, 0xef, 0xb8, 0xbd, 0x4f, 0xdb, 0x05
+};
+
+
+unsigned char kGost89CbcSV[24] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef,
+ 0x23, 0x45, 0x67, 0x89, 0x0a, 0xbc, 0xde, 0xf1,
+ 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef, 0x12,
+};
+
+unsigned char kGost89CbcC[32] =
+{
+ 0x96, 0xd1, 0xb0, 0x5e, 0xea, 0x68, 0x39, 0x19,
+ 0xaf, 0xf7, 0x61, 0x29, 0xab, 0xb9, 0x37, 0xb9,
+ 0x50, 0x58, 0xb4, 0xa1, 0xc4, 0xbc, 0x00, 0x19,
+ 0x20, 0xb7, 0x8b, 0x1a, 0x7c, 0xd7, 0xe6, 0x67,
+};
+
+unsigned char kGost89CfbSV[16] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef,
+ 0x23, 0x45, 0x67, 0x89, 0x0a, 0xbc, 0xde, 0xf1
+};
+
+unsigned char kGost89CfbC[32] =
+{
+ 0xdb, 0x37, 0xe0, 0xe2, 0x66, 0x90, 0x3c, 0x83,
+ 0x0d, 0x46, 0x64, 0x4c, 0x1f, 0x9a, 0x08, 0x9c,
+ 0x24, 0xbd, 0xd2, 0x03, 0x53, 0x15, 0xd3, 0x8b,
+ 0xbc, 0xc0, 0x32, 0x14, 0x21, 0x07, 0x55, 0x05
+};
+
+unsigned char kGost89ImitS[8] =
+{
+ 0x15, 0x4e, 0x72, 0x10, 0x20, 0x30, 0xc5, 0xbb
+};
+
+/* ----------------------------------------------------- */
+
+unsigned char kPaddingText[16] =
+{
+ 2, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+unsigned char kPaddingText2[32] =
+{
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+unsigned char paddingBufferText[16] =
+{
+ 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+unsigned char paddingBufferText2[32] =
+{
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
diff --git a/test/crypto/testgost.c b/src/GOST/testgost.c
similarity index 100%
rename from test/crypto/testgost.c
rename to src/GOST/testgost.c
diff --git a/src/blowfish/blowfish.pri b/src/blowfish/blowfish.pri
new file mode 100644
index 0000000000000000000000000000000000000000..fc7a886f3c5dc71b90c320d6d1c6c415e55d8771
--- /dev/null
+++ b/src/blowfish/blowfish.pri
@@ -0,0 +1,11 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += $$PWD/blowfish.h \
+ $$PWD/bf_local.h \
+ $$PWD/bf_pi.h
+
+SOURCES += $$PWD/bf_cfb64.c \
+ $$PWD/bf_ecb.c \
+ $$PWD/bf_enc.c \
+ $$PWD/bf_ofb64.c \
+ $$PWD/bf_skey.c
diff --git a/src/ringct20/ringct20.pri b/src/ringct20/ringct20.pri
new file mode 100644
index 0000000000000000000000000000000000000000..a3ecaff835b7f5afaa571d11edbea7ceab66d262
--- /dev/null
+++ b/src/ringct20/ringct20.pri
@@ -0,0 +1,17 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += $$PWD/ntt.h \
+ $$PWD/params.h \
+ $$PWD/poly.h \
+ $$PWD/reduce.h \
+ $$PWD/ring.h \
+ $$PWD/ringct20_params.h \
+ $$PWD/verify.inc
+
+SOURCES += $$PWD/ntt.c \
+ $$PWD/poly.c \
+ $$PWD/precomp.c \
+ $$PWD/reduce.c \
+ $$PWD/ring.c \
+ $$PWD/ringct20_params.c \
+ $$PWD/verify.c