From 663b8dcb0826295a701b5891924658f870b5cabc Mon Sep 17 00:00:00 2001 From: angelsl Date: Sun, 12 Nov 2017 21:21:26 +0800 Subject: [PATCH] Remove unused SymmetricCipherSalsa20 --- src/crypto/SymmetricCipherSalsa20.cpp | 112 -------------------------- src/crypto/SymmetricCipherSalsa20.h | 53 ------------ 2 files changed, 165 deletions(-) delete mode 100644 src/crypto/SymmetricCipherSalsa20.cpp delete mode 100644 src/crypto/SymmetricCipherSalsa20.h diff --git a/src/crypto/SymmetricCipherSalsa20.cpp b/src/crypto/SymmetricCipherSalsa20.cpp deleted file mode 100644 index 7e477656..00000000 --- a/src/crypto/SymmetricCipherSalsa20.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/* -* Copyright (C) 2010 Felix Geyer -* -* 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 . -*/ - -#include "SymmetricCipherSalsa20.h" - -SymmetricCipherSalsa20::SymmetricCipherSalsa20(SymmetricCipher::Algorithm algo, SymmetricCipher::Mode mode, - SymmetricCipher::Direction direction) -{ - Q_ASSERT(algo == SymmetricCipher::Salsa20); - Q_UNUSED(algo); - - Q_ASSERT(mode == SymmetricCipher::Stream); - Q_UNUSED(mode); - - Q_UNUSED(direction); -} - -SymmetricCipherSalsa20::~SymmetricCipherSalsa20() -{ -} - -bool SymmetricCipherSalsa20::init() -{ - return true; -} - -bool SymmetricCipherSalsa20::setKey(const QByteArray& key) -{ - Q_ASSERT((key.size() == 16) || (key.size() == 32)); - - m_key = key; - ECRYPT_keysetup(&m_ctx, reinterpret_cast(m_key.constData()), m_key.size()*8, 64); - - return true; -} - -bool SymmetricCipherSalsa20::setIv(const QByteArray& iv) -{ - Q_ASSERT(iv.size() == 8); - - m_iv = iv; - ECRYPT_ivsetup(&m_ctx, reinterpret_cast(m_iv.constData())); - - return true; -} - -QByteArray SymmetricCipherSalsa20::process(const QByteArray& data, bool* ok) -{ - Q_ASSERT((data.size() < blockSize()) || ((data.size() % blockSize()) == 0)); - - QByteArray result; - result.resize(data.size()); - - ECRYPT_encrypt_bytes(&m_ctx, reinterpret_cast(data.constData()), - reinterpret_cast(result.data()), data.size()); - - *ok = true; - return result; -} - -bool SymmetricCipherSalsa20::processInPlace(QByteArray& data) -{ - Q_ASSERT((data.size() < blockSize()) || ((data.size() % blockSize()) == 0)); - - ECRYPT_encrypt_bytes(&m_ctx, reinterpret_cast(data.constData()), - reinterpret_cast(data.data()), data.size()); - - return true; -} - -bool SymmetricCipherSalsa20::processInPlace(QByteArray& data, quint64 rounds) -{ - Q_ASSERT((data.size() < blockSize()) || ((data.size() % blockSize()) == 0)); - - for (quint64 i = 0; i != rounds; ++i) { - ECRYPT_encrypt_bytes(&m_ctx, reinterpret_cast(data.constData()), - reinterpret_cast(data.data()), data.size()); - } - - return true; -} - -bool SymmetricCipherSalsa20::reset() -{ - ECRYPT_ivsetup(&m_ctx, reinterpret_cast(m_iv.constData())); - - return true; -} - -int SymmetricCipherSalsa20::blockSize() const -{ - return 64; -} - -QString SymmetricCipherSalsa20::errorString() const -{ - return QString(); -} diff --git a/src/crypto/SymmetricCipherSalsa20.h b/src/crypto/SymmetricCipherSalsa20.h deleted file mode 100644 index 443d4ec8..00000000 --- a/src/crypto/SymmetricCipherSalsa20.h +++ /dev/null @@ -1,53 +0,0 @@ -/* -* Copyright (C) 2010 Felix Geyer -* -* 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 . -*/ - -#ifndef KEEPASSX_SYMMETRICCIPHERSALSA20_H -#define KEEPASSX_SYMMETRICCIPHERSALSA20_H - -#include "crypto/SymmetricCipher.h" -#include "crypto/SymmetricCipherBackend.h" -#include "crypto/salsa20/ecrypt-sync.h" - -class SymmetricCipherSalsa20 : public SymmetricCipherBackend -{ -public: - SymmetricCipherSalsa20(SymmetricCipher::Algorithm algo, SymmetricCipher::Mode mode, - SymmetricCipher::Direction direction); - ~SymmetricCipherSalsa20(); - bool init(); - void setAlgorithm(SymmetricCipher::Algorithm algo); - void setMode(SymmetricCipher::Mode mode); - void setDirection(SymmetricCipher::Direction direction); - bool setKey(const QByteArray& key); - bool setIv(const QByteArray& iv); - - QByteArray process(const QByteArray& data, bool* ok); - bool processInPlace(QByteArray& data); - bool processInPlace(QByteArray& data, quint64 rounds); - - bool reset(); - int blockSize() const; - - QString errorString() const; - -private: - ECRYPT_ctx m_ctx; - QByteArray m_key; - QByteArray m_iv; -}; - -#endif // KEEPASSX_SYMMETRICCIPHERSALSA20_H