mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 10:52:46 +00:00
Move half of the Challenge Hash stuff.
This commit is contained in:
@ -282,49 +282,6 @@ void CryptCreateRandomSeed (
|
||||
}
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void CryptHashPassword (
|
||||
const wchar_t username[],
|
||||
const wchar_t password[],
|
||||
ShaDigest * namePassHash
|
||||
) {
|
||||
unsigned passlen = StrLen(password);
|
||||
unsigned userlen = StrLen(username);
|
||||
|
||||
wchar_t * buffer = (wchar_t*)malloc(sizeof(wchar_t) * (passlen + userlen));
|
||||
StrCopy(buffer, password, passlen);
|
||||
StrCopy(buffer + passlen, username, userlen);
|
||||
StrLower(buffer + passlen); // lowercase the username
|
||||
|
||||
CryptDigest(
|
||||
kCryptSha,
|
||||
namePassHash,
|
||||
(userlen + passlen) * sizeof(buffer[0]),
|
||||
buffer
|
||||
);
|
||||
|
||||
free(buffer);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void CryptHashPasswordChallenge (
|
||||
unsigned clientChallenge,
|
||||
unsigned serverChallenge,
|
||||
const ShaDigest & namePassHash,
|
||||
ShaDigest * challengeHash
|
||||
) {
|
||||
#pragma pack(push, 1)
|
||||
struct {
|
||||
uint32_t clientChallenge;
|
||||
uint32_t serverChallenge;
|
||||
ShaDigest namePassHash;
|
||||
} buffer;
|
||||
#pragma pack(pop)
|
||||
buffer.clientChallenge = clientChallenge;
|
||||
buffer.serverChallenge = serverChallenge;
|
||||
buffer.namePassHash = namePassHash;
|
||||
CryptDigest(kCryptSha, challengeHash, sizeof(buffer), &buffer);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void CryptCreateFastWeakChallenge (
|
||||
|
@ -124,19 +124,6 @@ void CryptCreateRandomSeed (
|
||||
uint8_t * data
|
||||
);
|
||||
|
||||
void CryptHashPassword (
|
||||
const wchar_t username[],
|
||||
const wchar_t password[],
|
||||
ShaDigest * namePassHash
|
||||
);
|
||||
|
||||
void CryptHashPasswordChallenge (
|
||||
unsigned clientChallenge,
|
||||
unsigned serverChallenge,
|
||||
const ShaDigest & namePassHash,
|
||||
ShaDigest * challengeHash
|
||||
);
|
||||
|
||||
void CryptCreateFastWeakChallenge (
|
||||
unsigned * challenge,
|
||||
unsigned val1,
|
||||
|
Reference in New Issue
Block a user