summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-07-24 09:59:04 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-07-24 09:59:04 +0000
commitcf8a63ce921e613109b04585a6ac7ddb1a4ccf5c (patch)
treeccaebf84327b7eeb4b214481d45e1ae688739cc6 /sys
parentd3b27e35971d741dd22c9efcd80d37f89aa45d99 (diff)
conform to RFC2367 on SADB_xx naming (local name must be prefixed with
SADB_X_xx)
Diffstat (limited to 'sys')
-rw-r--r--sys/net/pfkeyv2.c18
-rw-r--r--sys/net/pfkeyv2.h14
-rw-r--r--sys/net/pfkeyv2_convert.c10
-rw-r--r--sys/netinet/ip_ah.c10
-rw-r--r--sys/netinet/ip_esp.c10
5 files changed, 31 insertions, 31 deletions
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c
index 8011b81de7c..adb21e2f068 100644
--- a/sys/net/pfkeyv2.c
+++ b/sys/net/pfkeyv2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.c,v 1.88 2003/07/24 08:03:19 itojun Exp $ */
+/* $OpenBSD: pfkeyv2.c,v 1.89 2003/07/24 09:59:02 itojun Exp $ */
/*
* @(#)COPYRIGHT 1.1 (NRL) 17 January 1995
@@ -105,10 +105,10 @@ static const struct sadb_alg ealgs[] = {
static const struct sadb_alg aalgs[] = {
{ SADB_AALG_SHA1HMAC, 0, 160, 160 },
{ SADB_AALG_MD5HMAC, 0, 128, 128 },
- { SADB_AALG_RIPEMD160HMAC, 0, 160, 160 },
- { SADB_AALG_SHA2_256, 0, 256, 256 },
- { SADB_AALG_SHA2_384, 0, 384, 384 },
- { SADB_AALG_SHA2_512, 0, 512, 512 }
+ { SADB_X_AALG_RIPEMD160HMAC, 0, 160, 160 },
+ { SADB_X_AALG_SHA2_256, 0, 256, 256 },
+ { SADB_X_AALG_SHA2_384, 0, 384, 384 },
+ { SADB_X_AALG_SHA2_512, 0, 512, 512 }
};
static const struct sadb_alg calgs[] = {
@@ -1945,7 +1945,7 @@ pfkeyv2_acquire(struct ipsec_policy *ipo, union sockaddr_union *gw,
sadb_comb->sadb_comb_auth_maxbits = 160;
} else if (!strncasecmp(ipsec_def_auth, "hmac-ripemd160",
sizeof("hmac_ripemd160"))) {
- sadb_comb->sadb_comb_auth = SADB_AALG_RIPEMD160HMAC;
+ sadb_comb->sadb_comb_auth = SADB_X_AALG_RIPEMD160HMAC;
sadb_comb->sadb_comb_auth_minbits = 160;
sadb_comb->sadb_comb_auth_maxbits = 160;
} else if (!strncasecmp(ipsec_def_auth, "hmac-md5",
@@ -1955,17 +1955,17 @@ pfkeyv2_acquire(struct ipsec_policy *ipo, union sockaddr_union *gw,
sadb_comb->sadb_comb_auth_maxbits = 128;
} else if (!strncasecmp(ipsec_def_auth, "hmac-sha2-256",
sizeof("hmac-sha2-256"))) {
- sadb_comb->sadb_comb_auth = SADB_AALG_SHA2_256;
+ sadb_comb->sadb_comb_auth = SADB_X_AALG_SHA2_256;
sadb_comb->sadb_comb_auth_minbits = 256;
sadb_comb->sadb_comb_auth_maxbits = 256;
} else if (!strncasecmp(ipsec_def_auth, "hmac-sha2-384",
sizeof("hmac-sha2-384"))) {
- sadb_comb->sadb_comb_auth = SADB_AALG_SHA2_384;
+ sadb_comb->sadb_comb_auth = SADB_X_AALG_SHA2_384;
sadb_comb->sadb_comb_auth_minbits = 384;
sadb_comb->sadb_comb_auth_maxbits = 384;
} else if (!strncasecmp(ipsec_def_auth, "hmac-sha2-512",
sizeof("hmac-sha2-512"))) {
- sadb_comb->sadb_comb_auth = SADB_AALG_SHA2_512;
+ sadb_comb->sadb_comb_auth = SADB_X_AALG_SHA2_512;
sadb_comb->sadb_comb_auth_minbits = 512;
sadb_comb->sadb_comb_auth_maxbits = 512;
}
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index 7892d847b65..152061fcc2b 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.h,v 1.47 2003/02/24 21:34:39 jason Exp $ */
+/* $OpenBSD: pfkeyv2.h,v 1.48 2003/07/24 09:59:02 itojun Exp $ */
/*
* @(#)COPYRIGHT 1.1 (NRL) January 1998
*
@@ -267,11 +267,11 @@ struct sadb_x_cred {
#define SADB_AALG_NONE 0
#define SADB_AALG_MD5HMAC 2
#define SADB_AALG_SHA1HMAC 3
-#define SADB_AALG_DES 4
-#define SADB_AALG_SHA2_256 5
-#define SADB_AALG_SHA2_384 6
-#define SADB_AALG_SHA2_512 7
-#define SADB_AALG_RIPEMD160HMAC 8
+#define SADB_X_AALG_DES 4
+#define SADB_X_AALG_SHA2_256 5
+#define SADB_X_AALG_SHA2_384 6
+#define SADB_X_AALG_SHA2_512 7
+#define SADB_X_AALG_RIPEMD160HMAC 8
#define SADB_X_AALG_MD5 249
#define SADB_X_AALG_SHA1 250
#define SADB_AALG_MAX 250
@@ -287,7 +287,7 @@ struct sadb_x_cred {
#define SADB_X_EALG_3IDEA 8
#define SADB_X_EALG_DES_IV32 9
#define SADB_X_EALG_RC4 10
-#define SADB_X_EALG_NULL 11
+#define SADB_EALG_NULL 11
#define SADB_X_EALG_AES 12
#define SADB_X_EALG_SKIPJACK 249
#define SADB_EALG_MAX 249
diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c
index 43e14557ff0..b0026c9fd9a 100644
--- a/sys/net/pfkeyv2_convert.c
+++ b/sys/net/pfkeyv2_convert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2_convert.c,v 1.16 2003/07/24 08:03:19 itojun Exp $ */
+/* $OpenBSD: pfkeyv2_convert.c,v 1.17 2003/07/24 09:59:02 itojun Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@keromytis.org)
*
@@ -180,19 +180,19 @@ export_sa(void **p, struct tdb *tdb)
break;
case CRYPTO_RIPEMD160_HMAC:
- sadb_sa->sadb_sa_auth = SADB_AALG_RIPEMD160HMAC;
+ sadb_sa->sadb_sa_auth = SADB_X_AALG_RIPEMD160HMAC;
break;
case CRYPTO_SHA2_256_HMAC:
- sadb_sa->sadb_sa_auth = SADB_AALG_SHA2_256;
+ sadb_sa->sadb_sa_auth = SADB_X_AALG_SHA2_256;
break;
case CRYPTO_SHA2_384_HMAC:
- sadb_sa->sadb_sa_auth = SADB_AALG_SHA2_384;
+ sadb_sa->sadb_sa_auth = SADB_X_AALG_SHA2_384;
break;
case CRYPTO_SHA2_512_HMAC:
- sadb_sa->sadb_sa_auth = SADB_AALG_SHA2_512;
+ sadb_sa->sadb_sa_auth = SADB_X_AALG_SHA2_512;
break;
case CRYPTO_MD5_KPDK:
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index c2689573892..41bf387c718 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ah.c,v 1.77 2003/07/24 08:03:19 itojun Exp $ */
+/* $OpenBSD: ip_ah.c,v 1.78 2003/07/24 09:59:02 itojun Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -103,19 +103,19 @@ ah_init(struct tdb *tdbp, struct xformsw *xsp, struct ipsecinit *ii)
thash = &auth_hash_hmac_sha1_96;
break;
- case SADB_AALG_RIPEMD160HMAC:
+ case SADB_X_AALG_RIPEMD160HMAC:
thash = &auth_hash_hmac_ripemd_160_96;
break;
- case SADB_AALG_SHA2_256:
+ case SADB_X_AALG_SHA2_256:
thash = &auth_hash_hmac_sha2_256_96;
break;
- case SADB_AALG_SHA2_384:
+ case SADB_X_AALG_SHA2_384:
thash = &auth_hash_hmac_sha2_384_96;
break;
- case SADB_AALG_SHA2_512:
+ case SADB_X_AALG_SHA2_512:
thash = &auth_hash_hmac_sha2_512_96;
break;
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index 13452b39c70..8ea427e157b 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp.c,v 1.85 2003/07/24 08:03:20 itojun Exp $ */
+/* $OpenBSD: ip_esp.c,v 1.86 2003/07/24 09:59:02 itojun Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -156,19 +156,19 @@ esp_init(struct tdb *tdbp, struct xformsw *xsp, struct ipsecinit *ii)
thash = &auth_hash_hmac_sha1_96;
break;
- case SADB_AALG_RIPEMD160HMAC:
+ case SADB_X_AALG_RIPEMD160HMAC:
thash = &auth_hash_hmac_ripemd_160_96;
break;
- case SADB_AALG_SHA2_256:
+ case SADB_X_AALG_SHA2_256:
thash = &auth_hash_hmac_sha2_256_96;
break;
- case SADB_AALG_SHA2_384:
+ case SADB_X_AALG_SHA2_384:
thash = &auth_hash_hmac_sha2_384_96;
break;
- case SADB_AALG_SHA2_512:
+ case SADB_X_AALG_SHA2_512:
thash = &auth_hash_hmac_sha2_512_96;
break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 07:14:06 +0000