ns-cert-ext -> ns_cert_exts to make directory name consistent with filenames
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 10 Oct 2009 14:20:33 +0000 (14:20 +0000)
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 10 Oct 2009 14:20:33 +0000 (14:20 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30478 f5534014-38df-0310-8fa8-9805f1628bb7

12 files changed:
asn1/Makefile.am
asn1/Makefile.nmake
asn1/ns-cert-exts/ns_cert_exts.cnf [deleted file]
asn1/ns_cert_exts/Makefile.am [moved from asn1/ns-cert-exts/Makefile.am with 100% similarity]
asn1/ns_cert_exts/Makefile.common [moved from asn1/ns-cert-exts/Makefile.common with 100% similarity]
asn1/ns_cert_exts/Makefile.nmake [moved from asn1/ns-cert-exts/Makefile.nmake with 100% similarity]
asn1/ns_cert_exts/NETSCAPE-CERT-EXTS.asn [moved from asn1/ns-cert-exts/NETSCAPE-CERT-EXTS.asn with 100% similarity]
asn1/ns_cert_exts/ns_cert_exts.cnf [new file with mode: 0644]
asn1/ns_cert_exts/packet-ns_cert_exts-template.c [moved from asn1/ns-cert-exts/packet-ns_cert_exts-template.c with 100% similarity]
asn1/ns_cert_exts/packet-ns_cert_exts-template.h [moved from asn1/ns-cert-exts/packet-ns_cert_exts-template.h with 94% similarity]
configure.in
epan/dissectors/packet-ns_cert_exts.c

index fef84ff5cf95a2b295699dc5d63863047bf69b7e..423ae0c98ede5b194064b13beb0de362ad9b208a 100644 (file)
@@ -62,7 +62,7 @@ SUBDIRS =             \
        mpeg-audio      \
        mpeg-pes        \
        nbap            \
-       ns-cert-exts\
+       ns_cert_exts\
        ocsp            \
        p7                      \
        pcap            \
index b608dbded2e3ebba3e485b19b4ddc82ef2ffac19..41f44bdf763f8328933fc919d62989882faac88c 100644 (file)
@@ -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 (file)
index a3958ae..0000000
+++ /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/ns_cert_exts.cnf b/asn1/ns_cert_exts/ns_cert_exts.cnf
new file mode 100644 (file)
index 0000000..dd609ff
--- /dev/null
@@ -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
+
+
similarity index 94%
rename from asn1/ns-cert-exts/packet-ns_cert_exts-template.h
rename to asn1/ns_cert_exts/packet-ns_cert_exts-template.h
index baa802c40e50c31e68e766feb7b8c3947e5f3d2f..0efc45c6c642b9b50f1bbecfe2392cf4d79aefa4 100644 (file)
@@ -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 */
 
index 7e947bd702656ec0704234b47ffa98f90d93b971..6320ecdda1bcccbf2707d1831e0a61d8ebd78327 100644 (file)
@@ -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
index 8afb86aa57d4f37b8aa6f037473aced5c86c60f9..7d0392c82ae5f0f48f2e3f5932aaa87d8ea3349c 100644 (file)
@@ -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 ---*/