oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

switch to use EVP interface instead of old crypto interface

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-08-17 10:45:21 +02:00
parent e8fce1170f
commit ec01d69f73
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kdc/digest.c
View File

@@ -1333,7 +1333,7 @@ _kdc_do_digest(krb5_context context,
if (ireq.u.ntlmRequest.sessionkey) { if (ireq.u.ntlmRequest.sessionkey) {
unsigned char masterkey[MD4_DIGEST_LENGTH]; unsigned char masterkey[MD4_DIGEST_LENGTH];
RC4_KEY rc4; EVP_CIPHER_CTX rc4;
size_t len; size_t len;
if ((flags & NTLM_NEG_KEYEX) == 0) { if ((flags & NTLM_NEG_KEYEX) == 0) {
@@ -1353,12 +1353,13 @@ _kdc_do_digest(krb5_context context,
goto failed; goto failed;
} }
RC4_set_key(&rc4, sizeof(sessionkey), sessionkey);
EVP_CIPHER_CTX_init(&rc4);
RC4(&rc4, sizeof(masterkey), EVP_CipherInit_ex(&rc4, EVP_rc4(), NULL, sessionkey, NULL, 1);
ireq.u.ntlmRequest.sessionkey->data, EVP_Cipher(&rc4,
masterkey); masterkey, ireq.u.ntlmRequest.sessionkey->data,
memset(&rc4, 0, sizeof(rc4)); sizeof(masterkey));
EVP_CIPHER_CTX_cleanup(&rc4);
r.u.ntlmResponse.sessionkey = r.u.ntlmResponse.sessionkey =
malloc(sizeof(*r.u.ntlmResponse.sessionkey)); malloc(sizeof(*r.u.ntlmResponse.sessionkey));