diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-10-10 14:20:33 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-10-10 14:20:33 +0000 |
commit | b57e27ef8e89bed26c0e4fe3e066922618a3b675 (patch) | |
tree | e632b838afb430856a6003dc65086d304255dd88 | |
parent | 3d94638c3dd42ca623d123d7b51dd326acf596a5 (diff) |
ns-cert-ext -> ns_cert_exts to make directory name consistent with filenames
svn path=/trunk/; revision=30478
-rw-r--r-- | asn1/Makefile.am | 2 | ||||
-rw-r--r-- | asn1/Makefile.nmake | 8 | ||||
-rw-r--r-- | asn1/ns-cert-exts/ns_cert_exts.cnf | 28 | ||||
-rw-r--r-- | asn1/ns_cert_exts/Makefile.am (renamed from asn1/ns-cert-exts/Makefile.am) | 0 | ||||
-rw-r--r-- | asn1/ns_cert_exts/Makefile.common (renamed from asn1/ns-cert-exts/Makefile.common) | 0 | ||||
-rw-r--r-- | asn1/ns_cert_exts/Makefile.nmake (renamed from asn1/ns-cert-exts/Makefile.nmake) | 0 | ||||
-rw-r--r-- | asn1/ns_cert_exts/NETSCAPE-CERT-EXTS.asn (renamed from asn1/ns-cert-exts/NETSCAPE-CERT-EXTS.asn) | 0 | ||||
-rw-r--r-- | asn1/ns_cert_exts/ns_cert_exts.cnf | 28 | ||||
-rw-r--r-- | asn1/ns_cert_exts/packet-ns_cert_exts-template.c (renamed from asn1/ns-cert-exts/packet-ns_cert_exts-template.c) | 0 | ||||
-rw-r--r-- | asn1/ns_cert_exts/packet-ns_cert_exts-template.h (renamed from asn1/ns-cert-exts/packet-ns_cert_exts-template.h) | 4 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ns_cert_exts.c | 16 |
12 files changed, 44 insertions, 44 deletions
diff --git a/asn1/Makefile.am b/asn1/Makefile.am index fef84ff5cf..423ae0c98e 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -62,7 +62,7 @@ SUBDIRS = \ mpeg-audio \ mpeg-pes \ nbap \ - ns-cert-exts\ + ns_cert_exts\ ocsp \ p7 \ pcap \ diff --git a/asn1/Makefile.nmake b/asn1/Makefile.nmake index b608dbded2..41f44bdf76 100644 --- a/asn1/Makefile.nmake +++ b/asn1/Makefile.nmake @@ -51,7 +51,7 @@ ber: \ ldap \ logotypecertextn \ mms \ - ns-cert-exts \ + ns_cert_exts \ ocsp \ p7 \ pkcs1 \ @@ -226,7 +226,7 @@ clean: cd nbap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. - cd ns-cert-exts + cd ns_cert_exts $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. cd ocsp @@ -550,8 +550,8 @@ nbap:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files cd .. -ns-cert-exts:: - cd ns-cert-exts +ns_cert_exts:: + cd ns_cert_exts $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files cd .. diff --git a/asn1/ns-cert-exts/ns_cert_exts.cnf b/asn1/ns-cert-exts/ns_cert_exts.cnf deleted file mode 100644 index a3958aeb91..0000000000 --- a/asn1/ns-cert-exts/ns_cert_exts.cnf +++ /dev/null @@ -1,28 +0,0 @@ -# NS-CERT-EXT.cnf -# NetScape Certificate Extensions conformation file - -# $Id$ - -#.MODULE_IMPORT - -#.EXPORTS - -#.REGISTER -CertType B "2.16.840.1.113730.1.1" "ns-cert-exts.cert_type" -BaseUrl B "2.16.840.1.113730.1.2" "ns-cert-exts.base_url" -RevocationUrl B "2.16.840.1.113730.1.3" "ns-cert-exts.revocation-url" -CaRevocationUrl B "2.16.840.1.113730.1.4" "ns-cert-exts.ca-revocation-url" -CertRenewalUrl B "2.16.840.1.113730.1.7" "ns-cert-exts.cert-renewal-url" -CaPolicyUrl B "2.16.840.1.113730.1.8" "ns-cert-exts.ca-policy-url" -SslServerName B "2.16.840.1.113730.1.12" "ns-cert-exts.ssl-server-name" -Comment B "2.16.840.1.113730.1.13" "ns-cert-exts.comment" - -#.NO_EMIT - -#.TYPE_RENAME - -#.FIELD_RENAME - -#.END - - diff --git a/asn1/ns-cert-exts/Makefile.am b/asn1/ns_cert_exts/Makefile.am index 462af31e88..462af31e88 100644 --- a/asn1/ns-cert-exts/Makefile.am +++ b/asn1/ns_cert_exts/Makefile.am diff --git a/asn1/ns-cert-exts/Makefile.common b/asn1/ns_cert_exts/Makefile.common index 4b923ae319..4b923ae319 100644 --- a/asn1/ns-cert-exts/Makefile.common +++ b/asn1/ns_cert_exts/Makefile.common diff --git a/asn1/ns-cert-exts/Makefile.nmake b/asn1/ns_cert_exts/Makefile.nmake index 5a32997c60..5a32997c60 100644 --- a/asn1/ns-cert-exts/Makefile.nmake +++ b/asn1/ns_cert_exts/Makefile.nmake diff --git a/asn1/ns-cert-exts/NETSCAPE-CERT-EXTS.asn b/asn1/ns_cert_exts/NETSCAPE-CERT-EXTS.asn index c541bdef14..c541bdef14 100644 --- a/asn1/ns-cert-exts/NETSCAPE-CERT-EXTS.asn +++ b/asn1/ns_cert_exts/NETSCAPE-CERT-EXTS.asn diff --git a/asn1/ns_cert_exts/ns_cert_exts.cnf b/asn1/ns_cert_exts/ns_cert_exts.cnf new file mode 100644 index 0000000000..dd609ff311 --- /dev/null +++ b/asn1/ns_cert_exts/ns_cert_exts.cnf @@ -0,0 +1,28 @@ +# NS-CERT-EXT.cnf +# NetScape Certificate Extensions conformation file + +# $Id$ + +#.MODULE_IMPORT + +#.EXPORTS + +#.REGISTER +CertType B "2.16.840.1.113730.1.1" "ns_cert_exts.cert_type" +BaseUrl B "2.16.840.1.113730.1.2" "ns_cert_exts.base_url" +RevocationUrl B "2.16.840.1.113730.1.3" "ns_cert_exts.revocation-url" +CaRevocationUrl B "2.16.840.1.113730.1.4" "ns_cert_exts.ca-revocation-url" +CertRenewalUrl B "2.16.840.1.113730.1.7" "ns_cert_exts.cert-renewal-url" +CaPolicyUrl B "2.16.840.1.113730.1.8" "ns_cert_exts.ca-policy-url" +SslServerName B "2.16.840.1.113730.1.12" "ns_cert_exts.ssl-server-name" +Comment B "2.16.840.1.113730.1.13" "ns_cert_exts.comment" + +#.NO_EMIT + +#.TYPE_RENAME + +#.FIELD_RENAME + +#.END + + diff --git a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c index 1ed04ecaad..1ed04ecaad 100644 --- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c +++ b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c diff --git a/asn1/ns-cert-exts/packet-ns_cert_exts-template.h b/asn1/ns_cert_exts/packet-ns_cert_exts-template.h index baa802c40e..0efc45c6c6 100644 --- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.h +++ b/asn1/ns_cert_exts/packet-ns_cert_exts-template.h @@ -1,4 +1,4 @@ -/* packet-ns-cert-exts.h +/* packet-ns_cert_exts.h * Routines for NetScape Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * @@ -26,7 +26,7 @@ #ifndef PACKET_NS_CERT_EXTS_H #define PACKET_NS_CERT_EXTS_H -#include "packet-ns-cert-exts-exp.h" +#include "packet-ns_cert_exts-exp.h" #endif /* PACKET_NS_CERT_EXTS_H */ diff --git a/configure.in b/configure.in index 7e947bd702..6320ecdda1 100644 --- a/configure.in +++ b/configure.in @@ -1677,7 +1677,7 @@ AC_OUTPUT( asn1/mpeg-audio/Makefile asn1/mpeg-pes/Makefile asn1/nbap/Makefile - asn1/ns-cert-exts/Makefile + asn1/ns_cert_exts/Makefile asn1/ocsp/Makefile asn1/p7/Makefile asn1/pcap/Makefile diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index 8afb86aa57..7d0392c82a 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -305,14 +305,14 @@ void proto_reg_handoff_ns_cert_exts(void) { /*--- Included file: packet-ns_cert_exts-dis-tab.c ---*/ #line 1 "packet-ns_cert_exts-dis-tab.c" - register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_CertType_PDU, proto_ns_cert_exts, "ns-cert-exts.cert_type"); - register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_BaseUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.base_url"); - register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_RevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.revocation-url"); - register_ber_oid_dissector("2.16.840.1.113730.1.4", dissect_CaRevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-revocation-url"); - register_ber_oid_dissector("2.16.840.1.113730.1.7", dissect_CertRenewalUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.cert-renewal-url"); - register_ber_oid_dissector("2.16.840.1.113730.1.8", dissect_CaPolicyUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-policy-url"); - register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_SslServerName_PDU, proto_ns_cert_exts, "ns-cert-exts.ssl-server-name"); - register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_Comment_PDU, proto_ns_cert_exts, "ns-cert-exts.comment"); + register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_CertType_PDU, proto_ns_cert_exts, "ns_cert_exts.cert_type"); + register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_BaseUrl_PDU, proto_ns_cert_exts, "ns_cert_exts.base_url"); + register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_RevocationUrl_PDU, proto_ns_cert_exts, "ns_cert_exts.revocation-url"); + register_ber_oid_dissector("2.16.840.1.113730.1.4", dissect_CaRevocationUrl_PDU, proto_ns_cert_exts, "ns_cert_exts.ca-revocation-url"); + register_ber_oid_dissector("2.16.840.1.113730.1.7", dissect_CertRenewalUrl_PDU, proto_ns_cert_exts, "ns_cert_exts.cert-renewal-url"); + register_ber_oid_dissector("2.16.840.1.113730.1.8", dissect_CaPolicyUrl_PDU, proto_ns_cert_exts, "ns_cert_exts.ca-policy-url"); + register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_SslServerName_PDU, proto_ns_cert_exts, "ns_cert_exts.ssl-server-name"); + register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_Comment_PDU, proto_ns_cert_exts, "ns_cert_exts.comment"); /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/ |