[src/netbsd-3]: src/crypto/dist/ipsec-tools/src/racoon Pull up revision 1.7 (...

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

details:   https://anonhg.NetBSD.org/src/rev/6928475dd083
branches:  netbsd-3
changeset: 576076:6928475dd083
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Jun 10 09:21:36 2005 +0000

description:
Pull up revision 1.7 (requested by manu in ticket #432):
Missing 0th element in rm_idtype2doi array

diffstat:

 crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (35 lines):

diff -r 16c8fd212f07 -r 6928475dd083 crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
--- a/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c    Fri Jun 10 09:21:29 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c    Fri Jun 10 09:21:36 2005 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: ipsec_doi.c,v 1.1.1.2.2.4 2005/05/28 13:04:40 tron Exp $       */
-
-/* Id: ipsec_doi.c,v 1.26.2.1 2005/02/17 13:19:18 vanhu Exp */
+/*     $NetBSD: ipsec_doi.c,v 1.1.1.2.2.5 2005/06/10 09:21:36 tron Exp $       */
+
+/* Id: ipsec_doi.c,v 1.38 2005/05/31 16:07:55 monas Exp */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -4157,14 +4157,15 @@
 #endif
 
 static int rm_idtype2doi[] = {
-       IPSECDOI_ID_FQDN,
-       IPSECDOI_ID_USER_FQDN,
-       IPSECDOI_ID_KEY_ID,
-       255,    /* it's type of "address"
+       255,                            /* IDTYPE_UNDEFINED, 0  */
+       IPSECDOI_ID_FQDN,               /* IDTYPE_FQDN, 1 */
+       IPSECDOI_ID_USER_FQDN,          /* IDTYPE_USERFQDN, 2 */
+       IPSECDOI_ID_KEY_ID,             /* IDTYPE_KEYID, 3 */ 
+       255,    /*                         IDTYPE_ADDRESS, 4
                 * it expands into 4 types by another function. */
-       IPSECDOI_ID_DER_ASN1_DN,
+       IPSECDOI_ID_DER_ASN1_DN,        /* IDTYPE_ASN1DN, 5 */
 #ifdef ENABLE_HYBRID
-       255,    /* It's type LOGIN */
+       255,                            /* IDTYPE_LOGIN, 6 */
 #endif
 };