This commit is contained in:
Love Hornquist Astrand
2010-10-27 21:13:47 -07:00
parent e334f05ab5
commit c71fe8f2cd

View File

@@ -273,7 +273,7 @@ client_mschapv2(const void *server_nonce, size_t snoncelen,
const char *password)
{
EVP_MD_CTX *hctx, *ctx;
unsigned char md[SHA_DIGEST_LENGTH], challange[SHA_DIGEST_LENGTH];
unsigned char md[SHA_DIGEST_LENGTH], challenge[SHA_DIGEST_LENGTH];
unsigned char hmd[MD4_DIGEST_LENGTH];
struct ntlm_buf answer;
int i, len, ret;
@@ -325,11 +325,11 @@ client_mschapv2(const void *server_nonce, size_t snoncelen,
EVP_DigestUpdate(ctx, client_nonce, cnoncelen);
EVP_DigestUpdate(ctx, server_nonce, snoncelen);
EVP_DigestUpdate(ctx, username, strlen(username));
EVP_DigestFinal_ex(ctx, challange, NULL);
EVP_DigestFinal_ex(ctx, challenge, NULL);
EVP_DigestInit_ex(ctx, EVP_sha1(), NULL);
EVP_DigestUpdate(ctx, md, sizeof(md));
EVP_DigestUpdate(ctx, challange, 8);
EVP_DigestUpdate(ctx, challenge, 8);
EVP_DigestUpdate(ctx, ms_chap_v2_magic2, sizeof(ms_chap_v2_magic2));
EVP_DigestFinal_ex(ctx, md, NULL);
@@ -433,7 +433,7 @@ ntlm_server_init(struct ntlm_server_init_options *opt,
krb5_error_code ret;
krb5_ntlm ntlm;
struct ntlm_type2 type2;
krb5_data challange, opaque;
krb5_data challenge, opaque;
struct ntlm_buf data;
char *s;
@@ -457,14 +457,14 @@ ntlm_server_init(struct ntlm_server_init_options *opt,
*
*/
ret = krb5_ntlm_init_get_challange(context, ntlm, &challange);
ret = krb5_ntlm_init_get_challange(context, ntlm, &challenge);
if (ret)
krb5_err(context, 1, ret, "krb5_ntlm_init_get_challange");
if (challange.length != sizeof(type2.challange))
krb5_errx(context, 1, "ntlm challange have wrong length");
memcpy(type2.challange, challange.data, sizeof(type2.challange));
krb5_data_free(&challange);
if (challenge.length != sizeof(type2.challenge))
krb5_errx(context, 1, "ntlm challenge have wrong length");
memcpy(type2.challenge, challenge.data, sizeof(type2.challenge));
krb5_data_free(&challenge);
ret = krb5_ntlm_init_get_flags(context, ntlm, &type2.flags);
if (ret)