diff options
-rw-r--r-- | sys/netinet/ip_ah.c | 8 | ||||
-rw-r--r-- | sys/netinet/ip_ah.h | 8 | ||||
-rw-r--r-- | sys/netinet/ip_ah_new.c | 10 | ||||
-rw-r--r-- | sys/netinet/ip_ah_old.c | 8 | ||||
-rw-r--r-- | sys/netinet/ip_esp.c | 8 | ||||
-rw-r--r-- | sys/netinet/ip_esp.h | 8 | ||||
-rw-r--r-- | sys/netinet/ip_esp_new.c | 11 | ||||
-rw-r--r-- | sys/netinet/ip_esp_old.c | 8 | ||||
-rw-r--r-- | sys/netinet/ip_ip4.c | 8 | ||||
-rw-r--r-- | sys/netinet/ip_ip4.h | 8 | ||||
-rw-r--r-- | sys/netinet/ip_ipsp.c | 8 | ||||
-rw-r--r-- | sys/netinet/ip_ipsp.h | 8 | ||||
-rw-r--r-- | sys/netinet/ip_output.c | 5 |
13 files changed, 61 insertions, 45 deletions
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c index 4ae7499c04b..afa4cbe472b 100644 --- a/sys/netinet/ip_ah.c +++ b/sys/netinet/ip_ah.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ah.c,v 1.17 1999/02/24 22:32:59 angelos Exp $ */ +/* $OpenBSD: ip_ah.c,v 1.18 1999/02/24 23:45:46 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_ah.h b/sys/netinet/ip_ah.h index 817f4eee5ad..0f4f48d8011 100644 --- a/sys/netinet/ip_ah.h +++ b/sys/netinet/ip_ah.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ah.h,v 1.14 1999/02/24 22:32:59 angelos Exp $ */ +/* $OpenBSD: ip_ah.h,v 1.15 1999/02/24 23:45:47 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_ah_new.c b/sys/netinet/ip_ah_new.c index ad6cfc3463e..5ebfbe47c13 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.22 1999/02/24 22:32:59 angelos Exp $ */ +/* $OpenBSD: ip_ah_new.c,v 1.23 1999/02/24 23:45:47 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in @@ -518,8 +520,6 @@ ah_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb, m_copydata(m, sizeof(struct ip), (ip->ip_hl << 2) - sizeof(struct ip), (caddr_t) opts); - DPRINTF(("ah_new_output(): using hash algorithm %s\n", ahx->name)); - ilen = ntohs(ip->ip_len); if (AH_NEW_FLENGTH + ilen > IP_MAXPACKET) diff --git a/sys/netinet/ip_ah_old.c b/sys/netinet/ip_ah_old.c index 4102de90b94..e10ed13fb79 100644 --- a/sys/netinet/ip_ah_old.c +++ b/sys/netinet/ip_ah_old.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ah_old.c,v 1.19 1999/02/24 22:33:00 angelos Exp $ */ +/* $OpenBSD: ip_ah_old.c,v 1.20 1999/02/24 23:45:48 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c index 66189caa2bb..f2da8435264 100644 --- a/sys/netinet/ip_esp.c +++ b/sys/netinet/ip_esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.c,v 1.17 1999/02/24 22:33:01 angelos Exp $ */ +/* $OpenBSD: ip_esp.c,v 1.18 1999/02/24 23:45:49 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_esp.h b/sys/netinet/ip_esp.h index b1f7af1a8d7..1b4fe3323f3 100644 --- a/sys/netinet/ip_esp.h +++ b/sys/netinet/ip_esp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.h,v 1.21 1999/02/24 22:33:01 angelos Exp $ */ +/* $OpenBSD: ip_esp.h,v 1.22 1999/02/24 23:45:49 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_esp_new.c b/sys/netinet/ip_esp_new.c index 9d5795f55ef..90976c000a4 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.35 1999/02/24 23:07:19 deraadt Exp $ */ +/* $OpenBSD: ip_esp_new.c,v 1.36 1999/02/24 23:45:49 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in @@ -762,10 +764,7 @@ esp_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb, blks = espx->blocksize; if (esph) - { alen = AH_HMAC_HASHLEN; - DPRINTF(("esp_new_output(): using hash algorithm: %s\n", esph->name)); - } else alen = 0; diff --git a/sys/netinet/ip_esp_old.c b/sys/netinet/ip_esp_old.c index d8089df6866..2cba906f2ca 100644 --- a/sys/netinet/ip_esp_old.c +++ b/sys/netinet/ip_esp_old.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp_old.c,v 1.28 1999/02/24 22:33:03 angelos Exp $ */ +/* $OpenBSD: ip_esp_old.c,v 1.29 1999/02/24 23:45:50 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_ip4.c b/sys/netinet/ip_ip4.c index 46406781679..29e28b00e89 100644 --- a/sys/netinet/ip_ip4.c +++ b/sys/netinet/ip_ip4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ip4.c,v 1.23 1999/02/24 22:33:04 angelos Exp $ */ +/* $OpenBSD: ip_ip4.c,v 1.24 1999/02/24 23:45:51 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_ip4.h b/sys/netinet/ip_ip4.h index ead2d231566..86949539a58 100644 --- a/sys/netinet/ip_ip4.h +++ b/sys/netinet/ip_ip4.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ip4.h,v 1.12 1999/02/24 22:33:04 angelos Exp $ */ +/* $OpenBSD: ip_ip4.h,v 1.13 1999/02/24 23:45:51 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c index 139e21e6721..cc1ff05c840 100644 --- a/sys/netinet/ip_ipsp.c +++ b/sys/netinet/ip_ipsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.c,v 1.32 1999/02/24 22:33:05 angelos Exp $ */ +/* $OpenBSD: ip_ipsp.c,v 1.33 1999/02/24 23:45:51 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index d3b57a54b74..e3236785fb2 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.25 1999/02/24 23:07:20 deraadt Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.26 1999/02/24 23:45:52 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -14,8 +14,10 @@ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis * and Niels Provos. * - * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis - * and Niels Provos. + * Additional features in 1999 by Angelos D. Keromytis. + * + * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, + * Angelos D. Keromytis and Niels Provos. * * Permission to use, copy, and modify this software without fee * is hereby granted, provided that this entire notice is included in diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index f3976ded930..70f6eca8b9b 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.40 1999/02/24 22:33:07 angelos Exp $ */ +/* $OpenBSD: ip_output.c,v 1.41 1999/02/24 23:45:52 angelos Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -359,9 +359,6 @@ ip_output(m0, va_alist) return ENXIO; } - DPRINTF(("ip_output(): calling %s\n", - tdb->tdb_xform->xf_name)); - /* Register first use, setup expiration timer */ if (tdb->tdb_first_use == 0) { tdb->tdb_first_use = time.tv_sec; |