summaryrefslogtreecommitdiffstats
path: root/crypto/cms
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-03-23 18:42:42 +0000
committerDr. Stephen Henson <steve@openssl.org>2015-03-24 12:03:36 +0000
commit5fe736e5fc29353706c2c1a5ae8bd97f3d7a35e9 (patch)
tree3dce872da695ad18bebda3cffc0e60bb1b8345b3 /crypto/cms
parent0dfb9398bb6493d5a56216e0c7039cb3f9fc88c6 (diff)
Move some ASN.1 internals to asn1_int.h
Move ASN.1 internals used across multiple directories into new internal header file asn1_int.h remove crypto/Makefile hack which allowed other directories to include "asn1_locl.h" Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/cms')
-rw-r--r--crypto/cms/cms_env.c2
-rw-r--r--crypto/cms/cms_kari.c2
-rw-r--r--crypto/cms/cms_pwri.c2
-rw-r--r--crypto/cms/cms_sd.c2
-rw-r--r--crypto/cms/cms_smime.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 624c3f268f..d1252f8d87 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -61,7 +61,7 @@
#include <openssl/rand.h>
#include <openssl/aes.h>
#include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
/* CMS EnvelopedData Utilities */
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index f8a6cbadb0..196b5c60f1 100644
--- a/crypto/cms/cms_kari.c
+++ b/crypto/cms/cms_kari.c
@@ -61,7 +61,7 @@
#include <openssl/rand.h>
#include <openssl/aes.h>
#include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
DECLARE_ASN1_ITEM(CMS_KeyAgreeRecipientInfo)
DECLARE_ASN1_ITEM(CMS_RecipientEncryptedKey)
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index 6729930920..dd5f636145 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -61,7 +61,7 @@
#include <openssl/rand.h>
#include <openssl/aes.h>
#include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
unsigned char *pass, ossl_ssize_t passlen)
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index a936ded188..b8ed1a1bea 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -60,7 +60,7 @@
#include <openssl/err.h>
#include <openssl/cms.h>
#include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
/* CMS SignedData Utilities */
diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index acf5c58011..6f6f20d63a 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -59,7 +59,7 @@
#include <openssl/err.h>
#include <openssl/cms.h>
#include "cms_lcl.h"
-#include "asn1_locl.h"
+#include "internal/asn1_int.h"
static BIO *cms_get_text_bio(BIO *out, unsigned int flags)
{