80809ace67
Selected the [Botan crypto library](https://github.com/randombit/botan) due to its feature list, maintainer support, availability across all deployment platforms, and ease of use. Also evaluated Crypto++ as a viable candidate, but the additional features of Botan (PKCS#11, TPM, etc) won out. The random number generator received a backend upgrade. Botan prefers hardware-based RNG's and will provide one if available. This is transparent to KeePassXC and a significant improvement over gcrypt. Replaced Argon2 library with built-in Botan implementation that supports i, d, and id. This requires Botan 2.11.0 or higher. Also simplified the parameter test across KDF's. Aligned SymmetricCipher parameters with available modes. All encrypt and decrypt operations are done in-place instead of returning new objects. This allows use of secure vectors in the future with no additional overhead. Took this opportunity to decouple KeeShare from SSH Agent. Removed leftover code from OpenSSHKey and consolidated the SSH Agent code into the same directory. Removed bcrypt and blowfish inserts since they are provided by Botan. Additionally simplified KeeShare settings interface by removing raw certificate byte data from the user interface. KeeShare will be further refactored in a future PR. NOTE: This PR breaks backwards compatibility with KeeShare certificates due to different RSA key storage with Botan. As a result, new "own" certificates will need to be generated and trust re-established. Removed YKChallengeResponseKeyCLI in favor of just using the original implementation with signal/slots. Removed TestRandom stub since it was just faking random numbers and not actually using the backend. TestRandomGenerator now uses the actual RNG. Greatly simplified Secret Service plugin's use of crypto functions with Botan.
82 lines
2.4 KiB
C++
82 lines
2.4 KiB
C++
/*
|
|
* Copyright (C) 2017 Toni Spets <toni.spets@iki.fi>
|
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
|
*
|
|
* This program 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 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* This program 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, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef KEEPASSXC_OPENSSHKEY_H
|
|
#define KEEPASSXC_OPENSSHKEY_H
|
|
|
|
#include <QCryptographicHash>
|
|
#include <QObject>
|
|
|
|
class BinaryStream;
|
|
|
|
class OpenSSHKey : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit OpenSSHKey(QObject* parent = nullptr);
|
|
OpenSSHKey(const OpenSSHKey& other);
|
|
bool operator==(const OpenSSHKey& other) const;
|
|
|
|
bool parsePKCS1PEM(const QByteArray& in);
|
|
bool encrypted() const;
|
|
bool openKey(const QString& passphrase = QString());
|
|
|
|
const QString cipherName() const;
|
|
const QString type() const;
|
|
const QString fingerprint(QCryptographicHash::Algorithm algo = QCryptographicHash::Sha256) const;
|
|
const QString comment() const;
|
|
const QString publicKey() const;
|
|
const QString errorString() const;
|
|
|
|
void setType(const QString& type);
|
|
void setPublicData(const QList<QByteArray>& data);
|
|
void setPrivateData(const QList<QByteArray>& data);
|
|
void setComment(const QString& comment);
|
|
|
|
void clearPrivate();
|
|
|
|
bool readPublic(BinaryStream& stream);
|
|
bool readPrivate(BinaryStream& stream);
|
|
bool writePublic(BinaryStream& stream);
|
|
bool writePrivate(BinaryStream& stream);
|
|
|
|
static const QString TYPE_DSA_PRIVATE;
|
|
static const QString TYPE_RSA_PRIVATE;
|
|
static const QString TYPE_OPENSSH_PRIVATE;
|
|
|
|
private:
|
|
bool extractPEM(const QByteArray& in, QByteArray& out);
|
|
|
|
QString m_type;
|
|
QString m_cipherName;
|
|
QByteArray m_cipherIV;
|
|
QString m_kdfName;
|
|
QByteArray m_kdfOptions;
|
|
|
|
QString m_rawType;
|
|
QByteArray m_rawData;
|
|
QList<QByteArray> m_rawPublicData;
|
|
QList<QByteArray> m_rawPrivateData;
|
|
QString m_comment;
|
|
QString m_error;
|
|
};
|
|
|
|
uint qHash(const OpenSSHKey& key);
|
|
|
|
#endif // KEEPASSXC_OPENSSHKEY_H
|