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-des-common.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-des-common.c')
| -rw-r--r-- | source4/heimdal/lib/krb5/crypto-des-common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/heimdal/lib/krb5/crypto-des-common.c b/source4/heimdal/lib/krb5/crypto-des-common.c index 82d344f28f..f8313952dc 100644 --- a/source4/heimdal/lib/krb5/crypto-des-common.c +++ b/source4/heimdal/lib/krb5/crypto-des-common.c @@ -57,12 +57,12 @@ _krb5_xor (DES_cblock *key, const unsigned char *b) krb5_error_code _krb5_des_checksum(krb5_context context, const EVP_MD *evp_md, - struct key_data *key, + struct _krb5_key_data *key, const void *data, size_t len, Checksum *cksum) { - struct evp_schedule *ctx = key->schedule->data; + struct _krb5_evp_schedule *ctx = key->schedule->data; EVP_MD_CTX *m; DES_cblock ivec; unsigned char *p = cksum->checksum.data; @@ -90,12 +90,12 @@ _krb5_des_checksum(krb5_context context, krb5_error_code _krb5_des_verify(krb5_context context, const EVP_MD *evp_md, - struct key_data *key, + struct _krb5_key_data *key, const void *data, size_t len, Checksum *C) { - struct evp_schedule *ctx = key->schedule->data; + struct _krb5_evp_schedule *ctx = key->schedule->data; EVP_MD_CTX *m; unsigned char tmp[24]; unsigned char res[16]; @@ -130,7 +130,7 @@ _krb5_des_verify(krb5_context context, static krb5_error_code RSA_MD5_checksum(krb5_context context, - struct key_data *key, + struct _krb5_key_data *key, const void *data, size_t len, unsigned usage, @@ -141,7 +141,7 @@ RSA_MD5_checksum(krb5_context context, return 0; } -struct checksum_type _krb5_checksum_rsa_md5 = { +struct _krb5_checksum_type _krb5_checksum_rsa_md5 = { CKSUMTYPE_RSA_MD5, "rsa-md5", 64, |