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-null.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-null.c')
| -rw-r--r-- | source4/heimdal/lib/krb5/crypto-null.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/heimdal/lib/krb5/crypto-null.c b/source4/heimdal/lib/krb5/crypto-null.c index 3a5c6b6cb3..69d0e7c34e 100644 --- a/source4/heimdal/lib/krb5/crypto-null.c +++ b/source4/heimdal/lib/krb5/crypto-null.c @@ -37,7 +37,7 @@ #define DES3_OLD_ENCTYPE 1 #endif -static struct key_type keytype_null = { +static struct _krb5_key_type keytype_null = { KEYTYPE_NULL, "null", 0, @@ -50,7 +50,7 @@ static struct key_type keytype_null = { static krb5_error_code NONE_checksum(krb5_context context, - struct key_data *key, + struct _krb5_key_data *key, const void *data, size_t len, unsigned usage, @@ -59,7 +59,7 @@ NONE_checksum(krb5_context context, return 0; } -struct checksum_type _krb5_checksum_none = { +struct _krb5_checksum_type _krb5_checksum_none = { CKSUMTYPE_NONE, "none", 1, @@ -71,7 +71,7 @@ struct checksum_type _krb5_checksum_none = { static krb5_error_code NULL_encrypt(krb5_context context, - struct key_data *key, + struct _krb5_key_data *key, void *data, size_t len, krb5_boolean encryptp, @@ -81,7 +81,7 @@ NULL_encrypt(krb5_context context, return 0; } -struct encryption_type _krb5_enctype_null = { +struct _krb5_encryption_type _krb5_enctype_null = { ETYPE_NULL, "null", 1, |