[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib Only include camelli...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/17745f98c64c
branches:  trunk
changeset: 758408:17745f98c64c
user:      agc <agc%NetBSD.org@localhost>
date:      Thu Nov 04 07:35:08 2010 +0000

description:
Only include camellia cipher if openssl supports it

diffstat:

 crypto/external/bsd/netpgp/dist/src/lib/symmetric.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r 1102576b0c2a -r 17745f98c64c crypto/external/bsd/netpgp/dist/src/lib/symmetric.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c       Thu Nov 04 07:33:46 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/symmetric.c       Thu Nov 04 07:35:08 2010 +0000
@@ -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: