Module Name: src
Committed By: agc
Date: Thu Nov 4 07:35:09 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: symmetric.c
Log Message:
Only include camellia cipher if openssl supports it
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.14 src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.15
--- src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c:1.14 Thu Nov 4 07:03:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c Thu Nov 4 07:35:08 2010
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: symmetric.c,v 1.14 2010/11/04 07:03:41 agc Exp $");
+__RCSID("$NetBSD: symmetric.c,v 1.15 2010/11/04 07:35:08 agc Exp $");
#endif
#include "crypto.h"
@@ -486,6 +486,7 @@
TRAILER
};
+#ifndef OPENSSL_NO_CAMELLIA
/* Camellia with 128-bit key (CAMELLIA) */
#define KEYBITS_CAMELLIA128 128
@@ -607,6 +608,7 @@
std_finish,
TRAILER
};
+#endif
static const __ops_crypt_t *
@@ -623,10 +625,12 @@
return &aes128;
case OPS_SA_AES_256:
return &aes256;
+#ifndef OPENSSL_NO_CAMELLIA
case OPS_SA_CAMELLIA_128:
return &camellia128;
case OPS_SA_CAMELLIA_256:
return &camellia256;
+#endif
case OPS_SA_TRIPLEDES:
return &tripledes;
default:
