From 6f4924eeb82a0ec006c3cca3fc92872404dedead Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Mon, 4 May 2020 09:47:32 +0300
Subject: [PATCH] New signatures added properly for Qt-based projects
compliance
---
dap-sdk/crypto/libdap-crypto.pri | 3 +-
dap-sdk/crypto/src/GOST/GOST.pri | 4 +-
dap-sdk/crypto/src/GOST/block_chipher.c | 2 +-
dap-sdk/crypto/src/GOST/block_chipher.h | 490 +++---
dap-sdk/crypto/src/blowfish/bf_cfb64.c | 65 -
dap-sdk/crypto/src/blowfish/bf_ecb.c | 33 -
dap-sdk/crypto/src/blowfish/bf_enc.c | 209 ---
dap-sdk/crypto/src/blowfish/bf_ofb64.c | 52 -
dap-sdk/crypto/src/blowfish/bf_skey.c | 58 -
.../src/blowfish/{bf_pi.h => blowfish.c} | 1432 +++++++++++------
dap-sdk/crypto/src/blowfish/blowfish.h | 11 +-
dap-sdk/crypto/src/blowfish/blowfish.pri | 9 +-
dap-sdk/crypto/src/dap_enc_salsa2012.c | 2 +
dap-sdk/crypto/src/salsa2012/salsa2012.pri | 4 +-
dap-sdk/crypto/src/sig_tesla/poly.c | 215 ---
dap-sdk/crypto/src/sig_tesla/sig_tesla.pri | 5 +-
dap-sdk/crypto/src/sig_tesla/tesla_params.c | 209 ++-
dap-sdk/crypto/src/sig_tesla/tesla_params.h | 15 +-
18 files changed, 1393 insertions(+), 1425 deletions(-)
delete mode 100644 dap-sdk/crypto/src/blowfish/bf_cfb64.c
delete mode 100644 dap-sdk/crypto/src/blowfish/bf_ecb.c
delete mode 100644 dap-sdk/crypto/src/blowfish/bf_enc.c
delete mode 100644 dap-sdk/crypto/src/blowfish/bf_ofb64.c
delete mode 100644 dap-sdk/crypto/src/blowfish/bf_skey.c
rename dap-sdk/crypto/src/blowfish/{bf_pi.h => blowfish.c} (73%)
delete mode 100755 dap-sdk/crypto/src/sig_tesla/poly.c
diff --git a/dap-sdk/crypto/libdap-crypto.pri b/dap-sdk/crypto/libdap-crypto.pri
index d79c308908..cb4941940f 100755
--- a/dap-sdk/crypto/libdap-crypto.pri
+++ b/dap-sdk/crypto/libdap-crypto.pri
@@ -1,7 +1,6 @@
include (src/defeo_scheme/defeo.pri)
include (src/iaes/iaes.pri)
include (src/oaes/oaes.pri)
-include (src/blowfish/blowfish.pri)
include (src/GOST/GOST.pri)
include (src/salsa2012/salsa2012.pri)
include (src/blowfish/blowfish.pri)
@@ -31,6 +30,7 @@ HEADERS += $$PWD/include/dap_enc.h \
$$PWD/include/dap_enc_base58.h \
$$PWD/include/dap_enc_dilithium.h \
$$PWD/include/dap_enc_ringct20.h \
+ $$PWD/include/dap_enc_salsa2012.h \
$$PWD/include/dap_crypto_common.h \
$$PWD/include/dap_cert.h \
$$PWD/include/dap_cert_file.h \
@@ -58,6 +58,7 @@ SOURCES += $$PWD/src/dap_enc.c \
$$PWD/src/dap_enc_base58.c \
$$PWD/src/dap_enc_dilithium.c \
$$PWD/src/dap_enc_ringct20.c \
+ $$PWD/src/dap_enc_salsa2012.c \
$$PWD/src/dap_enc_ca.c \
$$PWD/src/dap_cert.c \
$$PWD/src/dap_cert_file.c \
diff --git a/dap-sdk/crypto/src/GOST/GOST.pri b/dap-sdk/crypto/src/GOST/GOST.pri
index 176c5281c5..0136dc3c21 100644
--- a/dap-sdk/crypto/src/GOST/GOST.pri
+++ b/dap-sdk/crypto/src/GOST/GOST.pri
@@ -7,10 +7,10 @@ HEADERS += $$PWD/28147_14.h \
$$PWD/print_data.h \
$$PWD/table.h \
$$PWD/test_data.inc \
- $$PWD/block_cipher.h
+ $$PWD/block_chipher.h
SOURCES += $$PWD/28147_14.c \
$$PWD/28147_89.c \
- $$PWD/block_cipher.c \
+ $$PWD/block_chipher.c \
$$PWD/print_data.c \
$$PWD/testgost.c
diff --git a/dap-sdk/crypto/src/GOST/block_chipher.c b/dap-sdk/crypto/src/GOST/block_chipher.c
index a38dec4ed7..0bd604f81b 100644
--- a/dap-sdk/crypto/src/GOST/block_chipher.c
+++ b/dap-sdk/crypto/src/GOST/block_chipher.c
@@ -535,7 +535,7 @@ static int init_ofb_14_impl(unsigned char *key, void *ctx, size_t s, unsigned ch
return 0;
}
-int DLL_IMPORT init_ofb_14(unsigned char *key, void *ctx, size_t s, const unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint)
+int DLL_IMPORT init_ofb_14(unsigned char *key, void *ctx, size_t s, unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint)
{
if(SelfTestGost14Ofb())
return -1;
diff --git a/dap-sdk/crypto/src/GOST/block_chipher.h b/dap-sdk/crypto/src/GOST/block_chipher.h
index e3a31a5840..6dd6f12348 100644
--- a/dap-sdk/crypto/src/GOST/block_chipher.h
+++ b/dap-sdk/crypto/src/GOST/block_chipher.h
@@ -1,5 +1,5 @@
-/** @file
- * @brief ?????????? ??????? ??????????? ?????? ?????? ??????? ??????????
+/** @file
+ * @brief Объявление функций реализующих режимы работы блочных алгоритмов
*
* @copyright InfoTeCS. All rights reserved.
*/
@@ -10,412 +10,412 @@
#include "dll_import.h"
#include "callback_print.h"
-/** @brief ?????? ????????? ??? ?????? ?????????? ECB ????????? "????????" */
+/** @brief Размер контекста для режима шифрования ECB алгоритма "кузнечик" */
#define kEcb14ContextLen 0x38
-/** @brief ?????? ????????? ??? ?????? ?????????? ECB ????????? 28147-89 */
+/** @brief Размер контекста для режима шифрования ECB алгоритма 28147-89 */
#define kEcb89ContextLen 0x38
-/** @brief ?????? ????????? ??? ?????? ?????????? CBC ????????? "????????" */
+/** @brief Размер контекста для режима шифрования CBC алгоритма "кузнечик" */
#define kCbc14ContextLen 0x60
-/** @brief ?????? ????????? ??? ?????? ?????????? CBC ????????? 28147-89 */
+/** @brief Размер контекста для режима шифрования CBC алгоритма 28147-89 */
#define kCbc89ContextLen 0x60
-/** @brief ?????? ????????? ??? ?????? ?????????? CTR ????????? "????????" */
+/** @brief Размер контекста для режима шифрования CTR алгоритма "кузнечик" */
#define kCtr14ContextLen 0x48
-/** @brief ?????? ????????? ??? ?????? ?????????? CTR ????????? 28147-89 */
+/** @brief Размер контекста для режима шифрования CTR алгоритма 28147-89 */
#define kCtr89ContextLen 0x48
-/** @brief ?????? ????????? ??? ?????? ?????????? OFB ????????? "????????" */
+/** @brief Размер контекста для режима шифрования OFB алгоритма "кузнечик" */
#define kOfb14ContextLen 0x60
-/** @brief ?????? ????????? ??? ?????? ?????????? OFB ????????? 28147-89 */
+/** @brief Размер контекста для режима шифрования OFB алгоритма 28147-89 */
#define kOfb89ContextLen 0x60
-/** @brief ?????? ????????? ??? ?????? ?????????? CFB ????????? "????????" */
+/** @brief Размер контекста для режима шифрования CFB алгоритма "кузнечик" */
#define kCfb14ContextLen 0x60
-/** @brief ?????? ????????? ??? ?????? ?????????? CFB ????????? 28147-89 */
+/** @brief Размер контекста для режима шифрования CFB алгоритма 28147-89 */
#define kCfb89ContextLen 0x60
-/** @brief ?????? ????????? ??? ?????? ???????????? ???????????? ????????? "????????" */
+/** @brief Размер контекста для режима формирования имитовставки алгоритма "кузнечик" */
#define kImit14ContextLen 0x88
-/** @brief ?????? ????????? ??? ?????? ???????????? ???????????? ????????? 28147-89 */
+/** @brief Размер контекста для режима формирования имитовставки алгоритма 28147-89 */
#define kImit89ContextLen 0x88
-/** @brief ?????? ????? ????????? "????????" */
+/** @brief Размер блока алгоритма "кузнечик" */
#define kBlockLen14 16
-/** @brief ?????? ????? ????????? 28147-89 */
+/** @brief Размер блока алгоритма 28147-89 */
#define kBlockLen89 8
-/** @brief ?????? ????? ????????? "????????" */
+/** @brief Размер ключа алгоритма "кузнечик" */
#define kKeyLen14 32
-/** @brief ?????? ????? ????????? 28147-89 */
+/** @brief Размер ключа алгоритма 28147-89 */
#define kKeyLen89 32
#ifdef __cplusplus
extern "C" {
#endif
-/* *** ?????? ?????????? ***
- * ?????? ?????????? ???????? ? ?????????????? ????????
- * ?????????????????? ??????????????
+/* *** Режимы шифрования ***
+ * Режимы шифрования работают с использованием базового
+ * криптографического преобразования
*/
-/** @brief ????????????? ????????? ?????????? ? ?????? ECB ??? ????????? "????????"
+/** @brief Инициализация контекста шифрования в режиме ECB для алгоритма "кузнечик"
*
- * @param[in] key ????
- * @param[out] ctx ???????? cbc
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст cbc
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_ecb_14(unsigned char *key, void* ctx, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ????????????? ????????? ?????????? ? ?????? ECB ??? ????????? 28147-89
+/** @brief Инициализация контекста шифрования в режиме ECB для алгоритма 28147-89
*
- * @param[in] key ????
- * @param[out] ctx ???????? cbc
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст cbc
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_ecb_89(unsigned char *key, void* ctx, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ???????? ????????? ecb
+/** @brief Удаление контекста ecb
*
- * @param[in] ctx ???????? ecb
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст ecb
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_ecb(void* ctx);
-/** @brief ????????????? ????????? ?????????? ? ?????? CBC ??? ????????? "????????"
+/** @brief Инициализация контекста шифрования в режиме CBC для алгоритма "кузнечик"
*
- * @param[in] key ????
- * @param[out] ctx ???????? cbc
- * @param[in] iv ?????????????
- * @param[in] ivLength ????? ?????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст cbc
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длина синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_cbc_14(unsigned char *key, void* ctx, unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ????????????? ????????? ?????????? ? ?????? CBC ??? ????????? 28147-89
+/** @brief Инициализация контекста шифрования в режиме CBC для алгоритма 28147-89
*
- * @param[in] key ????
- * @param[out] ctx ???????? cbc
- * @param[in] iv ?????????????
- * @param[in] ivLength ????? ?????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст cbc
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длина синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_cbc_89(unsigned char *key, void* ctx, unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ???????? ????????? cbc
+/** @brief Удаление контекста cbc
*
- * @param[in] ctx ???????? cbc
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст cbc
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_cbc(void* ctx);
-/** @brief ????????????? ????????? ?????????? ? ?????? CTR ??? ????????? "????????"
+/** @brief Инициализация контекста шифрования в режиме CTR для алгоритма "кузнечик"
*
- * @param[in] key ????
- * @param[out] ctx ???????? ctr
- * @param[in] iv ?????????????
- * @param[in] length ????? ?????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст ctr
+ * @param[in] iv синхропосылка
+ * @param[in] length длина синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_ctr_14(unsigned char* key, unsigned char *iv, size_t length, void *ctx, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ????????????? ????????? ?????????? ? ?????? CTR ??? ????????? 28147-89
+/** @brief Инициализация контекста шифрования в режиме CTR для алгоритма 28147-89
*
- * @param[in] key ????
- * @param[out] ctx ???????? ctr
- * @param[in] iv ?????????????
- * @param[in] length ????? ?????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст ctr
+ * @param[in] iv синхропосылка
+ * @param[in] length длина синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_ctr_89(unsigned char* key, unsigned char *iv, size_t length, void *ctx, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ???????? ????????? ctr
+/** @brief Удаление контекста ctr
*
- * @param[in] ctx ???????? ctr
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст ctr
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_ctr(void* ctx);
-/** @brief ????????????? ????????? ?????????? ? ?????? OFB ??? ????????? "????????"
+/** @brief Инициализация контекста шифрования в режиме OFB для алгоритма "кузнечик"
*
- * @param[in] key ????
- * @param[out] ctx ???????? ofb
- * @param[in] s ???????? S
- * @param[in] iv ?????????????
- * @param[in] ivLength ????? ?????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст ofb
+ * @param[in] s параметр S
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длина синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
-int DLL_IMPORT init_ofb_14(unsigned char *key, void *ctx, size_t s, const unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint);
+int DLL_IMPORT init_ofb_14(unsigned char *key, void *ctx, size_t s, unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ????????????? ????????? ?????????? ? ?????? OFB ??? ????????? 28147-89
+/** @brief Инициализация контекста шифрования в режиме OFB для алгоритма 28147-89
*
- * @param[in] key ????
- * @param[out] ctx ???????? ofb
- * @param[in] s ???????? S
- * @param[in] iv ?????????????
- * @param[in] ivLength ????? ?????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст ofb
+ * @param[in] s параметр S
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длина синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_ofb_89(unsigned char *key, void *ctx, size_t s, unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ???????? ????????? ofb
+/** @brief Удаление контекста ofb
*
- * @param[in] ctx ???????? ofb
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст ofb
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_ofb(void* ctx);
-/** @brief ????????????? ????????? ?????????? ? ?????? CFB ??? ????????? "????????"
+/** @brief Инициализация контекста шифрования в режиме CFB для алгоритма "кузнечик"
*
- * @param[in] key ????
- * @param[out] ctx ???????? cfb
- * @param[in] s ???????? S
- * @param[in] iv ?????????????
- * @param[in] ivLength ????? ?????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст cfb
+ * @param[in] s параметр S
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длина синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_cfb_14(unsigned char *key, void *ctx, size_t s, unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ????????????? ????????? ?????????? ? ?????? CFB ??? ????????? 28147-89
+/** @brief Инициализация контекста шифрования в режиме CFB для алгоритма 28147-89
*
- * @param[in] key ????
- * @param[out] ctx ???????? cfb
- * @param[in] s ???????? S
- * @param[in] iv ?????????????
- * @param[in] ivLength ????? ?????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[out] ctx контекст cfb
+ * @param[in] s параметр S
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длина синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_cfb_89(unsigned char *key, void *ctx, size_t s, unsigned char *iv, size_t ivLength, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ???????? ????????? cfb
+/** @brief Удаление контекста cfb
*
- * @param[in] ctx ???????? cfb
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст cfb
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_cfb(void* ctx);
-/** @brief ????????????? ????????? ??????????? ??? ????????? "????????"
+/** @brief Инициализация контекста имтовставки для алгоритма "кузнечик"
*
- * @param[out] ctx ???????? ????????????
- * @param[in] key ????
- * @param[in] s ???????? S
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[out] ctx контекст имитовставки
+ * @param[in] key ключ
+ * @param[in] s параметр S
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_imit_14(unsigned char *key, size_t s, void *ctx, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ????????????? ????????? ??????????? ??? ????????? 28147-89
+/** @brief Инициализация контекста имтовставки для алгоритма 28147-89
*
- * @param[in] key ????
- * @param[in] s ???????? S
- * @param[out] ctx ???????? ????????????
- * @param[in] print ??????? ???????????
- * @param[in] print_uint ??????? ???????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] key ключ
+ * @param[in] s параметр S
+ * @param[out] ctx контекст имитовставки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_imit_89(unsigned char *key, size_t s, void *ctx, printout_byte_array print, printout_uint_array print_uint);
-/** @brief ???????? ????????? ????????????
+/** @brief Удаление контекста имитовставки
*
- * @param[in] ctx ???????? ????????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст имитовставки
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_imit(void* ctx);
-/** @brief ?????????? ???????????? ?????????? ? ?????? ??????? ?????? ??? ?????? ??????? ??????? ?????
+/** @brief Выполнение зашифрования информации в режиме простой замены для данных кратных размеру блока
*
- * @param[in] ctx ???????? ECB
- * @param[in] indata ???????? ?????
- * @param[out] outdata ????????????? ?????
- * @param[in] length ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст ECB
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] length длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT encrypt_ecb(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief ?????????? ????????????? ?????????? ? ?????? ??????? ?????? ??? ?????? ??????? ??????? ?????
+/** @brief Выполнение расшифрования информации в режиме простой замены для данных кратных размеру блока
*
- * @param[in] ctx ???????? ECB
- * @param[in] indata ???????? ?????
- * @param[out] outdata ????????????? ?????
- * @param[in] length ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст ECB
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] length длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT decrypt_ecb(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief ?????????? ???????????? ?????????? ? ?????? ??????? ?????? ? ??????????? ??? ?????? ??????? ??????? ?????
+/** @brief Выполнение зашифрования информации в режиме простой замены с зацеплением для данных кратных размеру блока
*
- * @param[in] ctx ???????? CBC
- * @param[in] indata ???????? ?????
- * @param[out] outdata ????????????? ?????
- * @param[in] length ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст CBC
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] length длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT encrypt_cbc(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief ?????????? ???????????? ?????????? ? ?????? ??????? ?????? ? ??????????? ??? ?????? ??????? ??????? ?????
+/** @brief Выполнение рсшифрования информации в режиме простой замены с зацеплением для данных кратных размеру блока
*
- * @param[in] ctx ???????? CBC
- * @param[in] indata ????????????? ?????
- * @param[out] outdata ?????????????? ?????
- * @param[in] length ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст CBC
+ * @param[in] indata зашифрованный текст
+ * @param[out] outdata расшифрованный текст
+ * @param[in] length длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT decrypt_cbc(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief ?????????? ?????????? (???????????? ??? ?????????????) ? ?????? ????????????
- * @details ???????? ?????? ????? ???? ?????? ????????? ????, ??? ??????? ?????????? ????? ???????? ????????? ????? ???????????? ??????
+/** @brief Выполнение шифрования (зашифрования или расшифрования) в режиме гаммирования
+ * @details неполным блоком может быть только последний блок, при попытке шифрования после передачи неполного блока возвращается ошибка
*
- * @param[in] ctx ???????? CTR
- * @param[in] indata ??????? ?????????
- * @param[out] outdata ?????????
- * @param[in] length ????? ?????????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст CTR
+ * @param[in] indata входное сообщение
+ * @param[out] outdata результат
+ * @param[in] length длина сообщения
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT crypt_ctr(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief ?????????? ??????? ?????????? ?????????? ? ?????? ???????????? ? ???????? ??????
- * @details ???????? ?????? ????? ???? ?????? ????????? ????, ??? ??????? ?????????? ????? ???????? ????????? ????? ???????????? ??????
+/** @brief Выполнение шаговой шифрования информации в режиме гаммирования с обратной связью
+ * @details неполным блоком может быть только последний блок, при попытке шифрования после передачи неполного блока возвращается ошибка
*
- * @param[in] ctx ???????? OFB
- * @param[in] indata ??????? ????
- * @param[out] outdata ????????? ??????????????
- * @param[in] inlength ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст OFB
+ * @param[in] indata входной блок
+ * @param[out] outdata результат преобразования
+ * @param[in] inlength длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT crypt_ofb(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief ?????????? ???????????? ?????????? ? ?????? ???????????? ? ???????? ??????
+/** @brief Выполнение зашифрования информации в режиме гаммирования с обратной связью
*
- * @param[in] ctx ???????? OFB
- * @param[in] indata ???????? ?????
- * @param[out] outdata ????????????? ?????
- * @param[in] inlength ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст OFB
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] inlength длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT encrypt_ofb(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief ?????????? ????????????? ?????????? ? ?????? ???????????? ? ???????? ??????
+/** @brief Выполнение расшифрования информации в режиме гаммирования с обратной связью
*
- * @param[in] ctx ???????? OFB
- * @param[in] indata ????????????? ?????
- * @param[out] outdata ?????????????? ?????
- * @param[in] inlength ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст OFB
+ * @param[in] indata зашифрованный текст
+ * @param[out] outdata расшифрованный текст
+ * @param[in] inlength длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT decrypt_ofb(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief ?????????? ???????????? ?????????? ? ?????? ???????????? ? ???????? ?????? ?? ??????????
- * @details ???????? ?????? ????? ???? ?????? ????????? ????, ??? ??????? ?????????? ????? ???????? ????????? ????? ???????????? ??????
+/** @brief Выполнение зашифрования информации в режиме гаммирования с обратной связью по шифртексту
+ * @details неполным блоком может быть только последний блок, при попытке шифрования после передачи неполного блока возвращается ошибка
*
- * @param[in] ctx ???????? CFB
- * @param[in] indata ???????? ?????
- * @param[out] outdata ????????????? ?????
- * @param[in] inlength ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст CFB
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] inlength длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT encrypt_cfb(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief ?????????? ????????????? ?????????? ? ?????? ???????????? ? ???????? ?????? ?? ??????????
- * @details ???????? ?????? ????? ???? ?????? ????????? ????, ??? ??????? ?????????? ????? ???????? ????????? ????? ???????????? ??????
+/** @brief Выполнение расшифрования информации в режиме гаммирования с обратной связью по шифртексту
+ * @details неполным блоком может быть только последний блок, при попытке шифрования после передачи неполного блока возвращается ошибка
*
- * @param[in] ctx ???????? CFB
- * @param[in] indata ????????????? ?????
- * @param[out] outdata ?????????????? ?????
- * @param[in] inlength ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст CFB
+ * @param[in] indata зашифрованный текст
+ * @param[out] outdata расшифрованный текст
+ * @param[in] inlength длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT decrypt_cfb(void *ctx, const unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief ?????????? ?????????? ???????????? ?? ?????? ??????? ??????? ?????
+/** @brief Выполнение вычисления имитовставки по данным кратным размеру блока
*
- * @param[in] ctx ???????? ????????????
- * @param[in] indata ???????? ?????
- * @param[in] length ????? ??????
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @param[in] ctx контекст имитовставки
+ * @param[in] indata открытый текст
+ * @param[in] length длина текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT imit(void *ctx, unsigned char *indata, size_t length);
-/** @brief ?????????? ????????? ????????????
+/** @brief Завершение выроботки имитовставки
*
- * @param[in] ctx ???????? ????????????
+ * @param[in] ctx контекст имитовставки
* @param[out] value
- * @return 0 ???? ??? ?????????????? ?????? ???????
- * @return -1 ???? ????????? ??????
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT done_imit(void *ctx, unsigned char *value);
-/** @brief ?????????? ?????? ?? ??????? ?????.
+/** @brief Дополнение данных до размера блока.
*
- * @param[in] data ?????????. ?????? ??? ?????? data ?????? ???? ???????? ??????????? ??? ??????????.
- * @param[in] length ?????? ?????????
- * @param[in] blockLen ????? ?????
- * @return ?????? ?????????
+ * @param[in] data сообщение. Память под данные data должна быть выделена достаточная для дополнения.
+ * @param[in] length размер сообщения
+ * @param[in] blockLen длина блока
+ * @return размер сообщения
*/
size_t DLL_IMPORT padd(unsigned char *data, size_t length, size_t blockLen);
-/** @brief ???????? ??????????? ??????. ??? ??????? ???????????? ???????? -1
+/** @brief Удаление дополненных данных. При ошибках возвращается значение -1
*
- * @param[in] data ?????????
- * @param[in] length ?????? ?????????
- * @return ?????? ?????????
+ * @param[in] data сообщение
+ * @param[in] length размер сообщения
+ * @return размер сообщения
*/
size_t DLL_IMPORT unpadd(unsigned char *data, size_t length);
diff --git a/dap-sdk/crypto/src/blowfish/bf_cfb64.c b/dap-sdk/crypto/src/blowfish/bf_cfb64.c
deleted file mode 100644
index 4c6ae8cf63..0000000000
--- a/dap-sdk/crypto/src/blowfish/bf_cfb64.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "bf_local.h"
-#include"blowfish.h"
-
-/*
- * The input and output encrypted as though 64bit cfb mode is being used.
- * The extra state information to record how much of the 64bit block we have
- * used is contained in *num;
- */
-
-void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, const BF_KEY *schedule,
- unsigned char *ivec, int *num, int encrypt)
-{
- register BF_LONG v0, v1, t;
- register int n = *num;
- register long l = length;
- BF_LONG ti[2];
- unsigned char *iv, c, cc;
-
- iv = (unsigned char *)ivec;
- if (encrypt) {
- while (l--) {
- if (n == 0) {
- n2l(iv, v0);
- ti[0] = v0;
- n2l(iv, v1);
- ti[1] = v1;
- BF_encrypt((BF_LONG *)ti, schedule);
- iv = (unsigned char *)ivec;
- t = ti[0];
- l2n(t, iv);
- t = ti[1];
- l2n(t, iv);
- iv = (unsigned char *)ivec;
- }
- c = *(in++) ^ iv[n];
- *(out++) = c;
- iv[n] = c;
- n = (n + 1) & 0x07;
- }
- } else {
- while (l--) {
- if (n == 0) {
- n2l(iv, v0);
- ti[0] = v0;
- n2l(iv, v1);
- ti[1] = v1;
- BF_encrypt((BF_LONG *)ti, schedule);
- iv = (unsigned char *)ivec;
- t = ti[0];
- l2n(t, iv);
- t = ti[1];
- l2n(t, iv);
- iv = (unsigned char *)ivec;
- }
- cc = *(in++);
- c = iv[n];
- iv[n] = cc;
- *(out++) = c ^ cc;
- n = (n + 1) & 0x07;
- }
- }
- v0 = v1 = ti[0] = ti[1] = t = c = cc = 0;
- *num = n;
-}
diff --git a/dap-sdk/crypto/src/blowfish/bf_ecb.c b/dap-sdk/crypto/src/blowfish/bf_ecb.c
deleted file mode 100644
index ccd2e04332..0000000000
--- a/dap-sdk/crypto/src/blowfish/bf_ecb.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "blowfish.h"
-#include "bf_local.h"
-
-/*
- * Blowfish as implemented from 'Blowfish: Springer-Verlag paper' (From
- * LECTURE NOTES IN COMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION, CAMBRIDGE
- * SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
- */
-
-const char *BF_options(void)
-{
- return "blowfish(ptr)";
-}
-
-void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
- const BF_KEY *key, int encrypt)
-{
- BF_LONG l, d[2];
-
- n2l(in, l);
- d[0] = l;
- n2l(in, l);
- d[1] = l;
- if (encrypt)
- BF_encrypt(d, key);
- else
- BF_decrypt(d, key);
- l = d[0];
- l2n(l, out);
- l = d[1];
- l2n(l, out);
- l = d[0] = d[1] = 0;
-}
diff --git a/dap-sdk/crypto/src/blowfish/bf_enc.c b/dap-sdk/crypto/src/blowfish/bf_enc.c
deleted file mode 100644
index 05576bf868..0000000000
--- a/dap-sdk/crypto/src/blowfish/bf_enc.c
+++ /dev/null
@@ -1,209 +0,0 @@
-#include "blowfish.h"
-#include "bf_local.h"
-
-/*
- * Blowfish as implemented from 'Blowfish: Springer-Verlag paper' (From
- * LECTURE NOTES IN COMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION, CAMBRIDGE
- * SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
- */
-
-#if (BF_ROUNDS != 16) && (BF_ROUNDS != 20)
-# error If you set BF_ROUNDS to some value other than 16 or 20, you will have \
-to modify the code.
-#endif
-//#include<stdio.h>
-
-void BF_encrypt(BF_LONG *data, const BF_KEY *key)
-{
- register BF_LONG l, r;
- register const BF_LONG *p, *s;
-
- p = key->P;
- s = &(key->S[0]);
- l = data[0];
- r = data[1];
-
- l ^= p[0];
- BF_ENC(r, l, s, p[1]);
- BF_ENC(l, r, s, p[2]);
- BF_ENC(r, l, s, p[3]);
- BF_ENC(l, r, s, p[4]);
- BF_ENC(r, l, s, p[5]);
- BF_ENC(l, r, s, p[6]);
- BF_ENC(r, l, s, p[7]);
- BF_ENC(l, r, s, p[8]);
- BF_ENC(r, l, s, p[9]);
- BF_ENC(l, r, s, p[10]);
- BF_ENC(r, l, s, p[11]);
- BF_ENC(l, r, s, p[12]);
- BF_ENC(r, l, s, p[13]);
- BF_ENC(l, r, s, p[14]);
- BF_ENC(r, l, s, p[15]);
- BF_ENC(l, r, s, p[16]);
-# if BF_ROUNDS == 20
- BF_ENC(r, l, s, p[17]);
- BF_ENC(l, r, s, p[18]);
- BF_ENC(r, l, s, p[19]);
- BF_ENC(l, r, s, p[20]);
-# endif
- r ^= p[BF_ROUNDS + 1];
-
- data[1] = l & 0xffffffffU;
- data[0] = r & 0xffffffffU;
-}
-
-void BF_decrypt(BF_LONG *data, const BF_KEY *key)
-{
- register BF_LONG l, r;
- register const BF_LONG *p, *s;
-
- p = key->P;
- s = &(key->S[0]);
- l = data[0];
- r = data[1];
-
- l ^= p[BF_ROUNDS + 1];
-# if BF_ROUNDS == 20
- BF_ENC(r, l, s, p[20]);
- BF_ENC(l, r, s, p[19]);
- BF_ENC(r, l, s, p[18]);
- BF_ENC(l, r, s, p[17]);
-# endif
- BF_ENC(r, l, s, p[16]);
- BF_ENC(l, r, s, p[15]);
- BF_ENC(r, l, s, p[14]);
- BF_ENC(l, r, s, p[13]);
- BF_ENC(r, l, s, p[12]);
- BF_ENC(l, r, s, p[11]);
- BF_ENC(r, l, s, p[10]);
- BF_ENC(l, r, s, p[9]);
- BF_ENC(r, l, s, p[8]);
- BF_ENC(l, r, s, p[7]);
- BF_ENC(r, l, s, p[6]);
- BF_ENC(l, r, s, p[5]);
- BF_ENC(r, l, s, p[4]);
- BF_ENC(l, r, s, p[3]);
- BF_ENC(r, l, s, p[2]);
- BF_ENC(l, r, s, p[1]);
- r ^= p[0];
-
- data[1] = l & 0xffffffffU;
- data[0] = r & 0xffffffffU;
-}
-
-void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
- const BF_KEY *schedule, unsigned char *ivec, int encrypt)
-{
- register BF_LONG tin0, tin1;
- register BF_LONG tout0, tout1, xor0, xor1;
- register long l = length;
- BF_LONG tin[2];
-
- if (encrypt) {
- n2l(ivec, tout0);
- n2l(ivec, tout1);
- ivec -= 8;
- for (l -= 8; l >= 0; l -= 8) {
- n2l(in, tin0);
- n2l(in, tin1);
- tin0 ^= tout0;
- tin1 ^= tout1;
- tin[0] = tin0;
- tin[1] = tin1;
- BF_encrypt(tin, schedule);
- tout0 = tin[0];
- tout1 = tin[1];
- l2n(tout0, out);
- l2n(tout1, out);
- }
- if (1||l != -8) {
- unsigned char tmpin[16];
- unsigned char *ptmpin = tmpin;
- memcpy(tmpin, in, l + 8);
- memcpy(tmpin + l + 8, &length, 4);
- int pad_length = (8-(l + 8 + 4 + 1)%8)%8;
- for(int i = 0; i < pad_length; ++i)
- {
- tmpin[l+8+4+i]=16;//prng better
- }
- tmpin[l+8+4+pad_length]=pad_length;
-// for(int i = 0; i < l + 8 + 4 +1 +pad_length; ++i)
-// {
-// printf("%.2x ", tmpin[i]);
-// }
-// printf("\n");fflush(stdout);
- n2l(ptmpin, tin0);
- n2l(ptmpin, tin1);
- tin0 ^= tout0;
- tin1 ^= tout1;
- tin[0] = tin0;
- tin[1] = tin1;
- BF_encrypt(tin, schedule);
- tout0 = tin[0];
- tout1 = tin[1];
- l2n(tout0, out);
- l2n(tout1, out);
- if(l+8+4+pad_length + 1 == 16)
- {
- n2l(ptmpin, tin0);
- n2l(ptmpin, tin1);
- tin0 ^= tout0;
- tin1 ^= tout1;
- tin[0] = tin0;
- tin[1] = tin1;
- BF_encrypt(tin, schedule);
- tout0 = tin[0];
- tout1 = tin[1];
- l2n(tout0, out);
- l2n(tout1, out);
- }
-
-
-// n2ln(in, tin0, tin1, l + 8);
-// tin0 ^= tout0;
-// tin1 ^= tout1;
-// tin[0] = tin0;
-// tin[1] = tin1;
-// BF_encrypt(tin, schedule);
-// tout0 = tin[0];
-// tout1 = tin[1];
-// l2n(tout0, out);
-// l2n(tout1, out);
- }
- l2n(tout0, ivec);
- l2n(tout1, ivec);
- } else {
- n2l(ivec, xor0);
- n2l(ivec, xor1);
- ivec -= 8;
- for (l -= 8; l >= 0; l -= 8) {
- n2l(in, tin0);
- n2l(in, tin1);
- tin[0] = tin0;
- tin[1] = tin1;
- BF_decrypt(tin, schedule);
- tout0 = tin[0] ^ xor0;
- tout1 = tin[1] ^ xor1;
- l2n(tout0, out);
- l2n(tout1, out);
- xor0 = tin0;
- xor1 = tin1;
- }
- if (l != -8) {
- n2l(in, tin0);
- n2l(in, tin1);
- tin[0] = tin0;
- tin[1] = tin1;
- BF_decrypt(tin, schedule);
- tout0 = tin[0] ^ xor0;
- tout1 = tin[1] ^ xor1;
- l2nn(tout0, tout1, out, l + 8);
- xor0 = tin0;
- xor1 = tin1;
- }
- l2n(xor0, ivec);
- l2n(xor1, ivec);
- }
- tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
- tin[0] = tin[1] = 0;
-}
diff --git a/dap-sdk/crypto/src/blowfish/bf_ofb64.c b/dap-sdk/crypto/src/blowfish/bf_ofb64.c
deleted file mode 100644
index 4eb763c091..0000000000
--- a/dap-sdk/crypto/src/blowfish/bf_ofb64.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "blowfish.h"
-#include "bf_local.h"
-
-/*
- * The input and output encrypted as though 64bit ofb mode is being used.
- * The extra state information to record how much of the 64bit block we have
- * used is contained in *num;
- */
-void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, const BF_KEY *schedule,
- unsigned char *ivec, int *num)
-{
- register BF_LONG v0, v1, t;
- register int n = *num;
- register long l = length;
- unsigned char d[8];
- register char *dp;
- BF_LONG ti[2];
- unsigned char *iv;
- int save = 0;
-
- iv = (unsigned char *)ivec;
- n2l(iv, v0);
- n2l(iv, v1);
- ti[0] = v0;
- ti[1] = v1;
- dp = (char *)d;
- l2n(v0, dp);
- l2n(v1, dp);
- while (l--) {
- if (n == 0) {
- BF_encrypt((BF_LONG *)ti, schedule);
- dp = (char *)d;
- t = ti[0];
- l2n(t, dp);
- t = ti[1];
- l2n(t, dp);
- save++;
- }
- *(out++) = *(in++) ^ d[n];
- n = (n + 1) & 0x07;
- }
- if (save) {
- v0 = ti[0];
- v1 = ti[1];
- iv = (unsigned char *)ivec;
- l2n(v0, iv);
- l2n(v1, iv);
- }
- t = v0 = v1 = ti[0] = ti[1] = 0;
- *num = n;
-}
diff --git a/dap-sdk/crypto/src/blowfish/bf_skey.c b/dap-sdk/crypto/src/blowfish/bf_skey.c
deleted file mode 100644
index cdf7f1e21b..0000000000
--- a/dap-sdk/crypto/src/blowfish/bf_skey.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "blowfish.h"
-#include "bf_local.h"
-#include "bf_pi.h"
-
-void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
-{
- int i;
- BF_LONG *p, ri, in[2];
- const unsigned char *d, *end;
-
- memcpy(key, &bf_init, sizeof(BF_KEY));
- p = key->P;
-
- if (len > ((BF_ROUNDS + 2) * 4))
- len = (BF_ROUNDS + 2) * 4;
-
- d = data;
- end = &(data[len]);
- for (i = 0; i < (BF_ROUNDS + 2); i++) {
- ri = *(d++);
- if (d >= end)
- d = data;
-
- ri <<= 8;
- ri |= *(d++);
- if (d >= end)
- d = data;
-
- ri <<= 8;
- ri |= *(d++);
- if (d >= end)
- d = data;
-
- ri <<= 8;
- ri |= *(d++);
- if (d >= end)
- d = data;
-
- p[i] ^= ri;
- }
-
- in[0] = 0L;
- in[1] = 0L;
- for (i = 0; i < (BF_ROUNDS + 2); i += 2) {
- BF_encrypt(in, key);
- p[i] = in[0];
- p[i + 1] = in[1];
- }
-
- p = key->S;
- for (i = 0; i < 4 * 256; i += 2) {
- BF_encrypt(in, key);
- p[i] = in[0];
- p[i + 1] = in[1];
- }
-}
diff --git a/dap-sdk/crypto/src/blowfish/bf_pi.h b/dap-sdk/crypto/src/blowfish/blowfish.c
similarity index 73%
rename from dap-sdk/crypto/src/blowfish/bf_pi.h
rename to dap-sdk/crypto/src/blowfish/blowfish.c
index 9785d54b7e..591549c116 100644
--- a/dap-sdk/crypto/src/blowfish/bf_pi.h
+++ b/dap-sdk/crypto/src/blowfish/blowfish.c
@@ -1,521 +1,911 @@
-static const BF_KEY bf_init = {
- {
- 0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L,
- 0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L,
- 0x452821e6L, 0x38d01377L, 0xbe5466cfL, 0x34e90c6cL,
- 0xc0ac29b7L, 0xc97c50ddL, 0x3f84d5b5L, 0xb5470917L,
- 0x9216d5d9L, 0x8979fb1b}, {
- 0xd1310ba6L, 0x98dfb5acL, 0x2ffd72dbL,
- 0xd01adfb7L,
- 0xb8e1afedL, 0x6a267e96L, 0xba7c9045L,
- 0xf12c7f99L,
- 0x24a19947L, 0xb3916cf7L, 0x0801f2e2L,
- 0x858efc16L,
- 0x636920d8L, 0x71574e69L, 0xa458fea3L,
- 0xf4933d7eL,
- 0x0d95748fL, 0x728eb658L, 0x718bcd58L,
- 0x82154aeeL,
- 0x7b54a41dL, 0xc25a59b5L, 0x9c30d539L,
- 0x2af26013L,
- 0xc5d1b023L, 0x286085f0L, 0xca417918L,
- 0xb8db38efL,
- 0x8e79dcb0L, 0x603a180eL, 0x6c9e0e8bL,
- 0xb01e8a3eL,
- 0xd71577c1L, 0xbd314b27L, 0x78af2fdaL,
- 0x55605c60L,
- 0xe65525f3L, 0xaa55ab94L, 0x57489862L,
- 0x63e81440L,
- 0x55ca396aL, 0x2aab10b6L, 0xb4cc5c34L,
- 0x1141e8ceL,
- 0xa15486afL, 0x7c72e993L, 0xb3ee1411L,
- 0x636fbc2aL,
- 0x2ba9c55dL, 0x741831f6L, 0xce5c3e16L,
- 0x9b87931eL,
- 0xafd6ba33L, 0x6c24cf5cL, 0x7a325381L,
- 0x28958677L,
- 0x3b8f4898L, 0x6b4bb9afL, 0xc4bfe81bL,
- 0x66282193L,
- 0x61d809ccL, 0xfb21a991L, 0x487cac60L,
- 0x5dec8032L,
- 0xef845d5dL, 0xe98575b1L, 0xdc262302L,
- 0xeb651b88L,
- 0x23893e81L, 0xd396acc5L, 0x0f6d6ff3L,
- 0x83f44239L,
- 0x2e0b4482L, 0xa4842004L, 0x69c8f04aL,
- 0x9e1f9b5eL,
- 0x21c66842L, 0xf6e96c9aL, 0x670c9c61L,
- 0xabd388f0L,
- 0x6a51a0d2L, 0xd8542f68L, 0x960fa728L,
- 0xab5133a3L,
- 0x6eef0b6cL, 0x137a3be4L, 0xba3bf050L,
- 0x7efb2a98L,
- 0xa1f1651dL, 0x39af0176L, 0x66ca593eL,
- 0x82430e88L,
- 0x8cee8619L, 0x456f9fb4L, 0x7d84a5c3L,
- 0x3b8b5ebeL,
- 0xe06f75d8L, 0x85c12073L, 0x401a449fL,
- 0x56c16aa6L,
- 0x4ed3aa62L, 0x363f7706L, 0x1bfedf72L,
- 0x429b023dL,
- 0x37d0d724L, 0xd00a1248L, 0xdb0fead3L,
- 0x49f1c09bL,
- 0x075372c9L, 0x80991b7bL, 0x25d479d8L,
- 0xf6e8def7L,
- 0xe3fe501aL, 0xb6794c3bL, 0x976ce0bdL,
- 0x04c006baL,
- 0xc1a94fb6L, 0x409f60c4L, 0x5e5c9ec2L,
- 0x196a2463L,
- 0x68fb6fafL, 0x3e6c53b5L, 0x1339b2ebL,
- 0x3b52ec6fL,
- 0x6dfc511fL, 0x9b30952cL, 0xcc814544L,
- 0xaf5ebd09L,
- 0xbee3d004L, 0xde334afdL, 0x660f2807L,
- 0x192e4bb3L,
- 0xc0cba857L, 0x45c8740fL, 0xd20b5f39L,
- 0xb9d3fbdbL,
- 0x5579c0bdL, 0x1a60320aL, 0xd6a100c6L,
- 0x402c7279L,
- 0x679f25feL, 0xfb1fa3ccL, 0x8ea5e9f8L,
- 0xdb3222f8L,
- 0x3c7516dfL, 0xfd616b15L, 0x2f501ec8L,
- 0xad0552abL,
- 0x323db5faL, 0xfd238760L, 0x53317b48L,
- 0x3e00df82L,
- 0x9e5c57bbL, 0xca6f8ca0L, 0x1a87562eL,
- 0xdf1769dbL,
- 0xd542a8f6L, 0x287effc3L, 0xac6732c6L,
- 0x8c4f5573L,
- 0x695b27b0L, 0xbbca58c8L, 0xe1ffa35dL,
- 0xb8f011a0L,
- 0x10fa3d98L, 0xfd2183b8L, 0x4afcb56cL,
- 0x2dd1d35bL,
- 0x9a53e479L, 0xb6f84565L, 0xd28e49bcL,
- 0x4bfb9790L,
- 0xe1ddf2daL, 0xa4cb7e33L, 0x62fb1341L,
- 0xcee4c6e8L,
- 0xef20cadaL, 0x36774c01L, 0xd07e9efeL,
- 0x2bf11fb4L,
- 0x95dbda4dL, 0xae909198L, 0xeaad8e71L,
- 0x6b93d5a0L,
- 0xd08ed1d0L, 0xafc725e0L, 0x8e3c5b2fL,
- 0x8e7594b7L,
- 0x8ff6e2fbL, 0xf2122b64L, 0x8888b812L,
- 0x900df01cL,
- 0x4fad5ea0L, 0x688fc31cL, 0xd1cff191L,
- 0xb3a8c1adL,
- 0x2f2f2218L, 0xbe0e1777L, 0xea752dfeL,
- 0x8b021fa1L,
- 0xe5a0cc0fL, 0xb56f74e8L, 0x18acf3d6L,
- 0xce89e299L,
- 0xb4a84fe0L, 0xfd13e0b7L, 0x7cc43b81L,
- 0xd2ada8d9L,
- 0x165fa266L, 0x80957705L, 0x93cc7314L,
- 0x211a1477L,
- 0xe6ad2065L, 0x77b5fa86L, 0xc75442f5L,
- 0xfb9d35cfL,
- 0xebcdaf0cL, 0x7b3e89a0L, 0xd6411bd3L,
- 0xae1e7e49L,
- 0x00250e2dL, 0x2071b35eL, 0x226800bbL,
- 0x57b8e0afL,
- 0x2464369bL, 0xf009b91eL, 0x5563911dL,
- 0x59dfa6aaL,
- 0x78c14389L, 0xd95a537fL, 0x207d5ba2L,
- 0x02e5b9c5L,
- 0x83260376L, 0x6295cfa9L, 0x11c81968L,
- 0x4e734a41L,
- 0xb3472dcaL, 0x7b14a94aL, 0x1b510052L,
- 0x9a532915L,
- 0xd60f573fL, 0xbc9bc6e4L, 0x2b60a476L,
- 0x81e67400L,
- 0x08ba6fb5L, 0x571be91fL, 0xf296ec6bL,
- 0x2a0dd915L,
- 0xb6636521L, 0xe7b9f9b6L, 0xff34052eL,
- 0xc5855664L,
- 0x53b02d5dL, 0xa99f8fa1L, 0x08ba4799L,
- 0x6e85076aL,
- 0x4b7a70e9L, 0xb5b32944L, 0xdb75092eL,
- 0xc4192623L,
- 0xad6ea6b0L, 0x49a7df7dL, 0x9cee60b8L,
- 0x8fedb266L,
- 0xecaa8c71L, 0x699a17ffL, 0x5664526cL,
- 0xc2b19ee1L,
- 0x193602a5L, 0x75094c29L, 0xa0591340L,
- 0xe4183a3eL,
- 0x3f54989aL, 0x5b429d65L, 0x6b8fe4d6L,
- 0x99f73fd6L,
- 0xa1d29c07L, 0xefe830f5L, 0x4d2d38e6L,
- 0xf0255dc1L,
- 0x4cdd2086L, 0x8470eb26L, 0x6382e9c6L,
- 0x021ecc5eL,
- 0x09686b3fL, 0x3ebaefc9L, 0x3c971814L,
- 0x6b6a70a1L,
- 0x687f3584L, 0x52a0e286L, 0xb79c5305L,
- 0xaa500737L,
- 0x3e07841cL, 0x7fdeae5cL, 0x8e7d44ecL,
- 0x5716f2b8L,
- 0xb03ada37L, 0xf0500c0dL, 0xf01c1f04L,
- 0x0200b3ffL,
- 0xae0cf51aL, 0x3cb574b2L, 0x25837a58L,
- 0xdc0921bdL,
- 0xd19113f9L, 0x7ca92ff6L, 0x94324773L,
- 0x22f54701L,
- 0x3ae5e581L, 0x37c2dadcL, 0xc8b57634L,
- 0x9af3dda7L,
- 0xa9446146L, 0x0fd0030eL, 0xecc8c73eL,
- 0xa4751e41L,
- 0xe238cd99L, 0x3bea0e2fL, 0x3280bba1L,
- 0x183eb331L,
- 0x4e548b38L, 0x4f6db908L, 0x6f420d03L,
- 0xf60a04bfL,
- 0x2cb81290L, 0x24977c79L, 0x5679b072L,
- 0xbcaf89afL,
- 0xde9a771fL, 0xd9930810L, 0xb38bae12L,
- 0xdccf3f2eL,
- 0x5512721fL, 0x2e6b7124L, 0x501adde6L,
- 0x9f84cd87L,
- 0x7a584718L, 0x7408da17L, 0xbc9f9abcL,
- 0xe94b7d8cL,
- 0xec7aec3aL, 0xdb851dfaL, 0x63094366L,
- 0xc464c3d2L,
- 0xef1c1847L, 0x3215d908L, 0xdd433b37L,
- 0x24c2ba16L,
- 0x12a14d43L, 0x2a65c451L, 0x50940002L,
- 0x133ae4ddL,
- 0x71dff89eL, 0x10314e55L, 0x81ac77d6L,
- 0x5f11199bL,
- 0x043556f1L, 0xd7a3c76bL, 0x3c11183bL,
- 0x5924a509L,
- 0xf28fe6edL, 0x97f1fbfaL, 0x9ebabf2cL,
- 0x1e153c6eL,
- 0x86e34570L, 0xeae96fb1L, 0x860e5e0aL,
- 0x5a3e2ab3L,
- 0x771fe71cL, 0x4e3d06faL, 0x2965dcb9L,
- 0x99e71d0fL,
- 0x803e89d6L, 0x5266c825L, 0x2e4cc978L,
- 0x9c10b36aL,
- 0xc6150ebaL, 0x94e2ea78L, 0xa5fc3c53L,
- 0x1e0a2df4L,
- 0xf2f74ea7L, 0x361d2b3dL, 0x1939260fL,
- 0x19c27960L,
- 0x5223a708L, 0xf71312b6L, 0xebadfe6eL,
- 0xeac31f66L,
- 0xe3bc4595L, 0xa67bc883L, 0xb17f37d1L,
- 0x018cff28L,
- 0xc332ddefL, 0xbe6c5aa5L, 0x65582185L,
- 0x68ab9802L,
- 0xeecea50fL, 0xdb2f953bL, 0x2aef7dadL,
- 0x5b6e2f84L,
- 0x1521b628L, 0x29076170L, 0xecdd4775L,
- 0x619f1510L,
- 0x13cca830L, 0xeb61bd96L, 0x0334fe1eL,
- 0xaa0363cfL,
- 0xb5735c90L, 0x4c70a239L, 0xd59e9e0bL,
- 0xcbaade14L,
- 0xeecc86bcL, 0x60622ca7L, 0x9cab5cabL,
- 0xb2f3846eL,
- 0x648b1eafL, 0x19bdf0caL, 0xa02369b9L,
- 0x655abb50L,
- 0x40685a32L, 0x3c2ab4b3L, 0x319ee9d5L,
- 0xc021b8f7L,
- 0x9b540b19L, 0x875fa099L, 0x95f7997eL,
- 0x623d7da8L,
- 0xf837889aL, 0x97e32d77L, 0x11ed935fL,
- 0x16681281L,
- 0x0e358829L, 0xc7e61fd6L, 0x96dedfa1L,
- 0x7858ba99L,
- 0x57f584a5L, 0x1b227263L, 0x9b83c3ffL,
- 0x1ac24696L,
- 0xcdb30aebL, 0x532e3054L, 0x8fd948e4L,
- 0x6dbc3128L,
- 0x58ebf2efL, 0x34c6ffeaL, 0xfe28ed61L,
- 0xee7c3c73L,
- 0x5d4a14d9L, 0xe864b7e3L, 0x42105d14L,
- 0x203e13e0L,
- 0x45eee2b6L, 0xa3aaabeaL, 0xdb6c4f15L,
- 0xfacb4fd0L,
- 0xc742f442L, 0xef6abbb5L, 0x654f3b1dL,
- 0x41cd2105L,
- 0xd81e799eL, 0x86854dc7L, 0xe44b476aL,
- 0x3d816250L,
- 0xcf62a1f2L, 0x5b8d2646L, 0xfc8883a0L,
- 0xc1c7b6a3L,
- 0x7f1524c3L, 0x69cb7492L, 0x47848a0bL,
- 0x5692b285L,
- 0x095bbf00L, 0xad19489dL, 0x1462b174L,
- 0x23820e00L,
- 0x58428d2aL, 0x0c55f5eaL, 0x1dadf43eL,
- 0x233f7061L,
- 0x3372f092L, 0x8d937e41L, 0xd65fecf1L,
- 0x6c223bdbL,
- 0x7cde3759L, 0xcbee7460L, 0x4085f2a7L,
- 0xce77326eL,
- 0xa6078084L, 0x19f8509eL, 0xe8efd855L,
- 0x61d99735L,
- 0xa969a7aaL, 0xc50c06c2L, 0x5a04abfcL,
- 0x800bcadcL,
- 0x9e447a2eL, 0xc3453484L, 0xfdd56705L,
- 0x0e1e9ec9L,
- 0xdb73dbd3L, 0x105588cdL, 0x675fda79L,
- 0xe3674340L,
- 0xc5c43465L, 0x713e38d8L, 0x3d28f89eL,
- 0xf16dff20L,
- 0x153e21e7L, 0x8fb03d4aL, 0xe6e39f2bL,
- 0xdb83adf7L,
- 0xe93d5a68L, 0x948140f7L, 0xf64c261cL,
- 0x94692934L,
- 0x411520f7L, 0x7602d4f7L, 0xbcf46b2eL,
- 0xd4a20068L,
- 0xd4082471L, 0x3320f46aL, 0x43b7d4b7L,
- 0x500061afL,
- 0x1e39f62eL, 0x97244546L, 0x14214f74L,
- 0xbf8b8840L,
- 0x4d95fc1dL, 0x96b591afL, 0x70f4ddd3L,
- 0x66a02f45L,
- 0xbfbc09ecL, 0x03bd9785L, 0x7fac6dd0L,
- 0x31cb8504L,
- 0x96eb27b3L, 0x55fd3941L, 0xda2547e6L,
- 0xabca0a9aL,
- 0x28507825L, 0x530429f4L, 0x0a2c86daL,
- 0xe9b66dfbL,
- 0x68dc1462L, 0xd7486900L, 0x680ec0a4L,
- 0x27a18deeL,
- 0x4f3ffea2L, 0xe887ad8cL, 0xb58ce006L,
- 0x7af4d6b6L,
- 0xaace1e7cL, 0xd3375fecL, 0xce78a399L,
- 0x406b2a42L,
- 0x20fe9e35L, 0xd9f385b9L, 0xee39d7abL,
- 0x3b124e8bL,
- 0x1dc9faf7L, 0x4b6d1856L, 0x26a36631L,
- 0xeae397b2L,
- 0x3a6efa74L, 0xdd5b4332L, 0x6841e7f7L,
- 0xca7820fbL,
- 0xfb0af54eL, 0xd8feb397L, 0x454056acL,
- 0xba489527L,
- 0x55533a3aL, 0x20838d87L, 0xfe6ba9b7L,
- 0xd096954bL,
- 0x55a867bcL, 0xa1159a58L, 0xcca92963L,
- 0x99e1db33L,
- 0xa62a4a56L, 0x3f3125f9L, 0x5ef47e1cL,
- 0x9029317cL,
- 0xfdf8e802L, 0x04272f70L, 0x80bb155cL,
- 0x05282ce3L,
- 0x95c11548L, 0xe4c66d22L, 0x48c1133fL,
- 0xc70f86dcL,
- 0x07f9c9eeL, 0x41041f0fL, 0x404779a4L,
- 0x5d886e17L,
- 0x325f51ebL, 0xd59bc0d1L, 0xf2bcc18fL,
- 0x41113564L,
- 0x257b7834L, 0x602a9c60L, 0xdff8e8a3L,
- 0x1f636c1bL,
- 0x0e12b4c2L, 0x02e1329eL, 0xaf664fd1L,
- 0xcad18115L,
- 0x6b2395e0L, 0x333e92e1L, 0x3b240b62L,
- 0xeebeb922L,
- 0x85b2a20eL, 0xe6ba0d99L, 0xde720c8cL,
- 0x2da2f728L,
- 0xd0127845L, 0x95b794fdL, 0x647d0862L,
- 0xe7ccf5f0L,
- 0x5449a36fL, 0x877d48faL, 0xc39dfd27L,
- 0xf33e8d1eL,
- 0x0a476341L, 0x992eff74L, 0x3a6f6eabL,
- 0xf4f8fd37L,
- 0xa812dc60L, 0xa1ebddf8L, 0x991be14cL,
- 0xdb6e6b0dL,
- 0xc67b5510L, 0x6d672c37L, 0x2765d43bL,
- 0xdcd0e804L,
- 0xf1290dc7L, 0xcc00ffa3L, 0xb5390f92L,
- 0x690fed0bL,
- 0x667b9ffbL, 0xcedb7d9cL, 0xa091cf0bL,
- 0xd9155ea3L,
- 0xbb132f88L, 0x515bad24L, 0x7b9479bfL,
- 0x763bd6ebL,
- 0x37392eb3L, 0xcc115979L, 0x8026e297L,
- 0xf42e312dL,
- 0x6842ada7L, 0xc66a2b3bL, 0x12754cccL,
- 0x782ef11cL,
- 0x6a124237L, 0xb79251e7L, 0x06a1bbe6L,
- 0x4bfb6350L,
- 0x1a6b1018L, 0x11caedfaL, 0x3d25bdd8L,
- 0xe2e1c3c9L,
- 0x44421659L, 0x0a121386L, 0xd90cec6eL,
- 0xd5abea2aL,
- 0x64af674eL, 0xda86a85fL, 0xbebfe988L,
- 0x64e4c3feL,
- 0x9dbc8057L, 0xf0f7c086L, 0x60787bf8L,
- 0x6003604dL,
- 0xd1fd8346L, 0xf6381fb0L, 0x7745ae04L,
- 0xd736fcccL,
- 0x83426b33L, 0xf01eab71L, 0xb0804187L,
- 0x3c005e5fL,
- 0x77a057beL, 0xbde8ae24L, 0x55464299L,
- 0xbf582e61L,
- 0x4e58f48fL, 0xf2ddfda2L, 0xf474ef38L,
- 0x8789bdc2L,
- 0x5366f9c3L, 0xc8b38e74L, 0xb475f255L,
- 0x46fcd9b9L,
- 0x7aeb2661L, 0x8b1ddf84L, 0x846a0e79L,
- 0x915f95e2L,
- 0x466e598eL, 0x20b45770L, 0x8cd55591L,
- 0xc902de4cL,
- 0xb90bace1L, 0xbb8205d0L, 0x11a86248L,
- 0x7574a99eL,
- 0xb77f19b6L, 0xe0a9dc09L, 0x662d09a1L,
- 0xc4324633L,
- 0xe85a1f02L, 0x09f0be8cL, 0x4a99a025L,
- 0x1d6efe10L,
- 0x1ab93d1dL, 0x0ba5a4dfL, 0xa186f20fL,
- 0x2868f169L,
- 0xdcb7da83L, 0x573906feL, 0xa1e2ce9bL,
- 0x4fcd7f52L,
- 0x50115e01L, 0xa70683faL, 0xa002b5c4L,
- 0x0de6d027L,
- 0x9af88c27L, 0x773f8641L, 0xc3604c06L,
- 0x61a806b5L,
- 0xf0177a28L, 0xc0f586e0L, 0x006058aaL,
- 0x30dc7d62L,
- 0x11e69ed7L, 0x2338ea63L, 0x53c2dd94L,
- 0xc2c21634L,
- 0xbbcbee56L, 0x90bcb6deL, 0xebfc7da1L,
- 0xce591d76L,
- 0x6f05e409L, 0x4b7c0188L, 0x39720a3dL,
- 0x7c927c24L,
- 0x86e3725fL, 0x724d9db9L, 0x1ac15bb4L,
- 0xd39eb8fcL,
- 0xed545578L, 0x08fca5b5L, 0xd83d7cd3L,
- 0x4dad0fc4L,
- 0x1e50ef5eL, 0xb161e6f8L, 0xa28514d9L,
- 0x6c51133cL,
- 0x6fd5c7e7L, 0x56e14ec4L, 0x362abfceL,
- 0xddc6c837L,
- 0xd79a3234L, 0x92638212L, 0x670efa8eL,
- 0x406000e0L,
- 0x3a39ce37L, 0xd3faf5cfL, 0xabc27737L,
- 0x5ac52d1bL,
- 0x5cb0679eL, 0x4fa33742L, 0xd3822740L,
- 0x99bc9bbeL,
- 0xd5118e9dL, 0xbf0f7315L, 0xd62d1c7eL,
- 0xc700c47bL,
- 0xb78c1b6bL, 0x21a19045L, 0xb26eb1beL,
- 0x6a366eb4L,
- 0x5748ab2fL, 0xbc946e79L, 0xc6a376d2L,
- 0x6549c2c8L,
- 0x530ff8eeL, 0x468dde7dL, 0xd5730a1dL,
- 0x4cd04dc6L,
- 0x2939bbdbL, 0xa9ba4650L, 0xac9526e8L,
- 0xbe5ee304L,
- 0xa1fad5f0L, 0x6a2d519aL, 0x63ef8ce2L,
- 0x9a86ee22L,
- 0xc089c2b8L, 0x43242ef6L, 0xa51e03aaL,
- 0x9cf2d0a4L,
- 0x83c061baL, 0x9be96a4dL, 0x8fe51550L,
- 0xba645bd6L,
- 0x2826a2f9L, 0xa73a3ae1L, 0x4ba99586L,
- 0xef5562e9L,
- 0xc72fefd3L, 0xf752f7daL, 0x3f046f69L,
- 0x77fa0a59L,
- 0x80e4a915L, 0x87b08601L, 0x9b09e6adL,
- 0x3b3ee593L,
- 0xe990fd5aL, 0x9e34d797L, 0x2cf0b7d9L,
- 0x022b8b51L,
- 0x96d5ac3aL, 0x017da67dL, 0xd1cf3ed6L,
- 0x7c7d2d28L,
- 0x1f9f25cfL, 0xadf2b89bL, 0x5ad6b472L,
- 0x5a88f54cL,
- 0xe029ac71L, 0xe019a5e6L, 0x47b0acfdL,
- 0xed93fa9bL,
- 0xe8d3c48dL, 0x283b57ccL, 0xf8d56629L,
- 0x79132e28L,
- 0x785f0191L, 0xed756055L, 0xf7960e44L,
- 0xe3d35e8cL,
- 0x15056dd4L, 0x88f46dbaL, 0x03a16125L,
- 0x0564f0bdL,
- 0xc3eb9e15L, 0x3c9057a2L, 0x97271aecL,
- 0xa93a072aL,
- 0x1b3f6d9bL, 0x1e6321f5L, 0xf59c66fbL,
- 0x26dcf319L,
- 0x7533d928L, 0xb155fdf5L, 0x03563482L,
- 0x8aba3cbbL,
- 0x28517711L, 0xc20ad9f8L, 0xabcc5167L,
- 0xccad925fL,
- 0x4de81751L, 0x3830dc8eL, 0x379d5862L,
- 0x9320f991L,
- 0xea7a90c2L, 0xfb3e7bceL, 0x5121ce64L,
- 0x774fbe32L,
- 0xa8b6e37eL, 0xc3293d46L, 0x48de5369L,
- 0x6413e680L,
- 0xa2ae0810L, 0xdd6db224L, 0x69852dfdL,
- 0x09072166L,
- 0xb39a460aL, 0x6445c0ddL, 0x586cdecfL,
- 0x1c20c8aeL,
- 0x5bbef7ddL, 0x1b588d40L, 0xccd2017fL,
- 0x6bb4e3bbL,
- 0xdda26a7eL, 0x3a59ff45L, 0x3e350a44L,
- 0xbcb4cdd5L,
- 0x72eacea8L, 0xfa6484bbL, 0x8d6612aeL,
- 0xbf3c6f47L,
- 0xd29be463L, 0x542f5d9eL, 0xaec2771bL,
- 0xf64e6370L,
- 0x740e0d8dL, 0xe75b1357L, 0xf8721671L,
- 0xaf537d5dL,
- 0x4040cb08L, 0x4eb4e2ccL, 0x34d2466aL,
- 0x0115af84L,
- 0xe1b00428L, 0x95983a1dL, 0x06b89fb4L,
- 0xce6ea048L,
- 0x6f3f3b82L, 0x3520ab82L, 0x011a1d4bL,
- 0x277227f8L,
- 0x611560b1L, 0xe7933fdcL, 0xbb3a792bL,
- 0x344525bdL,
- 0xa08839e1L, 0x51ce794bL, 0x2f32c9b7L,
- 0xa01fbac9L,
- 0xe01cc87eL, 0xbcc7d1f6L, 0xcf0111c3L,
- 0xa1e8aac7L,
- 0x1a908749L, 0xd44fbd9aL, 0xd0dadecbL,
- 0xd50ada38L,
- 0x0339c32aL, 0xc6913667L, 0x8df9317cL,
- 0xe0b12b4fL,
- 0xf79e59b7L, 0x43f5bb3aL, 0xf2d519ffL,
- 0x27d9459cL,
- 0xbf97222cL, 0x15e6fc2aL, 0x0f91fc71L,
- 0x9b941525L,
- 0xfae59361L, 0xceb69cebL, 0xc2a86459L,
- 0x12baa8d1L,
- 0xb6c1075eL, 0xe3056a0cL, 0x10d25065L,
- 0xcb03a442L,
- 0xe0ec6e0eL, 0x1698db3bL, 0x4c98a0beL,
- 0x3278e964L,
- 0x9f1f9532L, 0xe0d392dfL, 0xd3a0342bL,
- 0x8971f21eL,
- 0x1b0a7441L, 0x4ba3348cL, 0xc5be7120L,
- 0xc37632d8L,
- 0xdf359f8dL, 0x9b992f2eL, 0xe60b6f47L,
- 0x0fe3f11dL,
- 0xe54cda54L, 0x1edad891L, 0xce6279cfL,
- 0xcd3e7e6fL,
- 0x1618b166L, 0xfd2c1d05L, 0x848fd2c5L,
- 0xf6fb2299L,
- 0xf523f357L, 0xa6327623L, 0x93a83531L,
- 0x56cccd02L,
- 0xacf08162L, 0x5a75ebb5L, 0x6e163697L,
- 0x88d273ccL,
- 0xde966292L, 0x81b949d0L, 0x4c50901bL,
- 0x71c65614L,
- 0xe6c6c7bdL, 0x327a140aL, 0x45e1d006L,
- 0xc3f27b9aL,
- 0xc9aa53fdL, 0x62a80f00L, 0xbb25bfe2L,
- 0x35bdd2f6L,
- 0x71126905L, 0xb2040222L, 0xb6cbcf7cL,
- 0xcd769c2bL,
- 0x53113ec0L, 0x1640e3d3L, 0x38abbd60L,
- 0x2547adf0L,
- 0xba38209cL, 0xf746ce76L, 0x77afa1c5L,
- 0x20756060L,
- 0x85cbfe4eL, 0x8ae88dd8L, 0x7aaaf9b0L,
- 0x4cf9aa7eL,
- 0x1948c25cL, 0x02fb8a8cL, 0x01c36ae4L,
- 0xd6ebe1f9L,
- 0x90d4f869L, 0xa65cdea0L, 0x3f09252dL,
- 0xc208e69fL,
- 0xb74e6132L, 0xce77e25bL, 0x578fdfe3L,
- 0x3ac372e6L,
- }
-};
+#include <stdio.h>
+#include <string.h>
+#include "blowfish.h"
+#include "bf_local.h"
+/*
+ * The input and output encrypted as though 64bit cfb mode is being used.
+ * The extra state information to record how much of the 64bit block we have
+ * used is contained in *num;
+ */
+
+static const BF_KEY bf_init = {
+ {
+ 0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L,
+ 0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L,
+ 0x452821e6L, 0x38d01377L, 0xbe5466cfL, 0x34e90c6cL,
+ 0xc0ac29b7L, 0xc97c50ddL, 0x3f84d5b5L, 0xb5470917L,
+ 0x9216d5d9L, 0x8979fb1b}, {
+ 0xd1310ba6L, 0x98dfb5acL, 0x2ffd72dbL,
+ 0xd01adfb7L,
+ 0xb8e1afedL, 0x6a267e96L, 0xba7c9045L,
+ 0xf12c7f99L,
+ 0x24a19947L, 0xb3916cf7L, 0x0801f2e2L,
+ 0x858efc16L,
+ 0x636920d8L, 0x71574e69L, 0xa458fea3L,
+ 0xf4933d7eL,
+ 0x0d95748fL, 0x728eb658L, 0x718bcd58L,
+ 0x82154aeeL,
+ 0x7b54a41dL, 0xc25a59b5L, 0x9c30d539L,
+ 0x2af26013L,
+ 0xc5d1b023L, 0x286085f0L, 0xca417918L,
+ 0xb8db38efL,
+ 0x8e79dcb0L, 0x603a180eL, 0x6c9e0e8bL,
+ 0xb01e8a3eL,
+ 0xd71577c1L, 0xbd314b27L, 0x78af2fdaL,
+ 0x55605c60L,
+ 0xe65525f3L, 0xaa55ab94L, 0x57489862L,
+ 0x63e81440L,
+ 0x55ca396aL, 0x2aab10b6L, 0xb4cc5c34L,
+ 0x1141e8ceL,
+ 0xa15486afL, 0x7c72e993L, 0xb3ee1411L,
+ 0x636fbc2aL,
+ 0x2ba9c55dL, 0x741831f6L, 0xce5c3e16L,
+ 0x9b87931eL,
+ 0xafd6ba33L, 0x6c24cf5cL, 0x7a325381L,
+ 0x28958677L,
+ 0x3b8f4898L, 0x6b4bb9afL, 0xc4bfe81bL,
+ 0x66282193L,
+ 0x61d809ccL, 0xfb21a991L, 0x487cac60L,
+ 0x5dec8032L,
+ 0xef845d5dL, 0xe98575b1L, 0xdc262302L,
+ 0xeb651b88L,
+ 0x23893e81L, 0xd396acc5L, 0x0f6d6ff3L,
+ 0x83f44239L,
+ 0x2e0b4482L, 0xa4842004L, 0x69c8f04aL,
+ 0x9e1f9b5eL,
+ 0x21c66842L, 0xf6e96c9aL, 0x670c9c61L,
+ 0xabd388f0L,
+ 0x6a51a0d2L, 0xd8542f68L, 0x960fa728L,
+ 0xab5133a3L,
+ 0x6eef0b6cL, 0x137a3be4L, 0xba3bf050L,
+ 0x7efb2a98L,
+ 0xa1f1651dL, 0x39af0176L, 0x66ca593eL,
+ 0x82430e88L,
+ 0x8cee8619L, 0x456f9fb4L, 0x7d84a5c3L,
+ 0x3b8b5ebeL,
+ 0xe06f75d8L, 0x85c12073L, 0x401a449fL,
+ 0x56c16aa6L,
+ 0x4ed3aa62L, 0x363f7706L, 0x1bfedf72L,
+ 0x429b023dL,
+ 0x37d0d724L, 0xd00a1248L, 0xdb0fead3L,
+ 0x49f1c09bL,
+ 0x075372c9L, 0x80991b7bL, 0x25d479d8L,
+ 0xf6e8def7L,
+ 0xe3fe501aL, 0xb6794c3bL, 0x976ce0bdL,
+ 0x04c006baL,
+ 0xc1a94fb6L, 0x409f60c4L, 0x5e5c9ec2L,
+ 0x196a2463L,
+ 0x68fb6fafL, 0x3e6c53b5L, 0x1339b2ebL,
+ 0x3b52ec6fL,
+ 0x6dfc511fL, 0x9b30952cL, 0xcc814544L,
+ 0xaf5ebd09L,
+ 0xbee3d004L, 0xde334afdL, 0x660f2807L,
+ 0x192e4bb3L,
+ 0xc0cba857L, 0x45c8740fL, 0xd20b5f39L,
+ 0xb9d3fbdbL,
+ 0x5579c0bdL, 0x1a60320aL, 0xd6a100c6L,
+ 0x402c7279L,
+ 0x679f25feL, 0xfb1fa3ccL, 0x8ea5e9f8L,
+ 0xdb3222f8L,
+ 0x3c7516dfL, 0xfd616b15L, 0x2f501ec8L,
+ 0xad0552abL,
+ 0x323db5faL, 0xfd238760L, 0x53317b48L,
+ 0x3e00df82L,
+ 0x9e5c57bbL, 0xca6f8ca0L, 0x1a87562eL,
+ 0xdf1769dbL,
+ 0xd542a8f6L, 0x287effc3L, 0xac6732c6L,
+ 0x8c4f5573L,
+ 0x695b27b0L, 0xbbca58c8L, 0xe1ffa35dL,
+ 0xb8f011a0L,
+ 0x10fa3d98L, 0xfd2183b8L, 0x4afcb56cL,
+ 0x2dd1d35bL,
+ 0x9a53e479L, 0xb6f84565L, 0xd28e49bcL,
+ 0x4bfb9790L,
+ 0xe1ddf2daL, 0xa4cb7e33L, 0x62fb1341L,
+ 0xcee4c6e8L,
+ 0xef20cadaL, 0x36774c01L, 0xd07e9efeL,
+ 0x2bf11fb4L,
+ 0x95dbda4dL, 0xae909198L, 0xeaad8e71L,
+ 0x6b93d5a0L,
+ 0xd08ed1d0L, 0xafc725e0L, 0x8e3c5b2fL,
+ 0x8e7594b7L,
+ 0x8ff6e2fbL, 0xf2122b64L, 0x8888b812L,
+ 0x900df01cL,
+ 0x4fad5ea0L, 0x688fc31cL, 0xd1cff191L,
+ 0xb3a8c1adL,
+ 0x2f2f2218L, 0xbe0e1777L, 0xea752dfeL,
+ 0x8b021fa1L,
+ 0xe5a0cc0fL, 0xb56f74e8L, 0x18acf3d6L,
+ 0xce89e299L,
+ 0xb4a84fe0L, 0xfd13e0b7L, 0x7cc43b81L,
+ 0xd2ada8d9L,
+ 0x165fa266L, 0x80957705L, 0x93cc7314L,
+ 0x211a1477L,
+ 0xe6ad2065L, 0x77b5fa86L, 0xc75442f5L,
+ 0xfb9d35cfL,
+ 0xebcdaf0cL, 0x7b3e89a0L, 0xd6411bd3L,
+ 0xae1e7e49L,
+ 0x00250e2dL, 0x2071b35eL, 0x226800bbL,
+ 0x57b8e0afL,
+ 0x2464369bL, 0xf009b91eL, 0x5563911dL,
+ 0x59dfa6aaL,
+ 0x78c14389L, 0xd95a537fL, 0x207d5ba2L,
+ 0x02e5b9c5L,
+ 0x83260376L, 0x6295cfa9L, 0x11c81968L,
+ 0x4e734a41L,
+ 0xb3472dcaL, 0x7b14a94aL, 0x1b510052L,
+ 0x9a532915L,
+ 0xd60f573fL, 0xbc9bc6e4L, 0x2b60a476L,
+ 0x81e67400L,
+ 0x08ba6fb5L, 0x571be91fL, 0xf296ec6bL,
+ 0x2a0dd915L,
+ 0xb6636521L, 0xe7b9f9b6L, 0xff34052eL,
+ 0xc5855664L,
+ 0x53b02d5dL, 0xa99f8fa1L, 0x08ba4799L,
+ 0x6e85076aL,
+ 0x4b7a70e9L, 0xb5b32944L, 0xdb75092eL,
+ 0xc4192623L,
+ 0xad6ea6b0L, 0x49a7df7dL, 0x9cee60b8L,
+ 0x8fedb266L,
+ 0xecaa8c71L, 0x699a17ffL, 0x5664526cL,
+ 0xc2b19ee1L,
+ 0x193602a5L, 0x75094c29L, 0xa0591340L,
+ 0xe4183a3eL,
+ 0x3f54989aL, 0x5b429d65L, 0x6b8fe4d6L,
+ 0x99f73fd6L,
+ 0xa1d29c07L, 0xefe830f5L, 0x4d2d38e6L,
+ 0xf0255dc1L,
+ 0x4cdd2086L, 0x8470eb26L, 0x6382e9c6L,
+ 0x021ecc5eL,
+ 0x09686b3fL, 0x3ebaefc9L, 0x3c971814L,
+ 0x6b6a70a1L,
+ 0x687f3584L, 0x52a0e286L, 0xb79c5305L,
+ 0xaa500737L,
+ 0x3e07841cL, 0x7fdeae5cL, 0x8e7d44ecL,
+ 0x5716f2b8L,
+ 0xb03ada37L, 0xf0500c0dL, 0xf01c1f04L,
+ 0x0200b3ffL,
+ 0xae0cf51aL, 0x3cb574b2L, 0x25837a58L,
+ 0xdc0921bdL,
+ 0xd19113f9L, 0x7ca92ff6L, 0x94324773L,
+ 0x22f54701L,
+ 0x3ae5e581L, 0x37c2dadcL, 0xc8b57634L,
+ 0x9af3dda7L,
+ 0xa9446146L, 0x0fd0030eL, 0xecc8c73eL,
+ 0xa4751e41L,
+ 0xe238cd99L, 0x3bea0e2fL, 0x3280bba1L,
+ 0x183eb331L,
+ 0x4e548b38L, 0x4f6db908L, 0x6f420d03L,
+ 0xf60a04bfL,
+ 0x2cb81290L, 0x24977c79L, 0x5679b072L,
+ 0xbcaf89afL,
+ 0xde9a771fL, 0xd9930810L, 0xb38bae12L,
+ 0xdccf3f2eL,
+ 0x5512721fL, 0x2e6b7124L, 0x501adde6L,
+ 0x9f84cd87L,
+ 0x7a584718L, 0x7408da17L, 0xbc9f9abcL,
+ 0xe94b7d8cL,
+ 0xec7aec3aL, 0xdb851dfaL, 0x63094366L,
+ 0xc464c3d2L,
+ 0xef1c1847L, 0x3215d908L, 0xdd433b37L,
+ 0x24c2ba16L,
+ 0x12a14d43L, 0x2a65c451L, 0x50940002L,
+ 0x133ae4ddL,
+ 0x71dff89eL, 0x10314e55L, 0x81ac77d6L,
+ 0x5f11199bL,
+ 0x043556f1L, 0xd7a3c76bL, 0x3c11183bL,
+ 0x5924a509L,
+ 0xf28fe6edL, 0x97f1fbfaL, 0x9ebabf2cL,
+ 0x1e153c6eL,
+ 0x86e34570L, 0xeae96fb1L, 0x860e5e0aL,
+ 0x5a3e2ab3L,
+ 0x771fe71cL, 0x4e3d06faL, 0x2965dcb9L,
+ 0x99e71d0fL,
+ 0x803e89d6L, 0x5266c825L, 0x2e4cc978L,
+ 0x9c10b36aL,
+ 0xc6150ebaL, 0x94e2ea78L, 0xa5fc3c53L,
+ 0x1e0a2df4L,
+ 0xf2f74ea7L, 0x361d2b3dL, 0x1939260fL,
+ 0x19c27960L,
+ 0x5223a708L, 0xf71312b6L, 0xebadfe6eL,
+ 0xeac31f66L,
+ 0xe3bc4595L, 0xa67bc883L, 0xb17f37d1L,
+ 0x018cff28L,
+ 0xc332ddefL, 0xbe6c5aa5L, 0x65582185L,
+ 0x68ab9802L,
+ 0xeecea50fL, 0xdb2f953bL, 0x2aef7dadL,
+ 0x5b6e2f84L,
+ 0x1521b628L, 0x29076170L, 0xecdd4775L,
+ 0x619f1510L,
+ 0x13cca830L, 0xeb61bd96L, 0x0334fe1eL,
+ 0xaa0363cfL,
+ 0xb5735c90L, 0x4c70a239L, 0xd59e9e0bL,
+ 0xcbaade14L,
+ 0xeecc86bcL, 0x60622ca7L, 0x9cab5cabL,
+ 0xb2f3846eL,
+ 0x648b1eafL, 0x19bdf0caL, 0xa02369b9L,
+ 0x655abb50L,
+ 0x40685a32L, 0x3c2ab4b3L, 0x319ee9d5L,
+ 0xc021b8f7L,
+ 0x9b540b19L, 0x875fa099L, 0x95f7997eL,
+ 0x623d7da8L,
+ 0xf837889aL, 0x97e32d77L, 0x11ed935fL,
+ 0x16681281L,
+ 0x0e358829L, 0xc7e61fd6L, 0x96dedfa1L,
+ 0x7858ba99L,
+ 0x57f584a5L, 0x1b227263L, 0x9b83c3ffL,
+ 0x1ac24696L,
+ 0xcdb30aebL, 0x532e3054L, 0x8fd948e4L,
+ 0x6dbc3128L,
+ 0x58ebf2efL, 0x34c6ffeaL, 0xfe28ed61L,
+ 0xee7c3c73L,
+ 0x5d4a14d9L, 0xe864b7e3L, 0x42105d14L,
+ 0x203e13e0L,
+ 0x45eee2b6L, 0xa3aaabeaL, 0xdb6c4f15L,
+ 0xfacb4fd0L,
+ 0xc742f442L, 0xef6abbb5L, 0x654f3b1dL,
+ 0x41cd2105L,
+ 0xd81e799eL, 0x86854dc7L, 0xe44b476aL,
+ 0x3d816250L,
+ 0xcf62a1f2L, 0x5b8d2646L, 0xfc8883a0L,
+ 0xc1c7b6a3L,
+ 0x7f1524c3L, 0x69cb7492L, 0x47848a0bL,
+ 0x5692b285L,
+ 0x095bbf00L, 0xad19489dL, 0x1462b174L,
+ 0x23820e00L,
+ 0x58428d2aL, 0x0c55f5eaL, 0x1dadf43eL,
+ 0x233f7061L,
+ 0x3372f092L, 0x8d937e41L, 0xd65fecf1L,
+ 0x6c223bdbL,
+ 0x7cde3759L, 0xcbee7460L, 0x4085f2a7L,
+ 0xce77326eL,
+ 0xa6078084L, 0x19f8509eL, 0xe8efd855L,
+ 0x61d99735L,
+ 0xa969a7aaL, 0xc50c06c2L, 0x5a04abfcL,
+ 0x800bcadcL,
+ 0x9e447a2eL, 0xc3453484L, 0xfdd56705L,
+ 0x0e1e9ec9L,
+ 0xdb73dbd3L, 0x105588cdL, 0x675fda79L,
+ 0xe3674340L,
+ 0xc5c43465L, 0x713e38d8L, 0x3d28f89eL,
+ 0xf16dff20L,
+ 0x153e21e7L, 0x8fb03d4aL, 0xe6e39f2bL,
+ 0xdb83adf7L,
+ 0xe93d5a68L, 0x948140f7L, 0xf64c261cL,
+ 0x94692934L,
+ 0x411520f7L, 0x7602d4f7L, 0xbcf46b2eL,
+ 0xd4a20068L,
+ 0xd4082471L, 0x3320f46aL, 0x43b7d4b7L,
+ 0x500061afL,
+ 0x1e39f62eL, 0x97244546L, 0x14214f74L,
+ 0xbf8b8840L,
+ 0x4d95fc1dL, 0x96b591afL, 0x70f4ddd3L,
+ 0x66a02f45L,
+ 0xbfbc09ecL, 0x03bd9785L, 0x7fac6dd0L,
+ 0x31cb8504L,
+ 0x96eb27b3L, 0x55fd3941L, 0xda2547e6L,
+ 0xabca0a9aL,
+ 0x28507825L, 0x530429f4L, 0x0a2c86daL,
+ 0xe9b66dfbL,
+ 0x68dc1462L, 0xd7486900L, 0x680ec0a4L,
+ 0x27a18deeL,
+ 0x4f3ffea2L, 0xe887ad8cL, 0xb58ce006L,
+ 0x7af4d6b6L,
+ 0xaace1e7cL, 0xd3375fecL, 0xce78a399L,
+ 0x406b2a42L,
+ 0x20fe9e35L, 0xd9f385b9L, 0xee39d7abL,
+ 0x3b124e8bL,
+ 0x1dc9faf7L, 0x4b6d1856L, 0x26a36631L,
+ 0xeae397b2L,
+ 0x3a6efa74L, 0xdd5b4332L, 0x6841e7f7L,
+ 0xca7820fbL,
+ 0xfb0af54eL, 0xd8feb397L, 0x454056acL,
+ 0xba489527L,
+ 0x55533a3aL, 0x20838d87L, 0xfe6ba9b7L,
+ 0xd096954bL,
+ 0x55a867bcL, 0xa1159a58L, 0xcca92963L,
+ 0x99e1db33L,
+ 0xa62a4a56L, 0x3f3125f9L, 0x5ef47e1cL,
+ 0x9029317cL,
+ 0xfdf8e802L, 0x04272f70L, 0x80bb155cL,
+ 0x05282ce3L,
+ 0x95c11548L, 0xe4c66d22L, 0x48c1133fL,
+ 0xc70f86dcL,
+ 0x07f9c9eeL, 0x41041f0fL, 0x404779a4L,
+ 0x5d886e17L,
+ 0x325f51ebL, 0xd59bc0d1L, 0xf2bcc18fL,
+ 0x41113564L,
+ 0x257b7834L, 0x602a9c60L, 0xdff8e8a3L,
+ 0x1f636c1bL,
+ 0x0e12b4c2L, 0x02e1329eL, 0xaf664fd1L,
+ 0xcad18115L,
+ 0x6b2395e0L, 0x333e92e1L, 0x3b240b62L,
+ 0xeebeb922L,
+ 0x85b2a20eL, 0xe6ba0d99L, 0xde720c8cL,
+ 0x2da2f728L,
+ 0xd0127845L, 0x95b794fdL, 0x647d0862L,
+ 0xe7ccf5f0L,
+ 0x5449a36fL, 0x877d48faL, 0xc39dfd27L,
+ 0xf33e8d1eL,
+ 0x0a476341L, 0x992eff74L, 0x3a6f6eabL,
+ 0xf4f8fd37L,
+ 0xa812dc60L, 0xa1ebddf8L, 0x991be14cL,
+ 0xdb6e6b0dL,
+ 0xc67b5510L, 0x6d672c37L, 0x2765d43bL,
+ 0xdcd0e804L,
+ 0xf1290dc7L, 0xcc00ffa3L, 0xb5390f92L,
+ 0x690fed0bL,
+ 0x667b9ffbL, 0xcedb7d9cL, 0xa091cf0bL,
+ 0xd9155ea3L,
+ 0xbb132f88L, 0x515bad24L, 0x7b9479bfL,
+ 0x763bd6ebL,
+ 0x37392eb3L, 0xcc115979L, 0x8026e297L,
+ 0xf42e312dL,
+ 0x6842ada7L, 0xc66a2b3bL, 0x12754cccL,
+ 0x782ef11cL,
+ 0x6a124237L, 0xb79251e7L, 0x06a1bbe6L,
+ 0x4bfb6350L,
+ 0x1a6b1018L, 0x11caedfaL, 0x3d25bdd8L,
+ 0xe2e1c3c9L,
+ 0x44421659L, 0x0a121386L, 0xd90cec6eL,
+ 0xd5abea2aL,
+ 0x64af674eL, 0xda86a85fL, 0xbebfe988L,
+ 0x64e4c3feL,
+ 0x9dbc8057L, 0xf0f7c086L, 0x60787bf8L,
+ 0x6003604dL,
+ 0xd1fd8346L, 0xf6381fb0L, 0x7745ae04L,
+ 0xd736fcccL,
+ 0x83426b33L, 0xf01eab71L, 0xb0804187L,
+ 0x3c005e5fL,
+ 0x77a057beL, 0xbde8ae24L, 0x55464299L,
+ 0xbf582e61L,
+ 0x4e58f48fL, 0xf2ddfda2L, 0xf474ef38L,
+ 0x8789bdc2L,
+ 0x5366f9c3L, 0xc8b38e74L, 0xb475f255L,
+ 0x46fcd9b9L,
+ 0x7aeb2661L, 0x8b1ddf84L, 0x846a0e79L,
+ 0x915f95e2L,
+ 0x466e598eL, 0x20b45770L, 0x8cd55591L,
+ 0xc902de4cL,
+ 0xb90bace1L, 0xbb8205d0L, 0x11a86248L,
+ 0x7574a99eL,
+ 0xb77f19b6L, 0xe0a9dc09L, 0x662d09a1L,
+ 0xc4324633L,
+ 0xe85a1f02L, 0x09f0be8cL, 0x4a99a025L,
+ 0x1d6efe10L,
+ 0x1ab93d1dL, 0x0ba5a4dfL, 0xa186f20fL,
+ 0x2868f169L,
+ 0xdcb7da83L, 0x573906feL, 0xa1e2ce9bL,
+ 0x4fcd7f52L,
+ 0x50115e01L, 0xa70683faL, 0xa002b5c4L,
+ 0x0de6d027L,
+ 0x9af88c27L, 0x773f8641L, 0xc3604c06L,
+ 0x61a806b5L,
+ 0xf0177a28L, 0xc0f586e0L, 0x006058aaL,
+ 0x30dc7d62L,
+ 0x11e69ed7L, 0x2338ea63L, 0x53c2dd94L,
+ 0xc2c21634L,
+ 0xbbcbee56L, 0x90bcb6deL, 0xebfc7da1L,
+ 0xce591d76L,
+ 0x6f05e409L, 0x4b7c0188L, 0x39720a3dL,
+ 0x7c927c24L,
+ 0x86e3725fL, 0x724d9db9L, 0x1ac15bb4L,
+ 0xd39eb8fcL,
+ 0xed545578L, 0x08fca5b5L, 0xd83d7cd3L,
+ 0x4dad0fc4L,
+ 0x1e50ef5eL, 0xb161e6f8L, 0xa28514d9L,
+ 0x6c51133cL,
+ 0x6fd5c7e7L, 0x56e14ec4L, 0x362abfceL,
+ 0xddc6c837L,
+ 0xd79a3234L, 0x92638212L, 0x670efa8eL,
+ 0x406000e0L,
+ 0x3a39ce37L, 0xd3faf5cfL, 0xabc27737L,
+ 0x5ac52d1bL,
+ 0x5cb0679eL, 0x4fa33742L, 0xd3822740L,
+ 0x99bc9bbeL,
+ 0xd5118e9dL, 0xbf0f7315L, 0xd62d1c7eL,
+ 0xc700c47bL,
+ 0xb78c1b6bL, 0x21a19045L, 0xb26eb1beL,
+ 0x6a366eb4L,
+ 0x5748ab2fL, 0xbc946e79L, 0xc6a376d2L,
+ 0x6549c2c8L,
+ 0x530ff8eeL, 0x468dde7dL, 0xd5730a1dL,
+ 0x4cd04dc6L,
+ 0x2939bbdbL, 0xa9ba4650L, 0xac9526e8L,
+ 0xbe5ee304L,
+ 0xa1fad5f0L, 0x6a2d519aL, 0x63ef8ce2L,
+ 0x9a86ee22L,
+ 0xc089c2b8L, 0x43242ef6L, 0xa51e03aaL,
+ 0x9cf2d0a4L,
+ 0x83c061baL, 0x9be96a4dL, 0x8fe51550L,
+ 0xba645bd6L,
+ 0x2826a2f9L, 0xa73a3ae1L, 0x4ba99586L,
+ 0xef5562e9L,
+ 0xc72fefd3L, 0xf752f7daL, 0x3f046f69L,
+ 0x77fa0a59L,
+ 0x80e4a915L, 0x87b08601L, 0x9b09e6adL,
+ 0x3b3ee593L,
+ 0xe990fd5aL, 0x9e34d797L, 0x2cf0b7d9L,
+ 0x022b8b51L,
+ 0x96d5ac3aL, 0x017da67dL, 0xd1cf3ed6L,
+ 0x7c7d2d28L,
+ 0x1f9f25cfL, 0xadf2b89bL, 0x5ad6b472L,
+ 0x5a88f54cL,
+ 0xe029ac71L, 0xe019a5e6L, 0x47b0acfdL,
+ 0xed93fa9bL,
+ 0xe8d3c48dL, 0x283b57ccL, 0xf8d56629L,
+ 0x79132e28L,
+ 0x785f0191L, 0xed756055L, 0xf7960e44L,
+ 0xe3d35e8cL,
+ 0x15056dd4L, 0x88f46dbaL, 0x03a16125L,
+ 0x0564f0bdL,
+ 0xc3eb9e15L, 0x3c9057a2L, 0x97271aecL,
+ 0xa93a072aL,
+ 0x1b3f6d9bL, 0x1e6321f5L, 0xf59c66fbL,
+ 0x26dcf319L,
+ 0x7533d928L, 0xb155fdf5L, 0x03563482L,
+ 0x8aba3cbbL,
+ 0x28517711L, 0xc20ad9f8L, 0xabcc5167L,
+ 0xccad925fL,
+ 0x4de81751L, 0x3830dc8eL, 0x379d5862L,
+ 0x9320f991L,
+ 0xea7a90c2L, 0xfb3e7bceL, 0x5121ce64L,
+ 0x774fbe32L,
+ 0xa8b6e37eL, 0xc3293d46L, 0x48de5369L,
+ 0x6413e680L,
+ 0xa2ae0810L, 0xdd6db224L, 0x69852dfdL,
+ 0x09072166L,
+ 0xb39a460aL, 0x6445c0ddL, 0x586cdecfL,
+ 0x1c20c8aeL,
+ 0x5bbef7ddL, 0x1b588d40L, 0xccd2017fL,
+ 0x6bb4e3bbL,
+ 0xdda26a7eL, 0x3a59ff45L, 0x3e350a44L,
+ 0xbcb4cdd5L,
+ 0x72eacea8L, 0xfa6484bbL, 0x8d6612aeL,
+ 0xbf3c6f47L,
+ 0xd29be463L, 0x542f5d9eL, 0xaec2771bL,
+ 0xf64e6370L,
+ 0x740e0d8dL, 0xe75b1357L, 0xf8721671L,
+ 0xaf537d5dL,
+ 0x4040cb08L, 0x4eb4e2ccL, 0x34d2466aL,
+ 0x0115af84L,
+ 0xe1b00428L, 0x95983a1dL, 0x06b89fb4L,
+ 0xce6ea048L,
+ 0x6f3f3b82L, 0x3520ab82L, 0x011a1d4bL,
+ 0x277227f8L,
+ 0x611560b1L, 0xe7933fdcL, 0xbb3a792bL,
+ 0x344525bdL,
+ 0xa08839e1L, 0x51ce794bL, 0x2f32c9b7L,
+ 0xa01fbac9L,
+ 0xe01cc87eL, 0xbcc7d1f6L, 0xcf0111c3L,
+ 0xa1e8aac7L,
+ 0x1a908749L, 0xd44fbd9aL, 0xd0dadecbL,
+ 0xd50ada38L,
+ 0x0339c32aL, 0xc6913667L, 0x8df9317cL,
+ 0xe0b12b4fL,
+ 0xf79e59b7L, 0x43f5bb3aL, 0xf2d519ffL,
+ 0x27d9459cL,
+ 0xbf97222cL, 0x15e6fc2aL, 0x0f91fc71L,
+ 0x9b941525L,
+ 0xfae59361L, 0xceb69cebL, 0xc2a86459L,
+ 0x12baa8d1L,
+ 0xb6c1075eL, 0xe3056a0cL, 0x10d25065L,
+ 0xcb03a442L,
+ 0xe0ec6e0eL, 0x1698db3bL, 0x4c98a0beL,
+ 0x3278e964L,
+ 0x9f1f9532L, 0xe0d392dfL, 0xd3a0342bL,
+ 0x8971f21eL,
+ 0x1b0a7441L, 0x4ba3348cL, 0xc5be7120L,
+ 0xc37632d8L,
+ 0xdf359f8dL, 0x9b992f2eL, 0xe60b6f47L,
+ 0x0fe3f11dL,
+ 0xe54cda54L, 0x1edad891L, 0xce6279cfL,
+ 0xcd3e7e6fL,
+ 0x1618b166L, 0xfd2c1d05L, 0x848fd2c5L,
+ 0xf6fb2299L,
+ 0xf523f357L, 0xa6327623L, 0x93a83531L,
+ 0x56cccd02L,
+ 0xacf08162L, 0x5a75ebb5L, 0x6e163697L,
+ 0x88d273ccL,
+ 0xde966292L, 0x81b949d0L, 0x4c50901bL,
+ 0x71c65614L,
+ 0xe6c6c7bdL, 0x327a140aL, 0x45e1d006L,
+ 0xc3f27b9aL,
+ 0xc9aa53fdL, 0x62a80f00L, 0xbb25bfe2L,
+ 0x35bdd2f6L,
+ 0x71126905L, 0xb2040222L, 0xb6cbcf7cL,
+ 0xcd769c2bL,
+ 0x53113ec0L, 0x1640e3d3L, 0x38abbd60L,
+ 0x2547adf0L,
+ 0xba38209cL, 0xf746ce76L, 0x77afa1c5L,
+ 0x20756060L,
+ 0x85cbfe4eL, 0x8ae88dd8L, 0x7aaaf9b0L,
+ 0x4cf9aa7eL,
+ 0x1948c25cL, 0x02fb8a8cL, 0x01c36ae4L,
+ 0xd6ebe1f9L,
+ 0x90d4f869L, 0xa65cdea0L, 0x3f09252dL,
+ 0xc208e69fL,
+ 0xb74e6132L, 0xce77e25bL, 0x578fdfe3L,
+ 0x3ac372e6L,
+ }
+};
+
+void BF_encrypt(BF_LONG *data, const BF_KEY *key)
+{
+ register BF_LONG l, r;
+ register const BF_LONG *p, *s;
+
+ p = key->P;
+ s = &(key->S[0]);
+ l = data[0];
+ r = data[1];
+
+ l ^= p[0];
+ BF_ENC(r, l, s, p[1]);
+ BF_ENC(l, r, s, p[2]);
+ BF_ENC(r, l, s, p[3]);
+ BF_ENC(l, r, s, p[4]);
+ BF_ENC(r, l, s, p[5]);
+ BF_ENC(l, r, s, p[6]);
+ BF_ENC(r, l, s, p[7]);
+ BF_ENC(l, r, s, p[8]);
+ BF_ENC(r, l, s, p[9]);
+ BF_ENC(l, r, s, p[10]);
+ BF_ENC(r, l, s, p[11]);
+ BF_ENC(l, r, s, p[12]);
+ BF_ENC(r, l, s, p[13]);
+ BF_ENC(l, r, s, p[14]);
+ BF_ENC(r, l, s, p[15]);
+ BF_ENC(l, r, s, p[16]);
+# if BF_ROUNDS == 20
+ BF_ENC(r, l, s, p[17]);
+ BF_ENC(l, r, s, p[18]);
+ BF_ENC(r, l, s, p[19]);
+ BF_ENC(l, r, s, p[20]);
+# endif
+ r ^= p[BF_ROUNDS + 1];
+
+ data[1] = l & 0xffffffffU;
+ data[0] = r & 0xffffffffU;
+}
+
+void BF_decrypt(BF_LONG *data, const BF_KEY *key)
+{
+ register BF_LONG l, r;
+ register const BF_LONG *p, *s;
+
+ p = key->P;
+ s = &(key->S[0]);
+ l = data[0];
+ r = data[1];
+
+ l ^= p[BF_ROUNDS + 1];
+# if BF_ROUNDS == 20
+ BF_ENC(r, l, s, p[20]);
+ BF_ENC(l, r, s, p[19]);
+ BF_ENC(r, l, s, p[18]);
+ BF_ENC(l, r, s, p[17]);
+# endif
+ BF_ENC(r, l, s, p[16]);
+ BF_ENC(l, r, s, p[15]);
+ BF_ENC(r, l, s, p[14]);
+ BF_ENC(l, r, s, p[13]);
+ BF_ENC(r, l, s, p[12]);
+ BF_ENC(l, r, s, p[11]);
+ BF_ENC(r, l, s, p[10]);
+ BF_ENC(l, r, s, p[9]);
+ BF_ENC(r, l, s, p[8]);
+ BF_ENC(l, r, s, p[7]);
+ BF_ENC(r, l, s, p[6]);
+ BF_ENC(l, r, s, p[5]);
+ BF_ENC(r, l, s, p[4]);
+ BF_ENC(l, r, s, p[3]);
+ BF_ENC(r, l, s, p[2]);
+ BF_ENC(l, r, s, p[1]);
+ r ^= p[0];
+
+ data[1] = l & 0xffffffffU;
+ data[0] = r & 0xffffffffU;
+}
+
+void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+ long length, const BF_KEY *schedule,
+ unsigned char *ivec, int *num, int encrypt)
+{
+ register BF_LONG v0, v1, t;
+ register int n = *num;
+ register long l = length;
+ BF_LONG ti[2];
+ unsigned char *iv, c, cc;
+
+ iv = (unsigned char *)ivec;
+ if (encrypt) {
+ while (l--) {
+ if (n == 0) {
+ n2l(iv, v0);
+ ti[0] = v0;
+ n2l(iv, v1);
+ ti[1] = v1;
+ BF_encrypt((BF_LONG *)ti, schedule);
+ iv = (unsigned char *)ivec;
+ t = ti[0];
+ l2n(t, iv);
+ t = ti[1];
+ l2n(t, iv);
+ iv = (unsigned char *)ivec;
+ }
+ c = *(in++) ^ iv[n];
+ *(out++) = c;
+ iv[n] = c;
+ n = (n + 1) & 0x07;
+ }
+ } else {
+ while (l--) {
+ if (n == 0) {
+ n2l(iv, v0);
+ ti[0] = v0;
+ n2l(iv, v1);
+ ti[1] = v1;
+ BF_encrypt((BF_LONG *)ti, schedule);
+ iv = (unsigned char *)ivec;
+ t = ti[0];
+ l2n(t, iv);
+ t = ti[1];
+ l2n(t, iv);
+ iv = (unsigned char *)ivec;
+ }
+ cc = *(in++);
+ c = iv[n];
+ iv[n] = cc;
+ *(out++) = c ^ cc;
+ n = (n + 1) & 0x07;
+ }
+ }
+ v0 = v1 = ti[0] = ti[1] = t = c = cc = 0;
+ *num = n;
+}
+
+const char *BF_options(void)
+{
+ return "blowfish(ptr)";
+}
+
+void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
+ const BF_KEY *key, int encrypt)
+{
+ BF_LONG l, d[2];
+
+ n2l(in, l);
+ d[0] = l;
+ n2l(in, l);
+ d[1] = l;
+ if (encrypt)
+ BF_encrypt(d, key);
+ else
+ BF_decrypt(d, key);
+ l = d[0];
+ l2n(l, out);
+ l = d[1];
+ l2n(l, out);
+ l = d[0] = d[1] = 0;
+}
+
+#if (BF_ROUNDS != 16) && (BF_ROUNDS != 20)
+# error If you set BF_ROUNDS to some value other than 16 or 20, you will have \
+to modify the code.
+#endif
+
+void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+ const BF_KEY *schedule, unsigned char *ivec, int encrypt)
+{
+ register BF_LONG tin0, tin1;
+ register BF_LONG tout0, tout1, xor0, xor1;
+ register long l = length;
+ BF_LONG tin[2];
+
+ if (encrypt) {
+ n2l(ivec, tout0);
+ n2l(ivec, tout1);
+ ivec -= 8;
+ for (l -= 8; l >= 0; l -= 8) {
+ n2l(in, tin0);
+ n2l(in, tin1);
+ tin0 ^= tout0;
+ tin1 ^= tout1;
+ tin[0] = tin0;
+ tin[1] = tin1;
+ BF_encrypt(tin, schedule);
+ tout0 = tin[0];
+ tout1 = tin[1];
+ l2n(tout0, out);
+ l2n(tout1, out);
+ }
+ if (1||l != -8) {
+ unsigned char tmpin[16];
+ unsigned char *ptmpin = tmpin;
+ memcpy(tmpin, in, l + 8);
+ memcpy(tmpin + l + 8, &length, 4);
+ int pad_length = (8-(l + 8 + 4 + 1)%8)%8;
+ for(int i = 0; i < pad_length; ++i)
+ {
+ tmpin[l+8+4+i]=16;//prng better
+ }
+ tmpin[l+8+4+pad_length]=pad_length;
+// for(int i = 0; i < l + 8 + 4 +1 +pad_length; ++i)
+// {
+// printf("%.2x ", tmpin[i]);
+// }
+// printf("\n");fflush(stdout);
+ n2l(ptmpin, tin0);
+ n2l(ptmpin, tin1);
+ tin0 ^= tout0;
+ tin1 ^= tout1;
+ tin[0] = tin0;
+ tin[1] = tin1;
+ BF_encrypt(tin, schedule);
+ tout0 = tin[0];
+ tout1 = tin[1];
+ l2n(tout0, out);
+ l2n(tout1, out);
+ if(l+8+4+pad_length + 1 == 16)
+ {
+ n2l(ptmpin, tin0);
+ n2l(ptmpin, tin1);
+ tin0 ^= tout0;
+ tin1 ^= tout1;
+ tin[0] = tin0;
+ tin[1] = tin1;
+ BF_encrypt(tin, schedule);
+ tout0 = tin[0];
+ tout1 = tin[1];
+ l2n(tout0, out);
+ l2n(tout1, out);
+ }
+
+
+// n2ln(in, tin0, tin1, l + 8);
+// tin0 ^= tout0;
+// tin1 ^= tout1;
+// tin[0] = tin0;
+// tin[1] = tin1;
+// BF_encrypt(tin, schedule);
+// tout0 = tin[0];
+// tout1 = tin[1];
+// l2n(tout0, out);
+// l2n(tout1, out);
+ }
+ l2n(tout0, ivec);
+ l2n(tout1, ivec);
+ } else {
+ n2l(ivec, xor0);
+ n2l(ivec, xor1);
+ ivec -= 8;
+ for (l -= 8; l >= 0; l -= 8) {
+ n2l(in, tin0);
+ n2l(in, tin1);
+ tin[0] = tin0;
+ tin[1] = tin1;
+ BF_decrypt(tin, schedule);
+ tout0 = tin[0] ^ xor0;
+ tout1 = tin[1] ^ xor1;
+ l2n(tout0, out);
+ l2n(tout1, out);
+ xor0 = tin0;
+ xor1 = tin1;
+ }
+ if (l != -8) {
+ n2l(in, tin0);
+ n2l(in, tin1);
+ tin[0] = tin0;
+ tin[1] = tin1;
+ BF_decrypt(tin, schedule);
+ tout0 = tin[0] ^ xor0;
+ tout1 = tin[1] ^ xor1;
+ l2nn(tout0, tout1, out, l + 8);
+ xor0 = tin0;
+ xor1 = tin1;
+ }
+ l2n(xor0, ivec);
+ l2n(xor1, ivec);
+ }
+ tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
+ tin[0] = tin[1] = 0;
+}
+
+void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out,
+ long length, const BF_KEY *schedule,
+ unsigned char *ivec, int *num)
+{
+ register BF_LONG v0, v1, t;
+ register int n = *num;
+ register long l = length;
+ unsigned char d[8];
+ register char *dp;
+ BF_LONG ti[2];
+ unsigned char *iv;
+ int save = 0;
+
+ iv = (unsigned char *)ivec;
+ n2l(iv, v0);
+ n2l(iv, v1);
+ ti[0] = v0;
+ ti[1] = v1;
+ dp = (char *)d;
+ l2n(v0, dp);
+ l2n(v1, dp);
+ while (l--) {
+ if (n == 0) {
+ BF_encrypt((BF_LONG *)ti, schedule);
+ dp = (char *)d;
+ t = ti[0];
+ l2n(t, dp);
+ t = ti[1];
+ l2n(t, dp);
+ save++;
+ }
+ *(out++) = *(in++) ^ d[n];
+ n = (n + 1) & 0x07;
+ }
+ if (save) {
+ v0 = ti[0];
+ v1 = ti[1];
+ iv = (unsigned char *)ivec;
+ l2n(v0, iv);
+ l2n(v1, iv);
+ }
+ t = v0 = v1 = ti[0] = ti[1] = 0;
+ *num = n;
+}
+
+void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
+{
+ int i;
+ BF_LONG *p, ri, in[2];
+ const unsigned char *d, *end;
+
+ memcpy(key, &bf_init, sizeof(BF_KEY));
+ p = key->P;
+
+ if (len > ((BF_ROUNDS + 2) * 4))
+ len = (BF_ROUNDS + 2) * 4;
+
+ d = data;
+ end = &(data[len]);
+ for (i = 0; i < (BF_ROUNDS + 2); i++) {
+ ri = *(d++);
+ if (d >= end)
+ d = data;
+
+ ri <<= 8;
+ ri |= *(d++);
+ if (d >= end)
+ d = data;
+
+ ri <<= 8;
+ ri |= *(d++);
+ if (d >= end)
+ d = data;
+
+ ri <<= 8;
+ ri |= *(d++);
+ if (d >= end)
+ d = data;
+
+ p[i] ^= ri;
+ }
+
+ in[0] = 0L;
+ in[1] = 0L;
+ for (i = 0; i < (BF_ROUNDS + 2); i += 2) {
+ BF_encrypt(in, key);
+ p[i] = in[0];
+ p[i + 1] = in[1];
+ }
+
+ p = key->S;
+ for (i = 0; i < 4 * 256; i += 2) {
+ BF_encrypt(in, key);
+ p[i] = in[0];
+ p[i + 1] = in[1];
+ }
+}
diff --git a/dap-sdk/crypto/src/blowfish/blowfish.h b/dap-sdk/crypto/src/blowfish/blowfish.h
index 7ee87e636d..8326a5a844 100644
--- a/dap-sdk/crypto/src/blowfish/blowfish.h
+++ b/dap-sdk/crypto/src/blowfish/blowfish.h
@@ -1,13 +1,9 @@
//max using key size = (BF_ROUNDS + 2)*4 bytes = 72 bytes
#ifndef BLOWFISH_H
-# define BLOWFISH_H
-# pragma once
+#define BLOWFISH_H
#include "inttypes.h"
-# ifdef __cplusplus
-extern "C" {
-# endif
# define BF_BLOCK 8
@@ -29,6 +25,9 @@ typedef struct bf_key_st {
} BF_KEY;
+# ifdef __cplusplus
+extern "C" {
+# endif
void BF_set_key(BF_KEY *key, int len,
const unsigned char *data);
@@ -55,5 +54,5 @@ const char *BF_options(void);
# ifdef __cplusplus
}
# endif
-# endif
+#endif
diff --git a/dap-sdk/crypto/src/blowfish/blowfish.pri b/dap-sdk/crypto/src/blowfish/blowfish.pri
index fc7a886f3c..7c0dc12ee1 100644
--- a/dap-sdk/crypto/src/blowfish/blowfish.pri
+++ b/dap-sdk/crypto/src/blowfish/blowfish.pri
@@ -1,11 +1,6 @@
INCLUDEPATH += $$PWD
HEADERS += $$PWD/blowfish.h \
- $$PWD/bf_local.h \
- $$PWD/bf_pi.h
+ $$PWD/bf_local.h
-SOURCES += $$PWD/bf_cfb64.c \
- $$PWD/bf_ecb.c \
- $$PWD/bf_enc.c \
- $$PWD/bf_ofb64.c \
- $$PWD/bf_skey.c
+SOURCES += $$PWD/blowfish.c
diff --git a/dap-sdk/crypto/src/dap_enc_salsa2012.c b/dap-sdk/crypto/src/dap_enc_salsa2012.c
index 767f9fb9e0..68c4b577f9 100644
--- a/dap-sdk/crypto/src/dap_enc_salsa2012.c
+++ b/dap-sdk/crypto/src/dap_enc_salsa2012.c
@@ -13,6 +13,8 @@
#define SALSA20_KEY_SIZE 32
#define SALSA20_NONCE_SIZE 8
+#define DAP_DEL_Z DAP_DELETE
+
void dap_enc_salsa2012_key_generate(struct dap_enc_key * a_key, const void *kex_buf,
size_t kex_size, const void * seed, size_t seed_size, size_t key_size)
{
diff --git a/dap-sdk/crypto/src/salsa2012/salsa2012.pri b/dap-sdk/crypto/src/salsa2012/salsa2012.pri
index 30fa47d94c..7016c01291 100644
--- a/dap-sdk/crypto/src/salsa2012/salsa2012.pri
+++ b/dap-sdk/crypto/src/salsa2012/salsa2012.pri
@@ -3,8 +3,8 @@ INCLUDEPATH += $$PWD
HEADERS += $$PWD/common_salsa.h \
$$PWD/crypto_core_salsa2012.h \
$$PWD/crypto_stream_salsa2012.h \
- $$PWD/utils.h \
+ $$PWD/utils.h
SOURCES += $$PWD/core_salsa_ref.c \
$$PWD/stream_salsa2012.c \
- $$PWD/stream_salsa2012_ref.c \
+ $$PWD/stream_salsa2012_ref.c
diff --git a/dap-sdk/crypto/src/sig_tesla/poly.c b/dap-sdk/crypto/src/sig_tesla/poly.c
deleted file mode 100755
index 8d2fb6f86c..0000000000
--- a/dap-sdk/crypto/src/sig_tesla/poly.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*************************************************************************************
-* qTESLA: an efficient post-quantum signature scheme based on the R-LWE problem
-*
-* Abstract: NTT, modular reduction and polynomial functions
-**************************************************************************************/
-
-#include "tesla_params.h"
-
-int64_t reduce(int64_t a, tesla_param_t *p) { // Montgomery reduction
-
- int64_t u;
-
- u = (a * (int64_t)(p->PARAM_QINV)) & 0xFFFFFFFF;
- u *= (int64_t)(p->PARAM_Q);
- a += u;
- return a >> 32;
-}
-
-int64_t barr_reduce(int64_t a, tesla_param_t *p) { // Barrett reduction
-
- int64_t u = ((a * (int64_t)(p->PARAM_BARR_MULT)) >> (int64_t)(p->PARAM_BARR_DIV)) * (int64_t)(p->PARAM_Q);
- return a - u;
-}
-
-void ntt(poly *a, const poly *w, tesla_param_t *p) { // Forward NTT transform
-
- int Par_Q = (int)(p->PARAM_Q);
- int NumoProblems = p->PARAM_N >> 1, jTwiddle = 0;
-
- for (; NumoProblems > 0; NumoProblems >>= 1) {
- uint32_t jFirst, j = 0;
- for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
- int W = w[jTwiddle++];
- for (j = jFirst; j < jFirst + NumoProblems; j++) {
- if(p->kind <= 3) {
- int temp = reduce(W * a[j + NumoProblems], p);
- a[j + NumoProblems] = a[j] + (Par_Q - temp);
- a[j] = temp + a[j];
- }
- else {
- int temp = barr_reduce(reduce(W * a[j + NumoProblems], p), p);
- a[j + NumoProblems] = barr_reduce(a[j] + (2LL * Par_Q - temp), p);
- a[j] = barr_reduce(temp + a[j], p);
- }
- }
- }
- }
-}
-
-void nttinv(poly *a, const poly *w, tesla_param_t *p) { // Inverse NTT transform
-
- unsigned int NumoProblems = 1, jTwiddle = 0;
- for (NumoProblems = 1; NumoProblems < p->PARAM_N; NumoProblems *= 2) {
- unsigned int jFirst, j = 0;
- if(p->kind == 0) {
- for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
- int W = w[jTwiddle++];
- for (j = jFirst; j < jFirst + NumoProblems; j++) {
- int temp = a[j];
- a[j] = barr_reduce(temp + a[j + NumoProblems], p);
- a[j + NumoProblems] = reduce(W * (temp + (2 * p->PARAM_Q - a[j + NumoProblems])), p);
- }
- }
- }
-
- if(p->kind >= 1 && p->kind <= 3) {
- for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
- int W = w[jTwiddle++];
- for (j = jFirst; j < jFirst + NumoProblems; j++) {
- int temp = a[j];
- a[j] = (temp + a[j + NumoProblems]);
- a[j + NumoProblems] = reduce(W * (temp + (2 * (int64_t)(p->PARAM_Q) - a[j + NumoProblems])), p);
- }
- }
- NumoProblems *= 2;
- for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
- int W = w[jTwiddle++];
- for (j = jFirst; j < jFirst + NumoProblems; j++) {
- int temp = a[j];
- a[j] = barr_reduce(temp + a[j + NumoProblems], p);
- a[j + NumoProblems] = reduce(W * (temp + (2 * (int64_t)(p->PARAM_Q) - a[j + NumoProblems])), p);
- }
- }
- }
-
- if(p->kind == 4) {
- for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
- int W = w[jTwiddle++];
- for (j = jFirst; j < jFirst + NumoProblems; j++) {
- int temp = a[j];
- a[j] = barr_reduce((temp + a[j + NumoProblems]), p);
- a[j + NumoProblems] = barr_reduce(reduce(W * (temp + (2LL * p->PARAM_Q - a[j + NumoProblems])), p), p);
- }
- }
- }
- }
-}
-
-void poly_pointwise(poly *result, const poly *x, const poly *y, tesla_param_t *p) { // Pointwise polynomial multiplication result = x.y
-
- unsigned int i;
-
- for (i = 0; i < p->PARAM_N; i++)
- result[i] = reduce(x[i] * y[i], p);
-}
-
-void poly_ntt(poly *x_ntt, const poly *x, tesla_param_t *p) { // Call to NTT function. Avoids input destruction
-
- unsigned int i;
-
- poly *zeta = malloc(p->PARAM_N * sizeof(int64_t));
- poly *zetainv = malloc(p->PARAM_N * sizeof(int64_t));
- init_mass_poly( zeta, zetainv, p);
-
- for (i = 0; i < p->PARAM_N; i++)
- x_ntt[i] = x[i];
- ntt(x_ntt, zeta, p);
-
- free(zeta);
- zeta = NULL;
- free(zetainv);
- zetainv = NULL;
-}
-
-void poly_mul(poly *result, const poly *x, const poly *y, tesla_param_t *p) { // Polynomial multiplication result = x*y, with in place reduction for (X^N+1)
- // The inputs x and y are assumed to be in NTT form
-
- poly *zeta = malloc(p->PARAM_N * sizeof(int64_t));
- poly *zetainv = malloc(p->PARAM_N * sizeof(int64_t));
- init_mass_poly( zeta, zetainv, p);
-
- if(p->kind <= 2) {
- poly *y_ntt = malloc(p->PARAM_N * sizeof(int64_t));
- unsigned int i;
- for ( i = 0; i < p->PARAM_N; i++)
- y_ntt[i] = y[i];
-
- ntt(y_ntt, zeta, p);
- poly_pointwise(result, x, y_ntt, p);
-
- free(y_ntt);
- y_ntt = NULL;
- }
- else {
- poly_pointwise(result, x, y, p);
- }
-
- nttinv(result, zetainv, p);
-
- free(zeta);
- zeta = NULL;
- free(zetainv);
- zetainv = NULL;
-}
-
-void poly_add(poly *result, const poly *x, const poly *y, tesla_param_t *p) { // Polynomial addition result = x+y
-
- unsigned int i;
-
- for (i = 0; i < p->PARAM_N; i++)
- result[i] = x[i] + y[i];
-}
-
-void poly_sub(poly *result, const poly *x, const poly *y, tesla_param_t *p) { // Polynomial subtraction result = x-y
-
- unsigned int i;
-
- if(p->kind <= 2)
- for (i = 0; i < p->PARAM_N; i++)
- result[i] = barr_reduce(x[i] + (2 * p->PARAM_Q - y[i]), p);
- else
- for (i = 0; i < p->PARAM_N; i++)
- result[i] = barr_reduce(x[i] - y[i], p);
-}
-
-void poly_uniform(poly_k *a, const unsigned char *seed, tesla_param_t *p) {
-
- // Generation of polynomials "a_i"
- unsigned int pos = 0, i = 0, nbytes = (p->PARAM_Q_LOG + 7) / 8;
- unsigned int nblocks = p->PARAM_GEN_A;
- uint32_t val1, val2, val3, val4, mask = (uint32_t)(1 << p->PARAM_Q_LOG) - 1;
- unsigned char *buf = malloc(SHAKE128_RATE * nblocks * sizeof(char));
- uint16_t dmsp = 0;
-
- cshake128_simple( buf, SHAKE128_RATE * nblocks, dmsp++, seed, CRYPTO_RANDOMBYTES);
-// cSHAKE128( seed, CRYPTO_RANDOMBYTES * 8, buf, SHAKE128_RATE * nblocks * 8, NULL, 0, &dmsp, 16 );
-// ++ dmsp;
- while (i < p->PARAM_K * p->PARAM_N) {
- if (pos > SHAKE128_RATE * nblocks - 4 * nbytes) {
- nblocks = 1;
- cshake128_simple(buf, SHAKE128_RATE * nblocks, dmsp++, seed, CRYPTO_RANDOMBYTES);
-// cSHAKE128( seed, CRYPTO_RANDOMBYTES * 8, buf, SHAKE128_RATE * nblocks * 8, NULL, 0, &dmsp, 16 );
-// ++ dmsp;
- pos = 0;
- }
- val1 = (*(uint32_t *) (buf + pos)) & mask;
- pos += nbytes;
- val2 = (*(uint32_t *) (buf + pos)) & mask;
- pos += nbytes;
- val3 = (*(uint32_t *) (buf + pos)) & mask;
- pos += nbytes;
- val4 = (*(uint32_t *) (buf + pos)) & mask;
- pos += nbytes;
- if (val1 < p->PARAM_Q && i < p->PARAM_K * p->PARAM_N)
- a[i++] = reduce((int64_t) val1 * p->PARAM_R2_INVN, p);
- if (val2 < p->PARAM_Q && i < p->PARAM_K * p->PARAM_N)
- a[i++] = reduce((int64_t) val2 * p->PARAM_R2_INVN, p);
- if (val3 < p->PARAM_Q && i < p->PARAM_K * p->PARAM_N)
- a[i++] = reduce((int64_t) val3 * p->PARAM_R2_INVN, p);
- if (val4 < p->PARAM_Q && i < p->PARAM_K * p->PARAM_N)
- a[i++] = reduce((int64_t) val4 * p->PARAM_R2_INVN, p);
- }
- free(buf);
- buf = NULL;
-}
diff --git a/dap-sdk/crypto/src/sig_tesla/sig_tesla.pri b/dap-sdk/crypto/src/sig_tesla/sig_tesla.pri
index 6ec7df10c3..0f45f03ef7 100755
--- a/dap-sdk/crypto/src/sig_tesla/sig_tesla.pri
+++ b/dap-sdk/crypto/src/sig_tesla/sig_tesla.pri
@@ -1,10 +1,9 @@
-HEADERS += $$PWD/tesla_params.h \
+HEADERS += $$PWD/tesla_params.h
SOURCES += $$PWD/consts.c \
- $$PWD/poly.c \
$$PWD/sample.c \
$$PWD/sign.c \
- $$PWD/tesla_params.c \
+ $$PWD/tesla_params.c
INCLUDEPATH += $$PWD
diff --git a/dap-sdk/crypto/src/sig_tesla/tesla_params.c b/dap-sdk/crypto/src/sig_tesla/tesla_params.c
index 088a2a3648..5ed1f42de4 100755
--- a/dap-sdk/crypto/src/sig_tesla/tesla_params.c
+++ b/dap-sdk/crypto/src/sig_tesla/tesla_params.c
@@ -2,7 +2,6 @@
#include <string.h>
#include "tesla_params.h"
-
static const tesla_param_t tesla_params[] = {
{ qTESLA_I, /* kind */
@@ -158,3 +157,211 @@ bool tesla_params_init(tesla_param_t *params, tesla_kind_t kind){
return false;
}
}
+
+int64_t reduce(int64_t a, tesla_param_t *p) { // Montgomery reduction
+
+ int64_t u;
+
+ u = (a * (int64_t)(p->PARAM_QINV)) & 0xFFFFFFFF;
+ u *= (int64_t)(p->PARAM_Q);
+ a += u;
+ return a >> 32;
+}
+
+int64_t barr_reduce(int64_t a, tesla_param_t *p) { // Barrett reduction
+
+ int64_t u = ((a * (int64_t)(p->PARAM_BARR_MULT)) >> (int64_t)(p->PARAM_BARR_DIV)) * (int64_t)(p->PARAM_Q);
+ return a - u;
+}
+
+void ntt(poly *a, const poly *w, tesla_param_t *p) { // Forward NTT transform
+
+ int Par_Q = (int)(p->PARAM_Q);
+ int NumoProblems = p->PARAM_N >> 1, jTwiddle = 0;
+
+ for (; NumoProblems > 0; NumoProblems >>= 1) {
+ uint32_t jFirst, j = 0;
+ for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
+ int W = w[jTwiddle++];
+ for (j = jFirst; j < jFirst + NumoProblems; j++) {
+ if(p->kind <= 3) {
+ int temp = reduce(W * a[j + NumoProblems], p);
+ a[j + NumoProblems] = a[j] + (Par_Q - temp);
+ a[j] = temp + a[j];
+ }
+ else {
+ int temp = barr_reduce(reduce(W * a[j + NumoProblems], p), p);
+ a[j + NumoProblems] = barr_reduce(a[j] + (2LL * Par_Q - temp), p);
+ a[j] = barr_reduce(temp + a[j], p);
+ }
+ }
+ }
+ }
+}
+
+void nttinv(poly *a, const poly *w, tesla_param_t *p) { // Inverse NTT transform
+
+ unsigned int NumoProblems = 1, jTwiddle = 0;
+ for (NumoProblems = 1; NumoProblems < p->PARAM_N; NumoProblems *= 2) {
+ unsigned int jFirst, j = 0;
+ if(p->kind == 0) {
+ for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
+ int W = w[jTwiddle++];
+ for (j = jFirst; j < jFirst + NumoProblems; j++) {
+ int temp = a[j];
+ a[j] = barr_reduce(temp + a[j + NumoProblems], p);
+ a[j + NumoProblems] = reduce(W * (temp + (2 * p->PARAM_Q - a[j + NumoProblems])), p);
+ }
+ }
+ }
+
+ if(p->kind >= 1 && p->kind <= 3) {
+ for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
+ int W = w[jTwiddle++];
+ for (j = jFirst; j < jFirst + NumoProblems; j++) {
+ int temp = a[j];
+ a[j] = (temp + a[j + NumoProblems]);
+ a[j + NumoProblems] = reduce(W * (temp + (2 * (int64_t)(p->PARAM_Q) - a[j + NumoProblems])), p);
+ }
+ }
+ NumoProblems *= 2;
+ for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
+ int W = w[jTwiddle++];
+ for (j = jFirst; j < jFirst + NumoProblems; j++) {
+ int temp = a[j];
+ a[j] = barr_reduce(temp + a[j + NumoProblems], p);
+ a[j + NumoProblems] = reduce(W * (temp + (2 * (int64_t)(p->PARAM_Q) - a[j + NumoProblems])), p);
+ }
+ }
+ }
+
+ if(p->kind == 4) {
+ for (jFirst = 0; jFirst < p->PARAM_N; jFirst = j + NumoProblems) {
+ int W = w[jTwiddle++];
+ for (j = jFirst; j < jFirst + NumoProblems; j++) {
+ int temp = a[j];
+ a[j] = barr_reduce((temp + a[j + NumoProblems]), p);
+ a[j + NumoProblems] = barr_reduce(reduce(W * (temp + (2LL * p->PARAM_Q - a[j + NumoProblems])), p), p);
+ }
+ }
+ }
+ }
+}
+
+void poly_pointwise(poly *result, const poly *x, const poly *y, tesla_param_t *p) { // Pointwise polynomial multiplication result = x.y
+
+ unsigned int i;
+
+ for (i = 0; i < p->PARAM_N; i++)
+ result[i] = reduce(x[i] * y[i], p);
+}
+
+void poly_ntt(poly *x_ntt, const poly *x, tesla_param_t *p) { // Call to NTT function. Avoids input destruction
+
+ unsigned int i;
+
+ poly *zeta = malloc(p->PARAM_N * sizeof(int64_t));
+ poly *zetainv = malloc(p->PARAM_N * sizeof(int64_t));
+ init_mass_poly( zeta, zetainv, p);
+
+ for (i = 0; i < p->PARAM_N; i++)
+ x_ntt[i] = x[i];
+ ntt(x_ntt, zeta, p);
+
+ free(zeta);
+ zeta = NULL;
+ free(zetainv);
+ zetainv = NULL;
+}
+
+void poly_mul(poly *result, const poly *x, const poly *y, tesla_param_t *p) { // Polynomial multiplication result = x*y, with in place reduction for (X^N+1)
+ // The inputs x and y are assumed to be in NTT form
+
+ poly *zeta = malloc(p->PARAM_N * sizeof(int64_t));
+ poly *zetainv = malloc(p->PARAM_N * sizeof(int64_t));
+ init_mass_poly( zeta, zetainv, p);
+
+ if(p->kind <= 2) {
+ poly *y_ntt = malloc(p->PARAM_N * sizeof(int64_t));
+ unsigned int i;
+ for ( i = 0; i < p->PARAM_N; i++)
+ y_ntt[i] = y[i];
+
+ ntt(y_ntt, zeta, p);
+ poly_pointwise(result, x, y_ntt, p);
+
+ free(y_ntt);
+ y_ntt = NULL;
+ }
+ else {
+ poly_pointwise(result, x, y, p);
+ }
+
+ nttinv(result, zetainv, p);
+
+ free(zeta);
+ zeta = NULL;
+ free(zetainv);
+ zetainv = NULL;
+}
+
+void poly_add(poly *result, const poly *x, const poly *y, tesla_param_t *p) { // Polynomial addition result = x+y
+
+ unsigned int i;
+
+ for (i = 0; i < p->PARAM_N; i++)
+ result[i] = x[i] + y[i];
+}
+
+void poly_sub(poly *result, const poly *x, const poly *y, tesla_param_t *p) { // Polynomial subtraction result = x-y
+
+ unsigned int i;
+
+ if(p->kind <= 2)
+ for (i = 0; i < p->PARAM_N; i++)
+ result[i] = barr_reduce(x[i] + (2 * p->PARAM_Q - y[i]), p);
+ else
+ for (i = 0; i < p->PARAM_N; i++)
+ result[i] = barr_reduce(x[i] - y[i], p);
+}
+
+void poly_uniform(poly_k *a, const unsigned char *seed, tesla_param_t *p) {
+
+ // Generation of polynomials "a_i"
+ unsigned int pos = 0, i = 0, nbytes = (p->PARAM_Q_LOG + 7) / 8;
+ unsigned int nblocks = p->PARAM_GEN_A;
+ uint32_t val1, val2, val3, val4, mask = (uint32_t)(1 << p->PARAM_Q_LOG) - 1;
+ unsigned char *buf = malloc(SHAKE128_RATE * nblocks * sizeof(char));
+ uint16_t dmsp = 0;
+
+ cshake128_simple( buf, SHAKE128_RATE * nblocks, dmsp++, seed, CRYPTO_RANDOMBYTES);
+// cSHAKE128( seed, CRYPTO_RANDOMBYTES * 8, buf, SHAKE128_RATE * nblocks * 8, NULL, 0, &dmsp, 16 );
+// ++ dmsp;
+ while (i < p->PARAM_K * p->PARAM_N) {
+ if (pos > SHAKE128_RATE * nblocks - 4 * nbytes) {
+ nblocks = 1;
+ cshake128_simple(buf, SHAKE128_RATE * nblocks, dmsp++, seed, CRYPTO_RANDOMBYTES);
+// cSHAKE128( seed, CRYPTO_RANDOMBYTES * 8, buf, SHAKE128_RATE * nblocks * 8, NULL, 0, &dmsp, 16 );
+// ++ dmsp;
+ pos = 0;
+ }
+ val1 = (*(uint32_t *) (buf + pos)) & mask;
+ pos += nbytes;
+ val2 = (*(uint32_t *) (buf + pos)) & mask;
+ pos += nbytes;
+ val3 = (*(uint32_t *) (buf + pos)) & mask;
+ pos += nbytes;
+ val4 = (*(uint32_t *) (buf + pos)) & mask;
+ pos += nbytes;
+ if (val1 < p->PARAM_Q && i < p->PARAM_K * p->PARAM_N)
+ a[i++] = reduce((int64_t) val1 * p->PARAM_R2_INVN, p);
+ if (val2 < p->PARAM_Q && i < p->PARAM_K * p->PARAM_N)
+ a[i++] = reduce((int64_t) val2 * p->PARAM_R2_INVN, p);
+ if (val3 < p->PARAM_Q && i < p->PARAM_K * p->PARAM_N)
+ a[i++] = reduce((int64_t) val3 * p->PARAM_R2_INVN, p);
+ if (val4 < p->PARAM_Q && i < p->PARAM_K * p->PARAM_N)
+ a[i++] = reduce((int64_t) val4 * p->PARAM_R2_INVN, p);
+ }
+ free(buf);
+ buf = NULL;
+}
diff --git a/dap-sdk/crypto/src/sig_tesla/tesla_params.h b/dap-sdk/crypto/src/sig_tesla/tesla_params.h
index 15df3238e5..887cc80a7c 100755
--- a/dap-sdk/crypto/src/sig_tesla/tesla_params.h
+++ b/dap-sdk/crypto/src/sig_tesla/tesla_params.h
@@ -68,6 +68,13 @@ typedef struct {
unsigned long long sig_len;
} tesla_signature_t;
+///==========================================================================================
+typedef int64_t poly;//[ 2048 ]; //PARAM_N __attribute__ ((aligned(32)))
+typedef int64_t poly_k;//[ 5 * 2048]; // PARAM_K * PARAM_N __attribute__ ((aligned(32)))
+
+#ifdef __cplusplus
+extern "C" {
+#endif
///==========================================================================================
bool tesla_params_init(tesla_param_t *, tesla_kind_t );
@@ -84,10 +91,6 @@ void tesla_private_and_public_keys_delete(tesla_private_key_t *private_key, tesl
void tesla_signature_delete(tesla_signature_t *signature);
-///==========================================================================================
-typedef int64_t poly;//[ 2048 ]; //PARAM_N __attribute__ ((aligned(32)))
-typedef int64_t poly_k;//[ 5 * 2048]; // PARAM_K * PARAM_N __attribute__ ((aligned(32)))
-
int64_t init_mass_poly(poly *zeta, poly *zetainv, tesla_param_t *p);
int64_t reduce(int64_t a, tesla_param_t *p);
int64_t barr_reduce(int64_t a, tesla_param_t *p);
@@ -106,6 +109,10 @@ void sample_y(int64_t *y, const unsigned char *seed, int nonce, tesla_param_t *p
void sample_gauss_poly(int64_t *x, const unsigned char *seed, int nonce, tesla_param_t *p);
void encode_c(uint32_t *pos_list, int16_t *sign_list, unsigned char *c_bin, tesla_param_t *p);
+#ifdef __cplusplus
+}
+#endif
+
#endif
--
GitLab