Rename crypt-xxx to xxx

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40511 f5534014-38df-0310-8fa8-9805f1628bb7

11 files changed, 20 insertions, 20 deletions

diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 1f869b0aa5..67d823d3c0 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -512,7 +512,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset)
 }
 
 #if 0
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/md5.h>
 
 static gboolean
 verify_password(tvbuff_t *tvb, const char *password)
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index fc1a390862..45efba331b 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -51,8 +51,8 @@
 #include "packet-x509sat.h"
 #include "packet-pkcs12.h"
 
-#include <epan/crypt/crypt-sha1.h>
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/sha1.h>
+#include <epan/crypt/md5.h>
 
 #define PNAME  "Cryptographic Message Syntax"
 #define PSNAME "CMS"
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c
index 4ca278333e..6b6975e13b 100644
--- a/epan/dissectors/packet-data.c
+++ b/epan/dissectors/packet-data.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/md5.h>
 #include "packet-data.h"
 
 /* proto_data cannot be static because it's referenced in the
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 944e6b0f6f..f0c65ea768 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -44,10 +44,10 @@
 #include <epan/asn1.h>
 #include "packet-kerberos.h"
 /* for decoding */
-#include <epan/crypt/crypt-rc4.h>
-#include <epan/crypt/crypt-md4.h>
-#include <epan/crypt/crypt-md5.h>
-#include <epan/crypt/crypt-des.h>
+#include <epan/crypt/rc4.h>
+#include <epan/crypt/md4.h>
+#include <epan/crypt/md5.h>
+#include <epan/crypt/des.h>
 
 extern const char *gbl_nt_password;
 #ifdef DEBUG_NETLOGON
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 93c4fc5fbd..700b3ab8c0 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -39,7 +39,7 @@
 #include <epan/prefs.h>
 #include <epan/tap.h>
 #include <epan/expert.h>
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/md5.h>
 
 #include "color.h"
 #include "color_filters.h"
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 34856d486d..41a0e14574 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -77,7 +77,7 @@
 #include <nettle/des.h>
 #include <nettle/cbc.h>
 #endif
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/md5.h>
 #include <sys/stat.h>   /* For keyfile manipulation */
 #endif
 
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index ec1c4052ce..e90b242f77 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -47,10 +47,10 @@
 #include <epan/emem.h>
 #include <epan/tap.h>
 #include <epan/expert.h>
-#include <epan/crypt/crypt-rc4.h>
-#include <epan/crypt/crypt-md4.h>
-#include <epan/crypt/crypt-md5.h>
-#include <epan/crypt/crypt-des.h>
+#include <epan/crypt/rc4.h>
+#include <epan/crypt/md4.h>
+#include <epan/crypt/md5.h>
+#include <epan/crypt/des.h>
 #include "packet-dcerpc.h"
 #include "packet-gssapi.h"
 #include <wsutil/crc32.h>
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 82e135cfa5..6cfc0f73c2 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -61,7 +61,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/report_err.h>
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/md5.h>
 #include <epan/sminmpec.h>
 #include <epan/filesystem.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index b809a9cda6..ebd268561a 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -81,8 +81,8 @@
 
 #include "packet-snmp.h"
 
-#include <epan/crypt/crypt-sha1.h>
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/sha1.h>
+#include <epan/crypt/md5.h>
 #include <epan/expert.h>
 #include <epan/report_err.h>
 #include <epan/oids.h>
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 14ba0da063..4de80216d8 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -49,7 +49,7 @@
 #include "packet-dcerpc.h"
 #include "packet-gssapi.h"
 #include "packet-kerberos.h"
-#include <epan/crypt/crypt-rc4.h>
+#include <epan/crypt/rc4.h>
 #include <epan/conversation.h>
 #include <epan/emem.h>
 #include <epan/asn1.h>
@@ -794,7 +794,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 #ifdef HAVE_KERBEROS
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/md5.h>
 
 #ifndef KEYTYPE_ARCFOUR_56
 # define KEYTYPE_ARCFOUR_56 24
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index f78ebe4185..2bfe1cd6f3 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -66,7 +66,7 @@
 #include <epan/packet.h>
 
 #include <epan/prefs.h>
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/md5.h>
 #include <epan/emem.h>
 #include "packet-tacacs.h"