diff options
| author | gnn <gnn@FreeBSD.org> | 2007-05-09 19:37:02 +0000 |
|---|---|---|
| committer | gnn <gnn@FreeBSD.org> | 2007-05-09 19:37:02 +0000 |
| commit | 38b76f06232a188e2b053370458b6901b745948b (patch) | |
| tree | ab6a97da261f87bb2e97c008d467da3311010b9e /secure | |
| parent | 4941ee4a2accc1d1a5d38148ec1378487b9e1cf0 (diff) | |
| download | FreeBSD-src-38b76f06232a188e2b053370458b6901b745948b.zip FreeBSD-src-38b76f06232a188e2b053370458b6901b745948b.tar.gz | |
Integrate the Camellia Block Cipher. For more information see RFC 4132
and its bibliography.
Submitted by: Tomoyuki Okazaki <okazaki at kick dot gr dot jp>
MFC after: 1 month
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 11 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 2 | ||||
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-amd64.h | 4 | ||||
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-i386.h | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index e5a6f8d..9a0c7f7 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -95,6 +95,13 @@ SRCS+= c_enc.c .endif INCS+= cast.h +# camellia +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +SRCS+= camellia.c cmll_cbc.c cmll_cfb.c cmll_ctr.c cmll_ecb.c \ + cmll_misc.c cmll_ofb.c +INCS+= camellia.h +.endif + # comp SRCS+= c_rle.c c_zlib.c comp_err.c comp_lib.c INCS+= comp.h @@ -164,6 +171,9 @@ SRCS+= bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \ m_mdc2.c m_null.c m_ripemd.c m_sha.c m_sha1.c names.c \ openbsd_hw.c p5_crpt.c p5_crpt2.c p_dec.c p_enc.c p_lib.c \ p_open.c p_seal.c p_sign.c p_verify.c +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +SRCS+= e_camellia.c +.endif INCS+= evp.h # fips @@ -381,6 +391,7 @@ _ideapath= ${LCRYPTO_SRC}/crypto/idea ${LCRYPTO_SRC}/crypto/bn \ ${LCRYPTO_SRC}/crypto/buffer \ ${LCRYPTO_SRC}/crypto/cast \ + ${LCRYPTO_SRC}/crypto/camellia \ ${LCRYPTO_SRC}/crypto/comp \ ${LCRYPTO_SRC}/crypto/conf \ ${LCRYPTO_SRC}/crypto/des \ diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 5ca8a2d..ad17d85 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -13,7 +13,7 @@ CFLAGS+= -DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H CFLAGS+= -DOPENSSL_NO_IDEA .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" CFLAGS+= -DL_ENDIAN .endif diff --git a/secure/lib/libcrypto/opensslconf-amd64.h b/secure/lib/libcrypto/opensslconf-amd64.h index fac542f..cc0dde1 100644 --- a/secure/lib/libcrypto/opensslconf-amd64.h +++ b/secure/lib/libcrypto/opensslconf-amd64.h @@ -5,10 +5,6 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND -/* Disabled by default in OpenSSL 0.9.8. */ -#ifndef OPENSSL_NO_CAMELLIA -# define OPENSSL_NO_CAMELLIA -#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP diff --git a/secure/lib/libcrypto/opensslconf-i386.h b/secure/lib/libcrypto/opensslconf-i386.h index ff53f1c..f8ecc65 100644 --- a/secure/lib/libcrypto/opensslconf-i386.h +++ b/secure/lib/libcrypto/opensslconf-i386.h @@ -5,10 +5,6 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND -/* Disabled by default in OpenSSL 0.9.8. */ -#ifndef OPENSSL_NO_CAMELLIA -# define OPENSSL_NO_CAMELLIA -#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP |
