summaryrefslogtreecommitdiff
path: root/source4/heimdal/lib/krb5/crypto-pk.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-03-14 23:06:40 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-03-14 23:53:46 +0100
commit431853c84644c02e6bff1b325af5e94d3b1eacc6 (patch)
tree7206df22625034211ab120c590bb81792fac3d28 /source4/heimdal/lib/krb5/crypto-pk.c
parent8dfa224c1350a9cb3a2d35fae7721bebecfe7934 (diff)
downloadsamba-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-pk.c')
-rw-r--r--source4/heimdal/lib/krb5/crypto-pk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal/lib/krb5/crypto-pk.c b/source4/heimdal/lib/krb5/crypto-pk.c
index 21e729c9e1..eb783c8998 100644
--- a/source4/heimdal/lib/krb5/crypto-pk.c
+++ b/source4/heimdal/lib/krb5/crypto-pk.c
@@ -44,7 +44,7 @@ _krb5_pk_octetstring2key(krb5_context context,
const heim_octet_string *k_n,
krb5_keyblock *key)
{
- struct encryption_type *et = _krb5_find_enctype(type);
+ struct _krb5_encryption_type *et = _krb5_find_enctype(type);
krb5_error_code ret;
size_t keylen, offset;
void *keydata;
@@ -205,7 +205,7 @@ _krb5_pk_kdf(krb5_context context,
const Ticket *ticket,
krb5_keyblock *key)
{
- struct encryption_type *et;
+ struct _krb5_encryption_type *et;
krb5_error_code ret;
krb5_data other;
size_t keylen, offset;