aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2005-08-02 05:21:19 +0000
committerJörg Mayer <jmayer@loplof.de>2005-08-02 05:21:19 +0000
commitb7cd5963539717be92f6132e19c5f74fd4303595 (patch)
tree86bf550e73fc0c4639d32d1ef1a18a8d8eea9235 /asn1
parent84d1d10937f8184b4adc7d8f7677eae79443259d (diff)
Fix svn properties where needed:
Remove svn:executable Add svn:eol-style Add svn:keywords svn path=/trunk/; revision=15178
Diffstat (limited to 'asn1')
-rw-r--r--asn1/acse/Makefile2
-rw-r--r--asn1/acse/Makefile.nmake2
-rw-r--r--asn1/acse/packet-acse-template.c2
-rw-r--r--asn1/acse/packet-acse-template.h2
-rw-r--r--asn1/cmip/cmip.cnf2
-rw-r--r--asn1/cmip/packet-cmip-template.c2
-rw-r--r--asn1/cmip/packet-cmip-template.h2
-rw-r--r--asn1/ess/ess.cnf2
-rw-r--r--asn1/ess/packet-ess-template.c2
-rw-r--r--asn1/ess/packet-ess-template.h2
-rw-r--r--[-rwxr-xr-x]asn1/ftam/ISO8571-FTAM.asn0
-rw-r--r--asn1/ftam/Makefile2
-rw-r--r--asn1/ftam/Makefile.nmake2
-rw-r--r--[-rwxr-xr-x]asn1/ftam/ftam.cnf0
-rw-r--r--[-rwxr-xr-x]asn1/ftam/packet-ftam-template.c0
-rw-r--r--[-rwxr-xr-x]asn1/ftam/packet-ftam-template.h0
-rw-r--r--asn1/logotype-cert-extn/logotype-cert-extn.cnf2
-rw-r--r--asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c2
-rw-r--r--asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h2
-rw-r--r--asn1/ocsp/ocsp.cnf2
-rw-r--r--asn1/ocsp/packet-ocsp-template.c2
-rw-r--r--asn1/ocsp/packet-ocsp-template.h2
-rw-r--r--asn1/pkixcmp/cmp.cnf2
-rw-r--r--asn1/pkixcmp/packet-cmp-template.c2
-rw-r--r--asn1/pkixcmp/packet-cmp-template.h2
-rw-r--r--asn1/pkixcrmf/crmf.cnf2
-rw-r--r--asn1/pkixcrmf/packet-crmf-template.c2
-rw-r--r--asn1/pkixcrmf/packet-crmf-template.h2
-rw-r--r--asn1/pkixproxy/packet-pkixproxy-template.c2
-rw-r--r--asn1/pkixproxy/packet-pkixproxy-template.h2
-rw-r--r--asn1/pkixproxy/pkixproxy.cnf2
-rw-r--r--[-rwxr-xr-x]asn1/pkixqualified/PKIXqualified.asn440
-rw-r--r--asn1/pkixqualified/packet-pkixqualified-template.c2
-rw-r--r--asn1/pkixqualified/packet-pkixqualified-template.h2
-rw-r--r--asn1/pkixqualified/pkixqualified.cnf2
-rw-r--r--asn1/pkixtsp/packet-pkixtsp-template.c2
-rw-r--r--asn1/pkixtsp/packet-pkixtsp-template.h2
-rw-r--r--asn1/pkixtsp/pkixtsp.cnf2
-rw-r--r--asn1/smrse/SMRSE.asn266
-rw-r--r--asn1/smrse/packet-smrse-template.c2
-rw-r--r--asn1/smrse/packet-smrse-template.h2
-rw-r--r--asn1/smrse/smrse.cnf2
-rw-r--r--asn1/wlancertextn/Makefile2
-rw-r--r--asn1/wlancertextn/Makefile.nmake2
-rw-r--r--asn1/wlancertextn/packet-wlancertextn-template.c2
-rw-r--r--asn1/wlancertextn/packet-wlancertextn-template.h2
-rw-r--r--asn1/wlancertextn/wlancertextn.cnf2
47 files changed, 394 insertions, 394 deletions
diff --git a/asn1/acse/Makefile b/asn1/acse/Makefile
index 7321e4595b..15b28f40c5 100644
--- a/asn1/acse/Makefile
+++ b/asn1/acse/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $
+# $Id$
DISSECTOR_FILES=packet-acse.c packet-acse.h
diff --git a/asn1/acse/Makefile.nmake b/asn1/acse/Makefile.nmake
index eb2104bd5f..9c5b15df58 100644
--- a/asn1/acse/Makefile.nmake
+++ b/asn1/acse/Makefile.nmake
@@ -1,6 +1,6 @@
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake 13077 2005-01-16 23:26:02Z lroland $
+# $Id$
include ../../config.nmake
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index c1e665de52..03e2647672 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -13,7 +13,7 @@
* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
*
*
- * $Id: packet-acse-template.c 12740 2004-12-13 08:15:34Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/acse/packet-acse-template.h b/asn1/acse/packet-acse-template.h
index 409b4b6487..6b9622eff5 100644
--- a/asn1/acse/packet-acse-template.h
+++ b/asn1/acse/packet-acse-template.h
@@ -2,7 +2,7 @@
* Routines for ACSE packet dissection
* Ronnie Sahlberg 2005
*
- * $Id: packet-acse-template.h 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index 618b310bb4..dbd3cd901a 100644
--- a/asn1/cmip/cmip.cnf
+++ b/asn1/cmip/cmip.cnf
@@ -1,7 +1,7 @@
# cmip.cnf
# CMIP conformation file
-# $Id: cmip.cnf 12290 2004-10-13 00:21:00Z sahlberg $
+# $Id$
#.MODULE_IMPORT
InformationFramework x509if
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index 052923fb7d..4089882a42 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -2,7 +2,7 @@
* Routines for X.711 CMIP packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-cmip-template.c 12245 2004-10-08 20:28:04Z guy $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/cmip/packet-cmip-template.h b/asn1/cmip/packet-cmip-template.h
index 6728a7ab4a..4b0cfa5e00 100644
--- a/asn1/cmip/packet-cmip-template.h
+++ b/asn1/cmip/packet-cmip-template.h
@@ -2,7 +2,7 @@
* Routines for X.711 CMIP packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-cmip-template.h 12203 2004-10-05 09:18:55Z guy $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf
index f630d4dc80..a2eeafaafd 100644
--- a/asn1/ess/ess.cnf
+++ b/asn1/ess/ess.cnf
@@ -1,7 +1,7 @@
# ess.cnf
# ExtendedSecurityServices conformation file
-# $Id: ess.cnf 12558 2004-11-21 10:16:06Z sahlberg $
+# $Id$
#.MODULE_IMPORT
AuthenticationFramework x509af
diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c
index 2d80ce1a9e..3d97f218e7 100644
--- a/asn1/ess/packet-ess-template.c
+++ b/asn1/ess/packet-ess-template.c
@@ -2,7 +2,7 @@
* Routines for RFC2634 Extended Security Services packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-ess-template.c 12438 2004-10-30 02:36:58Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/ess/packet-ess-template.h b/asn1/ess/packet-ess-template.h
index fecc0788ab..076ed8c2bf 100644
--- a/asn1/ess/packet-ess-template.h
+++ b/asn1/ess/packet-ess-template.h
@@ -2,7 +2,7 @@
* Routines for RFC2634 Extended Security Services packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-ess-template.h 12437 2004-10-30 02:18:44Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/ftam/ISO8571-FTAM.asn b/asn1/ftam/ISO8571-FTAM.asn
index 68378bc0b3..68378bc0b3 100755..100644
--- a/asn1/ftam/ISO8571-FTAM.asn
+++ b/asn1/ftam/ISO8571-FTAM.asn
diff --git a/asn1/ftam/Makefile b/asn1/ftam/Makefile
index ac82732ec3..3fa711079b 100644
--- a/asn1/ftam/Makefile
+++ b/asn1/ftam/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $
+# $Id$
DISSECTOR_FILES=packet-ftam.c packet-ftam.h
diff --git a/asn1/ftam/Makefile.nmake b/asn1/ftam/Makefile.nmake
index e19a9d498f..3c7b6ac9fc 100644
--- a/asn1/ftam/Makefile.nmake
+++ b/asn1/ftam/Makefile.nmake
@@ -1,6 +1,6 @@
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake 13077 2005-01-16 23:26:02Z lroland $
+# $Id$
include ../../config.nmake
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index a3a17a9cdf..a3a17a9cdf 100755..100644
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c
index 3703daeae9..3703daeae9 100755..100644
--- a/asn1/ftam/packet-ftam-template.c
+++ b/asn1/ftam/packet-ftam-template.c
diff --git a/asn1/ftam/packet-ftam-template.h b/asn1/ftam/packet-ftam-template.h
index 69a0ebd74d..69a0ebd74d 100755..100644
--- a/asn1/ftam/packet-ftam-template.h
+++ b/asn1/ftam/packet-ftam-template.h
diff --git a/asn1/logotype-cert-extn/logotype-cert-extn.cnf b/asn1/logotype-cert-extn/logotype-cert-extn.cnf
index 82557f07b4..4fbad7b968 100644
--- a/asn1/logotype-cert-extn/logotype-cert-extn.cnf
+++ b/asn1/logotype-cert-extn/logotype-cert-extn.cnf
@@ -1,7 +1,7 @@
# logotype-cert-extn.cnf
# LogotypeCertExtn conformation file
-# $Id: logotype-cert-extn.cnf 12558 2004-11-21 10:16:06Z sahlberg $
+# $Id$
#.MODULE_IMPORT
AuthenticationFramework x509af
diff --git a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c b/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c
index c891fb9ecf..4273e14e4d 100644
--- a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c
+++ b/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c
@@ -2,7 +2,7 @@
* Routines for RFC3709 Logotype Certificate Extensions packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-logotype-cert-extn-template.c 12438 2004-10-30 02:36:58Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h b/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h
index c7ecbd09a0..e9a2f760ef 100644
--- a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h
+++ b/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h
@@ -2,7 +2,7 @@
* Routines for RFC3907 Logotype Certificate Extensions packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-logotype-cert-extn-template.h 12437 2004-10-30 02:18:44Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf
index 8d21e362c4..567ef511bd 100644
--- a/asn1/ocsp/ocsp.cnf
+++ b/asn1/ocsp/ocsp.cnf
@@ -1,7 +1,7 @@
# ocsp.cnf
# OCSP conformation file
-# $Id: ocsp.cnf 12558 2004-11-21 10:16:06Z sahlberg $
+# $Id$
#.MODULE_IMPORT
AuthenticationFramework x509af
diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c
index 585f908480..888a52943b 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.c
@@ -2,7 +2,7 @@
* Routines for Online Certificate Status Protocol (RFC2560) packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-ocsp-template.c 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/ocsp/packet-ocsp-template.h b/asn1/ocsp/packet-ocsp-template.h
index 6fd1c671c9..8aaab354d2 100644
--- a/asn1/ocsp/packet-ocsp-template.h
+++ b/asn1/ocsp/packet-ocsp-template.h
@@ -2,7 +2,7 @@
* Routines for Online Certificate Status Protocol (RFC2560) packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-ocsp-template.h 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixcmp/cmp.cnf b/asn1/pkixcmp/cmp.cnf
index 0fb4d5c489..b6360cea6a 100644
--- a/asn1/pkixcmp/cmp.cnf
+++ b/asn1/pkixcmp/cmp.cnf
@@ -1,7 +1,7 @@
# CMP.cnf
# CMP conformation file
-# $Id: cmp.cnf 12740 2004-12-13 08:15:34Z sahlberg $
+# $Id$
#.MODULE_IMPORT
PKIX1Explicit88 pkix1explicit
diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c
index 0591eb9318..672e4465af 100644
--- a/asn1/pkixcmp/packet-cmp-template.c
+++ b/asn1/pkixcmp/packet-cmp-template.c
@@ -2,7 +2,7 @@
* Routines for RFC2510 Certificate Management Protocol packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-cmp-template.c 12740 2004-12-13 08:15:34Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixcmp/packet-cmp-template.h b/asn1/pkixcmp/packet-cmp-template.h
index 2d8b1dbb31..e9fed8ad7d 100644
--- a/asn1/pkixcmp/packet-cmp-template.h
+++ b/asn1/pkixcmp/packet-cmp-template.h
@@ -2,7 +2,7 @@
* Routines for RFC2510 Certificate Management Protocol packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-cmp-template.h 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixcrmf/crmf.cnf b/asn1/pkixcrmf/crmf.cnf
index e34342c4ea..aa584b433c 100644
--- a/asn1/pkixcrmf/crmf.cnf
+++ b/asn1/pkixcrmf/crmf.cnf
@@ -1,7 +1,7 @@
# CRMF.cnf
# CRMF conformation file
-# $Id: cmrf.cnf 12740 2004-12-13 08:15:34Z sahlberg $
+# $Id$
#.MODULE_IMPORT
CryptographicMessageSyntax cms
diff --git a/asn1/pkixcrmf/packet-crmf-template.c b/asn1/pkixcrmf/packet-crmf-template.c
index 9947116009..489574e9c4 100644
--- a/asn1/pkixcrmf/packet-crmf-template.c
+++ b/asn1/pkixcrmf/packet-crmf-template.c
@@ -2,7 +2,7 @@
* Routines for RFC2511 Certificate Request Message Format packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-crmf-template.c 12740 2004-12-13 08:15:34Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixcrmf/packet-crmf-template.h b/asn1/pkixcrmf/packet-crmf-template.h
index c7becfbfd9..a646e95597 100644
--- a/asn1/pkixcrmf/packet-crmf-template.h
+++ b/asn1/pkixcrmf/packet-crmf-template.h
@@ -2,7 +2,7 @@
* Routines for RFC2511 Certificate Request Message Format packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-crmf-template.h 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c
index 06b2f99887..8af481cbeb 100644
--- a/asn1/pkixproxy/packet-pkixproxy-template.c
+++ b/asn1/pkixproxy/packet-pkixproxy-template.c
@@ -2,7 +2,7 @@
* Routines for RFC3820 PKIXProxy packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-pkixproxy-template.c 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixproxy/packet-pkixproxy-template.h b/asn1/pkixproxy/packet-pkixproxy-template.h
index 0386c1352d..b238a0d898 100644
--- a/asn1/pkixproxy/packet-pkixproxy-template.h
+++ b/asn1/pkixproxy/packet-pkixproxy-template.h
@@ -2,7 +2,7 @@
* Routines for RFC3820 PKIXProxy packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-pkixproxy-template.h 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixproxy/pkixproxy.cnf b/asn1/pkixproxy/pkixproxy.cnf
index 9750cfd1a0..450695c193 100644
--- a/asn1/pkixproxy/pkixproxy.cnf
+++ b/asn1/pkixproxy/pkixproxy.cnf
@@ -1,7 +1,7 @@
# pkixproxy.cnf
# PKIXProxy conformation file
-# $Id: pkixproxy.cnf 12558 2004-11-21 10:16:06Z sahlberg $
+# $Id$
#.MODULE_IMPORT
diff --git a/asn1/pkixqualified/PKIXqualified.asn b/asn1/pkixqualified/PKIXqualified.asn
index bd7c778a4e..c01e78663d 100755..100644
--- a/asn1/pkixqualified/PKIXqualified.asn
+++ b/asn1/pkixqualified/PKIXqualified.asn
@@ -1,220 +1,220 @@
--- This ASN definition is taken from (and modified to pass through asn2eth)
--- RFC3739
---
--- RFC3739 contains the followin copyright statements:
---
--- Full Copyright Statement
---
--- Copyright (C) The Internet Society (2004). This document is subject
--- to the rights, licenses and restrictions contained in BCP 78 and
--- except as set forth therein, the authors retain all their rights.
---
--- This document and the information contained herein are provided on an
--- "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE
--- REPRESENTS OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE
--- INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR
--- IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF
--- THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
--- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
---
--- Intellectual Property
---
--- The IETF takes no position regarding the validity or scope of any
--- Intellectual Property Rights or other rights that might be claimed
--- to pertain to the implementation or use of the technology
--- described in this document or the extent to which any license
--- under such rights might or might not be available; nor does it
--- represent that it has made any independent effort to identify any
--- such rights. Information on the procedures with respect to
--- rights in RFC documents can be found in BCP 78 and BCP 79.
---
--- Copies of IPR disclosures made to the IETF Secretariat and any
--- assurances of licenses to be made available, or the result of an
--- attempt made to obtain a general license or permission for the use
--- of such proprietary rights by implementers or users of this
--- specification can be obtained from the IETF on-line IPR repository
--- at http://www.ietf.org/ipr.
---
--- The IETF invites any interested party to bring to its attention
--- any copyrights, patents or patent applications, or other
--- proprietary rights that may cover technology that may be required
--- to implement this standard. Please address the information to the
--- IETF at ietf-ipr@ietf.org.
---
--- Acknowledgement
---
--- Funding for the RFC Editor function is currently provided by the
--- Internet Society.
---
-
-
- PKIXqualified97 {iso(1) identified-organization(3) dod(6)
- internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
- id-mod-qualified-cert-97(35) }
-
- DEFINITIONS EXPLICIT TAGS ::=
-
- BEGIN
-
- -- EXPORTS ALL --
-
- IMPORTS
-
- informationFramework, certificateExtensions, selectedAttributeTypes,
- authenticationFramework, upperBounds, id-at
- FROM UsefulDefinitions {joint-iso-itu-t(2) ds(5) module(1)
- usefulDefinitions(0) 3 }
-
- ub-name
- FROM UpperBounds upperBounds
-
- GeneralName
- FROM CertificateExtensions certificateExtensions
-
- ATTRIBUTE, AttributeType
- FROM InformationFramework informationFramework
-
- DirectoryString
- FROM SelectedAttributeTypes selectedAttributeTypes
-
- AlgorithmIdentifier, Extension, EXTENSION
- FROM AuthenticationFramework authenticationFramework
-
- id-pkix, id-pe
- FROM PKIX1Explicit88 { iso(1) identified-organization(3) dod(6)
- internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
- id-pkix1-explicit(18) };
-
- -- Locally defined OIDs
-
- -- Arc for QC personal data attributes
--- id-pda OBJECT IDENTIFIER ::= { id-pkix 9 }
-
- -- Arc for QC statements
--- id-qcs OBJECT IDENTIFIER ::= { id-pkix 11 }
-
- -- Personal data attributes
-
--- id-pda-dateOfBirth AttributeType ::= { id-pda 1 }
--- id-pda-placeOfBirth AttributeType ::= { id-pda 2 }
--- id-pda-gender AttributeType ::= { id-pda 3 }
--- id-pda-countryOfCitizenship AttributeType ::= { id-pda 4 }
--- id-pda-countryOfResidence AttributeType ::= { id-pda 5 }
-
- -- Certificate extensions
-
--- id-pe-biometricInfo OBJECT IDENTIFIER ::= { id-pe 2 }
--- id-pe-qcStatements OBJECT IDENTIFIER ::= { id-pe 3 }
-
- -- QC statements
-
--- id-qcs-pkixQCSyntax-v1 OBJECT IDENTIFIER ::= { id-qcs 1 }
--- id-qcs-pkixQCSyntax-v2 OBJECT IDENTIFIER ::= { id-qcs 2 }
-
-Generalizedtime ::= GeneralizedTime
-
-Directorystring ::= DirectoryString
-
-Printablestring ::= PrintableString
-
- -- Personal data attributes
---
--- dateOfBirth ATTRIBUTE ::= {
--- WITH SYNTAX GeneralizedTime
--- ID id-pda-dateOfBirth }
---
--- placeOfBirth ATTRIBUTE ::= {
--- WITH SYNTAX DirectoryString {ub-name}
--- ID id-pda-placeOfBirth }
---
--- gender ATTRIBUTE ::= {
--- WITH SYNTAX PrintableString (SIZE(1) ^ FROM("M"|"F"|"m"|"f"))
--- ID id-pda-gender }
---
--- countryOfCitizenship ATTRIBUTE ::= {
--- WITH SYNTAX PrintableString (SIZE (2))
--- (CONSTRAINED BY { })
--- ID id-pda-countryOfCitizenship }
---
--- countryOfResidence ATTRIBUTE ::= {
--- WITH SYNTAX PrintableString (SIZE (2))
--- (CONSTRAINED BY { })
--- ID id-pda-countryOfResidence }
---
- -- Certificate extensions
-
- -- Biometric info extension
---
--- biometricInfo EXTENSION ::= {
--- SYNTAX BiometricSyntax
--- IDENTIFIED BY id-pe-biometricInfo }
-
- BiometricSyntax ::= SEQUENCE OF BiometricData
-
- BiometricData ::= SEQUENCE {
- typeOfBiometricData TypeOfBiometricData,
- hashAlgorithm AlgorithmIdentifier,
- biometricDataHash OCTET STRING,
- sourceDataUri IA5String OPTIONAL,
- ... }
-
- TypeOfBiometricData ::= CHOICE {
- predefinedBiometricType PredefinedBiometricType,
- biometricDataOid OBJECT IDENTIFIER }
-
- PredefinedBiometricType ::= INTEGER {
- picture(0), handwritten-signature(1)}
-
-
- -- QC Statements Extension
- -- NOTE: This extension does not allow to mix critical and
- -- non-critical Qualified Certificate Statements. Either all
- -- statements must be critical or all statements must be
- -- non-critical.
---
--- qcStatements EXTENSION ::= {
--- SYNTAX QCStatements
--- IDENTIFIED BY id-pe-qcStatements }
-
- QCStatements ::= SEQUENCE OF QCStatement
-
- QCStatement ::= SEQUENCE {
- statementId OBJECT IDENTIFIER,
- statementInfo ANY OPTIONAL }
-
--- QC-STATEMENT ::= CLASS {
--- &id OBJECT IDENTIFIER UNIQUE,
--- &Type OPTIONAL }
--- WITH SYNTAX {
--- [SYNTAX &Type] IDENTIFIED BY &id }
-
--- qcStatement-1 QC-STATEMENT ::= { SYNTAX SemanticsInformation
--- IDENTIFIED BY id-qcs-pkixQCSyntax-v1}
- -- This statement identifies conformance with requirements
- -- defined in RFC 3039 (Version 1). This statement
- -- may optionally contain additional semantics information
- -- as specified below.
-
--- qcStatement-2 QC-STATEMENT ::= { SYNTAX SemanticsInformation
--- IDENTIFIED BY id-qcs-pkixQCSyntax-v2}
- -- This statement identifies conformance with requirements
- -- defined in this Qualified Certificate profile
- -- (Version 2). This statement may optionally contain
- -- additional semantics information as specified below.
-
- SemanticsInformation ::= SEQUENCE {
- semanticsIdentifier OBJECT IDENTIFIER OPTIONAL,
- nameRegistrationAuthorities NameRegistrationAuthorities OPTIONAL
- }
-
- NameRegistrationAuthorities ::= SEQUENCE OF GeneralName
-
- -- The following information object set is defined to constrain the
- -- set of attributes applications are required to recognize as QCSs.
--- SupportedStatements QC-STATEMENT ::= {
--- qcStatement-1 |
--- qcStatement-2 , ... }
-
- END
-
-
+-- This ASN definition is taken from (and modified to pass through asn2eth)
+-- RFC3739
+--
+-- RFC3739 contains the followin copyright statements:
+--
+-- Full Copyright Statement
+--
+-- Copyright (C) The Internet Society (2004). This document is subject
+-- to the rights, licenses and restrictions contained in BCP 78 and
+-- except as set forth therein, the authors retain all their rights.
+--
+-- This document and the information contained herein are provided on an
+-- "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE
+-- REPRESENTS OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE
+-- INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF
+-- THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+-- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+--
+-- Intellectual Property
+--
+-- The IETF takes no position regarding the validity or scope of any
+-- Intellectual Property Rights or other rights that might be claimed
+-- to pertain to the implementation or use of the technology
+-- described in this document or the extent to which any license
+-- under such rights might or might not be available; nor does it
+-- represent that it has made any independent effort to identify any
+-- such rights. Information on the procedures with respect to
+-- rights in RFC documents can be found in BCP 78 and BCP 79.
+--
+-- Copies of IPR disclosures made to the IETF Secretariat and any
+-- assurances of licenses to be made available, or the result of an
+-- attempt made to obtain a general license or permission for the use
+-- of such proprietary rights by implementers or users of this
+-- specification can be obtained from the IETF on-line IPR repository
+-- at http://www.ietf.org/ipr.
+--
+-- The IETF invites any interested party to bring to its attention
+-- any copyrights, patents or patent applications, or other
+-- proprietary rights that may cover technology that may be required
+-- to implement this standard. Please address the information to the
+-- IETF at ietf-ipr@ietf.org.
+--
+-- Acknowledgement
+--
+-- Funding for the RFC Editor function is currently provided by the
+-- Internet Society.
+--
+
+
+ PKIXqualified97 {iso(1) identified-organization(3) dod(6)
+ internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
+ id-mod-qualified-cert-97(35) }
+
+ DEFINITIONS EXPLICIT TAGS ::=
+
+ BEGIN
+
+ -- EXPORTS ALL --
+
+ IMPORTS
+
+ informationFramework, certificateExtensions, selectedAttributeTypes,
+ authenticationFramework, upperBounds, id-at
+ FROM UsefulDefinitions {joint-iso-itu-t(2) ds(5) module(1)
+ usefulDefinitions(0) 3 }
+
+ ub-name
+ FROM UpperBounds upperBounds
+
+ GeneralName
+ FROM CertificateExtensions certificateExtensions
+
+ ATTRIBUTE, AttributeType
+ FROM InformationFramework informationFramework
+
+ DirectoryString
+ FROM SelectedAttributeTypes selectedAttributeTypes
+
+ AlgorithmIdentifier, Extension, EXTENSION
+ FROM AuthenticationFramework authenticationFramework
+
+ id-pkix, id-pe
+ FROM PKIX1Explicit88 { iso(1) identified-organization(3) dod(6)
+ internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
+ id-pkix1-explicit(18) };
+
+ -- Locally defined OIDs
+
+ -- Arc for QC personal data attributes
+-- id-pda OBJECT IDENTIFIER ::= { id-pkix 9 }
+
+ -- Arc for QC statements
+-- id-qcs OBJECT IDENTIFIER ::= { id-pkix 11 }
+
+ -- Personal data attributes
+
+-- id-pda-dateOfBirth AttributeType ::= { id-pda 1 }
+-- id-pda-placeOfBirth AttributeType ::= { id-pda 2 }
+-- id-pda-gender AttributeType ::= { id-pda 3 }
+-- id-pda-countryOfCitizenship AttributeType ::= { id-pda 4 }
+-- id-pda-countryOfResidence AttributeType ::= { id-pda 5 }
+
+ -- Certificate extensions
+
+-- id-pe-biometricInfo OBJECT IDENTIFIER ::= { id-pe 2 }
+-- id-pe-qcStatements OBJECT IDENTIFIER ::= { id-pe 3 }
+
+ -- QC statements
+
+-- id-qcs-pkixQCSyntax-v1 OBJECT IDENTIFIER ::= { id-qcs 1 }
+-- id-qcs-pkixQCSyntax-v2 OBJECT IDENTIFIER ::= { id-qcs 2 }
+
+Generalizedtime ::= GeneralizedTime
+
+Directorystring ::= DirectoryString
+
+Printablestring ::= PrintableString
+
+ -- Personal data attributes
+--
+-- dateOfBirth ATTRIBUTE ::= {
+-- WITH SYNTAX GeneralizedTime
+-- ID id-pda-dateOfBirth }
+--
+-- placeOfBirth ATTRIBUTE ::= {
+-- WITH SYNTAX DirectoryString {ub-name}
+-- ID id-pda-placeOfBirth }
+--
+-- gender ATTRIBUTE ::= {
+-- WITH SYNTAX PrintableString (SIZE(1) ^ FROM("M"|"F"|"m"|"f"))
+-- ID id-pda-gender }
+--
+-- countryOfCitizenship ATTRIBUTE ::= {
+-- WITH SYNTAX PrintableString (SIZE (2))
+-- (CONSTRAINED BY { })
+-- ID id-pda-countryOfCitizenship }
+--
+-- countryOfResidence ATTRIBUTE ::= {
+-- WITH SYNTAX PrintableString (SIZE (2))
+-- (CONSTRAINED BY { })
+-- ID id-pda-countryOfResidence }
+--
+ -- Certificate extensions
+
+ -- Biometric info extension
+--
+-- biometricInfo EXTENSION ::= {
+-- SYNTAX BiometricSyntax
+-- IDENTIFIED BY id-pe-biometricInfo }
+
+ BiometricSyntax ::= SEQUENCE OF BiometricData
+
+ BiometricData ::= SEQUENCE {
+ typeOfBiometricData TypeOfBiometricData,
+ hashAlgorithm AlgorithmIdentifier,
+ biometricDataHash OCTET STRING,
+ sourceDataUri IA5String OPTIONAL,
+ ... }
+
+ TypeOfBiometricData ::= CHOICE {
+ predefinedBiometricType PredefinedBiometricType,
+ biometricDataOid OBJECT IDENTIFIER }
+
+ PredefinedBiometricType ::= INTEGER {
+ picture(0), handwritten-signature(1)}
+
+
+ -- QC Statements Extension
+ -- NOTE: This extension does not allow to mix critical and
+ -- non-critical Qualified Certificate Statements. Either all
+ -- statements must be critical or all statements must be
+ -- non-critical.
+--
+-- qcStatements EXTENSION ::= {
+-- SYNTAX QCStatements
+-- IDENTIFIED BY id-pe-qcStatements }
+
+ QCStatements ::= SEQUENCE OF QCStatement
+
+ QCStatement ::= SEQUENCE {
+ statementId OBJECT IDENTIFIER,
+ statementInfo ANY OPTIONAL }
+
+-- QC-STATEMENT ::= CLASS {
+-- &id OBJECT IDENTIFIER UNIQUE,
+-- &Type OPTIONAL }
+-- WITH SYNTAX {
+-- [SYNTAX &Type] IDENTIFIED BY &id }
+
+-- qcStatement-1 QC-STATEMENT ::= { SYNTAX SemanticsInformation
+-- IDENTIFIED BY id-qcs-pkixQCSyntax-v1}
+ -- This statement identifies conformance with requirements
+ -- defined in RFC 3039 (Version 1). This statement
+ -- may optionally contain additional semantics information
+ -- as specified below.
+
+-- qcStatement-2 QC-STATEMENT ::= { SYNTAX SemanticsInformation
+-- IDENTIFIED BY id-qcs-pkixQCSyntax-v2}
+ -- This statement identifies conformance with requirements
+ -- defined in this Qualified Certificate profile
+ -- (Version 2). This statement may optionally contain
+ -- additional semantics information as specified below.
+
+ SemanticsInformation ::= SEQUENCE {
+ semanticsIdentifier OBJECT IDENTIFIER OPTIONAL,
+ nameRegistrationAuthorities NameRegistrationAuthorities OPTIONAL
+ }
+
+ NameRegistrationAuthorities ::= SEQUENCE OF GeneralName
+
+ -- The following information object set is defined to constrain the
+ -- set of attributes applications are required to recognize as QCSs.
+-- SupportedStatements QC-STATEMENT ::= {
+-- qcStatement-1 |
+-- qcStatement-2 , ... }
+
+ END
+
+
diff --git a/asn1/pkixqualified/packet-pkixqualified-template.c b/asn1/pkixqualified/packet-pkixqualified-template.c
index 8525ef4715..865868e203 100644
--- a/asn1/pkixqualified/packet-pkixqualified-template.c
+++ b/asn1/pkixqualified/packet-pkixqualified-template.c
@@ -2,7 +2,7 @@
* Routines for RFC3739 PKIXqualified packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-pkixqualified-template.c 12434 2004-10-29 12:11:42Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixqualified/packet-pkixqualified-template.h b/asn1/pkixqualified/packet-pkixqualified-template.h
index 32ab885b0d..3f62982dd3 100644
--- a/asn1/pkixqualified/packet-pkixqualified-template.h
+++ b/asn1/pkixqualified/packet-pkixqualified-template.h
@@ -2,7 +2,7 @@
* Routines for RFC3739 PKIXqualified packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-pkixqualified-template.h 12434 2004-10-29 12:11:42Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf
index 6cd993286b..29b2050fff 100644
--- a/asn1/pkixqualified/pkixqualified.cnf
+++ b/asn1/pkixqualified/pkixqualified.cnf
@@ -1,7 +1,7 @@
# PKIXqualified.cnf
# PKIXqualified conformation file
-# $Id: pkixqualified.cnf 12434 2004-10-29 12:11:42Z sahlberg $
+# $Id$
#.MODULE_IMPORT
CertificateExtensions x509ce
diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c
index 25300f70f7..b2867e1a41 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.c
+++ b/asn1/pkixtsp/packet-pkixtsp-template.c
@@ -2,7 +2,7 @@
* Routines for RFC2634 Extended Security Services packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-pkixtsp-template.c 12438 2004-10-30 02:36:58Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixtsp/packet-pkixtsp-template.h b/asn1/pkixtsp/packet-pkixtsp-template.h
index 7907b56501..328d92034a 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.h
+++ b/asn1/pkixtsp/packet-pkixtsp-template.h
@@ -2,7 +2,7 @@
* Routines for RFC3161 Time-Stamp Protocol packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-pkixtsp-template.h 12437 2004-10-30 02:18:44Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/pkixtsp/pkixtsp.cnf b/asn1/pkixtsp/pkixtsp.cnf
index edfe3b4410..9f9b81e8c4 100644
--- a/asn1/pkixtsp/pkixtsp.cnf
+++ b/asn1/pkixtsp/pkixtsp.cnf
@@ -1,7 +1,7 @@
# pkixtsp.cnf
# Time-Stamp Protocol (RFC3161) conformation file
-# $Id: pkixtsp.cnf 12558 2004-11-21 10:16:06Z sahlberg $
+# $Id$
#.MODULE_IMPORT
PKIX1Explicit88 pkix1explicit
diff --git a/asn1/smrse/SMRSE.asn b/asn1/smrse/SMRSE.asn
index f8b0c9ed52..ee11a261b4 100644
--- a/asn1/smrse/SMRSE.asn
+++ b/asn1/smrse/SMRSE.asn
@@ -1,133 +1,133 @@
-SMRS DEFINITIONS IMPLICIT TAGS ::=
-BEGIN
-
-SMR-Bind ::= SEQUENCE {
- sc-address SMS-Address,
- password Password,
- ...
-}
-
-ub-password-length INTEGER ::= 20
-
-IMSI-Address ::= OCTET STRING
-
-SMS-Address ::= SEQUENCE {
- address-type INTEGER {
- unknown-type (0),
- internat-number (1),
- national-number (2),
- net-spec-number (3),
- short-number (4)
- },
-
- numbering-plan INTEGER {
- unknown-numbering (0),
- iSDN-numbering (1),
- data-network-numbering (3),
- telex-numbering (4),
- national-numbering (8),
- private-numbering (9)
- },
-
- address-value CHOICE {
- octet-format SemiOctetString
- }
-}
-
-
-SemiOctetString ::= OCTET STRING
-
-Password ::= PrintableString
-
-SMR-Bind-Confirm ::= SEQUENCE {
- ...
-}
-
-SMR-Bind-Failure ::= SEQUENCE {
- connect-fail-reason Connect-fail,
- ...
-}
-
-Connect-fail ::= INTEGER {
- not-entitled (0),
- tmp-overload (1),
- tmp-failure (2),
- id-or-passwd (3),
- not-supported (4),
- inv-SC-addr (5)
-}
-
-SMR-Unbind ::= SEQUENCE {
- ...
-}
-
-RPDataMT ::= SEQUENCE {
- mt-priority-request BOOLEAN,
- mt-mms BOOLEAN,
- mt-message-reference RP-MR,
- mt-originating-address SMS-Address,
- mt-destination-address SMS-Address,
- mt-user-data RP-UD,
- mt-origVMSCAddr [1] SMS-Address OPTIONAL,
- mt-tariffClass [2] SM-TC OPTIONAL,
- ...
-}
-
-RPDataMO ::= SEQUENCE {
- mo-message-reference RP-MR,
- mo-originating-address SMS-Address,
- mo-user-data RP-UD,
- origVMSCAddr [1] SMS-Address OPTIONAL ,
- moimsi [2] IMSI-Address OPTIONAL,
- ...
-}
-
-RP-MR ::= INTEGER (0..65535)
-
-RP-UD ::= OCTET STRING (SIZE (1..164))
-
-SM-TC ::= INTEGER (0..65535)
-
-RPAck ::= SEQUENCE {
- message-reference RP-MR,
- ...
-}
-
-Error-reason ::= INTEGER {
- unknown-subscriber (1),
- illegal-subscriber (9),
- teleservice-not-provisioned (11),
- call-barred (13),
- cug-reject (15),
- sMS-ll-capabilities-not-prov (19),
- error-in-MS (20),
- facility-not-supported (21),
- memory-capacity-exceeded (22),
- absent-subscriber (29),
- ms-busy-for-MT-sms (30),
- system-failure (36),
- illegal-equipment (44),
- no-resp-to-paging (60),
- gMSC-congestion (61),
- dublicate-sm (70),
- sC-congestion (101),
- mS-not-SC-Subscriber (103),
- invalid-sme-address (104)
-}
-
-RPError ::= SEQUENCE {
- error-reason Error-reason,
- msg-waiting-set BOOLEAN,
- message-reference RP-MR,
- alerting-MS-ISDN [1] SMS-Address OPTIONAL,
- sm-diag-info [2] RP-UD OPTIONAL,
- ...
-}
-
-RPAlertSC ::= SEQUENCE {
- ms-address SMS-Address,
- message-reference RP-MR,
- ...
-}
-
-END
+SMRS DEFINITIONS IMPLICIT TAGS ::=
+BEGIN
+
+SMR-Bind ::= SEQUENCE {
+ sc-address SMS-Address,
+ password Password,
+ ...
+}
+
+ub-password-length INTEGER ::= 20
+
+IMSI-Address ::= OCTET STRING
+
+SMS-Address ::= SEQUENCE {
+ address-type INTEGER {
+ unknown-type (0),
+ internat-number (1),
+ national-number (2),
+ net-spec-number (3),
+ short-number (4)
+ },
+
+ numbering-plan INTEGER {
+ unknown-numbering (0),
+ iSDN-numbering (1),
+ data-network-numbering (3),
+ telex-numbering (4),
+ national-numbering (8),
+ private-numbering (9)
+ },
+
+ address-value CHOICE {
+ octet-format SemiOctetString
+ }
+}
+
+
+SemiOctetString ::= OCTET STRING
+
+Password ::= PrintableString
+
+SMR-Bind-Confirm ::= SEQUENCE {
+ ...
+}
+
+SMR-Bind-Failure ::= SEQUENCE {
+ connect-fail-reason Connect-fail,
+ ...
+}
+
+Connect-fail ::= INTEGER {
+ not-entitled (0),
+ tmp-overload (1),
+ tmp-failure (2),
+ id-or-passwd (3),
+ not-supported (4),
+ inv-SC-addr (5)
+}
+
+SMR-Unbind ::= SEQUENCE {
+ ...
+}
+
+RPDataMT ::= SEQUENCE {
+ mt-priority-request BOOLEAN,
+ mt-mms BOOLEAN,
+ mt-message-reference RP-MR,
+ mt-originating-address SMS-Address,
+ mt-destination-address SMS-Address,
+ mt-user-data RP-UD,
+ mt-origVMSCAddr [1] SMS-Address OPTIONAL,
+ mt-tariffClass [2] SM-TC OPTIONAL,
+ ...
+}
+
+RPDataMO ::= SEQUENCE {
+ mo-message-reference RP-MR,
+ mo-originating-address SMS-Address,
+ mo-user-data RP-UD,
+ origVMSCAddr [1] SMS-Address OPTIONAL ,
+ moimsi [2] IMSI-Address OPTIONAL,
+ ...
+}
+
+RP-MR ::= INTEGER (0..65535)
+
+RP-UD ::= OCTET STRING (SIZE (1..164))
+
+SM-TC ::= INTEGER (0..65535)
+
+RPAck ::= SEQUENCE {
+ message-reference RP-MR,
+ ...
+}
+
+Error-reason ::= INTEGER {
+ unknown-subscriber (1),
+ illegal-subscriber (9),
+ teleservice-not-provisioned (11),
+ call-barred (13),
+ cug-reject (15),
+ sMS-ll-capabilities-not-prov (19),
+ error-in-MS (20),
+ facility-not-supported (21),
+ memory-capacity-exceeded (22),
+ absent-subscriber (29),
+ ms-busy-for-MT-sms (30),
+ system-failure (36),
+ illegal-equipment (44),
+ no-resp-to-paging (60),
+ gMSC-congestion (61),
+ dublicate-sm (70),
+ sC-congestion (101),
+ mS-not-SC-Subscriber (103),
+ invalid-sme-address (104)
+}
+
+RPError ::= SEQUENCE {
+ error-reason Error-reason,
+ msg-waiting-set BOOLEAN,
+ message-reference RP-MR,
+ alerting-MS-ISDN [1] SMS-Address OPTIONAL,
+ sm-diag-info [2] RP-UD OPTIONAL,
+ ...
+}
+
+RPAlertSC ::= SEQUENCE {
+ ms-address SMS-Address,
+ message-reference RP-MR,
+ ...
+}
+
+END
diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c
index f43ed566f3..ee88c94de9 100644
--- a/asn1/smrse/packet-smrse-template.c
+++ b/asn1/smrse/packet-smrse-template.c
@@ -2,7 +2,7 @@
* Routines for SMRSE Short Message Relay Service packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-smrse-template.c 12245 2004-10-08 20:28:04Z guy $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/smrse/packet-smrse-template.h b/asn1/smrse/packet-smrse-template.h
index e039190f37..08f308fbeb 100644
--- a/asn1/smrse/packet-smrse-template.h
+++ b/asn1/smrse/packet-smrse-template.h
@@ -2,7 +2,7 @@
* Routines for SMRSE Short Message Relay Service packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-smrse-template.h 12203 2004-10-05 09:18:55Z guy $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/smrse/smrse.cnf b/asn1/smrse/smrse.cnf
index 8c5ef834f8..e746de4b16 100644
--- a/asn1/smrse/smrse.cnf
+++ b/asn1/smrse/smrse.cnf
@@ -1,7 +1,7 @@
# smrse.cnf
# SMRSE conformation file
-# $Id: smrse.cnf 12290 2004-10-13 00:21:00Z sahlberg $
+# $Id$
#.MODULE_IMPORT
diff --git a/asn1/wlancertextn/Makefile b/asn1/wlancertextn/Makefile
index e51e9730dd..3d26506c40 100644
--- a/asn1/wlancertextn/Makefile
+++ b/asn1/wlancertextn/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $
+# $Id$
DISSECTOR_FILES=packet-wlancertextn.c packet-wlancertextn.h
diff --git a/asn1/wlancertextn/Makefile.nmake b/asn1/wlancertextn/Makefile.nmake
index 88c348999b..fefd59b456 100644
--- a/asn1/wlancertextn/Makefile.nmake
+++ b/asn1/wlancertextn/Makefile.nmake
@@ -1,6 +1,6 @@
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake 13077 2005-01-16 23:26:02Z lroland $
+# $Id$
include ../../config.nmake
diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c
index 3dcd04b0e5..85da6df4c4 100644
--- a/asn1/wlancertextn/packet-wlancertextn-template.c
+++ b/asn1/wlancertextn/packet-wlancertextn-template.c
@@ -2,7 +2,7 @@
* Routines for Wireless Certificate Extension (RFC3770)
* Ronnie Sahlberg 2005
*
- * $Id: packet-wlancertextn-template.c 12434 2004-10-29 12:11:42Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/wlancertextn/packet-wlancertextn-template.h b/asn1/wlancertextn/packet-wlancertextn-template.h
index 8cfb3c4342..8d1bbade88 100644
--- a/asn1/wlancertextn/packet-wlancertextn-template.h
+++ b/asn1/wlancertextn/packet-wlancertextn-template.h
@@ -2,7 +2,7 @@
* Routines for Wireless Certificate Extensions (RFC3770) packet dissection
* Ronnie Sahlberg 2005
*
- * $Id: packet-wlancertextn-template.h 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/asn1/wlancertextn/wlancertextn.cnf b/asn1/wlancertextn/wlancertextn.cnf
index d89c0849a0..c5a4d48f7c 100644
--- a/asn1/wlancertextn/wlancertextn.cnf
+++ b/asn1/wlancertextn/wlancertextn.cnf
@@ -1,7 +1,7 @@
# WlanCertExtn.cnf
# WlanCertExtn conformation file
-# $Id: WlanCertExtn.cnf 12434 2004-10-29 12:11:42Z sahlberg $
+# $Id$
#.MODULE_IMPORT