summaryrefslogtreecommitdiffstats
path: root/sys/geom
diff options
context:
space:
mode:
authorjb <jb@FreeBSD.org>2007-11-19 08:59:32 +0000
committerjb <jb@FreeBSD.org>2007-11-19 08:59:32 +0000
commit1785efbd759b3fd462c1d32f18f268e8c9d5e9fa (patch)
tree8e5e9fd08672611f14cf2eed3ef8c05dd5fca7f8 /sys/geom
parentec0f8069c41d6962d816d1d0cd0f4eac1877e470 (diff)
downloadFreeBSD-src-1785efbd759b3fd462c1d32f18f268e8c9d5e9fa.zip
FreeBSD-src-1785efbd759b3fd462c1d32f18f268e8c9d5e9fa.tar.gz
On some arches, openssl is built with OPENSSL_NO_CAMELLIA, so the
code here needs to depend on that too.
Diffstat (limited to 'sys/geom')
-rw-r--r--sys/geom/eli/g_eli_crypto.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/geom/eli/g_eli_crypto.c b/sys/geom/eli/g_eli_crypto.c
index c26b367..b247efc 100644
--- a/sys/geom/eli/g_eli_crypto.c
+++ b/sys/geom/eli/g_eli_crypto.c
@@ -158,6 +158,7 @@ g_eli_crypto_cipher(u_int algo, int enc, u_char *data, size_t datasize,
case CRYPTO_BLF_CBC:
type = EVP_bf_cbc();
break;
+#ifndef OPENSSL_NO_CAMELLIA
case CRYPTO_CAMELLIA_CBC:
switch (keysize) {
case 128:
@@ -173,6 +174,7 @@ g_eli_crypto_cipher(u_int algo, int enc, u_char *data, size_t datasize,
return (EINVAL);
}
break;
+#endif
case CRYPTO_3DES_CBC:
type = EVP_des_ede3_cbc();
break;
OpenPOWER on IntegriCloud