mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-04 22:40:05 +00:00
Tried to manually merge kamilprzyb and main repo's code (#45)
* Merge kamilprzyb and main repo's code * Update Makefile by FunnHornhoover * Update Makefile by FinnHornhoover * Add flag to Makefile by FinnHornhoover * Remove extra line from makefile * Remove lbcrypt from Makefile * Fix flag to Makefile by FinnHornhoover * Reimplement potential fix for tutorial blackscreen by Dongresources * Update CMakeLists.txt * Update CMakeLists.txt * Reinsert Jade's changes * Cosmetic Changes to Databases .h & .cpp * Remove CMakeSettings.json * Update Makefile by Finn Hornhoover * More cosmetic changes to Databases.cpp * More cosmetic changes to Databases.cpp * Remove unnecessary line (CMakeSettings.json) * Fix CNLoginServer.cpp * More cosmetic Changes to Database.hpp, edit Database.cpp to use JSON library onstead of json11 library, and delete json11 library files * Delete json11 library files * Delete JSON library to reupload * Reupload JSON library from main repo * Reupload JSON library from main repo * Fix syntax error * Fix Makefile * Remove commented line of code to be like master Co-authored-by: CPunch <sethtstubbs@gmail.com>
This commit is contained in:
parent
5c8a0069fc
commit
5cf7225f52
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@ CMakeCache.txt
|
|||||||
build/
|
build/
|
||||||
.vs/
|
.vs/
|
||||||
.idea/
|
.idea/
|
||||||
|
*.db
|
||||||
|
@ -33,7 +33,7 @@ endif()
|
|||||||
|
|
||||||
include_directories(src)
|
include_directories(src)
|
||||||
|
|
||||||
file(GLOB_RECURSE SOURCES src/**.cpp src/**.hpp)
|
file(GLOB_RECURSE SOURCES src/**.cpp src/**.hpp src/**.c src/**.h)
|
||||||
|
|
||||||
add_executable(openfusion ${SOURCES})
|
add_executable(openfusion ${SOURCES})
|
||||||
|
|
||||||
|
52
Makefile
52
Makefile
@ -1,7 +1,9 @@
|
|||||||
|
CC=clang
|
||||||
CXX=clang++
|
CXX=clang++
|
||||||
# -w suppresses all warnings (the part that's commented out helps me find memory leaks, it ruins performance though!)
|
# -w suppresses all warnings (the part that's commented out helps me find memory leaks, it ruins performance though!)
|
||||||
|
CCFLAGS=-O3 #-g3 -fsanitize=address
|
||||||
CXXFLAGS=-Wall -std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
|
CXXFLAGS=-Wall -std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
|
||||||
LDFLAGS=-lpthread
|
LDFLAGS=-lpthread -ldl
|
||||||
# specifies the name of our exectuable
|
# specifies the name of our exectuable
|
||||||
SERVER=bin/fusion
|
SERVER=bin/fusion
|
||||||
|
|
||||||
@ -10,19 +12,30 @@ SERVER=bin/fusion
|
|||||||
PROTOCOL_VERSION?=104
|
PROTOCOL_VERSION?=104
|
||||||
|
|
||||||
# Windows-specific
|
# Windows-specific
|
||||||
|
WIN_CC=x86_64-w64-mingw32-gcc
|
||||||
WIN_CXX=x86_64-w64-mingw32-g++
|
WIN_CXX=x86_64-w64-mingw32-g++
|
||||||
|
WIN_CCFLAGS=-O3 #-g3 -fsanitize=address
|
||||||
WIN_CXXFLAGS=-Wall -std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
|
WIN_CXXFLAGS=-Wall -std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
|
||||||
WIN_LDFLAGS=-static -lws2_32 -lwsock32
|
WIN_LDFLAGS=-static -lws2_32 -lwsock32
|
||||||
WIN_SERVER=bin/winfusion.exe
|
WIN_SERVER=bin/winfusion.exe
|
||||||
|
|
||||||
# source files
|
CC_SRC=\
|
||||||
SRC=\
|
src/contrib/bcrypt/bcrypt.c\
|
||||||
|
src/contrib/bcrypt/crypt_blowfish.c\
|
||||||
|
src/contrib/bcrypt/crypt_gensalt.c\
|
||||||
|
src/contrib/bcrypt/wrapper.c\
|
||||||
|
src/contrib/sqlite/sqlite3.c\
|
||||||
|
|
||||||
|
CXX_SRC=\
|
||||||
|
src/contrib/sqlite/sqlite3pp.cpp\
|
||||||
|
src/contrib/sqlite/sqlite3ppext.cpp\
|
||||||
src/ChatManager.cpp\
|
src/ChatManager.cpp\
|
||||||
src/CNLoginServer.cpp\
|
src/CNLoginServer.cpp\
|
||||||
src/CNProtocol.cpp\
|
src/CNProtocol.cpp\
|
||||||
src/CNShardServer.cpp\
|
src/CNShardServer.cpp\
|
||||||
src/CNShared.cpp\
|
src/CNShared.cpp\
|
||||||
src/CNStructs.cpp\
|
src/CNStructs.cpp\
|
||||||
|
src/Database.cpp\
|
||||||
src/Defines.cpp\
|
src/Defines.cpp\
|
||||||
src/main.cpp\
|
src/main.cpp\
|
||||||
src/MissionManager.cpp\
|
src/MissionManager.cpp\
|
||||||
@ -34,13 +47,28 @@ SRC=\
|
|||||||
src/settings.cpp\
|
src/settings.cpp\
|
||||||
|
|
||||||
# headers (for timestamp purposes)
|
# headers (for timestamp purposes)
|
||||||
HDR=\
|
CC_HDR=\
|
||||||
|
src/contrib/bcrypt/bcrypt.h\
|
||||||
|
src/contrib/bcrypt/crypt_blowfish.h\
|
||||||
|
src/contrib/bcrypt/crypt_gensalt.h\
|
||||||
|
src/contrib/bcrypt/ow-crypt.h\
|
||||||
|
src/contrib/bcrypt/winbcrypt.h\
|
||||||
|
src/contrib/sqlite/sqlite3.h\
|
||||||
|
src/contrib/sqlite/sqlite3ext.h\
|
||||||
|
|
||||||
|
CXX_HDR=\
|
||||||
|
src/contrib/bcrypt/BCrypt.hpp\
|
||||||
|
src/contrib/sqlite/sqlite3pp.h\
|
||||||
|
src/contrib/sqlite/sqlite3ppext.h\
|
||||||
|
src/contrib/INIReader.hpp\
|
||||||
|
src/contrib/JSON.hpp\
|
||||||
src/ChatManager.hpp\
|
src/ChatManager.hpp\
|
||||||
src/CNLoginServer.hpp\
|
src/CNLoginServer.hpp\
|
||||||
src/CNProtocol.hpp\
|
src/CNProtocol.hpp\
|
||||||
src/CNShardServer.hpp\
|
src/CNShardServer.hpp\
|
||||||
src/CNShared.hpp\
|
src/CNShared.hpp\
|
||||||
src/CNStructs.hpp\
|
src/CNStructs.hpp\
|
||||||
|
src/Database.hpp\
|
||||||
src/Defines.hpp\
|
src/Defines.hpp\
|
||||||
src/contrib/INIReader.hpp\
|
src/contrib/INIReader.hpp\
|
||||||
src/contrib/JSON.hpp\
|
src/contrib/JSON.hpp\
|
||||||
@ -52,26 +80,34 @@ HDR=\
|
|||||||
src/PlayerManager.hpp\
|
src/PlayerManager.hpp\
|
||||||
src/settings.hpp\
|
src/settings.hpp\
|
||||||
|
|
||||||
OBJ=$(SRC:.cpp=.o)
|
CC_OBJ=$(CC_SRC:.c=.o)
|
||||||
|
CXX_OBJ=$(CXX_SRC:.cpp=.o)
|
||||||
|
|
||||||
|
OBJ=$(CC_OBJ) $(CXX_OBJ)
|
||||||
|
|
||||||
all: $(SERVER)
|
all: $(SERVER)
|
||||||
|
|
||||||
windows: $(SERVER)
|
windows: $(SERVER)
|
||||||
|
|
||||||
# assign Windows-specific values if targeting Windows
|
# assign Windows-specific values if targeting Windows
|
||||||
|
windows : CC=$(WIN_CC)
|
||||||
windows : CXX=$(WIN_CXX)
|
windows : CXX=$(WIN_CXX)
|
||||||
|
windows : CCFLAGS=$(WIN_CCFLAGS)
|
||||||
windows : CXXFLAGS=$(WIN_CXXFLAGS)
|
windows : CXXFLAGS=$(WIN_CXXFLAGS)
|
||||||
windows : LDFLAGS=$(WIN_LDFLAGS)
|
windows : LDFLAGS=$(WIN_LDFLAGS)
|
||||||
windows : SERVER=$(WIN_SERVER)
|
windows : SERVER=$(WIN_SERVER)
|
||||||
|
|
||||||
%.o: %.cpp $(HDR)
|
$(CC_OBJ): %.o: %.c $(CC_HDR)
|
||||||
|
$(CC) -c $(CCFLAGS) -o $@ $<
|
||||||
|
|
||||||
|
$(CXX_OBJ): %.o: %.cpp $(CXX_HDR)
|
||||||
$(CXX) -c $(CXXFLAGS) -o $@ $<
|
$(CXX) -c $(CXXFLAGS) -o $@ $<
|
||||||
|
|
||||||
$(SERVER): $(OBJ) $(HDR)
|
$(SERVER): $(OBJ) $(CC_HDR) $(CXX_HDR)
|
||||||
mkdir -p bin
|
mkdir -p bin
|
||||||
$(CXX) $(OBJ) $(LDFLAGS) -o $(SERVER)
|
$(CXX) $(OBJ) $(LDFLAGS) -o $(SERVER)
|
||||||
|
|
||||||
.PHONY: all windows clean
|
.PHONY: all windows clean
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJ) $(SERVER) $(WIN_SERVER)
|
rm -f $(OBJ) $(SERVER) $(WIN_SERVER)
|
@ -3,10 +3,7 @@
|
|||||||
#include "CNStructs.hpp"
|
#include "CNStructs.hpp"
|
||||||
|
|
||||||
#include "settings.hpp"
|
#include "settings.hpp"
|
||||||
|
#include "Database.hpp"
|
||||||
/*
|
|
||||||
This is *not* connected to any database, so i'm sending dummy data just to get the client to work & connect to the shard <3
|
|
||||||
*/
|
|
||||||
|
|
||||||
std::map<CNSocket*, CNLoginData> CNLoginServer::loginSessions;
|
std::map<CNSocket*, CNLoginData> CNLoginServer::loginSessions;
|
||||||
|
|
||||||
@ -25,36 +22,119 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
|
|||||||
return; // ignore the malformed packet
|
return; // ignore the malformed packet
|
||||||
|
|
||||||
sP_CL2LS_REQ_LOGIN* login = (sP_CL2LS_REQ_LOGIN*)data->buf;
|
sP_CL2LS_REQ_LOGIN* login = (sP_CL2LS_REQ_LOGIN*)data->buf;
|
||||||
INITSTRUCT(sP_LS2CL_REP_LOGIN_SUCC, resp);
|
bool success = false;
|
||||||
int charCount = 2; // send 4 randomly generated characters for now
|
int errorCode = 0;
|
||||||
|
std::string userLogin = U16toU8(login->szID);
|
||||||
|
std::string userPassword = U16toU8(login->szPassword);
|
||||||
|
//checking regex
|
||||||
|
if (!Database::isLoginDataGood(userLogin, userPassword)) {
|
||||||
|
errorCode = (int)LOGINERRORID::login_error;
|
||||||
|
}
|
||||||
|
|
||||||
DEBUGLOG(
|
//if user does not exist in db, add him to and send succ
|
||||||
std::cout << "P_CL2LS_REQ_LOGIN:" << std::endl;
|
else if (!Database::doesUserExist(U16toU8(login->szID))) {
|
||||||
std::cout << "\tClient version: " << login->iClientVerA << "." << login->iClientVerB << "." << login->iClientVerC << std::endl;
|
Database::addAccount(U16toU8(login->szID), U16toU8(login->szPassword));
|
||||||
std::cout << "\tLogin type: " << login->iLoginType << std::endl;
|
success = true;
|
||||||
std::cout << "\tID: " << U16toU8(login->szID) << " Password: " << U16toU8(login->szPassword) << std::endl;
|
}
|
||||||
)
|
//if user exists, check if password is correct
|
||||||
|
else if (Database::isPasswordCorrect((U16toU8(login->szID)), U16toU8(login->szPassword))) {
|
||||||
|
success = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
errorCode = (int)LOGINERRORID::id_and_password_do_not_match;
|
||||||
|
}
|
||||||
|
|
||||||
resp.iCharCount = charCount;
|
if (success)
|
||||||
resp.iSlotNum = 1;
|
{
|
||||||
resp.iPaymentFlag = 1;
|
int userID = Database::getUserID(userLogin);
|
||||||
resp.iOpenBetaFlag = 0;
|
int charCount = Database::getUserSlotsNum(userID);
|
||||||
resp.uiSvrTime = getTime();
|
|
||||||
|
|
||||||
// set username in resp packet
|
INITSTRUCT(sP_LS2CL_REP_LOGIN_SUCC, resp);
|
||||||
memcpy(resp.szID, login->szID, sizeof(char16_t) * 33);
|
// set username in resp packet
|
||||||
|
memcpy(resp.szID, login->szID, sizeof(char16_t) * 33);
|
||||||
|
|
||||||
// send the resp in with original key
|
resp.iCharCount = charCount;
|
||||||
sock->sendPacket((void*)&resp, P_LS2CL_REP_LOGIN_SUCC, sizeof(sP_LS2CL_REP_LOGIN_SUCC));
|
resp.iSlotNum = 1;
|
||||||
|
resp.iPaymentFlag = 1;
|
||||||
|
resp.iOpenBetaFlag = 0;
|
||||||
|
resp.uiSvrTime = getTime();
|
||||||
|
|
||||||
// update keys
|
// send the resp in with original key
|
||||||
sock->setEKey(CNSocketEncryption::createNewKey(resp.uiSvrTime, resp.iCharCount + 1, resp.iSlotNum + 1));
|
sock->sendPacket((void*)&resp, P_LS2CL_REP_LOGIN_SUCC, sizeof(sP_LS2CL_REP_LOGIN_SUCC));
|
||||||
sock->setFEKey(CNSocketEncryption::createNewKey((uint64_t)(*(uint64_t*)&CNSocketEncryption::defaultKey[0]), login->iClientVerC, 1));
|
|
||||||
|
|
||||||
loginSessions[sock] = CNLoginData();
|
// update keys
|
||||||
|
sock->setEKey(CNSocketEncryption::createNewKey(resp.uiSvrTime, resp.iCharCount + 1, resp.iSlotNum + 1));
|
||||||
|
sock->setFEKey(CNSocketEncryption::createNewKey((uint64_t)(*(uint64_t*)&CNSocketEncryption::defaultKey[0]), login->iClientVerC, 1));
|
||||||
|
|
||||||
|
loginSessions[sock] = CNLoginData();
|
||||||
|
loginSessions[sock].userID = userID;
|
||||||
|
|
||||||
if (settings::LOGINRANDCHARACTERS) {
|
|
||||||
// now send the characters :)
|
// now send the characters :)
|
||||||
|
|
||||||
|
/*if (charCount > 0) {
|
||||||
|
|
||||||
|
std::list<Player> characters = Database::getCharacters(loginSessions[sock].userID);
|
||||||
|
std::list<Player>::iterator it;
|
||||||
|
for (it = characters.begin(); it != characters.end(); it++)
|
||||||
|
{
|
||||||
|
sP_LS2CL_REP_CHAR_INFO charInfo = sP_LS2CL_REP_CHAR_INFO();
|
||||||
|
|
||||||
|
charInfo.iSlot = (int8_t)it->slot;
|
||||||
|
charInfo.iLevel = (int16_t)it->level;
|
||||||
|
charInfo.sPC_Style = it->PCStyle;
|
||||||
|
charInfo.sPC_Style2 = it->PCStyle2;
|
||||||
|
|
||||||
|
// position
|
||||||
|
charInfo.iX = it->x;
|
||||||
|
charInfo.iY = it->y;
|
||||||
|
charInfo.iZ = it->z;
|
||||||
|
|
||||||
|
//save character in session (for char select)
|
||||||
|
int64_t UID = charInfo.sPC_Style.iPC_UID;
|
||||||
|
loginSessions[sock].characters[UID] = Player();
|
||||||
|
loginSessions[sock].characters[UID].level = charInfo.iLevel;
|
||||||
|
loginSessions[sock].characters[UID].slot = charInfo.iSlot;
|
||||||
|
loginSessions[sock].characters[UID].FEKey = sock->getFEKey();
|
||||||
|
loginSessions[sock].characters[UID].x = charInfo.iX;
|
||||||
|
loginSessions[sock].characters[UID].y = charInfo.iY;
|
||||||
|
loginSessions[sock].characters[UID].z = charInfo.iZ;
|
||||||
|
loginSessions[sock].characters[UID].PCStyle = charInfo.sPC_Style;
|
||||||
|
loginSessions[sock].characters[UID].PCStyle2 = charInfo.sPC_Style2;
|
||||||
|
loginSessions[sock].characters[UID].IsGM = false;
|
||||||
|
loginSessions[sock].characters[UID].money = 9001;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Player test = loginSessions[sock].characters[UID];
|
||||||
|
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
|
//equip char creation clothes and lightning rifle
|
||||||
|
charInfo.aEquip[i] = it->Equip[i];
|
||||||
|
loginSessions[sock].characters[UID].Equip[i] = charInfo.aEquip[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 5; i < AEQUIP_COUNT; i++) {
|
||||||
|
// empty equips
|
||||||
|
charInfo.aEquip[i].iID = 0;
|
||||||
|
charInfo.aEquip[i].iType = i;
|
||||||
|
charInfo.aEquip[i].iOpt = 0;
|
||||||
|
loginSessions[sock].characters[UID].Equip[i] = charInfo.aEquip[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
for (int i = 0; i < AINVEN_COUNT; i++) {
|
||||||
|
// setup inventories
|
||||||
|
loginSessions[sock].characters[UID].Inven[i].iID = 0;
|
||||||
|
loginSessions[sock].characters[UID].Inven[i].iType = 0;
|
||||||
|
loginSessions[sock].characters[UID].Inven[i].iOpt = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// set default to the first character
|
||||||
|
if (it == characters.begin())
|
||||||
|
loginSessions[sock].selectedChar = UID;
|
||||||
|
|
||||||
|
sock->sendPacket((void*)&charInfo, P_LS2CL_REP_CHAR_INFO, sizeof(sP_LS2CL_REP_CHAR_INFO));
|
||||||
|
|
||||||
for (int i = 0; i < charCount; i++) {
|
for (int i = 0; i < charCount; i++) {
|
||||||
sP_LS2CL_REP_CHAR_INFO charInfo = sP_LS2CL_REP_CHAR_INFO();
|
sP_LS2CL_REP_CHAR_INFO charInfo = sP_LS2CL_REP_CHAR_INFO();
|
||||||
charInfo.iSlot = (int8_t)i + 1;
|
charInfo.iSlot = (int8_t)i + 1;
|
||||||
@ -110,14 +190,19 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
|
|||||||
loginSessions[sock].characters[UID].Inven[i].iID = 0;
|
loginSessions[sock].characters[UID].Inven[i].iID = 0;
|
||||||
loginSessions[sock].characters[UID].Inven[i].iType = 0;
|
loginSessions[sock].characters[UID].Inven[i].iType = 0;
|
||||||
loginSessions[sock].characters[UID].Inven[i].iOpt = 0;
|
loginSessions[sock].characters[UID].Inven[i].iOpt = 0;
|
||||||
}
|
|
||||||
|
|
||||||
// set default to the first character
|
|
||||||
if (i == 0)
|
|
||||||
loginSessions[sock].selectedChar = UID;
|
|
||||||
|
|
||||||
sock->sendPacket((void*)&charInfo, P_LS2CL_REP_CHAR_INFO, sizeof(sP_LS2CL_REP_CHAR_INFO));
|
}
|
||||||
}
|
}*/
|
||||||
|
}
|
||||||
|
//Failure
|
||||||
|
else {
|
||||||
|
|
||||||
|
INITSTRUCT(sP_LS2CL_REP_LOGIN_FAIL, resp);
|
||||||
|
|
||||||
|
memcpy(resp.szID, login->szID, sizeof(char16_t) * 33);
|
||||||
|
resp.iErrorCode = errorCode;
|
||||||
|
|
||||||
|
sock->sendPacket((void*)&resp, P_LS2CL_REP_LOGIN_FAIL, sizeof(sP_LS2CL_REP_LOGIN_FAIL));
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@ -132,36 +217,51 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
|
|||||||
|
|
||||||
// naughty words allowed!!!!!!!! (also for some reason, the client will always show 'Player 0' if you manually type a name. It will show up for other connected players though)
|
// naughty words allowed!!!!!!!! (also for some reason, the client will always show 'Player 0' if you manually type a name. It will show up for other connected players though)
|
||||||
sP_CL2LS_REQ_CHECK_CHAR_NAME* nameCheck = (sP_CL2LS_REQ_CHECK_CHAR_NAME*)data->buf;
|
sP_CL2LS_REQ_CHECK_CHAR_NAME* nameCheck = (sP_CL2LS_REQ_CHECK_CHAR_NAME*)data->buf;
|
||||||
INITSTRUCT(sP_LS2CL_REP_CHECK_CHAR_NAME_SUCC, resp);
|
//check if name is occupied
|
||||||
|
if (Database::isNameFree(U16toU8(nameCheck->szFirstName), U16toU8(nameCheck->szLastName)))
|
||||||
|
{
|
||||||
|
|
||||||
DEBUGLOG(
|
// naughty words allowed!!!!!!!! (also for some reason, the client will always show 'Player + ID' if you manually type a name. It will show up for other connected players though)
|
||||||
std::cout << "P_CL2LS_REQ_CHECK_CHAR_NAME:" << std::endl;
|
|
||||||
|
INITSTRUCT(sP_LS2CL_REP_CHECK_CHAR_NAME_SUCC, resp);
|
||||||
|
|
||||||
|
DEBUGLOG(
|
||||||
|
std::cout << "P_CL2LS_REQ_CHECK_CHAR_NAME:" << std::endl;
|
||||||
std::cout << "\tFirstName: " << U16toU8(nameCheck->szFirstName) << " LastName: " << U16toU8(nameCheck->szLastName) << std::endl;
|
std::cout << "\tFirstName: " << U16toU8(nameCheck->szFirstName) << " LastName: " << U16toU8(nameCheck->szLastName) << std::endl;
|
||||||
)
|
)
|
||||||
|
|
||||||
memcpy(resp.szFirstName, nameCheck->szFirstName, sizeof(char16_t) * 9);
|
memcpy(resp.szFirstName, nameCheck->szFirstName, sizeof(char16_t) * 9);
|
||||||
memcpy(resp.szLastName, nameCheck->szLastName, sizeof(char16_t) * 17);
|
memcpy(resp.szLastName, nameCheck->szLastName, sizeof(char16_t) * 17);
|
||||||
|
|
||||||
// fr*ck allowed!!!
|
// fr*ck allowed!!!
|
||||||
sock->sendPacket((void*)&resp, P_LS2CL_REP_CHECK_CHAR_NAME_SUCC, sizeof(sP_LS2CL_REP_CHECK_CHAR_NAME_SUCC));
|
sock->sendPacket((void*)&resp, P_LS2CL_REP_CHECK_CHAR_NAME_SUCC, sizeof(sP_LS2CL_REP_CHECK_CHAR_NAME_SUCC));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
INITSTRUCT(sP_LS2CL_REP_CHECK_CHAR_NAME_FAIL, resp);
|
||||||
|
resp.iErrorCode = 1;
|
||||||
|
sock->sendPacket((void*)&resp, P_LS2CL_REP_CHECK_CHAR_NAME_FAIL, sizeof(sP_LS2CL_REP_CHECK_CHAR_NAME_FAIL));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
case P_CL2LS_REQ_SAVE_CHAR_NAME: {
|
case P_CL2LS_REQ_SAVE_CHAR_NAME: {
|
||||||
if (data->size != sizeof(sP_CL2LS_REQ_SAVE_CHAR_NAME))
|
if (data->size != sizeof(sP_CL2LS_REQ_SAVE_CHAR_NAME))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
sP_CL2LS_REQ_SAVE_CHAR_NAME* save = (sP_CL2LS_REQ_SAVE_CHAR_NAME*)data->buf;
|
sP_CL2LS_REQ_SAVE_CHAR_NAME* save = (sP_CL2LS_REQ_SAVE_CHAR_NAME*)data->buf;
|
||||||
|
Database::createCharacter(save, loginSessions[sock].userID);
|
||||||
|
|
||||||
INITSTRUCT(sP_LS2CL_REP_SAVE_CHAR_NAME_SUCC, resp);
|
INITSTRUCT(sP_LS2CL_REP_SAVE_CHAR_NAME_SUCC, resp);
|
||||||
|
|
||||||
DEBUGLOG(
|
DEBUGLOG(
|
||||||
std::cout << "P_CL2LS_REQ_SAVE_CHAR_NAME:" << std::endl;
|
std::cout << "P_CL2LS_REQ_SAVE_CHAR_NAME:" << std::endl;
|
||||||
std::cout << "\tSlot: " << (int)save->iSlotNum << std::endl;
|
std::cout << "\tSlot: " << (int)save->iSlotNum << std::endl;
|
||||||
std::cout << "\tGender: " << (int)save->iGender << std::endl;
|
|
||||||
std::cout << "\tName: " << U16toU8(save->szFirstName) << " " << U16toU8(save->szLastName) << std::endl;
|
std::cout << "\tName: " << U16toU8(save->szFirstName) << " " << U16toU8(save->szLastName) << std::endl;
|
||||||
)
|
)
|
||||||
|
|
||||||
resp.iSlotNum = save->iSlotNum;
|
resp.iSlotNum = save->iSlotNum;
|
||||||
resp.iGender = save->iGender;
|
resp.iGender = save->iGender;
|
||||||
|
resp.iPC_UID = Database::getCharacterID(loginSessions[sock].userID, save->iSlotNum);
|
||||||
memcpy(resp.szFirstName, save->szFirstName, sizeof(char16_t) * 9);
|
memcpy(resp.szFirstName, save->szFirstName, sizeof(char16_t) * 9);
|
||||||
memcpy(resp.szLastName, save->szLastName, sizeof(char16_t) * 17);
|
memcpy(resp.szLastName, save->szLastName, sizeof(char16_t) * 17);
|
||||||
|
|
||||||
@ -173,6 +273,8 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
sP_CL2LS_REQ_CHAR_CREATE* character = (sP_CL2LS_REQ_CHAR_CREATE*)data->buf;
|
sP_CL2LS_REQ_CHAR_CREATE* character = (sP_CL2LS_REQ_CHAR_CREATE*)data->buf;
|
||||||
|
Database::finishCharacter(character);
|
||||||
|
|
||||||
INITSTRUCT(sP_LS2CL_REP_CHAR_CREATE_SUCC, resp);
|
INITSTRUCT(sP_LS2CL_REP_CHAR_CREATE_SUCC, resp);
|
||||||
|
|
||||||
DEBUGLOG(
|
DEBUGLOG(
|
||||||
@ -209,14 +311,13 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
|
|||||||
character->PCStyle.iNameCheck = 1;
|
character->PCStyle.iNameCheck = 1;
|
||||||
resp.sPC_Style = character->PCStyle;
|
resp.sPC_Style = character->PCStyle;
|
||||||
resp.sPC_Style2.iAppearanceFlag = 1;
|
resp.sPC_Style2.iAppearanceFlag = 1;
|
||||||
resp.sPC_Style2.iTutorialFlag = 1;
|
resp.sPC_Style2.iTutorialFlag = 0;
|
||||||
resp.sPC_Style2.iPayzoneFlag = 1;
|
resp.sPC_Style2.iPayzoneFlag = 1;
|
||||||
resp.iLevel = 36;
|
resp.iLevel = 36;
|
||||||
resp.sOn_Item = character->sOn_Item;
|
resp.sOn_Item = character->sOn_Item;
|
||||||
|
|
||||||
loginSessions[sock].characters[UID] = Player();
|
loginSessions[sock].characters[UID] = Player();
|
||||||
loginSessions[sock].characters[UID].level = 36;
|
loginSessions[sock].characters[UID].level = 36;
|
||||||
loginSessions[sock].characters[UID].money = 9001;
|
|
||||||
loginSessions[sock].characters[UID].FEKey = sock->getFEKey();
|
loginSessions[sock].characters[UID].FEKey = sock->getFEKey();
|
||||||
loginSessions[sock].characters[UID].PCStyle = character->PCStyle;
|
loginSessions[sock].characters[UID].PCStyle = character->PCStyle;
|
||||||
loginSessions[sock].characters[UID].PCStyle2.iAppearanceFlag = 1;
|
loginSessions[sock].characters[UID].PCStyle2.iAppearanceFlag = 1;
|
||||||
@ -230,14 +331,40 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
|
|||||||
loginSessions[sock].characters[UID].Equip[2].iID = character->sOn_Item.iEquipLBID; // lower body
|
loginSessions[sock].characters[UID].Equip[2].iID = character->sOn_Item.iEquipLBID; // lower body
|
||||||
loginSessions[sock].characters[UID].Equip[2].iType = 2;
|
loginSessions[sock].characters[UID].Equip[2].iType = 2;
|
||||||
loginSessions[sock].characters[UID].Equip[3].iID = character->sOn_Item.iEquipFootID; // foot!
|
loginSessions[sock].characters[UID].Equip[3].iID = character->sOn_Item.iEquipFootID; // foot!
|
||||||
|
loginSessions[sock].characters[UID].Equip[3].iType = 3;
|
||||||
|
loginSessions[sock].characters[UID].IsGM = false;
|
||||||
loginSessions[sock].characters[UID].Equip[3].iType = 3;
|
loginSessions[sock].characters[UID].Equip[3].iType = 3;
|
||||||
loginSessions[sock].characters[UID].isTrading = false;
|
loginSessions[sock].characters[UID].isTrading = false;
|
||||||
loginSessions[sock].characters[UID].isTradeConfirm = false;
|
loginSessions[sock].characters[UID].isTradeConfirm = false;
|
||||||
loginSessions[sock].characters[UID].IsGM = settings::GM;
|
loginSessions[sock].characters[UID].IsGM = settings::GM;
|
||||||
|
|
||||||
|
|
||||||
sock->sendPacket((void*)&resp, P_LS2CL_REP_CHAR_CREATE_SUCC, sizeof(sP_LS2CL_REP_CHAR_CREATE_SUCC));
|
sock->sendPacket((void*)&resp, P_LS2CL_REP_CHAR_CREATE_SUCC, sizeof(sP_LS2CL_REP_CHAR_CREATE_SUCC));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case P_CL2LS_REQ_CHAR_DELETE: {
|
||||||
|
if (data->size != sizeof(sP_CL2LS_REQ_CHAR_DELETE))
|
||||||
|
return;
|
||||||
|
|
||||||
|
sP_CL2LS_REQ_CHAR_DELETE* del = (sP_CL2LS_REQ_CHAR_DELETE*)data->buf;
|
||||||
|
int operationResult = Database::deleteCharacter(del->iPC_UID, loginSessions[sock].userID);
|
||||||
|
|
||||||
|
//success
|
||||||
|
if (operationResult > 0) {
|
||||||
|
INITSTRUCT(sP_LS2CL_REP_CHAR_DELETE_SUCC, resp);
|
||||||
|
resp.iSlotNum = operationResult;
|
||||||
|
sock->sendPacket((void*)&resp, P_LS2CL_REP_CHAR_DELETE_SUCC, sizeof(sP_LS2CL_REP_CHAR_DELETE_SUCC));
|
||||||
|
}
|
||||||
|
//failure
|
||||||
|
else {
|
||||||
|
//client doesnt't care about this packet and softlocks
|
||||||
|
INITSTRUCT(sP_LS2CL_REP_CHAR_DELETE_FAIL, resp);
|
||||||
|
resp.iErrorCode = 0;
|
||||||
|
sock->sendPacket((void*)&resp, P_LS2CL_REP_CHAR_DELETE_FAIL, sizeof(sP_LS2CL_REP_CHAR_DELETE_FAIL));
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
case P_CL2LS_REQ_CHAR_SELECT: {
|
case P_CL2LS_REQ_CHAR_SELECT: {
|
||||||
if (data->size != sizeof(sP_CL2LS_REQ_CHAR_SELECT))
|
if (data->size != sizeof(sP_CL2LS_REQ_CHAR_SELECT))
|
||||||
return;
|
return;
|
||||||
@ -283,6 +410,18 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
|
|||||||
sock->sendPacket((void*)&resp, P_LS2CL_REP_SHARD_SELECT_SUCC, sizeof(sP_LS2CL_REP_SHARD_SELECT_SUCC));
|
sock->sendPacket((void*)&resp, P_LS2CL_REP_SHARD_SELECT_SUCC, sizeof(sP_LS2CL_REP_SHARD_SELECT_SUCC));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case P_CL2LS_REQ_SAVE_CHAR_TUTOR: {
|
||||||
|
if (data->size != sizeof(sP_CL2LS_REQ_SAVE_CHAR_TUTOR))
|
||||||
|
return;
|
||||||
|
sP_CL2LS_REQ_SAVE_CHAR_TUTOR* save = (sP_CL2LS_REQ_SAVE_CHAR_TUTOR*)data->buf;
|
||||||
|
Database::finishTutorial(save->iPC_UID);
|
||||||
|
loginSessions[sock].characters[save->iPC_UID].PCStyle2.iTutorialFlag = 1;
|
||||||
|
loginSessions[sock].characters[save->iPC_UID].Equip[0].iID = 328;
|
||||||
|
loginSessions[sock].characters[save->iPC_UID].Equip[0].iType = 0;
|
||||||
|
loginSessions[sock].characters[save->iPC_UID].Equip[0].iOpt = 1;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
if (settings::VERBOSITY)
|
if (settings::VERBOSITY)
|
||||||
std::cerr << "OpenFusion: LOGIN UNIMPLM ERR. PacketType: " << Defines::p2str(CL2LS, data->type) << " (" << data->type << ")" << std::endl;
|
std::cerr << "OpenFusion: LOGIN UNIMPLM ERR. PacketType: " << Defines::p2str(CL2LS, data->type) << " (" << data->type << ")" << std::endl;
|
||||||
|
@ -9,6 +9,19 @@
|
|||||||
struct CNLoginData {
|
struct CNLoginData {
|
||||||
std::map<int64_t, Player> characters;
|
std::map<int64_t, Player> characters;
|
||||||
int64_t selectedChar;
|
int64_t selectedChar;
|
||||||
|
int userID;
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class LOGINERRORID {
|
||||||
|
database_error = 0,
|
||||||
|
id_doesnt_exist = 1,
|
||||||
|
id_and_password_do_not_match = 2,
|
||||||
|
id_already_in_use = 3,
|
||||||
|
login_error = 4,
|
||||||
|
client_version_outdated = 6,
|
||||||
|
you_are_not_an_authorized_beta_tester = 7,
|
||||||
|
authentication_connection_error = 8,
|
||||||
|
updated_euala_required = 9
|
||||||
};
|
};
|
||||||
|
|
||||||
// WARNING: THERE CAN ONLY BE ONE OF THESE SERVERS AT A TIME!!!!!! TODO: change loginSessions & packet handlers to be non-static
|
// WARNING: THERE CAN ONLY BE ONE OF THESE SERVERS AT A TIME!!!!!! TODO: change loginSessions & packet handlers to be non-static
|
||||||
|
345
src/Database.cpp
Normal file
345
src/Database.cpp
Normal file
@ -0,0 +1,345 @@
|
|||||||
|
#include "contrib/sqlite/sqlite3pp.h"
|
||||||
|
#include "contrib/bcrypt/BCrypt.hpp"
|
||||||
|
#include "CNProtocol.hpp"
|
||||||
|
#include "Database.hpp"
|
||||||
|
#include "CNStructs.hpp"
|
||||||
|
#include "settings.hpp"
|
||||||
|
#include "Player.hpp"
|
||||||
|
#include <regex>
|
||||||
|
#include <fstream>
|
||||||
|
#include "contrib/JSON.hpp"
|
||||||
|
|
||||||
|
|
||||||
|
//TODO: replace this sqlite wrapper with something better, clean up queries, get rid of json
|
||||||
|
|
||||||
|
sqlite3pp::database db;
|
||||||
|
|
||||||
|
void Database::open() {
|
||||||
|
//checking if database file exists
|
||||||
|
std::ifstream file;
|
||||||
|
file.open("data.db");
|
||||||
|
if (file) {
|
||||||
|
file.close();
|
||||||
|
//if exists, assign it
|
||||||
|
db = sqlite3pp::database("data.db");
|
||||||
|
DEBUGLOG(std::cout << "Database in operation" << std::endl; )
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
//if doesn't, create all the tables
|
||||||
|
DEBUGLOG(std::cout << "Creating new database" << std::endl;)
|
||||||
|
db = sqlite3pp::database("data.db");
|
||||||
|
db.execute("CREATE TABLE Accounts(AccountID INTEGER PRIMARY KEY AUTOINCREMENT, Login TEXT NOT NULL, Password TEXT NOT NULL);");
|
||||||
|
db.execute("CREATE TABLE Players(PlayerID INTEGER PRIMARY KEY AUTOINCREMENT, AccountID INTEGER NOT NULL, Slot INTEGER NOT NULL, FirstName TEXT NOT NULL, LastName TEXT NOT NULL, CharData TEXT NOT NULL);");
|
||||||
|
DEBUGLOG(std::cout << "Done" << std::endl;)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Database::isLoginDataGood(std::string login, std::string password) {
|
||||||
|
std::regex loginRegex("^([A-Za-z\\d_\\-]){5,20}$");
|
||||||
|
std::regex passwordRegex("^([A-Za-z\\d_\\-@$!%*#?&,.+:;<=>]){8,20}$");
|
||||||
|
return (std::regex_match(login, loginRegex) && std::regex_match(password, passwordRegex));
|
||||||
|
}
|
||||||
|
|
||||||
|
void Database::addAccount(std::string login, std::string password) {
|
||||||
|
sqlite3pp::command cmd(db, "INSERT INTO Accounts (Login, Password) VALUES (:login, :password)");
|
||||||
|
password = BCrypt::generateHash(password);
|
||||||
|
cmd.bind(":login", login, sqlite3pp::nocopy);
|
||||||
|
cmd.bind(":password", password, sqlite3pp::nocopy);
|
||||||
|
cmd.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Database::doesUserExist(std::string login) {
|
||||||
|
std::string q = "SELECT COUNT(AccountID) FROM Accounts WHERE Login = :login";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":login", login, sqlite3pp::nocopy);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
int result;
|
||||||
|
std::tie(result) = (*i).get_columns<int>(0);
|
||||||
|
return (result != 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Database::isPasswordCorrect(std::string login, std::string password) {
|
||||||
|
std::string q = "SELECT Password FROM Accounts WHERE Login = :login";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":login", login, sqlite3pp::nocopy);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
const char* actual;
|
||||||
|
std::tie(actual) = (*i).get_columns<const char*>(0);
|
||||||
|
return BCrypt::validatePassword(password, actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
int Database::getUserID(std::string login) {
|
||||||
|
std::string q = "SELECT AccountID FROM Accounts WHERE Login = :login";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":login", login, sqlite3pp::nocopy);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
int result;
|
||||||
|
std::tie(result) = (*i).get_columns<int>(0);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
int Database::getUserSlotsNum(int AccountId) {
|
||||||
|
std::string q = "SELECT COUNT(PlayerID) FROM Players WHERE AccountID = :ID";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":ID", AccountId);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
int result;
|
||||||
|
std::tie(result) = (*i).get_columns<int>(0);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Database::isNameFree(std::string First, std::string Second) {
|
||||||
|
std::string q = "SELECT COUNT(PlayerID) FROM Players WHERE FirstName = :First COLLATE nocase AND LastName = :Second COLLATE nocase";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":First", First, sqlite3pp::nocopy);
|
||||||
|
qry.bind(":Second", Second, sqlite3pp::nocopy);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
int result;
|
||||||
|
std::tie(result) = (*i).get_columns<int>(0);
|
||||||
|
return (result == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Database::createCharacter(sP_CL2LS_REQ_SAVE_CHAR_NAME* save, int AccountID) {
|
||||||
|
std::string charData = CharacterToJson(save);
|
||||||
|
sqlite3pp::command cmd(db, "INSERT INTO Players (AccountID, Slot, FirstName, LastName, CharData) VALUES (:AccountID, :Slot, :FirstName, :LastName, :CharData)");
|
||||||
|
std::string first = U16toU8(save->szFirstName);
|
||||||
|
std::string last = U16toU8(save->szLastName);
|
||||||
|
cmd.bind(":AccountID", AccountID);
|
||||||
|
cmd.bind(":Slot", save->iSlotNum);
|
||||||
|
cmd.bind(":CharData", charData, sqlite3pp::nocopy);
|
||||||
|
cmd.bind(":FirstName", first, sqlite3pp::nocopy);
|
||||||
|
cmd.bind(":LastName", last, sqlite3pp::nocopy);
|
||||||
|
cmd.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Database::finishCharacter(sP_CL2LS_REQ_CHAR_CREATE* character) {
|
||||||
|
int id = character->PCStyle.iPC_UID;
|
||||||
|
std::string charData = CharacterToJson(character);
|
||||||
|
sqlite3pp::command cmd(db, "UPDATE Players SET CharData = :data WHERE PlayerID = :id");
|
||||||
|
cmd.bind(":data", charData, sqlite3pp::nocopy);
|
||||||
|
cmd.bind(":id", id);
|
||||||
|
cmd.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Database::finishTutorial(int PlayerID) {
|
||||||
|
std::string json;
|
||||||
|
std::string q = "SELECT CharData FROM Players WHERE PlayerID = :ID";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":ID", PlayerID);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
std::tie(json) = (*i).get_columns<std::string>(0);
|
||||||
|
Player player = JsonToPlayer(json, PlayerID);
|
||||||
|
player.PCStyle2.iTutorialFlag = 1;
|
||||||
|
//equip lightning gun
|
||||||
|
player.Equip[0].iID = 328;
|
||||||
|
json = PlayerToJson(player);
|
||||||
|
sqlite3pp::command cmd(db, "UPDATE Players SET CharData = :data WHERE PlayerID = :id");
|
||||||
|
cmd.bind(":data", json, sqlite3pp::nocopy);
|
||||||
|
cmd.bind(":id", PlayerID);
|
||||||
|
cmd.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
int Database::getCharacterID(int AccountID, int slot) {
|
||||||
|
std::string q = "SELECT PlayerID FROM Players WHERE AccountID = :ID AND Slot = :Slot";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":ID", AccountID);
|
||||||
|
qry.bind(":Slot", slot);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
int result;
|
||||||
|
std::tie(result) = (*i).get_columns<int>(0);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
int Database::deleteCharacter(int characterID, int accountID) {
|
||||||
|
//checking if requested player exist and is bound to the account
|
||||||
|
std::string q = "SELECT COUNT(AccountID) FROM Players WHERE AccountID = :AccID AND PlayerID = :PID";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":AccID", accountID);
|
||||||
|
qry.bind(":PID", characterID);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
int result;
|
||||||
|
std::tie(result) = (*i).get_columns<int>(0);
|
||||||
|
if (result > 0) {
|
||||||
|
//get player character slot
|
||||||
|
q = "SELECT Slot FROM Players WHERE PlayerID = :PID";
|
||||||
|
query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":PID", characterID);
|
||||||
|
sqlite3pp::query::iterator i = qry.begin();
|
||||||
|
int slot;
|
||||||
|
std::tie(slot) = (*i).get_columns<int>(0);
|
||||||
|
//delete
|
||||||
|
sqlite3pp::command cmd(db, "DELETE FROM Players WHERE PlayerID = :ID");
|
||||||
|
cmd.bind(":ID", characterID);
|
||||||
|
cmd.execute();
|
||||||
|
return slot;
|
||||||
|
}
|
||||||
|
else return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::list <Player> Database::getCharacters(int userID) {
|
||||||
|
std::list<Player> Result = std::list<Player>();
|
||||||
|
std::string q = "SELECT * FROM Players WHERE AccountID = :ID";
|
||||||
|
const char* query = q.c_str();
|
||||||
|
sqlite3pp::query qry(db, query);
|
||||||
|
qry.bind(":ID", userID);
|
||||||
|
for (sqlite3pp::query::iterator i = qry.begin(); i != qry.end(); ++i) {
|
||||||
|
int ID, AccountID, slot;
|
||||||
|
char const* charData, * first, * second;
|
||||||
|
std::tie(ID, AccountID, slot, first, second, charData) =
|
||||||
|
(*i).get_columns<int, int, int, char const*, char const*, char const*>(0, 1, 2, 3, 4, 5);
|
||||||
|
Player toadd = JsonToPlayer(charData, ID);
|
||||||
|
toadd.slot = slot;
|
||||||
|
Result.push_back(toadd);
|
||||||
|
}
|
||||||
|
return Result;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string Database::CharacterToJson(sP_CL2LS_REQ_SAVE_CHAR_NAME* save) {
|
||||||
|
nlohmann::json json = {
|
||||||
|
{"Level",1},
|
||||||
|
//to check
|
||||||
|
{"HP",1000},
|
||||||
|
{"NameCheck", 1},
|
||||||
|
{"FirstName",U16toU8(save->szFirstName)},
|
||||||
|
{"LastName",U16toU8(save->szLastName)},
|
||||||
|
{"Gender",rand() % 2 + 1 },
|
||||||
|
{"FaceStyle",1},
|
||||||
|
{"HairStyle",1},
|
||||||
|
{"HairColor",(rand() % 19) + 1},
|
||||||
|
{"SkinColor",(rand() % 13) + 1},
|
||||||
|
{"EyeColor",(rand() % 6) + 1},
|
||||||
|
{"Height",(rand() % 6)},
|
||||||
|
{"Body",(rand() % 4)},
|
||||||
|
{"Class",0},
|
||||||
|
{"AppearanceFlag",0},
|
||||||
|
{"PayzoneFlag",1},
|
||||||
|
{"TutorialFlag",0},
|
||||||
|
{"EquipUB", 217},
|
||||||
|
{"EquipLB", 203},
|
||||||
|
{"EquipFoot", 314},
|
||||||
|
{"EquipWeapon", 0},
|
||||||
|
{"x",settings::SPAWN_X},
|
||||||
|
{"y",settings::SPAWN_Y},
|
||||||
|
{"z",settings::SPAWN_Z},
|
||||||
|
{"isGM",false},
|
||||||
|
};
|
||||||
|
return json.dump();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string Database::PlayerToJson(Player player) {
|
||||||
|
nlohmann::json json = {
|
||||||
|
{"Level",1},
|
||||||
|
//to check
|
||||||
|
{"HP",100},
|
||||||
|
{"NameCheck", 1},
|
||||||
|
{"FirstName",U16toU8(player.PCStyle.szFirstName)},
|
||||||
|
{"LastName",U16toU8(player.PCStyle.szLastName)},
|
||||||
|
{"Gender",player.PCStyle.iGender},
|
||||||
|
{"FaceStyle",player.PCStyle.iFaceStyle},
|
||||||
|
{"HairStyle",player.PCStyle.iHairStyle},
|
||||||
|
{"HairColor",player.PCStyle.iHairColor},
|
||||||
|
{"SkinColor",player.PCStyle.iSkinColor},
|
||||||
|
{"EyeColor",player.PCStyle.iEyeColor},
|
||||||
|
{"Height",player.PCStyle.iHeight},
|
||||||
|
{"Body",player.PCStyle.iBody},
|
||||||
|
{"Class",player.PCStyle.iClass},
|
||||||
|
{"AppearanceFlag",player.PCStyle2.iAppearanceFlag},
|
||||||
|
{"PayzoneFlag",player.PCStyle2.iPayzoneFlag},
|
||||||
|
{"TutorialFlag",player.PCStyle2.iTutorialFlag},
|
||||||
|
{"EquipUB", player.Equip[1].iID},
|
||||||
|
{"EquipLB", player.Equip[2].iID},
|
||||||
|
{"EquipFoot", player.Equip[3].iID},
|
||||||
|
{"EquipWeapon", player.Equip[0].iID},
|
||||||
|
{"x",player.x},
|
||||||
|
{"y",player.y},
|
||||||
|
{"z",player.z},
|
||||||
|
{"isGM",false},
|
||||||
|
};
|
||||||
|
return json.dump();
|
||||||
|
}
|
||||||
|
|
||||||
|
Player Database::JsonToPlayer(std::string input, int PC_UID) {
|
||||||
|
std::string err;
|
||||||
|
const auto json = nlohmann::json::parse(input);
|
||||||
|
Player player;
|
||||||
|
player.PCStyle.iPC_UID = (int64_t)PC_UID;
|
||||||
|
player.level = std::stoi(json["Level"].dump());
|
||||||
|
player.HP = std::stoi(json["HP"].dump());
|
||||||
|
player.PCStyle.iNameCheck = std::stoi(json["NameCheck"].dump());
|
||||||
|
U8toU16(json["FirstName"].get<std::string>(), player.PCStyle.szFirstName);
|
||||||
|
U8toU16(json["LastName"].get<std::string>(), player.PCStyle.szLastName);
|
||||||
|
player.PCStyle.iGender = std::stoi(json["Gender"].dump());
|
||||||
|
player.PCStyle.iFaceStyle = std::stoi(json["FaceStyle"].dump());
|
||||||
|
player.PCStyle.iHairStyle = std::stoi(json["HairStyle"].dump());
|
||||||
|
player.PCStyle.iHairColor = std::stoi(json["HairColor"].dump());
|
||||||
|
player.PCStyle.iSkinColor = std::stoi(json["SkinColor"].dump());
|
||||||
|
player.PCStyle.iEyeColor = std::stoi(json["EyeColor"].dump());
|
||||||
|
player.PCStyle.iHeight = std::stoi(json["Height"].dump());
|
||||||
|
player.PCStyle.iBody = std::stoi(json["Body"].dump());
|
||||||
|
player.PCStyle.iClass = std::stoi(json["Class"].dump());
|
||||||
|
player.PCStyle2.iAppearanceFlag = std::stoi(json["AppearanceFlag"].dump());
|
||||||
|
player.PCStyle2.iPayzoneFlag = std::stoi(json["PayzoneFlag"].dump());
|
||||||
|
player.PCStyle2.iTutorialFlag = std::stoi(json["TutorialFlag"].dump());
|
||||||
|
player.Equip[0].iID = std::stoi(json["EquipWeapon"].dump());
|
||||||
|
if (player.Equip[0].iID != 0)
|
||||||
|
player.Equip[0].iOpt = 1;
|
||||||
|
else
|
||||||
|
player.Equip[0].iOpt = 0;
|
||||||
|
player.Equip[0].iType = 0;
|
||||||
|
player.Equip[1].iID = std::stoi(json["EquipUB"].dump());
|
||||||
|
player.Equip[1].iOpt = 1;
|
||||||
|
player.Equip[1].iType = 1;
|
||||||
|
player.Equip[2].iID = std::stoi(json["EquipLB"].dump());
|
||||||
|
player.Equip[2].iOpt = 1;
|
||||||
|
player.Equip[2].iType = 2;
|
||||||
|
player.Equip[3].iID = std::stoi(json["EquipFoot"].dump());
|
||||||
|
player.Equip[3].iOpt = 1;
|
||||||
|
player.Equip[3].iType = 3;
|
||||||
|
player.x = std::stoi(json["x"].dump());
|
||||||
|
player.y = std::stoi(json["y"].dump());
|
||||||
|
player.z = std::stoi(json["z"].dump());
|
||||||
|
return player;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string Database::CharacterToJson(sP_CL2LS_REQ_CHAR_CREATE* character) {
|
||||||
|
nlohmann::json json = {
|
||||||
|
{"Level",1},
|
||||||
|
//to check
|
||||||
|
{"HP",1000},
|
||||||
|
{"NameCheck", 1},
|
||||||
|
{"FirstName",U16toU8(character->PCStyle.szFirstName)},
|
||||||
|
{"LastName",U16toU8(character->PCStyle.szLastName)},
|
||||||
|
{"Gender",character->PCStyle.iGender},
|
||||||
|
{"FaceStyle",character->PCStyle.iFaceStyle},
|
||||||
|
{"HairStyle",character->PCStyle.iHairStyle},
|
||||||
|
{"HairColor",character->PCStyle.iHairColor},
|
||||||
|
{"SkinColor",character->PCStyle.iSkinColor},
|
||||||
|
{"EyeColor",character->PCStyle.iEyeColor},
|
||||||
|
{"Height",character->PCStyle.iHeight},
|
||||||
|
{"Body",character->PCStyle.iBody},
|
||||||
|
{"Class",character->PCStyle.iClass},
|
||||||
|
{"AppearanceFlag",1},
|
||||||
|
{"PayzoneFlag",1},
|
||||||
|
{"TutorialFlag",0},
|
||||||
|
{"EquipUB", character->sOn_Item.iEquipUBID},
|
||||||
|
{"EquipLB", character->sOn_Item.iEquipLBID},
|
||||||
|
{"EquipFoot", character->sOn_Item.iEquipFootID},
|
||||||
|
{"EquipWeapon", 0},
|
||||||
|
{"x",settings::SPAWN_X},
|
||||||
|
{"y",settings::SPAWN_Y},
|
||||||
|
{"z",settings::SPAWN_Z},
|
||||||
|
{"isGM",false},
|
||||||
|
};
|
||||||
|
return json.dump();
|
||||||
|
}
|
31
src/Database.hpp
Normal file
31
src/Database.hpp
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "CNStructs.hpp"
|
||||||
|
#include "Player.hpp"
|
||||||
|
#include <list>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace Database {
|
||||||
|
void open();
|
||||||
|
//checks regex
|
||||||
|
bool isLoginDataGood(std::string login, std::string password);
|
||||||
|
void addAccount(std::string login, std::string password);
|
||||||
|
bool doesUserExist(std::string login);
|
||||||
|
bool isPasswordCorrect(std::string login, std::string password);
|
||||||
|
int getUserID(std::string login);
|
||||||
|
int getUserSlotsNum(int AccountId);
|
||||||
|
bool isNameFree(std::string First, std::string Second);
|
||||||
|
//after chosing name
|
||||||
|
void createCharacter(sP_CL2LS_REQ_SAVE_CHAR_NAME* save, int AccountID);
|
||||||
|
//after finishing creation
|
||||||
|
void finishCharacter(sP_CL2LS_REQ_CHAR_CREATE* character);
|
||||||
|
void finishTutorial(int PlayerID);
|
||||||
|
//returns slot nr if success
|
||||||
|
int deleteCharacter(int characterID, int accountID);
|
||||||
|
int getCharacterID(int AccountID, int slot);
|
||||||
|
std::list <Player> getCharacters(int userID);
|
||||||
|
//some json parsing crap
|
||||||
|
std::string CharacterToJson(sP_CL2LS_REQ_SAVE_CHAR_NAME* save);
|
||||||
|
std::string CharacterToJson(sP_CL2LS_REQ_CHAR_CREATE* character);
|
||||||
|
Player JsonToPlayer(std::string input, int PC_UID);
|
||||||
|
std::string PlayerToJson(Player player);
|
||||||
|
}
|
31
src/contrib/bcrypt/BCrypt.hpp
Normal file
31
src/contrib/bcrypt/BCrypt.hpp
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
#ifndef __BCRYPT__
|
||||||
|
#define __BCRYPT__
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include "winbcrypt.h"
|
||||||
|
#else
|
||||||
|
|
||||||
|
#include "bcrypt.h"
|
||||||
|
#include <string>
|
||||||
|
#include <stdexcept>
|
||||||
|
class BCrypt {
|
||||||
|
public:
|
||||||
|
static std::string generateHash(const std::string & password, int workload = 12){
|
||||||
|
char salt[BCRYPT_HASHSIZE];
|
||||||
|
char hash[BCRYPT_HASHSIZE];
|
||||||
|
int ret;
|
||||||
|
ret = bcrypt_gensalt(workload, salt);
|
||||||
|
if(ret != 0)throw std::runtime_error{"bcrypt: can not generate salt"};
|
||||||
|
ret = bcrypt_hashpw(password.c_str(), salt, hash);
|
||||||
|
if(ret != 0)throw std::runtime_error{"bcrypt: can not generate hash"};
|
||||||
|
return std::string{hash};
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool validatePassword(const std::string & password, const std::string & hash){
|
||||||
|
return (bcrypt_checkpw(password.c_str(), hash.c_str()) == 0);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // __BCRYPT__
|
230
src/contrib/bcrypt/bcrypt.c
Normal file
230
src/contrib/bcrypt/bcrypt.c
Normal file
@ -0,0 +1,230 @@
|
|||||||
|
/*
|
||||||
|
* bcrypt wrapper library
|
||||||
|
*
|
||||||
|
* Written in 2011, 2013, 2014, 2015 by Ricardo Garcia <r@rg3.name>
|
||||||
|
*
|
||||||
|
* To the extent possible under law, the author(s) have dedicated all copyright
|
||||||
|
* and related and neighboring rights to this software to the public domain
|
||||||
|
* worldwide. This software is distributed without any warranty.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the CC0 Public Domain Dedication along
|
||||||
|
* with this software. If not, see
|
||||||
|
* <http://creativecommons.org/publicdomain/zero/1.0/>.
|
||||||
|
*/
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#ifdef _WIN32
|
||||||
|
#elif _WIN64
|
||||||
|
#else
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32 || _WIN64
|
||||||
|
// On windows we need to generate random bytes differently.
|
||||||
|
typedef __int64 ssize_t;
|
||||||
|
#define BCRYPT_HASHSIZE 60
|
||||||
|
|
||||||
|
#include "bcrypt.h"
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
|
#include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */
|
||||||
|
#else
|
||||||
|
#include "bcrypt.h"
|
||||||
|
#include "ow-crypt.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define RANDBYTES (16)
|
||||||
|
|
||||||
|
static int try_close(int fd)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
for (;;) {
|
||||||
|
errno = 0;
|
||||||
|
ret = close(fd);
|
||||||
|
if (ret == -1 && errno == EINTR)
|
||||||
|
continue;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int try_read(int fd, char *out, size_t count)
|
||||||
|
{
|
||||||
|
size_t total;
|
||||||
|
ssize_t partial;
|
||||||
|
|
||||||
|
total = 0;
|
||||||
|
while (total < count)
|
||||||
|
{
|
||||||
|
for (;;) {
|
||||||
|
errno = 0;
|
||||||
|
partial = read(fd, out + total, count - total);
|
||||||
|
if (partial == -1 && errno == EINTR)
|
||||||
|
continue;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (partial < 1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
total += partial;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is a best effort implementation. Nothing prevents a compiler from
|
||||||
|
* optimizing this function and making it vulnerable to timing attacks, but
|
||||||
|
* this method is commonly used in crypto libraries like NaCl.
|
||||||
|
*
|
||||||
|
* Return value is zero if both strings are equal and nonzero otherwise.
|
||||||
|
*/
|
||||||
|
static int timing_safe_strcmp(const char *str1, const char *str2)
|
||||||
|
{
|
||||||
|
const unsigned char *u1;
|
||||||
|
const unsigned char *u2;
|
||||||
|
int ret;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
int len1 = strlen(str1);
|
||||||
|
int len2 = strlen(str2);
|
||||||
|
|
||||||
|
/* In our context both strings should always have the same length
|
||||||
|
* because they will be hashed passwords. */
|
||||||
|
if (len1 != len2)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
/* Force unsigned for bitwise operations. */
|
||||||
|
u1 = (const unsigned char *)str1;
|
||||||
|
u2 = (const unsigned char *)str2;
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
for (i = 0; i < len1; ++i)
|
||||||
|
ret |= (u1[i] ^ u2[i]);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
int bcrypt_gensalt(int factor, char salt[BCRYPT_HASHSIZE])
|
||||||
|
{
|
||||||
|
int fd;
|
||||||
|
char input[RANDBYTES];
|
||||||
|
int workf;
|
||||||
|
char *aux;
|
||||||
|
|
||||||
|
// Note: Windows does not have /dev/urandom sadly.
|
||||||
|
#ifdef _WIN32 || _WIN64
|
||||||
|
HCRYPTPROV p;
|
||||||
|
ULONG i;
|
||||||
|
|
||||||
|
// Acquire a crypt context for generating random bytes.
|
||||||
|
if (CryptAcquireContext(&p, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) == FALSE) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (CryptGenRandom(p, RANDBYTES, (BYTE*)input) == FALSE) {
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (CryptReleaseContext(p, 0) == FALSE) {
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
// Get random bytes on Unix/Linux.
|
||||||
|
fd = open("/dev/urandom", O_RDONLY);
|
||||||
|
if (fd == -1)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
if (try_read(fd, input, RANDBYTES) != 0) {
|
||||||
|
if (try_close(fd) != 0)
|
||||||
|
return 4;
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (try_close(fd) != 0)
|
||||||
|
return 3;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Generate salt. */
|
||||||
|
workf = (factor < 4 || factor > 31)?12:factor;
|
||||||
|
aux = crypt_gensalt_rn("$2a$", workf, input, RANDBYTES,
|
||||||
|
salt, BCRYPT_HASHSIZE);
|
||||||
|
return (aux == NULL)?5:0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int bcrypt_hashpw(const char *passwd, const char salt[BCRYPT_HASHSIZE], char hash[BCRYPT_HASHSIZE])
|
||||||
|
{
|
||||||
|
char *aux;
|
||||||
|
aux = crypt_rn(passwd, salt, hash, BCRYPT_HASHSIZE);
|
||||||
|
return (aux == NULL)?1:0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int bcrypt_checkpw(const char *passwd, const char hash[BCRYPT_HASHSIZE])
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
char outhash[BCRYPT_HASHSIZE];
|
||||||
|
|
||||||
|
ret = bcrypt_hashpw(passwd, hash, outhash);
|
||||||
|
if (ret != 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return timing_safe_strcmp(hash, outhash);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef TEST_BCRYPT
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
clock_t before;
|
||||||
|
clock_t after;
|
||||||
|
char salt[BCRYPT_HASHSIZE];
|
||||||
|
char hash[BCRYPT_HASHSIZE];
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
const char pass[] = "hi,mom";
|
||||||
|
const char hash1[] = "$2a$10$VEVmGHy4F4XQMJ3eOZJAUeb.MedU0W10pTPCuf53eHdKJPiSE8sMK";
|
||||||
|
const char hash2[] = "$2a$10$3F0BVk5t8/aoS.3ddaB3l.fxg5qvafQ9NybxcpXLzMeAt.nVWn.NO";
|
||||||
|
|
||||||
|
ret = bcrypt_gensalt(12, salt);
|
||||||
|
assert(ret == 0);
|
||||||
|
printf("Generated salt: %s\n", salt);
|
||||||
|
before = clock();
|
||||||
|
ret = bcrypt_hashpw("testtesttest", salt, hash);
|
||||||
|
assert(ret == 0);
|
||||||
|
after = clock();
|
||||||
|
printf("Hashed password: %s\n", hash);
|
||||||
|
printf("Time taken: %f seconds\n",
|
||||||
|
(double)(after - before) / CLOCKS_PER_SEC);
|
||||||
|
|
||||||
|
ret = bcrypt_hashpw(pass, hash1, hash);
|
||||||
|
assert(ret == 0);
|
||||||
|
printf("First hash check: %s\n", (strcmp(hash1, hash) == 0)?"OK":"FAIL");
|
||||||
|
ret = bcrypt_hashpw(pass, hash2, hash);
|
||||||
|
assert(ret == 0);
|
||||||
|
printf("Second hash check: %s\n", (strcmp(hash2, hash) == 0)?"OK":"FAIL");
|
||||||
|
|
||||||
|
before = clock();
|
||||||
|
ret = (bcrypt_checkpw(pass, hash1) == 0);
|
||||||
|
after = clock();
|
||||||
|
printf("First hash check with bcrypt_checkpw: %s\n", ret?"OK":"FAIL");
|
||||||
|
printf("Time taken: %f seconds\n",
|
||||||
|
(double)(after - before) / CLOCKS_PER_SEC);
|
||||||
|
|
||||||
|
before = clock();
|
||||||
|
ret = (bcrypt_checkpw(pass, hash2) == 0);
|
||||||
|
after = clock();
|
||||||
|
printf("Second hash check with bcrypt_checkpw: %s\n", ret?"OK":"FAIL");
|
||||||
|
printf("Time taken: %f seconds\n",
|
||||||
|
(double)(after - before) / CLOCKS_PER_SEC);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
97
src/contrib/bcrypt/bcrypt.h
Normal file
97
src/contrib/bcrypt/bcrypt.h
Normal file
@ -0,0 +1,97 @@
|
|||||||
|
#ifndef BCRYPT_H_
|
||||||
|
#define BCRYPT_H_
|
||||||
|
/*
|
||||||
|
* bcrypt wrapper library
|
||||||
|
*
|
||||||
|
* Written in 2011, 2013, 2014, 2015 by Ricardo Garcia <r@rg3.name>
|
||||||
|
*
|
||||||
|
* To the extent possible under law, the author(s) have dedicated all copyright
|
||||||
|
* and related and neighboring rights to this software to the public domain
|
||||||
|
* worldwide. This software is distributed without any warranty.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the CC0 Public Domain Dedication along
|
||||||
|
* with this software. If not, see
|
||||||
|
* <http://creativecommons.org/publicdomain/zero/1.0/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define BCRYPT_HASHSIZE (64)
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function expects a work factor between 4 and 31 and a char array to
|
||||||
|
* store the resulting generated salt. The char array should typically have
|
||||||
|
* BCRYPT_HASHSIZE bytes at least. If the provided work factor is not in the
|
||||||
|
* previous range, it will default to 12.
|
||||||
|
*
|
||||||
|
* The return value is zero if the salt could be correctly generated and
|
||||||
|
* nonzero otherwise.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
int bcrypt_gensalt(int workfactor, char salt[BCRYPT_HASHSIZE]);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function expects a password to be hashed, a salt to hash the password
|
||||||
|
* with and a char array to leave the result. Both the salt and the hash
|
||||||
|
* parameters should have room for BCRYPT_HASHSIZE characters at least.
|
||||||
|
*
|
||||||
|
* It can also be used to verify a hashed password. In that case, provide the
|
||||||
|
* expected hash in the salt parameter and verify the output hash is the same
|
||||||
|
* as the input hash. However, to avoid timing attacks, it's better to use
|
||||||
|
* bcrypt_checkpw when verifying a password.
|
||||||
|
*
|
||||||
|
* The return value is zero if the password could be hashed and nonzero
|
||||||
|
* otherwise.
|
||||||
|
*/
|
||||||
|
int bcrypt_hashpw(const char *passwd, const char salt[BCRYPT_HASHSIZE],
|
||||||
|
char hash[BCRYPT_HASHSIZE]);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function expects a password and a hash to verify the password against.
|
||||||
|
* The internal implementation is tuned to avoid timing attacks.
|
||||||
|
*
|
||||||
|
* The return value will be -1 in case of errors, zero if the provided password
|
||||||
|
* matches the given hash and greater than zero if no errors are found and the
|
||||||
|
* passwords don't match.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
int bcrypt_checkpw(const char *passwd, const char hash[BCRYPT_HASHSIZE]);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Brief Example
|
||||||
|
* -------------
|
||||||
|
*
|
||||||
|
* Hashing a password:
|
||||||
|
*
|
||||||
|
* char salt[BCRYPT_HASHSIZE];
|
||||||
|
* char hash[BCRYPT_HASHSIZE];
|
||||||
|
* int ret;
|
||||||
|
*
|
||||||
|
* ret = bcrypt_gensalt(12, salt);
|
||||||
|
* assert(ret == 0);
|
||||||
|
* ret = bcrypt_hashpw("thepassword", salt, hash);
|
||||||
|
* assert(ret == 0);
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* Verifying a password:
|
||||||
|
*
|
||||||
|
* int ret;
|
||||||
|
*
|
||||||
|
* ret = bcrypt_checkpw("thepassword", "expectedhash");
|
||||||
|
* assert(ret != -1);
|
||||||
|
*
|
||||||
|
* if (ret == 0) {
|
||||||
|
* printf("The password matches\n");
|
||||||
|
* } else {
|
||||||
|
* printf("The password does NOT match\n");
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
24
src/contrib/bcrypt/crypt.h
Normal file
24
src/contrib/bcrypt/crypt.h
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
* Written by Solar Designer <solar at openwall.com> in 2000-2002.
|
||||||
|
* No copyright is claimed, and the software is hereby placed in the public
|
||||||
|
* domain. In case this attempt to disclaim copyright and place the software
|
||||||
|
* in the public domain is deemed null and void, then the software is
|
||||||
|
* Copyright (c) 2000-2002 Solar Designer and it is hereby released to the
|
||||||
|
* general public under the following terms:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted.
|
||||||
|
*
|
||||||
|
* There's ABSOLUTELY NO WARRANTY, express or implied.
|
||||||
|
*
|
||||||
|
* See crypt_blowfish.c for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
//#include <gnu-crypt.h>
|
||||||
|
|
||||||
|
#if defined(_OW_SOURCE) || defined(__USE_OW)
|
||||||
|
#define __SKIP_GNU
|
||||||
|
#undef __SKIP_OW
|
||||||
|
#include <ow-crypt.h>
|
||||||
|
#undef __SKIP_GNU
|
||||||
|
#endif
|
911
src/contrib/bcrypt/crypt_blowfish.c
Normal file
911
src/contrib/bcrypt/crypt_blowfish.c
Normal file
@ -0,0 +1,911 @@
|
|||||||
|
/*
|
||||||
|
* The crypt_blowfish homepage is:
|
||||||
|
*
|
||||||
|
* http://www.openwall.com/crypt/
|
||||||
|
*
|
||||||
|
* This code comes from John the Ripper password cracker, with reentrant
|
||||||
|
* and crypt(3) interfaces added, but optimizations specific to password
|
||||||
|
* cracking removed.
|
||||||
|
*
|
||||||
|
* Written by Solar Designer <solar at openwall.com> in 1998-2014.
|
||||||
|
* No copyright is claimed, and the software is hereby placed in the public
|
||||||
|
* domain. In case this attempt to disclaim copyright and place the software
|
||||||
|
* in the public domain is deemed null and void, then the software is
|
||||||
|
* Copyright (c) 1998-2014 Solar Designer and it is hereby released to the
|
||||||
|
* general public under the following terms:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted.
|
||||||
|
*
|
||||||
|
* There's ABSOLUTELY NO WARRANTY, express or implied.
|
||||||
|
*
|
||||||
|
* It is my intent that you should be able to use this on your system,
|
||||||
|
* as part of a software package, or anywhere else to improve security,
|
||||||
|
* ensure compatibility, or for any other purpose. I would appreciate
|
||||||
|
* it if you give credit where it is due and keep your modifications in
|
||||||
|
* the public domain as well, but I don't require that in order to let
|
||||||
|
* you place this code and any modifications you make under a license
|
||||||
|
* of your choice.
|
||||||
|
*
|
||||||
|
* This implementation is fully compatible with OpenBSD's bcrypt.c for prefix
|
||||||
|
* "$2b$", originally by Niels Provos <provos at citi.umich.edu>, and it uses
|
||||||
|
* some of his ideas. The password hashing algorithm was designed by David
|
||||||
|
* Mazieres <dm at lcs.mit.edu>. For information on the level of
|
||||||
|
* compatibility for bcrypt hash prefixes other than "$2b$", please refer to
|
||||||
|
* the comments in BF_set_key() below and to the included crypt(3) man page.
|
||||||
|
*
|
||||||
|
* There's a paper on the algorithm that explains its design decisions:
|
||||||
|
*
|
||||||
|
* http://www.usenix.org/events/usenix99/provos.html
|
||||||
|
*
|
||||||
|
* Some of the tricks in BF_ROUND might be inspired by Eric Young's
|
||||||
|
* Blowfish library (I can't be sure if I would think of something if I
|
||||||
|
* hadn't seen his code).
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#ifndef __set_errno
|
||||||
|
#define __set_errno(val) errno = (val)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Just to make sure the prototypes match the actual definitions */
|
||||||
|
#ifdef _WIN32 || _WIN64
|
||||||
|
#include "crypt_blowfish.h"
|
||||||
|
#else
|
||||||
|
#include "crypt_blowfish.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __i386__
|
||||||
|
#define BF_ASM 1
|
||||||
|
#define BF_SCALE 1
|
||||||
|
#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
|
||||||
|
#define BF_ASM 0
|
||||||
|
#define BF_SCALE 1
|
||||||
|
#else
|
||||||
|
#define BF_ASM 0
|
||||||
|
#define BF_SCALE 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef unsigned int BF_word;
|
||||||
|
typedef signed int BF_word_signed;
|
||||||
|
|
||||||
|
/* Number of Blowfish rounds, this is also hardcoded into a few places */
|
||||||
|
#define BF_N 16
|
||||||
|
|
||||||
|
typedef BF_word BF_key[BF_N + 2];
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
BF_word S[4][0x100];
|
||||||
|
BF_key P;
|
||||||
|
} BF_ctx;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Magic IV for 64 Blowfish encryptions that we do at the end.
|
||||||
|
* The string is "OrpheanBeholderScryDoubt" on big-endian.
|
||||||
|
*/
|
||||||
|
static BF_word BF_magic_w[6] = {
|
||||||
|
0x4F727068, 0x65616E42, 0x65686F6C,
|
||||||
|
0x64657253, 0x63727944, 0x6F756274
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* P-box and S-box tables initialized with digits of Pi.
|
||||||
|
*/
|
||||||
|
static BF_ctx BF_init_state = {
|
||||||
|
{
|
||||||
|
{
|
||||||
|
0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
|
||||||
|
0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
|
||||||
|
0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
|
||||||
|
0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
|
||||||
|
0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
|
||||||
|
0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
|
||||||
|
0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
|
||||||
|
0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
|
||||||
|
0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
|
||||||
|
0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
|
||||||
|
0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
|
||||||
|
0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
|
||||||
|
0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
|
||||||
|
0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
|
||||||
|
0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
|
||||||
|
0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
|
||||||
|
0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
|
||||||
|
0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
|
||||||
|
0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
|
||||||
|
0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
|
||||||
|
0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
|
||||||
|
0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
|
||||||
|
0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
|
||||||
|
0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
|
||||||
|
0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
|
||||||
|
0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
|
||||||
|
0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
|
||||||
|
0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
|
||||||
|
0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
|
||||||
|
0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
|
||||||
|
0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
|
||||||
|
0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
|
||||||
|
0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
|
||||||
|
0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
|
||||||
|
0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
|
||||||
|
0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
|
||||||
|
0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
|
||||||
|
0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
|
||||||
|
0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
|
||||||
|
0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
|
||||||
|
0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
|
||||||
|
0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
|
||||||
|
0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
|
||||||
|
0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
|
||||||
|
0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
|
||||||
|
0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
|
||||||
|
0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
|
||||||
|
0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
|
||||||
|
0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
|
||||||
|
0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
|
||||||
|
0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
|
||||||
|
0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
|
||||||
|
0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
|
||||||
|
0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
|
||||||
|
0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
|
||||||
|
0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
|
||||||
|
0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
|
||||||
|
0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
|
||||||
|
0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
|
||||||
|
0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
|
||||||
|
0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
|
||||||
|
0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
|
||||||
|
0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
|
||||||
|
0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
|
||||||
|
}, {
|
||||||
|
0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
|
||||||
|
0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
|
||||||
|
0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
|
||||||
|
0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
|
||||||
|
0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
|
||||||
|
0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
|
||||||
|
0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
|
||||||
|
0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
|
||||||
|
0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
|
||||||
|
0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
|
||||||
|
0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
|
||||||
|
0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
|
||||||
|
0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
|
||||||
|
0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
|
||||||
|
0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
|
||||||
|
0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
|
||||||
|
0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
|
||||||
|
0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
|
||||||
|
0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
|
||||||
|
0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
|
||||||
|
0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
|
||||||
|
0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
|
||||||
|
0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
|
||||||
|
0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
|
||||||
|
0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
|
||||||
|
0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
|
||||||
|
0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
|
||||||
|
0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
|
||||||
|
0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
|
||||||
|
0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
|
||||||
|
0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
|
||||||
|
0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
|
||||||
|
0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
|
||||||
|
0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
|
||||||
|
0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
|
||||||
|
0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
|
||||||
|
0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
|
||||||
|
0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
|
||||||
|
0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
|
||||||
|
0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
|
||||||
|
0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
|
||||||
|
0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
|
||||||
|
0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
|
||||||
|
0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
|
||||||
|
0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
|
||||||
|
0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
|
||||||
|
0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
|
||||||
|
0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
|
||||||
|
0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
|
||||||
|
0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
|
||||||
|
0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
|
||||||
|
0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
|
||||||
|
0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
|
||||||
|
0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
|
||||||
|
0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
|
||||||
|
0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
|
||||||
|
0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
|
||||||
|
0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
|
||||||
|
0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
|
||||||
|
0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
|
||||||
|
0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
|
||||||
|
0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
|
||||||
|
0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
|
||||||
|
0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
|
||||||
|
}, {
|
||||||
|
0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
|
||||||
|
0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
|
||||||
|
0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
|
||||||
|
0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
|
||||||
|
0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
|
||||||
|
0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
|
||||||
|
0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
|
||||||
|
0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
|
||||||
|
0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
|
||||||
|
0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
|
||||||
|
0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
|
||||||
|
0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
|
||||||
|
0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
|
||||||
|
0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
|
||||||
|
0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
|
||||||
|
0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
|
||||||
|
0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
|
||||||
|
0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
|
||||||
|
0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
|
||||||
|
0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
|
||||||
|
0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
|
||||||
|
0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
|
||||||
|
0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
|
||||||
|
0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
|
||||||
|
0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
|
||||||
|
0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
|
||||||
|
0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
|
||||||
|
0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
|
||||||
|
0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
|
||||||
|
0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
|
||||||
|
0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
|
||||||
|
0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
|
||||||
|
0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
|
||||||
|
0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
|
||||||
|
0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
|
||||||
|
0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
|
||||||
|
0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
|
||||||
|
0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
|
||||||
|
0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
|
||||||
|
0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
|
||||||
|
0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
|
||||||
|
0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
|
||||||
|
0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
|
||||||
|
0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
|
||||||
|
0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
|
||||||
|
0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
|
||||||
|
0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
|
||||||
|
0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
|
||||||
|
0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
|
||||||
|
0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
|
||||||
|
0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
|
||||||
|
0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
|
||||||
|
0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
|
||||||
|
0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
|
||||||
|
0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
|
||||||
|
0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
|
||||||
|
0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
|
||||||
|
0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
|
||||||
|
0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
|
||||||
|
0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
|
||||||
|
0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
|
||||||
|
0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
|
||||||
|
0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
|
||||||
|
0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
|
||||||
|
}, {
|
||||||
|
0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
|
||||||
|
0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
|
||||||
|
0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
|
||||||
|
0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
|
||||||
|
0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
|
||||||
|
0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
|
||||||
|
0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
|
||||||
|
0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
|
||||||
|
0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
|
||||||
|
0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
|
||||||
|
0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
|
||||||
|
0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
|
||||||
|
0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
|
||||||
|
0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
|
||||||
|
0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
|
||||||
|
0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
|
||||||
|
0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
|
||||||
|
0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
|
||||||
|
0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
|
||||||
|
0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
|
||||||
|
0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
|
||||||
|
0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
|
||||||
|
0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
|
||||||
|
0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
|
||||||
|
0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
|
||||||
|
0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
|
||||||
|
0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
|
||||||
|
0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
|
||||||
|
0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
|
||||||
|
0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
|
||||||
|
0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
|
||||||
|
0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
|
||||||
|
0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
|
||||||
|
0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
|
||||||
|
0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
|
||||||
|
0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
|
||||||
|
0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
|
||||||
|
0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
|
||||||
|
0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
|
||||||
|
0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
|
||||||
|
0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
|
||||||
|
0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
|
||||||
|
0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
|
||||||
|
0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
|
||||||
|
0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
|
||||||
|
0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
|
||||||
|
0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
|
||||||
|
0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
|
||||||
|
0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
|
||||||
|
0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
|
||||||
|
0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
|
||||||
|
0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
|
||||||
|
0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
|
||||||
|
0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
|
||||||
|
0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
|
||||||
|
0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
|
||||||
|
0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
|
||||||
|
0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
|
||||||
|
0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
|
||||||
|
0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
|
||||||
|
0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
|
||||||
|
0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
|
||||||
|
0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
|
||||||
|
0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
|
||||||
|
0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
|
||||||
|
0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
|
||||||
|
0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
|
||||||
|
0x9216d5d9, 0x8979fb1b
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static unsigned char BF_itoa64[64 + 1] =
|
||||||
|
"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
||||||
|
|
||||||
|
static unsigned char BF_atoi64[0x60] = {
|
||||||
|
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1,
|
||||||
|
54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64,
|
||||||
|
64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||||
|
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 64, 64, 64, 64, 64,
|
||||||
|
64, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
|
||||||
|
43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 64, 64, 64, 64, 64
|
||||||
|
};
|
||||||
|
|
||||||
|
#define BF_safe_atoi64(dst, src) \
|
||||||
|
{ \
|
||||||
|
tmp = (unsigned char)(src); \
|
||||||
|
if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
|
||||||
|
tmp = BF_atoi64[tmp]; \
|
||||||
|
if (tmp > 63) return -1; \
|
||||||
|
(dst) = tmp; \
|
||||||
|
}
|
||||||
|
|
||||||
|
static int BF_decode(BF_word *dst, const char *src, int size)
|
||||||
|
{
|
||||||
|
unsigned char *dptr = (unsigned char *)dst;
|
||||||
|
unsigned char *end = dptr + size;
|
||||||
|
const unsigned char *sptr = (const unsigned char *)src;
|
||||||
|
unsigned int tmp, c1, c2, c3, c4;
|
||||||
|
|
||||||
|
do {
|
||||||
|
BF_safe_atoi64(c1, *sptr++);
|
||||||
|
BF_safe_atoi64(c2, *sptr++);
|
||||||
|
*dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4);
|
||||||
|
if (dptr >= end) break;
|
||||||
|
|
||||||
|
BF_safe_atoi64(c3, *sptr++);
|
||||||
|
*dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2);
|
||||||
|
if (dptr >= end) break;
|
||||||
|
|
||||||
|
BF_safe_atoi64(c4, *sptr++);
|
||||||
|
*dptr++ = ((c3 & 0x03) << 6) | c4;
|
||||||
|
} while (dptr < end);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void BF_encode(char *dst, const BF_word *src, int size)
|
||||||
|
{
|
||||||
|
const unsigned char *sptr = (const unsigned char *)src;
|
||||||
|
const unsigned char *end = sptr + size;
|
||||||
|
unsigned char *dptr = (unsigned char *)dst;
|
||||||
|
unsigned int c1, c2;
|
||||||
|
|
||||||
|
do {
|
||||||
|
c1 = *sptr++;
|
||||||
|
*dptr++ = BF_itoa64[c1 >> 2];
|
||||||
|
c1 = (c1 & 0x03) << 4;
|
||||||
|
if (sptr >= end) {
|
||||||
|
*dptr++ = BF_itoa64[c1];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
c2 = *sptr++;
|
||||||
|
c1 |= c2 >> 4;
|
||||||
|
*dptr++ = BF_itoa64[c1];
|
||||||
|
c1 = (c2 & 0x0f) << 2;
|
||||||
|
if (sptr >= end) {
|
||||||
|
*dptr++ = BF_itoa64[c1];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
c2 = *sptr++;
|
||||||
|
c1 |= c2 >> 6;
|
||||||
|
*dptr++ = BF_itoa64[c1];
|
||||||
|
*dptr++ = BF_itoa64[c2 & 0x3f];
|
||||||
|
} while (sptr < end);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void BF_swap(BF_word *x, int count)
|
||||||
|
{
|
||||||
|
static int endianness_check = 1;
|
||||||
|
char *is_little_endian = (char *)&endianness_check;
|
||||||
|
BF_word tmp;
|
||||||
|
|
||||||
|
if (*is_little_endian)
|
||||||
|
do {
|
||||||
|
tmp = *x;
|
||||||
|
tmp = (tmp << 16) | (tmp >> 16);
|
||||||
|
*x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF);
|
||||||
|
} while (--count);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if BF_SCALE
|
||||||
|
/* Architectures which can shift addresses left by 2 bits with no extra cost */
|
||||||
|
#define BF_ROUND(L, R, N) \
|
||||||
|
tmp1 = L & 0xFF; \
|
||||||
|
tmp2 = L >> 8; \
|
||||||
|
tmp2 &= 0xFF; \
|
||||||
|
tmp3 = L >> 16; \
|
||||||
|
tmp3 &= 0xFF; \
|
||||||
|
tmp4 = L >> 24; \
|
||||||
|
tmp1 = data.ctx.S[3][tmp1]; \
|
||||||
|
tmp2 = data.ctx.S[2][tmp2]; \
|
||||||
|
tmp3 = data.ctx.S[1][tmp3]; \
|
||||||
|
tmp3 += data.ctx.S[0][tmp4]; \
|
||||||
|
tmp3 ^= tmp2; \
|
||||||
|
R ^= data.ctx.P[N + 1]; \
|
||||||
|
tmp3 += tmp1; \
|
||||||
|
R ^= tmp3;
|
||||||
|
#else
|
||||||
|
/* Architectures with no complicated addressing modes supported */
|
||||||
|
#define BF_INDEX(S, i) \
|
||||||
|
(*((BF_word *)(((unsigned char *)S) + (i))))
|
||||||
|
#define BF_ROUND(L, R, N) \
|
||||||
|
tmp1 = L & 0xFF; \
|
||||||
|
tmp1 <<= 2; \
|
||||||
|
tmp2 = L >> 6; \
|
||||||
|
tmp2 &= 0x3FC; \
|
||||||
|
tmp3 = L >> 14; \
|
||||||
|
tmp3 &= 0x3FC; \
|
||||||
|
tmp4 = L >> 22; \
|
||||||
|
tmp4 &= 0x3FC; \
|
||||||
|
tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \
|
||||||
|
tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \
|
||||||
|
tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \
|
||||||
|
tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \
|
||||||
|
tmp3 ^= tmp2; \
|
||||||
|
R ^= data.ctx.P[N + 1]; \
|
||||||
|
tmp3 += tmp1; \
|
||||||
|
R ^= tmp3;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Encrypt one block, BF_N is hardcoded here.
|
||||||
|
*/
|
||||||
|
#define BF_ENCRYPT \
|
||||||
|
L ^= data.ctx.P[0]; \
|
||||||
|
BF_ROUND(L, R, 0); \
|
||||||
|
BF_ROUND(R, L, 1); \
|
||||||
|
BF_ROUND(L, R, 2); \
|
||||||
|
BF_ROUND(R, L, 3); \
|
||||||
|
BF_ROUND(L, R, 4); \
|
||||||
|
BF_ROUND(R, L, 5); \
|
||||||
|
BF_ROUND(L, R, 6); \
|
||||||
|
BF_ROUND(R, L, 7); \
|
||||||
|
BF_ROUND(L, R, 8); \
|
||||||
|
BF_ROUND(R, L, 9); \
|
||||||
|
BF_ROUND(L, R, 10); \
|
||||||
|
BF_ROUND(R, L, 11); \
|
||||||
|
BF_ROUND(L, R, 12); \
|
||||||
|
BF_ROUND(R, L, 13); \
|
||||||
|
BF_ROUND(L, R, 14); \
|
||||||
|
BF_ROUND(R, L, 15); \
|
||||||
|
tmp4 = R; \
|
||||||
|
R = L; \
|
||||||
|
L = tmp4 ^ data.ctx.P[BF_N + 1];
|
||||||
|
|
||||||
|
#if BF_ASM
|
||||||
|
#define BF_body() \
|
||||||
|
_BF_body_r(&data.ctx);
|
||||||
|
#else
|
||||||
|
#define BF_body() \
|
||||||
|
L = R = 0; \
|
||||||
|
ptr = data.ctx.P; \
|
||||||
|
do { \
|
||||||
|
ptr += 2; \
|
||||||
|
BF_ENCRYPT; \
|
||||||
|
*(ptr - 2) = L; \
|
||||||
|
*(ptr - 1) = R; \
|
||||||
|
} while (ptr < &data.ctx.P[BF_N + 2]); \
|
||||||
|
\
|
||||||
|
ptr = data.ctx.S[0]; \
|
||||||
|
do { \
|
||||||
|
ptr += 2; \
|
||||||
|
BF_ENCRYPT; \
|
||||||
|
*(ptr - 2) = L; \
|
||||||
|
*(ptr - 1) = R; \
|
||||||
|
} while (ptr < &data.ctx.S[3][0xFF]);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static void BF_set_key(const char *key, BF_key expanded, BF_key initial,
|
||||||
|
unsigned char flags)
|
||||||
|
{
|
||||||
|
const char *ptr = key;
|
||||||
|
unsigned int bug, i, j;
|
||||||
|
BF_word safety, sign, diff, tmp[2];
|
||||||
|
|
||||||
|
/*
|
||||||
|
* There was a sign extension bug in older revisions of this function. While
|
||||||
|
* we would have liked to simply fix the bug and move on, we have to provide
|
||||||
|
* a backwards compatibility feature (essentially the bug) for some systems and
|
||||||
|
* a safety measure for some others. The latter is needed because for certain
|
||||||
|
* multiple inputs to the buggy algorithm there exist easily found inputs to
|
||||||
|
* the correct algorithm that produce the same hash. Thus, we optionally
|
||||||
|
* deviate from the correct algorithm just enough to avoid such collisions.
|
||||||
|
* While the bug itself affected the majority of passwords containing
|
||||||
|
* characters with the 8th bit set (although only a percentage of those in a
|
||||||
|
* collision-producing way), the anti-collision safety measure affects
|
||||||
|
* only a subset of passwords containing the '\xff' character (not even all of
|
||||||
|
* those passwords, just some of them). This character is not found in valid
|
||||||
|
* UTF-8 sequences and is rarely used in popular 8-bit character encodings.
|
||||||
|
* Thus, the safety measure is unlikely to cause much annoyance, and is a
|
||||||
|
* reasonable tradeoff to use when authenticating against existing hashes that
|
||||||
|
* are not reliably known to have been computed with the correct algorithm.
|
||||||
|
*
|
||||||
|
* We use an approach that tries to minimize side-channel leaks of password
|
||||||
|
* information - that is, we mostly use fixed-cost bitwise operations instead
|
||||||
|
* of branches or table lookups. (One conditional branch based on password
|
||||||
|
* length remains. It is not part of the bug aftermath, though, and is
|
||||||
|
* difficult and possibly unreasonable to avoid given the use of C strings by
|
||||||
|
* the caller, which results in similar timing leaks anyway.)
|
||||||
|
*
|
||||||
|
* For actual implementation, we set an array index in the variable "bug"
|
||||||
|
* (0 means no bug, 1 means sign extension bug emulation) and a flag in the
|
||||||
|
* variable "safety" (bit 16 is set when the safety measure is requested).
|
||||||
|
* Valid combinations of settings are:
|
||||||
|
*
|
||||||
|
* Prefix "$2a$": bug = 0, safety = 0x10000
|
||||||
|
* Prefix "$2b$": bug = 0, safety = 0
|
||||||
|
* Prefix "$2x$": bug = 1, safety = 0
|
||||||
|
* Prefix "$2y$": bug = 0, safety = 0
|
||||||
|
*/
|
||||||
|
bug = (unsigned int)flags & 1;
|
||||||
|
safety = ((BF_word)flags & 2) << 15;
|
||||||
|
|
||||||
|
sign = diff = 0;
|
||||||
|
|
||||||
|
for (i = 0; i < BF_N + 2; i++) {
|
||||||
|
tmp[0] = tmp[1] = 0;
|
||||||
|
for (j = 0; j < 4; j++) {
|
||||||
|
tmp[0] <<= 8;
|
||||||
|
tmp[0] |= (unsigned char)*ptr; /* correct */
|
||||||
|
tmp[1] <<= 8;
|
||||||
|
tmp[1] |= (BF_word_signed)(signed char)*ptr; /* bug */
|
||||||
|
/*
|
||||||
|
* Sign extension in the first char has no effect - nothing to overwrite yet,
|
||||||
|
* and those extra 24 bits will be fully shifted out of the 32-bit word. For
|
||||||
|
* chars 2, 3, 4 in each four-char block, we set bit 7 of "sign" if sign
|
||||||
|
* extension in tmp[1] occurs. Once this flag is set, it remains set.
|
||||||
|
*/
|
||||||
|
if (j)
|
||||||
|
sign |= tmp[1] & 0x80;
|
||||||
|
if (!*ptr)
|
||||||
|
ptr = key;
|
||||||
|
else
|
||||||
|
ptr++;
|
||||||
|
}
|
||||||
|
diff |= tmp[0] ^ tmp[1]; /* Non-zero on any differences */
|
||||||
|
|
||||||
|
expanded[i] = tmp[bug];
|
||||||
|
initial[i] = BF_init_state.P[i] ^ tmp[bug];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* At this point, "diff" is zero iff the correct and buggy algorithms produced
|
||||||
|
* exactly the same result. If so and if "sign" is non-zero, which indicates
|
||||||
|
* that there was a non-benign sign extension, this means that we have a
|
||||||
|
* collision between the correctly computed hash for this password and a set of
|
||||||
|
* passwords that could be supplied to the buggy algorithm. Our safety measure
|
||||||
|
* is meant to protect from such many-buggy to one-correct collisions, by
|
||||||
|
* deviating from the correct algorithm in such cases. Let's check for this.
|
||||||
|
*/
|
||||||
|
diff |= diff >> 16; /* still zero iff exact match */
|
||||||
|
diff &= 0xffff; /* ditto */
|
||||||
|
diff += 0xffff; /* bit 16 set iff "diff" was non-zero (on non-match) */
|
||||||
|
sign <<= 9; /* move the non-benign sign extension flag to bit 16 */
|
||||||
|
sign &= ~diff & safety; /* action needed? */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If we have determined that we need to deviate from the correct algorithm,
|
||||||
|
* flip bit 16 in initial expanded key. (The choice of 16 is arbitrary, but
|
||||||
|
* let's stick to it now. It came out of the approach we used above, and it's
|
||||||
|
* not any worse than any other choice we could make.)
|
||||||
|
*
|
||||||
|
* It is crucial that we don't do the same to the expanded key used in the main
|
||||||
|
* Eksblowfish loop. By doing it to only one of these two, we deviate from a
|
||||||
|
* state that could be directly specified by a password to the buggy algorithm
|
||||||
|
* (and to the fully correct one as well, but that's a side-effect).
|
||||||
|
*/
|
||||||
|
initial[0] ^= sign;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const unsigned char flags_by_subtype[26] =
|
||||||
|
{2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 0};
|
||||||
|
|
||||||
|
static char *BF_crypt(const char *key, const char *setting,
|
||||||
|
char *output, int size,
|
||||||
|
BF_word min)
|
||||||
|
{
|
||||||
|
#if BF_ASM
|
||||||
|
extern void _BF_body_r(BF_ctx *ctx);
|
||||||
|
#endif
|
||||||
|
struct {
|
||||||
|
BF_ctx ctx;
|
||||||
|
BF_key expanded_key;
|
||||||
|
union {
|
||||||
|
BF_word salt[4];
|
||||||
|
BF_word output[6];
|
||||||
|
} binary;
|
||||||
|
} data;
|
||||||
|
BF_word L, R;
|
||||||
|
BF_word tmp1, tmp2, tmp3, tmp4;
|
||||||
|
BF_word *ptr;
|
||||||
|
BF_word count;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (size < 7 + 22 + 31 + 1) {
|
||||||
|
__set_errno(ERANGE);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (setting[0] != '$' ||
|
||||||
|
setting[1] != '2' ||
|
||||||
|
setting[2] < 'a' || setting[2] > 'z' ||
|
||||||
|
!flags_by_subtype[(unsigned int)(unsigned char)setting[2] - 'a'] ||
|
||||||
|
setting[3] != '$' ||
|
||||||
|
setting[4] < '0' || setting[4] > '3' ||
|
||||||
|
setting[5] < '0' || setting[5] > '9' ||
|
||||||
|
(setting[4] == '3' && setting[5] > '1') ||
|
||||||
|
setting[6] != '$') {
|
||||||
|
__set_errno(EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0'));
|
||||||
|
if (count < min || BF_decode(data.binary.salt, &setting[7], 16)) {
|
||||||
|
__set_errno(EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
BF_swap(data.binary.salt, 4);
|
||||||
|
|
||||||
|
BF_set_key(key, data.expanded_key, data.ctx.P,
|
||||||
|
flags_by_subtype[(unsigned int)(unsigned char)setting[2] - 'a']);
|
||||||
|
|
||||||
|
memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S));
|
||||||
|
|
||||||
|
L = R = 0;
|
||||||
|
for (i = 0; i < BF_N + 2; i += 2) {
|
||||||
|
L ^= data.binary.salt[i & 2];
|
||||||
|
R ^= data.binary.salt[(i & 2) + 1];
|
||||||
|
BF_ENCRYPT;
|
||||||
|
data.ctx.P[i] = L;
|
||||||
|
data.ctx.P[i + 1] = R;
|
||||||
|
}
|
||||||
|
|
||||||
|
ptr = data.ctx.S[0];
|
||||||
|
do {
|
||||||
|
ptr += 4;
|
||||||
|
L ^= data.binary.salt[(BF_N + 2) & 3];
|
||||||
|
R ^= data.binary.salt[(BF_N + 3) & 3];
|
||||||
|
BF_ENCRYPT;
|
||||||
|
*(ptr - 4) = L;
|
||||||
|
*(ptr - 3) = R;
|
||||||
|
|
||||||
|
L ^= data.binary.salt[(BF_N + 4) & 3];
|
||||||
|
R ^= data.binary.salt[(BF_N + 5) & 3];
|
||||||
|
BF_ENCRYPT;
|
||||||
|
*(ptr - 2) = L;
|
||||||
|
*(ptr - 1) = R;
|
||||||
|
} while (ptr < &data.ctx.S[3][0xFF]);
|
||||||
|
|
||||||
|
do {
|
||||||
|
int done;
|
||||||
|
|
||||||
|
for (i = 0; i < BF_N + 2; i += 2) {
|
||||||
|
data.ctx.P[i] ^= data.expanded_key[i];
|
||||||
|
data.ctx.P[i + 1] ^= data.expanded_key[i + 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
done = 0;
|
||||||
|
do {
|
||||||
|
BF_body();
|
||||||
|
if (done)
|
||||||
|
break;
|
||||||
|
done = 1;
|
||||||
|
|
||||||
|
tmp1 = data.binary.salt[0];
|
||||||
|
tmp2 = data.binary.salt[1];
|
||||||
|
tmp3 = data.binary.salt[2];
|
||||||
|
tmp4 = data.binary.salt[3];
|
||||||
|
for (i = 0; i < BF_N; i += 4) {
|
||||||
|
data.ctx.P[i] ^= tmp1;
|
||||||
|
data.ctx.P[i + 1] ^= tmp2;
|
||||||
|
data.ctx.P[i + 2] ^= tmp3;
|
||||||
|
data.ctx.P[i + 3] ^= tmp4;
|
||||||
|
}
|
||||||
|
data.ctx.P[16] ^= tmp1;
|
||||||
|
data.ctx.P[17] ^= tmp2;
|
||||||
|
} while (1);
|
||||||
|
} while (--count);
|
||||||
|
|
||||||
|
for (i = 0; i < 6; i += 2) {
|
||||||
|
L = BF_magic_w[i];
|
||||||
|
R = BF_magic_w[i + 1];
|
||||||
|
|
||||||
|
count = 64;
|
||||||
|
do {
|
||||||
|
BF_ENCRYPT;
|
||||||
|
} while (--count);
|
||||||
|
|
||||||
|
data.binary.output[i] = L;
|
||||||
|
data.binary.output[i + 1] = R;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(output, setting, 7 + 22 - 1);
|
||||||
|
output[7 + 22 - 1] = BF_itoa64[(int)
|
||||||
|
BF_atoi64[(int)setting[7 + 22 - 1] - 0x20] & 0x30];
|
||||||
|
|
||||||
|
/* This has to be bug-compatible with the original implementation, so
|
||||||
|
* only encode 23 of the 24 bytes. :-) */
|
||||||
|
BF_swap(data.binary.output, 6);
|
||||||
|
BF_encode(&output[7 + 22], data.binary.output, 23);
|
||||||
|
output[7 + 22 + 31] = '\0';
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
int _crypt_output_magic(const char *setting, char *output, int size)
|
||||||
|
{
|
||||||
|
if (size < 3)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
output[0] = '*';
|
||||||
|
output[1] = '0';
|
||||||
|
output[2] = '\0';
|
||||||
|
|
||||||
|
if (setting[0] == '*' && setting[1] == '0')
|
||||||
|
output[1] = '1';
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Please preserve the runtime self-test. It serves two purposes at once:
|
||||||
|
*
|
||||||
|
* 1. We really can't afford the risk of producing incompatible hashes e.g.
|
||||||
|
* when there's something like gcc bug 26587 again, whereas an application or
|
||||||
|
* library integrating this code might not also integrate our external tests or
|
||||||
|
* it might not run them after every build. Even if it does, the miscompile
|
||||||
|
* might only occur on the production build, but not on a testing build (such
|
||||||
|
* as because of different optimization settings). It is painful to recover
|
||||||
|
* from incorrectly-computed hashes - merely fixing whatever broke is not
|
||||||
|
* enough. Thus, a proactive measure like this self-test is needed.
|
||||||
|
*
|
||||||
|
* 2. We don't want to leave sensitive data from our actual password hash
|
||||||
|
* computation on the stack or in registers. Previous revisions of the code
|
||||||
|
* would do explicit cleanups, but simply running the self-test after hash
|
||||||
|
* computation is more reliable.
|
||||||
|
*
|
||||||
|
* The performance cost of this quick self-test is around 0.6% at the "$2a$08"
|
||||||
|
* setting.
|
||||||
|
*/
|
||||||
|
char *_crypt_blowfish_rn(const char *key, const char *setting,
|
||||||
|
char *output, int size)
|
||||||
|
{
|
||||||
|
const char *test_key = "8b \xd0\xc1\xd2\xcf\xcc\xd8";
|
||||||
|
const char *test_setting = "$2a$00$abcdefghijklmnopqrstuu";
|
||||||
|
static const char * const test_hashes[2] =
|
||||||
|
{"i1D709vfamulimlGcq0qq3UvuUasvEa\0\x55", /* 'a', 'b', 'y' */
|
||||||
|
"VUrPmXD6q/nVSSp7pNDhCR9071IfIRe\0\x55"}; /* 'x' */
|
||||||
|
const char *test_hash = test_hashes[0];
|
||||||
|
char *retval;
|
||||||
|
const char *p;
|
||||||
|
int save_errno, ok;
|
||||||
|
struct {
|
||||||
|
char s[7 + 22 + 1];
|
||||||
|
char o[7 + 22 + 31 + 1 + 1 + 1];
|
||||||
|
} buf;
|
||||||
|
|
||||||
|
/* Hash the supplied password */
|
||||||
|
_crypt_output_magic(setting, output, size);
|
||||||
|
retval = BF_crypt(key, setting, output, size, 16);
|
||||||
|
save_errno = errno;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Do a quick self-test. It is important that we make both calls to BF_crypt()
|
||||||
|
* from the same scope such that they likely use the same stack locations,
|
||||||
|
* which makes the second call overwrite the first call's sensitive data on the
|
||||||
|
* stack and makes it more likely that any alignment related issues would be
|
||||||
|
* detected by the self-test.
|
||||||
|
*/
|
||||||
|
memcpy(buf.s, test_setting, sizeof(buf.s));
|
||||||
|
if (retval) {
|
||||||
|
unsigned int flags = flags_by_subtype[
|
||||||
|
(unsigned int)(unsigned char)setting[2] - 'a'];
|
||||||
|
test_hash = test_hashes[flags & 1];
|
||||||
|
buf.s[2] = setting[2];
|
||||||
|
}
|
||||||
|
memset(buf.o, 0x55, sizeof(buf.o));
|
||||||
|
buf.o[sizeof(buf.o) - 1] = 0;
|
||||||
|
p = BF_crypt(test_key, buf.s, buf.o, sizeof(buf.o) - (1 + 1), 1);
|
||||||
|
|
||||||
|
ok = (p == buf.o &&
|
||||||
|
!memcmp(p, buf.s, 7 + 22) &&
|
||||||
|
!memcmp(p + (7 + 22), test_hash, 31 + 1 + 1 + 1));
|
||||||
|
|
||||||
|
{
|
||||||
|
const char *k = "\xff\xa3" "34" "\xff\xff\xff\xa3" "345";
|
||||||
|
BF_key ae, ai, ye, yi;
|
||||||
|
BF_set_key(k, ae, ai, 2); /* $2a$ */
|
||||||
|
BF_set_key(k, ye, yi, 4); /* $2y$ */
|
||||||
|
ai[0] ^= 0x10000; /* undo the safety (for comparison) */
|
||||||
|
ok = ok && ai[0] == 0xdb9c59bc && ye[17] == 0x33343500 &&
|
||||||
|
!memcmp(ae, ye, sizeof(ae)) &&
|
||||||
|
!memcmp(ai, yi, sizeof(ai));
|
||||||
|
}
|
||||||
|
|
||||||
|
__set_errno(save_errno);
|
||||||
|
if (ok)
|
||||||
|
return retval;
|
||||||
|
|
||||||
|
/* Should not happen */
|
||||||
|
_crypt_output_magic(setting, output, size);
|
||||||
|
__set_errno(EINVAL); /* pretend we don't support this hash type */
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *_crypt_gensalt_blowfish_rn(const char *prefix, unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size)
|
||||||
|
{
|
||||||
|
if (size < 16 || output_size < 7 + 22 + 1 ||
|
||||||
|
(count && (count < 4 || count > 31)) ||
|
||||||
|
prefix[0] != '$' || prefix[1] != '2' ||
|
||||||
|
(prefix[2] != 'a' && prefix[2] != 'b' && prefix[2] != 'y')) {
|
||||||
|
if (output_size > 0) output[0] = '\0';
|
||||||
|
__set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!count) count = 5;
|
||||||
|
|
||||||
|
output[0] = '$';
|
||||||
|
output[1] = '2';
|
||||||
|
output[2] = prefix[2];
|
||||||
|
output[3] = '$';
|
||||||
|
output[4] = '0' + count / 10;
|
||||||
|
output[5] = '0' + count % 10;
|
||||||
|
output[6] = '$';
|
||||||
|
|
||||||
|
BF_encode(&output[7], (const BF_word *)input, 16);
|
||||||
|
output[7 + 22] = '\0';
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
27
src/contrib/bcrypt/crypt_blowfish.h
Normal file
27
src/contrib/bcrypt/crypt_blowfish.h
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* Written by Solar Designer <solar at openwall.com> in 2000-2011.
|
||||||
|
* No copyright is claimed, and the software is hereby placed in the public
|
||||||
|
* domain. In case this attempt to disclaim copyright and place the software
|
||||||
|
* in the public domain is deemed null and void, then the software is
|
||||||
|
* Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
|
||||||
|
* general public under the following terms:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted.
|
||||||
|
*
|
||||||
|
* There's ABSOLUTELY NO WARRANTY, express or implied.
|
||||||
|
*
|
||||||
|
* See crypt_blowfish.c for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _CRYPT_BLOWFISH_H
|
||||||
|
#define _CRYPT_BLOWFISH_H
|
||||||
|
|
||||||
|
extern int _crypt_output_magic(const char *setting, char *output, int size);
|
||||||
|
extern char *_crypt_blowfish_rn(const char *key, const char *setting,
|
||||||
|
char *output, int size);
|
||||||
|
extern char *_crypt_gensalt_blowfish_rn(const char *prefix,
|
||||||
|
unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size);
|
||||||
|
|
||||||
|
#endif
|
128
src/contrib/bcrypt/crypt_gensalt.c
Normal file
128
src/contrib/bcrypt/crypt_gensalt.c
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
/*
|
||||||
|
* Written by Solar Designer <solar at openwall.com> in 2000-2011.
|
||||||
|
* No copyright is claimed, and the software is hereby placed in the public
|
||||||
|
* domain. In case this attempt to disclaim copyright and place the software
|
||||||
|
* in the public domain is deemed null and void, then the software is
|
||||||
|
* Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
|
||||||
|
* general public under the following terms:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted.
|
||||||
|
*
|
||||||
|
* There's ABSOLUTELY NO WARRANTY, express or implied.
|
||||||
|
*
|
||||||
|
* See crypt_blowfish.c for more information.
|
||||||
|
*
|
||||||
|
* This file contains salt generation functions for the traditional and
|
||||||
|
* other common crypt(3) algorithms, except for bcrypt which is defined
|
||||||
|
* entirely in crypt_blowfish.c.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#ifndef __set_errno
|
||||||
|
#define __set_errno(val) errno = (val)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Just to make sure the prototypes match the actual definitions */
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include "crypt_gensalt.h"
|
||||||
|
#else
|
||||||
|
#include "crypt_gensalt.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
unsigned char _crypt_itoa64[64 + 1] =
|
||||||
|
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
||||||
|
|
||||||
|
char *_crypt_gensalt_traditional_rn(const char *prefix, unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size)
|
||||||
|
{
|
||||||
|
(void) prefix;
|
||||||
|
|
||||||
|
if (size < 2 || output_size < 2 + 1 || (count && count != 25)) {
|
||||||
|
if (output_size > 0) output[0] = '\0';
|
||||||
|
__set_errno((output_size < 2 + 1) ? ERANGE : EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
output[0] = _crypt_itoa64[(unsigned int)input[0] & 0x3f];
|
||||||
|
output[1] = _crypt_itoa64[(unsigned int)input[1] & 0x3f];
|
||||||
|
output[2] = '\0';
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *_crypt_gensalt_extended_rn(const char *prefix, unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size)
|
||||||
|
{
|
||||||
|
unsigned long value;
|
||||||
|
|
||||||
|
(void) prefix;
|
||||||
|
|
||||||
|
/* Even iteration counts make it easier to detect weak DES keys from a look
|
||||||
|
* at the hash, so they should be avoided */
|
||||||
|
if (size < 3 || output_size < 1 + 4 + 4 + 1 ||
|
||||||
|
(count && (count > 0xffffff || !(count & 1)))) {
|
||||||
|
if (output_size > 0) output[0] = '\0';
|
||||||
|
__set_errno((output_size < 1 + 4 + 4 + 1) ? ERANGE : EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!count) count = 725;
|
||||||
|
|
||||||
|
output[0] = '_';
|
||||||
|
output[1] = _crypt_itoa64[count & 0x3f];
|
||||||
|
output[2] = _crypt_itoa64[(count >> 6) & 0x3f];
|
||||||
|
output[3] = _crypt_itoa64[(count >> 12) & 0x3f];
|
||||||
|
output[4] = _crypt_itoa64[(count >> 18) & 0x3f];
|
||||||
|
value = (unsigned long)(unsigned char)input[0] |
|
||||||
|
((unsigned long)(unsigned char)input[1] << 8) |
|
||||||
|
((unsigned long)(unsigned char)input[2] << 16);
|
||||||
|
output[5] = _crypt_itoa64[value & 0x3f];
|
||||||
|
output[6] = _crypt_itoa64[(value >> 6) & 0x3f];
|
||||||
|
output[7] = _crypt_itoa64[(value >> 12) & 0x3f];
|
||||||
|
output[8] = _crypt_itoa64[(value >> 18) & 0x3f];
|
||||||
|
output[9] = '\0';
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *_crypt_gensalt_md5_rn(const char *prefix, unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size)
|
||||||
|
{
|
||||||
|
unsigned long value;
|
||||||
|
|
||||||
|
(void) prefix;
|
||||||
|
|
||||||
|
if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000)) {
|
||||||
|
if (output_size > 0) output[0] = '\0';
|
||||||
|
__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
output[0] = '$';
|
||||||
|
output[1] = '1';
|
||||||
|
output[2] = '$';
|
||||||
|
value = (unsigned long)(unsigned char)input[0] |
|
||||||
|
((unsigned long)(unsigned char)input[1] << 8) |
|
||||||
|
((unsigned long)(unsigned char)input[2] << 16);
|
||||||
|
output[3] = _crypt_itoa64[value & 0x3f];
|
||||||
|
output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
|
||||||
|
output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
|
||||||
|
output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
|
||||||
|
output[7] = '\0';
|
||||||
|
|
||||||
|
if (size >= 6 && output_size >= 3 + 4 + 4 + 1) {
|
||||||
|
value = (unsigned long)(unsigned char)input[3] |
|
||||||
|
((unsigned long)(unsigned char)input[4] << 8) |
|
||||||
|
((unsigned long)(unsigned char)input[5] << 16);
|
||||||
|
output[7] = _crypt_itoa64[value & 0x3f];
|
||||||
|
output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
|
||||||
|
output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
|
||||||
|
output[10] = _crypt_itoa64[(value >> 18) & 0x3f];
|
||||||
|
output[11] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
30
src/contrib/bcrypt/crypt_gensalt.h
Normal file
30
src/contrib/bcrypt/crypt_gensalt.h
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
/*
|
||||||
|
* Written by Solar Designer <solar at openwall.com> in 2000-2011.
|
||||||
|
* No copyright is claimed, and the software is hereby placed in the public
|
||||||
|
* domain. In case this attempt to disclaim copyright and place the software
|
||||||
|
* in the public domain is deemed null and void, then the software is
|
||||||
|
* Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
|
||||||
|
* general public under the following terms:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted.
|
||||||
|
*
|
||||||
|
* There's ABSOLUTELY NO WARRANTY, express or implied.
|
||||||
|
*
|
||||||
|
* See crypt_blowfish.c for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _CRYPT_GENSALT_H
|
||||||
|
#define _CRYPT_GENSALT_H
|
||||||
|
|
||||||
|
extern unsigned char _crypt_itoa64[];
|
||||||
|
extern char *_crypt_gensalt_traditional_rn(const char *prefix,
|
||||||
|
unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size);
|
||||||
|
extern char *_crypt_gensalt_extended_rn(const char *prefix,
|
||||||
|
unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size);
|
||||||
|
extern char *_crypt_gensalt_md5_rn(const char *prefix, unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size);
|
||||||
|
|
||||||
|
#endif
|
43
src/contrib/bcrypt/ow-crypt.h
Normal file
43
src/contrib/bcrypt/ow-crypt.h
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
/*
|
||||||
|
* Written by Solar Designer <solar at openwall.com> in 2000-2011.
|
||||||
|
* No copyright is claimed, and the software is hereby placed in the public
|
||||||
|
* domain. In case this attempt to disclaim copyright and place the software
|
||||||
|
* in the public domain is deemed null and void, then the software is
|
||||||
|
* Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
|
||||||
|
* general public under the following terms:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted.
|
||||||
|
*
|
||||||
|
* There's ABSOLUTELY NO WARRANTY, express or implied.
|
||||||
|
*
|
||||||
|
* See crypt_blowfish.c for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _OW_CRYPT_H
|
||||||
|
#define _OW_CRYPT_H
|
||||||
|
|
||||||
|
#ifndef __GNUC__
|
||||||
|
#undef __const
|
||||||
|
#define __const const
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef __SKIP_GNU
|
||||||
|
extern char *crypt(__const char *key, __const char *setting);
|
||||||
|
extern char *crypt_r(__const char *key, __const char *setting, void *data);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef __SKIP_OW
|
||||||
|
extern char *crypt_rn(__const char *key, __const char *setting,
|
||||||
|
void *data, int size);
|
||||||
|
extern char *crypt_ra(__const char *key, __const char *setting,
|
||||||
|
void **data, int *size);
|
||||||
|
extern char *crypt_gensalt(__const char *prefix, unsigned long count,
|
||||||
|
__const char *input, int size);
|
||||||
|
extern char *crypt_gensalt_rn(__const char *prefix, unsigned long count,
|
||||||
|
__const char *input, int size, char *output, int output_size);
|
||||||
|
extern char *crypt_gensalt_ra(__const char *prefix, unsigned long count,
|
||||||
|
__const char *input, int size);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
27
src/contrib/bcrypt/winbcrypt.h
Normal file
27
src/contrib/bcrypt/winbcrypt.h
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#ifndef __WIN_BCRYPT__H
|
||||||
|
#define __WIN_BCRYPT__H
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
#include "crypt_blowfish.h"
|
||||||
|
#include "bcrypt.h"
|
||||||
|
|
||||||
|
class BCrypt {
|
||||||
|
public:
|
||||||
|
static std::string generateHash(const std::string & password, int workload = 12) {
|
||||||
|
char salt[BCRYPT_HASHSIZE];
|
||||||
|
char hash[BCRYPT_HASHSIZE];
|
||||||
|
int ret;
|
||||||
|
ret = bcrypt_gensalt(workload, salt);
|
||||||
|
if (ret != 0)throw std::runtime_error{ "bcrypt: can not generate salt" };
|
||||||
|
ret = bcrypt_hashpw(password.c_str(), salt, hash);
|
||||||
|
if (ret != 0)throw std::runtime_error{ "bcrypt: can not generate hash" };
|
||||||
|
return std::string{ hash };
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool validatePassword(const std::string & password, const std::string & hash) {
|
||||||
|
return (bcrypt_checkpw(password.c_str(), hash.c_str()) == 0);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
563
src/contrib/bcrypt/wrapper.c
Normal file
563
src/contrib/bcrypt/wrapper.c
Normal file
@ -0,0 +1,563 @@
|
|||||||
|
/*
|
||||||
|
* Written by Solar Designer <solar at openwall.com> in 2000-2014.
|
||||||
|
* No copyright is claimed, and the software is hereby placed in the public
|
||||||
|
* domain. In case this attempt to disclaim copyright and place the software
|
||||||
|
* in the public domain is deemed null and void, then the software is
|
||||||
|
* Copyright (c) 2000-2014 Solar Designer and it is hereby released to the
|
||||||
|
* general public under the following terms:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted.
|
||||||
|
*
|
||||||
|
* There's ABSOLUTELY NO WARRANTY, express or implied.
|
||||||
|
*
|
||||||
|
* See crypt_blowfish.c for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#ifndef __set_errno
|
||||||
|
#define __set_errno(val) errno = (val)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef TEST
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/times.h>
|
||||||
|
#ifdef TEST_THREADS
|
||||||
|
#include <pthread.h>
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define CRYPT_OUTPUT_SIZE (7 + 22 + 31 + 1)
|
||||||
|
#define CRYPT_GENSALT_OUTPUT_SIZE (7 + 22 + 1)
|
||||||
|
|
||||||
|
#if defined(__GLIBC__) && defined(_LIBC)
|
||||||
|
#define __SKIP_GNU
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32 | _WIN64
|
||||||
|
#include "ow-crypt.h"
|
||||||
|
|
||||||
|
#include "crypt_blowfish.h"
|
||||||
|
#include "crypt_gensalt.h"
|
||||||
|
#else
|
||||||
|
#include "ow-crypt.h"
|
||||||
|
|
||||||
|
#include "crypt_blowfish.h"
|
||||||
|
#include "crypt_gensalt.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GLIBC__) && defined(_LIBC)
|
||||||
|
/* crypt.h from glibc-crypt-2.1 will define struct crypt_data for us */
|
||||||
|
#include "crypt.h"
|
||||||
|
extern char *__md5_crypt_r(const char *key, const char *salt,
|
||||||
|
char *buffer, int buflen);
|
||||||
|
/* crypt-entry.c needs to be patched to define __des_crypt_r rather than
|
||||||
|
* __crypt_r, and not define crypt_r and crypt at all */
|
||||||
|
extern char *__des_crypt_r(const char *key, const char *salt,
|
||||||
|
struct crypt_data *data);
|
||||||
|
extern struct crypt_data _ufc_foobar;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static int _crypt_data_alloc(void **data, int *size, int need)
|
||||||
|
{
|
||||||
|
void *updated;
|
||||||
|
|
||||||
|
if (*data && *size >= need) return 0;
|
||||||
|
|
||||||
|
updated = realloc(*data, need);
|
||||||
|
|
||||||
|
if (!updated) {
|
||||||
|
#ifndef __GLIBC__
|
||||||
|
/* realloc(3) on glibc sets errno, so we don't need to bother */
|
||||||
|
__set_errno(ENOMEM);
|
||||||
|
#endif
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__GLIBC__) && defined(_LIBC)
|
||||||
|
if (need >= sizeof(struct crypt_data))
|
||||||
|
((struct crypt_data *)updated)->initialized = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
*data = updated;
|
||||||
|
*size = need;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *_crypt_retval_magic(char *retval, const char *setting,
|
||||||
|
char *output, int size)
|
||||||
|
{
|
||||||
|
if (retval)
|
||||||
|
return retval;
|
||||||
|
|
||||||
|
if (_crypt_output_magic(setting, output, size))
|
||||||
|
return NULL; /* shouldn't happen */
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__GLIBC__) && defined(_LIBC)
|
||||||
|
/*
|
||||||
|
* Applications may re-use the same instance of struct crypt_data without
|
||||||
|
* resetting the initialized field in order to let crypt_r() skip some of
|
||||||
|
* its initialization code. Thus, it is important that our multiple hashing
|
||||||
|
* algorithms either don't conflict with each other in their use of the
|
||||||
|
* data area or reset the initialized field themselves whenever required.
|
||||||
|
* Currently, the hashing algorithms simply have no conflicts: the first
|
||||||
|
* field of struct crypt_data is the 128-byte large DES key schedule which
|
||||||
|
* __des_crypt_r() calculates each time it is called while the two other
|
||||||
|
* hashing algorithms use less than 128 bytes of the data area.
|
||||||
|
*/
|
||||||
|
|
||||||
|
char *__crypt_rn(__const char *key, __const char *setting,
|
||||||
|
void *data, int size)
|
||||||
|
{
|
||||||
|
if (setting[0] == '$' && setting[1] == '2')
|
||||||
|
return _crypt_blowfish_rn(key, setting, (char *)data, size);
|
||||||
|
if (setting[0] == '$' && setting[1] == '1')
|
||||||
|
return __md5_crypt_r(key, setting, (char *)data, size);
|
||||||
|
if (setting[0] == '$' || setting[0] == '_') {
|
||||||
|
__set_errno(EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
if (size >= sizeof(struct crypt_data))
|
||||||
|
return __des_crypt_r(key, setting, (struct crypt_data *)data);
|
||||||
|
__set_errno(ERANGE);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *__crypt_ra(__const char *key, __const char *setting,
|
||||||
|
void **data, int *size)
|
||||||
|
{
|
||||||
|
if (setting[0] == '$' && setting[1] == '2') {
|
||||||
|
if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
|
||||||
|
return NULL;
|
||||||
|
return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
|
||||||
|
}
|
||||||
|
if (setting[0] == '$' && setting[1] == '1') {
|
||||||
|
if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
|
||||||
|
return NULL;
|
||||||
|
return __md5_crypt_r(key, setting, (char *)*data, *size);
|
||||||
|
}
|
||||||
|
if (setting[0] == '$' || setting[0] == '_') {
|
||||||
|
__set_errno(EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
if (_crypt_data_alloc(data, size, sizeof(struct crypt_data)))
|
||||||
|
return NULL;
|
||||||
|
return __des_crypt_r(key, setting, (struct crypt_data *)*data);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *__crypt_r(__const char *key, __const char *setting,
|
||||||
|
struct crypt_data *data)
|
||||||
|
{
|
||||||
|
return _crypt_retval_magic(
|
||||||
|
__crypt_rn(key, setting, data, sizeof(*data)),
|
||||||
|
setting, (char *)data, sizeof(*data));
|
||||||
|
}
|
||||||
|
|
||||||
|
char *__crypt(__const char *key, __const char *setting)
|
||||||
|
{
|
||||||
|
return _crypt_retval_magic(
|
||||||
|
__crypt_rn(key, setting, &_ufc_foobar, sizeof(_ufc_foobar)),
|
||||||
|
setting, (char *)&_ufc_foobar, sizeof(_ufc_foobar));
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
char *crypt_rn(const char *key, const char *setting, void *data, int size)
|
||||||
|
{
|
||||||
|
return _crypt_blowfish_rn(key, setting, (char *)data, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *crypt_ra(const char *key, const char *setting,
|
||||||
|
void **data, int *size)
|
||||||
|
{
|
||||||
|
if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
|
||||||
|
return NULL;
|
||||||
|
return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *crypt_r(const char *key, const char *setting, void *data)
|
||||||
|
{
|
||||||
|
return _crypt_retval_magic(
|
||||||
|
crypt_rn(key, setting, data, CRYPT_OUTPUT_SIZE),
|
||||||
|
setting, (char *)data, CRYPT_OUTPUT_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *crypt(const char *key, const char *setting)
|
||||||
|
{
|
||||||
|
static char output[CRYPT_OUTPUT_SIZE];
|
||||||
|
|
||||||
|
return _crypt_retval_magic(
|
||||||
|
crypt_rn(key, setting, output, sizeof(output)),
|
||||||
|
setting, output, sizeof(output));
|
||||||
|
}
|
||||||
|
|
||||||
|
#define __crypt_gensalt_rn crypt_gensalt_rn
|
||||||
|
#define __crypt_gensalt_ra crypt_gensalt_ra
|
||||||
|
#define __crypt_gensalt crypt_gensalt
|
||||||
|
#endif
|
||||||
|
|
||||||
|
char *__crypt_gensalt_rn(const char *prefix, unsigned long count,
|
||||||
|
const char *input, int size, char *output, int output_size)
|
||||||
|
{
|
||||||
|
char *(*use)(const char *_prefix, unsigned long _count,
|
||||||
|
const char *_input, int _size,
|
||||||
|
char *_output, int _output_size);
|
||||||
|
|
||||||
|
/* This may be supported on some platforms in the future */
|
||||||
|
if (!input) {
|
||||||
|
__set_errno(EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!strncmp(prefix, "$2a$", 4) || !strncmp(prefix, "$2b$", 4) ||
|
||||||
|
!strncmp(prefix, "$2y$", 4))
|
||||||
|
use = _crypt_gensalt_blowfish_rn;
|
||||||
|
else
|
||||||
|
if (!strncmp(prefix, "$1$", 3))
|
||||||
|
use = _crypt_gensalt_md5_rn;
|
||||||
|
else
|
||||||
|
if (prefix[0] == '_')
|
||||||
|
use = _crypt_gensalt_extended_rn;
|
||||||
|
else
|
||||||
|
if (!prefix[0] ||
|
||||||
|
(prefix[0] && prefix[1] &&
|
||||||
|
memchr(_crypt_itoa64, prefix[0], 64) &&
|
||||||
|
memchr(_crypt_itoa64, prefix[1], 64)))
|
||||||
|
use = _crypt_gensalt_traditional_rn;
|
||||||
|
else {
|
||||||
|
__set_errno(EINVAL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return use(prefix, count, input, size, output, output_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *__crypt_gensalt_ra(const char *prefix, unsigned long count,
|
||||||
|
const char *input, int size)
|
||||||
|
{
|
||||||
|
char output[CRYPT_GENSALT_OUTPUT_SIZE];
|
||||||
|
char *retval;
|
||||||
|
|
||||||
|
retval = __crypt_gensalt_rn(prefix, count,
|
||||||
|
input, size, output, sizeof(output));
|
||||||
|
|
||||||
|
if (retval) {
|
||||||
|
#ifdef _WIN32 | _WIN64
|
||||||
|
retval = _strdup(retval);
|
||||||
|
#else
|
||||||
|
retval = strdup(retval);
|
||||||
|
#endif
|
||||||
|
#ifndef __GLIBC__
|
||||||
|
/* strdup(3) on glibc sets errno, so we don't need to bother */
|
||||||
|
if (!retval)
|
||||||
|
__set_errno(ENOMEM);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *__crypt_gensalt(const char *prefix, unsigned long count,
|
||||||
|
const char *input, int size)
|
||||||
|
{
|
||||||
|
static char output[CRYPT_GENSALT_OUTPUT_SIZE];
|
||||||
|
|
||||||
|
return __crypt_gensalt_rn(prefix, count,
|
||||||
|
input, size, output, sizeof(output));
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__GLIBC__) && defined(_LIBC)
|
||||||
|
weak_alias(__crypt_rn, crypt_rn)
|
||||||
|
weak_alias(__crypt_ra, crypt_ra)
|
||||||
|
weak_alias(__crypt_r, crypt_r)
|
||||||
|
weak_alias(__crypt, crypt)
|
||||||
|
weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
|
||||||
|
weak_alias(__crypt_gensalt_ra, crypt_gensalt_ra)
|
||||||
|
weak_alias(__crypt_gensalt, crypt_gensalt)
|
||||||
|
weak_alias(crypt, fcrypt)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef TEST
|
||||||
|
static const char *tests[][3] = {
|
||||||
|
{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW",
|
||||||
|
"U*U"},
|
||||||
|
{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.VGOzA784oUp/Z0DY336zx7pLYAy0lwK",
|
||||||
|
"U*U*"},
|
||||||
|
{"$2a$05$XXXXXXXXXXXXXXXXXXXXXOAcXxm9kjPGEMsLznoKqmqw7tc8WCx4a",
|
||||||
|
"U*U*U"},
|
||||||
|
{"$2a$05$abcdefghijklmnopqrstuu5s2v8.iXieOjg/.AySBTTZIIVFJeBui",
|
||||||
|
"0123456789abcdefghijklmnopqrstuvwxyz"
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
|
||||||
|
"chars after 72 are ignored"},
|
||||||
|
{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
|
||||||
|
"\xa3"},
|
||||||
|
{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
|
||||||
|
"\xff\xff\xa3"},
|
||||||
|
{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
|
||||||
|
"\xff\xff\xa3"},
|
||||||
|
{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.nqd1wy.pTMdcvrRWxyiGL2eMz.2a85.",
|
||||||
|
"\xff\xff\xa3"},
|
||||||
|
{"$2b$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
|
||||||
|
"\xff\xff\xa3"},
|
||||||
|
{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
|
||||||
|
"\xa3"},
|
||||||
|
{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
|
||||||
|
"\xa3"},
|
||||||
|
{"$2b$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
|
||||||
|
"\xa3"},
|
||||||
|
{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
|
||||||
|
"1\xa3" "345"},
|
||||||
|
{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
|
||||||
|
"\xff\xa3" "345"},
|
||||||
|
{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
|
||||||
|
"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
|
||||||
|
{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
|
||||||
|
"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
|
||||||
|
{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.ZC1JEJ8Z4gPfpe1JOr/oyPXTWl9EFd.",
|
||||||
|
"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
|
||||||
|
{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.nRht2l/HRhr6zmCp9vYUvvsqynflf9e",
|
||||||
|
"\xff\xa3" "345"},
|
||||||
|
{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.nRht2l/HRhr6zmCp9vYUvvsqynflf9e",
|
||||||
|
"\xff\xa3" "345"},
|
||||||
|
{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
|
||||||
|
"\xa3" "ab"},
|
||||||
|
{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
|
||||||
|
"\xa3" "ab"},
|
||||||
|
{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
|
||||||
|
"\xa3" "ab"},
|
||||||
|
{"$2x$05$6bNw2HLQYeqHYyBfLMsv/OiwqTymGIGzFsA4hOTWebfehXHNprcAS",
|
||||||
|
"\xd1\x91"},
|
||||||
|
{"$2x$05$6bNw2HLQYeqHYyBfLMsv/O9LIGgn8OMzuDoHfof8AQimSGfcSWxnS",
|
||||||
|
"\xd0\xc1\xd2\xcf\xcc\xd8"},
|
||||||
|
{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.swQOIzjOiJ9GHEPuhEkvqrUyvWhEMx6",
|
||||||
|
"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
|
||||||
|
"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
|
||||||
|
"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
|
||||||
|
"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
|
||||||
|
"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
|
||||||
|
"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
|
||||||
|
"chars after 72 are ignored as usual"},
|
||||||
|
{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.R9xrDjiycxMbQE2bp.vgqlYpW5wx2yy",
|
||||||
|
"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
|
||||||
|
"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
|
||||||
|
"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
|
||||||
|
"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
|
||||||
|
"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
|
||||||
|
"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"},
|
||||||
|
{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.9tQZzcJfm3uj2NvJ/n5xkhpqLrMpWCe",
|
||||||
|
"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
|
||||||
|
"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
|
||||||
|
"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
|
||||||
|
"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
|
||||||
|
"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
|
||||||
|
"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"},
|
||||||
|
{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.7uG0VCzI2bS7j6ymqJi9CdcdxiRTWNy",
|
||||||
|
""},
|
||||||
|
{"*0", "", "$2a$03$CCCCCCCCCCCCCCCCCCCCC."},
|
||||||
|
{"*0", "", "$2a$32$CCCCCCCCCCCCCCCCCCCCC."},
|
||||||
|
{"*0", "", "$2c$05$CCCCCCCCCCCCCCCCCCCCC."},
|
||||||
|
{"*0", "", "$2z$05$CCCCCCCCCCCCCCCCCCCCC."},
|
||||||
|
{"*0", "", "$2`$05$CCCCCCCCCCCCCCCCCCCCC."},
|
||||||
|
{"*0", "", "$2{$05$CCCCCCCCCCCCCCCCCCCCC."},
|
||||||
|
{"*1", "", "*0"},
|
||||||
|
{NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
#define which tests[0]
|
||||||
|
|
||||||
|
static volatile sig_atomic_t running;
|
||||||
|
|
||||||
|
static void handle_timer(int signum)
|
||||||
|
{
|
||||||
|
(void) signum;
|
||||||
|
running = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void *run(void *arg)
|
||||||
|
{
|
||||||
|
unsigned long count = 0;
|
||||||
|
int i = 0;
|
||||||
|
void *data = NULL;
|
||||||
|
int size = 0x12345678;
|
||||||
|
|
||||||
|
do {
|
||||||
|
const char *hash = tests[i][0];
|
||||||
|
const char *key = tests[i][1];
|
||||||
|
const char *setting = tests[i][2];
|
||||||
|
|
||||||
|
if (!tests[++i][0])
|
||||||
|
i = 0;
|
||||||
|
|
||||||
|
if (setting && strlen(hash) < 30) /* not for benchmark */
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (strcmp(crypt_ra(key, hash, &data, &size), hash)) {
|
||||||
|
printf("%d: FAILED (crypt_ra/%d/%lu)\n",
|
||||||
|
(int)((char *)arg - (char *)0), i, count);
|
||||||
|
free(data);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
count++;
|
||||||
|
} while (running);
|
||||||
|
|
||||||
|
free(data);
|
||||||
|
return count + (char *)0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
struct itimerval it;
|
||||||
|
struct tms buf;
|
||||||
|
clock_t clk_tck, start_real, start_virtual, end_real, end_virtual;
|
||||||
|
unsigned long count;
|
||||||
|
void *data;
|
||||||
|
int size;
|
||||||
|
char *setting1, *setting2;
|
||||||
|
int i;
|
||||||
|
#ifdef TEST_THREADS
|
||||||
|
pthread_t t[TEST_THREADS];
|
||||||
|
void *t_retval;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
data = NULL;
|
||||||
|
size = 0x12345678;
|
||||||
|
|
||||||
|
for (i = 0; tests[i][0]; i++) {
|
||||||
|
const char *hash = tests[i][0];
|
||||||
|
const char *key = tests[i][1];
|
||||||
|
const char *setting = tests[i][2];
|
||||||
|
const char *p;
|
||||||
|
int ok = !setting || strlen(hash) >= 30;
|
||||||
|
int o_size;
|
||||||
|
char s_buf[30], o_buf[61];
|
||||||
|
if (!setting) {
|
||||||
|
memcpy(s_buf, hash, sizeof(s_buf) - 1);
|
||||||
|
s_buf[sizeof(s_buf) - 1] = 0;
|
||||||
|
setting = s_buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
__set_errno(0);
|
||||||
|
p = crypt(key, setting);
|
||||||
|
if ((!ok && !errno) || strcmp(p, hash)) {
|
||||||
|
printf("FAILED (crypt/%d)\n", i);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ok && strcmp(crypt(key, hash), hash)) {
|
||||||
|
printf("FAILED (crypt/%d)\n", i);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (o_size = -1; o_size <= (int)sizeof(o_buf); o_size++) {
|
||||||
|
int ok_n = ok && o_size == (int)sizeof(o_buf);
|
||||||
|
const char *x = "abc";
|
||||||
|
strcpy(o_buf, x);
|
||||||
|
if (o_size >= 3) {
|
||||||
|
x = "*0";
|
||||||
|
if (setting[0] == '*' && setting[1] == '0')
|
||||||
|
x = "*1";
|
||||||
|
}
|
||||||
|
__set_errno(0);
|
||||||
|
p = crypt_rn(key, setting, o_buf, o_size);
|
||||||
|
if ((ok_n && (!p || strcmp(p, hash))) ||
|
||||||
|
(!ok_n && (!errno || p || strcmp(o_buf, x)))) {
|
||||||
|
printf("FAILED (crypt_rn/%d)\n", i);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
__set_errno(0);
|
||||||
|
p = crypt_ra(key, setting, &data, &size);
|
||||||
|
if ((ok && (!p || strcmp(p, hash))) ||
|
||||||
|
(!ok && (!errno || p || strcmp((char *)data, hash)))) {
|
||||||
|
printf("FAILED (crypt_ra/%d)\n", i);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setting1 = crypt_gensalt(which[0], 12, data, size);
|
||||||
|
if (!setting1 || strncmp(setting1, "$2a$12$", 7)) {
|
||||||
|
puts("FAILED (crypt_gensalt)\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
setting2 = crypt_gensalt_ra(setting1, 12, data, size);
|
||||||
|
if (strcmp(setting1, setting2)) {
|
||||||
|
puts("FAILED (crypt_gensalt_ra/1)\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
(*(char *)data)++;
|
||||||
|
setting1 = crypt_gensalt_ra(setting2, 12, data, size);
|
||||||
|
if (!strcmp(setting1, setting2)) {
|
||||||
|
puts("FAILED (crypt_gensalt_ra/2)\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
free(setting1);
|
||||||
|
free(setting2);
|
||||||
|
free(data);
|
||||||
|
|
||||||
|
#if defined(_SC_CLK_TCK) || !defined(CLK_TCK)
|
||||||
|
clk_tck = sysconf(_SC_CLK_TCK);
|
||||||
|
#else
|
||||||
|
clk_tck = CLK_TCK;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
running = 1;
|
||||||
|
signal(SIGALRM, handle_timer);
|
||||||
|
|
||||||
|
memset(&it, 0, sizeof(it));
|
||||||
|
it.it_value.tv_sec = 5;
|
||||||
|
setitimer(ITIMER_REAL, &it, NULL);
|
||||||
|
|
||||||
|
start_real = times(&buf);
|
||||||
|
start_virtual = buf.tms_utime + buf.tms_stime;
|
||||||
|
|
||||||
|
count = (char *)run((char *)0) - (char *)0;
|
||||||
|
|
||||||
|
end_real = times(&buf);
|
||||||
|
end_virtual = buf.tms_utime + buf.tms_stime;
|
||||||
|
if (end_virtual == start_virtual) end_virtual++;
|
||||||
|
|
||||||
|
printf("%.1f c/s real, %.1f c/s virtual\n",
|
||||||
|
(float)count * clk_tck / (end_real - start_real),
|
||||||
|
(float)count * clk_tck / (end_virtual - start_virtual));
|
||||||
|
|
||||||
|
#ifdef TEST_THREADS
|
||||||
|
running = 1;
|
||||||
|
it.it_value.tv_sec = 60;
|
||||||
|
setitimer(ITIMER_REAL, &it, NULL);
|
||||||
|
start_real = times(&buf);
|
||||||
|
|
||||||
|
for (i = 0; i < TEST_THREADS; i++)
|
||||||
|
if (pthread_create(&t[i], NULL, run, i + (char *)0)) {
|
||||||
|
perror("pthread_create");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < TEST_THREADS; i++) {
|
||||||
|
if (pthread_join(t[i], &t_retval)) {
|
||||||
|
perror("pthread_join");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!t_retval) continue;
|
||||||
|
count = (char *)t_retval - (char *)0;
|
||||||
|
end_real = times(&buf);
|
||||||
|
printf("%d: %.1f c/s real\n", i,
|
||||||
|
(float)count * clk_tck / (end_real - start_real));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
202
src/contrib/bcrypt/x86.S
Normal file
202
src/contrib/bcrypt/x86.S
Normal file
@ -0,0 +1,202 @@
|
|||||||
|
/*
|
||||||
|
* Written by Solar Designer <solar at openwall.com> in 1998-2010.
|
||||||
|
* No copyright is claimed, and the software is hereby placed in the public
|
||||||
|
* domain. In case this attempt to disclaim copyright and place the software
|
||||||
|
* in the public domain is deemed null and void, then the software is
|
||||||
|
* Copyright (c) 1998-2010 Solar Designer and it is hereby released to the
|
||||||
|
* general public under the following terms:
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted.
|
||||||
|
*
|
||||||
|
* There's ABSOLUTELY NO WARRANTY, express or implied.
|
||||||
|
*
|
||||||
|
* See crypt_blowfish.c for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef __i386__
|
||||||
|
|
||||||
|
#if defined(__OpenBSD__) && !defined(__ELF__)
|
||||||
|
#define UNDERSCORES
|
||||||
|
#define ALIGN_LOG
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__CYGWIN32__) || defined(__MINGW32__)
|
||||||
|
#define UNDERSCORES
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __DJGPP__
|
||||||
|
#define UNDERSCORES
|
||||||
|
#define ALIGN_LOG
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef UNDERSCORES
|
||||||
|
#define _BF_body_r __BF_body_r
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef ALIGN_LOG
|
||||||
|
#define DO_ALIGN(log) .align (log)
|
||||||
|
#elif defined(DUMBAS)
|
||||||
|
#define DO_ALIGN(log) .align 1 << log
|
||||||
|
#else
|
||||||
|
#define DO_ALIGN(log) .align (1 << (log))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define BF_FRAME 0x200
|
||||||
|
#define ctx %esp
|
||||||
|
|
||||||
|
#define BF_ptr (ctx)
|
||||||
|
|
||||||
|
#define S(N, r) N+BF_FRAME(ctx,r,4)
|
||||||
|
#ifdef DUMBAS
|
||||||
|
#define P(N) 0x1000+N+N+N+N+BF_FRAME(ctx)
|
||||||
|
#else
|
||||||
|
#define P(N) 0x1000+4*N+BF_FRAME(ctx)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This version of the assembly code is optimized primarily for the original
|
||||||
|
* Intel Pentium but is also careful to avoid partial register stalls on the
|
||||||
|
* Pentium Pro family of processors (tested up to Pentium III Coppermine).
|
||||||
|
*
|
||||||
|
* It is possible to do 15% faster on the Pentium Pro family and probably on
|
||||||
|
* many non-Intel x86 processors, but, unfortunately, that would make things
|
||||||
|
* twice slower for the original Pentium.
|
||||||
|
*
|
||||||
|
* An additional 2% speedup may be achieved with non-reentrant code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define L %esi
|
||||||
|
#define R %edi
|
||||||
|
#define tmp1 %eax
|
||||||
|
#define tmp1_lo %al
|
||||||
|
#define tmp2 %ecx
|
||||||
|
#define tmp2_hi %ch
|
||||||
|
#define tmp3 %edx
|
||||||
|
#define tmp3_lo %dl
|
||||||
|
#define tmp4 %ebx
|
||||||
|
#define tmp4_hi %bh
|
||||||
|
#define tmp5 %ebp
|
||||||
|
|
||||||
|
.text
|
||||||
|
|
||||||
|
#define BF_ROUND(L, R, N) \
|
||||||
|
xorl L,tmp2; \
|
||||||
|
xorl tmp1,tmp1; \
|
||||||
|
movl tmp2,L; \
|
||||||
|
shrl $16,tmp2; \
|
||||||
|
movl L,tmp4; \
|
||||||
|
movb tmp2_hi,tmp1_lo; \
|
||||||
|
andl $0xFF,tmp2; \
|
||||||
|
movb tmp4_hi,tmp3_lo; \
|
||||||
|
andl $0xFF,tmp4; \
|
||||||
|
movl S(0,tmp1),tmp1; \
|
||||||
|
movl S(0x400,tmp2),tmp5; \
|
||||||
|
addl tmp5,tmp1; \
|
||||||
|
movl S(0x800,tmp3),tmp5; \
|
||||||
|
xorl tmp5,tmp1; \
|
||||||
|
movl S(0xC00,tmp4),tmp5; \
|
||||||
|
addl tmp1,tmp5; \
|
||||||
|
movl 4+P(N),tmp2; \
|
||||||
|
xorl tmp5,R
|
||||||
|
|
||||||
|
#define BF_ENCRYPT_START \
|
||||||
|
BF_ROUND(L, R, 0); \
|
||||||
|
BF_ROUND(R, L, 1); \
|
||||||
|
BF_ROUND(L, R, 2); \
|
||||||
|
BF_ROUND(R, L, 3); \
|
||||||
|
BF_ROUND(L, R, 4); \
|
||||||
|
BF_ROUND(R, L, 5); \
|
||||||
|
BF_ROUND(L, R, 6); \
|
||||||
|
BF_ROUND(R, L, 7); \
|
||||||
|
BF_ROUND(L, R, 8); \
|
||||||
|
BF_ROUND(R, L, 9); \
|
||||||
|
BF_ROUND(L, R, 10); \
|
||||||
|
BF_ROUND(R, L, 11); \
|
||||||
|
BF_ROUND(L, R, 12); \
|
||||||
|
BF_ROUND(R, L, 13); \
|
||||||
|
BF_ROUND(L, R, 14); \
|
||||||
|
BF_ROUND(R, L, 15); \
|
||||||
|
movl BF_ptr,tmp5; \
|
||||||
|
xorl L,tmp2; \
|
||||||
|
movl P(17),L
|
||||||
|
|
||||||
|
#define BF_ENCRYPT_END \
|
||||||
|
xorl R,L; \
|
||||||
|
movl tmp2,R
|
||||||
|
|
||||||
|
DO_ALIGN(5)
|
||||||
|
.globl _BF_body_r
|
||||||
|
_BF_body_r:
|
||||||
|
movl 4(%esp),%eax
|
||||||
|
pushl %ebp
|
||||||
|
pushl %ebx
|
||||||
|
pushl %esi
|
||||||
|
pushl %edi
|
||||||
|
subl $BF_FRAME-8,%eax
|
||||||
|
xorl L,L
|
||||||
|
cmpl %esp,%eax
|
||||||
|
ja BF_die
|
||||||
|
xchgl %eax,%esp
|
||||||
|
xorl R,R
|
||||||
|
pushl %eax
|
||||||
|
leal 0x1000+BF_FRAME-4(ctx),%eax
|
||||||
|
movl 0x1000+BF_FRAME-4(ctx),tmp2
|
||||||
|
pushl %eax
|
||||||
|
xorl tmp3,tmp3
|
||||||
|
BF_loop_P:
|
||||||
|
BF_ENCRYPT_START
|
||||||
|
addl $8,tmp5
|
||||||
|
BF_ENCRYPT_END
|
||||||
|
leal 0x1000+18*4+BF_FRAME(ctx),tmp1
|
||||||
|
movl tmp5,BF_ptr
|
||||||
|
cmpl tmp5,tmp1
|
||||||
|
movl L,-8(tmp5)
|
||||||
|
movl R,-4(tmp5)
|
||||||
|
movl P(0),tmp2
|
||||||
|
ja BF_loop_P
|
||||||
|
leal BF_FRAME(ctx),tmp5
|
||||||
|
xorl tmp3,tmp3
|
||||||
|
movl tmp5,BF_ptr
|
||||||
|
BF_loop_S:
|
||||||
|
BF_ENCRYPT_START
|
||||||
|
BF_ENCRYPT_END
|
||||||
|
movl P(0),tmp2
|
||||||
|
movl L,(tmp5)
|
||||||
|
movl R,4(tmp5)
|
||||||
|
BF_ENCRYPT_START
|
||||||
|
BF_ENCRYPT_END
|
||||||
|
movl P(0),tmp2
|
||||||
|
movl L,8(tmp5)
|
||||||
|
movl R,12(tmp5)
|
||||||
|
BF_ENCRYPT_START
|
||||||
|
BF_ENCRYPT_END
|
||||||
|
movl P(0),tmp2
|
||||||
|
movl L,16(tmp5)
|
||||||
|
movl R,20(tmp5)
|
||||||
|
BF_ENCRYPT_START
|
||||||
|
addl $32,tmp5
|
||||||
|
BF_ENCRYPT_END
|
||||||
|
leal 0x1000+BF_FRAME(ctx),tmp1
|
||||||
|
movl tmp5,BF_ptr
|
||||||
|
cmpl tmp5,tmp1
|
||||||
|
movl P(0),tmp2
|
||||||
|
movl L,-8(tmp5)
|
||||||
|
movl R,-4(tmp5)
|
||||||
|
ja BF_loop_S
|
||||||
|
movl 4(%esp),%esp
|
||||||
|
popl %edi
|
||||||
|
popl %esi
|
||||||
|
popl %ebx
|
||||||
|
popl %ebp
|
||||||
|
ret
|
||||||
|
|
||||||
|
BF_die:
|
||||||
|
/* Oops, need to re-compile with a larger BF_FRAME. */
|
||||||
|
hlt
|
||||||
|
jmp BF_die
|
||||||
|
|
||||||
|
#if defined(__ELF__) && defined(__linux__)
|
||||||
|
.section .note.GNU-stack,"",@progbits
|
||||||
|
#endif
|
||||||
|
#endif
|
20842
src/contrib/sqlite/shell.c
Normal file
20842
src/contrib/sqlite/shell.c
Normal file
File diff suppressed because it is too large
Load Diff
230517
src/contrib/sqlite/sqlite3.c
Normal file
230517
src/contrib/sqlite/sqlite3.c
Normal file
File diff suppressed because it is too large
Load Diff
12174
src/contrib/sqlite/sqlite3.h
Normal file
12174
src/contrib/sqlite/sqlite3.h
Normal file
File diff suppressed because it is too large
Load Diff
659
src/contrib/sqlite/sqlite3ext.h
Normal file
659
src/contrib/sqlite/sqlite3ext.h
Normal file
@ -0,0 +1,659 @@
|
|||||||
|
/*
|
||||||
|
** 2006 June 7
|
||||||
|
**
|
||||||
|
** The author disclaims copyright to this source code. In place of
|
||||||
|
** a legal notice, here is a blessing:
|
||||||
|
**
|
||||||
|
** May you do good and not evil.
|
||||||
|
** May you find forgiveness for yourself and forgive others.
|
||||||
|
** May you share freely, never taking more than you give.
|
||||||
|
**
|
||||||
|
*************************************************************************
|
||||||
|
** This header file defines the SQLite interface for use by
|
||||||
|
** shared libraries that want to be imported as extensions into
|
||||||
|
** an SQLite instance. Shared libraries that intend to be loaded
|
||||||
|
** as extensions by SQLite should #include this file instead of
|
||||||
|
** sqlite3.h.
|
||||||
|
*/
|
||||||
|
#ifndef SQLITE3EXT_H
|
||||||
|
#define SQLITE3EXT_H
|
||||||
|
#include "sqlite3.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
** The following structure holds pointers to all of the SQLite API
|
||||||
|
** routines.
|
||||||
|
**
|
||||||
|
** WARNING: In order to maintain backwards compatibility, add new
|
||||||
|
** interfaces to the end of this structure only. If you insert new
|
||||||
|
** interfaces in the middle of this structure, then older different
|
||||||
|
** versions of SQLite will not be able to load each other's shared
|
||||||
|
** libraries!
|
||||||
|
*/
|
||||||
|
struct sqlite3_api_routines {
|
||||||
|
void * (*aggregate_context)(sqlite3_context*,int nBytes);
|
||||||
|
int (*aggregate_count)(sqlite3_context*);
|
||||||
|
int (*bind_blob)(sqlite3_stmt*,int,const void*,int n,void(*)(void*));
|
||||||
|
int (*bind_double)(sqlite3_stmt*,int,double);
|
||||||
|
int (*bind_int)(sqlite3_stmt*,int,int);
|
||||||
|
int (*bind_int64)(sqlite3_stmt*,int,sqlite_int64);
|
||||||
|
int (*bind_null)(sqlite3_stmt*,int);
|
||||||
|
int (*bind_parameter_count)(sqlite3_stmt*);
|
||||||
|
int (*bind_parameter_index)(sqlite3_stmt*,const char*zName);
|
||||||
|
const char * (*bind_parameter_name)(sqlite3_stmt*,int);
|
||||||
|
int (*bind_text)(sqlite3_stmt*,int,const char*,int n,void(*)(void*));
|
||||||
|
int (*bind_text16)(sqlite3_stmt*,int,const void*,int,void(*)(void*));
|
||||||
|
int (*bind_value)(sqlite3_stmt*,int,const sqlite3_value*);
|
||||||
|
int (*busy_handler)(sqlite3*,int(*)(void*,int),void*);
|
||||||
|
int (*busy_timeout)(sqlite3*,int ms);
|
||||||
|
int (*changes)(sqlite3*);
|
||||||
|
int (*close)(sqlite3*);
|
||||||
|
int (*collation_needed)(sqlite3*,void*,void(*)(void*,sqlite3*,
|
||||||
|
int eTextRep,const char*));
|
||||||
|
int (*collation_needed16)(sqlite3*,void*,void(*)(void*,sqlite3*,
|
||||||
|
int eTextRep,const void*));
|
||||||
|
const void * (*column_blob)(sqlite3_stmt*,int iCol);
|
||||||
|
int (*column_bytes)(sqlite3_stmt*,int iCol);
|
||||||
|
int (*column_bytes16)(sqlite3_stmt*,int iCol);
|
||||||
|
int (*column_count)(sqlite3_stmt*pStmt);
|
||||||
|
const char * (*column_database_name)(sqlite3_stmt*,int);
|
||||||
|
const void * (*column_database_name16)(sqlite3_stmt*,int);
|
||||||
|
const char * (*column_decltype)(sqlite3_stmt*,int i);
|
||||||
|
const void * (*column_decltype16)(sqlite3_stmt*,int);
|
||||||
|
double (*column_double)(sqlite3_stmt*,int iCol);
|
||||||
|
int (*column_int)(sqlite3_stmt*,int iCol);
|
||||||
|
sqlite_int64 (*column_int64)(sqlite3_stmt*,int iCol);
|
||||||
|
const char * (*column_name)(sqlite3_stmt*,int);
|
||||||
|
const void * (*column_name16)(sqlite3_stmt*,int);
|
||||||
|
const char * (*column_origin_name)(sqlite3_stmt*,int);
|
||||||
|
const void * (*column_origin_name16)(sqlite3_stmt*,int);
|
||||||
|
const char * (*column_table_name)(sqlite3_stmt*,int);
|
||||||
|
const void * (*column_table_name16)(sqlite3_stmt*,int);
|
||||||
|
const unsigned char * (*column_text)(sqlite3_stmt*,int iCol);
|
||||||
|
const void * (*column_text16)(sqlite3_stmt*,int iCol);
|
||||||
|
int (*column_type)(sqlite3_stmt*,int iCol);
|
||||||
|
sqlite3_value* (*column_value)(sqlite3_stmt*,int iCol);
|
||||||
|
void * (*commit_hook)(sqlite3*,int(*)(void*),void*);
|
||||||
|
int (*complete)(const char*sql);
|
||||||
|
int (*complete16)(const void*sql);
|
||||||
|
int (*create_collation)(sqlite3*,const char*,int,void*,
|
||||||
|
int(*)(void*,int,const void*,int,const void*));
|
||||||
|
int (*create_collation16)(sqlite3*,const void*,int,void*,
|
||||||
|
int(*)(void*,int,const void*,int,const void*));
|
||||||
|
int (*create_function)(sqlite3*,const char*,int,int,void*,
|
||||||
|
void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
|
||||||
|
void (*xStep)(sqlite3_context*,int,sqlite3_value**),
|
||||||
|
void (*xFinal)(sqlite3_context*));
|
||||||
|
int (*create_function16)(sqlite3*,const void*,int,int,void*,
|
||||||
|
void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
|
||||||
|
void (*xStep)(sqlite3_context*,int,sqlite3_value**),
|
||||||
|
void (*xFinal)(sqlite3_context*));
|
||||||
|
int (*create_module)(sqlite3*,const char*,const sqlite3_module*,void*);
|
||||||
|
int (*data_count)(sqlite3_stmt*pStmt);
|
||||||
|
sqlite3 * (*db_handle)(sqlite3_stmt*);
|
||||||
|
int (*declare_vtab)(sqlite3*,const char*);
|
||||||
|
int (*enable_shared_cache)(int);
|
||||||
|
int (*errcode)(sqlite3*db);
|
||||||
|
const char * (*errmsg)(sqlite3*);
|
||||||
|
const void * (*errmsg16)(sqlite3*);
|
||||||
|
int (*exec)(sqlite3*,const char*,sqlite3_callback,void*,char**);
|
||||||
|
int (*expired)(sqlite3_stmt*);
|
||||||
|
int (*finalize)(sqlite3_stmt*pStmt);
|
||||||
|
void (*free)(void*);
|
||||||
|
void (*free_table)(char**result);
|
||||||
|
int (*get_autocommit)(sqlite3*);
|
||||||
|
void * (*get_auxdata)(sqlite3_context*,int);
|
||||||
|
int (*get_table)(sqlite3*,const char*,char***,int*,int*,char**);
|
||||||
|
int (*global_recover)(void);
|
||||||
|
void (*interruptx)(sqlite3*);
|
||||||
|
sqlite_int64 (*last_insert_rowid)(sqlite3*);
|
||||||
|
const char * (*libversion)(void);
|
||||||
|
int (*libversion_number)(void);
|
||||||
|
void *(*malloc)(int);
|
||||||
|
char * (*mprintf)(const char*,...);
|
||||||
|
int (*open)(const char*,sqlite3**);
|
||||||
|
int (*open16)(const void*,sqlite3**);
|
||||||
|
int (*prepare)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
|
||||||
|
int (*prepare16)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
|
||||||
|
void * (*profile)(sqlite3*,void(*)(void*,const char*,sqlite_uint64),void*);
|
||||||
|
void (*progress_handler)(sqlite3*,int,int(*)(void*),void*);
|
||||||
|
void *(*realloc)(void*,int);
|
||||||
|
int (*reset)(sqlite3_stmt*pStmt);
|
||||||
|
void (*result_blob)(sqlite3_context*,const void*,int,void(*)(void*));
|
||||||
|
void (*result_double)(sqlite3_context*,double);
|
||||||
|
void (*result_error)(sqlite3_context*,const char*,int);
|
||||||
|
void (*result_error16)(sqlite3_context*,const void*,int);
|
||||||
|
void (*result_int)(sqlite3_context*,int);
|
||||||
|
void (*result_int64)(sqlite3_context*,sqlite_int64);
|
||||||
|
void (*result_null)(sqlite3_context*);
|
||||||
|
void (*result_text)(sqlite3_context*,const char*,int,void(*)(void*));
|
||||||
|
void (*result_text16)(sqlite3_context*,const void*,int,void(*)(void*));
|
||||||
|
void (*result_text16be)(sqlite3_context*,const void*,int,void(*)(void*));
|
||||||
|
void (*result_text16le)(sqlite3_context*,const void*,int,void(*)(void*));
|
||||||
|
void (*result_value)(sqlite3_context*,sqlite3_value*);
|
||||||
|
void * (*rollback_hook)(sqlite3*,void(*)(void*),void*);
|
||||||
|
int (*set_authorizer)(sqlite3*,int(*)(void*,int,const char*,const char*,
|
||||||
|
const char*,const char*),void*);
|
||||||
|
void (*set_auxdata)(sqlite3_context*,int,void*,void (*)(void*));
|
||||||
|
char * (*xsnprintf)(int,char*,const char*,...);
|
||||||
|
int (*step)(sqlite3_stmt*);
|
||||||
|
int (*table_column_metadata)(sqlite3*,const char*,const char*,const char*,
|
||||||
|
char const**,char const**,int*,int*,int*);
|
||||||
|
void (*thread_cleanup)(void);
|
||||||
|
int (*total_changes)(sqlite3*);
|
||||||
|
void * (*trace)(sqlite3*,void(*xTrace)(void*,const char*),void*);
|
||||||
|
int (*transfer_bindings)(sqlite3_stmt*,sqlite3_stmt*);
|
||||||
|
void * (*update_hook)(sqlite3*,void(*)(void*,int ,char const*,char const*,
|
||||||
|
sqlite_int64),void*);
|
||||||
|
void * (*user_data)(sqlite3_context*);
|
||||||
|
const void * (*value_blob)(sqlite3_value*);
|
||||||
|
int (*value_bytes)(sqlite3_value*);
|
||||||
|
int (*value_bytes16)(sqlite3_value*);
|
||||||
|
double (*value_double)(sqlite3_value*);
|
||||||
|
int (*value_int)(sqlite3_value*);
|
||||||
|
sqlite_int64 (*value_int64)(sqlite3_value*);
|
||||||
|
int (*value_numeric_type)(sqlite3_value*);
|
||||||
|
const unsigned char * (*value_text)(sqlite3_value*);
|
||||||
|
const void * (*value_text16)(sqlite3_value*);
|
||||||
|
const void * (*value_text16be)(sqlite3_value*);
|
||||||
|
const void * (*value_text16le)(sqlite3_value*);
|
||||||
|
int (*value_type)(sqlite3_value*);
|
||||||
|
char *(*vmprintf)(const char*,va_list);
|
||||||
|
/* Added ??? */
|
||||||
|
int (*overload_function)(sqlite3*, const char *zFuncName, int nArg);
|
||||||
|
/* Added by 3.3.13 */
|
||||||
|
int (*prepare_v2)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
|
||||||
|
int (*prepare16_v2)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
|
||||||
|
int (*clear_bindings)(sqlite3_stmt*);
|
||||||
|
/* Added by 3.4.1 */
|
||||||
|
int (*create_module_v2)(sqlite3*,const char*,const sqlite3_module*,void*,
|
||||||
|
void (*xDestroy)(void *));
|
||||||
|
/* Added by 3.5.0 */
|
||||||
|
int (*bind_zeroblob)(sqlite3_stmt*,int,int);
|
||||||
|
int (*blob_bytes)(sqlite3_blob*);
|
||||||
|
int (*blob_close)(sqlite3_blob*);
|
||||||
|
int (*blob_open)(sqlite3*,const char*,const char*,const char*,sqlite3_int64,
|
||||||
|
int,sqlite3_blob**);
|
||||||
|
int (*blob_read)(sqlite3_blob*,void*,int,int);
|
||||||
|
int (*blob_write)(sqlite3_blob*,const void*,int,int);
|
||||||
|
int (*create_collation_v2)(sqlite3*,const char*,int,void*,
|
||||||
|
int(*)(void*,int,const void*,int,const void*),
|
||||||
|
void(*)(void*));
|
||||||
|
int (*file_control)(sqlite3*,const char*,int,void*);
|
||||||
|
sqlite3_int64 (*memory_highwater)(int);
|
||||||
|
sqlite3_int64 (*memory_used)(void);
|
||||||
|
sqlite3_mutex *(*mutex_alloc)(int);
|
||||||
|
void (*mutex_enter)(sqlite3_mutex*);
|
||||||
|
void (*mutex_free)(sqlite3_mutex*);
|
||||||
|
void (*mutex_leave)(sqlite3_mutex*);
|
||||||
|
int (*mutex_try)(sqlite3_mutex*);
|
||||||
|
int (*open_v2)(const char*,sqlite3**,int,const char*);
|
||||||
|
int (*release_memory)(int);
|
||||||
|
void (*result_error_nomem)(sqlite3_context*);
|
||||||
|
void (*result_error_toobig)(sqlite3_context*);
|
||||||
|
int (*sleep)(int);
|
||||||
|
void (*soft_heap_limit)(int);
|
||||||
|
sqlite3_vfs *(*vfs_find)(const char*);
|
||||||
|
int (*vfs_register)(sqlite3_vfs*,int);
|
||||||
|
int (*vfs_unregister)(sqlite3_vfs*);
|
||||||
|
int (*xthreadsafe)(void);
|
||||||
|
void (*result_zeroblob)(sqlite3_context*,int);
|
||||||
|
void (*result_error_code)(sqlite3_context*,int);
|
||||||
|
int (*test_control)(int, ...);
|
||||||
|
void (*randomness)(int,void*);
|
||||||
|
sqlite3 *(*context_db_handle)(sqlite3_context*);
|
||||||
|
int (*extended_result_codes)(sqlite3*,int);
|
||||||
|
int (*limit)(sqlite3*,int,int);
|
||||||
|
sqlite3_stmt *(*next_stmt)(sqlite3*,sqlite3_stmt*);
|
||||||
|
const char *(*sql)(sqlite3_stmt*);
|
||||||
|
int (*status)(int,int*,int*,int);
|
||||||
|
int (*backup_finish)(sqlite3_backup*);
|
||||||
|
sqlite3_backup *(*backup_init)(sqlite3*,const char*,sqlite3*,const char*);
|
||||||
|
int (*backup_pagecount)(sqlite3_backup*);
|
||||||
|
int (*backup_remaining)(sqlite3_backup*);
|
||||||
|
int (*backup_step)(sqlite3_backup*,int);
|
||||||
|
const char *(*compileoption_get)(int);
|
||||||
|
int (*compileoption_used)(const char*);
|
||||||
|
int (*create_function_v2)(sqlite3*,const char*,int,int,void*,
|
||||||
|
void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
|
||||||
|
void (*xStep)(sqlite3_context*,int,sqlite3_value**),
|
||||||
|
void (*xFinal)(sqlite3_context*),
|
||||||
|
void(*xDestroy)(void*));
|
||||||
|
int (*db_config)(sqlite3*,int,...);
|
||||||
|
sqlite3_mutex *(*db_mutex)(sqlite3*);
|
||||||
|
int (*db_status)(sqlite3*,int,int*,int*,int);
|
||||||
|
int (*extended_errcode)(sqlite3*);
|
||||||
|
void (*log)(int,const char*,...);
|
||||||
|
sqlite3_int64 (*soft_heap_limit64)(sqlite3_int64);
|
||||||
|
const char *(*sourceid)(void);
|
||||||
|
int (*stmt_status)(sqlite3_stmt*,int,int);
|
||||||
|
int (*strnicmp)(const char*,const char*,int);
|
||||||
|
int (*unlock_notify)(sqlite3*,void(*)(void**,int),void*);
|
||||||
|
int (*wal_autocheckpoint)(sqlite3*,int);
|
||||||
|
int (*wal_checkpoint)(sqlite3*,const char*);
|
||||||
|
void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*);
|
||||||
|
int (*blob_reopen)(sqlite3_blob*,sqlite3_int64);
|
||||||
|
int (*vtab_config)(sqlite3*,int op,...);
|
||||||
|
int (*vtab_on_conflict)(sqlite3*);
|
||||||
|
/* Version 3.7.16 and later */
|
||||||
|
int (*close_v2)(sqlite3*);
|
||||||
|
const char *(*db_filename)(sqlite3*,const char*);
|
||||||
|
int (*db_readonly)(sqlite3*,const char*);
|
||||||
|
int (*db_release_memory)(sqlite3*);
|
||||||
|
const char *(*errstr)(int);
|
||||||
|
int (*stmt_busy)(sqlite3_stmt*);
|
||||||
|
int (*stmt_readonly)(sqlite3_stmt*);
|
||||||
|
int (*stricmp)(const char*,const char*);
|
||||||
|
int (*uri_boolean)(const char*,const char*,int);
|
||||||
|
sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
|
||||||
|
const char *(*uri_parameter)(const char*,const char*);
|
||||||
|
char *(*xvsnprintf)(int,char*,const char*,va_list);
|
||||||
|
int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
|
||||||
|
/* Version 3.8.7 and later */
|
||||||
|
int (*auto_extension)(void(*)(void));
|
||||||
|
int (*bind_blob64)(sqlite3_stmt*,int,const void*,sqlite3_uint64,
|
||||||
|
void(*)(void*));
|
||||||
|
int (*bind_text64)(sqlite3_stmt*,int,const char*,sqlite3_uint64,
|
||||||
|
void(*)(void*),unsigned char);
|
||||||
|
int (*cancel_auto_extension)(void(*)(void));
|
||||||
|
int (*load_extension)(sqlite3*,const char*,const char*,char**);
|
||||||
|
void *(*malloc64)(sqlite3_uint64);
|
||||||
|
sqlite3_uint64 (*msize)(void*);
|
||||||
|
void *(*realloc64)(void*,sqlite3_uint64);
|
||||||
|
void (*reset_auto_extension)(void);
|
||||||
|
void (*result_blob64)(sqlite3_context*,const void*,sqlite3_uint64,
|
||||||
|
void(*)(void*));
|
||||||
|
void (*result_text64)(sqlite3_context*,const char*,sqlite3_uint64,
|
||||||
|
void(*)(void*), unsigned char);
|
||||||
|
int (*strglob)(const char*,const char*);
|
||||||
|
/* Version 3.8.11 and later */
|
||||||
|
sqlite3_value *(*value_dup)(const sqlite3_value*);
|
||||||
|
void (*value_free)(sqlite3_value*);
|
||||||
|
int (*result_zeroblob64)(sqlite3_context*,sqlite3_uint64);
|
||||||
|
int (*bind_zeroblob64)(sqlite3_stmt*, int, sqlite3_uint64);
|
||||||
|
/* Version 3.9.0 and later */
|
||||||
|
unsigned int (*value_subtype)(sqlite3_value*);
|
||||||
|
void (*result_subtype)(sqlite3_context*,unsigned int);
|
||||||
|
/* Version 3.10.0 and later */
|
||||||
|
int (*status64)(int,sqlite3_int64*,sqlite3_int64*,int);
|
||||||
|
int (*strlike)(const char*,const char*,unsigned int);
|
||||||
|
int (*db_cacheflush)(sqlite3*);
|
||||||
|
/* Version 3.12.0 and later */
|
||||||
|
int (*system_errno)(sqlite3*);
|
||||||
|
/* Version 3.14.0 and later */
|
||||||
|
int (*trace_v2)(sqlite3*,unsigned,int(*)(unsigned,void*,void*,void*),void*);
|
||||||
|
char *(*expanded_sql)(sqlite3_stmt*);
|
||||||
|
/* Version 3.18.0 and later */
|
||||||
|
void (*set_last_insert_rowid)(sqlite3*,sqlite3_int64);
|
||||||
|
/* Version 3.20.0 and later */
|
||||||
|
int (*prepare_v3)(sqlite3*,const char*,int,unsigned int,
|
||||||
|
sqlite3_stmt**,const char**);
|
||||||
|
int (*prepare16_v3)(sqlite3*,const void*,int,unsigned int,
|
||||||
|
sqlite3_stmt**,const void**);
|
||||||
|
int (*bind_pointer)(sqlite3_stmt*,int,void*,const char*,void(*)(void*));
|
||||||
|
void (*result_pointer)(sqlite3_context*,void*,const char*,void(*)(void*));
|
||||||
|
void *(*value_pointer)(sqlite3_value*,const char*);
|
||||||
|
int (*vtab_nochange)(sqlite3_context*);
|
||||||
|
int (*value_nochange)(sqlite3_value*);
|
||||||
|
const char *(*vtab_collation)(sqlite3_index_info*,int);
|
||||||
|
/* Version 3.24.0 and later */
|
||||||
|
int (*keyword_count)(void);
|
||||||
|
int (*keyword_name)(int,const char**,int*);
|
||||||
|
int (*keyword_check)(const char*,int);
|
||||||
|
sqlite3_str *(*str_new)(sqlite3*);
|
||||||
|
char *(*str_finish)(sqlite3_str*);
|
||||||
|
void (*str_appendf)(sqlite3_str*, const char *zFormat, ...);
|
||||||
|
void (*str_vappendf)(sqlite3_str*, const char *zFormat, va_list);
|
||||||
|
void (*str_append)(sqlite3_str*, const char *zIn, int N);
|
||||||
|
void (*str_appendall)(sqlite3_str*, const char *zIn);
|
||||||
|
void (*str_appendchar)(sqlite3_str*, int N, char C);
|
||||||
|
void (*str_reset)(sqlite3_str*);
|
||||||
|
int (*str_errcode)(sqlite3_str*);
|
||||||
|
int (*str_length)(sqlite3_str*);
|
||||||
|
char *(*str_value)(sqlite3_str*);
|
||||||
|
/* Version 3.25.0 and later */
|
||||||
|
int (*create_window_function)(sqlite3*,const char*,int,int,void*,
|
||||||
|
void (*xStep)(sqlite3_context*,int,sqlite3_value**),
|
||||||
|
void (*xFinal)(sqlite3_context*),
|
||||||
|
void (*xValue)(sqlite3_context*),
|
||||||
|
void (*xInv)(sqlite3_context*,int,sqlite3_value**),
|
||||||
|
void(*xDestroy)(void*));
|
||||||
|
/* Version 3.26.0 and later */
|
||||||
|
const char *(*normalized_sql)(sqlite3_stmt*);
|
||||||
|
/* Version 3.28.0 and later */
|
||||||
|
int (*stmt_isexplain)(sqlite3_stmt*);
|
||||||
|
int (*value_frombind)(sqlite3_value*);
|
||||||
|
/* Version 3.30.0 and later */
|
||||||
|
int (*drop_modules)(sqlite3*,const char**);
|
||||||
|
/* Version 3.31.0 and later */
|
||||||
|
sqlite3_int64 (*hard_heap_limit64)(sqlite3_int64);
|
||||||
|
const char *(*uri_key)(const char*,int);
|
||||||
|
const char *(*filename_database)(const char*);
|
||||||
|
const char *(*filename_journal)(const char*);
|
||||||
|
const char *(*filename_wal)(const char*);
|
||||||
|
/* Version 3.32.0 and later */
|
||||||
|
char *(*create_filename)(const char*,const char*,const char*,
|
||||||
|
int,const char**);
|
||||||
|
void (*free_filename)(char*);
|
||||||
|
sqlite3_file *(*database_file_object)(const char*);
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
** This is the function signature used for all extension entry points. It
|
||||||
|
** is also defined in the file "loadext.c".
|
||||||
|
*/
|
||||||
|
typedef int (*sqlite3_loadext_entry)(
|
||||||
|
sqlite3 *db, /* Handle to the database. */
|
||||||
|
char **pzErrMsg, /* Used to set error string on failure. */
|
||||||
|
const sqlite3_api_routines *pThunk /* Extension API function pointers. */
|
||||||
|
);
|
||||||
|
|
||||||
|
/*
|
||||||
|
** The following macros redefine the API routines so that they are
|
||||||
|
** redirected through the global sqlite3_api structure.
|
||||||
|
**
|
||||||
|
** This header file is also used by the loadext.c source file
|
||||||
|
** (part of the main SQLite library - not an extension) so that
|
||||||
|
** it can get access to the sqlite3_api_routines structure
|
||||||
|
** definition. But the main library does not want to redefine
|
||||||
|
** the API. So the redefinition macros are only valid if the
|
||||||
|
** SQLITE_CORE macros is undefined.
|
||||||
|
*/
|
||||||
|
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
||||||
|
#define sqlite3_aggregate_context sqlite3_api->aggregate_context
|
||||||
|
#ifndef SQLITE_OMIT_DEPRECATED
|
||||||
|
#define sqlite3_aggregate_count sqlite3_api->aggregate_count
|
||||||
|
#endif
|
||||||
|
#define sqlite3_bind_blob sqlite3_api->bind_blob
|
||||||
|
#define sqlite3_bind_double sqlite3_api->bind_double
|
||||||
|
#define sqlite3_bind_int sqlite3_api->bind_int
|
||||||
|
#define sqlite3_bind_int64 sqlite3_api->bind_int64
|
||||||
|
#define sqlite3_bind_null sqlite3_api->bind_null
|
||||||
|
#define sqlite3_bind_parameter_count sqlite3_api->bind_parameter_count
|
||||||
|
#define sqlite3_bind_parameter_index sqlite3_api->bind_parameter_index
|
||||||
|
#define sqlite3_bind_parameter_name sqlite3_api->bind_parameter_name
|
||||||
|
#define sqlite3_bind_text sqlite3_api->bind_text
|
||||||
|
#define sqlite3_bind_text16 sqlite3_api->bind_text16
|
||||||
|
#define sqlite3_bind_value sqlite3_api->bind_value
|
||||||
|
#define sqlite3_busy_handler sqlite3_api->busy_handler
|
||||||
|
#define sqlite3_busy_timeout sqlite3_api->busy_timeout
|
||||||
|
#define sqlite3_changes sqlite3_api->changes
|
||||||
|
#define sqlite3_close sqlite3_api->close
|
||||||
|
#define sqlite3_collation_needed sqlite3_api->collation_needed
|
||||||
|
#define sqlite3_collation_needed16 sqlite3_api->collation_needed16
|
||||||
|
#define sqlite3_column_blob sqlite3_api->column_blob
|
||||||
|
#define sqlite3_column_bytes sqlite3_api->column_bytes
|
||||||
|
#define sqlite3_column_bytes16 sqlite3_api->column_bytes16
|
||||||
|
#define sqlite3_column_count sqlite3_api->column_count
|
||||||
|
#define sqlite3_column_database_name sqlite3_api->column_database_name
|
||||||
|
#define sqlite3_column_database_name16 sqlite3_api->column_database_name16
|
||||||
|
#define sqlite3_column_decltype sqlite3_api->column_decltype
|
||||||
|
#define sqlite3_column_decltype16 sqlite3_api->column_decltype16
|
||||||
|
#define sqlite3_column_double sqlite3_api->column_double
|
||||||
|
#define sqlite3_column_int sqlite3_api->column_int
|
||||||
|
#define sqlite3_column_int64 sqlite3_api->column_int64
|
||||||
|
#define sqlite3_column_name sqlite3_api->column_name
|
||||||
|
#define sqlite3_column_name16 sqlite3_api->column_name16
|
||||||
|
#define sqlite3_column_origin_name sqlite3_api->column_origin_name
|
||||||
|
#define sqlite3_column_origin_name16 sqlite3_api->column_origin_name16
|
||||||
|
#define sqlite3_column_table_name sqlite3_api->column_table_name
|
||||||
|
#define sqlite3_column_table_name16 sqlite3_api->column_table_name16
|
||||||
|
#define sqlite3_column_text sqlite3_api->column_text
|
||||||
|
#define sqlite3_column_text16 sqlite3_api->column_text16
|
||||||
|
#define sqlite3_column_type sqlite3_api->column_type
|
||||||
|
#define sqlite3_column_value sqlite3_api->column_value
|
||||||
|
#define sqlite3_commit_hook sqlite3_api->commit_hook
|
||||||
|
#define sqlite3_complete sqlite3_api->complete
|
||||||
|
#define sqlite3_complete16 sqlite3_api->complete16
|
||||||
|
#define sqlite3_create_collation sqlite3_api->create_collation
|
||||||
|
#define sqlite3_create_collation16 sqlite3_api->create_collation16
|
||||||
|
#define sqlite3_create_function sqlite3_api->create_function
|
||||||
|
#define sqlite3_create_function16 sqlite3_api->create_function16
|
||||||
|
#define sqlite3_create_module sqlite3_api->create_module
|
||||||
|
#define sqlite3_create_module_v2 sqlite3_api->create_module_v2
|
||||||
|
#define sqlite3_data_count sqlite3_api->data_count
|
||||||
|
#define sqlite3_db_handle sqlite3_api->db_handle
|
||||||
|
#define sqlite3_declare_vtab sqlite3_api->declare_vtab
|
||||||
|
#define sqlite3_enable_shared_cache sqlite3_api->enable_shared_cache
|
||||||
|
#define sqlite3_errcode sqlite3_api->errcode
|
||||||
|
#define sqlite3_errmsg sqlite3_api->errmsg
|
||||||
|
#define sqlite3_errmsg16 sqlite3_api->errmsg16
|
||||||
|
#define sqlite3_exec sqlite3_api->exec
|
||||||
|
#ifndef SQLITE_OMIT_DEPRECATED
|
||||||
|
#define sqlite3_expired sqlite3_api->expired
|
||||||
|
#endif
|
||||||
|
#define sqlite3_finalize sqlite3_api->finalize
|
||||||
|
#define sqlite3_free sqlite3_api->free
|
||||||
|
#define sqlite3_free_table sqlite3_api->free_table
|
||||||
|
#define sqlite3_get_autocommit sqlite3_api->get_autocommit
|
||||||
|
#define sqlite3_get_auxdata sqlite3_api->get_auxdata
|
||||||
|
#define sqlite3_get_table sqlite3_api->get_table
|
||||||
|
#ifndef SQLITE_OMIT_DEPRECATED
|
||||||
|
#define sqlite3_global_recover sqlite3_api->global_recover
|
||||||
|
#endif
|
||||||
|
#define sqlite3_interrupt sqlite3_api->interruptx
|
||||||
|
#define sqlite3_last_insert_rowid sqlite3_api->last_insert_rowid
|
||||||
|
#define sqlite3_libversion sqlite3_api->libversion
|
||||||
|
#define sqlite3_libversion_number sqlite3_api->libversion_number
|
||||||
|
#define sqlite3_malloc sqlite3_api->malloc
|
||||||
|
#define sqlite3_mprintf sqlite3_api->mprintf
|
||||||
|
#define sqlite3_open sqlite3_api->open
|
||||||
|
#define sqlite3_open16 sqlite3_api->open16
|
||||||
|
#define sqlite3_prepare sqlite3_api->prepare
|
||||||
|
#define sqlite3_prepare16 sqlite3_api->prepare16
|
||||||
|
#define sqlite3_prepare_v2 sqlite3_api->prepare_v2
|
||||||
|
#define sqlite3_prepare16_v2 sqlite3_api->prepare16_v2
|
||||||
|
#define sqlite3_profile sqlite3_api->profile
|
||||||
|
#define sqlite3_progress_handler sqlite3_api->progress_handler
|
||||||
|
#define sqlite3_realloc sqlite3_api->realloc
|
||||||
|
#define sqlite3_reset sqlite3_api->reset
|
||||||
|
#define sqlite3_result_blob sqlite3_api->result_blob
|
||||||
|
#define sqlite3_result_double sqlite3_api->result_double
|
||||||
|
#define sqlite3_result_error sqlite3_api->result_error
|
||||||
|
#define sqlite3_result_error16 sqlite3_api->result_error16
|
||||||
|
#define sqlite3_result_int sqlite3_api->result_int
|
||||||
|
#define sqlite3_result_int64 sqlite3_api->result_int64
|
||||||
|
#define sqlite3_result_null sqlite3_api->result_null
|
||||||
|
#define sqlite3_result_text sqlite3_api->result_text
|
||||||
|
#define sqlite3_result_text16 sqlite3_api->result_text16
|
||||||
|
#define sqlite3_result_text16be sqlite3_api->result_text16be
|
||||||
|
#define sqlite3_result_text16le sqlite3_api->result_text16le
|
||||||
|
#define sqlite3_result_value sqlite3_api->result_value
|
||||||
|
#define sqlite3_rollback_hook sqlite3_api->rollback_hook
|
||||||
|
#define sqlite3_set_authorizer sqlite3_api->set_authorizer
|
||||||
|
#define sqlite3_set_auxdata sqlite3_api->set_auxdata
|
||||||
|
#define sqlite3_snprintf sqlite3_api->xsnprintf
|
||||||
|
#define sqlite3_step sqlite3_api->step
|
||||||
|
#define sqlite3_table_column_metadata sqlite3_api->table_column_metadata
|
||||||
|
#define sqlite3_thread_cleanup sqlite3_api->thread_cleanup
|
||||||
|
#define sqlite3_total_changes sqlite3_api->total_changes
|
||||||
|
#define sqlite3_trace sqlite3_api->trace
|
||||||
|
#ifndef SQLITE_OMIT_DEPRECATED
|
||||||
|
#define sqlite3_transfer_bindings sqlite3_api->transfer_bindings
|
||||||
|
#endif
|
||||||
|
#define sqlite3_update_hook sqlite3_api->update_hook
|
||||||
|
#define sqlite3_user_data sqlite3_api->user_data
|
||||||
|
#define sqlite3_value_blob sqlite3_api->value_blob
|
||||||
|
#define sqlite3_value_bytes sqlite3_api->value_bytes
|
||||||
|
#define sqlite3_value_bytes16 sqlite3_api->value_bytes16
|
||||||
|
#define sqlite3_value_double sqlite3_api->value_double
|
||||||
|
#define sqlite3_value_int sqlite3_api->value_int
|
||||||
|
#define sqlite3_value_int64 sqlite3_api->value_int64
|
||||||
|
#define sqlite3_value_numeric_type sqlite3_api->value_numeric_type
|
||||||
|
#define sqlite3_value_text sqlite3_api->value_text
|
||||||
|
#define sqlite3_value_text16 sqlite3_api->value_text16
|
||||||
|
#define sqlite3_value_text16be sqlite3_api->value_text16be
|
||||||
|
#define sqlite3_value_text16le sqlite3_api->value_text16le
|
||||||
|
#define sqlite3_value_type sqlite3_api->value_type
|
||||||
|
#define sqlite3_vmprintf sqlite3_api->vmprintf
|
||||||
|
#define sqlite3_vsnprintf sqlite3_api->xvsnprintf
|
||||||
|
#define sqlite3_overload_function sqlite3_api->overload_function
|
||||||
|
#define sqlite3_prepare_v2 sqlite3_api->prepare_v2
|
||||||
|
#define sqlite3_prepare16_v2 sqlite3_api->prepare16_v2
|
||||||
|
#define sqlite3_clear_bindings sqlite3_api->clear_bindings
|
||||||
|
#define sqlite3_bind_zeroblob sqlite3_api->bind_zeroblob
|
||||||
|
#define sqlite3_blob_bytes sqlite3_api->blob_bytes
|
||||||
|
#define sqlite3_blob_close sqlite3_api->blob_close
|
||||||
|
#define sqlite3_blob_open sqlite3_api->blob_open
|
||||||
|
#define sqlite3_blob_read sqlite3_api->blob_read
|
||||||
|
#define sqlite3_blob_write sqlite3_api->blob_write
|
||||||
|
#define sqlite3_create_collation_v2 sqlite3_api->create_collation_v2
|
||||||
|
#define sqlite3_file_control sqlite3_api->file_control
|
||||||
|
#define sqlite3_memory_highwater sqlite3_api->memory_highwater
|
||||||
|
#define sqlite3_memory_used sqlite3_api->memory_used
|
||||||
|
#define sqlite3_mutex_alloc sqlite3_api->mutex_alloc
|
||||||
|
#define sqlite3_mutex_enter sqlite3_api->mutex_enter
|
||||||
|
#define sqlite3_mutex_free sqlite3_api->mutex_free
|
||||||
|
#define sqlite3_mutex_leave sqlite3_api->mutex_leave
|
||||||
|
#define sqlite3_mutex_try sqlite3_api->mutex_try
|
||||||
|
#define sqlite3_open_v2 sqlite3_api->open_v2
|
||||||
|
#define sqlite3_release_memory sqlite3_api->release_memory
|
||||||
|
#define sqlite3_result_error_nomem sqlite3_api->result_error_nomem
|
||||||
|
#define sqlite3_result_error_toobig sqlite3_api->result_error_toobig
|
||||||
|
#define sqlite3_sleep sqlite3_api->sleep
|
||||||
|
#define sqlite3_soft_heap_limit sqlite3_api->soft_heap_limit
|
||||||
|
#define sqlite3_vfs_find sqlite3_api->vfs_find
|
||||||
|
#define sqlite3_vfs_register sqlite3_api->vfs_register
|
||||||
|
#define sqlite3_vfs_unregister sqlite3_api->vfs_unregister
|
||||||
|
#define sqlite3_threadsafe sqlite3_api->xthreadsafe
|
||||||
|
#define sqlite3_result_zeroblob sqlite3_api->result_zeroblob
|
||||||
|
#define sqlite3_result_error_code sqlite3_api->result_error_code
|
||||||
|
#define sqlite3_test_control sqlite3_api->test_control
|
||||||
|
#define sqlite3_randomness sqlite3_api->randomness
|
||||||
|
#define sqlite3_context_db_handle sqlite3_api->context_db_handle
|
||||||
|
#define sqlite3_extended_result_codes sqlite3_api->extended_result_codes
|
||||||
|
#define sqlite3_limit sqlite3_api->limit
|
||||||
|
#define sqlite3_next_stmt sqlite3_api->next_stmt
|
||||||
|
#define sqlite3_sql sqlite3_api->sql
|
||||||
|
#define sqlite3_status sqlite3_api->status
|
||||||
|
#define sqlite3_backup_finish sqlite3_api->backup_finish
|
||||||
|
#define sqlite3_backup_init sqlite3_api->backup_init
|
||||||
|
#define sqlite3_backup_pagecount sqlite3_api->backup_pagecount
|
||||||
|
#define sqlite3_backup_remaining sqlite3_api->backup_remaining
|
||||||
|
#define sqlite3_backup_step sqlite3_api->backup_step
|
||||||
|
#define sqlite3_compileoption_get sqlite3_api->compileoption_get
|
||||||
|
#define sqlite3_compileoption_used sqlite3_api->compileoption_used
|
||||||
|
#define sqlite3_create_function_v2 sqlite3_api->create_function_v2
|
||||||
|
#define sqlite3_db_config sqlite3_api->db_config
|
||||||
|
#define sqlite3_db_mutex sqlite3_api->db_mutex
|
||||||
|
#define sqlite3_db_status sqlite3_api->db_status
|
||||||
|
#define sqlite3_extended_errcode sqlite3_api->extended_errcode
|
||||||
|
#define sqlite3_log sqlite3_api->log
|
||||||
|
#define sqlite3_soft_heap_limit64 sqlite3_api->soft_heap_limit64
|
||||||
|
#define sqlite3_sourceid sqlite3_api->sourceid
|
||||||
|
#define sqlite3_stmt_status sqlite3_api->stmt_status
|
||||||
|
#define sqlite3_strnicmp sqlite3_api->strnicmp
|
||||||
|
#define sqlite3_unlock_notify sqlite3_api->unlock_notify
|
||||||
|
#define sqlite3_wal_autocheckpoint sqlite3_api->wal_autocheckpoint
|
||||||
|
#define sqlite3_wal_checkpoint sqlite3_api->wal_checkpoint
|
||||||
|
#define sqlite3_wal_hook sqlite3_api->wal_hook
|
||||||
|
#define sqlite3_blob_reopen sqlite3_api->blob_reopen
|
||||||
|
#define sqlite3_vtab_config sqlite3_api->vtab_config
|
||||||
|
#define sqlite3_vtab_on_conflict sqlite3_api->vtab_on_conflict
|
||||||
|
/* Version 3.7.16 and later */
|
||||||
|
#define sqlite3_close_v2 sqlite3_api->close_v2
|
||||||
|
#define sqlite3_db_filename sqlite3_api->db_filename
|
||||||
|
#define sqlite3_db_readonly sqlite3_api->db_readonly
|
||||||
|
#define sqlite3_db_release_memory sqlite3_api->db_release_memory
|
||||||
|
#define sqlite3_errstr sqlite3_api->errstr
|
||||||
|
#define sqlite3_stmt_busy sqlite3_api->stmt_busy
|
||||||
|
#define sqlite3_stmt_readonly sqlite3_api->stmt_readonly
|
||||||
|
#define sqlite3_stricmp sqlite3_api->stricmp
|
||||||
|
#define sqlite3_uri_boolean sqlite3_api->uri_boolean
|
||||||
|
#define sqlite3_uri_int64 sqlite3_api->uri_int64
|
||||||
|
#define sqlite3_uri_parameter sqlite3_api->uri_parameter
|
||||||
|
#define sqlite3_uri_vsnprintf sqlite3_api->xvsnprintf
|
||||||
|
#define sqlite3_wal_checkpoint_v2 sqlite3_api->wal_checkpoint_v2
|
||||||
|
/* Version 3.8.7 and later */
|
||||||
|
#define sqlite3_auto_extension sqlite3_api->auto_extension
|
||||||
|
#define sqlite3_bind_blob64 sqlite3_api->bind_blob64
|
||||||
|
#define sqlite3_bind_text64 sqlite3_api->bind_text64
|
||||||
|
#define sqlite3_cancel_auto_extension sqlite3_api->cancel_auto_extension
|
||||||
|
#define sqlite3_load_extension sqlite3_api->load_extension
|
||||||
|
#define sqlite3_malloc64 sqlite3_api->malloc64
|
||||||
|
#define sqlite3_msize sqlite3_api->msize
|
||||||
|
#define sqlite3_realloc64 sqlite3_api->realloc64
|
||||||
|
#define sqlite3_reset_auto_extension sqlite3_api->reset_auto_extension
|
||||||
|
#define sqlite3_result_blob64 sqlite3_api->result_blob64
|
||||||
|
#define sqlite3_result_text64 sqlite3_api->result_text64
|
||||||
|
#define sqlite3_strglob sqlite3_api->strglob
|
||||||
|
/* Version 3.8.11 and later */
|
||||||
|
#define sqlite3_value_dup sqlite3_api->value_dup
|
||||||
|
#define sqlite3_value_free sqlite3_api->value_free
|
||||||
|
#define sqlite3_result_zeroblob64 sqlite3_api->result_zeroblob64
|
||||||
|
#define sqlite3_bind_zeroblob64 sqlite3_api->bind_zeroblob64
|
||||||
|
/* Version 3.9.0 and later */
|
||||||
|
#define sqlite3_value_subtype sqlite3_api->value_subtype
|
||||||
|
#define sqlite3_result_subtype sqlite3_api->result_subtype
|
||||||
|
/* Version 3.10.0 and later */
|
||||||
|
#define sqlite3_status64 sqlite3_api->status64
|
||||||
|
#define sqlite3_strlike sqlite3_api->strlike
|
||||||
|
#define sqlite3_db_cacheflush sqlite3_api->db_cacheflush
|
||||||
|
/* Version 3.12.0 and later */
|
||||||
|
#define sqlite3_system_errno sqlite3_api->system_errno
|
||||||
|
/* Version 3.14.0 and later */
|
||||||
|
#define sqlite3_trace_v2 sqlite3_api->trace_v2
|
||||||
|
#define sqlite3_expanded_sql sqlite3_api->expanded_sql
|
||||||
|
/* Version 3.18.0 and later */
|
||||||
|
#define sqlite3_set_last_insert_rowid sqlite3_api->set_last_insert_rowid
|
||||||
|
/* Version 3.20.0 and later */
|
||||||
|
#define sqlite3_prepare_v3 sqlite3_api->prepare_v3
|
||||||
|
#define sqlite3_prepare16_v3 sqlite3_api->prepare16_v3
|
||||||
|
#define sqlite3_bind_pointer sqlite3_api->bind_pointer
|
||||||
|
#define sqlite3_result_pointer sqlite3_api->result_pointer
|
||||||
|
#define sqlite3_value_pointer sqlite3_api->value_pointer
|
||||||
|
/* Version 3.22.0 and later */
|
||||||
|
#define sqlite3_vtab_nochange sqlite3_api->vtab_nochange
|
||||||
|
#define sqlite3_value_nochange sqlite3_api->value_nochange
|
||||||
|
#define sqlite3_vtab_collation sqlite3_api->vtab_collation
|
||||||
|
/* Version 3.24.0 and later */
|
||||||
|
#define sqlite3_keyword_count sqlite3_api->keyword_count
|
||||||
|
#define sqlite3_keyword_name sqlite3_api->keyword_name
|
||||||
|
#define sqlite3_keyword_check sqlite3_api->keyword_check
|
||||||
|
#define sqlite3_str_new sqlite3_api->str_new
|
||||||
|
#define sqlite3_str_finish sqlite3_api->str_finish
|
||||||
|
#define sqlite3_str_appendf sqlite3_api->str_appendf
|
||||||
|
#define sqlite3_str_vappendf sqlite3_api->str_vappendf
|
||||||
|
#define sqlite3_str_append sqlite3_api->str_append
|
||||||
|
#define sqlite3_str_appendall sqlite3_api->str_appendall
|
||||||
|
#define sqlite3_str_appendchar sqlite3_api->str_appendchar
|
||||||
|
#define sqlite3_str_reset sqlite3_api->str_reset
|
||||||
|
#define sqlite3_str_errcode sqlite3_api->str_errcode
|
||||||
|
#define sqlite3_str_length sqlite3_api->str_length
|
||||||
|
#define sqlite3_str_value sqlite3_api->str_value
|
||||||
|
/* Version 3.25.0 and later */
|
||||||
|
#define sqlite3_create_window_function sqlite3_api->create_window_function
|
||||||
|
/* Version 3.26.0 and later */
|
||||||
|
#define sqlite3_normalized_sql sqlite3_api->normalized_sql
|
||||||
|
/* Version 3.28.0 and later */
|
||||||
|
#define sqlite3_stmt_isexplain sqlite3_api->stmt_isexplain
|
||||||
|
#define sqlite3_value_frombind sqlite3_api->value_frombind
|
||||||
|
/* Version 3.30.0 and later */
|
||||||
|
#define sqlite3_drop_modules sqlite3_api->drop_modules
|
||||||
|
/* Version 3.31.0 and later */
|
||||||
|
#define sqlite3_hard_heap_limit64 sqlite3_api->hard_heap_limit64
|
||||||
|
#define sqlite3_uri_key sqlite3_api->uri_key
|
||||||
|
#define sqlite3_filename_database sqlite3_api->filename_database
|
||||||
|
#define sqlite3_filename_journal sqlite3_api->filename_journal
|
||||||
|
#define sqlite3_filename_wal sqlite3_api->filename_wal
|
||||||
|
/* Version 3.32.0 and later */
|
||||||
|
#define sqlite3_create_filename sqlite3_api->create_filename
|
||||||
|
#define sqlite3_free_filename sqlite3_api->free_filename
|
||||||
|
#define sqlite3_database_file_object sqlite3_api->database_file_object
|
||||||
|
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
|
||||||
|
|
||||||
|
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
||||||
|
/* This case when the file really is being compiled as a loadable
|
||||||
|
** extension */
|
||||||
|
# define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api=0;
|
||||||
|
# define SQLITE_EXTENSION_INIT2(v) sqlite3_api=v;
|
||||||
|
# define SQLITE_EXTENSION_INIT3 \
|
||||||
|
extern const sqlite3_api_routines *sqlite3_api;
|
||||||
|
#else
|
||||||
|
/* This case when the file is being statically linked into the
|
||||||
|
** application */
|
||||||
|
# define SQLITE_EXTENSION_INIT1 /*no-op*/
|
||||||
|
# define SQLITE_EXTENSION_INIT2(v) (void)v; /* unused parameter */
|
||||||
|
# define SQLITE_EXTENSION_INIT3 /*no-op*/
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* SQLITE3EXT_H */
|
620
src/contrib/sqlite/sqlite3pp.cpp
Normal file
620
src/contrib/sqlite/sqlite3pp.cpp
Normal file
@ -0,0 +1,620 @@
|
|||||||
|
// sqlite3pp.cpp
|
||||||
|
//
|
||||||
|
// The MIT License
|
||||||
|
//
|
||||||
|
// Copyright (c) 2015 Wongoo Lee (iwongu at gmail dot com)
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
// THE SOFTWARE.
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
#include "sqlite3pp.h"
|
||||||
|
|
||||||
|
namespace sqlite3pp
|
||||||
|
{
|
||||||
|
|
||||||
|
null_type ignore;
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
int busy_handler_impl(void* p, int cnt)
|
||||||
|
{
|
||||||
|
auto h = static_cast<database::busy_handler*>(p);
|
||||||
|
return (*h)(cnt);
|
||||||
|
}
|
||||||
|
|
||||||
|
int commit_hook_impl(void* p)
|
||||||
|
{
|
||||||
|
auto h = static_cast<database::commit_handler*>(p);
|
||||||
|
return (*h)();
|
||||||
|
}
|
||||||
|
|
||||||
|
void rollback_hook_impl(void* p)
|
||||||
|
{
|
||||||
|
auto h = static_cast<database::rollback_handler*>(p);
|
||||||
|
(*h)();
|
||||||
|
}
|
||||||
|
|
||||||
|
void update_hook_impl(void* p, int opcode, char const* dbname, char const* tablename, long long int rowid)
|
||||||
|
{
|
||||||
|
auto h = static_cast<database::update_handler*>(p);
|
||||||
|
(*h)(opcode, dbname, tablename, rowid);
|
||||||
|
}
|
||||||
|
|
||||||
|
int authorizer_impl(void* p, int evcode, char const* p1, char const* p2, char const* dbname, char const* tvname)
|
||||||
|
{
|
||||||
|
auto h = static_cast<database::authorize_handler*>(p);
|
||||||
|
return (*h)(evcode, p1, p2, dbname, tvname);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
database::database(char const* dbname, int flags, char const* vfs) : db_(nullptr), borrowing_(false)
|
||||||
|
{
|
||||||
|
if (dbname) {
|
||||||
|
auto rc = connect(dbname, flags, vfs);
|
||||||
|
if (rc != SQLITE_OK)
|
||||||
|
throw database_error("can't connect database");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
database::database(sqlite3* pdb) : db_(pdb), borrowing_(true)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
database::database(database&& db) : db_(std::move(db.db_)),
|
||||||
|
borrowing_(std::move(db.borrowing_)),
|
||||||
|
bh_(std::move(db.bh_)),
|
||||||
|
ch_(std::move(db.ch_)),
|
||||||
|
rh_(std::move(db.rh_)),
|
||||||
|
uh_(std::move(db.uh_)),
|
||||||
|
ah_(std::move(db.ah_))
|
||||||
|
{
|
||||||
|
db.db_ = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
database& database::operator=(database&& db)
|
||||||
|
{
|
||||||
|
db_ = std::move(db.db_);
|
||||||
|
db.db_ = nullptr;
|
||||||
|
borrowing_ = std::move(db.borrowing_);
|
||||||
|
bh_ = std::move(db.bh_);
|
||||||
|
ch_ = std::move(db.ch_);
|
||||||
|
rh_ = std::move(db.rh_);
|
||||||
|
uh_ = std::move(db.uh_);
|
||||||
|
ah_ = std::move(db.ah_);
|
||||||
|
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
database::~database()
|
||||||
|
{
|
||||||
|
if (!borrowing_) {
|
||||||
|
disconnect();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::connect(char const* dbname, int flags, char const* vfs)
|
||||||
|
{
|
||||||
|
if (!borrowing_) {
|
||||||
|
disconnect();
|
||||||
|
}
|
||||||
|
|
||||||
|
return sqlite3_open_v2(dbname, &db_, flags, vfs);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::disconnect()
|
||||||
|
{
|
||||||
|
auto rc = SQLITE_OK;
|
||||||
|
if (db_) {
|
||||||
|
rc = sqlite3_close(db_);
|
||||||
|
if (rc == SQLITE_OK) {
|
||||||
|
db_ = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::attach(char const* dbname, char const* name)
|
||||||
|
{
|
||||||
|
return executef("ATTACH '%q' AS '%q'", dbname, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::detach(char const* name)
|
||||||
|
{
|
||||||
|
return executef("DETACH '%q'", name);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::backup(database& destdb, backup_handler h)
|
||||||
|
{
|
||||||
|
return backup("main", destdb, "main", h);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::backup(char const* dbname, database& destdb, char const* destdbname, backup_handler h, int step_page)
|
||||||
|
{
|
||||||
|
sqlite3_backup* bkup = sqlite3_backup_init(destdb.db_, destdbname, db_, dbname);
|
||||||
|
if (!bkup) {
|
||||||
|
return error_code();
|
||||||
|
}
|
||||||
|
auto rc = SQLITE_OK;
|
||||||
|
do {
|
||||||
|
rc = sqlite3_backup_step(bkup, step_page);
|
||||||
|
if (h) {
|
||||||
|
h(sqlite3_backup_remaining(bkup), sqlite3_backup_pagecount(bkup), rc);
|
||||||
|
}
|
||||||
|
} while (rc == SQLITE_OK || rc == SQLITE_BUSY || rc == SQLITE_LOCKED);
|
||||||
|
sqlite3_backup_finish(bkup);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
void database::set_busy_handler(busy_handler h)
|
||||||
|
{
|
||||||
|
bh_ = h;
|
||||||
|
sqlite3_busy_handler(db_, bh_ ? busy_handler_impl : 0, &bh_);
|
||||||
|
}
|
||||||
|
|
||||||
|
void database::set_commit_handler(commit_handler h)
|
||||||
|
{
|
||||||
|
ch_ = h;
|
||||||
|
sqlite3_commit_hook(db_, ch_ ? commit_hook_impl : 0, &ch_);
|
||||||
|
}
|
||||||
|
|
||||||
|
void database::set_rollback_handler(rollback_handler h)
|
||||||
|
{
|
||||||
|
rh_ = h;
|
||||||
|
sqlite3_rollback_hook(db_, rh_ ? rollback_hook_impl : 0, &rh_);
|
||||||
|
}
|
||||||
|
|
||||||
|
void database::set_update_handler(update_handler h)
|
||||||
|
{
|
||||||
|
uh_ = h;
|
||||||
|
sqlite3_update_hook(db_, uh_ ? update_hook_impl : 0, &uh_);
|
||||||
|
}
|
||||||
|
|
||||||
|
void database::set_authorize_handler(authorize_handler h)
|
||||||
|
{
|
||||||
|
ah_ = h;
|
||||||
|
sqlite3_set_authorizer(db_, ah_ ? authorizer_impl : 0, &ah_);
|
||||||
|
}
|
||||||
|
|
||||||
|
long long int database::last_insert_rowid() const
|
||||||
|
{
|
||||||
|
return sqlite3_last_insert_rowid(db_);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::enable_foreign_keys(bool enable)
|
||||||
|
{
|
||||||
|
return sqlite3_db_config(db_, SQLITE_DBCONFIG_ENABLE_FKEY, enable ? 1 : 0, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::enable_triggers(bool enable)
|
||||||
|
{
|
||||||
|
return sqlite3_db_config(db_, SQLITE_DBCONFIG_ENABLE_TRIGGER, enable ? 1 : 0, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::enable_extended_result_codes(bool enable)
|
||||||
|
{
|
||||||
|
return sqlite3_extended_result_codes(db_, enable ? 1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::changes() const
|
||||||
|
{
|
||||||
|
return sqlite3_changes(db_);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::error_code() const
|
||||||
|
{
|
||||||
|
return sqlite3_errcode(db_);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::extended_error_code() const
|
||||||
|
{
|
||||||
|
return sqlite3_extended_errcode(db_);
|
||||||
|
}
|
||||||
|
|
||||||
|
char const* database::error_msg() const
|
||||||
|
{
|
||||||
|
return sqlite3_errmsg(db_);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::execute(char const* sql)
|
||||||
|
{
|
||||||
|
return sqlite3_exec(db_, sql, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::executef(char const* sql, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
va_start(ap, sql);
|
||||||
|
std::shared_ptr<char> msql(sqlite3_vmprintf(sql, ap), sqlite3_free);
|
||||||
|
va_end(ap);
|
||||||
|
|
||||||
|
return execute(msql.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
int database::set_busy_timeout(int ms)
|
||||||
|
{
|
||||||
|
return sqlite3_busy_timeout(db_, ms);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
statement::statement(database& db, char const* stmt) : db_(db), stmt_(0), tail_(0)
|
||||||
|
{
|
||||||
|
if (stmt) {
|
||||||
|
auto rc = prepare(stmt);
|
||||||
|
if (rc != SQLITE_OK)
|
||||||
|
throw database_error(db_);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
statement::~statement()
|
||||||
|
{
|
||||||
|
// finish() can return error. If you want to check the error, call
|
||||||
|
// finish() explicitly before this object is destructed.
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::prepare(char const* stmt)
|
||||||
|
{
|
||||||
|
auto rc = finish();
|
||||||
|
if (rc != SQLITE_OK)
|
||||||
|
return rc;
|
||||||
|
|
||||||
|
return prepare_impl(stmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::prepare_impl(char const* stmt)
|
||||||
|
{
|
||||||
|
return sqlite3_prepare_v2(db_.db_, stmt, std::strlen(stmt), &stmt_, &tail_);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::finish()
|
||||||
|
{
|
||||||
|
auto rc = SQLITE_OK;
|
||||||
|
if (stmt_) {
|
||||||
|
rc = finish_impl(stmt_);
|
||||||
|
stmt_ = nullptr;
|
||||||
|
}
|
||||||
|
tail_ = nullptr;
|
||||||
|
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::finish_impl(sqlite3_stmt* stmt)
|
||||||
|
{
|
||||||
|
return sqlite3_finalize(stmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::step()
|
||||||
|
{
|
||||||
|
return sqlite3_step(stmt_);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::reset()
|
||||||
|
{
|
||||||
|
return sqlite3_reset(stmt_);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(int idx, int value)
|
||||||
|
{
|
||||||
|
return sqlite3_bind_int(stmt_, idx, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(int idx, double value)
|
||||||
|
{
|
||||||
|
return sqlite3_bind_double(stmt_, idx, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(int idx, long long int value)
|
||||||
|
{
|
||||||
|
return sqlite3_bind_int64(stmt_, idx, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(int idx, char const* value, copy_semantic fcopy)
|
||||||
|
{
|
||||||
|
return sqlite3_bind_text(stmt_, idx, value, std::strlen(value), fcopy == copy ? SQLITE_TRANSIENT : SQLITE_STATIC );
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(int idx, void const* value, int n, copy_semantic fcopy)
|
||||||
|
{
|
||||||
|
return sqlite3_bind_blob(stmt_, idx, value, n, fcopy == copy ? SQLITE_TRANSIENT : SQLITE_STATIC );
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(int idx, std::string const& value, copy_semantic fcopy)
|
||||||
|
{
|
||||||
|
return sqlite3_bind_text(stmt_, idx, value.c_str(), value.size(), fcopy == copy ? SQLITE_TRANSIENT : SQLITE_STATIC );
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(int idx)
|
||||||
|
{
|
||||||
|
return sqlite3_bind_null(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(int idx, null_type)
|
||||||
|
{
|
||||||
|
return bind(idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(char const* name, int value)
|
||||||
|
{
|
||||||
|
auto idx = sqlite3_bind_parameter_index(stmt_, name);
|
||||||
|
return bind(idx, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(char const* name, double value)
|
||||||
|
{
|
||||||
|
auto idx = sqlite3_bind_parameter_index(stmt_, name);
|
||||||
|
return bind(idx, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(char const* name, long long int value)
|
||||||
|
{
|
||||||
|
auto idx = sqlite3_bind_parameter_index(stmt_, name);
|
||||||
|
return bind(idx, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(char const* name, char const* value, copy_semantic fcopy)
|
||||||
|
{
|
||||||
|
auto idx = sqlite3_bind_parameter_index(stmt_, name);
|
||||||
|
return bind(idx, value, fcopy);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(char const* name, void const* value, int n, copy_semantic fcopy)
|
||||||
|
{
|
||||||
|
auto idx = sqlite3_bind_parameter_index(stmt_, name);
|
||||||
|
return bind(idx, value, n, fcopy);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(char const* name, std::string const& value, copy_semantic fcopy)
|
||||||
|
{
|
||||||
|
auto idx = sqlite3_bind_parameter_index(stmt_, name);
|
||||||
|
return bind(idx, value, fcopy);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(char const* name)
|
||||||
|
{
|
||||||
|
auto idx = sqlite3_bind_parameter_index(stmt_, name);
|
||||||
|
return bind(idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
int statement::bind(char const* name, null_type)
|
||||||
|
{
|
||||||
|
return bind(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
command::bindstream::bindstream(command& cmd, int idx) : cmd_(cmd), idx_(idx)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
command::command(database& db, char const* stmt) : statement(db, stmt)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
command::bindstream command::binder(int idx)
|
||||||
|
{
|
||||||
|
return bindstream(*this, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
int command::execute()
|
||||||
|
{
|
||||||
|
auto rc = step();
|
||||||
|
if (rc == SQLITE_DONE) rc = SQLITE_OK;
|
||||||
|
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
int command::execute_all()
|
||||||
|
{
|
||||||
|
auto rc = execute();
|
||||||
|
if (rc != SQLITE_OK) return rc;
|
||||||
|
|
||||||
|
char const* sql = tail_;
|
||||||
|
|
||||||
|
while (std::strlen(sql) > 0) { // sqlite3_complete() is broken.
|
||||||
|
sqlite3_stmt* old_stmt = stmt_;
|
||||||
|
|
||||||
|
if ((rc = prepare_impl(sql)) != SQLITE_OK) return rc;
|
||||||
|
|
||||||
|
if ((rc = sqlite3_transfer_bindings(old_stmt, stmt_)) != SQLITE_OK) return rc;
|
||||||
|
|
||||||
|
finish_impl(old_stmt);
|
||||||
|
|
||||||
|
if ((rc = execute()) != SQLITE_OK) return rc;
|
||||||
|
|
||||||
|
sql = tail_;
|
||||||
|
}
|
||||||
|
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
query::rows::getstream::getstream(rows* rws, int idx) : rws_(rws), idx_(idx)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
query::rows::rows(sqlite3_stmt* stmt) : stmt_(stmt)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
int query::rows::data_count() const
|
||||||
|
{
|
||||||
|
return sqlite3_data_count(stmt_);
|
||||||
|
}
|
||||||
|
|
||||||
|
int query::rows::column_type(int idx) const
|
||||||
|
{
|
||||||
|
return sqlite3_column_type(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
int query::rows::column_bytes(int idx) const
|
||||||
|
{
|
||||||
|
return sqlite3_column_bytes(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
int query::rows::get(int idx, int) const
|
||||||
|
{
|
||||||
|
return sqlite3_column_int(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
double query::rows::get(int idx, double) const
|
||||||
|
{
|
||||||
|
return sqlite3_column_double(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
long long int query::rows::get(int idx, long long int) const
|
||||||
|
{
|
||||||
|
return sqlite3_column_int64(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
char const* query::rows::get(int idx, char const*) const
|
||||||
|
{
|
||||||
|
return reinterpret_cast<char const*>(sqlite3_column_text(stmt_, idx));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string query::rows::get(int idx, std::string) const
|
||||||
|
{
|
||||||
|
return get(idx, (char const*)0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void const* query::rows::get(int idx, void const*) const
|
||||||
|
{
|
||||||
|
return sqlite3_column_blob(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
null_type query::rows::get(int /*idx*/, null_type) const
|
||||||
|
{
|
||||||
|
return ignore;
|
||||||
|
}
|
||||||
|
query::rows::getstream query::rows::getter(int idx)
|
||||||
|
{
|
||||||
|
return getstream(this, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
query::query_iterator::query_iterator() : cmd_(0)
|
||||||
|
{
|
||||||
|
rc_ = SQLITE_DONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
query::query_iterator::query_iterator(query* cmd) : cmd_(cmd)
|
||||||
|
{
|
||||||
|
rc_ = cmd_->step();
|
||||||
|
if (rc_ != SQLITE_ROW && rc_ != SQLITE_DONE)
|
||||||
|
throw database_error(cmd_->db_);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool query::query_iterator::operator==(query::query_iterator const& other) const
|
||||||
|
{
|
||||||
|
return rc_ == other.rc_;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool query::query_iterator::operator!=(query::query_iterator const& other) const
|
||||||
|
{
|
||||||
|
return rc_ != other.rc_;
|
||||||
|
}
|
||||||
|
|
||||||
|
query::query_iterator& query::query_iterator::operator++()
|
||||||
|
{
|
||||||
|
rc_ = cmd_->step();
|
||||||
|
if (rc_ != SQLITE_ROW && rc_ != SQLITE_DONE)
|
||||||
|
throw database_error(cmd_->db_);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
query::query_iterator::value_type query::query_iterator::operator*() const
|
||||||
|
{
|
||||||
|
return rows(cmd_->stmt_);
|
||||||
|
}
|
||||||
|
|
||||||
|
query::query(database& db, char const* stmt) : statement(db, stmt)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
int query::column_count() const
|
||||||
|
{
|
||||||
|
return sqlite3_column_count(stmt_);
|
||||||
|
}
|
||||||
|
|
||||||
|
char const* query::column_name(int idx) const
|
||||||
|
{
|
||||||
|
return sqlite3_column_name(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
char const* query::column_decltype(int idx) const
|
||||||
|
{
|
||||||
|
return sqlite3_column_decltype(stmt_, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
query::iterator query::begin()
|
||||||
|
{
|
||||||
|
return query_iterator(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
query::iterator query::end()
|
||||||
|
{
|
||||||
|
return query_iterator();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
transaction::transaction(database& db, bool fcommit, bool freserve) : db_(&db), fcommit_(fcommit)
|
||||||
|
{
|
||||||
|
int rc = db_->execute(freserve ? "BEGIN IMMEDIATE" : "BEGIN");
|
||||||
|
if (rc != SQLITE_OK)
|
||||||
|
throw database_error(*db_);
|
||||||
|
}
|
||||||
|
|
||||||
|
transaction::~transaction()
|
||||||
|
{
|
||||||
|
if (db_) {
|
||||||
|
// execute() can return error. If you want to check the error,
|
||||||
|
// call commit() or rollback() explicitly before this object is
|
||||||
|
// destructed.
|
||||||
|
db_->execute(fcommit_ ? "COMMIT" : "ROLLBACK");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int transaction::commit()
|
||||||
|
{
|
||||||
|
auto db = db_;
|
||||||
|
db_ = nullptr;
|
||||||
|
int rc = db->execute("COMMIT");
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
int transaction::rollback()
|
||||||
|
{
|
||||||
|
auto db = db_;
|
||||||
|
db_ = nullptr;
|
||||||
|
int rc = db->execute("ROLLBACK");
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
database_error::database_error(char const* msg) : std::runtime_error(msg)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
database_error::database_error(database& db) : std::runtime_error(sqlite3_errmsg(db.db_))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace sqlite3pp
|
345
src/contrib/sqlite/sqlite3pp.h
Normal file
345
src/contrib/sqlite/sqlite3pp.h
Normal file
@ -0,0 +1,345 @@
|
|||||||
|
// sqlite3pp.h
|
||||||
|
//
|
||||||
|
// The MIT License
|
||||||
|
//
|
||||||
|
// Copyright (c) 2015 Wongoo Lee (iwongu at gmail dot com)
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
// THE SOFTWARE.
|
||||||
|
|
||||||
|
#ifndef SQLITE3PP_H
|
||||||
|
#define SQLITE3PP_H
|
||||||
|
|
||||||
|
#define SQLITE3PP_VERSION "1.0.8"
|
||||||
|
#define SQLITE3PP_VERSION_MAJOR 1
|
||||||
|
#define SQLITE3PP_VERSION_MINOR 0
|
||||||
|
#define SQLITE3PP_VERSION_PATCH 8
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
|
#include <iterator>
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <string>
|
||||||
|
#include <tuple>
|
||||||
|
|
||||||
|
#ifdef SQLITE3PP_LOADABLE_EXTENSION
|
||||||
|
#include <sqlite3ext.h>
|
||||||
|
SQLITE_EXTENSION_INIT1
|
||||||
|
#else
|
||||||
|
# include "sqlite3.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace sqlite3pp
|
||||||
|
{
|
||||||
|
class database;
|
||||||
|
|
||||||
|
namespace ext
|
||||||
|
{
|
||||||
|
class function;
|
||||||
|
class aggregate;
|
||||||
|
database borrow(sqlite3* pdb);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
struct convert {
|
||||||
|
using to_int = int;
|
||||||
|
};
|
||||||
|
|
||||||
|
class null_type {};
|
||||||
|
extern null_type ignore;
|
||||||
|
|
||||||
|
class noncopyable
|
||||||
|
{
|
||||||
|
protected:
|
||||||
|
noncopyable() = default;
|
||||||
|
~noncopyable() = default;
|
||||||
|
|
||||||
|
noncopyable(noncopyable&&) = default;
|
||||||
|
noncopyable& operator=(noncopyable&&) = default;
|
||||||
|
|
||||||
|
noncopyable(noncopyable const&) = delete;
|
||||||
|
noncopyable& operator=(noncopyable const&) = delete;
|
||||||
|
};
|
||||||
|
|
||||||
|
class database : noncopyable
|
||||||
|
{
|
||||||
|
friend class statement;
|
||||||
|
friend class database_error;
|
||||||
|
friend class ext::function;
|
||||||
|
friend class ext::aggregate;
|
||||||
|
friend database ext::borrow(sqlite3* pdb);
|
||||||
|
|
||||||
|
public:
|
||||||
|
using busy_handler = std::function<int (int)>;
|
||||||
|
using commit_handler = std::function<int ()>;
|
||||||
|
using rollback_handler = std::function<void ()>;
|
||||||
|
using update_handler = std::function<void (int, char const*, char const*, long long int)>;
|
||||||
|
using authorize_handler = std::function<int (int, char const*, char const*, char const*, char const*)>;
|
||||||
|
using backup_handler = std::function<void (int, int, int)>;
|
||||||
|
|
||||||
|
explicit database(char const* dbname = nullptr, int flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, const char* vfs = nullptr);
|
||||||
|
|
||||||
|
database(database&& db);
|
||||||
|
database& operator=(database&& db);
|
||||||
|
|
||||||
|
~database();
|
||||||
|
|
||||||
|
int connect(char const* dbname, int flags, const char* vfs = nullptr);
|
||||||
|
int disconnect();
|
||||||
|
|
||||||
|
int attach(char const* dbname, char const* name);
|
||||||
|
int detach(char const* name);
|
||||||
|
|
||||||
|
int backup(database& destdb, backup_handler h = {});
|
||||||
|
int backup(char const* dbname, database& destdb, char const* destdbname, backup_handler h, int step_page = 5);
|
||||||
|
|
||||||
|
long long int last_insert_rowid() const;
|
||||||
|
|
||||||
|
int enable_foreign_keys(bool enable = true);
|
||||||
|
int enable_triggers(bool enable = true);
|
||||||
|
int enable_extended_result_codes(bool enable = true);
|
||||||
|
|
||||||
|
int changes() const;
|
||||||
|
|
||||||
|
int error_code() const;
|
||||||
|
int extended_error_code() const;
|
||||||
|
char const* error_msg() const;
|
||||||
|
|
||||||
|
int execute(char const* sql);
|
||||||
|
int executef(char const* sql, ...);
|
||||||
|
|
||||||
|
int set_busy_timeout(int ms);
|
||||||
|
|
||||||
|
void set_busy_handler(busy_handler h);
|
||||||
|
void set_commit_handler(commit_handler h);
|
||||||
|
void set_rollback_handler(rollback_handler h);
|
||||||
|
void set_update_handler(update_handler h);
|
||||||
|
void set_authorize_handler(authorize_handler h);
|
||||||
|
|
||||||
|
private:
|
||||||
|
database(sqlite3* pdb);
|
||||||
|
|
||||||
|
private:
|
||||||
|
sqlite3* db_;
|
||||||
|
bool borrowing_;
|
||||||
|
|
||||||
|
busy_handler bh_;
|
||||||
|
commit_handler ch_;
|
||||||
|
rollback_handler rh_;
|
||||||
|
update_handler uh_;
|
||||||
|
authorize_handler ah_;
|
||||||
|
};
|
||||||
|
|
||||||
|
class database_error : public std::runtime_error
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit database_error(char const* msg);
|
||||||
|
explicit database_error(database& db);
|
||||||
|
};
|
||||||
|
|
||||||
|
enum copy_semantic { copy, nocopy };
|
||||||
|
|
||||||
|
class statement : noncopyable
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
int prepare(char const* stmt);
|
||||||
|
int finish();
|
||||||
|
|
||||||
|
int bind(int idx, int value);
|
||||||
|
int bind(int idx, double value);
|
||||||
|
int bind(int idx, long long int value);
|
||||||
|
int bind(int idx, char const* value, copy_semantic fcopy);
|
||||||
|
int bind(int idx, void const* value, int n, copy_semantic fcopy);
|
||||||
|
int bind(int idx, std::string const& value, copy_semantic fcopy);
|
||||||
|
int bind(int idx);
|
||||||
|
int bind(int idx, null_type);
|
||||||
|
|
||||||
|
int bind(char const* name, int value);
|
||||||
|
int bind(char const* name, double value);
|
||||||
|
int bind(char const* name, long long int value);
|
||||||
|
int bind(char const* name, char const* value, copy_semantic fcopy);
|
||||||
|
int bind(char const* name, void const* value, int n, copy_semantic fcopy);
|
||||||
|
int bind(char const* name, std::string const& value, copy_semantic fcopy);
|
||||||
|
int bind(char const* name);
|
||||||
|
int bind(char const* name, null_type);
|
||||||
|
|
||||||
|
int step();
|
||||||
|
int reset();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
explicit statement(database& db, char const* stmt = nullptr);
|
||||||
|
~statement();
|
||||||
|
|
||||||
|
int prepare_impl(char const* stmt);
|
||||||
|
int finish_impl(sqlite3_stmt* stmt);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
database& db_;
|
||||||
|
sqlite3_stmt* stmt_;
|
||||||
|
char const* tail_;
|
||||||
|
};
|
||||||
|
|
||||||
|
class command : public statement
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
class bindstream
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
bindstream(command& cmd, int idx);
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
bindstream& operator << (T value) {
|
||||||
|
auto rc = cmd_.bind(idx_, value);
|
||||||
|
if (rc != SQLITE_OK) {
|
||||||
|
throw database_error(cmd_.db_);
|
||||||
|
}
|
||||||
|
++idx_;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
bindstream& operator << (char const* value) {
|
||||||
|
auto rc = cmd_.bind(idx_, value, copy);
|
||||||
|
if (rc != SQLITE_OK) {
|
||||||
|
throw database_error(cmd_.db_);
|
||||||
|
}
|
||||||
|
++idx_;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
bindstream& operator << (std::string const& value) {
|
||||||
|
auto rc = cmd_.bind(idx_, value, copy);
|
||||||
|
if (rc != SQLITE_OK) {
|
||||||
|
throw database_error(cmd_.db_);
|
||||||
|
}
|
||||||
|
++idx_;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
command& cmd_;
|
||||||
|
int idx_;
|
||||||
|
};
|
||||||
|
|
||||||
|
explicit command(database& db, char const* stmt = nullptr);
|
||||||
|
|
||||||
|
bindstream binder(int idx = 1);
|
||||||
|
|
||||||
|
int execute();
|
||||||
|
int execute_all();
|
||||||
|
};
|
||||||
|
|
||||||
|
class query : public statement
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
class rows
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
class getstream
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
getstream(rows* rws, int idx);
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
getstream& operator >> (T& value) {
|
||||||
|
value = rws_->get(idx_, T());
|
||||||
|
++idx_;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
rows* rws_;
|
||||||
|
int idx_;
|
||||||
|
};
|
||||||
|
|
||||||
|
explicit rows(sqlite3_stmt* stmt);
|
||||||
|
|
||||||
|
int data_count() const;
|
||||||
|
int column_type(int idx) const;
|
||||||
|
|
||||||
|
int column_bytes(int idx) const;
|
||||||
|
|
||||||
|
template <class T> T get(int idx) const {
|
||||||
|
return get(idx, T());
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class... Ts>
|
||||||
|
std::tuple<Ts...> get_columns(typename convert<Ts>::to_int... idxs) const {
|
||||||
|
return std::make_tuple(get(idxs, Ts())...);
|
||||||
|
}
|
||||||
|
|
||||||
|
getstream getter(int idx = 0);
|
||||||
|
|
||||||
|
private:
|
||||||
|
int get(int idx, int) const;
|
||||||
|
double get(int idx, double) const;
|
||||||
|
long long int get(int idx, long long int) const;
|
||||||
|
char const* get(int idx, char const*) const;
|
||||||
|
std::string get(int idx, std::string) const;
|
||||||
|
void const* get(int idx, void const*) const;
|
||||||
|
null_type get(int idx, null_type) const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
sqlite3_stmt* stmt_;
|
||||||
|
};
|
||||||
|
|
||||||
|
class query_iterator
|
||||||
|
: public std::iterator<std::input_iterator_tag, rows>
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
query_iterator();
|
||||||
|
explicit query_iterator(query* cmd);
|
||||||
|
|
||||||
|
bool operator==(query_iterator const&) const;
|
||||||
|
bool operator!=(query_iterator const&) const;
|
||||||
|
|
||||||
|
query_iterator& operator++();
|
||||||
|
|
||||||
|
value_type operator*() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
query* cmd_;
|
||||||
|
int rc_;
|
||||||
|
};
|
||||||
|
|
||||||
|
explicit query(database& db, char const* stmt = nullptr);
|
||||||
|
|
||||||
|
int column_count() const;
|
||||||
|
|
||||||
|
char const* column_name(int idx) const;
|
||||||
|
char const* column_decltype(int idx) const;
|
||||||
|
|
||||||
|
using iterator = query_iterator;
|
||||||
|
|
||||||
|
iterator begin();
|
||||||
|
iterator end();
|
||||||
|
};
|
||||||
|
|
||||||
|
class transaction : noncopyable
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit transaction(database& db, bool fcommit = false, bool freserve = false);
|
||||||
|
~transaction();
|
||||||
|
|
||||||
|
int commit();
|
||||||
|
int rollback();
|
||||||
|
|
||||||
|
private:
|
||||||
|
database* db_;
|
||||||
|
bool fcommit_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace sqlite3pp
|
||||||
|
|
||||||
|
#endif
|
200
src/contrib/sqlite/sqlite3ppext.cpp
Normal file
200
src/contrib/sqlite/sqlite3ppext.cpp
Normal file
@ -0,0 +1,200 @@
|
|||||||
|
// sqlite3ppext.cpp
|
||||||
|
//
|
||||||
|
// The MIT License
|
||||||
|
//
|
||||||
|
// Copyright (c) 2015 Wongoo Lee (iwongu at gmail dot com)
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
// THE SOFTWARE.
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
|
#include "sqlite3ppext.h"
|
||||||
|
|
||||||
|
namespace sqlite3pp
|
||||||
|
{
|
||||||
|
namespace ext
|
||||||
|
{
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
|
||||||
|
void function_impl(sqlite3_context* ctx, int nargs, sqlite3_value** values)
|
||||||
|
{
|
||||||
|
auto f = static_cast<function::function_handler*>(sqlite3_user_data(ctx));
|
||||||
|
context c(ctx, nargs, values);
|
||||||
|
(*f)(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
void step_impl(sqlite3_context* ctx, int nargs, sqlite3_value** values)
|
||||||
|
{
|
||||||
|
auto p = static_cast<std::pair<aggregate::pfunction_base, aggregate::pfunction_base>*>(sqlite3_user_data(ctx));
|
||||||
|
auto s = static_cast<aggregate::function_handler*>((*p).first.get());
|
||||||
|
context c(ctx, nargs, values);
|
||||||
|
((function::function_handler&)*s)(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
void finalize_impl(sqlite3_context* ctx)
|
||||||
|
{
|
||||||
|
auto p = static_cast<std::pair<aggregate::pfunction_base, aggregate::pfunction_base>*>(sqlite3_user_data(ctx));
|
||||||
|
auto f = static_cast<aggregate::function_handler*>((*p).second.get());
|
||||||
|
context c(ctx);
|
||||||
|
((function::function_handler&)*f)(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
database borrow(sqlite3* pdb) {
|
||||||
|
return database(pdb);
|
||||||
|
}
|
||||||
|
|
||||||
|
context::context(sqlite3_context* ctx, int nargs, sqlite3_value** values)
|
||||||
|
: ctx_(ctx), nargs_(nargs), values_(values)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
int context::args_count() const
|
||||||
|
{
|
||||||
|
return nargs_;
|
||||||
|
}
|
||||||
|
|
||||||
|
int context::args_bytes(int idx) const
|
||||||
|
{
|
||||||
|
return sqlite3_value_bytes(values_[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
int context::args_type(int idx) const
|
||||||
|
{
|
||||||
|
return sqlite3_value_type(values_[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
int context::get(int idx, int) const
|
||||||
|
{
|
||||||
|
return sqlite3_value_int(values_[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
double context::get(int idx, double) const
|
||||||
|
{
|
||||||
|
return sqlite3_value_double(values_[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
long long int context::get(int idx, long long int) const
|
||||||
|
{
|
||||||
|
return sqlite3_value_int64(values_[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
char const* context::get(int idx, char const*) const
|
||||||
|
{
|
||||||
|
return reinterpret_cast<char const*>(sqlite3_value_text(values_[idx]));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string context::get(int idx, std::string) const
|
||||||
|
{
|
||||||
|
return get(idx, (char const*)0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void const* context::get(int idx, void const*) const
|
||||||
|
{
|
||||||
|
return sqlite3_value_blob(values_[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void context::result(int value)
|
||||||
|
{
|
||||||
|
sqlite3_result_int(ctx_, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result(double value)
|
||||||
|
{
|
||||||
|
sqlite3_result_double(ctx_, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result(long long int value)
|
||||||
|
{
|
||||||
|
sqlite3_result_int64(ctx_, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result(std::string const& value)
|
||||||
|
{
|
||||||
|
result(value.c_str(), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result(char const* value, bool fcopy)
|
||||||
|
{
|
||||||
|
sqlite3_result_text(ctx_, value, std::strlen(value), fcopy ? SQLITE_TRANSIENT : SQLITE_STATIC);
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result(void const* value, int n, bool fcopy)
|
||||||
|
{
|
||||||
|
sqlite3_result_blob(ctx_, value, n, fcopy ? SQLITE_TRANSIENT : SQLITE_STATIC );
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result()
|
||||||
|
{
|
||||||
|
sqlite3_result_null(ctx_);
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result(null_type)
|
||||||
|
{
|
||||||
|
sqlite3_result_null(ctx_);
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result_copy(int idx)
|
||||||
|
{
|
||||||
|
sqlite3_result_value(ctx_, values_[idx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
void context::result_error(char const* msg)
|
||||||
|
{
|
||||||
|
sqlite3_result_error(ctx_, msg, std::strlen(msg));
|
||||||
|
}
|
||||||
|
|
||||||
|
void* context::aggregate_data(int size)
|
||||||
|
{
|
||||||
|
return sqlite3_aggregate_context(ctx_, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
int context::aggregate_count()
|
||||||
|
{
|
||||||
|
return sqlite3_aggregate_count(ctx_);
|
||||||
|
}
|
||||||
|
|
||||||
|
function::function(database& db) : db_(db.db_)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
int function::create(char const* name, function_handler h, int nargs)
|
||||||
|
{
|
||||||
|
fh_[name] = pfunction_base(new function_handler(h));
|
||||||
|
return sqlite3_create_function(db_, name, nargs, SQLITE_UTF8, fh_[name].get(), function_impl, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
aggregate::aggregate(database& db) : db_(db.db_)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
int aggregate::create(char const* name, function_handler s, function_handler f, int nargs)
|
||||||
|
{
|
||||||
|
ah_[name] = std::make_pair(pfunction_base(new function_handler(s)), pfunction_base(new function_handler(f)));
|
||||||
|
return sqlite3_create_function(db_, name, nargs, SQLITE_UTF8, &ah_[name], 0, step_impl, finalize_impl);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace ext
|
||||||
|
|
||||||
|
} // namespace sqlite3pp
|
232
src/contrib/sqlite/sqlite3ppext.h
Normal file
232
src/contrib/sqlite/sqlite3ppext.h
Normal file
@ -0,0 +1,232 @@
|
|||||||
|
// sqlite3ppext.h
|
||||||
|
//
|
||||||
|
// The MIT License
|
||||||
|
//
|
||||||
|
// Copyright (c) 2015 Wongoo Lee (iwongu at gmail dot com)
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
// THE SOFTWARE.
|
||||||
|
|
||||||
|
#ifndef SQLITE3PPEXT_H
|
||||||
|
#define SQLITE3PPEXT_H
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
#include <map>
|
||||||
|
#include <memory>
|
||||||
|
#include <tuple>
|
||||||
|
#include <type_traits>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
#include "sqlite3pp.h"
|
||||||
|
|
||||||
|
namespace sqlite3pp
|
||||||
|
{
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
template<size_t N>
|
||||||
|
struct Apply {
|
||||||
|
template<typename F, typename T, typename... A>
|
||||||
|
static inline auto apply(F&& f, T&& t, A&&... a)
|
||||||
|
-> decltype(Apply<N-1>::apply(std::forward<F>(f),
|
||||||
|
std::forward<T>(t),
|
||||||
|
std::get<N-1>(std::forward<T>(t)),
|
||||||
|
std::forward<A>(a)...))
|
||||||
|
{
|
||||||
|
return Apply<N-1>::apply(std::forward<F>(f),
|
||||||
|
std::forward<T>(t),
|
||||||
|
std::get<N-1>(std::forward<T>(t)),
|
||||||
|
std::forward<A>(a)...);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template<>
|
||||||
|
struct Apply<0> {
|
||||||
|
template<typename F, typename T, typename... A>
|
||||||
|
static inline auto apply(F&& f, T&&, A&&... a)
|
||||||
|
-> decltype(std::forward<F>(f)(std::forward<A>(a)...))
|
||||||
|
{
|
||||||
|
return std::forward<F>(f)(std::forward<A>(a)...);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template<typename F, typename T>
|
||||||
|
inline auto apply(F&& f, T&& t)
|
||||||
|
-> decltype(Apply<std::tuple_size<typename std::decay<T>::type>::value>::apply(std::forward<F>(f), std::forward<T>(t)))
|
||||||
|
{
|
||||||
|
return Apply<std::tuple_size<typename std::decay<T>::type>::value>::apply(
|
||||||
|
std::forward<F>(f), std::forward<T>(t));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
namespace ext
|
||||||
|
{
|
||||||
|
database borrow(sqlite3* pdb);
|
||||||
|
|
||||||
|
class context : noncopyable
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit context(sqlite3_context* ctx, int nargs = 0, sqlite3_value** values = nullptr);
|
||||||
|
|
||||||
|
int args_count() const;
|
||||||
|
int args_bytes(int idx) const;
|
||||||
|
int args_type(int idx) const;
|
||||||
|
|
||||||
|
template <class T> T get(int idx) const {
|
||||||
|
return get(idx, T());
|
||||||
|
}
|
||||||
|
|
||||||
|
void result(int value);
|
||||||
|
void result(double value);
|
||||||
|
void result(long long int value);
|
||||||
|
void result(std::string const& value);
|
||||||
|
void result(char const* value, bool fcopy);
|
||||||
|
void result(void const* value, int n, bool fcopy);
|
||||||
|
void result();
|
||||||
|
void result(null_type);
|
||||||
|
void result_copy(int idx);
|
||||||
|
void result_error(char const* msg);
|
||||||
|
|
||||||
|
void* aggregate_data(int size);
|
||||||
|
int aggregate_count();
|
||||||
|
|
||||||
|
template <class... Ts>
|
||||||
|
std::tuple<Ts...> to_tuple() {
|
||||||
|
return to_tuple_impl(0, *this, std::tuple<Ts...>());
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
int get(int idx, int) const;
|
||||||
|
double get(int idx, double) const;
|
||||||
|
long long int get(int idx, long long int) const;
|
||||||
|
char const* get(int idx, char const*) const;
|
||||||
|
std::string get(int idx, std::string) const;
|
||||||
|
void const* get(int idx, void const*) const;
|
||||||
|
|
||||||
|
template<class H, class... Ts>
|
||||||
|
static inline std::tuple<H, Ts...> to_tuple_impl(int index, const context& c, std::tuple<H, Ts...>&&)
|
||||||
|
{
|
||||||
|
auto h = std::make_tuple(c.context::get<H>(index));
|
||||||
|
return std::tuple_cat(h, to_tuple_impl(++index, c, std::tuple<Ts...>()));
|
||||||
|
}
|
||||||
|
static inline std::tuple<> to_tuple_impl(int /*index*/, const context& /*c*/, std::tuple<>&&)
|
||||||
|
{
|
||||||
|
return std::tuple<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
sqlite3_context* ctx_;
|
||||||
|
int nargs_;
|
||||||
|
sqlite3_value** values_;
|
||||||
|
};
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
template <class R, class... Ps>
|
||||||
|
void functionx_impl(sqlite3_context* ctx, int nargs, sqlite3_value** values)
|
||||||
|
{
|
||||||
|
context c(ctx, nargs, values);
|
||||||
|
auto f = static_cast<std::function<R (Ps...)>*>(sqlite3_user_data(ctx));
|
||||||
|
c.result(apply(*f, c.to_tuple<Ps...>()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class function : noncopyable
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
using function_handler = std::function<void (context&)>;
|
||||||
|
using pfunction_base = std::shared_ptr<void>;
|
||||||
|
|
||||||
|
explicit function(database& db);
|
||||||
|
|
||||||
|
int create(char const* name, function_handler h, int nargs = 0);
|
||||||
|
|
||||||
|
template <class F> int create(char const* name, std::function<F> h) {
|
||||||
|
fh_[name] = std::shared_ptr<void>(new std::function<F>(h));
|
||||||
|
return create_function_impl<F>()(db_, fh_[name].get(), name);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
template<class R, class... Ps>
|
||||||
|
struct create_function_impl;
|
||||||
|
|
||||||
|
template<class R, class... Ps>
|
||||||
|
struct create_function_impl<R (Ps...)>
|
||||||
|
{
|
||||||
|
int operator()(sqlite3* db, void* fh, char const* name) {
|
||||||
|
return sqlite3_create_function(db, name, sizeof...(Ps), SQLITE_UTF8, fh,
|
||||||
|
functionx_impl<R, Ps...>,
|
||||||
|
0, 0);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private:
|
||||||
|
sqlite3* db_;
|
||||||
|
|
||||||
|
std::map<std::string, pfunction_base> fh_;
|
||||||
|
};
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
template <class T, class... Ps>
|
||||||
|
void stepx_impl(sqlite3_context* ctx, int nargs, sqlite3_value** values)
|
||||||
|
{
|
||||||
|
context c(ctx, nargs, values);
|
||||||
|
T* t = static_cast<T*>(c.aggregate_data(sizeof(T)));
|
||||||
|
if (c.aggregate_count() == 1) new (t) T;
|
||||||
|
apply([](T* tt, Ps... ps){tt->step(ps...);},
|
||||||
|
std::tuple_cat(std::make_tuple(t), c.to_tuple<Ps...>()));
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
void finishN_impl(sqlite3_context* ctx)
|
||||||
|
{
|
||||||
|
context c(ctx);
|
||||||
|
T* t = static_cast<T*>(c.aggregate_data(sizeof(T)));
|
||||||
|
c.result(t->finish());
|
||||||
|
t->~T();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class aggregate : noncopyable
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
using function_handler = std::function<void (context&)>;
|
||||||
|
using pfunction_base = std::shared_ptr<void>;
|
||||||
|
|
||||||
|
explicit aggregate(database& db);
|
||||||
|
|
||||||
|
int create(char const* name, function_handler s, function_handler f, int nargs = 1);
|
||||||
|
|
||||||
|
template <class T, class... Ps>
|
||||||
|
int create(char const* name) {
|
||||||
|
return sqlite3_create_function(db_, name, sizeof...(Ps), SQLITE_UTF8, 0, 0, stepx_impl<T, Ps...>, finishN_impl<T>);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
sqlite3* db_;
|
||||||
|
|
||||||
|
std::map<std::string, std::pair<pfunction_base, pfunction_base> > ah_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace ext
|
||||||
|
|
||||||
|
} // namespace sqlite3pp
|
||||||
|
|
||||||
|
#endif
|
@ -6,6 +6,7 @@
|
|||||||
#include "MissionManager.hpp"
|
#include "MissionManager.hpp"
|
||||||
#include "NanoManager.hpp"
|
#include "NanoManager.hpp"
|
||||||
#include "NPCManager.hpp"
|
#include "NPCManager.hpp"
|
||||||
|
#include "Database.hpp"
|
||||||
|
|
||||||
#include "settings.hpp"
|
#include "settings.hpp"
|
||||||
|
|
||||||
@ -41,6 +42,8 @@ int main() {
|
|||||||
NanoManager::init();
|
NanoManager::init();
|
||||||
NPCManager::init();
|
NPCManager::init();
|
||||||
|
|
||||||
|
Database::open();
|
||||||
|
|
||||||
std::cout << "[INFO] Starting Server Threads..." << std::endl;
|
std::cout << "[INFO] Starting Server Threads..." << std::endl;
|
||||||
CNLoginServer loginServer(settings::LOGINPORT);
|
CNLoginServer loginServer(settings::LOGINPORT);
|
||||||
CNShardServer shardServer(settings::SHARDPORT);
|
CNShardServer shardServer(settings::SHARDPORT);
|
||||||
|
Loading…
Reference in New Issue
Block a user