Fix visability issues.

This commit is contained in:
2019-09-14 09:24:03 +01:00
parent ed1add2c60
commit 1093294b61
8 changed files with 12 additions and 8 deletions

View File

@@ -22,7 +22,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <vector> #include <vector>
struct U2FMessage { struct U2FMessage {
public:
uint32_t cid; uint32_t cid;
uint8_t cmd; uint8_t cmd;
std::vector<uint8_t> data; std::vector<uint8_t> data;

View File

@@ -20,7 +20,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "Storage.hpp" #include "Storage.hpp"
#include "U2F_Msg_CMD.hpp" #include "U2F_Msg_CMD.hpp"
struct U2F_Authenticate_APDU : U2F_Msg_CMD { class U2F_Authenticate_APDU : public U2F_Msg_CMD {
protected:
uint8_t controlByte; uint8_t controlByte;
std::array<uint8_t, 32> challengeP; std::array<uint8_t, 32> challengeP;
Storage::AppParam appParam; Storage::AppParam appParam;
@@ -31,6 +32,7 @@ public:
virtual void respond(const uint32_t channelID) const override; virtual void respond(const uint32_t channelID) const override;
protected:
enum ControlCode { enum ControlCode {
CheckOnly = 0x07, CheckOnly = 0x07,
EnforcePresenceSign = 0x03, EnforcePresenceSign = 0x03,

View File

@@ -20,7 +20,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "U2FMessage.hpp" #include "U2FMessage.hpp"
#include <memory> #include <memory>
struct U2F_CMD { class U2F_CMD {
protected: protected:
U2F_CMD() = default; U2F_CMD() = default;

View File

@@ -22,7 +22,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
struct U2F_Init_CMD : U2F_CMD { class U2F_Init_CMD : public U2F_CMD {
protected:
uint64_t nonce; uint64_t nonce;
public: public:

View File

@@ -23,7 +23,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <memory> #include <memory>
#include <vector> #include <vector>
struct U2F_Msg_CMD : U2F_CMD { struct U2F_Msg_CMD : public U2F_CMD {
uint8_t cla; uint8_t cla;
uint8_t ins; uint8_t ins;
uint8_t p1; uint8_t p1;

View File

@@ -22,7 +22,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
struct U2F_Ping_CMD : U2F_CMD { class U2F_Ping_CMD : public U2F_CMD {
protected:
std::vector<uint8_t> nonce; std::vector<uint8_t> nonce;
public: public:

View File

@@ -20,7 +20,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "Storage.hpp" #include "Storage.hpp"
#include "U2F_Msg_CMD.hpp" #include "U2F_Msg_CMD.hpp"
struct U2F_Register_APDU : U2F_Msg_CMD { class U2F_Register_APDU : public U2F_Msg_CMD {
protected:
std::array<uint8_t, 32> challengeP; std::array<uint8_t, 32> challengeP;
Storage::AppParam appP; Storage::AppParam appP;
Storage::KeyHandle keyH; Storage::KeyHandle keyH;

View File

@@ -19,7 +19,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#pragma once #pragma once
#include "U2F_Msg_CMD.hpp" #include "U2F_Msg_CMD.hpp"
struct U2F_Version_APDU : U2F_Msg_CMD { class U2F_Version_APDU : public U2F_Msg_CMD {
public: public:
U2F_Version_APDU(const U2F_Msg_CMD& msg, const std::vector<uint8_t>& data); U2F_Version_APDU(const U2F_Msg_CMD& msg, const std::vector<uint8_t>& data);
void respond(const uint32_t channelID) const override; void respond(const uint32_t channelID) const override;