Skip to content

Increase password padding #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kw217 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Increase password padding #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions v380/v380.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct TCommandReq {
uint32_t deviceId;
char hostDateTime[32]; // optional - maybe related to unk1/2, on v380 pc this is a domain name
char username[32];
char password[32]; // consists of randomkey:password
char password[64]; // consists of randomkey:password
} login;
struct {
uint32_t deviceId; // 4: +292
Expand Down Expand Up @@ -126,7 +126,7 @@ void GeneratePassword(std::vector<uint8_t>& output, const std::string& password)
const char* staticKey = "macrovideo+*#!^@";

std::vector<uint8_t> paddedPassword;
size_t pad = AES_BLOCKLEN - (password.size() % AES_BLOCKLEN);
size_t pad = 3 * AES_BLOCKLEN - (password.size() % AES_BLOCKLEN);
paddedPassword.resize(password.size() + pad);
memcpy_s(paddedPassword.data(), paddedPassword.size(), password.c_str(), password.size());

Expand Down Expand Up @@ -363,17 +363,17 @@ int main(int argc, const char* argv[])
std::vector<uint8_t> pw;
GeneratePassword(pw, password);

buf.resize(256, 0);
buf.resize(520, 0);
TCommandReq* req = reinterpret_cast<TCommandReq*>(buf.data());
TLoginResp resp;

req->command = 1167;
req->u.login.deviceId = stoi(id);
req->u.login.unknown1 = 1022;
req->u.login.unknown2 = 2;
req->u.login.unknown2 = 31;
req->u.login.unknown3 = 1;
memcpy_s(req->u.login.username, 32, username.c_str(), username.size());
memcpy_s(req->u.login.password, 32, pw.data(), pw.size());
memcpy_s(req->u.login.password, 64, pw.data(), pw.size());

socketAuth.Send(buf);
socketAuth.Recv(buf, 256, 5000);
Expand Down