From 1c9741f328dfc227f2a3490c877603e2c9f9dc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sun, 17 Aug 2008 14:07:40 +0000 Subject: [PATCH] The PRF slightly more generic git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23578 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/crypto.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/krb5/crypto.c b/lib/krb5/crypto.c index 0ac6619df..95f0a9950 100644 --- a/lib/krb5/crypto.c +++ b/lib/krb5/crypto.c @@ -2491,14 +2491,12 @@ AES_PRF(krb5_context context, krb5_abortx(context, "malloc failed"); { + const EVP_CIPHER *c = (*crypto->et->keytype->evp)(); EVP_CIPHER_CTX ctx; - unsigned char ivec[16]; - - memset(ivec, 0, sizeof(ivec)); - EVP_CIPHER_CTX_init(&ctx); - EVP_CipherInit_ex(&ctx, (*crypto->et->keytype->evp)(), - NULL, derived->keyvalue.data, ivec, 1); - EVP_Cipher(&ctx, out->data, result.checksum.data, 16); + /* XXX blksz 1 for cts, so we can't use that */ + EVP_CIPHER_CTX_init(&ctx); /* ivec all zero */ + EVP_CipherInit_ex(&ctx, c, NULL, derived->keyvalue.data, NULL, 1); + EVP_Cipher(&ctx, out->data, result.checksum.data, 16); EVP_CIPHER_CTX_cleanup(&ctx); }