mirror of https://github.com/cutefishos/calamares
Merge branch 'issue-1254'
Adriaan de Groot
5 years ago
commit
f1d7b29f11
@ -0,0 +1,124 @@
|
||||
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2019-2020, Adriaan de Groot <groot@kde.org>
|
||||
*
|
||||
* Calamares 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Calamares 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 Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "Entropy.h"
|
||||
|
||||
#include <QFile>
|
||||
|
||||
#include <random>
|
||||
|
||||
CalamaresUtils::EntropySource
|
||||
CalamaresUtils::getEntropy( int size, QByteArray& b )
|
||||
{
|
||||
b.clear();
|
||||
if ( size < 1 )
|
||||
{
|
||||
return EntropySource::None;
|
||||
}
|
||||
|
||||
b.resize( size );
|
||||
char* buffer = b.data();
|
||||
std::fill( buffer, buffer + size, 0xcb );
|
||||
|
||||
int readSize = 0;
|
||||
QFile urandom( "/dev/urandom" );
|
||||
if ( urandom.exists() && urandom.open( QIODevice::ReadOnly ) )
|
||||
{
|
||||
readSize = urandom.read( buffer, size );
|
||||
urandom.close();
|
||||
}
|
||||
|
||||
if ( readSize >= size )
|
||||
{
|
||||
return EntropySource::URandom;
|
||||
}
|
||||
|
||||
// If it wasn't available, or did not return enough bytes,
|
||||
// complete it with twister (and tell the client).
|
||||
std::random_device r;
|
||||
std::seed_seq seed { r(), r(), r(), r(), r(), r(), r(), r() };
|
||||
std::mt19937_64 twister( seed );
|
||||
|
||||
std::uint64_t next = 0;
|
||||
do
|
||||
{
|
||||
next = twister();
|
||||
// Eight times, for a 64-bit next
|
||||
#define GET_ONE_BYTE \
|
||||
if ( readSize < size ) \
|
||||
{ \
|
||||
buffer[ readSize++ ] = next & 0xff; \
|
||||
next = next >> 8; \
|
||||
}
|
||||
GET_ONE_BYTE
|
||||
GET_ONE_BYTE
|
||||
GET_ONE_BYTE
|
||||
GET_ONE_BYTE
|
||||
GET_ONE_BYTE
|
||||
GET_ONE_BYTE
|
||||
GET_ONE_BYTE
|
||||
GET_ONE_BYTE
|
||||
} while ( readSize < size );
|
||||
|
||||
return EntropySource::Twister;
|
||||
}
|
||||
|
||||
CalamaresUtils::EntropySource
|
||||
CalamaresUtils::getPrintableEntropy( int size, QString& s )
|
||||
{
|
||||
s.clear();
|
||||
if ( size < 1 )
|
||||
{
|
||||
return EntropySource::None;
|
||||
}
|
||||
|
||||
static const char salt_chars[] = { '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
|
||||
'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
|
||||
'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
|
||||
'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
|
||||
static_assert( sizeof( salt_chars ) == 64, "Missing salt_chars" );
|
||||
|
||||
// Number of bytes we're going to need
|
||||
int byteSize = ( ( size * 6 ) / 8 ) + 1;
|
||||
QByteArray b;
|
||||
EntropySource r = getEntropy( byteSize, b );
|
||||
|
||||
int bitsLeft = 0;
|
||||
int byteOffset = 0;
|
||||
qint64 next = 0;
|
||||
do
|
||||
{
|
||||
if ( bitsLeft < 6 )
|
||||
{
|
||||
next = ( next << 8 ) | b.at( byteOffset++ );
|
||||
bitsLeft += 8;
|
||||
}
|
||||
char c = salt_chars[ next & 0b0111111 ];
|
||||
next >>= 6;
|
||||
bitsLeft -= 6;
|
||||
s.append( c );
|
||||
} while ( ( s.length() < size ) && ( byteOffset < b.size() ) );
|
||||
|
||||
if ( s.length() < size )
|
||||
{
|
||||
// It's incomplete, not really no-entropy
|
||||
return EntropySource::None;
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2019-2020, Adriaan de Groot <groot@kde.org>
|
||||
*
|
||||
* Calamares 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Calamares 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 Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef UTILS_ENTROPY_H
|
||||
#define UTILS_ENTROPY_H
|
||||
|
||||
#include "DllMacro.h"
|
||||
|
||||
#include <QByteArray>
|
||||
|
||||
namespace CalamaresUtils
|
||||
{
|
||||
/// @brief Which entropy source was actually used for the entropy.
|
||||
enum class EntropySource
|
||||
{
|
||||
None, ///< Buffer is empty, no random data
|
||||
URandom, ///< Read from /dev/urandom
|
||||
Twister ///< Generated by pseudo-random
|
||||
};
|
||||
|
||||
/** @brief Fill buffer @p b with exactly @p size random bytes
|
||||
*
|
||||
* The array is cleared and resized, then filled with 0xcb
|
||||
* "just in case", after which it is filled with random
|
||||
* bytes from a suitable source. Returns which source was used.
|
||||
*/
|
||||
DLLEXPORT EntropySource getEntropy( int size, QByteArray& b );
|
||||
|
||||
/** @brief Fill string @p s with exactly @p size random printable ASCII characters
|
||||
*
|
||||
* The characters are picked from a set of 64 (2^6). The string
|
||||
* contains 6 * size bits of entropy. * Returns which source was used.
|
||||
* @see getEntropy
|
||||
*/
|
||||
DLLEXPORT EntropySource getPrintableEntropy( int size, QString& s );
|
||||
} // namespace CalamaresUtils
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue