svn rev #21780: trunk/src/lib/crypto/ arcfour/ des/ dk/ enc_provider/ keyhash_provider/ ...
raeburn@MIT.EDU
raeburn at MIT.EDU
Thu Jan 22 19:46:48 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=21780
Commit By: raeburn
Log Message:
Include cksumtypes.h from aead.h to get struct krb5_cksumtypes (moved
in rev 21753).
Protect cksumtypes.h from multiple inclusions.
Update dependencies.
Changed Files:
U trunk/src/lib/crypto/aead.h
U trunk/src/lib/crypto/arcfour/deps
U trunk/src/lib/crypto/cksumtypes.h
U trunk/src/lib/crypto/deps
U trunk/src/lib/crypto/des/deps
U trunk/src/lib/crypto/dk/deps
U trunk/src/lib/crypto/enc_provider/deps
U trunk/src/lib/crypto/keyhash_provider/deps
U trunk/src/lib/crypto/raw/deps
Modified: trunk/src/lib/crypto/aead.h
===================================================================
--- trunk/src/lib/crypto/aead.h 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/aead.h 2009-01-23 00:46:46 UTC (rev 21780)
@@ -1,7 +1,7 @@
/*
* lib/crypto/aead.h
*
- * Copyright 2008 by the Massachusetts Institute of Technology.
+ * Copyright 2008, 2009 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
* Export of this software from the United States of America may
@@ -25,6 +25,7 @@
*/
#include "k5-int.h"
+#include "cksumtypes.h"
/* AEAD helpers */
Modified: trunk/src/lib/crypto/arcfour/deps
===================================================================
--- trunk/src/lib/crypto/arcfour/deps 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/arcfour/deps 2009-01-23 00:46:46 UTC (rev 21780)
@@ -21,7 +21,7 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
$(SRCTOP)/include/socket-utils.h $(srcdir)/../aead.h \
- arcfour-int.h arcfour.h arcfour_aead.c
+ $(srcdir)/../cksumtypes.h arcfour-int.h arcfour.h arcfour_aead.c
arcfour_s2k.so arcfour_s2k.po $(OUTPRE)arcfour_s2k.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
Modified: trunk/src/lib/crypto/cksumtypes.h
===================================================================
--- trunk/src/lib/crypto/cksumtypes.h 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/cksumtypes.h 2009-01-23 00:46:46 UTC (rev 21780)
@@ -24,6 +24,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#ifndef CKSUMTYPES_H
+#define CKSUMTYPES_H
#include "k5-int.h"
struct krb5_cksumtypes {
@@ -57,3 +59,4 @@
extern const struct krb5_cksumtypes krb5_cksumtypes_list[];
extern const unsigned int krb5_cksumtypes_length;
+#endif
Modified: trunk/src/lib/crypto/deps
===================================================================
--- trunk/src/lib/crypto/deps 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/deps 2009-01-23 00:46:46 UTC (rev 21780)
@@ -85,8 +85,8 @@
$(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h aead.h crypto_length.c \
- etypes.h
+ $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \
+ crypto_length.c etypes.h
crypto_libinit.so crypto_libinit.po $(OUTPRE)crypto_libinit.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -116,7 +116,7 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- aead.h decrypt.c etypes.h
+ aead.h cksumtypes.h decrypt.c etypes.h
decrypt_iov.so decrypt_iov.po $(OUTPRE)decrypt_iov.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -126,8 +126,8 @@
$(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h aead.h decrypt_iov.c \
- etypes.h
+ $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \
+ decrypt_iov.c etypes.h
encrypt.so encrypt.po $(OUTPRE)encrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -137,7 +137,7 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- aead.h encrypt.c etypes.h
+ aead.h cksumtypes.h encrypt.c etypes.h
encrypt_iov.so encrypt_iov.po $(OUTPRE)encrypt_iov.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -157,8 +157,8 @@
$(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h aead.h encrypt_length.c \
- etypes.h
+ $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \
+ encrypt_length.c etypes.h
enctype_compare.so enctype_compare.po $(OUTPRE)enctype_compare.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -203,7 +203,7 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- aead.h hmac.c
+ aead.h cksumtypes.h hmac.c
keyblocks.so keyblocks.po $(OUTPRE)keyblocks.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
Modified: trunk/src/lib/crypto/des/deps
===================================================================
--- trunk/src/lib/crypto/des/deps 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/des/deps 2009-01-23 00:46:46 UTC (rev 21780)
@@ -30,7 +30,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../aead.h d3_aead.c des_int.h f_tables.h
+ $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h d3_aead.c \
+ des_int.h f_tables.h
d3_kysched.so d3_kysched.po $(OUTPRE)d3_kysched.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -50,7 +51,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../aead.h des_int.h f_aead.c f_tables.h
+ $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h des_int.h \
+ f_aead.c f_tables.h
f_cbc.so f_cbc.po $(OUTPRE)f_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
Modified: trunk/src/lib/crypto/dk/deps
===================================================================
--- trunk/src/lib/crypto/dk/deps 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/dk/deps 2009-01-23 00:46:46 UTC (rev 21780)
@@ -11,7 +11,8 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
$(SRCTOP)/include/socket-utils.h $(srcdir)/../aead.h \
- $(srcdir)/../etypes.h checksum.c dk.h
+ $(srcdir)/../cksumtypes.h $(srcdir)/../etypes.h checksum.c \
+ dk.h
dk_aead.so dk_aead.po $(OUTPRE)dk_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -21,7 +22,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../aead.h dk.h dk_aead.c
+ $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h dk.h \
+ dk_aead.c
dk_decrypt.so dk_decrypt.po $(OUTPRE)dk_decrypt.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
Modified: trunk/src/lib/crypto/enc_provider/deps
===================================================================
--- trunk/src/lib/crypto/enc_provider/deps 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/enc_provider/deps 2009-01-23 00:46:46 UTC (rev 21780)
@@ -10,8 +10,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../aead.h $(srcdir)/../des/des_int.h des.c \
- enc_provider.h
+ $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h $(srcdir)/../des/des_int.h \
+ des.c enc_provider.h
des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -21,7 +21,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../aead.h $(srcdir)/../des/des_int.h des3.c
+ $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h $(srcdir)/../des/des_int.h \
+ des3.c
aes.so aes.po $(OUTPRE)aes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -32,7 +33,7 @@
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
$(srcdir)/../aead.h $(srcdir)/../aes/aes.h $(srcdir)/../aes/uitypes.h \
- aes.c enc_provider.h
+ $(srcdir)/../cksumtypes.h aes.c enc_provider.h
rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -43,4 +44,5 @@
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
$(srcdir)/../aead.h $(srcdir)/../arcfour/arcfour-int.h \
- $(srcdir)/../arcfour/arcfour.h enc_provider.h rc4.c
+ $(srcdir)/../arcfour/arcfour.h $(srcdir)/../cksumtypes.h \
+ enc_provider.h rc4.c
Modified: trunk/src/lib/crypto/keyhash_provider/deps
===================================================================
--- trunk/src/lib/crypto/keyhash_provider/deps 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/keyhash_provider/deps 2009-01-23 00:46:46 UTC (rev 21780)
@@ -44,8 +44,8 @@
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
$(SRCTOP)/include/socket-utils.h $(srcdir)/../aead.h \
$(srcdir)/../arcfour/arcfour-int.h $(srcdir)/../arcfour/arcfour.h \
- $(srcdir)/../hash_provider/hash_provider.h $(srcdir)/../md5/rsa-md5.h \
- hmac_md5.c keyhash_provider.h
+ $(srcdir)/../cksumtypes.h $(srcdir)/../hash_provider/hash_provider.h \
+ $(srcdir)/../md5/rsa-md5.h hmac_md5.c keyhash_provider.h
md5_hmac.so md5_hmac.po $(OUTPRE)md5_hmac.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
Modified: trunk/src/lib/crypto/raw/deps
===================================================================
--- trunk/src/lib/crypto/raw/deps 2009-01-22 23:37:35 UTC (rev 21779)
+++ trunk/src/lib/crypto/raw/deps 2009-01-23 00:46:46 UTC (rev 21780)
@@ -31,4 +31,4 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
$(SRCTOP)/include/socket-utils.h $(srcdir)/../aead.h \
- raw.h raw_aead.c
+ $(srcdir)/../cksumtypes.h raw.h raw_aead.c
More information about the cvs-krb5
mailing list