[src/netbsd-3]: src Backout ticket 579 because it causes build failures.

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fc92267a1cb0
branches:  netbsd-3
changeset: 576615:fc92267a1cb0
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jul 12 19:08:47 2005 +0000

description:
Backout ticket 579 because it causes build failures.

diffstat:

 crypto/dist/ipsec-tools/ChangeLog               |   4 ----
 crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c |  24 +-----------------------
 doc/CHANGES-3.0                                 |   8 +-------
 3 files changed, 2 insertions(+), 34 deletions(-)

diffs (88 lines):

diff -r 8127e532e07d -r fc92267a1cb0 crypto/dist/ipsec-tools/ChangeLog
--- a/crypto/dist/ipsec-tools/ChangeLog Tue Jul 12 17:45:02 2005 +0000
+++ b/crypto/dist/ipsec-tools/ChangeLog Tue Jul 12 19:08:47 2005 +0000
@@ -13,10 +13,6 @@
        * src/racoon/{admin.c|session.c}: Don't use adminport if it is 
          disabled.
 
-2005-07-04  Emmanuel Dreyfus  <manu%netbsd.org@localhost>
-
-       * src/racoon/isakmp_inf.c: safety checks on informational messages
-
 2005-07-01  Emmanuel Dreyfus  <manu%netbsd.org@localhost>
 
        From Uri <urimobile%optonline.net@localhost>
diff -r 8127e532e07d -r fc92267a1cb0 crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c   Tue Jul 12 17:45:02 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c   Tue Jul 12 19:08:47 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_inf.c,v 1.1.1.3.2.4 2005/07/12 17:31:25 tron Exp $      */
+/*     $NetBSD: isakmp_inf.c,v 1.1.1.3.2.5 2005/07/12 19:08:47 tron Exp $      */
 
 /* Id: isakmp_inf.c,v 1.14.4.2 2005/03/02 20:00:03 vanhu Exp */
 
@@ -149,14 +149,6 @@
        } else
                msg = vdup(msg0);
 
-       /* Safety check */
-       if (msg->l < sizeof(*isakmp) + sizeof(*gen)) {
-               plog(LLV_ERROR, LOCATION, NULL, 
-                       "ignore information because the "
-                       "message is way too short\n");
-               goto end;
-       }
-
        isakmp = (struct isakmp *)msg->v;
        gen = (struct isakmp_gen *)((caddr_t)isakmp + sizeof(struct isakmp));
 
@@ -176,14 +168,6 @@
 
        {
                void *p;
-               /* Safety check */
-               if (msg->l < sizeof(*isakmp) + ntohs(gen->len) + sizeof(*nd)) {
-                       plog(LLV_ERROR, LOCATION, NULL, 
-                               "ignore information because the "
-                               "message is too short\n");
-                       goto end;
-               }
-
                vchar_t *hash, *payload;
                struct isakmp_gen *nd;
 
@@ -198,12 +182,6 @@
                        goto end;
                }
 
-               if (ntohs(nd->len) < sizeof(*nd)) {
-                       plog(LLV_ERROR, LOCATION, NULL,
-                               "too short payload length (broken message?)\n");
-                       goto end;
-               }
-
                payload = vmalloc(ntohs(nd->len));
                if (payload == NULL) {
                        plog(LLV_ERROR, LOCATION, NULL,
diff -r 8127e532e07d -r fc92267a1cb0 doc/CHANGES-3.0
--- a/doc/CHANGES-3.0   Tue Jul 12 17:45:02 2005 +0000
+++ b/doc/CHANGES-3.0   Tue Jul 12 19:08:47 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CHANGES-3.0,v 1.1.2.175 2005/07/12 17:45:02 tron Exp $
+#      $NetBSD: CHANGES-3.0,v 1.1.2.176 2005/07/12 19:08:47 tron Exp $
 
 A complete list of changes from the initial NetBSD 3.0 branch on 16 March 2005
 until the 3.0 release:
@@ -10502,12 +10502,6 @@
        Add pkcs7 support.
        [manu, ticket #578]
 
-crypto/dist/ipsec-tools/ChangeLog              1.19
-crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c        1.5
-
-       Safety checks on informational messages
-       [manu, ticket #579]
-
 crypto/dist/ipsec-tools/ChangeLog              1.20
 crypto/dist/ipsec-tools/src/racoon/pfkey.c     1.5