diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-09-07 17:54:15 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-09-07 17:54:15 +0000 |
| commit | 140e24e9149eabe8793d439a7d386c78ecb00fab (patch) | |
| tree | fccb86dad4bd892ba5be6660c91a6222992bdf7f /src/lib/crypto/openssl/camellia | |
| parent | 97b6d19bc89c8eb6754225875890e0f2dbdd929d (diff) | |
| download | krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.tar.gz krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.tar.xz krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.zip | |
Merge the camellia-ccm branch to trunk. Since there are no IANA
assignments for Camellia-CCM enctypes or cksumtypes yet, they are
disabled in a default build. They can be made available by defining
(via CPPFLAGS) local-use enctype numbers for the enctypes and
cksumtypes.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24295 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/openssl/camellia')
| -rw-r--r-- | src/lib/crypto/openssl/camellia/Makefile.in | 40 | ||||
| -rw-r--r-- | src/lib/crypto/openssl/camellia/deps | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/src/lib/crypto/openssl/camellia/Makefile.in b/src/lib/crypto/openssl/camellia/Makefile.in new file mode 100644 index 0000000000..5e36d50702 --- /dev/null +++ b/src/lib/crypto/openssl/camellia/Makefile.in @@ -0,0 +1,40 @@ +# Nothing here! But we can't remove this directory as the build +# system currently assumes that all modules have the same directory +# structure. + +mydir=lib/crypto/openssl/camellia +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk -I$(srcdir)/../../../../include +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=camellia +##DOS##OBJFILE=..\$(OUTPRE)camellia.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS= + +OBJS= + +SRCS= + + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +check:: + + +clean-unix:: clean-libobjs + +clean:: + +@libobj_frag@ + diff --git a/src/lib/crypto/openssl/camellia/deps b/src/lib/crypto/openssl/camellia/deps new file mode 100644 index 0000000000..2feac3c9d3 --- /dev/null +++ b/src/lib/crypto/openssl/camellia/deps @@ -0,0 +1 @@ +# No dependencies here. |