diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-05-07 04:51:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:39 -0500 |
| commit | 835926c87921a0f4186a9331b6e31b2e6f1c0d90 (patch) | |
| tree | 1086d806019f4f7a86dc7b0073017a0fb876b6c2 /source4/heimdal/lib/des/aes.h | |
| parent | 7a0b65efce3669643d21a2e209d4bf2626a5e948 (diff) | |
| download | samba-835926c87921a0f4186a9331b6e31b2e6f1c0d90.tar.gz samba-835926c87921a0f4186a9331b6e31b2e6f1c0d90.tar.bz2 samba-835926c87921a0f4186a9331b6e31b2e6f1c0d90.zip | |
r15481: Update heimdal/ to match current lorikeet-heimdal.
This includes many useful upstream changes, many of which should
reduce warnings in our compile.
It also includes a change to the HDB interface, which removes the need
for Samba4/lorikeet-heimdal to deviate from upstream for hdb_fetch().
The new flags replace the old entry type enum.
(This required the rework in hdb-ldb.c included in this commit)
Andrew Bartlett
(This used to be commit ef5604b87744c89e66e4d845f45b23563754ec05)
Diffstat (limited to 'source4/heimdal/lib/des/aes.h')
| -rwxr-xr-x | source4/heimdal/lib/des/aes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal/lib/des/aes.h b/source4/heimdal/lib/des/aes.h index 8a62c6461d..3ea1c141be 100755 --- a/source4/heimdal/lib/des/aes.h +++ b/source4/heimdal/lib/des/aes.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: aes.h,v 1.5 2006/01/08 21:47:27 lha Exp $ */ +/* $Id: aes.h,v 1.6 2006/05/05 11:06:35 lha Exp $ */ #ifndef HEIM_AES_H #define HEIM_AES_H 1 @@ -54,7 +54,7 @@ #define AES_DECRYPT 0 typedef struct aes_key { - u_int32_t key[(AES_MAXNR+1)*4]; + uint32_t key[(AES_MAXNR+1)*4]; int rounds; } AES_KEY; |