Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-09 11:18:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Botan: don't call deprecated functions (#10826)

Browse Source 
* Botan: use raw_private_key_bits() if available

Botan 3.x introduces raw_private_key_bits() as an alias for
get_private_key(), and deprecates the latter.

* Botan: use Cipher_Dir::Encryption

Botan 3.x introduces Cipher_Dir::Encryption as an alias for
Cipher_Dir::ENCRYPTION, and deprecates the latter. Likewise for
Decryption/DECRYPTION.
This commit is contained in:
Carlo Teubner 2024-06-01 20:53:35 +01:00 committed by GitHub
parent 5de669eb7b
commit 9288bef4f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/browser/BrowserPasskeys.cpp
View File

@ -19,6 +19,7 @@
#include "BrowserMessageBuilder.h" #include "BrowserMessageBuilder.h"
#include "BrowserService.h" #include "BrowserService.h"
#include "PasskeyUtils.h" #include "PasskeyUtils.h"
#include "config-keepassx.h"
#include "crypto/Random.h" #include "crypto/Random.h"
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>
@ -276,7 +277,11 @@ BrowserPasskeys::buildCredentialPrivateKey(int alg, const QString& predefinedFir
try { try {
Botan::Ed25519_PrivateKey key(*randomGen()->getRng()); Botan::Ed25519_PrivateKey key(*randomGen()->getRng());
auto publicKey = key.get_public_key(); auto publicKey = key.get_public_key();
#ifdef WITH_XC_BOTAN3
auto privateKey = key.raw_private_key_bits();
#else
auto privateKey = key.get_private_key(); auto privateKey = key.get_private_key();
#endif
firstPart = browserMessageBuilder()->getQByteArray(publicKey.data(), publicKey.size()); firstPart = browserMessageBuilder()->getQByteArray(publicKey.data(), publicKey.size());
secondPart = browserMessageBuilder()->getQByteArray(privateKey.data(), privateKey.size()); secondPart = browserMessageBuilder()->getQByteArray(privateKey.data(), privateKey.size());

4
src/crypto/SymmetricCipher.cpp
View File

@ -34,7 +34,11 @@ bool SymmetricCipher::init(Mode mode, Direction direction, const QByteArray& key
try { try {
auto botanMode = modeToString(mode); auto botanMode = modeToString(mode);
auto botanDirection = auto botanDirection =
#ifdef WITH_XC_BOTAN3
(direction == SymmetricCipher::Encrypt ? Botan::Cipher_Dir::Encryption : Botan::Cipher_Dir::Decryption);
#else
(direction == SymmetricCipher::Encrypt ? Botan::Cipher_Dir::ENCRYPTION : Botan::Cipher_Dir::DECRYPTION); (direction == SymmetricCipher::Encrypt ? Botan::Cipher_Dir::ENCRYPTION : Botan::Cipher_Dir::DECRYPTION);
#endif
auto cipher = Botan::Cipher_Mode::create_or_throw(botanMode.toStdString(), botanDirection); auto cipher = Botan::Cipher_Mode::create_or_throw(botanMode.toStdString(), botanDirection);
m_cipher.reset(cipher.release()); m_cipher.reset(cipher.release());

5
src/sshagent/OpenSSHKeyGen.cpp
View File

@ -18,6 +18,7 @@
#include "OpenSSHKeyGen.h" #include "OpenSSHKeyGen.h"
#include "BinaryStream.h" #include "BinaryStream.h"
#include "OpenSSHKey.h" #include "OpenSSHKey.h"
#include "config-keepassx.h"
#include "crypto/Random.h" #include "crypto/Random.h"
#include <botan/ecdsa.h> #include <botan/ecdsa.h>
@ -126,7 +127,11 @@ namespace OpenSSHKeyGen
QByteArray privateData; QByteArray privateData;
BinaryStream privateStream(&privateData); BinaryStream privateStream(&privateData);
vectorToStream(ed25519Key.get_public_key(), privateStream); vectorToStream(ed25519Key.get_public_key(), privateStream);
#ifdef WITH_XC_BOTAN3
vectorToStream(ed25519Key.raw_private_key_bits(), privateStream);
#else
vectorToStream(ed25519Key.get_private_key(), privateStream); vectorToStream(ed25519Key.get_private_key(), privateStream);
#endif
key.setType("ssh-ed25519"); key.setType("ssh-ed25519");
key.setCheck(randomGen()->randomUInt(std::numeric_limits<quint32>::max() - 1) + 1); key.setCheck(randomGen()->randomUInt(std::numeric_limits<quint32>::max() - 1) + 1);