Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/sys pullup (approved by releng-1-5)
details: https://anonhg.NetBSD.org/src/rev/ab281d861b29
branches: netbsd-1-5
changeset: 489672:ab281d861b29
user: itojun <itojun%NetBSD.org@localhost>
date: Wed Oct 04 17:39:35 2000 +0000
description:
pullup (approved by releng-1-5)
rijndael-cbc kernel support.
sys/crypto/rijndael/* add tag for latest
sys/netinet6/esp_rijndael.[ch] add tag for latest
sys/netinet6/esp_core.c 1.9 -> 1.11
sys/conf/files 1.389 -> 1.390, 1.395 -> 1.396
sys/net/pfkeyv2.h 1.7 -> 1.11
diffstat:
sys/conf/files | 24 +++++++++++-------------
sys/net/pfkeyv2.h | 15 +++++++--------
sys/netinet6/esp_core.c | 23 ++++++++++++++++++++++-
3 files changed, 40 insertions(+), 22 deletions(-)
diffs (145 lines):
diff -r 02dde4b0dd90 -r ab281d861b29 sys/conf/files
--- a/sys/conf/files Wed Oct 04 17:07:44 2000 +0000
+++ b/sys/conf/files Wed Oct 04 17:39:35 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.373.2.5 2000/08/11 18:16:46 thorpej Exp $
+# $NetBSD: files,v 1.373.2.6 2000/10/04 17:39:36 itojun Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -556,16 +556,13 @@
file coda/coda_vfsops.c coda
file coda/coda_vnops.c coda
file crypto/arc4/arc4.c wlan
-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/cast128/cast128_cbc.c ipsec & ipsec_esp
+file crypto/rijndael/rijndael-alg-fst.c ipsec & ipsec_esp
+file crypto/rijndael/rijndael-api-fst.c ipsec & ipsec_esp
file ddb/db_access.c ddb | kgdb
file ddb/db_aout.c ddb
file ddb/db_break.c ddb
@@ -871,13 +868,13 @@
file netinet/ip_proxy.c ipfilter
file netinet/ip_state.c ipfilter
file netinet/raw_ip.c inet
-file netinet/tcp_debug.c inet
-file netinet/tcp_input.c inet
-file netinet/tcp_output.c inet
-file netinet/tcp_subr.c inet
-file netinet/tcp_timer.c inet
-file netinet/tcp_usrreq.c inet
-file netinet/udp_usrreq.c inet
+file netinet/tcp_debug.c inet | inet6
+file netinet/tcp_input.c inet | inet6
+file netinet/tcp_output.c inet | inet6
+file netinet/tcp_subr.c inet | inet6
+file netinet/tcp_timer.c inet | inet6
+file netinet/tcp_usrreq.c inet | inet6
+file netinet/udp_usrreq.c inet | inet6
file netinet6/ah_core.c ipsec
file netinet6/ah_input.c ipsec
file netinet6/ah_output.c ipsec
@@ -885,6 +882,7 @@
file netinet6/esp_core.c ipsec & ipsec_esp
file netinet6/esp_output.c ipsec & ipsec_esp
file netinet6/esp_input.c ipsec & ipsec_esp
+file netinet6/esp_rijndael.c ipsec & ipsec_esp
file netinet6/frag6.c inet6
file netinet6/icmp6.c inet6
file netinet6/in6.c inet6
diff -r 02dde4b0dd90 -r ab281d861b29 sys/net/pfkeyv2.h
--- a/sys/net/pfkeyv2.h Wed Oct 04 17:07:44 2000 +0000
+++ b/sys/net/pfkeyv2.h Wed Oct 04 17:39:35 2000 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: pfkeyv2.h,v 1.5.2.2 2000/07/25 04:24:45 itojun Exp $ */
-/* $KAME: pfkeyv2.h,v 1.18 2000/07/15 16:07:47 itojun Exp $ */
+/* $NetBSD: pfkeyv2.h,v 1.5.2.3 2000/10/04 17:39:36 itojun Exp $ */
+/* $KAME: pfkeyv2.h,v 1.23 2000/10/03 21:38:21 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -313,13 +313,12 @@
#define SADB_EALG_DESCBC 2
#define SADB_EALG_3DESCBC 3
#define SADB_EALG_NULL 11
-#define SADB_EALG_MAX 11
-/* private allocations - based on RFC2407 */
-#if 0 /*disabled due to possible patent issue*/
-#define SADB_X_EALG_RC5CBC 4
-#endif
+#define SADB_EALG_MAX 12
+/* private allocations - based on RFC2407/IANA assignment */
#define SADB_X_EALG_CAST128CBC 6
-#define SADB_X_EALG_BLOWFISHCBC 7
+#define SADB_X_EALG_BLOWFISHCBC 7
+#define SADB_X_EALG_RIJNDAELCBC 12
+#define SADB_X_EALG_AES 12
/* private allocations should use 249-255 (RFC2407) */
#if 1 /*nonstandard */
diff -r 02dde4b0dd90 -r ab281d861b29 sys/netinet6/esp_core.c
--- a/sys/netinet6/esp_core.c Wed Oct 04 17:07:44 2000 +0000
+++ b/sys/netinet6/esp_core.c Wed Oct 04 17:39:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_core.c,v 1.1.1.1.2.4 2000/09/29 06:42:42 itojun Exp $ */
+/* $NetBSD: esp_core.c,v 1.1.1.1.2.5 2000/10/04 17:39:35 itojun Exp $ */
/* $KAME: esp_core.c,v 1.44 2000/09/20 18:15:22 itojun Exp $ */
/*
@@ -58,6 +58,7 @@
#include <netinet6/ipsec.h>
#include <netinet6/ah.h>
#include <netinet6/esp.h>
+#include <netinet6/esp_rijndael.h>
#include <net/pfkeyv2.h>
#include <netkey/keydb.h>
#include <crypto/des/des.h>
@@ -136,6 +137,11 @@
esp_common_ivlen, esp_cbc_decrypt,
esp_cbc_encrypt, esp_cast128_schedule,
esp_cast128_blockdecrypt, esp_cast128_blockencrypt, },
+ { 16, 16, esp_cbc_mature, 128, 256, esp_rijndael_schedlen,
+ "rijndael-cbc",
+ esp_common_ivlen, esp_cbc_decrypt,
+ esp_cbc_encrypt, esp_rijndael_schedule,
+ esp_rijndael_blockdecrypt, esp_rijndael_blockencrypt },
};
const struct esp_algorithm *
@@ -154,6 +160,10 @@
return &esp_algorithms[3];
case SADB_X_EALG_CAST128CBC:
return &esp_algorithms[4];
+#ifdef SADB_X_EALG_RIJNDAELCBC
+ case SADB_X_EALG_RIJNDAELCBC:
+ return &esp_algorithms[5];
+#endif
default:
return NULL;
}
@@ -413,6 +423,17 @@
case SADB_X_EALG_BLOWFISHCBC:
case SADB_X_EALG_CAST128CBC:
break;
+#ifdef SADB_X_EALG_RIJNDAELCBC
+ case SADB_X_EALG_RIJNDAELCBC:
+#endif
+ /* allows specific key sizes only */
+ if (!(keylen == 128 || keylen == 192 || keylen == 256)) {
+ ipseclog((LOG_ERR,
+ "esp_cbc_mature %s: invalid key length %d.\n",
+ algo->name, keylen));
+ return 1;
+ }
+ break;
}
return 0;
Home |
Main Index |
Thread Index |
Old Index