diff --git a/src/smartcard/card.cpp b/src/smartcard/card.cpp index 32eeca901..b3947ca2f 100644 --- a/src/smartcard/card.cpp +++ b/src/smartcard/card.cpp @@ -1,150 +1,169 @@ /* smartcard/card.h This file is part of Kleopatra, the KDE keymanager Copyright (c) 2017 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH + Copyright (c) 2020 by g10 Code GmbH Kleopatra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Kleopatra is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #include "card.h" using namespace Kleo; using namespace Kleo::SmartCard; -Card::Card(): mCanLearn(false), - mHasNullPin(false), - mStatus(Status::NoCard), - mAppType(UnknownApplication), - mAppVersion(-1) { +class Card::Private +{ +public: + Private(): mCanLearn(false), + mHasNullPin(false), + mStatus(Status::NoCard), + mAppType(UnknownApplication), + mAppVersion(-1) + { + } + + bool mCanLearn; + bool mHasNullPin; + Status mStatus; + std::string mSerialNumber; + AppType mAppType; + int mAppVersion; + std::vector mPinStates; + int mSlot; + QString mErrMsg; +}; + +Card::Card(): d(new Private()) { } void Card::setStatus(Status s) { - mStatus = s; + d->mStatus = s; } Card::Status Card::status() const { - return mStatus; + return d->mStatus; } void Card::setSerialNumber(const std::string &sn) { - mSerialNumber = sn; + d->mSerialNumber = sn; } std::string Card::serialNumber() const { - return mSerialNumber; + return d->mSerialNumber; } Card::AppType Card::appType() const { - return mAppType; + return d->mAppType; } void Card::setAppType(AppType t) { - mAppType = t; + d->mAppType = t; } void Card::setAppVersion(int version) { - mAppVersion = version; + d->mAppVersion = version; } int Card::appVersion() const { - return mAppVersion; + return d->mAppVersion; } std::vector Card::pinStates() const { - return mPinStates; + return d->mPinStates; } void Card::setPinStates(const std::vector &pinStates) { - mPinStates = pinStates; + d->mPinStates = pinStates; } void Card::setSlot(int slot) { - mSlot = slot; + d->mSlot = slot; } int Card::slot() const { - return mSlot; + return d->mSlot; } bool Card::hasNullPin() const { - return mHasNullPin; + return d->mHasNullPin; } void Card::setHasNullPin(bool value) { - mHasNullPin = value; + d->mHasNullPin = value; } bool Card::canLearnKeys() const { - return mCanLearn; + return d->mCanLearn; } void Card::setCanLearnKeys(bool value) { - mCanLearn = value; + d->mCanLearn = value; } bool Card::operator == (const Card& other) const { - return mStatus == other.status() - && mSerialNumber == other.serialNumber() - && mAppType == other.appType() - && mAppVersion == other.appVersion() - && mPinStates == other.pinStates() - && mSlot == other.slot() - && mCanLearn == other.canLearnKeys() - && mHasNullPin == other.hasNullPin(); + return d->mStatus == other.status() + && d->mSerialNumber == other.serialNumber() + && d->mAppType == other.appType() + && d->mAppVersion == other.appVersion() + && d->mPinStates == other.pinStates() + && d->mSlot == other.slot() + && d->mCanLearn == other.canLearnKeys() + && d->mHasNullPin == other.hasNullPin(); } bool Card::operator != (const Card& other) const { return !operator==(other); } void Card::setErrorMsg(const QString &msg) { - mErrMsg = msg; + d->mErrMsg = msg; } QString Card::errorMsg() const { - return mErrMsg; + return d->mErrMsg; } diff --git a/src/smartcard/card.h b/src/smartcard/card.h index a82ec3697..235d88c2e 100644 --- a/src/smartcard/card.h +++ b/src/smartcard/card.h @@ -1,130 +1,124 @@ #ifndef SMARTCARD_CARD_H #define SMARTCARD_CARD_H /* smartcard/card.h This file is part of Kleopatra, the KDE keymanager Copyright (c) 2017 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH Kleopatra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Kleopatra is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #include #include +#include #include namespace Kleo { namespace SmartCard { class ReaderStatus; /** Class to work with Smartcards or other Hardware tokens. */ class Card { public: enum AppType { UnknownApplication, OpenPGPApplication, NksApplication, P15Application, DinSigApplication, GeldkarteApplication, NumAppTypes }; enum PinState { UnknownPinState, NullPin, PinBlocked, NoPin, PinOk, NumPinStates }; enum Status { NoCard, CardPresent, CardActive, CardUsable, _NumScdStates, CardError = _NumScdStates, NumStates }; Card(); virtual ~Card() {} virtual bool operator == (const Card& other) const; bool operator != (const Card& other) const; void setStatus(Status s); Status status() const; virtual void setSerialNumber(const std::string &sn); std::string serialNumber() const; AppType appType() const; void setAppType(AppType type); void setAppVersion(int version); int appVersion() const; std::vector pinStates() const; void setPinStates(const std::vector &pinStates); void setSlot(int slot); int slot() const; bool hasNullPin() const; void setHasNullPin(bool value); bool canLearnKeys() const; void setCanLearnKeys(bool value); QString errorMsg() const; void setErrorMsg(const QString &msg); private: - bool mCanLearn; - bool mHasNullPin; - Status mStatus; - std::string mSerialNumber; - AppType mAppType; - int mAppVersion; - std::vector mPinStates; - int mSlot; - QString mErrMsg; + class Private; + std::shared_ptr d; }; } // namespace Smartcard } // namespace Kleopatra #endif // SMARTCARD_CARD_H