diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2011-03-14 23:06:40 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2011-03-14 23:53:46 +0100 |
commit | 431853c84644c02e6bff1b325af5e94d3b1eacc6 (patch) | |
tree | 7206df22625034211ab120c590bb81792fac3d28 /source4/heimdal/lib/krb5/crypto-evp.c | |
parent | 8dfa224c1350a9cb3a2d35fae7721bebecfe7934 (diff) | |
download | samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.tar.gz samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.tar.bz2 samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.zip |
Merge new lorikeet heimdal, revision 85ed7247f515770c73b1f1ced1739f6ce19d75d2
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon Mar 14 23:53:46 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/heimdal/lib/krb5/crypto-evp.c')
-rw-r--r-- | source4/heimdal/lib/krb5/crypto-evp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source4/heimdal/lib/krb5/crypto-evp.c b/source4/heimdal/lib/krb5/crypto-evp.c index 69d1e2679d..3f9cd57bbc 100644 --- a/source4/heimdal/lib/krb5/crypto-evp.c +++ b/source4/heimdal/lib/krb5/crypto-evp.c @@ -35,10 +35,10 @@ void _krb5_evp_schedule(krb5_context context, - struct key_type *kt, - struct key_data *kd) + struct _krb5_key_type *kt, + struct _krb5_key_data *kd) { - struct evp_schedule *key = kd->schedule->data; + struct _krb5_evp_schedule *key = kd->schedule->data; const EVP_CIPHER *c = (*kt->evp)(); EVP_CIPHER_CTX_init(&key->ectx); @@ -49,23 +49,23 @@ _krb5_evp_schedule(krb5_context context, } void -_krb5_evp_cleanup(krb5_context context, struct key_data *kd) +_krb5_evp_cleanup(krb5_context context, struct _krb5_key_data *kd) { - struct evp_schedule *key = kd->schedule->data; + struct _krb5_evp_schedule *key = kd->schedule->data; EVP_CIPHER_CTX_cleanup(&key->ectx); EVP_CIPHER_CTX_cleanup(&key->dctx); } krb5_error_code _krb5_evp_encrypt(krb5_context context, - struct key_data *key, + struct _krb5_key_data *key, void *data, size_t len, krb5_boolean encryptp, int usage, void *ivec) { - struct evp_schedule *ctx = key->schedule->data; + struct _krb5_evp_schedule *ctx = key->schedule->data; EVP_CIPHER_CTX *c; c = encryptp ? &ctx->ectx : &ctx->dctx; if (ivec == NULL) { @@ -89,7 +89,7 @@ static const unsigned char zero_ivec[EVP_MAX_BLOCK_LENGTH] = { 0 }; krb5_error_code _krb5_evp_encrypt_cts(krb5_context context, - struct key_data *key, + struct _krb5_key_data *key, void *data, size_t len, krb5_boolean encryptp, @@ -97,7 +97,7 @@ _krb5_evp_encrypt_cts(krb5_context context, void *ivec) { size_t i, blocksize; - struct evp_schedule *ctx = key->schedule->data; + struct _krb5_evp_schedule *ctx = key->schedule->data; char tmp[EVP_MAX_BLOCK_LENGTH], ivec2[EVP_MAX_BLOCK_LENGTH]; EVP_CIPHER_CTX *c; unsigned char *p; |