diff options
| author | Jack Lloyd <[email protected]> | 2020-10-31 06:48:12 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2020-10-31 06:54:27 -0400 |
| commit | ebe69cd491477707b12599bcf52d1416c6524080 (patch) | |
| tree | 063e778520f22a6561ed678bf04549f87f04798a /src/lib/pubkey/xmss | |
| parent | 57943a84c7b7a3f0881f2e4e2c4fab244601822b (diff) | |
Merge some of the ASN.1 headers
Deprecate asn1_str.h asn1_time.h asn1_oid.h and alg_id.h with all
contents moved to existing asn1_obj.h
Diffstat (limited to 'src/lib/pubkey/xmss')
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_privatekey.h | 2 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_publickey.h | 3 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_wots_privatekey.h | 2 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_wots_publickey.h | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/pubkey/xmss/xmss_privatekey.h b/src/lib/pubkey/xmss/xmss_privatekey.h index 7d219f8ba..97e431dd6 100644 --- a/src/lib/pubkey/xmss/xmss_privatekey.h +++ b/src/lib/pubkey/xmss/xmss_privatekey.h @@ -11,7 +11,7 @@ #include <cstddef> #include <iterator> #include <memory> -#include <botan/alg_id.h> +#include <botan/asn1_obj.h> #include <botan/exceptn.h> #include <botan/pk_keys.h> #include <botan/types.h> diff --git a/src/lib/pubkey/xmss/xmss_publickey.h b/src/lib/pubkey/xmss/xmss_publickey.h index faea04d15..bd7187d4c 100644 --- a/src/lib/pubkey/xmss/xmss_publickey.h +++ b/src/lib/pubkey/xmss/xmss_publickey.h @@ -13,8 +13,7 @@ #include <iterator> #include <memory> #include <string> -#include <botan/alg_id.h> -#include <botan/asn1_oid.h> +#include <botan/asn1_obj.h> #include <botan/der_enc.h> #include <botan/exceptn.h> #include <botan/rng.h> diff --git a/src/lib/pubkey/xmss/xmss_wots_privatekey.h b/src/lib/pubkey/xmss/xmss_wots_privatekey.h index 550bfb86b..e6dea133d 100644 --- a/src/lib/pubkey/xmss/xmss_wots_privatekey.h +++ b/src/lib/pubkey/xmss/xmss_wots_privatekey.h @@ -10,7 +10,7 @@ #include <cstddef> #include <memory> -#include <botan/alg_id.h> +#include <botan/asn1_obj.h> #include <botan/exceptn.h> #include <botan/pk_keys.h> #include <botan/rng.h> diff --git a/src/lib/pubkey/xmss/xmss_wots_publickey.h b/src/lib/pubkey/xmss/xmss_wots_publickey.h index f9d5d62c7..324764be2 100644 --- a/src/lib/pubkey/xmss/xmss_wots_publickey.h +++ b/src/lib/pubkey/xmss/xmss_wots_publickey.h @@ -11,12 +11,10 @@ #include <cstddef> #include <string> #include <vector> -#include <botan/alg_id.h> #include <botan/rng.h> -#include <botan/asn1_oid.h> +#include <botan/asn1_obj.h> #include <botan/exceptn.h> #include <botan/pk_keys.h> -#include <botan/types.h> #include <botan/xmss_wots_parameters.h> #include <botan/xmss_address.h> #include <botan/xmss_hash.h> |