[src/ipsec-tools-0_8-branch]: src/crypto/dist/ipsec-tools/src/include-glibc/n...

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

details:   https://anonhg.NetBSD.org/src/rev/7a09e23c9b82
branches:  ipsec-tools-0_8-branch
changeset: 763343:7a09e23c9b82
user:      tteras <tteras%NetBSD.org@localhost>
date:      Thu May 23 05:44:28 2013 +0000

description:
>From Rainer Weikusat <rweikusat%mobileactivedefense.com@localhost>: Fix
SADB_X_EALG_CASTCBC definition to use system definition (which
differs at least on Linux).

diffstat:

 crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r e55849e0161f -r 7a09e23c9b82 crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h
--- a/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h   Fri Apr 12 10:04:21 2013 +0000
+++ b/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h   Thu May 23 05:44:28 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pfkeyv2.h,v 1.4 2006/09/09 16:22:08 manu Exp $ */
+/*     $NetBSD: pfkeyv2.h,v 1.4.40.1 2013/05/23 05:44:28 tteras Exp $  */
 
 #ifndef __NET_PFKEYV2_H_
 #define __NET_PFKEYV2_H_ 1
@@ -18,7 +18,11 @@
 #define SADB_X_AALG_SHA              250
 
 /* private allocations - based on RFC2407/IANA assignment */
-#define SADB_X_EALG_CAST128CBC 5       /* SADB_X_EALG_CASTCBC? == 6 */
+#ifdef SADB_X_EALG_CASTCBC
+#define SADB_X_EALG_CAST128CBC         SADB_X_EALG_CASTCBC
+#else
+#define SADB_X_EALG_CAST128CBC         5
+#endif
 #define SADB_X_EALG_RIJNDAELCBC                SADB_X_EALG_AESCBC
 #define SADB_X_EALG_AES                        SADB_X_EALG_AESCBC