summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-11-18 09:09:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-11-18 09:09:46 +0000
commit8bb8b74271bf77c55d5a64deab3d31f20416a11b (patch)
treeff1a8845d0100f4bbda6687499152f5bf02212bb /sys/netinet
parent13bf2e8da46885e6f30b82c2de084d5136dc26d8 (diff)
fix 3DES, style changes
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_ah_new.c16
-rw-r--r--sys/netinet/ip_esp_new.c47
2 files changed, 32 insertions, 31 deletions
diff --git a/sys/netinet/ip_ah_new.c b/sys/netinet/ip_ah_new.c
index 79c7e1d3bfc..5b6086caec3 100644
--- a/sys/netinet/ip_ah_new.c
+++ b/sys/netinet/ip_ah_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ah_new.c,v 1.12 1997/11/15 00:07:07 deraadt Exp $ */
+/* $OpenBSD: ip_ah_new.c,v 1.13 1997/11/18 09:09:43 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -71,16 +71,16 @@ struct ah_hash ah_new_hash[] = {
{ ALG_AUTH_MD5, "HMAC-MD5-96",
AH_MD5_ALEN,
sizeof(MD5_CTX),
- (void (*)(void *))MD5Init,
- (void (*)(void *, u_int8_t *, u_int16_t))MD5Update,
- (void (*)(u_int8_t *, void *))MD5Final
+ (void (*)(void *)) MD5Init,
+ (void (*)(void *, u_int8_t *, u_int16_t)) MD5Update,
+ (void (*)(u_int8_t *, void *)) MD5Final
},
{ ALG_AUTH_SHA1, "HMAC-SHA1-96",
AH_SHA1_ALEN,
sizeof(SHA1_CTX),
- (void (*)(void *))SHA1Init,
- (void (*)(void *, u_int8_t *, u_int16_t))SHA1Update,
- (void (*)(u_int8_t *, void *))SHA1Final
+ (void (*)(void *)) SHA1Init,
+ (void (*)(void *, u_int8_t *, u_int16_t)) SHA1Update,
+ (void (*)(u_int8_t *, void *)) SHA1Final
}
};
@@ -138,7 +138,7 @@ ah_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
m_copydata(m, EMT_SETSPI_FLEN, AH_NEW_XENCAP_LEN, (caddr_t) &txd);
/* Check whether the hash algorithm is supported */
- for (i=sizeof(ah_new_hash)/sizeof(struct ah_hash)-1; i >= 0; i--)
+ for (i = sizeof(ah_new_hash) / sizeof(struct ah_hash) - 1; i >= 0; i--)
if (txd.amx_hash_algorithm == ah_new_hash[i].type)
break;
if (i < 0)
diff --git a/sys/netinet/ip_esp_new.c b/sys/netinet/ip_esp_new.c
index f5d709a50f5..ccb65185216 100644
--- a/sys/netinet/ip_esp_new.c
+++ b/sys/netinet/ip_esp_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp_new.c,v 1.12 1997/11/18 00:12:15 provos Exp $ */
+/* $OpenBSD: ip_esp_new.c,v 1.13 1997/11/18 09:09:45 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -83,16 +83,16 @@ struct esp_hash esp_new_hash[] = {
{ ALG_AUTH_MD5, "HMAC-MD5-96",
AH_MD5_ALEN,
sizeof(MD5_CTX),
- (void (*)(void *))MD5Init,
- (void (*)(void *, u_int8_t *, u_int16_t))MD5Update,
- (void (*)(u_int8_t *, void *))MD5Final
+ (void (*) (void *)) MD5Init,
+ (void (*) (void *, u_int8_t *, u_int16_t)) MD5Update,
+ (void (*) (u_int8_t *, void *)) MD5Final
},
{ ALG_AUTH_SHA1, "HMAC-SHA1-96",
AH_SHA1_ALEN,
sizeof(SHA1_CTX),
- (void (*)(void *))SHA1Init,
- (void (*)(void *, u_int8_t *, u_int16_t))SHA1Update,
- (void (*)(u_int8_t *, void *))SHA1Final
+ (void (*) (void *)) SHA1Init,
+ (void (*) (void *, u_int8_t *, u_int16_t)) SHA1Update,
+ (void (*) (u_int8_t *, void *)) SHA1Final
}
};
@@ -141,9 +141,9 @@ static void
des3_encrypt(void *pxd, u_int8_t *blk)
{
struct esp_new_xdata *xd = pxd;
- des_ecb3_encrypt(blk, blk, (caddr_t) (xd->edx_eks[2]),
+ des_ecb3_encrypt(blk, blk, (caddr_t) (xd->edx_eks[0]),
(caddr_t) (xd->edx_eks[1]),
- (caddr_t) (xd->edx_eks[0]), 1);
+ (caddr_t) (xd->edx_eks[2]), 1);
}
static void
@@ -160,7 +160,7 @@ blf_encrypt(void *pxd, u_int8_t *blk)
{
struct esp_new_xdata *xd = pxd;
Blowfish_encipher(&xd->edx_bks, (u_int32_t *)blk,
- (u_int32_t *)(blk+4));
+ (u_int32_t *) (blk + 4));
}
static void
@@ -168,7 +168,7 @@ blf_decrypt(void *pxd, u_int8_t *blk)
{
struct esp_new_xdata *xd = pxd;
Blowfish_decipher(&xd->edx_bks, (u_int32_t *)blk,
- (u_int32_t *)(blk+4));
+ (u_int32_t *) (blk + 4));
}
static void
@@ -215,8 +215,8 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
struct esp_xform *txform;
struct esp_hash *thash;
caddr_t buffer = NULL;
- int blocklen, i;
u_int32_t rk[14];
+ int blocklen, i;
if (m->m_len < ENCAP_MSG_FIXED_LEN)
{
@@ -242,7 +242,7 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
m_copydata(m, EMT_SETSPI_FLEN, ESP_NEW_XENCAP_LEN, (caddr_t) &txd);
/* Check whether the encryption algorithm is supported */
- for (i=sizeof(esp_new_xform)/sizeof(struct esp_xform)-1; i >= 0; i--)
+ for (i = sizeof(esp_new_xform) / sizeof(struct esp_xform) - 1; i >= 0; i--)
if (txd.edx_enc_algorithm == esp_new_xform[i].type)
break;
if (i < 0)
@@ -262,7 +262,8 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
/* Check whether the authentication algorithm is supported */
if (txd.edx_flags & ESP_NEW_FLAG_AUTH)
{
- for (i=sizeof(esp_new_hash)/sizeof(struct esp_hash)-1; i >= 0; i--)
+ for (i = sizeof(esp_new_hash) / sizeof(struct esp_hash) - 1; i >= 0;
+ i--)
if (txd.edx_hash_algorithm == esp_new_hash[i].type)
break;
if (i < 0)
@@ -293,7 +294,7 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
if (((txd.edx_ivlen == 0) && !(txform->ivmask&1)) ||
((txd.edx_ivlen != 0) && (
!(txd.edx_ivlen & txform->ivmask) ||
- (txd.edx_ivlen & (txd.edx_ivlen-1)))))
+ (txd.edx_ivlen & (txd.edx_ivlen - 1)))))
{
if (encdebug)
log(LOG_WARNING, "esp_new_init(): unsupported IV length %d\n",
@@ -453,23 +454,23 @@ esp_new_zeroize(struct tdb *tdbp)
struct mbuf *
esp_new_input(struct mbuf *m, struct tdb *tdb)
{
- struct esp_new_xdata *xd;
- struct ip *ip, ipo;
u_char iv[ESP_MAX_IVS], niv[ESP_MAX_IVS], blk[ESP_MAX_BLKS], opts[40];
+ int ohlen, oplen, plen, alen, ilen, olen, i, blks;
+ struct esp_new_xdata *xd;
+ int count, off, errc;
+ struct mbuf *mi, *mo;
u_char *idat, *odat;
struct esp_new *esp;
struct ifnet *rcvif;
- int ohlen, oplen, plen, alen, ilen, olen, i, blks;
- int count, off, errc;
+ struct ip *ip, ipo;
u_int32_t btsx;
- struct mbuf *mi, *mo;
union {
MD5_CTX md5ctx;
SHA1_CTX sha1ctx;
} ctx;
u_char buf[AH_ALEN_MAX], buf2[AH_ALEN_MAX];
- xd = (struct esp_new_xdata *)tdb->tdb_xdata;
+ xd = (struct esp_new_xdata *) tdb->tdb_xdata;
blks = xd->edx_xform->blocksize;
@@ -552,8 +553,8 @@ esp_new_input(struct mbuf *m, struct tdb *tdb)
}
}
- /* Skip the IP header, IP options, SPI, SN and IV and minus Auth Data*/
- plen = m->m_pkthdr.len - (ip->ip_hl << 2) - 2 * sizeof (u_int32_t) -
+ /* Skip the IP header, IP options, SPI, SN and IV and minus Auth Data */
+ plen = m->m_pkthdr.len - (ip->ip_hl << 2) - 2 * sizeof(u_int32_t) -
xd->edx_ivlen - alen;
if (plen & (blks - 1))
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 23:15:11 +0000