Module Name: src
Committed By: tteras
Date: Thu May 23 05:44:29 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/include-glibc/net
[ipsec-tools-0_8-branch]:
pfkeyv2.h
Log Message:
>From Rainer Weikusat <rweiku...@mobileactivedefense.com>: Fix
SADB_X_EALG_CASTCBC definition to use system definition (which
differs at least on Linux).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.40.1 \
src/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h
diff -u src/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h:1.4 src/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h:1.4.40.1
--- src/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h:1.4 Sat Sep 9 16:22:08 2006
+++ src/crypto/dist/ipsec-tools/src/include-glibc/net/pfkeyv2.h Thu May 23 05:44:28 2013
@@ -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
