aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-11-06 15:27:33 +0000
committerlloyd <[email protected]>2012-11-06 15:27:33 +0000
commite4622803c9e91e14942eae91f041e879bf8957fb (patch)
tree985b7e4487d1c65f60976107ee29848116ffe5c2
parent9fa2b506ec836b9438ad0b81c881f63b37e934cc (diff)
Rename asn1_int to asn1_obj as it actually declares ASN1_Object
-rw-r--r--src/asn1/alg_id.h2
-rw-r--r--src/asn1/asn1_alt_name.h2
-rw-r--r--src/asn1/asn1_attribute.cpp (renamed from src/asn1/asn1_att.cpp)0
-rw-r--r--src/asn1/asn1_attribute.h2
-rw-r--r--src/asn1/asn1_obj.cpp (renamed from src/asn1/asn1_int.cpp)2
-rw-r--r--src/asn1/asn1_obj.h (renamed from src/asn1/asn1_int.h)0
-rw-r--r--src/asn1/asn1_oid.h2
-rw-r--r--src/asn1/asn1_str.h2
-rw-r--r--src/asn1/asn1_time.cpp (renamed from src/asn1/asn1_tm.cpp)0
-rw-r--r--src/asn1/asn1_time.h2
-rw-r--r--src/asn1/der_enc.cpp2
-rw-r--r--src/asn1/der_enc.h2
-rw-r--r--src/asn1/x509_dn.h2
-rw-r--r--src/cert/x509/x509_ext.h2
-rw-r--r--src/cert/x509/x509_obj.h2
-rw-r--r--src/cms/cms_dec.cpp2
16 files changed, 13 insertions, 13 deletions
diff --git a/src/asn1/alg_id.h b/src/asn1/alg_id.h
index 1ec6b62d3..d8b40e700 100644
--- a/src/asn1/alg_id.h
+++ b/src/asn1/alg_id.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_ALGORITHM_IDENTIFIER_H__
#define BOTAN_ALGORITHM_IDENTIFIER_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
#include <string>
diff --git a/src/asn1/asn1_alt_name.h b/src/asn1/asn1_alt_name.h
index b71be1ff7..f2c83ed2c 100644
--- a/src/asn1/asn1_alt_name.h
+++ b/src/asn1/asn1_alt_name.h
@@ -9,7 +9,7 @@
#ifndef BOTAN_ASN1_ALT_NAME_H__
#define BOTAN_ASN1_ALT_NAME_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/asn1_str.h>
#include <botan/asn1_oid.h>
#include <map>
diff --git a/src/asn1/asn1_att.cpp b/src/asn1/asn1_attribute.cpp
index dff52bef9..dff52bef9 100644
--- a/src/asn1/asn1_att.cpp
+++ b/src/asn1/asn1_attribute.cpp
diff --git a/src/asn1/asn1_attribute.h b/src/asn1/asn1_attribute.h
index b51811015..877135803 100644
--- a/src/asn1/asn1_attribute.h
+++ b/src/asn1/asn1_attribute.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_ASN1_ATTRIBUTE_H__
#define BOTAN_ASN1_ATTRIBUTE_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
#include <vector>
diff --git a/src/asn1/asn1_int.cpp b/src/asn1/asn1_obj.cpp
index ff8eba54e..898e91614 100644
--- a/src/asn1/asn1_int.cpp
+++ b/src/asn1/asn1_obj.cpp
@@ -5,7 +5,7 @@
* Distributed under the terms of the Botan license
*/
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/der_enc.h>
#include <botan/ber_dec.h>
#include <botan/data_src.h>
diff --git a/src/asn1/asn1_int.h b/src/asn1/asn1_obj.h
index 564f4ecdb..564f4ecdb 100644
--- a/src/asn1/asn1_int.h
+++ b/src/asn1/asn1_obj.h
diff --git a/src/asn1/asn1_oid.h b/src/asn1/asn1_oid.h
index 9d712b256..78594265d 100644
--- a/src/asn1/asn1_oid.h
+++ b/src/asn1/asn1_oid.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_ASN1_OID_H__
#define BOTAN_ASN1_OID_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <string>
#include <vector>
diff --git a/src/asn1/asn1_str.h b/src/asn1/asn1_str.h
index ba43b0e94..42f1ef5ae 100644
--- a/src/asn1/asn1_str.h
+++ b/src/asn1/asn1_str.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_ASN1_STRING_H__
#define BOTAN_ASN1_STRING_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
namespace Botan {
diff --git a/src/asn1/asn1_tm.cpp b/src/asn1/asn1_time.cpp
index b1093158c..b1093158c 100644
--- a/src/asn1/asn1_tm.cpp
+++ b/src/asn1/asn1_time.cpp
diff --git a/src/asn1/asn1_time.h b/src/asn1/asn1_time.h
index ca8449178..3e7e0ef1c 100644
--- a/src/asn1/asn1_time.h
+++ b/src/asn1/asn1_time.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_ASN1_TIME_H__
#define BOTAN_ASN1_TIME_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <chrono>
namespace Botan {
diff --git a/src/asn1/der_enc.cpp b/src/asn1/der_enc.cpp
index c451eae34..c1e5fd45c 100644
--- a/src/asn1/der_enc.cpp
+++ b/src/asn1/der_enc.cpp
@@ -6,7 +6,7 @@
*/
#include <botan/der_enc.h>
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/bigint.h>
#include <botan/get_byte.h>
#include <botan/parsing.h>
diff --git a/src/asn1/der_enc.h b/src/asn1/der_enc.h
index 3234445ca..61efb27b1 100644
--- a/src/asn1/der_enc.h
+++ b/src/asn1/der_enc.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_DER_ENCODER_H__
#define BOTAN_DER_ENCODER_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <vector>
namespace Botan {
diff --git a/src/asn1/x509_dn.h b/src/asn1/x509_dn.h
index f8dc9e782..e37fe6627 100644
--- a/src/asn1/x509_dn.h
+++ b/src/asn1/x509_dn.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_X509_DN_H__
#define BOTAN_X509_DN_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
#include <botan/asn1_str.h>
#include <map>
diff --git a/src/cert/x509/x509_ext.h b/src/cert/x509/x509_ext.h
index 07da1b8f8..20be18a71 100644
--- a/src/cert/x509/x509_ext.h
+++ b/src/cert/x509/x509_ext.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_X509_EXTENSIONS_H__
#define BOTAN_X509_EXTENSIONS_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
#include <botan/datastor.h>
#include <botan/crl_ent.h>
diff --git a/src/cert/x509/x509_obj.h b/src/cert/x509/x509_obj.h
index 42aead195..5905e1b37 100644
--- a/src/cert/x509/x509_obj.h
+++ b/src/cert/x509/x509_obj.h
@@ -8,7 +8,7 @@
#ifndef BOTAN_X509_OBJECT_H__
#define BOTAN_X509_OBJECT_H__
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/pipe.h>
#include <botan/x509_key.h>
#include <botan/rng.h>
diff --git a/src/cms/cms_dec.cpp b/src/cms/cms_dec.cpp
index a9f4e69d9..744ff4d63 100644
--- a/src/cms/cms_dec.cpp
+++ b/src/cms/cms_dec.cpp
@@ -7,7 +7,7 @@
#include <botan/cms_dec.h>
#include <botan/ber_dec.h>
-#include <botan/asn1_int.h>
+#include <botan/asn1_obj.h>
#include <botan/oids.h>
#include <botan/pem.h>