diff options
author | Jack Lloyd <[email protected]> | 2017-01-05 18:40:30 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2017-01-05 18:40:30 -0500 |
commit | c1d47622ae157ef353e4fe9b7849246516678b9d (patch) | |
tree | 991585f9ab05fc69a69145343a424f22a39ce342 /src/lib | |
parent | 1df7574b3715848ead3ba349069a9f57ba9ac5df (diff) | |
parent | d5f42acd711194c4738859180471b0bd82bc00cb (diff) |
Merge GH #804 Move Data_Store type to x509 module
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/utils/datastor/info.txt | 0 | ||||
-rw-r--r-- | src/lib/x509/certstor_sql/info.txt | 3 | ||||
-rw-r--r-- | src/lib/x509/datastor.cpp (renamed from src/lib/utils/datastor/datastor.cpp) | 0 | ||||
-rw-r--r-- | src/lib/x509/datastor.h (renamed from src/lib/utils/datastor/datastor.h) | 4 | ||||
-rw-r--r-- | src/lib/x509/info.txt | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/utils/datastor/info.txt b/src/lib/utils/datastor/info.txt deleted file mode 100644 index e69de29bb..000000000 --- a/src/lib/utils/datastor/info.txt +++ /dev/null diff --git a/src/lib/x509/certstor_sql/info.txt b/src/lib/x509/certstor_sql/info.txt index cfdd521a2..619784e70 100644 --- a/src/lib/x509/certstor_sql/info.txt +++ b/src/lib/x509/certstor_sql/info.txt @@ -1,5 +1,2 @@ define CERTSTOR_SQL 20160818 -<requires> -datastor -</requires> diff --git a/src/lib/utils/datastor/datastor.cpp b/src/lib/x509/datastor.cpp index ae6b1e45c..ae6b1e45c 100644 --- a/src/lib/utils/datastor/datastor.cpp +++ b/src/lib/x509/datastor.cpp diff --git a/src/lib/utils/datastor/datastor.h b/src/lib/x509/datastor.h index ee9ef219a..e5e8b3f1b 100644 --- a/src/lib/utils/datastor/datastor.h +++ b/src/lib/x509/datastor.h @@ -19,6 +19,10 @@ namespace Botan { /** * Data Store +* +* This class is used internally by the library, and exposed for ABI +* reasons. There is no reason for applications to use this type directly. +* It will be removed in a future major release. */ class BOTAN_DLL Data_Store { diff --git a/src/lib/x509/info.txt b/src/lib/x509/info.txt index 7e6afc5ad..b1a0ab414 100644 --- a/src/lib/x509/info.txt +++ b/src/lib/x509/info.txt @@ -3,7 +3,6 @@ define OCSP 20161118 <requires> asn1 -datastor pubkey sha1 </requires> |