diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-08-01 23:34:47 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-08-01 23:34:47 +0000 |
commit | 2df54da6e2b70777154d38ce3923093568358285 (patch) | |
tree | 4bdb887d40a0a5fee501c0bd30f31388019fbe32 /asn1/cms | |
parent | 6ae3372687957dfbda6352598aee00e84f83f7da (diff) |
Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.
Protect a bunch of the crypt header files from multiple inclusion.
svn path=/trunk/; revision=51100
Diffstat (limited to 'asn1/cms')
-rw-r--r-- | asn1/cms/packet-cms-template.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 01efb52f86..e4e93d12ea 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -27,6 +27,10 @@ #include "config.h" #include <glib.h> + +#include <wsutil/sha1.h> +#include <wsutil/md5.h> + #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -41,9 +45,6 @@ #include "packet-x509sat.h" #include "packet-pkcs12.h" -#include <epan/crypt/sha1.h> -#include <epan/crypt/md5.h> - #define PNAME "Cryptographic Message Syntax" #define PSNAME "CMS" #define PFNAME "cms" |