1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-06-02 08:09:49 -04:00

Switch to C++11 for Kaitai-generated parsers

This commit is contained in:
Nikolaj Schlej 2023-02-26 13:23:25 -08:00
parent 255742f371
commit 75bf036137
15 changed files with 316 additions and 745 deletions
common/generated

View file

@ -1,10 +1,10 @@
#ifndef INTEL_KEYM_V2_H_
#define INTEL_KEYM_V2_H_
#pragma once
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
#include "../kaitai/kaitaistruct.h"
#include <stdint.h>
#include <memory>
#include <vector>
#if KAITAI_STRUCT_VERSION < 9000L
@ -31,7 +31,7 @@ public:
KM_USAGE_FLAGS_SDEV = 8
};
intel_keym_v2_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, intel_keym_v2_t* p__root = 0);
intel_keym_v2_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = nullptr, intel_keym_v2_t* p__root = nullptr);
private:
void _read();
@ -44,7 +44,7 @@ public:
public:
key_signature_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
key_signature_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = nullptr, intel_keym_v2_t* p__root = nullptr);
private:
void _read();
@ -56,18 +56,18 @@ public:
private:
uint8_t m_version;
uint16_t m_key_id;
public_key_t* m_public_key;
std::unique_ptr<public_key_t> m_public_key;
uint16_t m_sig_scheme;
signature_t* m_signature;
std::unique_ptr<signature_t> m_signature;
intel_keym_v2_t* m__root;
intel_keym_v2_t* m__parent;
public:
uint8_t version() const { return m_version; }
uint16_t key_id() const { return m_key_id; }
public_key_t* public_key() const { return m_public_key; }
public_key_t* public_key() const { return m_public_key.get(); }
uint16_t sig_scheme() const { return m_sig_scheme; }
signature_t* signature() const { return m_signature; }
signature_t* signature() const { return m_signature.get(); }
intel_keym_v2_t* _root() const { return m__root; }
intel_keym_v2_t* _parent() const { return m__parent; }
};
@ -76,7 +76,7 @@ public:
public:
km_hash_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
km_hash_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = nullptr, intel_keym_v2_t* p__root = nullptr);
private:
void _read();
@ -106,7 +106,7 @@ public:
public:
signature_t(kaitai::kstream* p__io, intel_keym_v2_t::key_signature_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
signature_t(kaitai::kstream* p__io, intel_keym_v2_t::key_signature_t* p__parent = nullptr, intel_keym_v2_t* p__root = nullptr);
private:
void _read();
@ -136,7 +136,7 @@ public:
public:
public_key_t(kaitai::kstream* p__io, intel_keym_v2_t::key_signature_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
public_key_t(kaitai::kstream* p__io, intel_keym_v2_t::key_signature_t* p__parent = nullptr, intel_keym_v2_t* p__root = nullptr);
private:
void _read();
@ -166,7 +166,7 @@ public:
public:
header_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
header_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = nullptr, intel_keym_v2_t* p__root = nullptr);
private:
void _read();
@ -193,32 +193,30 @@ public:
};
private:
header_t* m_header;
std::unique_ptr<header_t> m_header;
uint16_t m_key_signature_offset;
std::vector<uint8_t>* m_reserved;
std::unique_ptr<std::vector<uint8_t>> m_reserved;
uint8_t m_km_version;
uint8_t m_km_svn;
uint8_t m_km_id;
uint16_t m_fpf_hash_algorithm_id;
uint16_t m_num_km_hashes;
std::vector<km_hash_t*>* m_km_hashes;
key_signature_t* m_key_signature;
std::unique_ptr<std::vector<std::unique_ptr<km_hash_t>>> m_km_hashes;
std::unique_ptr<key_signature_t> m_key_signature;
intel_keym_v2_t* m__root;
kaitai::kstruct* m__parent;
public:
header_t* header() const { return m_header; }
header_t* header() const { return m_header.get(); }
uint16_t key_signature_offset() const { return m_key_signature_offset; }
std::vector<uint8_t>* reserved() const { return m_reserved; }
std::vector<uint8_t>* reserved() const { return m_reserved.get(); }
uint8_t km_version() const { return m_km_version; }
uint8_t km_svn() const { return m_km_svn; }
uint8_t km_id() const { return m_km_id; }
uint16_t fpf_hash_algorithm_id() const { return m_fpf_hash_algorithm_id; }
uint16_t num_km_hashes() const { return m_num_km_hashes; }
std::vector<km_hash_t*>* km_hashes() const { return m_km_hashes; }
key_signature_t* key_signature() const { return m_key_signature; }
std::vector<std::unique_ptr<km_hash_t>>* km_hashes() const { return m_km_hashes.get(); }
key_signature_t* key_signature() const { return m_key_signature.get(); }
intel_keym_v2_t* _root() const { return m__root; }
kaitai::kstruct* _parent() const { return m__parent; }
};
#endif // INTEL_KEYM_V2_H_