Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys enable IPSEC_ESP build (still needs manual symlink).



details:   https://anonhg.NetBSD.org/src/rev/f74a99e35887
branches:  trunk
changeset: 474287:f74a99e35887
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Jul 02 19:58:27 1999 +0000

description:
enable IPSEC_ESP build (still needs manual symlink).
commit to cryptosrc-intl will follow.

diffstat:

 sys/conf/files     |  20 +++++++++-----------
 sys/netkey/key.c   |   4 +++-
 sys/netkey/keyv2.h |   6 +++++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diffs (85 lines):

diff -r 9d9ebde54019 -r f74a99e35887 sys/conf/files
--- a/sys/conf/files    Fri Jul 02 19:57:05 1999 +0000
+++ b/sys/conf/files    Fri Jul 02 19:58:27 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.294 1999/07/01 08:12:45 itojun Exp $
+#      $NetBSD: files,v 1.295 1999/07/02 19:58:29 itojun Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -581,20 +581,18 @@
 file netinet6/ipsec.c                  ipsec
 file netinet6/ah_output.c              ipsec
 file netinet6/ah_input.c               ipsec
-file netinet6/esp_output.c             ipsec & ipsec_esp
+file netinet6/esp_output.c     ipsec & ipsec_esp
 file netinet6/esp_input.c              ipsec & ipsec_esp
 file crypto/des/des_cbc.c              ipsec & ipsec_esp
 file crypto/des/des_ecb.c              ipsec & ipsec_esp
-file crypto/des/des_setkey.c           ipsec & ipsec_esp
-file crypto/des/des_3cbc.c             ipsec & ipsec_esp
-file crypto/blowfish/bf_cbc.c          ipsec & ipsec_esp
-file crypto/blowfish/bf_cbc_m.c                ipsec & ipsec_esp
-file crypto/blowfish/bf_enc.c          ipsec & ipsec_esp
-file crypto/blowfish/bf_skey.c         ipsec & ipsec_esp
-file crypto/cast128/cast128.c          ipsec & ipsec_esp
+file crypto/des/des_setkey.c   ipsec & ipsec_esp
+file crypto/des/des_3cbc.c     ipsec & ipsec_esp
+file crypto/blowfish/bf_cbc.c  ipsec & ipsec_esp
+file crypto/blowfish/bf_cbc_m.c        ipsec & ipsec_esp
+file crypto/blowfish/bf_enc.c  ipsec & ipsec_esp
+file crypto/blowfish/bf_skey.c ipsec & ipsec_esp
+file crypto/cast128/cast128.c  ipsec & ipsec_esp
 file crypto/cast128/cast128_cbc.c      ipsec & ipsec_esp
-file crypto/rc5/rc5.c                  ipsec & ipsec_esp
-file crypto/rc5/rc5_cbc.c              ipsec & ipsec_esp
 file netinet6/ipcomp_core.c            ipsec
 file netinet6/ipcomp_input.c           ipsec
 file netinet6/ipcomp_output.c          ipsec
diff -r 9d9ebde54019 -r f74a99e35887 sys/netkey/key.c
--- a/sys/netkey/key.c  Fri Jul 02 19:57:05 1999 +0000
+++ b/sys/netkey/key.c  Fri Jul 02 19:58:27 1999 +0000
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-/* KAME $Id: key.c,v 1.2 1999/07/01 08:12:59 itojun Exp $ */
+/* KAME $Id: key.c,v 1.3 1999/07/02 19:58:27 itojun Exp $ */
 
 /*
  * This code is referd to RFC 2367,
@@ -2560,7 +2560,9 @@
                case SADB_EALG_NULL:
                case SADB_EALG_BLOWFISHCBC:
                case SADB_EALG_CAST128CBC:
+#ifdef SADB_EALG_RC5CBC
                case SADB_EALG_RC5CBC:
+#endif
                        break;
                default:
                        printf("key_mature: unknown encryption algorithm.\n");
diff -r 9d9ebde54019 -r f74a99e35887 sys/netkey/keyv2.h
--- a/sys/netkey/keyv2.h        Fri Jul 02 19:57:05 1999 +0000
+++ b/sys/netkey/keyv2.h        Fri Jul 02 19:58:27 1999 +0000
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: keyv2.h,v 1.2 1999/07/01 08:13:00 itojun Exp $ */
+/* $Id: keyv2.h,v 1.3 1999/07/02 19:58:28 itojun Exp $ */
 
 /*
  * This file has been derived rfc 2367,
@@ -281,8 +281,12 @@
 #define SADB_EALG_NULL          3      /* 11 */
 #define SADB_EALG_BLOWFISHCBC   4
 #define SADB_EALG_CAST128CBC    5
+#if 0
 #define SADB_EALG_RC5CBC        6
 #define SADB_EALG_MAX           7
+#else
+#define SADB_EALG_MAX           6
+#endif
 
 #if 1  /*nonstandard */
 #define SADB_X_CALG_NONE       0



Home | Main Index | Thread Index | Old Index